ory-oathkeeper-client 0.0.0.alpha62 → 0.35.0.alpha1

data/lib/ory-oathkeeper-client/models/list_rules_unauthorized_body.rb

@@ -3,17 +3,16 @@
 
 #ORY Oathkeeper is a reverse proxy that checks the HTTP Authorization for validity against a set of rules. This service uses Hydra to validate access tokens and policies.
 
-The version of the OpenAPI document: v0.0.0-alpha.62
+The version of the OpenAPI document: v0.0.0-alpha.37
 Contact: hi@ory.am
 Generated by: https://openapi-generator.tech
-OpenAPI Generator version: 5.2.1
+OpenAPI Generator version: 4.2.2
 
 =end
 
 require 'date'
-require 'time'
 
-module OryOathkeeperClient
+module OryHydraClient
   # ListRulesUnauthorizedBody ListRulesUnauthorizedBody ListRulesUnauthorizedBody ListRulesUnauthorizedBody ListRulesUnauthorizedBody ListRulesUnauthorizedBody ListRulesUnauthorizedBody list rules unauthorized body
   class ListRulesUnauthorizedBody
     # code
@@ -46,16 +45,11 @@ module OryOathkeeperClient
       }
     end
 
-    # Returns all the JSON keys this model knows about
-    def self.acceptable_attributes
-      attribute_map.values
-    end
-
     # Attribute type mapping.
     def self.openapi_types
       {
         :'code' => :'Integer',
-        :'details' => :'Array<Object>',
+        :'details' => :'Array<Hash<String, Object>>',
         :'message' => :'String',
         :'reason' => :'String',
         :'request' => :'String',
@@ -73,13 +67,13 @@ module OryOathkeeperClient
     # @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 `OryOathkeeperClient::ListRulesUnauthorizedBody` initialize method"
+        fail ArgumentError, "The input argument (attributes) must be a hash in `OryHydraClient::ListRulesUnauthorizedBody` 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 `OryOathkeeperClient::ListRulesUnauthorizedBody`. 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 `OryHydraClient::ListRulesUnauthorizedBody`. 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
       }
@@ -162,9 +156,7 @@ module OryOathkeeperClient
     def build_from_hash(attributes)
       return nil unless attributes.is_a?(Hash)
       self.class.openapi_types.each_pair do |key, type|
-        if attributes[self.class.attribute_map[key]].nil? && self.class.openapi_nullable.include?(key)
-          self.send("#{key}=", nil)
-        elsif type =~ /\AArray<(.*)>/i
+        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)
@@ -172,7 +164,7 @@ module OryOathkeeperClient
           end
         elsif !attributes[self.class.attribute_map[key]].nil?
           self.send("#{key}=", _deserialize(type, attributes[self.class.attribute_map[key]]))
-        end
+        end # or else data not found in attributes(hash), not an issue as the data can be optional
       end
 
       self
@@ -184,8 +176,8 @@ module OryOathkeeperClient
     # @return [Object] Deserialized data
     def _deserialize(type, value)
       case type.to_sym
-      when :Time
-        Time.parse(value)
+      when :DateTime
+        DateTime.parse(value)
       when :Date
         Date.parse(value)
       when :String
@@ -215,9 +207,7 @@ module OryOathkeeperClient
           end
         end
       else # model
-        # models (e.g. Pet) or oneOf
-        klass = OryOathkeeperClient.const_get(type)
-        klass.respond_to?(:openapi_one_of) ? klass.build(value) : klass.build_from_hash(value)
+        OryHydraClient.const_get(type).build_from_hash(value)
       end
     end
 
@@ -243,7 +233,7 @@ module OryOathkeeperClient
           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
@@ -266,7 +256,5 @@ module OryOathkeeperClient
         value
       end
     end
-
   end
-
 end

data/lib/ory-oathkeeper-client/models/rule.rb

@@ -3,17 +3,16 @@
 
 #ORY Oathkeeper is a reverse proxy that checks the HTTP Authorization for validity against a set of rules. This service uses Hydra to validate access tokens and policies.
 
