Skip to content

[go-experimental] Fix issue with Nullable marshaling comparing value to empty string no matter the enum type #4712

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
jimschubert merged 1 commit into from
Dec 17, 2019
Merged

[go-experimental] Fix issue with Nullable marshaling comparing value to empty string no matter the enum type #4712

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
31 changes: 2 additions & 29 deletions modules/openapi-generator/src/main/resources/go-experimental/model.mustache
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,32 +25,6 @@ const (
{{/enumVars}}
{{/allowableValues}}
)

type Nullable{{{classname}}} struct {
Value {{{classname}}}
ExplicitNull bool
}

func (v Nullable{{{classname}}}) MarshalJSON() ([]byte, error) {
switch {
case v.ExplicitNull && v.Value != "":
return nil, ErrInvalidNullable
case v.ExplicitNull:
return []byte("null"), nil
default:
return json.Marshal(v.Value)
}
}

func (v *Nullable{{{classname}}}) UnmarshalJSON(src []byte) error {
if bytes.Equal(src, []byte("null")) {
v.ExplicitNull = true
return nil
}

return json.Unmarshal(src, &v.Value)
}

{{/isEnum}}
{{^isEnum}}
// {{classname}}{{#description}} {{{description}}}{{/description}}{{^description}} struct for {{{classname}}}{{/description}}
Expand Down Expand Up @@ -121,6 +95,7 @@ func (o *{{classname}}) Set{{name}}(v {{dataType}}) {

{{/required}}
{{/vars}}
{{/isEnum}}
type Nullable{{{classname}}} struct {
Value {{{classname}}}
ExplicitNull bool
Expand All @@ -132,7 +107,7 @@ func (v Nullable{{{classname}}}) MarshalJSON() ([]byte, error) {
return []byte("null"), nil
default:
return json.Marshal(v.Value)
}

@jirikuncar jirikuncar Dec 10, 2019

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

👍

}
}

func (v *Nullable{{{classname}}}) UnmarshalJSON(src []byte) error {
Expand All @@ -143,7 +118,5 @@ func (v *Nullable{{{classname}}}) UnmarshalJSON(src []byte) error {

return json.Unmarshal(src, &v.Value)
}
{{/isEnum}}

{{/model}}
{{/models}}
3 changes: 1 addition & 2 deletions samples/client/petstore/go-experimental/go-petstore/model_200_response.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -97,7 +97,7 @@ func (v NullableModel200Response) MarshalJSON() ([]byte, error) {
return []byte("null"), nil
default:
return json.Marshal(v.Value)
}
}
}

func (v *NullableModel200Response) UnmarshalJSON(src []byte) error {
Expand All @@ -108,4 +108,3 @@ func (v *NullableModel200Response) UnmarshalJSON(src []byte) error {

return json.Unmarshal(src, &v.Value)
}

3 changes: 1 addition & 2 deletions samples/client/petstore/go-experimental/go-petstore/model_additional_properties_any_type.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@ func (v NullableAdditionalPropertiesAnyType) MarshalJSON() ([]byte, error) {
return []byte("null"), nil
default:
return json.Marshal(v.Value)
}
}
}

func (v *NullableAdditionalPropertiesAnyType) UnmarshalJSON(src []byte) error {
Expand All @@ -74,4 +74,3 @@ func (v *NullableAdditionalPropertiesAnyType) UnmarshalJSON(src []byte) error {

return json.Unmarshal(src, &v.Value)
}

3 changes: 1 addition & 2 deletions samples/client/petstore/go-experimental/go-petstore/model_additional_properties_array.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@ func (v NullableAdditionalPropertiesArray) MarshalJSON() ([]byte, error) {
return []byte("null"), nil
default:
return json.Marshal(v.Value)
}
}
}

