Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
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
6 changes: 3 additions & 3 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -3579,7 +3579,7 @@ func (a *Thing) UnmarshalJSON(b []byte) error {
var fieldVal interface{}
err := json.Unmarshal(fieldBuf, &fieldVal)
if err != nil {
return fmt.Errorf("error unmarshaling field %s: %w", fieldName, err)
return fmt.Errorf("error unmarshalling field %s: %w", fieldName, err)
}
a.AdditionalProperties[fieldName] = fieldVal
}
Expand Down Expand Up @@ -3683,7 +3683,7 @@ func (a *Thing) UnmarshalJSON(b []byte) error {
var fieldVal int
err := json.Unmarshal(fieldBuf, &fieldVal)
if err != nil {
return fmt.Errorf("error unmarshaling field %s: %w", fieldName, err)
return fmt.Errorf("error unmarshalling field %s: %w", fieldName, err)
}
a.AdditionalProperties[fieldName] = fieldVal
}
Expand Down Expand Up @@ -3801,7 +3801,7 @@ func (a *Thing) UnmarshalJSON(b []byte) error {
}
err := json.Unmarshal(fieldBuf, &fieldVal)
if err != nil {
return fmt.Errorf("error unmarshaling field %s: %w", fieldName, err)
return fmt.Errorf("error unmarshalling field %s: %w", fieldName, err)
}
a.AdditionalProperties[fieldName] = fieldVal
}
Expand Down
2 changes: 1 addition & 1 deletion configuration-schema.json
Original file line number Diff line number Diff line change
Expand Up @@ -110,7 +110,7 @@
},
"preserve-original-operation-id-casing-in-embedded-spec": {
"type": "boolean",
"description": "When `oapi-codegen` parses the original OpenAPI specification, it will apply the configured `output-options.name-normalizer` to each operation's `operationId` before that is used to generate code from.\nHowever, this is also applied to the copy of the `operationId`s in the `embedded-spec` generation, which means that the embedded OpenAPI specification is then out-of-sync with the input specificiation.\nTo ensure that the `operationId` in the embedded spec is preserved as-is from the input specification, set this. NOTE that this will not impact generated code.\nNOTE that if you're using `include-operation-ids` or `exclude-operation-ids` you may want to ensure that the `operationId`s used are correct."
"description": "When `oapi-codegen` parses the original OpenAPI specification, it will apply the configured `output-options.name-normalizer` to each operation's `operationId` before that is used to generate code from.\nHowever, this is also applied to the copy of the `operationId`s in the `embedded-spec` generation, which means that the embedded OpenAPI specification is then out-of-sync with the input specification.\nTo ensure that the `operationId` in the embedded spec is preserved as-is from the input specification, set this. NOTE that this will not impact generated code.\nNOTE that if you're using `include-operation-ids` or `exclude-operation-ids` you may want to ensure that the `operationId`s used are correct."
}
}
},
Expand Down
8 changes: 4 additions & 4 deletions examples/authenticated-api/stdhttp/api/api.gen.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

8 changes: 4 additions & 4 deletions examples/import-mapping/samepackage/server.gen.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

8 changes: 4 additions & 4 deletions examples/minimal-server/chi/api/ping.gen.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

8 changes: 4 additions & 4 deletions examples/minimal-server/gorillamux/api/ping.gen.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

8 changes: 4 additions & 4 deletions examples/minimal-server/stdhttp-go-tool/api/ping.gen.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

8 changes: 4 additions & 4 deletions examples/minimal-server/stdhttp/api/ping.gen.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

8 changes: 4 additions & 4 deletions examples/overlay/api/ping.gen.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