-The version of the OpenAPI document: v0.0.0-alpha.62
+The version of the OpenAPI document: Latest
 Contact: hi@ory.am
 Generated by: https://openapi-generator.tech
-OpenAPI Generator version: 5.2.1
+OpenAPI Generator version: 4.2.2
 
 =end
 
 require 'date'
-require 'time'
 
-module OryOathkeeperClient
+module OryHydraClient
   class Rule
     # Authenticators is a list of authentication handlers that will try and authenticate the provided credentials. Authenticators are checked iteratively from index 0 to n and if the first authenticator to return a positive result will be the one used.  If you want the rule to first check a specific authenticator  before \"falling back\" to others, have that authenticator as the first item in the array.
     attr_accessor :authenticators
@@ -46,11 +45,6 @@ module OryOathkeeperClient
       }
     end
 
-    # Returns all the JSON keys this model knows about
-    def self.acceptable_attributes
-      attribute_map.values
-    end
-
     # Attribute type mapping.
     def self.openapi_types
       {
@@ -74,13 +68,13 @@ module OryOathkeeperClient
     # @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 `OryOathkeeperClient::Rule` initialize method"
+        fail ArgumentError, "The input argument (attributes) must be a hash in `OryHydraClient::Rule` 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 `OryOathkeeperClient::Rule`. 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 `OryHydraClient::Rule`. 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
       }
@@ -170,9 +164,7 @@ module OryOathkeeperClient
     def build_from_hash(attributes)
       return nil unless attributes.is_a?(Hash)
       self.class.openapi_types.each_pair do |key, type|
-        if attributes[self.class.attribute_map[key]].nil? && self.class.openapi_nullable.include?(key)
-          self.send("#{key}=", nil)
-        elsif type =~ /\AArray<(.*)>/i
+        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)
@@ -180,7 +172,7 @@ module OryOathkeeperClient
           end
         elsif !attributes[self.class.attribute_map[key]].nil?
           self.send("#{key}=", _deserialize(type, attributes[self.class.attribute_map[key]]))
-        end
+        end # or else data not found in attributes(hash), not an issue as the data can be optional
       end
 
       self
@@ -192,8 +184,8 @@ module OryOathkeeperClient
     # @return [Object] Deserialized data
     def _deserialize(type, value)
       case type.to_sym
-      when :Time
-        Time.parse(value)
+      when :DateTime
+        DateTime.parse(value)
       when :Date
         Date.parse(value)
       when :String
@@ -223,9 +215,7 @@ module OryOathkeeperClient
           end
         end
       else # model
-        # models (e.g. Pet) or oneOf
-        klass = OryOathkeeperClient.const_get(type)
-        klass.respond_to?(:openapi_one_of) ? klass.build(value) : klass.build_from_hash(value)
+        OryHydraClient.const_get(type).build_from_hash(value)
       end
     end
 
@@ -251,7 +241,7 @@ module OryOathkeeperClient
           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
@@ -274,7 +264,5 @@ module OryOathkeeperClient
         value
       end
     end
-
   end
-
 end

data/lib/ory-oathkeeper-client/models/rule_handler.rb

@@ -3,17 +3,17 @@
 
 #ORY Oathkeeper is a reverse proxy that checks the HTTP Authorization for validity against a set of rules. This service uses Hydra to validate access tokens and policies.
 
-The version of the OpenAPI document: v0.0.0-alpha.62
+The version of the OpenAPI document: Latest
 Contact: hi@ory.am
 Generated by: https://openapi-generator.tech
-OpenAPI Generator version: 5.2.1
+OpenAPI Generator version: 4.2.2
 
 =end
 
 require 'date'
-require 'time'
 
-module OryOathkeeperClient
+module OryHydraClient
+  # RuleHandler rule handler
   class RuleHandler
     # Config contains the configuration for the handler. Please read the user guide for a complete list of each handler's available settings.
     attr_accessor :config
@@ -29,11 +29,6 @@ module OryOathkeeperClient
       }
     end
 
