Merge branch 'master' into patch-1

Author: jef

modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/AbstractKotlinCodegen.java

@@ -1119,6 +1119,8 @@ protected ImmutableMap.Builder<String, Mustache.Lambda> addMustacheLambdas() {
     }
 
     protected interface DataTypeAssigner {
+        void setIsVoid(Boolean isVoid);
+
         void setReturnType(String returnType);
 
         void setReturnContainer(String returnContainer);
@@ -1131,6 +1133,7 @@ protected interface DataTypeAssigner {
     protected void doDataTypeAssignment(final String returnType, DataTypeAssigner dataTypeAssigner) {
         if (returnType == null) {
             dataTypeAssigner.setReturnType("Unit");
+            dataTypeAssigner.setIsVoid(true);
         } else if (returnType.startsWith("kotlin.collections.List")) {
             int end = returnType.lastIndexOf(">");
             if (end > 0) {

modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/KotlinServerCodegen.java

@@ -418,6 +418,11 @@ public OperationsMap postProcessOperationsWithModels(OperationsMap objs, List<Mo
                         }
 
                         doDataTypeAssignment(resp.dataType, new DataTypeAssigner() {
+                            @Override
+                            public void setIsVoid(Boolean isVoid) {
+                                resp.isVoid = isVoid;
+                            }
+
                             @Override
                             public void setReturnType(final String returnType) {
                                 resp.dataType = returnType;
@@ -432,6 +437,10 @@ public void setReturnContainer(final String returnContainer) {
                 }
 
                 doDataTypeAssignment(operation.returnType, new DataTypeAssigner() {
+                    @Override
+                    public void setIsVoid(Boolean isVoid) {
+                        operation.isVoid = isVoid;
+                    }
 
                     @Override
                     public void setReturnType(final String returnType) {

modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/KotlinSpringServerCodegen.java

@@ -880,6 +880,11 @@ public OperationsMap postProcessOperationsWithModels(OperationsMap objs, List<Mo
                         resp.baseType = getNonMutableContainerTypeIfNeeded(resp.baseType);
 
                         doDataTypeAssignment(resp.dataType, new DataTypeAssigner() {
+                            @Override
+                            public void setIsVoid(Boolean isVoid) {
+                                resp.isVoid = isVoid;
+                            }
+
                             @Override
                             public void setReturnType(final String returnType) {
                                 resp.dataType = returnType;
@@ -904,6 +909,10 @@ public void setReturnContainer(final String returnContainer) {
                 }
 
                 doDataTypeAssignment(operation.returnType, new DataTypeAssigner() {
+                    @Override
+                    public void setIsVoid(Boolean isVoid) {
+                        operation.isVoid = isVoid;
+                    }
 
                     @Override
                     public void setReturnType(final String returnType) {

modules/openapi-generator/src/main/resources/ruby-client/partial_anyof_module.mustache

@@ -29,8 +29,7 @@
         openapi_any_of.each do |klass|
           begin
             next if klass == :AnyType # "nullable: true"
-            typed_data = find_and_cast_into_type(klass, data)
-            return typed_data if typed_data
+            return find_and_cast_into_type(klass, data)
           rescue # rescue all errors so we keep iterating even if the current item lookup raises
           end
         end

modules/openapi-generator/src/main/resources/ruby-client/partial_oneof_module.mustache

@@ -69,8 +69,7 @@
         openapi_one_of.each do |klass|
           begin
             next if klass == :AnyType # "nullable: true"
-            typed_data = find_and_cast_into_type(klass, data)
-            return typed_data if typed_data
+            return find_and_cast_into_type(klass, data)
           rescue # rescue all errors so we keep iterating even if the current item lookup raises
           end
         end

modules/openapi-generator/src/test/resources/3_0/ruby/petstore-with-fake-endpoints-models-for-testing.yaml

@@ -2162,3 +2162,33 @@ components:
           type: string
         type_:
           type: string
+    OneOfPrimitiveTypes:
+      oneOf:
+        - type: string
+        - type: number
+        - type: integer
+        - type: boolean
+        - type: string
+          format: date
+        - type: string
+          format: date-time
+        - type: array
+          items:
+            type: string
+        - type: array
+          items:
+            type: number
+        - type: array
+          items:
+            type: integer
+        - type: array
+          items:
+            type: boolean
+        - type: array
+          items:
+            type: string
+            format: date
+        - type: array
+          items:
+            type: string
+            format: date-time

samples/client/petstore/ruby-httpx/.openapi-generator/FILES

@@ -48,6 +48,7 @@ docs/Name.md
 docs/NullableClass.md
 docs/NumberOnly.md
 docs/ObjectWithDeprecatedFields.md
+docs/OneOfPrimitiveTypes.md
 docs/Order.md
 docs/OuterComposite.md
 docs/OuterEnum.md
@@ -118,6 +119,7 @@ lib/petstore/models/name.rb
 lib/petstore/models/nullable_class.rb
 lib/petstore/models/number_only.rb
 lib/petstore/models/object_with_deprecated_fields.rb
+lib/petstore/models/one_of_primitive_types.rb
 lib/petstore/models/order.rb
 lib/petstore/models/outer_composite.rb
 lib/petstore/models/outer_enum.rb

samples/client/petstore/ruby-httpx/README.md

@@ -164,6 +164,7 @@ Class | Method | HTTP request | Description
  - [Petstore::NullableClass](docs/NullableClass.md)
  - [Petstore::NumberOnly](docs/NumberOnly.md)
  - [Petstore::ObjectWithDeprecatedFields](docs/ObjectWithDeprecatedFields.md)
+ - [Petstore::OneOfPrimitiveTypes](docs/OneOfPrimitiveTypes.md)
  - [Petstore::Order](docs/Order.md)
  - [Petstore::OuterComposite](docs/OuterComposite.md)
  - [Petstore::OuterEnum](docs/OuterEnum.md)

samples/client/petstore/ruby-httpx/docs/OneOfPrimitiveTypes.md

@@ -0,0 +1,69 @@
+# Petstore::OneOfPrimitiveTypes
+
+## Class instance methods
+
+### `openapi_one_of`
+
+Returns the list of classes defined in oneOf.
+
+#### Example
+
+```ruby
+require 'petstore'
+
+Petstore::OneOfPrimitiveTypes.openapi_one_of
+# =>
+# [
+#   :'Array<Boolean>',
+#   :'Array<Date>',
+#   :'Array<Float>',
+#   :'Array<Integer>',
+#   :'Array<String>',
+#   :'Array<Time>',
+#   :'Boolean',
+#   :'Date',
+#   :'Float',
+#   :'Integer',
+#   :'String',
+#   :'Time'
+# ]
+```
+
+### build
+
+Find the appropriate object from the `openapi_one_of` list and casts the data into it.
+
+#### Example
+
+```ruby
+require 'petstore'
+
+Petstore::OneOfPrimitiveTypes.build(data)
+# => #<Array<Boolean>:0x00007fdd4aab02a0>
+
+Petstore::OneOfPrimitiveTypes.build(data_that_doesnt_match)
+# => nil
+```
+
+#### Parameters
+
+| Name | Type | Description |
+| ---- | ---- | ----------- |
+| **data** | **Mixed** | data to be matched against the list of oneOf items |
+
+#### Return type
+
+- `Array<Boolean>`
+- `Array<Date>`
+- `Array<Float>`
+- `Array<Integer>`
+- `Array<String>`
+- `Array<Time>`
+- `Boolean`
+- `Date`
+- `Float`
+- `Integer`
+- `String`
+- `Time`
+- `nil` (if no type matches)
+

samples/client/petstore/ruby-httpx/lib/petstore.rb

@@ -53,6 +53,7 @@
 require 'petstore/models/nullable_class'
 require 'petstore/models/number_only'
 require 'petstore/models/object_with_deprecated_fields'
+require 'petstore/models/one_of_primitive_types'
 require 'petstore/models/order'
 require 'petstore/models/outer_composite'
 require 'petstore/models/outer_enum'