8 changes: 4 additions & 4 deletions examples/petstore-expanded/chi/api/petstore.gen.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions examples/petstore-expanded/chi/petstore_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ func TestPetStore(t *testing.T) {

var resultPet api.Pet
err = json.NewDecoder(rr.Body).Decode(&resultPet)
assert.NoError(t, err, "error unmarshaling response")
assert.NoError(t, err, "error unmarshalling response")
assert.Equal(t, newPet.Name, resultPet.Name)
assert.Equal(t, *newPet.Tag, *resultPet.Tag)
})
Expand Down Expand Up @@ -146,7 +146,7 @@ func TestPetStore(t *testing.T) {

var petError api.Error
err = json.NewDecoder(rr.Body).Decode(&petError)
assert.NoError(t, err, "error unmarshaling PetError")
assert.NoError(t, err, "error unmarshalling PetError")
assert.Equal(t, int32(http.StatusNotFound), petError.Code)

// Now, delete both real pets
Expand Down
6 changes: 3 additions & 3 deletions examples/petstore-expanded/echo/petstore_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,7 @@ func TestPetStore(t *testing.T) {
// sure that its fields match.
var resultPet models.Pet
err = result.UnmarshalBodyToObject(&resultPet)
assert.NoError(t, err, "error unmarshaling response")
assert.NoError(t, err, "error unmarshalling response")
assert.Equal(t, newPet.Name, resultPet.Name)
assert.Equal(t, *newPet.Tag, *resultPet.Tag)

Expand Down Expand Up @@ -106,7 +106,7 @@ func TestPetStore(t *testing.T) {
// We should have gotten a response from the server with the new pet. Make
// sure that its fields match.
err = result.UnmarshalBodyToObject(&resultPet)
assert.NoError(t, err, "error unmarshaling response")
assert.NoError(t, err, "error unmarshalling response")
petId2 := resultPet.Id

// Now, list all pets, we should have two
Expand Down Expand Up @@ -137,7 +137,7 @@ func TestPetStore(t *testing.T) {
result = testutil.NewRequest().Delete("/pets/7").GoWithHTTPHandler(t, e)
assert.Equal(t, http.StatusNotFound, result.Code())
err = result.UnmarshalBodyToObject(&petError)
assert.NoError(t, err, "error unmarshaling PetError")
assert.NoError(t, err, "error unmarshalling PetError")
assert.Equal(t, int32(http.StatusNotFound), petError.Code)

// Now, delete both real pets
Expand Down
4 changes: 2 additions & 2 deletions examples/petstore-expanded/fiber/petstore_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,7 @@ func TestPetStore(t *testing.T) {

var resultPet api.Pet
err = json.NewDecoder(rr.Body).Decode(&resultPet)
assert.NoError(t, err, "error unmarshaling response")
assert.NoError(t, err, "error unmarshalling response")
assert.Equal(t, newPet.Name, resultPet.Name)
assert.Equal(t, *newPet.Tag, *resultPet.Tag)
})
Expand Down Expand Up @@ -160,7 +160,7 @@ func TestPetStore(t *testing.T) {

var petError api.Error
err = json.NewDecoder(rr.Body).Decode(&petError)
assert.NoError(t, err, "error unmarshaling PetError")
assert.NoError(t, err, "error unmarshalling PetError")
assert.Equal(t, int32(http.StatusNotFound), petError.Code)

// Now, delete both real pets
Expand Down
4 changes: 2 additions & 2 deletions examples/petstore-expanded/gin/petstore_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ func TestPetStore(t *testing.T) {

var resultPet api.Pet
err = json.NewDecoder(rr.Body).Decode(&resultPet)
assert.NoError(t, err, "error unmarshaling response")
assert.NoError(t, err, "error unmarshalling response")
assert.Equal(t, newPet.Name, resultPet.Name)
assert.Equal(t, *newPet.Tag, *resultPet.Tag)
})
Expand Down Expand Up @@ -119,7 +119,7 @@ func TestPetStore(t *testing.T) {

var petError api.Error
err = json.NewDecoder(rr.Body).Decode(&petError)
assert.NoError(t, err, "error unmarshaling PetError")
assert.NoError(t, err, "error unmarshalling PetError")
assert.Equal(t, int32(http.StatusNotFound), petError.Code)

// Now, delete both real pets
Expand Down
8 changes: 4 additions & 4 deletions examples/petstore-expanded/gorilla/api/petstore.gen.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions examples/petstore-expanded/gorilla/petstore_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ func TestPetStore(t *testing.T) {

var resultPet api.Pet
err = json.NewDecoder(rr.Body).Decode(&resultPet)
assert.NoError(t, err, "error unmarshaling response")
assert.NoError(t, err, "error unmarshalling response")
assert.Equal(t, newPet.Name, resultPet.Name)
assert.Equal(t, *newPet.Tag, *resultPet.Tag)
})
Expand Down Expand Up @@ -146,7 +146,7 @@ func TestPetStore(t *testing.T) {

var petError api.Error
err = json.NewDecoder(rr.Body).Decode(&petError)
assert.NoError(t, err, "error unmarshaling PetError")
assert.NoError(t, err, "error unmarshalling PetError")
assert.Equal(t, int32(http.StatusNotFound), petError.Code)

// Now, delete both real pets
Expand Down
4 changes: 2 additions & 2 deletions examples/petstore-expanded/iris/petstore_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ func TestPetStore(t *testing.T) {

var resultPet api.Pet
err := json.NewDecoder(rr.Body).Decode(&resultPet)
assert.NoError(t, err, "error unmarshaling response")
assert.NoError(t, err, "error unmarshalling response")
assert.Equal(t, newPet.Name, resultPet.Name)
assert.Equal(t, *newPet.Tag, *resultPet.Tag)
})
Expand Down Expand Up @@ -130,7 +130,7 @@ func TestPetStore(t *testing.T) {

var petError api.Error
err := json.NewDecoder(rr.Body).Decode(&petError)
assert.NoError(t, err, "error unmarshaling PetError")
assert.NoError(t, err, "error unmarshalling PetError")
assert.Equal(t, int32(http.StatusNotFound), petError.Code)

// Now, delete both real pets
Expand Down
8 changes: 4 additions & 4 deletions examples/petstore-expanded/stdhttp/api/petstore.gen.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading