[Golang] generate embedded structs and set supportsInheritance to true

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

@@ -48,6 +48,7 @@ public abstract class AbstractGoCodegen extends DefaultCodegen implements Codege
  public AbstractGoCodegen() {
  super();
 
+ supportsInheritance = true;
  hideGenerationTimestamp = Boolean.FALSE;
 
  defaultIncludes = new HashSet<String>(

modules/openapi-generator/src/main/resources/go-experimental/api.mustache

@@ -134,14 +134,16 @@ func (a *{{{classname}}}Service) {{{nickname}}}(ctx _context.Context{{#hasParams
 	{{#queryParams}}
 	{{#required}}
 	{{#isCollectionFormatMulti}}
-	t:={{paramName}}
-	if reflect.TypeOf(t).Kind() == reflect.Slice {
- s := reflect.ValueOf(t)
- for i := 0; i < s.Len(); i++ {
- localVarQueryParams.Add("{{baseName}}", parameterToString(s.Index(i), "{{#collectionFormat}}{{collectionFormat}}{{/collectionFormat}}"))
+	{
+ t:={{paramName}}
+ if reflect.TypeOf(t).Kind() == reflect.Slice {
+ s := reflect.ValueOf(t)
+ for i := 0; i < s.Len(); i++ {
+ localVarQueryParams.Add("{{baseName}}", parameterToString(s.Index(i), "{{#collectionFormat}}{{collectionFormat}}{{/collectionFormat}}"))
+ }
+ } else {
+ localVarQueryParams.Add("{{baseName}}", parameterToString(t, "{{#collectionFormat}}{{collectionFormat}}{{/collectionFormat}}"))
  }
-	} else {
- localVarQueryParams.Add("{{baseName}}", parameterToString(t, "{{#collectionFormat}}{{collectionFormat}}{{/collectionFormat}}"))
 	}
 	{{/isCollectionFormatMulti}}
 	{{^isCollectionFormatMulti}}

modules/openapi-generator/src/main/resources/go-experimental/model.mustache

@@ -55,6 +55,9 @@ func (v *Nullable{{{classname}}}) UnmarshalJSON(src []byte) error {
 {{^isEnum}}
 // {{classname}}{{#description}} {{{description}}}{{/description}}{{^description}} struct for {{{classname}}}{{/description}}
 type {{classname}} struct {
+{{#parent}}
+	{{{parent}}}
+{{/parent}}
 {{#vars}}
 {{^-first}}
 {{/-first}}

modules/openapi-generator/src/main/resources/go-experimental/model_doc.mustache

@@ -4,13 +4,13 @@
 
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
-{{#vars}}**{{name}}** | Pointer to {{#isPrimitiveType}}**{{{dataType}}}**{{/isPrimitiveType}}{{^isPrimitiveType}}[**{{{dataType}}}**]({{complexType}}.md){{/isPrimitiveType}} | {{description}} | {{^required}}[optional] {{/required}}{{#isReadOnly}}[readonly] {{/isReadOnly}}{{#defaultValue}}[default to {{{.}}}]{{/defaultValue}}
-{{/vars}}
+{{#allVars}}**{{name}}** | Pointer to {{#isPrimitiveType}}**{{{dataType}}}**{{/isPrimitiveType}}{{^isPrimitiveType}}[**{{{dataType}}}**]({{complexType}}.md){{/isPrimitiveType}} | {{description}} | {{^required}}[optional] {{/required}}{{#isReadOnly}}[readonly] {{/isReadOnly}}{{#defaultValue}}[default to {{{.}}}]{{/defaultValue}}
+{{/allVars}}
 
 {{^isEnum}}
 ## Methods
 
-{{#vars}}
+{{#allVars}}
 ### Get{{name}}
 
 `func (o *{{classname}}) Get{{name}}() {{dataType}}`
@@ -45,7 +45,7 @@ Set{{name}}ExplicitNull (un)sets {{name}} to be considered as explicit "null" va
 when serializing to JSON (pass true as argument to set this, false to unset)
 The {{name}} value is set to nil even if false is passed
 {{/isNullable}}
-{{/vars}}
+{{/allVars}}
 {{/isEnum}}
 
 [[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)

modules/openapi-generator/src/main/resources/go/model.mustache

@@ -29,14 +29,14 @@ const (
 {{^isEnum}}
 // {{classname}}{{#description}} {{{description}}}{{/description}}{{^description}} struct for {{{classname}}}{{/description}}
 type {{classname}} struct {
-{{#vars}}
+{{#allVars}}
 {{^-first}}
 {{/-first}}
 {{#description}}
 	// {{{description}}}
 {{/description}}
 	{{name}} {{#isNullable}}*{{/isNullable}}{{{dataType}}} `json:"{{baseName}}{{^required}},omitempty{{/required}}"{{#withXml}} xml:"{{baseName}}{{#isXmlAttribute}},attr{{/isXmlAttribute}}"{{/withXml}}{{#vendorExtensions.x-go-custom-tag}} {{{.}}}{{/vendorExtensions.x-go-custom-tag}}`
-{{/vars}}
+{{/allVars}}
 }
 {{/isEnum}}
 {{/model}}

modules/openapi-generator/src/main/resources/go/model_doc.mustache

@@ -4,8 +4,8 @@
 
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
-{{#vars}}**{{name}}** | {{#isNullable}}Pointer to {{/isNullable}}{{#isPrimitiveType}}**{{{dataType}}}**{{/isPrimitiveType}}{{^isPrimitiveType}}[**{{{dataType}}}**]({{complexType}}.md){{/isPrimitiveType}} | {{description}} | {{^required}}[optional] {{/required}}{{#isReadOnly}}[readonly] {{/isReadOnly}}{{#defaultValue}}[default to {{{.}}}]{{/defaultValue}}
-{{/vars}}
+{{#allVars}}**{{name}}** | {{#isNullable}}Pointer to {{/isNullable}}{{#isPrimitiveType}}**{{{dataType}}}**{{/isPrimitiveType}}{{^isPrimitiveType}}[**{{{dataType}}}**]({{complexType}}.md){{/isPrimitiveType}} | {{description}} | {{^required}}[optional] {{/required}}{{#isReadOnly}}[readonly] {{/isReadOnly}}{{#defaultValue}}[default to {{{.}}}]{{/defaultValue}}
+{{/allVars}}
 
 [[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/client/petstore/go-experimental/go-petstore/api_fake.go

@@ -1230,14 +1230,16 @@ func (a *FakeApiService) TestQueryParameterCollectionFormat(ctx _context.Context
 	localVarQueryParams.Add("ioutil", parameterToString(ioutil, "csv"))
 	localVarQueryParams.Add("http", parameterToString(http, "space"))
 	localVarQueryParams.Add("url", parameterToString(url, "csv"))
-	t:=context
-	if reflect.TypeOf(t).Kind() == reflect.Slice {
- s := reflect.ValueOf(t)
- for i := 0; i < s.Len(); i++ {
- localVarQueryParams.Add("context", parameterToString(s.Index(i), "multi"))
+	{
+ t:=context
+ if reflect.TypeOf(t).Kind() == reflect.Slice {
+ s := reflect.ValueOf(t)
+ for i := 0; i < s.Len(); i++ {
+ localVarQueryParams.Add("context", parameterToString(s.Index(i), "multi"))
+ }
+ } else {
+ localVarQueryParams.Add("context", parameterToString(t, "multi"))
  }
-	} else {
- localVarQueryParams.Add("context", parameterToString(t, "multi"))
 	}
 	// to determine the Content-Type header
 	localVarHTTPContentTypes := []string{}

samples/client/petstore/go-experimental/go-petstore/model_additional_properties_any_type.go

@@ -16,6 +16,7 @@ import (
 
 // AdditionalPropertiesAnyType struct for AdditionalPropertiesAnyType
 type AdditionalPropertiesAnyType struct {
+
 	Name *string `json:"name,omitempty"`
 }
 

samples/client/petstore/go-experimental/go-petstore/model_additional_properties_array.go

@@ -16,6 +16,7 @@ import (
 
 // AdditionalPropertiesArray struct for AdditionalPropertiesArray
 type AdditionalPropertiesArray struct {
+
 	Name *string `json:"name,omitempty"`
 }
 

samples/client/petstore/go-experimental/go-petstore/model_additional_properties_boolean.go

@@ -16,6 +16,7 @@ import (
 
 // AdditionalPropertiesBoolean struct for AdditionalPropertiesBoolean
 type AdditionalPropertiesBoolean struct {
+
 	Name *string `json:"name,omitempty"`
 }
 

samples/client/petstore/go-experimental/go-petstore/model_additional_properties_integer.go

@@ -16,6 +16,7 @@ import (
 
 // AdditionalPropertiesInteger struct for AdditionalPropertiesInteger
 type AdditionalPropertiesInteger struct {
+
 	Name *string `json:"name,omitempty"`
 }
 

samples/client/petstore/go-experimental/go-petstore/model_additional_properties_number.go

@@ -16,6 +16,7 @@ import (
 
 // AdditionalPropertiesNumber struct for AdditionalPropertiesNumber
 type AdditionalPropertiesNumber struct {
+
 	Name *string `json:"name,omitempty"`
 }
 

samples/client/petstore/go-experimental/go-petstore/model_additional_properties_object.go

@@ -16,6 +16,7 @@ import (
 
 // AdditionalPropertiesObject struct for AdditionalPropertiesObject
 type AdditionalPropertiesObject struct {
+
 	Name *string `json:"name,omitempty"`
 }
 

samples/client/petstore/go-experimental/go-petstore/model_additional_properties_string.go

@@ -16,6 +16,7 @@ import (
 
 // AdditionalPropertiesString struct for AdditionalPropertiesString
 type AdditionalPropertiesString struct {
+
 	Name *string `json:"name,omitempty"`
 }
 

samples/client/petstore/go-experimental/go-petstore/model_cat.go

@@ -16,59 +16,10 @@ import (
 
 // Cat struct for Cat
 type Cat struct {
-	ClassName string `json:"className"`
-	Color *string `json:"color,omitempty"`
+	Animal
 	Declawed *bool `json:"declawed,omitempty"`
 }
 
-// GetClassName returns the ClassName field value
-func (o *Cat) GetClassName() string {
-	if o == nil {
- var ret string
- return ret
-	}
-
-	return o.ClassName
-}
-
-// SetClassName sets field value
-func (o *Cat) SetClassName(v string) {
-	o.ClassName = v
-}
-
-// GetColor returns the Color field value if set, zero value otherwise.
-func (o *Cat) GetColor() string {
-	if o == nil || o.Color == nil {
- var ret string
- return ret
-	}
-	return *o.Color
-}
-
-// GetColorOk returns a tuple with the Color field value if set, zero value otherwise
-// and a boolean to check if the value has been set.
-func (o *Cat) GetColorOk() (string, bool) {
-	if o == nil || o.Color == nil {
- var ret string
- return ret, false
-	}
-	return *o.Color, true
-}
-
-// HasColor returns a boolean if a field has been set.
-func (o *Cat) HasColor() bool {
-	if o != nil && o.Color != nil {
- return true
-	}
-
-	return false
-}
-
-// SetColor gets a reference to the given string and assigns it to the Color field.
-func (o *Cat) SetColor(v string) {
-	o.Color = &v
-}
-
 // GetDeclawed returns the Declawed field value if set, zero value otherwise.
 func (o *Cat) GetDeclawed() bool {
 	if o == nil || o.Declawed == nil {

samples/client/petstore/go-experimental/go-petstore/model_dog.go

@@ -16,59 +16,10 @@ import (
 
 // Dog struct for Dog
 type Dog struct {
-	ClassName string `json:"className"`
-	Color *string `json:"color,omitempty"`
+	Animal
 	Breed *string `json:"breed,omitempty"`
 }
 
-// GetClassName returns the ClassName field value
-func (o *Dog) GetClassName() string {
-	if o == nil {
- var ret string
- return ret
-	}
-
-	return o.ClassName
-}
-
-// SetClassName sets field value
-func (o *Dog) SetClassName(v string) {
-	o.ClassName = v
-}
-
-// GetColor returns the Color field value if set, zero value otherwise.
-func (o *Dog) GetColor() string {
-	if o == nil || o.Color == nil {
- var ret string
- return ret
-	}
-	return *o.Color
-}
-
-// GetColorOk returns a tuple with the Color field value if set, zero value otherwise
-// and a boolean to check if the value has been set.
-func (o *Dog) GetColorOk() (string, bool) {
-	if o == nil || o.Color == nil {
- var ret string
- return ret, false
-	}
-	return *o.Color, true
-}
-
-// HasColor returns a boolean if a field has been set.
-func (o *Dog) HasColor() bool {
-	if o != nil && o.Color != nil {
- return true
-	}
-
-	return false
-}
-
-// SetColor gets a reference to the given string and assigns it to the Color field.
-func (o *Dog) SetColor(v string) {
-	o.Color = &v
-}
-
 // GetBreed returns the Breed field value if set, zero value otherwise.
 func (o *Dog) GetBreed() string {
 	if o == nil || o.Breed == nil {

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

@@ -1250,26 +1250,30 @@ func (a *FakeApiService) TestQueryParameterCollectionFormat(ctx _context.Context
 	localVarQueryParams := _neturl.Values{}
 	localVarFormParams := _neturl.Values{}
 
-	t:=pipe
-	if reflect.TypeOf(t).Kind() == reflect.Slice {
- s := reflect.ValueOf(t)
- for i := 0; i < s.Len(); i++ {
- localVarQueryParams.Add("pipe", parameterToString(s.Index(i), "multi"))
+	{
+ t:=pipe
+ if reflect.TypeOf(t).Kind() == reflect.Slice {
+ s := reflect.ValueOf(t)
+ for i := 0; i < s.Len(); i++ {
+ localVarQueryParams.Add("pipe", parameterToString(s.Index(i), "multi"))
+ }
+ } else {
+ localVarQueryParams.Add("pipe", parameterToString(t, "multi"))
  }
-	} else {
- localVarQueryParams.Add("pipe", parameterToString(t, "multi"))
 	}
 	localVarQueryParams.Add("ioutil", parameterToString(ioutil, "csv"))
 	localVarQueryParams.Add("http", parameterToString(http, "space"))
 	localVarQueryParams.Add("url", parameterToString(url, "csv"))
-	t:=context
-	if reflect.TypeOf(t).Kind() == reflect.Slice {
- s := reflect.ValueOf(t)
- for i := 0; i < s.Len(); i++ {
- localVarQueryParams.Add("context", parameterToString(s.Index(i), "multi"))
+	{
+ t:=context
+ if reflect.TypeOf(t).Kind() == reflect.Slice {
+ s := reflect.ValueOf(t)
+ for i := 0; i < s.Len(); i++ {
+ localVarQueryParams.Add("context", parameterToString(s.Index(i), "multi"))
+ }
+ } else {
+ localVarQueryParams.Add("context", parameterToString(t, "multi"))
  }
-	} else {
- localVarQueryParams.Add("context", parameterToString(t, "multi"))
 	}
 	// to determine the Content-Type header
 	localVarHTTPContentTypes := []string{}

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

@@ -8,7 +8,7 @@ Name | Type | Description | Notes
 **EnumStringRequired** | Pointer to **string** | | 
 **EnumInteger** | Pointer to **int32** | | [optional] 
 **EnumNumber** | Pointer to **float64** | | [optional] 
-**OuterEnum** | Pointer to [**NullableOuterEnum**](OuterEnum.md) | | [optional] 
+**OuterEnum** | Pointer to [**OuterEnum**](OuterEnum.md) | | [optional] 
 **OuterEnumInteger** | Pointer to [**OuterEnumInteger**](OuterEnumInteger.md) | | [optional] 
 **OuterEnumDefaultValue** | Pointer to [**OuterEnumDefaultValue**](OuterEnumDefaultValue.md) | | [optional] 
 **OuterEnumIntegerDefaultValue** | Pointer to [**OuterEnumIntegerDefaultValue**](OuterEnumIntegerDefaultValue.md) | | [optional] 
@@ -117,13 +117,13 @@ SetEnumNumber gets a reference to the given float64 and assigns it to the EnumNu
 
 ### GetOuterEnum
 
-`func (o *EnumTest) GetOuterEnum() NullableOuterEnum`
+`func (o *EnumTest) GetOuterEnum() OuterEnum`
 
 GetOuterEnum returns the OuterEnum field if non-nil, zero value otherwise.
 
 ### GetOuterEnumOk
 
-`func (o *EnumTest) GetOuterEnumOk() (NullableOuterEnum, bool)`
+`func (o *EnumTest) GetOuterEnumOk() (OuterEnum, bool)`
 
 GetOuterEnumOk returns a tuple with the OuterEnum field if it's non-nil, zero value otherwise
 and a boolean to check if the value has been set.
@@ -136,9 +136,9 @@ HasOuterEnum returns a boolean if a field has been set.
 
 ### SetOuterEnum
 
-`func (o *EnumTest) SetOuterEnum(v NullableOuterEnum)`
+`func (o *EnumTest) SetOuterEnum(v OuterEnum)`
 
-SetOuterEnum gets a reference to the given NullableOuterEnum and assigns it to the OuterEnum field.
+SetOuterEnum gets a reference to the given OuterEnum and assigns it to the OuterEnum field.
 
 ### SetOuterEnumExplicitNull