handle anytype and objecttype for go-exerimental

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

@@ -155,6 +155,9 @@ public class CodegenProperty implements Cloneable, IJsonSchemaValidationProperti
     public boolean isDiscriminator;
     public List<String> _enum;
     public Map<String, Object> allowableValues;
+    // If 'additionalProperties' is not set, items is null.
+    // If 'additionalProperties' is set to a type or refers to a type, 'items' provides the type information for
+    // the undeclared properties. 
     public CodegenProperty items;
     public CodegenProperty mostInnerItems;
     public Map<String, Object> vendorExtensions = new HashMap<String, Object>();

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

@@ -604,14 +604,57 @@ private void setExportParameterName(List<CodegenParameter> codegenParameters) {
         }
     }
 
+    /**
+     * OAS type mapping to golang implementation:
+     * 
+     * AnyType                  interface{}                        Any type, e.g. null, string, integer, number, boolean, map, array.
+     * ObjectType               map[string]interface{}             Free-form object with no constraint on additional properties.
+     * map[string]Animal        map[string]Animal                  Free-form object. The value of undeclared properties must be 'Animal'.
+     * map[string]ObjectType    map[string]map[string]interface{}  Free-form object. The value of undeclared properties must be an object (map).
+     *                          map[string][]interface{}           Free-form object. The value of undeclared properties must be an array.
+     * 
+     */
     @Override
     public void postProcessModelProperty(CodegenModel model, CodegenProperty property) {
-        // The 'go-experimental/model.mustache' template conditionally generates accessor methods.
-        // For containers (e.g. Array, Map) and non-nullable primitive types, the generated code
-        // returns the type directly.
+        // The 'go-experimental/model.mustache' template generates accessor methods.
+        // For containers (e.g. Array, Map) and non-nullable primitive types, the go struct field
+        // is the underlying type, e.g. *int32, *string, *bool...
         // In other cases (nullable primitive types, free-form objects...), the generated code has
         // a wrapper type and a Get() function to access the underlying type.
-        if ((property.isNullable && !property.isContainer) || property.isFreeFormObject) {
+        boolean hasWrapper = false;
+        if (property.isAnyType) {
+            // The wrapper type is the 'AnyType' struct and the wrapped type is 'interface{}'.
+            hasWrapper = true;
+        } else if (property.isFreeFormObject && !property.isNullable) { // && 
+            // Undeclared properties use case.
+            // The undeclared properties are implemented using a go map.
+            // The map key is always a string.
+            // The map value is interface{} when there are no constraints, but the
+            // 'additionalProperties' attribute may require a specific type.
+            if (property.items == null) {
+                // The 'additionalProperties' attribute is not set, so it is a free-form object
+                // with no constraint on the type of undeclared properties.
+                // The wrapper type is 'ObjectType'.
+                // The wrapped type is 'map[string]interface{}'.
+                hasWrapper = true;
+            } else if (property.items.isFreeFormObject && !property.items.isNullable) {
+                // The 'additionalProperties' attribute is set, and the value of the undeclared
+                // properties must be a free-form object. Hence it's a map of map.
+                // The wrapper type is map[string]ObjectType.
+                // The wrapped type is 'map[string]map[string]interface{}'.
+                hasWrapper = true;
+            } else {
+                // The 'additionalProperties' attribute is set, and the value of the undeclared
+                // properties is not free-form. For example, if the undeclared properties must
+                // be of type 'Animal', then:
+                // The wrapper type is map[string]Animal.
+                // The wrapped type is 'map[string]Animal'.
+            }
+        } else if (property.isNullable && !property.isContainer) {
+            // Primitive types.
+            hasWrapper = true;
+        }
+        if (hasWrapper) {
             property.vendorExtensions.put("x-golang-has-wrapper", true);
         }
     }

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

@@ -177,17 +177,37 @@ public Map<String, Object> postProcessModels(Map<String, Object> objs) {
                 }
 
                 for (CodegenProperty param : model.vars) {
+                    // Two golang types are used in the generated code: the type of the
+                    // struct fields and the types of the getter and setter methods.
+                    // The struct fields may use a wrapper type (such as 'NullableBool'),
+                    // whereas the getter method returns the unwrapped type (e.g. 'bool').
+                    // param.dataType is the golang type of the generated struct field.
+                    // "x-go-base-type" is the type in the setter and getter functions.
+                    param.vendorExtensions.put("x-go-base-type", param.dataType);
+                    if (!param.vendorExtensions.containsKey("x-golang-has-wrapper")) {
+                        continue;
+                    }
                     if (param.isAnyType) {
                         param.vendorExtensions.put("x-go-base-type", "interface{}");
                         continue;
                     } else if (param.isFreeFormObject) {
-                        param.vendorExtensions.put("x-go-base-type", "map[string]interface{}");
-                        continue;
+                        switch (param.dataType) {
+                        case "ObjectType":
+                            param.vendorExtensions.put("x-go-base-type", "map[string]interface{}");
+                            continue;
+                        case "[]ObjectType":
+                            param.vendorExtensions.put("x-go-base-type", "map[string][]interface{}");
+                            continue;
+                        case "map[string]ObjectType":
+                            param.vendorExtensions.put("x-go-base-type", "map[string]map[string]interface{}");
+                            continue;
+                        }
                     }
-                    param.vendorExtensions.put("x-go-base-type", param.dataType);
+                    /*
                     if (!param.isNullable || param.isMapContainer || param.isListContainer) {
                         continue;
                     }
+                    */
                     if (param.isDateTime) {
                         // Note this could have been done by adding the following line in processOpts(),
                         // however, we only want to represent the DateTime object as NullableTime if

samples/openapi3/client/petstore/go-experimental/go-petstore/docs/NullableClass.md

@@ -343,20 +343,20 @@ HasArrayItemsNullable returns a boolean if a field has been set.
 
 ### GetObjectNullableProp
 
-`func (o *NullableClass) GetObjectNullableProp() map[string]interface{}`
+`func (o *NullableClass) GetObjectNullableProp() map[string]ObjectType`
 
 GetObjectNullableProp returns the ObjectNullableProp field if non-nil, zero value otherwise.
 
 ### GetObjectNullablePropOk
 
-`func (o *NullableClass) GetObjectNullablePropOk() (*map[string]interface{}, bool)`
+`func (o *NullableClass) GetObjectNullablePropOk() (*map[string]ObjectType, bool)`
 
 GetObjectNullablePropOk returns a tuple with the ObjectNullableProp field if it's non-nil, zero value otherwise
 and a boolean to check if the value has been set.
 
 ### SetObjectNullableProp
 
-`func (o *NullableClass) SetObjectNullableProp(v map[string]interface{})`
+`func (o *NullableClass) SetObjectNullableProp(v map[string]ObjectType)`
 
 SetObjectNullableProp sets ObjectNullableProp field to given value.
 
@@ -378,20 +378,20 @@ HasObjectNullableProp returns a boolean if a field has been set.
 UnsetObjectNullableProp ensures that no value is present for ObjectNullableProp, not even an explicit nil
 ### GetObjectAndItemsNullableProp
 
-`func (o *NullableClass) GetObjectAndItemsNullableProp() map[string]interface{}`
+`func (o *NullableClass) GetObjectAndItemsNullableProp() map[string]ObjectType`
 
 GetObjectAndItemsNullableProp returns the ObjectAndItemsNullableProp field if non-nil, zero value otherwise.
 
 ### GetObjectAndItemsNullablePropOk
 
-`func (o *NullableClass) GetObjectAndItemsNullablePropOk() (*map[string]interface{}, bool)`
+`func (o *NullableClass) GetObjectAndItemsNullablePropOk() (*map[string]ObjectType, bool)`
 
 GetObjectAndItemsNullablePropOk returns a tuple with the ObjectAndItemsNullableProp field if it's non-nil, zero value otherwise
 and a boolean to check if the value has been set.
 
 ### SetObjectAndItemsNullableProp
 
-`func (o *NullableClass) SetObjectAndItemsNullableProp(v map[string]interface{})`
+`func (o *NullableClass) SetObjectAndItemsNullableProp(v map[string]ObjectType)`
 
 SetObjectAndItemsNullableProp sets ObjectAndItemsNullableProp field to given value.
 
@@ -413,20 +413,20 @@ HasObjectAndItemsNullableProp returns a boolean if a field has been set.
 UnsetObjectAndItemsNullableProp ensures that no value is present for ObjectAndItemsNullableProp, not even an explicit nil
 ### GetObjectItemsNullable
 
-`func (o *NullableClass) GetObjectItemsNullable() map[string]interface{}`
+`func (o *NullableClass) GetObjectItemsNullable() map[string]ObjectType`
 
 GetObjectItemsNullable returns the ObjectItemsNullable field if non-nil, zero value otherwise.
 
 ### GetObjectItemsNullableOk
 
-`func (o *NullableClass) GetObjectItemsNullableOk() (*map[string]interface{}, bool)`
+`func (o *NullableClass) GetObjectItemsNullableOk() (*map[string]ObjectType, bool)`
 
 GetObjectItemsNullableOk returns a tuple with the ObjectItemsNullable field if it's non-nil, zero value otherwise
 and a boolean to check if the value has been set.
 
 ### SetObjectItemsNullable
 
-`func (o *NullableClass) SetObjectItemsNullable(v map[string]interface{})`
+`func (o *NullableClass) SetObjectItemsNullable(v map[string]ObjectType)`
 
 SetObjectItemsNullable sets ObjectItemsNullable field to given value.
 

samples/openapi3/client/petstore/go-experimental/go-petstore/go.mod

@@ -2,6 +2,4 @@ module github.com/GIT_USER_ID/GIT_REPO_ID
 
 go 1.13
 
-require (
-	golang.org/x/oauth2 v0.0.0-20190604053449-0f29369cfe45
-)
+require golang.org/x/oauth2 v0.0.0-20190604053449-0f29369cfe45

samples/openapi3/client/petstore/go-experimental/go-petstore/model_nullable_class.go

@@ -398,9 +398,9 @@ func (o *NullableClass) SetArrayItemsNullable(v []ObjectType) {
 }
 
 // GetObjectNullableProp returns the ObjectNullableProp field value if set, zero value otherwise (both if not set or set to explicit null).
-func (o *NullableClass) GetObjectNullableProp() map[string]interface{} {
+func (o *NullableClass) GetObjectNullableProp() map[string]ObjectType {
 	if o == nil  {
-		var ret map[string]interface{}
+		var ret map[string]ObjectType
 		return ret
 	}
 	return o.ObjectNullableProp
@@ -409,7 +409,7 @@ func (o *NullableClass) GetObjectNullableProp() map[string]interface{} {
 // GetObjectNullablePropOk returns a tuple with the ObjectNullableProp field value if set, nil otherwise
 // and a boolean to check if the value has been set.
 // NOTE: If the value is an explicit nil, `nil, true` will be returned
-func (o *NullableClass) GetObjectNullablePropOk() (*map[string]interface{}, bool) {
+func (o *NullableClass) GetObjectNullablePropOk() (*map[string]ObjectType, bool) {
 	if o == nil || o.ObjectNullableProp == nil {
 		return nil, false
 	}
@@ -426,14 +426,14 @@ func (o *NullableClass) HasObjectNullableProp() bool {
 }
 
 // SetObjectNullableProp gets a reference to the given map[string]ObjectType and assigns it to the ObjectNullableProp field.
-func (o *NullableClass) SetObjectNullableProp(v map[string]interface{}) {
+func (o *NullableClass) SetObjectNullableProp(v map[string]ObjectType) {
 	o.ObjectNullableProp = v
 }
 
 // GetObjectAndItemsNullableProp returns the ObjectAndItemsNullableProp field value if set, zero value otherwise (both if not set or set to explicit null).
-func (o *NullableClass) GetObjectAndItemsNullableProp() map[string]interface{} {
+func (o *NullableClass) GetObjectAndItemsNullableProp() map[string]ObjectType {
 	if o == nil  {
-		var ret map[string]interface{}
+		var ret map[string]ObjectType
 		return ret
 	}
 	return o.ObjectAndItemsNullableProp
@@ -442,7 +442,7 @@ func (o *NullableClass) GetObjectAndItemsNullableProp() map[string]interface{} {
 // GetObjectAndItemsNullablePropOk returns a tuple with the ObjectAndItemsNullableProp field value if set, nil otherwise
 // and a boolean to check if the value has been set.
 // NOTE: If the value is an explicit nil, `nil, true` will be returned
-func (o *NullableClass) GetObjectAndItemsNullablePropOk() (*map[string]interface{}, bool) {
+func (o *NullableClass) GetObjectAndItemsNullablePropOk() (*map[string]ObjectType, bool) {
 	if o == nil || o.ObjectAndItemsNullableProp == nil {
 		return nil, false
 	}
@@ -459,26 +459,26 @@ func (o *NullableClass) HasObjectAndItemsNullableProp() bool {
 }
 
 // SetObjectAndItemsNullableProp gets a reference to the given map[string]ObjectType and assigns it to the ObjectAndItemsNullableProp field.
-func (o *NullableClass) SetObjectAndItemsNullableProp(v map[string]interface{}) {
+func (o *NullableClass) SetObjectAndItemsNullableProp(v map[string]ObjectType) {
 	o.ObjectAndItemsNullableProp = v
 }
 
 // GetObjectItemsNullable returns the ObjectItemsNullable field value if set, zero value otherwise.
-func (o *NullableClass) GetObjectItemsNullable() map[string]interface{} {
+func (o *NullableClass) GetObjectItemsNullable() map[string]ObjectType {
 	if o == nil || o.ObjectItemsNullable == nil {
-		var ret map[string]interface{}
+		var ret map[string]ObjectType
 		return ret
 	}
-	return *o.ObjectItemsNullable.Get()
+	return *o.ObjectItemsNullable
 }
 
 // GetObjectItemsNullableOk returns a tuple with the ObjectItemsNullable field value if set, nil otherwise
 // and a boolean to check if the value has been set.
-func (o *NullableClass) GetObjectItemsNullableOk() (*map[string]interface{}, bool) {
+func (o *NullableClass) GetObjectItemsNullableOk() (*map[string]ObjectType, bool) {
 	if o == nil || o.ObjectItemsNullable == nil {
 		return nil, false
 	}
-	return o.ObjectItemsNullable.Get(), true
+	return o.ObjectItemsNullable, true
 }
 
 // HasObjectItemsNullable returns a boolean if a field has been set.
@@ -491,8 +491,8 @@ func (o *NullableClass) HasObjectItemsNullable() bool {
 }
 
 // SetObjectItemsNullable gets a reference to the given map[string]ObjectType and assigns it to the ObjectItemsNullable field.
-func (o *NullableClass) SetObjectItemsNullable(v map[string]interface{}) {
-	o.ObjectItemsNullable.Set(&v)
+func (o *NullableClass) SetObjectItemsNullable(v map[string]ObjectType) {
+	o.ObjectItemsNullable = &v
 }
 
 func (o NullableClass) MarshalJSON() ([]byte, error) {