-    # Returns all the JSON keys this model knows about
-    def self.acceptable_attributes
-      attribute_map.values
-    end
-
     # Attribute type mapping.
     def self.openapi_types
       {
@@ -52,13 +47,13 @@ module OryOathkeeperClient
     # @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 `OryOathkeeperClient::RuleHandler` initialize method"
+        fail ArgumentError, "The input argument (attributes) must be a hash in `OryHydraClient::RuleHandler` 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 `OryOathkeeperClient::RuleHandler`. 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 `OryHydraClient::RuleHandler`. 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
       }
@@ -119,9 +114,7 @@ module OryOathkeeperClient
     def build_from_hash(attributes)
       return nil unless attributes.is_a?(Hash)
       self.class.openapi_types.each_pair do |key, type|
-        if attributes[self.class.attribute_map[key]].nil? && self.class.openapi_nullable.include?(key)
-          self.send("#{key}=", nil)
-        elsif type =~ /\AArray<(.*)>/i
+        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)
@@ -129,7 +122,7 @@ module OryOathkeeperClient
           end
         elsif !attributes[self.class.attribute_map[key]].nil?
           self.send("#{key}=", _deserialize(type, attributes[self.class.attribute_map[key]]))
-        end
+        end # or else data not found in attributes(hash), not an issue as the data can be optional
       end
 
       self
@@ -141,8 +134,8 @@ module OryOathkeeperClient
     # @return [Object] Deserialized data
     def _deserialize(type, value)
       case type.to_sym
-      when :Time
-        Time.parse(value)
+      when :DateTime
+        DateTime.parse(value)
       when :Date
         Date.parse(value)
       when :String
@@ -172,9 +165,7 @@ module OryOathkeeperClient
           end
         end
       else # model
-        # models (e.g. Pet) or oneOf
-        klass = OryOathkeeperClient.const_get(type)
-        klass.respond_to?(:openapi_one_of) ? klass.build(value) : klass.build_from_hash(value)
+        OryHydraClient.const_get(type).build_from_hash(value)
       end
     end
 
@@ -200,7 +191,7 @@ module OryOathkeeperClient
           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
@@ -223,7 +214,5 @@ module OryOathkeeperClient
         value
       end
     end
-
   end
-
 end

data/lib/ory-oathkeeper-client/models/rule_match.rb

@@ -3,17 +3,17 @@
 
 #ORY Oathkeeper is a reverse proxy that checks the HTTP Authorization for validity against a set of rules. This service uses Hydra to validate access tokens and policies.
 
-The version of the OpenAPI document: v0.0.0-alpha.62
+The version of the OpenAPI document: Latest
 Contact: hi@ory.am
 Generated by: https://openapi-generator.tech
-OpenAPI Generator version: 5.2.1
+OpenAPI Generator version: 4.2.2
 
 =end
 
 require 'date'
-require 'time'
 
-module OryOathkeeperClient
+module OryHydraClient
+  # RuleMatch rule match
   class RuleMatch
     # An array of HTTP methods (e.g. GET, POST, PUT, DELETE, ...). When ORY Oathkeeper searches for rules to decide what to do with an incoming request to the proxy server, it compares the HTTP method of the incoming request with the HTTP methods of each rules. If a match is found, the rule is considered a partial match. If the matchesUrl field is satisfied as well, the rule is considered a full match.
     attr_accessor :methods
@@ -29,11 +29,6 @@ module OryOathkeeperClient
       }
     end
 
-    # Returns all the JSON keys this model knows about
-    def self.acceptable_attributes
-      attribute_map.values
-    end
-
     # Attribute type mapping.
     def self.openapi_types
       {
@@ -52,13 +47,13 @@ module OryOathkeeperClient
     # @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 `OryOathkeeperClient::RuleMatch` initialize method"
+        fail ArgumentError, "The input argument (attributes) must be a hash in `OryHydraClient::RuleMatch` 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 `OryOathkeeperClient::RuleMatch`. 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 `OryHydraClient::RuleMatch`. 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
       }
@@ -121,9 +116,7 @@ module OryOathkeeperClient
     def build_from_hash(attributes)
       return nil unless attributes.is_a?(Hash)
       self.class.openapi_types.each_pair do |key, type|
