postpone require models with parent (#9103)

OpenAPITools · Mar 29, 2021 · 9fb97c6 · 9fb97c6
1 parent fe52529
commit 9fb97c6
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 6 deletions.
diff --git a/modules/openapi-generator/src/main/resources/ruby-client/gem.mustache b/modules/openapi-generator/src/main/resources/ruby-client/gem.mustache
@@ -11,7 +11,17 @@ require '{{gemName}}/configuration'
 # Models
 {{#models}}
 {{#model}}
-require '{{gemName}}/{{modelPackage}}/{{classFilename}}'{{/model}}
+{{^parent}}
+require '{{gemName}}/{{modelPackage}}/{{classFilename}}'
+{{/parent}}
+{{/model}}
+{{/models}}
+{{#models}}
+{{#model}}
+{{#parent}}
+require '{{gemName}}/{{modelPackage}}/{{classFilename}}'
+{{/parent}}
+{{/model}}
 {{/models}}
 
 # APIs

diff --git a/samples/client/petstore/ruby-faraday/lib/petstore.rb b/samples/client/petstore/ruby-faraday/lib/petstore.rb
@@ -24,12 +24,10 @@
 require 'petstore/models/array_of_number_only'
 require 'petstore/models/array_test'
 require 'petstore/models/capitalization'
-require 'petstore/models/cat'
 require 'petstore/models/cat_all_of'
 require 'petstore/models/category'
 require 'petstore/models/class_model'
 require 'petstore/models/client'
-require 'petstore/models/dog'
 require 'petstore/models/dog_all_of'
 require 'petstore/models/enum_arrays'
 require 'petstore/models/enum_class'
@@ -61,6 +59,8 @@
 require 'petstore/models/special_model_name'
 require 'petstore/models/tag'
 require 'petstore/models/user'
+require 'petstore/models/cat'
+require 'petstore/models/dog'
 
 # APIs
 require 'petstore/api/another_fake_api'

diff --git a/samples/client/petstore/ruby/lib/petstore.rb b/samples/client/petstore/ruby/lib/petstore.rb
@@ -24,12 +24,10 @@
 require 'petstore/models/array_of_number_only'
 require 'petstore/models/array_test'
 require 'petstore/models/capitalization'
-require 'petstore/models/cat'
 require 'petstore/models/cat_all_of'
 require 'petstore/models/category'
 require 'petstore/models/class_model'
 require 'petstore/models/client'
-require 'petstore/models/dog'
 require 'petstore/models/dog_all_of'
 require 'petstore/models/enum_arrays'
 require 'petstore/models/enum_class'
@@ -61,6 +59,8 @@
 require 'petstore/models/special_model_name'
 require 'petstore/models/tag'
 require 'petstore/models/user'
+require 'petstore/models/cat'
+require 'petstore/models/dog'
 
 # APIs
 require 'petstore/api/another_fake_api'

diff --git a/samples/openapi3/client/features/generate-alias-as-model/ruby-client/lib/petstore.rb b/samples/openapi3/client/features/generate-alias-as-model/ruby-client/lib/petstore.rb
@@ -17,8 +17,8 @@
 require 'petstore/configuration'
 
 # Models
-require 'petstore/models/array_alias'
 require 'petstore/models/map_alias'
+require 'petstore/models/array_alias'
 
 # APIs
 require 'petstore/api/usage_api'