func (v *NullableAdditionalPropertiesArray) UnmarshalJSON(src []byte) error {
Expand All @@ -74,4 +74,3 @@ func (v *NullableAdditionalPropertiesArray) UnmarshalJSON(src []byte) error {

return json.Unmarshal(src, &v.Value)
}

3 changes: 1 addition & 2 deletions samples/client/petstore/go-experimental/go-petstore/model_additional_properties_boolean.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@ func (v NullableAdditionalPropertiesBoolean) MarshalJSON() ([]byte, error) {
return []byte("null"), nil
default:
return json.Marshal(v.Value)
}
}
}

func (v *NullableAdditionalPropertiesBoolean) UnmarshalJSON(src []byte) error {
Expand All @@ -74,4 +74,3 @@ func (v *NullableAdditionalPropertiesBoolean) UnmarshalJSON(src []byte) error {

return json.Unmarshal(src, &v.Value)
}

3 changes: 1 addition & 2 deletions samples/client/petstore/go-experimental/go-petstore/model_additional_properties_class.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -403,7 +403,7 @@ func (v NullableAdditionalPropertiesClass) MarshalJSON() ([]byte, error) {
return []byte("null"), nil
default:
return json.Marshal(v.Value)
}
}
}

func (v *NullableAdditionalPropertiesClass) UnmarshalJSON(src []byte) error {
Expand All @@ -414,4 +414,3 @@ func (v *NullableAdditionalPropertiesClass) UnmarshalJSON(src []byte) error {

return json.Unmarshal(src, &v.Value)
}

3 changes: 1 addition & 2 deletions samples/client/petstore/go-experimental/go-petstore/model_additional_properties_integer.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@ func (v NullableAdditionalPropertiesInteger) MarshalJSON() ([]byte, error) {
return []byte("null"), nil
default:
return json.Marshal(v.Value)
}
}
}

func (v *NullableAdditionalPropertiesInteger) UnmarshalJSON(src []byte) error {
Expand All @@ -74,4 +74,3 @@ func (v *NullableAdditionalPropertiesInteger) UnmarshalJSON(src []byte) error {

return json.Unmarshal(src, &v.Value)
}

3 changes: 1 addition & 2 deletions samples/client/petstore/go-experimental/go-petstore/model_additional_properties_number.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@ func (v NullableAdditionalPropertiesNumber) MarshalJSON() ([]byte, error) {
return []byte("null"), nil
default:
return json.Marshal(v.Value)
}
}
}

func (v *NullableAdditionalPropertiesNumber) UnmarshalJSON(src []byte) error {
Expand All @@ -74,4 +74,3 @@ func (v *NullableAdditionalPropertiesNumber) UnmarshalJSON(src []byte) error {

return json.Unmarshal(src, &v.Value)
}

3 changes: 1 addition & 2 deletions samples/client/petstore/go-experimental/go-petstore/model_additional_properties_object.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@ func (v NullableAdditionalPropertiesObject) MarshalJSON() ([]byte, error) {
return []byte("null"), nil
default:
return json.Marshal(v.Value)
}
}
}

func (v *NullableAdditionalPropertiesObject) UnmarshalJSON(src []byte) error {
Expand All @@ -74,4 +74,3 @@ func (v *NullableAdditionalPropertiesObject) UnmarshalJSON(src []byte) error {

return json.Unmarshal(src, &v.Value)
}

3 changes: 1 addition & 2 deletions samples/client/petstore/go-experimental/go-petstore/model_additional_properties_string.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@ func (v NullableAdditionalPropertiesString) MarshalJSON() ([]byte, error) {
return []byte("null"), nil
default:
return json.Marshal(v.Value)
}
}
}

func (v *NullableAdditionalPropertiesString) UnmarshalJSON(src []byte) error {
Expand All @@ -74,4 +74,3 @@ func (v *NullableAdditionalPropertiesString) UnmarshalJSON(src []byte) error {

return json.Unmarshal(src, &v.Value)
}

3 changes: 1 addition & 2 deletions samples/client/petstore/go-experimental/go-petstore/model_animal.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -79,7 +79,7 @@ func (v NullableAnimal) MarshalJSON() ([]byte, error) {
return []byte("null"), nil
default:
return json.Marshal(v.Value)
}
}
}