-        if attributes[self.class.attribute_map[key]].nil? && self.class.openapi_nullable.include?(key)
-          self.send("#{key}=", nil)
-        elsif type =~ /\AArray<(.*)>/i
+        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)
@@ -131,7 +124,7 @@ module OryOathkeeperClient
           end
         elsif !attributes[self.class.attribute_map[key]].nil?
           self.send("#{key}=", _deserialize(type, attributes[self.class.attribute_map[key]]))
-        end
+        end # or else data not found in attributes(hash), not an issue as the data can be optional
       end
 
       self
@@ -143,8 +136,8 @@ module OryOathkeeperClient
     # @return [Object] Deserialized data
     def _deserialize(type, value)
       case type.to_sym
-      when :Time
-        Time.parse(value)
+      when :DateTime
+        DateTime.parse(value)
       when :Date
         Date.parse(value)
       when :String
@@ -174,9 +167,7 @@ module OryOathkeeperClient
           end
         end
       else # model
-        # models (e.g. Pet) or oneOf
-        klass = OryOathkeeperClient.const_get(type)
-        klass.respond_to?(:openapi_one_of) ? klass.build(value) : klass.build_from_hash(value)
+        OryHydraClient.const_get(type).build_from_hash(value)
       end
     end
 
@@ -202,7 +193,7 @@ module OryOathkeeperClient
           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
@@ -225,7 +216,5 @@ module OryOathkeeperClient
         value
       end
     end
-
   end
-
 end

data/lib/ory-oathkeeper-client/models/swagger_create_rule_parameters.rb

@@ -3,17 +3,16 @@
 
 #ORY Oathkeeper is a reverse proxy that checks the HTTP Authorization for validity against a set of rules. This service uses Hydra to validate access tokens and policies.
 
-The version of the OpenAPI document: v0.0.0-alpha.62
+The version of the OpenAPI document: v0.0.0-alpha.37
 Contact: hi@ory.am
 Generated by: https://openapi-generator.tech
-OpenAPI Generator version: 5.2.1
+OpenAPI Generator version: 4.2.2
 
 =end
 
 require 'date'
-require 'time'
 
-module OryOathkeeperClient
+module OryHydraClient
   # SwaggerCreateRuleParameters SwaggerCreateRuleParameters SwaggerCreateRuleParameters SwaggerCreateRuleParameters SwaggerCreateRuleParameters swagger create rule parameters
   class SwaggerCreateRuleParameters
     attr_accessor :body
@@ -25,11 +24,6 @@ module OryOathkeeperClient
       }
     end
 
-    # Returns all the JSON keys this model knows about
-    def self.acceptable_attributes
-      attribute_map.values
-    end
-
     # Attribute type mapping.
     def self.openapi_types
       {
@@ -47,13 +41,13 @@ module OryOathkeeperClient
     # @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 `OryOathkeeperClient::SwaggerCreateRuleParameters` initialize method"
+        fail ArgumentError, "The input argument (attributes) must be a hash in `OryHydraClient::SwaggerCreateRuleParameters` 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 `OryOathkeeperClient::SwaggerCreateRuleParameters`. 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 `OryHydraClient::SwaggerCreateRuleParameters`. 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
       }
@@ -109,9 +103,7 @@ module OryOathkeeperClient
     def build_from_hash(attributes)
       return nil unless attributes.is_a?(Hash)
       self.class.openapi_types.each_pair do |key, type|
-        if attributes[self.class.attribute_map[key]].nil? && self.class.openapi_nullable.include?(key)
-          self.send("#{key}=", nil)
-        elsif type =~ /\AArray<(.*)>/i
+        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)
@@ -119,7 +111,7 @@ module OryOathkeeperClient
           end
         elsif !attributes[self.class.attribute_map[key]].nil?
           self.send("#{key}=", _deserialize(type, attributes[self.class.attribute_map[key]]))
-        end
+        end # or else data not found in attributes(hash), not an issue as the data can be optional
       end
 
       self
