swagger_aem 2.5.0 → 3.4.0

data/lib/swagger_aem/models/keystore_items.rb

@@ -3,17 +3,16 @@
 
 #Swagger AEM is an OpenAPI specification for Adobe Experience Manager (AEM) API
 
-OpenAPI spec version: 2.4.0
+The version of the OpenAPI document: 3.4.0
 Contact: opensource@shinesolutions.com
-Generated by: https://github.com/swagger-api/swagger-codegen.git
-Swagger Codegen version: 2.3.0-SNAPSHOT
+Generated by: https://openapi-generator.tech
+OpenAPI Generator version: 4.3.1
 
 =end
 
 require 'date'
 
 module SwaggerAemClient
-
   class KeystoreItems
     # Keystore alias name
     attr_accessor :_alias
@@ -29,7 +28,6 @@ module SwaggerAemClient
 
     attr_accessor :chain
 
-
     # Attribute mapping from ruby-style variable name to JSON key.
     def self.attribute_map
       {
@@ -42,7 +40,7 @@ module SwaggerAemClient
     end
 
     # Attribute type mapping.
-    def self.swagger_types
+    def self.openapi_types
       {
         :'_alias' => :'String',
         :'entry_type' => :'String',
@@ -52,49 +50,61 @@ module SwaggerAemClient
       }
     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 = {})
-      return unless attributes.is_a?(Hash)
+      if (!attributes.is_a?(Hash))
+        fail ArgumentError, "The input argument (attributes) must be a hash in `SwaggerAemClient::KeystoreItems` 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 `SwaggerAemClient::KeystoreItems`. 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?(:'alias')
-        self._alias = attributes[:'alias']
+      if attributes.key?(:'_alias')
+        self._alias = attributes[:'_alias']
       end
 
-      if attributes.has_key?(:'entryType')
-        self.entry_type = attributes[:'entryType']
+      if attributes.key?(:'entry_type')
+        self.entry_type = attributes[:'entry_type']
       end
 
-      if attributes.has_key?(:'algorithm')
+      if attributes.key?(:'algorithm')
         self.algorithm = attributes[:'algorithm']
       end
 
-      if attributes.has_key?(:'format')
+      if attributes.key?(:'format')
         self.format = attributes[:'format']
       end
 
-      if attributes.has_key?(:'chain')
+      if attributes.key?(:'chain')
         if (value = attributes[:'chain']).is_a?(Array)
           self.chain = value
         end
       end
-
     end
 
     # Show invalid properties with the reasons. Usually used together with valid?
-    # @return Array for valid properies with the reasons
+    # @return Array for valid properties with the reasons
     def list_invalid_properties
       invalid_properties = Array.new
-      return invalid_properties
+      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 true
+      true
     end
 
     # Checks equality by comparing each attribute.
@@ -116,22 +126,29 @@ module SwaggerAemClient
     end
 
     # Calculates hash code according to all attributes.
-    # @return [Fixnum] Hash code
+    # @return [Integer] Hash code
     def hash
       [_alias, entry_type, algorithm, format, chain].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.swagger_types.each_pair do |key, type|
+      self.class.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) } )
+            self.send("#{key}=", attributes[self.class.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]]))
@@ -157,7 +174,7 @@ module SwaggerAemClient
         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
@@ -178,8 +195,7 @@ module SwaggerAemClient
           end
         end
       else # model
-        temp_model = SwaggerAemClient.const_get(type).new
-        temp_model.build_from_hash(value)
+        SwaggerAemClient.const_get(type).build_from_hash(value)
       end
     end
 
@@ -201,7 +217,11 @@ module SwaggerAemClient
       hash = {}
       self.class.attribute_map.each_pair do |attr, param|
         value = self.send(attr)
-        next if value.nil?
+        if value.nil?
+          is_nullable = self.class.openapi_nullable.include?(attr)
+          next if !is_nullable || (is_nullable && !instance_variable_defined?(:"@#{attr}"))
+        end
+        
         hash[param] = _to_hash(value)
       end
       hash
