Skip to content

Commit 18de667

Browse files
authored
default to 32 bit numbers (#9)
* default to 32 bit numbers
1 parent 0f9c9d4 commit 18de667

File tree

5 files changed

+16
-16
lines changed

5 files changed

+16
-16
lines changed

pkg/generators/models/go_type_from_ref.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ func goTypeFromSpec(schemaRef *openapi3.SchemaRef) string {
4747
case "int64":
4848
propertyType = "int64"
4949
default:
50-
propertyType = "int64"
50+
propertyType = "int32" // the default is int32 because this is always json-serialized to a proper number in contrast to int64 which will become a string
5151
}
5252
case "number":
5353
switch schemaRef.Value.Format {
@@ -56,7 +56,7 @@ func goTypeFromSpec(schemaRef *openapi3.SchemaRef) string {
5656
case "double":
5757
propertyType = "float64"
5858
default:
59-
propertyType = "float64"
59+
propertyType = "float32" // the default is float32 because this is always json-serialized to a proper number in contrast to float64 which will become a string
6060
}
6161
case "":
6262
if schemaRef.Ref != "" {

pkg/generators/models/testdata/cases/validation/expected/model_address.go

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ type Address struct {
1414
// Name:
1515
Name *string `json:"name"`
1616
// Number:
17-
Number int64 `json:"number"`
17+
Number int32 `json:"number"`
1818
// Street:
1919
Street string `json:"street"`
2020
}
@@ -42,12 +42,12 @@ func (m Address) SetName(val *string) {
4242
}
4343

4444
// GetNumber returns the Number property
45-
func (m Address) GetNumber() int64 {
45+
func (m Address) GetNumber() int32 {
4646
return m.Number
4747
}
4848

4949
// SetNumber sets the Number property
50-
func (m Address) SetNumber(val int64) {
50+
func (m Address) SetNumber(val int32) {
5151
m.Number = val
5252
}
5353

pkg/generators/models/testdata/cases/validation/expected/model_person.go

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ type Person struct {
1717
// Address:
1818
Address Address `json:"address,omitempty"`
1919
// Age:
20-
Age float64 `json:"age,omitempty"`
20+
Age float32 `json:"age,omitempty"`
2121
// Base64:
2222
Base64 string `json:"base64,omitempty"`
2323
// Date:
@@ -53,7 +53,7 @@ func (m Person) Validate() error {
5353
m.Address,
5454
),
5555
"age": validation.Validate(
56-
m.Age, validation.Min(float64(18)), validation.Max(float64(120)),
56+
m.Age, validation.Min(float32(18)), validation.Max(float32(120)),
5757
),
5858
"base64": validation.Validate(
5959
m.Base64, is.Base64,
@@ -102,12 +102,12 @@ func (m Person) SetAddress(val Address) {
102102
}
103103

104104
// GetAge returns the Age property
105-
func (m Person) GetAge() float64 {
105+
func (m Person) GetAge() float32 {
106106
return m.Age
107107
}
108108

109109
// SetAge sets the Age property
110-
func (m Person) SetAge(val float64) {
110+
func (m Person) SetAge(val float32) {
111111
m.Age = val
112112
}
113113

pkg/generators/models/testdata/cases/validation/generated/model_address.go

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ type Address struct {
1414
// Name:
1515
Name *string `json:"name"`
1616
// Number:
17-
Number int64 `json:"number"`
17+
Number int32 `json:"number"`
1818
// Street:
1919
Street string `json:"street"`
2020
}
@@ -42,12 +42,12 @@ func (m Address) SetName(val *string) {
4242
}
4343

4444
// GetNumber returns the Number property
45-
func (m Address) GetNumber() int64 {
45+
func (m Address) GetNumber() int32 {
4646
return m.Number
4747
}
4848

4949
// SetNumber sets the Number property
50-
func (m Address) SetNumber(val int64) {
50+
func (m Address) SetNumber(val int32) {
5151
m.Number = val
5252
}
5353

pkg/generators/models/testdata/cases/validation/generated/model_person.go

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ type Person struct {
1717
// Address:
1818
Address Address `json:"address,omitempty"`
1919
// Age:
20-
Age float64 `json:"age,omitempty"`
20+
Age float32 `json:"age,omitempty"`
2121
// Base64:
2222
Base64 string `json:"base64,omitempty"`
2323
// Date:
@@ -53,7 +53,7 @@ func (m Person) Validate() error {
5353
m.Address,
5454
),
5555
"age": validation.Validate(
56-
m.Age, validation.Min(float64(18)), validation.Max(float64(120)),
56+
m.Age, validation.Min(float32(18)), validation.Max(float32(120)),
5757
),
5858
"base64": validation.Validate(
5959
m.Base64, is.Base64,
@@ -102,12 +102,12 @@ func (m Person) SetAddress(val Address) {
102102
}
103103

104104
// GetAge returns the Age property
105-
func (m Person) GetAge() float64 {
105+
func (m Person) GetAge() float32 {
106106
return m.Age
107107
}
108108

109109
// SetAge sets the Age property
110-
func (m Person) SetAge(val float64) {
110+
func (m Person) SetAge(val float32) {
111111
m.Age = val
112112
}
113113

0 commit comments

Comments
 (0)