@@ -131,8 +123,8 @@ module OryOathkeeperClient
     # @return [Object] Deserialized data
     def _deserialize(type, value)
       case type.to_sym
-      when :Time
-        Time.parse(value)
+      when :DateTime
+        DateTime.parse(value)
       when :Date
         Date.parse(value)
       when :String
@@ -162,9 +154,7 @@ module OryOathkeeperClient
           end
         end
       else # model
-        # models (e.g. Pet) or oneOf
-        klass = OryOathkeeperClient.const_get(type)
-        klass.respond_to?(:openapi_one_of) ? klass.build(value) : klass.build_from_hash(value)
+        OryHydraClient.const_get(type).build_from_hash(value)
       end
     end
 
@@ -190,7 +180,7 @@ module OryOathkeeperClient
           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 +203,5 @@ module OryOathkeeperClient
         value
       end
     end
-
   end
-
 end

data/lib/ory-oathkeeper-client/models/swagger_get_rule_parameters.rb

@@ -3,17 +3,16 @@
 
 #ORY Oathkeeper is a reverse proxy that checks the HTTP Authorization for validity against a set of rules. This service uses Hydra to validate access tokens and policies.
 
-The version of the OpenAPI document: v0.0.0-alpha.62
+The version of the OpenAPI document: v0.0.0-alpha.37
 Contact: hi@ory.am
 Generated by: https://openapi-generator.tech
-OpenAPI Generator version: 5.2.1
+OpenAPI Generator version: 4.2.2
 
 =end
 
 require 'date'
-require 'time'
 
-module OryOathkeeperClient
+module OryHydraClient
   # SwaggerGetRuleParameters swagger get rule parameters
   class SwaggerGetRuleParameters
     # in: path
@@ -26,11 +25,6 @@ module OryOathkeeperClient
       }
     end
 
-    # Returns all the JSON keys this model knows about
-    def self.acceptable_attributes
-      attribute_map.values
-    end
-
     # Attribute type mapping.
     def self.openapi_types
       {
@@ -48,13 +42,13 @@ module OryOathkeeperClient
     # @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 `OryOathkeeperClient::SwaggerGetRuleParameters` initialize method"
+        fail ArgumentError, "The input argument (attributes) must be a hash in `OryHydraClient::SwaggerGetRuleParameters` 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 `OryOathkeeperClient::SwaggerGetRuleParameters`. 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 `OryHydraClient::SwaggerGetRuleParameters`. 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
       }
@@ -115,9 +109,7 @@ module OryOathkeeperClient
     def build_from_hash(attributes)
       return nil unless attributes.is_a?(Hash)
       self.class.openapi_types.each_pair do |key, type|
-        if attributes[self.class.attribute_map[key]].nil? && self.class.openapi_nullable.include?(key)
-          self.send("#{key}=", nil)
-        elsif type =~ /\AArray<(.*)>/i
+        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)
@@ -125,7 +117,7 @@ module OryOathkeeperClient
           end
         elsif !attributes[self.class.attribute_map[key]].nil?
           self.send("#{key}=", _deserialize(type, attributes[self.class.attribute_map[key]]))
-        end
+        end # or else data not found in attributes(hash), not an issue as the data can be optional
       end
 
       self
@@ -137,8 +129,8 @@ module OryOathkeeperClient
     # @return [Object] Deserialized data
     def _deserialize(type, value)
       case type.to_sym
-      when :Time
-        Time.parse(value)
+      when :DateTime
+        DateTime.parse(value)
       when :Date
         Date.parse(value)
       when :String
@@ -168,9 +160,7 @@ module OryOathkeeperClient
           end
         end
       else # model
-        # models (e.g. Pet) or oneOf
-        klass = OryOathkeeperClient.const_get(type)
-        klass.respond_to?(:openapi_one_of) ? klass.build(value) : klass.build_from_hash(value)
+        OryHydraClient.const_get(type).build_from_hash(value)
       end
     end
 
@@ -196,7 +186,7 @@ module OryOathkeeperClient
           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
@@ -219,7 +209,5 @@ module OryOathkeeperClient
         value
       end
     end
-
   end
-
 end