@@ -213,7 +233,7 @@ module SwaggerAemClient
     # @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) }
+        value.compact.map { |v| _to_hash(v) }
       elsif value.is_a?(Hash)
         {}.tap do |hash|
           value.each { |k, v| hash[k] = _to_hash(v) }
@@ -224,7 +244,5 @@ module SwaggerAemClient
         value
       end
     end
-
   end
-
 end

data/lib/swagger_aem/models/saml_configuration_info.rb

@@ -3,17 +3,16 @@
 
 #Swagger AEM is an OpenAPI specification for Adobe Experience Manager (AEM) API
 
-OpenAPI spec version: 2.4.0
+The version of the OpenAPI document: 3.4.0
 Contact: opensource@shinesolutions.com
-Generated by: https://github.com/swagger-api/swagger-codegen.git
-Swagger Codegen version: 2.3.0-SNAPSHOT
+Generated by: https://openapi-generator.tech
+OpenAPI Generator version: 4.3.1
 
 =end
 
 require 'date'
 
 module SwaggerAemClient
-
   class SamlConfigurationInfo
     # Persistent Identity (PID)
     attr_accessor :pid
@@ -32,7 +31,6 @@ module SwaggerAemClient
 
     attr_accessor :properties
 
-
     # Attribute mapping from ruby-style variable name to JSON key.
     def self.attribute_map
       {
@@ -46,62 +44,74 @@ module SwaggerAemClient
     end
 
     # Attribute type mapping.
-    def self.swagger_types
+    def self.openapi_types
       {
         :'pid' => :'String',
         :'title' => :'String',
         :'description' => :'String',
         :'bundle_location' => :'String',
         :'service_location' => :'String',
-        :'properties' => :'Object'
+        :'properties' => :'SamlConfigurationProperties'
       }
     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 = {})
-      return unless attributes.is_a?(Hash)
+      if (!attributes.is_a?(Hash))
+        fail ArgumentError, "The input argument (attributes) must be a hash in `SwaggerAemClient::SamlConfigurationInfo` 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 `SwaggerAemClient::SamlConfigurationInfo`. 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?(:'pid')
+      if attributes.key?(:'pid')
         self.pid = attributes[:'pid']
       end
 
-      if attributes.has_key?(:'title')
+      if attributes.key?(:'title')
         self.title = attributes[:'title']
       end
 
-      if attributes.has_key?(:'description')
+      if attributes.key?(:'description')
         self.description = attributes[:'description']
       end
 
-      if attributes.has_key?(:'bundle_location')
+      if attributes.key?(:'bundle_location')
         self.bundle_location = attributes[:'bundle_location']
       end
 
-      if attributes.has_key?(:'service_location')
+      if attributes.key?(:'service_location')
         self.service_location = attributes[:'service_location']
       end
 
-      if attributes.has_key?(:'properties')
+      if attributes.key?(:'properties')
         self.properties = attributes[:'properties']
       end
-
     end
 
     # Show invalid properties with the reasons. Usually used together with valid?
-    # @return Array for valid properies with the reasons
+    # @return Array for valid properties with the reasons
     def list_invalid_properties
       invalid_properties = Array.new
-      return invalid_properties
+      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 true
+      true
     end
 
     # Checks equality by comparing each attribute.
@@ -124,22 +134,29 @@ module SwaggerAemClient
     end
 
     # Calculates hash code according to all attributes.
-    # @return [Fixnum] Hash code
+    # @return [Integer] Hash code
     def hash
       [pid, title, description, bundle_location, service_location, properties].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.swagger_types.each_pair do |key, type|
+      self.class.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) } )
+            self.send("#{key}=", attributes[self.class.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]]))
@@ -165,7 +182,7 @@ module SwaggerAemClient
         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
@@ -186,8 +203,7 @@ module SwaggerAemClient
           end
         end
       else # model
