[Ruby] openapi_nullable as a Set and skipping attrs fix

OpenAPITools · Nov 6, 2019 · ccc0f79 · ccc0f79
1 parent a2cfa44
commit ccc0f79
Show file tree

Hide file tree

Showing 178 changed files with 1,264 additions and 556 deletions.
diff --git a/modules/openapi-generator/src/main/resources/ruby-client/base_object.mustache b/modules/openapi-generator/src/main/resources/ruby-client/base_object.mustache
@@ -87,7 +87,11 @@
       hash = {{^parent}}{}{{/parent}}{{#parent}}super{{/parent}}
       self.class.attribute_map.each_pair do |attr, param|
         value = self.send(attr)
-        next if value.nil? && !self.class.openapi_nullable.include?(attr)
+        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

diff --git a/modules/openapi-generator/src/main/resources/ruby-client/partial_model_generic.mustache b/modules/openapi-generator/src/main/resources/ruby-client/partial_model_generic.mustache
@@ -53,13 +53,13 @@
 
     # List of attributes with nullable: true
     def self.openapi_nullable
-      [
+      Set.new([
         {{#vars}}
         {{#isNullable}}
-          :'{{{name}}}'{{#hasMore}},{{/hasMore}}
+        :'{{{name}}}'{{#hasMore}},{{/hasMore}}
         {{/isNullable}}
         {{/vars}}
-      ]
+      ])
     end
 
     {{#anyOf}}

diff --git a/samples/client/petstore/ruby-faraday/lib/petstore/models/additional_properties_any_type.rb b/samples/client/petstore/ruby-faraday/lib/petstore/models/additional_properties_any_type.rb
@@ -32,8 +32,8 @@ def self.openapi_types
 
     # List of attributes with nullable: true
     def self.openapi_nullable
-      [
-      ]
+      Set.new([
+      ])
     end
 
     # Initializes the object
@@ -175,7 +175,11 @@ def to_hash
       hash = {}
       self.class.attribute_map.each_pair do |attr, param|
         value = self.send(attr)
-        next if value.nil? && !self.class.openapi_nullable.include?(attr)
+        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

diff --git a/samples/client/petstore/ruby-faraday/lib/petstore/models/additional_properties_array.rb b/samples/client/petstore/ruby-faraday/lib/petstore/models/additional_properties_array.rb
@@ -32,8 +32,8 @@ def self.openapi_types
 
     # List of attributes with nullable: true
     def self.openapi_nullable
-      [
-      ]
+      Set.new([
+      ])
     end
 
     # Initializes the object
@@ -175,7 +175,11 @@ def to_hash
       hash = {}
       self.class.attribute_map.each_pair do |attr, param|
         value = self.send(attr)
-        next if value.nil? && !self.class.openapi_nullable.include?(attr)
+        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

diff --git a/samples/client/petstore/ruby-faraday/lib/petstore/models/additional_properties_boolean.rb b/samples/client/petstore/ruby-faraday/lib/petstore/models/additional_properties_boolean.rb
@@ -32,8 +32,8 @@ def self.openapi_types
 
     # List of attributes with nullable: true
     def self.openapi_nullable
-      [
-      ]
+      Set.new([
+      ])
     end
 
     # Initializes the object
@@ -175,7 +175,11 @@ def to_hash
       hash = {}
       self.class.attribute_map.each_pair do |attr, param|
         value = self.send(attr)
-        next if value.nil? && !self.class.openapi_nullable.include?(attr)
+        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

diff --git a/samples/client/petstore/ruby-faraday/lib/petstore/models/additional_properties_class.rb b/samples/client/petstore/ruby-faraday/lib/petstore/models/additional_properties_class.rb
@@ -72,8 +72,8 @@ def self.openapi_types
 
     # List of attributes with nullable: true
     def self.openapi_nullable
-      [
-      ]
+      Set.new([
+      ])
     end
 
     # Initializes the object
@@ -281,7 +281,11 @@ def to_hash
       hash = {}
       self.class.attribute_map.each_pair do |attr, param|
         value = self.send(attr)
-        next if value.nil? && !self.class.openapi_nullable.include?(attr)
+        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

diff --git a/samples/client/petstore/ruby-faraday/lib/petstore/models/additional_properties_integer.rb b/samples/client/petstore/ruby-faraday/lib/petstore/models/additional_properties_integer.rb
@@ -32,8 +32,8 @@ def self.openapi_types
 
     # List of attributes with nullable: true
     def self.openapi_nullable
-      [
-      ]
+      Set.new([
+      ])
     end
 
     # Initializes the object
@@ -175,7 +175,11 @@ def to_hash
       hash = {}
       self.class.attribute_map.each_pair do |attr, param|
         value = self.send(attr)
-        next if value.nil? && !self.class.openapi_nullable.include?(attr)
+        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

diff --git a/samples/client/petstore/ruby-faraday/lib/petstore/models/additional_properties_number.rb b/samples/client/petstore/ruby-faraday/lib/petstore/models/additional_properties_number.rb
@@ -32,8 +32,8 @@ def self.openapi_types
 
     # List of attributes with nullable: true
     def self.openapi_nullable
-      [
-      ]
+      Set.new([
+      ])
     end
 
     # Initializes the object
@@ -175,7 +175,11 @@ def to_hash
       hash = {}
       self.class.attribute_map.each_pair do |attr, param|
         value = self.send(attr)
-        next if value.nil? && !self.class.openapi_nullable.include?(attr)
+        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

diff --git a/samples/client/petstore/ruby-faraday/lib/petstore/models/additional_properties_object.rb b/samples/client/petstore/ruby-faraday/lib/petstore/models/additional_properties_object.rb
@@ -32,8 +32,8 @@ def self.openapi_types
 
     # List of attributes with nullable: true
     def self.openapi_nullable
-      [
-      ]
+      Set.new([
+      ])
     end
 
     # Initializes the object
@@ -175,7 +175,11 @@ def to_hash
       hash = {}
       self.class.attribute_map.each_pair do |attr, param|
         value = self.send(attr)
-        next if value.nil? && !self.class.openapi_nullable.include?(attr)
+        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

diff --git a/samples/client/petstore/ruby-faraday/lib/petstore/models/additional_properties_string.rb b/samples/client/petstore/ruby-faraday/lib/petstore/models/additional_properties_string.rb
@@ -32,8 +32,8 @@ def self.openapi_types
 
     # List of attributes with nullable: true
     def self.openapi_nullable
-      [
-      ]
+      Set.new([
+      ])
     end
 
     # Initializes the object
@@ -175,7 +175,11 @@ def to_hash
       hash = {}
       self.class.attribute_map.each_pair do |attr, param|
         value = self.send(attr)
-        next if value.nil? && !self.class.openapi_nullable.include?(attr)
+        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

diff --git a/samples/client/petstore/ruby-faraday/lib/petstore/models/animal.rb b/samples/client/petstore/ruby-faraday/lib/petstore/models/animal.rb
@@ -36,8 +36,8 @@ def self.openapi_types
 
     # List of attributes with nullable: true
     def self.openapi_nullable
-      [
-      ]
+      Set.new([
+      ])
     end
 
     # discriminator's property name in OpenAPI v3
@@ -196,7 +196,11 @@ def to_hash
       hash = {}
       self.class.attribute_map.each_pair do |attr, param|
         value = self.send(attr)
-        next if value.nil? && !self.class.openapi_nullable.include?(attr)
+        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

diff --git a/samples/client/petstore/ruby-faraday/lib/petstore/models/api_response.rb b/samples/client/petstore/ruby-faraday/lib/petstore/models/api_response.rb
@@ -40,8 +40,8 @@ def self.openapi_types
 
     # List of attributes with nullable: true
     def self.openapi_nullable
-      [
-      ]
+      Set.new([
+      ])
     end
 
     # Initializes the object
@@ -193,7 +193,11 @@ def to_hash
       hash = {}
       self.class.attribute_map.each_pair do |attr, param|
         value = self.send(attr)
-        next if value.nil? && !self.class.openapi_nullable.include?(attr)
+        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

diff --git a/samples/client/petstore/ruby-faraday/lib/petstore/models/array_of_array_of_number_only.rb b/samples/client/petstore/ruby-faraday/lib/petstore/models/array_of_array_of_number_only.rb
@@ -32,8 +32,8 @@ def self.openapi_types
 
     # List of attributes with nullable: true
     def self.openapi_nullable
-      [
-      ]
+      Set.new([
+      ])
     end
 
     # Initializes the object
@@ -177,7 +177,11 @@ def to_hash
       hash = {}
       self.class.attribute_map.each_pair do |attr, param|
         value = self.send(attr)
-        next if value.nil? && !self.class.openapi_nullable.include?(attr)
+        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

diff --git a/samples/client/petstore/ruby-faraday/lib/petstore/models/array_of_number_only.rb b/samples/client/petstore/ruby-faraday/lib/petstore/models/array_of_number_only.rb
@@ -32,8 +32,8 @@ def self.openapi_types
 
     # List of attributes with nullable: true
     def self.openapi_nullable
-      [
-      ]
+      Set.new([
+      ])
     end
 
     # Initializes the object
@@ -177,7 +177,11 @@ def to_hash
       hash = {}
       self.class.attribute_map.each_pair do |attr, param|
         value = self.send(attr)
-        next if value.nil? && !self.class.openapi_nullable.include?(attr)
+        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

diff --git a/samples/client/petstore/ruby-faraday/lib/petstore/models/array_test.rb b/samples/client/petstore/ruby-faraday/lib/petstore/models/array_test.rb
@@ -40,8 +40,8 @@ def self.openapi_types
 
     # List of attributes with nullable: true
     def self.openapi_nullable
-      [
-      ]
+      Set.new([
+      ])
     end
 
     # Initializes the object
@@ -199,7 +199,11 @@ def to_hash
       hash = {}
       self.class.attribute_map.each_pair do |attr, param|
         value = self.send(attr)
-        next if value.nil? && !self.class.openapi_nullable.include?(attr)
+        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

diff --git a/samples/client/petstore/ruby-faraday/lib/petstore/models/capitalization.rb b/samples/client/petstore/ruby-faraday/lib/petstore/models/capitalization.rb
@@ -53,8 +53,8 @@ def self.openapi_types
 
     # List of attributes with nullable: true
     def self.openapi_nullable
-      [
-      ]
+      Set.new([
+      ])
     end
 
     # Initializes the object
@@ -221,7 +221,11 @@ def to_hash
       hash = {}
       self.class.attribute_map.each_pair do |attr, param|
         value = self.send(attr)
-        next if value.nil? && !self.class.openapi_nullable.include?(attr)
+        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

diff --git a/samples/client/petstore/ruby-faraday/lib/petstore/models/cat.rb b/samples/client/petstore/ruby-faraday/lib/petstore/models/cat.rb
@@ -32,8 +32,8 @@ def self.openapi_types
 
     # List of attributes with nullable: true
     def self.openapi_nullable
-      [
-      ]
+      Set.new([
+      ])
     end
 
     # List of class defined in allOf (OpenAPI v3)
@@ -187,7 +187,11 @@ def to_hash
       hash = super
       self.class.attribute_map.each_pair do |attr, param|
         value = self.send(attr)
-        next if value.nil? && !self.class.openapi_nullable.include?(attr)
+        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