Skip to content

Commit d5f4250

Browse files
wing328martinlakov
andauthored
[Golang] Move utility functions from client.mustache to utils.mustache (#19001)
* [Golang] Move utility functions from client.mustache to utils.mustache * re-generate Go samples * re-generate Go samples again * re-generate samples once more * update go samples --------- Co-authored-by: Martin Lakov <[email protected]>
1 parent 1064cb6 commit d5f4250

File tree

19 files changed

+131
-108
lines changed

19 files changed

+131
-108
lines changed

modules/openapi-generator/src/main/resources/go/client.mustache

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -585,18 +585,6 @@ func addFile(w *multipart.Writer, fieldName, path string) error {
585585
return err
586586
}
587587

588-
// Prevent trying to import "fmt"
589-
func reportError(format string, a ...interface{}) error {
590-
return fmt.Errorf(format, a...)
591-
}
592-
593-
// A wrapper for strict JSON decoding
594-
func newStrictDecoder(data []byte) *json.Decoder {
595-
dec := json.NewDecoder(bytes.NewBuffer(data))
596-
dec.DisallowUnknownFields()
597-
return dec
598-
}
599-
600588
// Set request body from an interface{}
601589
func setBody(body interface{}, contentType string) (bodyBuf *bytes.Buffer, err error) {
602590
if bodyBuf == nil {

modules/openapi-generator/src/main/resources/go/utils.mustache

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,9 @@
22
package {{packageName}}
33

44
import (
5+
"bytes"
56
"encoding/json"
7+
"fmt"
68
"reflect"
79
"time"
810
)
@@ -336,3 +338,15 @@ func IsNil(i interface{}) bool {
336338
type MappedNullable interface {
337339
ToMap() (map[string]interface{}, error)
338340
}
341+
342+
// A wrapper for strict JSON decoding
343+
func newStrictDecoder(data []byte) *json.Decoder {
344+
dec := json.NewDecoder(bytes.NewBuffer(data))
345+
dec.DisallowUnknownFields()
346+
return dec
347+
}
348+
349+
// Prevent trying to import "fmt"
350+
func reportError(format string, a ...interface{}) error {
351+
return fmt.Errorf(format, a...)
352+
}

samples/client/echo_api/go-external-refs/client.go

Lines changed: 0 additions & 12 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

samples/client/echo_api/go-external-refs/utils.go

Lines changed: 14 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

samples/client/echo_api/go/client.go

Lines changed: 0 additions & 12 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

samples/client/echo_api/go/utils.go

Lines changed: 14 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

samples/client/others/go/allof_multiple_ref_and_discriminator/client.go

Lines changed: 0 additions & 12 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

samples/client/others/go/allof_multiple_ref_and_discriminator/utils.go

Lines changed: 14 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

samples/client/others/go/oneof-anyof-required/client.go

Lines changed: 0 additions & 12 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

samples/client/others/go/oneof-anyof-required/utils.go

Lines changed: 14 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

samples/client/petstore/go/go-petstore/client.go

Lines changed: 0 additions & 12 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

samples/client/petstore/go/go-petstore/utils.go

Lines changed: 14 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

samples/openapi3/client/extensions/x-auth-id-alias/go-experimental/client.go

Lines changed: 0 additions & 12 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

samples/openapi3/client/extensions/x-auth-id-alias/go-experimental/utils.go

Lines changed: 14 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

samples/openapi3/client/petstore/go-petstore-generateMarshalJSON-false/client.go

Lines changed: 0 additions & 12 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

samples/openapi3/client/petstore/go-petstore-generateMarshalJSON-false/utils.go

Lines changed: 14 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

samples/openapi3/client/petstore/go/go-petstore/client.go

Lines changed: 0 additions & 12 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)