-        temp_model = SwaggerAemClient.const_get(type).new
-        temp_model.build_from_hash(value)
+        SwaggerAemClient.const_get(type).build_from_hash(value)
       end
     end
 
@@ -209,7 +225,11 @@ module SwaggerAemClient
       hash = {}
       self.class.attribute_map.each_pair do |attr, param|
         value = self.send(attr)
-        next if value.nil?
+        if value.nil?
+          is_nullable = self.class.openapi_nullable.include?(attr)
+          next if !is_nullable || (is_nullable && !instance_variable_defined?(:"@#{attr}"))
+        end
+        
         hash[param] = _to_hash(value)
       end
       hash
@@ -221,7 +241,7 @@ module SwaggerAemClient
     # @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) }
+        value.compact.map { |v| _to_hash(v) }
       elsif value.is_a?(Hash)
         {}.tap do |hash|
           value.each { |k, v| hash[k] = _to_hash(v) }
@@ -232,7 +252,5 @@ module SwaggerAemClient
         value
       end
     end
-
   end
-
 end

data/lib/swagger_aem/models/saml_configuration_properties.rb

@@ -3,91 +3,65 @@
 
 #Swagger AEM is an OpenAPI specification for Adobe Experience Manager (AEM) API
 
-OpenAPI spec version: 2.4.0
+The version of the OpenAPI document: 3.4.0
 Contact: opensource@shinesolutions.com
-Generated by: https://github.com/swagger-api/swagger-codegen.git
-Swagger Codegen version: 2.3.0-SNAPSHOT
+Generated by: https://openapi-generator.tech
+OpenAPI Generator version: 4.3.1
 
 =end
 
 require 'date'
 
 module SwaggerAemClient
-
   class SamlConfigurationProperties
-    # Repository path for which this authentication handler should be used by Sling. If this is empty, the authentication handler will be disabled.
     attr_accessor :path
 
-    # OSGi Framework Service Ranking value to indicate the order in which to call this service. This is an int value where higher values designate higher precedence. Default value is 0.
     attr_accessor :service_ranking
 
-    # URL of the IDP where the SAML Authentication Request should be sent to. If this property is empty the authentication handler is disabled. (idpUrl)
     attr_accessor :idp_url
 
-    # The alias of the IdP's certificate in the global truststore. If this property is empty the authentication handler is disabled.
     attr_accessor :idp_cert_alias
 
-    # Use an HTTP Redirect to the IDP URL instead of sending an AuthnRequest-message to request credentials. Use this for IDP initiated authentication.
     attr_accessor :idp_http_redirect
 
-    # ID which uniquely identifies this service provider with the identity provider. If this property is empty the authentication handler is disabled.
     attr_accessor :service_provider_entity_id
 
-    # The (optional) AssertionConsumerServiceURL attribute of an Authn request specifies the location to which a <Response> message MUST be sent to the requester.
     attr_accessor :assertion_consumer_service_url
 
-    # The alias of the SP's private key in the key-store of the 'authentication-service' system user. If this property is empty the handler will not be able to sign or decrypt messages.
     attr_accessor :sp_private_key_alias
 
-    # The password of the key-store of the 'authentication-service' system user.
     attr_accessor :key_store_password
 
-    # The default location to redirect to after successful authentication.
     attr_accessor :default_redirect_url
 
-    # The name of the attribute containing the user ID used to authenticate and create the user in the CRX repository. Leave empty to use the Subject:NameId.
     attr_accessor :user_id_attribute
 
-    # Whether or not this authentication handler expects encrypted SAML assertions. If this is enabled the SP's private key must be provided in the key-store of the 'authentication-service' system user (see SP Private Key Alias above).
     attr_accessor :use_encryption
 
-    # Whether or not to autocreate nonexisting users in the repository.
     attr_accessor :create_user
 