func (v *NullableAnimal) UnmarshalJSON(src []byte) error {
Expand All @@ -90,4 +90,3 @@ func (v *NullableAnimal) UnmarshalJSON(src []byte) error {

return json.Unmarshal(src, &v.Value)
}

3 changes: 1 addition & 2 deletions samples/client/petstore/go-experimental/go-petstore/model_api_response.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -131,7 +131,7 @@ func (v NullableApiResponse) MarshalJSON() ([]byte, error) {
return []byte("null"), nil
default:
return json.Marshal(v.Value)
}
}
}

func (v *NullableApiResponse) UnmarshalJSON(src []byte) error {
Expand All @@ -142,4 +142,3 @@ func (v *NullableApiResponse) UnmarshalJSON(src []byte) error {

return json.Unmarshal(src, &v.Value)
}

3 changes: 1 addition & 2 deletions samples/client/petstore/go-experimental/go-petstore/model_array_of_array_of_number_only.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@ func (v NullableArrayOfArrayOfNumberOnly) MarshalJSON() ([]byte, error) {
return []byte("null"), nil
default:
return json.Marshal(v.Value)
}
}
}

func (v *NullableArrayOfArrayOfNumberOnly) UnmarshalJSON(src []byte) error {
Expand All @@ -74,4 +74,3 @@ func (v *NullableArrayOfArrayOfNumberOnly) UnmarshalJSON(src []byte) error {

return json.Unmarshal(src, &v.Value)
}

3 changes: 1 addition & 2 deletions samples/client/petstore/go-experimental/go-petstore/model_array_of_number_only.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@ func (v NullableArrayOfNumberOnly) MarshalJSON() ([]byte, error) {
return []byte("null"), nil
default:
return json.Marshal(v.Value)
}
}
}

func (v *NullableArrayOfNumberOnly) UnmarshalJSON(src []byte) error {
Expand All @@ -74,4 +74,3 @@ func (v *NullableArrayOfNumberOnly) UnmarshalJSON(src []byte) error {

return json.Unmarshal(src, &v.Value)
}

3 changes: 1 addition & 2 deletions samples/client/petstore/go-experimental/go-petstore/model_array_test_.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -131,7 +131,7 @@ func (v NullableArrayTest) MarshalJSON() ([]byte, error) {
return []byte("null"), nil
default:
return json.Marshal(v.Value)
}
}
}

func (v *NullableArrayTest) UnmarshalJSON(src []byte) error {
Expand All @@ -142,4 +142,3 @@ func (v *NullableArrayTest) UnmarshalJSON(src []byte) error {

return json.Unmarshal(src, &v.Value)
}

3 changes: 1 addition & 2 deletions samples/client/petstore/go-experimental/go-petstore/model_capitalization.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -234,7 +234,7 @@ func (v NullableCapitalization) MarshalJSON() ([]byte, error) {
return []byte("null"), nil
default:
return json.Marshal(v.Value)
}
}
}

func (v *NullableCapitalization) UnmarshalJSON(src []byte) error {
Expand All @@ -245,4 +245,3 @@ func (v *NullableCapitalization) UnmarshalJSON(src []byte) error {

return json.Unmarshal(src, &v.Value)
}

3 changes: 1 addition & 2 deletions samples/client/petstore/go-experimental/go-petstore/model_cat.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -113,7 +113,7 @@ func (v NullableCat) MarshalJSON() ([]byte, error) {
return []byte("null"), nil
default:
return json.Marshal(v.Value)
}
}
}

