Skip to content

[Go][Experimental] Support additionalProperties #6525

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
wing328 merged 3 commits into from
Jun 4, 2020
Merged

[Go][Experimental] Support additionalProperties #6525

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
89e67f6
support additonal properties in go
wing328 Jun 3, 2020
d918d53
support additonal properties marshal in go exp
wing328 Jun 3, 2020
161f57b
update go samples
wing328 Jun 3, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
support additonal properties marshal in go exp
  • Loading branch information
@wing328
wing328 committed Jun 3, 2020
commit d918d53787d22cf7866d49268cb2ccdf192d396d
35 changes: 21 additions & 14 deletions modules/openapi-generator/src/main/resources/go-experimental/model_simple.mustache
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ type {{classname}} struct {
{{name}} {{^required}}{{^isNullable}}*{{/isNullable}}{{/required}}{{{dataType}}} `json:"{{baseName}}{{^required}},omitempty{{/required}}"{{#withXml}} xml:"{{baseName}}{{#isXmlAttribute}},attr{{/isXmlAttribute}}"{{/withXml}}{{#vendorExtensions.x-go-custom-tag}} {{{.}}}{{/vendorExtensions.x-go-custom-tag}}`
{{/vars}}
{{#vendorExtensions.x-additional-properties}}
AdditionalProperties map[string]interface{}
AdditionalProperties map[string]interface{}
{{/vendorExtensions.x-additional-properties}}
}

Expand Down Expand Up @@ -253,27 +253,34 @@ func (o {{classname}}) MarshalJSON() ([]byte, error) {
}
{{/isNullable}}
{{/vars}}
{{#vendorExtensions.x-additional-properties}}

for key, value := range o.AdditionalProperties {
toSerialize[key] = value
}

{{/vendorExtensions.x-additional-properties}}
return json.Marshal(toSerialize)
}

{{#vendorExtensions.x-additional-properties}}
func (f *{{{classname}}}) UnmarshalJSON(bytes []byte) (err error) {
var{{{classname}}} := _{{{classname}}}{}
func (o *{{{classname}}}) UnmarshalJSON(bytes []byte) (err error) {
var{{{classname}}} := _{{{classname}}}{}

if err = json.Unmarshal(bytes, &var{{{classname}}}); err == nil {
*f = {{{classname}}}(var{{{classname}}})
}
if err = json.Unmarshal(bytes, &var{{{classname}}}); err == nil {
*o = {{{classname}}}(var{{{classname}}})
}

additionalProperties := make(map[string]interface{})
additionalProperties := make(map[string]interface{})

if err = json.Unmarshal(bytes, &additionalProperties); err == nil {
{{#vars}}
delete(additionalProperties, "{{{baseName}}}")
{{/vars}}
f.AdditionalProperties = additionalProperties
}
if err = json.Unmarshal(bytes, &additionalProperties); err == nil {
{{#vars}}
delete(additionalProperties, "{{{baseName}}}")
{{/vars}}
o.AdditionalProperties = additionalProperties
}

return err
return err
}

{{/vendorExtensions.x-additional-properties}}
Expand Down
29 changes: 17 additions & 12 deletions samples/openapi3/client/petstore/go-experimental/go-petstore/model_banana.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ import (
// Banana struct for Banana
type Banana struct {
LengthCm *float32 `json:"lengthCm,omitempty"`
AdditionalProperties map[string]interface{}
AdditionalProperties map[string]interface{}
}

type _Banana Banana
Expand Down Expand Up @@ -75,24 +75,29 @@ func (o Banana) MarshalJSON() ([]byte, error) {
if o.LengthCm != nil {
toSerialize["lengthCm"] = o.LengthCm
}

for key, value := range o.AdditionalProperties {
toSerialize[key] = value
}

return json.Marshal(toSerialize)
}

func (f *Banana) UnmarshalJSON(bytes []byte) (err error) {
varBanana := _Banana{}
func (o *Banana) UnmarshalJSON(bytes []byte) (err error) {
varBanana := _Banana{}

if err = json.Unmarshal(bytes, &varBanana); err == nil {
*f = Banana(varBanana)
}
if err = json.Unmarshal(bytes, &varBanana); err == nil {
*o = Banana(varBanana)
}

additionalProperties := make(map[string]interface{})
additionalProperties := make(map[string]interface{})

if err = json.Unmarshal(bytes, &additionalProperties); err == nil {
delete(additionalProperties, "lengthCm")
f.AdditionalProperties = additionalProperties
}
if err = json.Unmarshal(bytes, &additionalProperties); err == nil {
delete(additionalProperties, "lengthCm")
o.AdditionalProperties = additionalProperties
}

return err
return err
}

type NullableBanana struct {
Expand Down
59 changes: 32 additions & 27 deletions samples/openapi3/client/petstore/go-experimental/go-petstore/model_nullable_class.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ type NullableClass struct {
ObjectNullableProp map[string]map[string]interface{} `json:"object_nullable_prop,omitempty"`
ObjectAndItemsNullableProp map[string]map[string]interface{} `json:"object_and_items_nullable_prop,omitempty"`
ObjectItemsNullable *map[string]map[string]interface{} `json:"object_items_nullable,omitempty"`
AdditionalProperties map[string]interface{}
AdditionalProperties map[string]interface{}
}

type _NullableClass NullableClass
Expand Down Expand Up @@ -536,35 +536,40 @@ func (o NullableClass) MarshalJSON() ([]byte, error) {
if o.ObjectItemsNullable != nil {
toSerialize["object_items_nullable"] = o.ObjectItemsNullable
}

for key, value := range o.AdditionalProperties {
toSerialize[key] = value
}

return json.Marshal(toSerialize)
}

func (f *NullableClass) UnmarshalJSON(bytes []byte) (err error) {
varNullableClass := _NullableClass{}

if err = json.Unmarshal(bytes, &varNullableClass); err == nil {
*f = NullableClass(varNullableClass)
}

additionalProperties := make(map[string]interface{})

if err = json.Unmarshal(bytes, &additionalProperties); err == nil {
delete(additionalProperties, "integer_prop")
delete(additionalProperties, "number_prop")
delete(additionalProperties, "boolean_prop")
delete(additionalProperties, "string_prop")
delete(additionalProperties, "date_prop")
delete(additionalProperties, "datetime_prop")
delete(additionalProperties, "array_nullable_prop")
delete(additionalProperties, "array_and_items_nullable_prop")
delete(additionalProperties, "array_items_nullable")
delete(additionalProperties, "object_nullable_prop")
delete(additionalProperties, "object_and_items_nullable_prop")
delete(additionalProperties, "object_items_nullable")
f.AdditionalProperties = additionalProperties
}

return err
func (o *NullableClass) UnmarshalJSON(bytes []byte) (err error) {
varNullableClass := _NullableClass{}

if err = json.Unmarshal(bytes, &varNullableClass); err == nil {
*o = NullableClass(varNullableClass)
}

additionalProperties := make(map[string]interface{})

if err = json.Unmarshal(bytes, &additionalProperties); err == nil {
delete(additionalProperties, "integer_prop")
delete(additionalProperties, "number_prop")
delete(additionalProperties, "boolean_prop")
delete(additionalProperties, "string_prop")
delete(additionalProperties, "date_prop")
delete(additionalProperties, "datetime_prop")
delete(additionalProperties, "array_nullable_prop")
delete(additionalProperties, "array_and_items_nullable_prop")
delete(additionalProperties, "array_items_nullable")
delete(additionalProperties, "object_nullable_prop")
delete(additionalProperties, "object_and_items_nullable_prop")
delete(additionalProperties, "object_items_nullable")
o.AdditionalProperties = additionalProperties
}

return err
}

type NullableNullableClass struct {
Expand Down
6 changes: 5 additions & 1 deletion samples/openapi3/client/petstore/go-experimental/model_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ func TestBanana(t *testing.T) {
assert.Equal(newBanana.LengthCm, &lengthCm2, "Banana LengthCm should be equal")

// test additioanl properties
jsonBanana:= `{"lengthCm": 3.1, "fruits": ["apple", "peach"]}`
jsonBanana:= `{"fruits":["apple","peach"],"lengthCm":3.1}`
jsonMap := make(map[string]interface{})
json.Unmarshal([]byte(jsonBanana), &jsonMap)

Expand All @@ -26,5 +26,9 @@ func TestBanana(t *testing.T) {
json.Unmarshal([]byte(jsonBanana), &newBanana2)
assert.Equal(newBanana2.LengthCm, &lengthCm3, "Banana2 LengthCm should be equal")
assert.Equal(newBanana2.AdditionalProperties["fruits"], jsonMap["fruits"], "Banana2 AdditonalProperties should be equal")

newBanana2Json, _ := json.Marshal(newBanana2)
assert.Equal(string(newBanana2Json), jsonBanana, "Banana2 JSON string should be equal")

}