-    # Whether or not a user should be automatically added to CRX groups after successful authentication.
     attr_accessor :add_group_memberships
 
-    # The name of the attribute containing a list of CRX groups this user should be added to.
     attr_accessor :group_membership_attribute
 
-    # A list of default CRX groups users are added to after successful authentication.
     attr_accessor :default_groups
 
-    # The value of the NameIDPolicy format parameter to send in the AuthnRequest message.
     attr_accessor :name_id_format
 
-    # A list of attribute mappings (in the format \\attributename=path/relative/to/user/node\\) which should be stored in the repository on user-synchronization.
     attr_accessor :synchronize_attributes
 
-    # Whether or not logout (dropCredentials) requests will be processed by this handler.
     attr_accessor :handle_logout
 
-    # URL of the IDP where the SAML Logout Request should be sent to. If this property is empty the authentication handler won't handle logouts.
     attr_accessor :logout_url
 
-    # Time tolerance in seconds to compensate clock skew between IDP and SP when validating Assertions.
     attr_accessor :clock_tolerance
 
-    # The digest algorithm to use when signing a SAML message.
     attr_accessor :digest_method
 
-    # The signature algorithm to use when signing a SAML message.
     attr_accessor :signature_method
 
-    # User intermediate path to store created users.
     attr_accessor :user_intermediate_path
 
-
     # Attribute mapping from ruby-style variable name to JSON key.
     def self.attribute_map
       {
@@ -119,200 +93,164 @@ module SwaggerAemClient
     end
 
     # Attribute type mapping.
-    def self.swagger_types
+    def self.openapi_types
       {
-        :'path' => :'Array<SamlConfigurationPropertyItemsArray>',
-        :'service_ranking' => :'Array<SamlConfigurationPropertyItemsLong>',
-        :'idp_url' => :'Array<SamlConfigurationPropertyItemsString>',
-        :'idp_cert_alias' => :'Array<SamlConfigurationPropertyItemsString>',
-        :'idp_http_redirect' => :'Array<SamlConfigurationPropertyItemsBoolean>',
-        :'service_provider_entity_id' => :'Array<SamlConfigurationPropertyItemsString>',
-        :'assertion_consumer_service_url' => :'Array<SamlConfigurationPropertyItemsString>',
-        :'sp_private_key_alias' => :'Array<SamlConfigurationPropertyItemsString>',
-        :'key_store_password' => :'Array<SamlConfigurationPropertyItemsString>',
-        :'default_redirect_url' => :'Array<SamlConfigurationPropertyItemsString>',
-        :'user_id_attribute' => :'Array<SamlConfigurationPropertyItemsString>',
-        :'use_encryption' => :'Array<SamlConfigurationPropertyItemsBoolean>',
-        :'create_user' => :'Array<SamlConfigurationPropertyItemsBoolean>',
-        :'add_group_memberships' => :'Array<SamlConfigurationPropertyItemsBoolean>',
-        :'group_membership_attribute' => :'Array<SamlConfigurationPropertyItemsString>',
-        :'default_groups' => :'Array<SamlConfigurationPropertyItemsArray>',
-        :'name_id_format' => :'Array<SamlConfigurationPropertyItemsString>',
-        :'synchronize_attributes' => :'Array<SamlConfigurationPropertyItemsArray>',
-        :'handle_logout' => :'Array<SamlConfigurationPropertyItemsBoolean>',
-        :'logout_url' => :'Array<SamlConfigurationPropertyItemsString>',
-        :'clock_tolerance' => :'Array<SamlConfigurationPropertyItemsLong>',
-        :'digest_method' => :'Array<SamlConfigurationPropertyItemsString>',
-        :'signature_method' => :'Array<SamlConfigurationPropertyItemsString>',
-        :'user_intermediate_path' => :'Array<SamlConfigurationPropertyItemsString>'
+        :'path' => :'SamlConfigurationPropertyItemsArray',
+        :'service_ranking' => :'SamlConfigurationPropertyItemsLong',
+        :'idp_url' => :'SamlConfigurationPropertyItemsString',
+        :'idp_cert_alias' => :'SamlConfigurationPropertyItemsString',
+        :'idp_http_redirect' => :'SamlConfigurationPropertyItemsBoolean',
+        :'service_provider_entity_id' => :'SamlConfigurationPropertyItemsString',
+        :'assertion_consumer_service_url' => :'SamlConfigurationPropertyItemsString',
+        :'sp_private_key_alias' => :'SamlConfigurationPropertyItemsString',
+        :'key_store_password' => :'SamlConfigurationPropertyItemsString',
+        :'default_redirect_url' => :'SamlConfigurationPropertyItemsString',
+        :'user_id_attribute' => :'SamlConfigurationPropertyItemsString',
+        :'use_encryption' => :'SamlConfigurationPropertyItemsBoolean',
+        :'create_user' => :'SamlConfigurationPropertyItemsBoolean',
+        :'add_group_memberships' => :'SamlConfigurationPropertyItemsBoolean',
+        :'group_membership_attribute' => :'SamlConfigurationPropertyItemsString',
+        :'default_groups' => :'SamlConfigurationPropertyItemsArray',
+        :'name_id_format' => :'SamlConfigurationPropertyItemsString',
+        :'synchronize_attributes' => :'SamlConfigurationPropertyItemsArray',
+        :'handle_logout' => :'SamlConfigurationPropertyItemsBoolean',
+        :'logout_url' => :'SamlConfigurationPropertyItemsString',
+        :'clock_tolerance' => :'SamlConfigurationPropertyItemsLong',
+        :'digest_method' => :'SamlConfigurationPropertyItemsString',
+        :'signature_method' => :'SamlConfigurationPropertyItemsString',
+        :'user_intermediate_path' => :'SamlConfigurationPropertyItemsString'
       }
     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 = {})
