Skip to content

[go-experimental] Fix nullable support #5414

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 8 commits into from
Mar 24, 2020
Merged

[go-experimental] Fix nullable support #5414

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
cd51181
Fix nullable support in go-experimental client
Feb 21, 2020
6660e34
Fix support for models with parents and container fields
Feb 24, 2020
89c6693
Make sure that oneOf interfaces serialize properly even if they're re…
Feb 24, 2020
a214508
Spaces => tabs
Mar 17, 2020
69b5cf0
Regenerate samples
Mar 17, 2020
711acec
Make some methods of nullables pointer-receivers, add tests
Mar 19, 2020
abed677
Improve the Get/Set logic to make usage more convenient
Mar 19, 2020
afc8426
Address review
Mar 19, 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
Regenerate samples
  • Loading branch information
Slavek Kabrda committed Mar 17, 2020
commit 69b5cf00e407c03ccbb853ce64194ec793ae54ca
42 changes: 21 additions & 21 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 @@ -52,12 +52,12 @@ func (o *Model200Response) GetNameOk() (int32, bool) {
var ret int32
return ret, false
}
return *o.Name, true
return *o.Name, true
}

// HasName returns a boolean if a field has been set.
func (o *Model200Response) HasName() bool {
if o != nil && o.Name != nil {
if o != nil && o.Name != nil {
return true
}

Expand Down Expand Up @@ -85,12 +85,12 @@ func (o *Model200Response) GetClassOk() (string, bool) {
var ret string
return ret, false
}
return *o.Class, true
return *o.Class, true
}

// HasClass returns a boolean if a field has been set.
func (o *Model200Response) HasClass() bool {
if o != nil && o.Class != nil {
if o != nil && o.Class != nil {
return true
}

Expand All @@ -103,14 +103,14 @@ func (o *Model200Response) SetClass(v string) {
}

func (o Model200Response) MarshalJSON() ([]byte, error) {
toSerialize := map[string]interface{}{}
if o.Name != nil {
toSerialize["name"] = o.Name
}
if o.Class != nil {
toSerialize["class"] = o.Class
}
return json.Marshal(toSerialize)
toSerialize := map[string]interface{}{}
if o.Name != nil {
toSerialize["name"] = o.Name
}
if o.Class != nil {
toSerialize["class"] = o.Class
}
return json.Marshal(toSerialize)
}

type NullableModel200Response struct {
Expand All @@ -119,32 +119,32 @@ type NullableModel200Response struct {
}

func (v NullableModel200Response) Get() *Model200Response {
return v.value
return v.value
}

func (v NullableModel200Response) Set(val *Model200Response) {
v.value = val
v.isSet = true
v.value = val
v.isSet = true
}

func (v NullableModel200Response) IsSet() bool {
return v.isSet
return v.isSet
}

func (v NullableModel200Response) Unset() {
v.value = nil
v.isSet = false
v.value = nil
v.isSet = false
}

func NewNullableModel200Response(val *Model200Response) *NullableModel200Response {
return &NullableModel200Response{value: val, isSet: true}
return &NullableModel200Response{value: val, isSet: true}
}

func (v NullableModel200Response) MarshalJSON() ([]byte, error) {
return json.Marshal(v.value)
return json.Marshal(v.value)
}

func (v *NullableModel200Response) UnmarshalJSON(src []byte) error {
v.isSet = true
v.isSet = true
return json.Unmarshal(src, &v.value)
}
32 changes: 16 additions & 16 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 @@ -51,12 +51,12 @@ func (o *AdditionalPropertiesAnyType) GetNameOk() (string, bool) {
var ret string
return ret, false
}
return *o.Name, true
return *o.Name, true
}

// HasName returns a boolean if a field has been set.
func (o *AdditionalPropertiesAnyType) HasName() bool {
if o != nil && o.Name != nil {
if o != nil && o.Name != nil {
return true
}

Expand All @@ -69,11 +69,11 @@ func (o *AdditionalPropertiesAnyType) SetName(v string) {
}

func (o AdditionalPropertiesAnyType) MarshalJSON() ([]byte, error) {
toSerialize := map[string]interface{}{}
if o.Name != nil {
toSerialize["name"] = o.Name
}
return json.Marshal(toSerialize)
toSerialize := map[string]interface{}{}
if o.Name != nil {
toSerialize["name"] = o.Name
}
return json.Marshal(toSerialize)
}

type NullableAdditionalPropertiesAnyType struct {
Expand All @@ -82,32 +82,32 @@ type NullableAdditionalPropertiesAnyType struct {
}

func (v NullableAdditionalPropertiesAnyType) Get() *AdditionalPropertiesAnyType {
return v.value
return v.value
}

func (v NullableAdditionalPropertiesAnyType) Set(val *AdditionalPropertiesAnyType) {
v.value = val
v.isSet = true
v.value = val
v.isSet = true
}

func (v NullableAdditionalPropertiesAnyType) IsSet() bool {
return v.isSet
return v.isSet
}

func (v NullableAdditionalPropertiesAnyType) Unset() {
v.value = nil
v.isSet = false
v.value = nil
v.isSet = false
}

func NewNullableAdditionalPropertiesAnyType(val *AdditionalPropertiesAnyType) *NullableAdditionalPropertiesAnyType {
return &NullableAdditionalPropertiesAnyType{value: val, isSet: true}
return &NullableAdditionalPropertiesAnyType{value: val, isSet: true}
}

func (v NullableAdditionalPropertiesAnyType) MarshalJSON() ([]byte, error) {
return json.Marshal(v.value)
return json.Marshal(v.value)
}

func (v *NullableAdditionalPropertiesAnyType) UnmarshalJSON(src []byte) error {
v.isSet = true
v.isSet = true
return json.Unmarshal(src, &v.value)
}
32 changes: 16 additions & 16 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 @@ -51,12 +51,12 @@ func (o *AdditionalPropertiesArray) GetNameOk() (string, bool) {
var ret string
return ret, false
}
return *o.Name, true
return *o.Name, true
}

// HasName returns a boolean if a field has been set.
func (o *AdditionalPropertiesArray) HasName() bool {
if o != nil && o.Name != nil {
if o != nil && o.Name != nil {
return true
}

Expand All @@ -69,11 +69,11 @@ func (o *AdditionalPropertiesArray) SetName(v string) {
}

func (o AdditionalPropertiesArray) MarshalJSON() ([]byte, error) {
toSerialize := map[string]interface{}{}
if o.Name != nil {
toSerialize["name"] = o.Name
}
return json.Marshal(toSerialize)
toSerialize := map[string]interface{}{}
if o.Name != nil {
toSerialize["name"] = o.Name
}
return json.Marshal(toSerialize)
}

type NullableAdditionalPropertiesArray struct {
Expand All @@ -82,32 +82,32 @@ type NullableAdditionalPropertiesArray struct {
}

func (v NullableAdditionalPropertiesArray) Get() *AdditionalPropertiesArray {
return v.value
return v.value
}

func (v NullableAdditionalPropertiesArray) Set(val *AdditionalPropertiesArray) {
v.value = val
v.isSet = true
v.value = val
v.isSet = true
}

func (v NullableAdditionalPropertiesArray) IsSet() bool {
return v.isSet
return v.isSet
}

func (v NullableAdditionalPropertiesArray) Unset() {
v.value = nil
v.isSet = false
v.value = nil
v.isSet = false
}

func NewNullableAdditionalPropertiesArray(val *AdditionalPropertiesArray) *NullableAdditionalPropertiesArray {
return &NullableAdditionalPropertiesArray{value: val, isSet: true}
return &NullableAdditionalPropertiesArray{value: val, isSet: true}
}

func (v NullableAdditionalPropertiesArray) MarshalJSON() ([]byte, error) {
return json.Marshal(v.value)
return json.Marshal(v.value)
}

func (v *NullableAdditionalPropertiesArray) UnmarshalJSON(src []byte) error {
v.isSet = true
v.isSet = true
return json.Unmarshal(src, &v.value)
}
32 changes: 16 additions & 16 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 @@ -51,12 +51,12 @@ func (o *AdditionalPropertiesBoolean) GetNameOk() (string, bool) {
var ret string
return ret, false
}
return *o.Name, true
return *o.Name, true
}

// HasName returns a boolean if a field has been set.
func (o *AdditionalPropertiesBoolean) HasName() bool {
if o != nil && o.Name != nil {
if o != nil && o.Name != nil {
return true
}

Expand All @@ -69,11 +69,11 @@ func (o *AdditionalPropertiesBoolean) SetName(v string) {
}

func (o AdditionalPropertiesBoolean) MarshalJSON() ([]byte, error) {
toSerialize := map[string]interface{}{}
if o.Name != nil {
toSerialize["name"] = o.Name
}
return json.Marshal(toSerialize)
toSerialize := map[string]interface{}{}
if o.Name != nil {
toSerialize["name"] = o.Name
}
return json.Marshal(toSerialize)
}

type NullableAdditionalPropertiesBoolean struct {
Expand All @@ -82,32 +82,32 @@ type NullableAdditionalPropertiesBoolean struct {
}

func (v NullableAdditionalPropertiesBoolean) Get() *AdditionalPropertiesBoolean {
return v.value
return v.value
}

func (v NullableAdditionalPropertiesBoolean) Set(val *AdditionalPropertiesBoolean) {
v.value = val
v.isSet = true
v.value = val
v.isSet = true
}

func (v NullableAdditionalPropertiesBoolean) IsSet() bool {
return v.isSet
return v.isSet
}

func (v NullableAdditionalPropertiesBoolean) Unset() {
v.value = nil
v.isSet = false
v.value = nil
v.isSet = false
}

func NewNullableAdditionalPropertiesBoolean(val *AdditionalPropertiesBoolean) *NullableAdditionalPropertiesBoolean {
return &NullableAdditionalPropertiesBoolean{value: val, isSet: true}
return &NullableAdditionalPropertiesBoolean{value: val, isSet: true}
}

func (v NullableAdditionalPropertiesBoolean) MarshalJSON() ([]byte, error) {
return json.Marshal(v.value)
return json.Marshal(v.value)
}

func (v *NullableAdditionalPropertiesBoolean) UnmarshalJSON(src []byte) error {
v.isSet = true
v.isSet = true
return json.Unmarshal(src, &v.value)
}
Loading