func (v *NullableCat) UnmarshalJSON(src []byte) error {
Expand All @@ -124,4 +124,3 @@ func (v *NullableCat) UnmarshalJSON(src []byte) error {

return json.Unmarshal(src, &v.Value)
}

3 changes: 1 addition & 2 deletions samples/client/petstore/go-experimental/go-petstore/model_cat_all_of.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@ func (v NullableCatAllOf) MarshalJSON() ([]byte, error) {
return []byte("null"), nil
default:
return json.Marshal(v.Value)
}
}
}

func (v *NullableCatAllOf) UnmarshalJSON(src []byte) error {
Expand All @@ -74,4 +74,3 @@ func (v *NullableCatAllOf) UnmarshalJSON(src []byte) error {

return json.Unmarshal(src, &v.Value)
}

3 changes: 1 addition & 2 deletions samples/client/petstore/go-experimental/go-petstore/model_category.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -79,7 +79,7 @@ func (v NullableCategory) MarshalJSON() ([]byte, error) {
return []byte("null"), nil
default:
return json.Marshal(v.Value)
}
}
}

func (v *NullableCategory) UnmarshalJSON(src []byte) error {
Expand All @@ -90,4 +90,3 @@ func (v *NullableCategory) UnmarshalJSON(src []byte) error {

return json.Unmarshal(src, &v.Value)
}

3 changes: 1 addition & 2 deletions samples/client/petstore/go-experimental/go-petstore/model_class_model.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@ func (v NullableClassModel) MarshalJSON() ([]byte, error) {
return []byte("null"), nil
default:
return json.Marshal(v.Value)
}
}
}

func (v *NullableClassModel) UnmarshalJSON(src []byte) error {
Expand All @@ -74,4 +74,3 @@ func (v *NullableClassModel) UnmarshalJSON(src []byte) error {

return json.Unmarshal(src, &v.Value)
}

3 changes: 1 addition & 2 deletions samples/client/petstore/go-experimental/go-petstore/model_client.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@ func (v NullableClient) MarshalJSON() ([]byte, error) {
return []byte("null"), nil
default:
return json.Marshal(v.Value)
}
}
}

func (v *NullableClient) UnmarshalJSON(src []byte) error {
Expand All @@ -74,4 +74,3 @@ func (v *NullableClient) UnmarshalJSON(src []byte) error {

return json.Unmarshal(src, &v.Value)
}

3 changes: 1 addition & 2 deletions samples/client/petstore/go-experimental/go-petstore/model_dog.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -113,7 +113,7 @@ func (v NullableDog) MarshalJSON() ([]byte, error) {
return []byte("null"), nil
default:
return json.Marshal(v.Value)
}
}
}

func (v *NullableDog) UnmarshalJSON(src []byte) error {
Expand All @@ -124,4 +124,3 @@ func (v *NullableDog) UnmarshalJSON(src []byte) error {

return json.Unmarshal(src, &v.Value)
}

3 changes: 1 addition & 2 deletions samples/client/petstore/go-experimental/go-petstore/model_dog_all_of.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@ func (v NullableDogAllOf) MarshalJSON() ([]byte, error) {
return []byte("null"), nil
default:
return json.Marshal(v.Value)
}
}
}

func (v *NullableDogAllOf) UnmarshalJSON(src []byte) error {
Expand All @@ -74,4 +74,3 @@ func (v *NullableDogAllOf) UnmarshalJSON(src []byte) error {

return json.Unmarshal(src, &v.Value)
}

3 changes: 1 addition & 2 deletions samples/client/petstore/go-experimental/go-petstore/model_enum_arrays.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -97,7 +97,7 @@ func (v NullableEnumArrays) MarshalJSON() ([]byte, error) {
return []byte("null"), nil
default:
return json.Marshal(v.Value)
}
}
}

func (v *NullableEnumArrays) UnmarshalJSON(src []byte) error {
Expand All @@ -108,4 +108,3 @@ func (v *NullableEnumArrays) UnmarshalJSON(src []byte) error {

return json.Unmarshal(src, &v.Value)
}

Loading