-      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?(:'path')
-        if (value = attributes[:'path']).is_a?(Array)
-          self.path = value
-        end
+      if (!attributes.is_a?(Hash))
+        fail ArgumentError, "The input argument (attributes) must be a hash in `SwaggerAemClient::SamlConfigurationProperties` initialize method"
       end
 
-      if attributes.has_key?(:'service.ranking')
-        if (value = attributes[:'service.ranking']).is_a?(Array)
-          self.service_ranking = value
+      # 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 `SwaggerAemClient::SamlConfigurationProperties`. 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?(:'path')
+        self.path = attributes[:'path']
       end
 
-      if attributes.has_key?(:'idpUrl')
-        if (value = attributes[:'idpUrl']).is_a?(Array)
-          self.idp_url = value
-        end
+      if attributes.key?(:'service_ranking')
+        self.service_ranking = attributes[:'service_ranking']
       end
 
-      if attributes.has_key?(:'idpCertAlias')
-        if (value = attributes[:'idpCertAlias']).is_a?(Array)
-          self.idp_cert_alias = value
-        end
+      if attributes.key?(:'idp_url')
+        self.idp_url = attributes[:'idp_url']
       end
 
-      if attributes.has_key?(:'idpHttpRedirect')
-        if (value = attributes[:'idpHttpRedirect']).is_a?(Array)
-          self.idp_http_redirect = value
-        end
+      if attributes.key?(:'idp_cert_alias')
+        self.idp_cert_alias = attributes[:'idp_cert_alias']
       end
 
-      if attributes.has_key?(:'serviceProviderEntityId')
-        if (value = attributes[:'serviceProviderEntityId']).is_a?(Array)
-          self.service_provider_entity_id = value
-        end
+      if attributes.key?(:'idp_http_redirect')
+        self.idp_http_redirect = attributes[:'idp_http_redirect']
       end
 
