[Go] Client Models using AllOf, OneOf, or AnyOf Correctly Include time and os imports (Attempt 2) (#14459)

* Currently, if a Model is an allOf the time and os imports are not correctly added to the generated file. This was introduced recently with a fix to not include those imports when the model is a composedSchema #13833. The logic in that fix was just slightly off as an allOf should be treated the same as a standard model.

If a model is an AllOf or does not have any composed schemas at all, the sub-models are in-lined defined in the struct. In this case, the standard logic of including the time and os imports apply.

If a model is a OneOf or AnyOf, the sub-models are included as pointers to the defined model. In this case, do not include those items in the logic of including time and os imports.

* Update example to include a time in an allOf

* Add back the accidentally removed nil check

Author: icubbon

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

@@ -634,9 +634,6 @@ public ModelsMap postProcessModels(ModelsMap objs) {
 
             List<CodegenProperty> inheritedProperties = new ArrayList<>();
             if (model.getComposedSchemas() != null) {
-                if (model.getComposedSchemas().getAllOf() != null) {
-                    inheritedProperties.addAll(model.getComposedSchemas().getAllOf());
-                }
                 if (model.getComposedSchemas().getAnyOf() != null) {
                     inheritedProperties.addAll(model.getComposedSchemas().getAnyOf());
                 }
@@ -646,22 +643,18 @@ public ModelsMap postProcessModels(ModelsMap objs) {
             }
 
             List<CodegenProperty> codegenProperties = new ArrayList<>();
-            if(model.getIsModel() || model.getComposedSchemas() == null) {
-                // If the model is a model, use model.vars as it only
-                // contains properties the generated struct will own itself.
-                // If model is no model and it has no composed schemas use
-                // model.vars.
+            if(model.getComposedSchemas() == null || (model.getComposedSchemas() != null && model.getComposedSchemas().getAllOf() != null)) {
+                // If the model is an allOf or does not have any composed schemas, then we can use the model's properties.
                 codegenProperties.addAll(model.vars);
             } else {
                 // If the model is no model, but is a
-                // allOf, anyOf or oneOf, add all first level options
-                // from allOf, anyOf or oneOf.
+                // anyOf or oneOf, add all first level options
+                // from anyOf or oneOf.
                 codegenProperties.addAll(inheritedProperties);
             }
 
             for (CodegenProperty cp : codegenProperties) {
-                if (!addedTimeImport && ("time.Time".equals(cp.dataType) ||
-                        (cp.items != null && "time.Time".equals(cp.items.dataType)))) {
+                if (!addedTimeImport && ("time.Time".equals(cp.dataType) || (cp.items != null && "time.Time".equals(cp.items.dataType)))) {
                     imports.add(createMapping("import", "time"));
                     addedTimeImport = true;
                 }
@@ -671,16 +664,10 @@ public ModelsMap postProcessModels(ModelsMap objs) {
                     addedOSImport = true;
                 }
             }
-
             if (this instanceof GoClientCodegen && model.isEnum) {
                 imports.add(createMapping("import", "fmt"));
             }
 
-            // if oneOf contains "time.Time" type
-            if (!addedTimeImport && model.oneOf != null && model.oneOf.contains("time.Time")) {
-                imports.add(createMapping("import", "time"));
-            }
-
             // if oneOf contains "null" type
             if (model.oneOf != null && !model.oneOf.isEmpty() && model.oneOf.contains("nil")) {
                 model.isNullable = true;

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

@@ -2051,3 +2051,10 @@ components:
       - type: string
       - format: date-time
         type: string
+    AllOfPrimitiveTypes:
+      allOf:
+      - type: object
+        properties: 
+          test: 
+            type: string
+            format: date-time

samples/openapi3/client/petstore/go/go-petstore/.openapi-generator/FILES

@@ -12,6 +12,8 @@ api_user.go
 client.go
 configuration.go
 docs/AdditionalPropertiesClass.md
+docs/AllOfPrimitiveTypes.md
+docs/AllOfPrimitiveTypesAllOf.md
 docs/Animal.md
 docs/AnotherFakeApi.md
 docs/ApiResponse.md
@@ -88,6 +90,8 @@ model_200_response.go
 model__foo_get_default_response.go
 model__special_model_name_.go
 model_additional_properties_class.go
+model_all_of_primitive_types.go
+model_all_of_primitive_types_all_of.go
 model_animal.go
 model_api_response.go
 model_apple.go

samples/openapi3/client/petstore/go/go-petstore/README.md

@@ -123,6 +123,8 @@ Class | Method | HTTP request | Description
 ## Documentation For Models
 
  - [AdditionalPropertiesClass](docs/AdditionalPropertiesClass.md)
+ - [AllOfPrimitiveTypes](docs/AllOfPrimitiveTypes.md)
+ - [AllOfPrimitiveTypesAllOf](docs/AllOfPrimitiveTypesAllOf.md)
  - [Animal](docs/Animal.md)
  - [ApiResponse](docs/ApiResponse.md)
  - [Apple](docs/Apple.md)

samples/openapi3/client/petstore/go/go-petstore/api/openapi.yaml

@@ -2014,6 +2014,9 @@ components:
       - type: string
       - format: date-time
         type: string
+    AllOfPrimitiveTypes:
+      allOf:
+      - $ref: '#/components/schemas/AllOfPrimitiveTypes_allOf'
     _foo_get_default_response:
       example:
         string:
@@ -2176,6 +2179,13 @@ components:
           type: string
       type: object
       example: null
+    AllOfPrimitiveTypes_allOf:
+      properties:
+        test:
+          format: date-time
+          type: string
+      type: object
+      example: null
   securitySchemes:
     petstore_auth:
       flows:

samples/openapi3/client/petstore/go/go-petstore/docs/AllOfPrimitiveTypes.md

@@ -0,0 +1,56 @@
+# AllOfPrimitiveTypes
+
+## Properties
+
+Name | Type | Description | Notes
+------------ | ------------- | ------------- | -------------
+**Test** | Pointer to **time.Time** |  | [optional] 
+
+## Methods
+
+### NewAllOfPrimitiveTypes
+
+`func NewAllOfPrimitiveTypes() *AllOfPrimitiveTypes`
+
+NewAllOfPrimitiveTypes instantiates a new AllOfPrimitiveTypes object
+This constructor will assign default values to properties that have it defined,
+and makes sure properties required by API are set, but the set of arguments
+will change when the set of required properties is changed
+
+### NewAllOfPrimitiveTypesWithDefaults
+
+`func NewAllOfPrimitiveTypesWithDefaults() *AllOfPrimitiveTypes`
+
+NewAllOfPrimitiveTypesWithDefaults instantiates a new AllOfPrimitiveTypes object
+This constructor will only assign default values to properties that have it defined,
+but it doesn't guarantee that properties required by API are set
+
+### GetTest
+
+`func (o *AllOfPrimitiveTypes) GetTest() time.Time`
+
+GetTest returns the Test field if non-nil, zero value otherwise.
+
+### GetTestOk
+
+`func (o *AllOfPrimitiveTypes) GetTestOk() (*time.Time, bool)`
+
+GetTestOk returns a tuple with the Test field if it's non-nil, zero value otherwise
+and a boolean to check if the value has been set.
+
+### SetTest
+
+`func (o *AllOfPrimitiveTypes) SetTest(v time.Time)`
+
+SetTest sets Test field to given value.
+
+### HasTest
+
+`func (o *AllOfPrimitiveTypes) HasTest() bool`
+
+HasTest returns a boolean if a field has been set.
+
+
+[[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
+
+

samples/openapi3/client/petstore/go/go-petstore/docs/AllOfPrimitiveTypesAllOf.md

@@ -0,0 +1,56 @@
+# AllOfPrimitiveTypesAllOf
+
+## Properties
+
+Name | Type | Description | Notes
+------------ | ------------- | ------------- | -------------
+**Test** | Pointer to **time.Time** |  | [optional] 
+
+## Methods
+
+### NewAllOfPrimitiveTypesAllOf
+
+`func NewAllOfPrimitiveTypesAllOf() *AllOfPrimitiveTypesAllOf`
+
+NewAllOfPrimitiveTypesAllOf instantiates a new AllOfPrimitiveTypesAllOf object
+This constructor will assign default values to properties that have it defined,
+and makes sure properties required by API are set, but the set of arguments
+will change when the set of required properties is changed
+
+### NewAllOfPrimitiveTypesAllOfWithDefaults
+
+`func NewAllOfPrimitiveTypesAllOfWithDefaults() *AllOfPrimitiveTypesAllOf`
+
+NewAllOfPrimitiveTypesAllOfWithDefaults instantiates a new AllOfPrimitiveTypesAllOf object
+This constructor will only assign default values to properties that have it defined,
+but it doesn't guarantee that properties required by API are set
+
+### GetTest
+
+`func (o *AllOfPrimitiveTypesAllOf) GetTest() time.Time`
+
+GetTest returns the Test field if non-nil, zero value otherwise.
+
+### GetTestOk
+
+`func (o *AllOfPrimitiveTypesAllOf) GetTestOk() (*time.Time, bool)`
+
+GetTestOk returns a tuple with the Test field if it's non-nil, zero value otherwise
+and a boolean to check if the value has been set.
+
+### SetTest
+
+`func (o *AllOfPrimitiveTypesAllOf) SetTest(v time.Time)`
+
+SetTest sets Test field to given value.
+
+### HasTest
+
+`func (o *AllOfPrimitiveTypesAllOf) HasTest() bool`
+
+HasTest returns a boolean if a field has been set.
+
+
+[[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
+
+