-      if attributes.has_key?(:'assertionConsumerServiceURL')
-        if (value = attributes[:'assertionConsumerServiceURL']).is_a?(Array)
-          self.assertion_consumer_service_url = value
-        end
+      if attributes.key?(:'service_provider_entity_id')
+        self.service_provider_entity_id = attributes[:'service_provider_entity_id']
       end
 
-      if attributes.has_key?(:'spPrivateKeyAlias')
-        if (value = attributes[:'spPrivateKeyAlias']).is_a?(Array)
-          self.sp_private_key_alias = value
-        end
+      if attributes.key?(:'assertion_consumer_service_url')
+        self.assertion_consumer_service_url = attributes[:'assertion_consumer_service_url']
       end
 
-      if attributes.has_key?(:'keyStorePassword')
-        if (value = attributes[:'keyStorePassword']).is_a?(Array)
-          self.key_store_password = value
-        end
+      if attributes.key?(:'sp_private_key_alias')
+        self.sp_private_key_alias = attributes[:'sp_private_key_alias']
       end
 
-      if attributes.has_key?(:'defaultRedirectUrl')
-        if (value = attributes[:'defaultRedirectUrl']).is_a?(Array)
-          self.default_redirect_url = value
-        end
+      if attributes.key?(:'key_store_password')
+        self.key_store_password = attributes[:'key_store_password']
       end
 
-      if attributes.has_key?(:'userIDAttribute')
-        if (value = attributes[:'userIDAttribute']).is_a?(Array)
-          self.user_id_attribute = value
-        end
+      if attributes.key?(:'default_redirect_url')
+        self.default_redirect_url = attributes[:'default_redirect_url']
       end
 
-      if attributes.has_key?(:'useEncryption')
-        if (value = attributes[:'useEncryption']).is_a?(Array)
-          self.use_encryption = value
-        end
+      if attributes.key?(:'user_id_attribute')
+        self.user_id_attribute = attributes[:'user_id_attribute']
       end
 
-      if attributes.has_key?(:'createUser')
-        if (value = attributes[:'createUser']).is_a?(Array)
-          self.create_user = value
-        end
+      if attributes.key?(:'use_encryption')
+        self.use_encryption = attributes[:'use_encryption']
       end
 
-      if attributes.has_key?(:'addGroupMemberships')
-        if (value = attributes[:'addGroupMemberships']).is_a?(Array)
-          self.add_group_memberships = value
-        end
+      if attributes.key?(:'create_user')
+        self.create_user = attributes[:'create_user']
       end
 
-      if attributes.has_key?(:'groupMembershipAttribute')
-        if (value = attributes[:'groupMembershipAttribute']).is_a?(Array)
-          self.group_membership_attribute = value
-        end
+      if attributes.key?(:'add_group_memberships')
+        self.add_group_memberships = attributes[:'add_group_memberships']
       end
 
-      if attributes.has_key?(:'defaultGroups')
-        if (value = attributes[:'defaultGroups']).is_a?(Array)
-          self.default_groups = value
-        end
+      if attributes.key?(:'group_membership_attribute')
+        self.group_membership_attribute = attributes[:'group_membership_attribute']
       end
 
-      if attributes.has_key?(:'nameIdFormat')
-        if (value = attributes[:'nameIdFormat']).is_a?(Array)
-          self.name_id_format = value
-        end
+      if attributes.key?(:'default_groups')
+        self.default_groups = attributes[:'default_groups']
       end
 
-      if attributes.has_key?(:'synchronizeAttributes')
-        if (value = attributes[:'synchronizeAttributes']).is_a?(Array)
-          self.synchronize_attributes = value
-        end
+      if attributes.key?(:'name_id_format')
+        self.name_id_format = attributes[:'name_id_format']
       end
 
-      if attributes.has_key?(:'handleLogout')
-        if (value = attributes[:'handleLogout']).is_a?(Array)
-          self.handle_logout = value
-        end
+      if attributes.key?(:'synchronize_attributes')
+        self.synchronize_attributes = attributes[:'synchronize_attributes']
       end
 
-      if attributes.has_key?(:'logoutUrl')
-        if (value = attributes[:'logoutUrl']).is_a?(Array)
-          self.logout_url = value
-        end
+      if attributes.key?(:'handle_logout')
+        self.handle_logout = attributes[:'handle_logout']
       end
 
-      if attributes.has_key?(:'clockTolerance')
-        if (value = attributes[:'clockTolerance']).is_a?(Array)
-          self.clock_tolerance = value
-        end
+      if attributes.key?(:'logout_url')
+        self.logout_url = attributes[:'logout_url']
       end
 
-      if attributes.has_key?(:'digestMethod')
-        if (value = attributes[:'digestMethod']).is_a?(Array)
-          self.digest_method = value
-        end
+      if attributes.key?(:'clock_tolerance')
+        self.clock_tolerance = attributes[:'clock_tolerance']
       end
 
-      if attributes.has_key?(:'signatureMethod')
-        if (value = attributes[:'signatureMethod']).is_a?(Array)
-          self.signature_method = value
-        end
+      if attributes.key?(:'digest_method')
+        self.digest_method = attributes[:'digest_method']
       end
 
-      if attributes.has_key?(:'userIntermediatePath')
-        if (value = attributes[:'userIntermediatePath']).is_a?(Array)
-          self.user_intermediate_path = value
-        end
+      if attributes.key?(:'signature_method')
+        self.signature_method = attributes[:'signature_method']
       end
 
+      if attributes.key?(:'user_intermediate_path')
+        self.user_intermediate_path = attributes[:'user_intermediate_path']
+      end
     end
 
     # Show invalid properties with the reasons. Usually used together with valid?
-    # @return Array for valid properies with the reasons
+    # @return Array for valid properties with the reasons
     def list_invalid_properties
       invalid_properties = Array.new
-      return invalid_properties
+      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 true
+      true
     end
 
     # Checks equality by comparing each attribute.
@@ -353,22 +291,29 @@ module SwaggerAemClient
     end
 
     # Calculates hash code according to all attributes.
-    # @return [Fixnum] Hash code
+    # @return [Integer] Hash code
     def hash
       [path, service_ranking, idp_url, idp_cert_alias, idp_http_redirect, service_provider_entity_id, assertion_consumer_service_url, sp_private_key_alias, key_store_password, default_redirect_url, user_id_attribute, use_encryption, create_user, add_group_memberships, group_membership_attribute, default_groups, name_id_format, synchronize_attributes, handle_logout, logout_url, clock_tolerance, digest_method, signature_method, user_intermediate_path].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.swagger_types.each_pair do |key, type|
+      self.class.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) } )
+            self.send("#{key}=", attributes[self.class.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]]))
@@ -394,7 +339,7 @@ module SwaggerAemClient
         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
@@ -415,8 +360,7 @@ module SwaggerAemClient
           end
         end
       else # model
-        temp_model = SwaggerAemClient.const_get(type).new
-        temp_model.build_from_hash(value)
+        SwaggerAemClient.const_get(type).build_from_hash(value)
       end
     end
 
@@ -438,7 +382,11 @@ module SwaggerAemClient
       hash = {}
       self.class.attribute_map.each_pair do |attr, param|
         value = self.send(attr)
-        next if value.nil?
+        if value.nil?
+          is_nullable = self.class.openapi_nullable.include?(attr)
+          next if !is_nullable || (is_nullable && !instance_variable_defined?(:"@#{attr}"))
+        end
+        
         hash[param] = _to_hash(value)
       end
       hash
@@ -450,7 +398,7 @@ module SwaggerAemClient
     # @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) }
+        value.compact.map { |v| _to_hash(v) }
       elsif value.is_a?(Hash)
         {}.tap do |hash|
           value.each { |k, v| hash[k] = _to_hash(v) }
@@ -461,7 +409,5 @@ module SwaggerAemClient
         value
       end
     end
-
   end
-
 end