diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS new file mode 100644 index 000000000..be8851996 --- /dev/null +++ b/.github/CODEOWNERS @@ -0,0 +1 @@ +* @oapi-codegen/maintainers diff --git a/README.md b/README.md index f7b14883b..d055c3752 100644 --- a/README.md +++ b/README.md @@ -27,20 +27,20 @@ This would give you a `tools/tools.go`: package main import ( - _ "github.com/deepmap/oapi-codegen/v2/cmd/oapi-codegen" + _ "github.com/oapi-codegen/oapi-codegen/v2/cmd/oapi-codegen" ) ``` Then, each invocation of `oapi-codegen` would be used like so: ```go -//go:generate go run github.com/deepmap/oapi-codegen/v2/cmd/oapi-codegen --config=config.yaml ../../api.yaml +//go:generate go run github.com/oapi-codegen/oapi-codegen/v2/cmd/oapi-codegen --config=config.yaml ../../api.yaml ``` Alternatively, you can install it as a binary with: ```sh -$ go install github.com/deepmap/oapi-codegen/v2/cmd/oapi-codegen@latest +$ go install github.com/oapi-codegen/oapi-codegen/v2/cmd/oapi-codegen@latest $ oapi-codegen -version ``` @@ -64,9 +64,9 @@ To do so, you can run: ```sh # pin to the latest version on the default branch -$ go get github.com/deepmap/oapi-codegen/v2@master +$ go get github.com/oapi-codegen/oapi-codegen/v2@master # alternatively, to a commit hash i.e. https://github.com/deepmap/oapi-codegen/commit/71e916c59688a6379b5774dfe5904ec222b9a537 -$ go get github.com/deepmap/oapi-codegen/v2@71e916c59688a6379b5774dfe5904ec222b9a537 +$ go get github.com/oapi-codegen/oapi-codegen/v2@71e916c59688a6379b5774dfe5904ec222b9a537 ``` This will then make a change such as: @@ -77,15 +77,15 @@ index 44f29a4..436a780 100644 --- go.mod +++ go.mod @@ -2,21 +2,20 @@ --require github.com/deepmap/oapi-codegen/v2 v2.1.0 -+require github.com/deepmap/oapi-codegen/v2 v2.1.1-0.20240331212514-80f0b978ef16 +-require github.com/oapi-codegen/oapi-codegen/v2 v2.1.0 ++require github.com/oapi-codegen/oapi-codegen/v2 v2.1.1-0.20240331212514-80f0b978ef16 ``` ## Usage `oapi-codegen` is largely configured using a YAML configuration file, to simplify the number of flags that users need to remember, and to make reading the `go:generate` command less daunting. -For full details of what is supported, it's worth checking out [the GoDoc for `codegen.Configuration`](https://pkg.go.dev/github.com/deepmap/oapi-codegen/v2/pkg/codegen#Configuration). +For full details of what is supported, it's worth checking out [the GoDoc for `codegen.Configuration`](https://pkg.go.dev/github.com/oapi-codegen/oapi-codegen/v2/pkg/codegen#Configuration). We also have [a JSON Schema](configuration-schema.json) that can be used by IDEs/editors with the Language Server Protocol (LSP) to perform intelligent suggestions, i.e.: @@ -99,7 +99,7 @@ package: api Although we strive to retain backwards compatibility - as a project that's using a stable API per SemVer - there are sometimes opportunities we must take to fix a bug that could cause a breaking change for [people relying upon the behaviour](https://xkcd.com/1172/). -In this case, we will expose a [compatibility option](https://pkg.go.dev/github.com/deepmap/oapi-codegen/v2/pkg/codegen#CompatibilityOptions) to restore old behaviour. +In this case, we will expose a [compatibility option](https://pkg.go.dev/github.com/oapi-codegen/oapi-codegen/v2/pkg/codegen#CompatibilityOptions) to restore old behaviour. ## Features @@ -679,7 +679,7 @@ import ( "log" "net/http" - "github.com/deepmap/oapi-codegen/v2/examples/minimal-server/stdhttp/api" + "github.com/oapi-codegen/oapi-codegen/v2/examples/minimal-server/stdhttp/api" ) func main() { @@ -816,7 +816,7 @@ import ( "log" "net/http" - "github.com/deepmap/oapi-codegen/v2/examples/minimal-server/chi/api" + "github.com/oapi-codegen/oapi-codegen/v2/examples/minimal-server/chi/api" "github.com/go-chi/chi/v5" ) @@ -943,7 +943,7 @@ import ( "log" "net/http" - "github.com/deepmap/oapi-codegen/v2/examples/minimal-server/gorillamux/api" + "github.com/oapi-codegen/oapi-codegen/v2/examples/minimal-server/gorillamux/api" "github.com/gorilla/mux" ) @@ -1074,7 +1074,7 @@ Now we've got our implementation, we can then write the following code to wire i import ( "log" - "github.com/deepmap/oapi-codegen/v2/examples/minimal-server/echo/api" + "github.com/oapi-codegen/oapi-codegen/v2/examples/minimal-server/echo/api" "github.com/labstack/echo/v4" ) @@ -1191,7 +1191,7 @@ Now we've got our implementation, we can then write the following code to wire i import ( "log" - "github.com/deepmap/oapi-codegen/v2/examples/minimal-server/fiber/api" + "github.com/oapi-codegen/oapi-codegen/v2/examples/minimal-server/fiber/api" "github.com/gofiber/fiber/v2" ) @@ -1306,7 +1306,7 @@ import ( "log" "net/http" - "github.com/deepmap/oapi-codegen/v2/examples/minimal-server/gin/api" + "github.com/oapi-codegen/oapi-codegen/v2/examples/minimal-server/gin/api" "github.com/gin-gonic/gin" ) @@ -1430,7 +1430,7 @@ Now we've got our implementation, we can then write the following code to wire i import ( "log" - "github.com/deepmap/oapi-codegen/v2/examples/minimal-server/iris/api" + "github.com/oapi-codegen/oapi-codegen/v2/examples/minimal-server/iris/api" "github.com/kataras/iris/v12" ) @@ -1565,7 +1565,7 @@ And a `generate.go`: ```go package client -//go:generate go run github.com/deepmap/oapi-codegen/v2/cmd/oapi-codegen -config cfg.yaml api.yaml +//go:generate go run github.com/oapi-codegen/oapi-codegen/v2/cmd/oapi-codegen -config cfg.yaml api.yaml ``` This would then generate: @@ -1641,7 +1641,7 @@ import ( "log" "net/http" - "github.com/deepmap/oapi-codegen/v2/examples/client" + "github.com/oapi-codegen/oapi-codegen/v2/examples/client" ) func TestClient_canCall() { @@ -1764,7 +1764,7 @@ And a `generate.go`: ```go package onlymodels -//go:generate go run github.com/deepmap/oapi-codegen/v2/cmd/oapi-codegen -config cfg.yaml api.yaml +//go:generate go run github.com/oapi-codegen/oapi-codegen/v2/cmd/oapi-codegen -config cfg.yaml api.yaml ``` This would then generate: @@ -1903,7 +1903,7 @@ output-options: skip-prune: true import-mapping: # for a given file/URL that is $ref'd, point `oapi-codegen` to the Go package that this spec is generated into, to perform Go package imports - ../common/api.yaml: github.com/deepmap/oapi-codegen/v2/examples/import-mapping/common + ../common/api.yaml: github.com/oapi-codegen/oapi-codegen/v2/examples/import-mapping/common ``` This will then generate the following code: @@ -1913,7 +1913,7 @@ package admin import ( // ... - externalRef0 "github.com/deepmap/oapi-codegen/v2/examples/import-mapping/common" + externalRef0 "github.com/oapi-codegen/oapi-codegen/v2/examples/import-mapping/common" ) // User defines model for User. @@ -2873,7 +2873,7 @@ import ( "fmt" "log" - "github.com/deepmap/oapi-codegen/v2/pkg/securityprovider" + "github.com/oapi-codegen/oapi-codegen/v2/pkg/securityprovider" ) func main() { @@ -2895,7 +2895,7 @@ func main() { } ``` -Notice that we're using a pre-built provider from the [`pkg/securityprovider` package](https://pkg.go.dev/github.com/deepmap/oapi-codegen/v2/pkg/securityprovider), which has some inbuilt support for other types of authentication, too. +Notice that we're using a pre-built provider from the [`pkg/securityprovider` package](https://pkg.go.dev/github.com/oapi-codegen/oapi-codegen/v2/pkg/securityprovider), which has some inbuilt support for other types of authentication, too. ## Custom code generation @@ -3853,7 +3853,7 @@ output-options: exclude-schemas: [] ``` -Check [the docs](https://pkg.go.dev/github.com/deepmap/oapi-codegen/v2/pkg/codegen#OutputOptions) for more details of usage. +Check [the docs](https://pkg.go.dev/github.com/oapi-codegen/oapi-codegen/v2/pkg/codegen#OutputOptions) for more details of usage. ### Should I commit the generated code? diff --git a/cmd/oapi-codegen/oapi-codegen.go b/cmd/oapi-codegen/oapi-codegen.go index f45eb40f5..cba80bf2c 100644 --- a/cmd/oapi-codegen/oapi-codegen.go +++ b/cmd/oapi-codegen/oapi-codegen.go @@ -25,8 +25,8 @@ import ( "gopkg.in/yaml.v2" - "github.com/deepmap/oapi-codegen/v2/pkg/codegen" - "github.com/deepmap/oapi-codegen/v2/pkg/util" + "github.com/oapi-codegen/oapi-codegen/v2/pkg/codegen" + "github.com/oapi-codegen/oapi-codegen/v2/pkg/util" ) func errExit(format string, args ...interface{}) { diff --git a/cmd/oapi-codegen/oapi-codegen_test.go b/cmd/oapi-codegen/oapi-codegen_test.go index 689a8e9a0..9d9f06c20 100644 --- a/cmd/oapi-codegen/oapi-codegen_test.go +++ b/cmd/oapi-codegen/oapi-codegen_test.go @@ -3,7 +3,7 @@ package main import ( "testing" - "github.com/deepmap/oapi-codegen/v2/pkg/util" + "github.com/oapi-codegen/oapi-codegen/v2/pkg/util" ) func TestLoader(t *testing.T) { diff --git a/examples/anyof-allof-oneof/anyofallofoneof.gen.go b/examples/anyof-allof-oneof/anyofallofoneof.gen.go index 8259f1557..99b861683 100644 --- a/examples/anyof-allof-oneof/anyofallofoneof.gen.go +++ b/examples/anyof-allof-oneof/anyofallofoneof.gen.go @@ -1,6 +1,6 @@ // Package anyofallofoneof provides primitives to interact with the openapi HTTP API. // -// Code generated by github.com/deepmap/oapi-codegen/v2 version v2.0.0-00010101000000-000000000000 DO NOT EDIT. +// Code generated by github.com/oapi-codegen/oapi-codegen/v2 version v2.0.0-00010101000000-000000000000 DO NOT EDIT. package anyofallofoneof import ( diff --git a/examples/anyof-allof-oneof/generate.go b/examples/anyof-allof-oneof/generate.go index b585c8b36..9e993e2b9 100644 --- a/examples/anyof-allof-oneof/generate.go +++ b/examples/anyof-allof-oneof/generate.go @@ -1,3 +1,3 @@ package anyofallofoneof -//go:generate go run github.com/deepmap/oapi-codegen/v2/cmd/oapi-codegen -config cfg.yaml api.yaml +//go:generate go run github.com/oapi-codegen/oapi-codegen/v2/cmd/oapi-codegen -config cfg.yaml api.yaml diff --git a/examples/authenticated-api/echo/api/api.gen.go b/examples/authenticated-api/echo/api/api.gen.go index bca4d644d..383ab5dc2 100644 --- a/examples/authenticated-api/echo/api/api.gen.go +++ b/examples/authenticated-api/echo/api/api.gen.go @@ -1,6 +1,6 @@ // Package api provides primitives to interact with the openapi HTTP API. // -// Code generated by github.com/deepmap/oapi-codegen/v2 version v2.0.0-00010101000000-000000000000 DO NOT EDIT. +// Code generated by github.com/oapi-codegen/oapi-codegen/v2 version v2.0.0-00010101000000-000000000000 DO NOT EDIT. package api import ( diff --git a/examples/authenticated-api/echo/api/doc.go b/examples/authenticated-api/echo/api/doc.go index d49f3532e..e6d8f45d9 100644 --- a/examples/authenticated-api/echo/api/doc.go +++ b/examples/authenticated-api/echo/api/doc.go @@ -1,3 +1,3 @@ package api -//go:generate go run github.com/deepmap/oapi-codegen/v2/cmd/oapi-codegen --config=config.yaml ../../api.yaml +//go:generate go run github.com/oapi-codegen/oapi-codegen/v2/cmd/oapi-codegen --config=config.yaml ../../api.yaml diff --git a/examples/authenticated-api/echo/main.go b/examples/authenticated-api/echo/main.go index 2d1ace8e2..905f8d8ae 100644 --- a/examples/authenticated-api/echo/main.go +++ b/examples/authenticated-api/echo/main.go @@ -5,10 +5,10 @@ import ( "log" "net" - "github.com/deepmap/oapi-codegen/v2/examples/authenticated-api/echo/api" - "github.com/deepmap/oapi-codegen/v2/examples/authenticated-api/echo/server" "github.com/labstack/echo/v4" "github.com/labstack/echo/v4/middleware" + "github.com/oapi-codegen/oapi-codegen/v2/examples/authenticated-api/echo/api" + "github.com/oapi-codegen/oapi-codegen/v2/examples/authenticated-api/echo/server" ) func main() { diff --git a/examples/authenticated-api/echo/server/fake_jws.go b/examples/authenticated-api/echo/server/fake_jws.go index 46532af66..6eb3067d8 100644 --- a/examples/authenticated-api/echo/server/fake_jws.go +++ b/examples/authenticated-api/echo/server/fake_jws.go @@ -4,16 +4,17 @@ import ( "crypto/ecdsa" "fmt" - "github.com/deepmap/oapi-codegen/v2/pkg/ecdsafile" "github.com/lestrrat-go/jwx/jwa" "github.com/lestrrat-go/jwx/jwk" "github.com/lestrrat-go/jwx/jws" "github.com/lestrrat-go/jwx/jwt" + "github.com/oapi-codegen/oapi-codegen/v2/pkg/ecdsafile" ) // PrivateKey is an ECDSA private key which was generated with the following // command: -// openssl ecparam -name prime256v1 -genkey -noout -out ecprivatekey.pem +// +// openssl ecparam -name prime256v1 -genkey -noout -out ecprivatekey.pem // // We are using a hard coded key here in this example, but in real applications, // you would never do this. Your JWT signing key must never be in your application, diff --git a/examples/authenticated-api/echo/server/server.go b/examples/authenticated-api/echo/server/server.go index dedb2cb2c..5346b77e2 100644 --- a/examples/authenticated-api/echo/server/server.go +++ b/examples/authenticated-api/echo/server/server.go @@ -6,10 +6,10 @@ import ( "sort" "sync" - "github.com/deepmap/oapi-codegen/v2/examples/authenticated-api/echo/api" "github.com/getkin/kin-openapi/openapi3filter" "github.com/labstack/echo/v4" middleware "github.com/oapi-codegen/echo-middleware" + "github.com/oapi-codegen/oapi-codegen/v2/examples/authenticated-api/echo/api" ) type server struct { diff --git a/examples/authenticated-api/echo/server/server_test.go b/examples/authenticated-api/echo/server/server_test.go index 22ee03054..5891c7171 100644 --- a/examples/authenticated-api/echo/server/server_test.go +++ b/examples/authenticated-api/echo/server/server_test.go @@ -4,9 +4,9 @@ import ( "net/http" "testing" - "github.com/deepmap/oapi-codegen/v2/examples/authenticated-api/echo/api" - "github.com/oapi-codegen/testutil" "github.com/labstack/echo/v4" + "github.com/oapi-codegen/oapi-codegen/v2/examples/authenticated-api/echo/api" + "github.com/oapi-codegen/testutil" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" ) diff --git a/examples/authenticated-api/stdhttp/api/api.gen.go b/examples/authenticated-api/stdhttp/api/api.gen.go index 01e6e5f25..7b1fa2c48 100644 --- a/examples/authenticated-api/stdhttp/api/api.gen.go +++ b/examples/authenticated-api/stdhttp/api/api.gen.go @@ -2,7 +2,7 @@ // Package api provides primitives to interact with the openapi HTTP API. // -// Code generated by github.com/deepmap/oapi-codegen/v2 version v2.0.0-00010101000000-000000000000 DO NOT EDIT. +// Code generated by github.com/oapi-codegen/oapi-codegen/v2 version v2.0.0-00010101000000-000000000000 DO NOT EDIT. package api import ( diff --git a/examples/authenticated-api/stdhttp/api/doc.go b/examples/authenticated-api/stdhttp/api/doc.go index d49f3532e..e6d8f45d9 100644 --- a/examples/authenticated-api/stdhttp/api/doc.go +++ b/examples/authenticated-api/stdhttp/api/doc.go @@ -1,3 +1,3 @@ package api -//go:generate go run github.com/deepmap/oapi-codegen/v2/cmd/oapi-codegen --config=config.yaml ../../api.yaml +//go:generate go run github.com/oapi-codegen/oapi-codegen/v2/cmd/oapi-codegen --config=config.yaml ../../api.yaml diff --git a/examples/authenticated-api/stdhttp/go.mod b/examples/authenticated-api/stdhttp/go.mod index 7bda47d1d..fb0f72572 100644 --- a/examples/authenticated-api/stdhttp/go.mod +++ b/examples/authenticated-api/stdhttp/go.mod @@ -1,14 +1,14 @@ -module github.com/deepmap/oapi-codegen/v2/examples/authenticated-api/stdhttp +module github.com/oapi-codegen/oapi-codegen/v2/examples/authenticated-api/stdhttp go 1.22 -replace github.com/deepmap/oapi-codegen/v2 => ../../../ +replace github.com/oapi-codegen/oapi-codegen/v2 => ../../../ require ( - github.com/deepmap/oapi-codegen/v2 v2.0.0-00010101000000-000000000000 github.com/getkin/kin-openapi v0.124.0 github.com/lestrrat-go/jwx v1.2.29 github.com/oapi-codegen/nethttp-middleware v1.0.2 + github.com/oapi-codegen/oapi-codegen/v2 v2.0.0-00010101000000-000000000000 github.com/oapi-codegen/testutil v1.1.0 github.com/stretchr/testify v1.9.0 ) diff --git a/examples/authenticated-api/stdhttp/main.go b/examples/authenticated-api/stdhttp/main.go index 98dd5cad9..73d330aac 100644 --- a/examples/authenticated-api/stdhttp/main.go +++ b/examples/authenticated-api/stdhttp/main.go @@ -5,8 +5,8 @@ import ( "log" "net/http" - "github.com/deepmap/oapi-codegen/v2/examples/authenticated-api/stdhttp/api" - "github.com/deepmap/oapi-codegen/v2/examples/authenticated-api/stdhttp/server" + "github.com/oapi-codegen/oapi-codegen/v2/examples/authenticated-api/stdhttp/api" + "github.com/oapi-codegen/oapi-codegen/v2/examples/authenticated-api/stdhttp/server" ) func main() { diff --git a/examples/authenticated-api/stdhttp/server/fake_jws.go b/examples/authenticated-api/stdhttp/server/fake_jws.go index 46532af66..6eb3067d8 100644 --- a/examples/authenticated-api/stdhttp/server/fake_jws.go +++ b/examples/authenticated-api/stdhttp/server/fake_jws.go @@ -4,16 +4,17 @@ import ( "crypto/ecdsa" "fmt" - "github.com/deepmap/oapi-codegen/v2/pkg/ecdsafile" "github.com/lestrrat-go/jwx/jwa" "github.com/lestrrat-go/jwx/jwk" "github.com/lestrrat-go/jwx/jws" "github.com/lestrrat-go/jwx/jwt" + "github.com/oapi-codegen/oapi-codegen/v2/pkg/ecdsafile" ) // PrivateKey is an ECDSA private key which was generated with the following // command: -// openssl ecparam -name prime256v1 -genkey -noout -out ecprivatekey.pem +// +// openssl ecparam -name prime256v1 -genkey -noout -out ecprivatekey.pem // // We are using a hard coded key here in this example, but in real applications, // you would never do this. Your JWT signing key must never be in your application, diff --git a/examples/authenticated-api/stdhttp/server/server.go b/examples/authenticated-api/stdhttp/server/server.go index 70e11f6cd..ddcabaa73 100644 --- a/examples/authenticated-api/stdhttp/server/server.go +++ b/examples/authenticated-api/stdhttp/server/server.go @@ -8,9 +8,9 @@ import ( "sort" "sync" - "github.com/deepmap/oapi-codegen/v2/examples/authenticated-api/stdhttp/api" "github.com/getkin/kin-openapi/openapi3filter" middleware "github.com/oapi-codegen/nethttp-middleware" + "github.com/oapi-codegen/oapi-codegen/v2/examples/authenticated-api/stdhttp/api" ) type server struct { diff --git a/examples/authenticated-api/stdhttp/server/server_test.go b/examples/authenticated-api/stdhttp/server/server_test.go index 58075aa21..cfada646d 100644 --- a/examples/authenticated-api/stdhttp/server/server_test.go +++ b/examples/authenticated-api/stdhttp/server/server_test.go @@ -4,7 +4,7 @@ import ( "net/http" "testing" - "github.com/deepmap/oapi-codegen/v2/examples/authenticated-api/stdhttp/api" + "github.com/oapi-codegen/oapi-codegen/v2/examples/authenticated-api/stdhttp/api" "github.com/oapi-codegen/testutil" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/examples/authenticated-api/stdhttp/tools/tools.go b/examples/authenticated-api/stdhttp/tools/tools.go index 67a500f26..8615cb4c5 100644 --- a/examples/authenticated-api/stdhttp/tools/tools.go +++ b/examples/authenticated-api/stdhttp/tools/tools.go @@ -4,5 +4,5 @@ package tools import ( - _ "github.com/deepmap/oapi-codegen/v2/cmd/oapi-codegen" + _ "github.com/oapi-codegen/oapi-codegen/v2/cmd/oapi-codegen" ) diff --git a/examples/client/client.gen.go b/examples/client/client.gen.go index 33ed34d75..8ef6b7856 100644 --- a/examples/client/client.gen.go +++ b/examples/client/client.gen.go @@ -1,6 +1,6 @@ // Package client provides primitives to interact with the openapi HTTP API. // -// Code generated by github.com/deepmap/oapi-codegen/v2 version v2.0.0-00010101000000-000000000000 DO NOT EDIT. +// Code generated by github.com/oapi-codegen/oapi-codegen/v2 version v2.0.0-00010101000000-000000000000 DO NOT EDIT. package client import ( diff --git a/examples/client/generate.go b/examples/client/generate.go index 3bf610b9e..e9c9a42f8 100644 --- a/examples/client/generate.go +++ b/examples/client/generate.go @@ -1,3 +1,3 @@ package client -//go:generate go run github.com/deepmap/oapi-codegen/v2/cmd/oapi-codegen -config cfg.yaml api.yaml +//go:generate go run github.com/oapi-codegen/oapi-codegen/v2/cmd/oapi-codegen -config cfg.yaml api.yaml diff --git a/examples/custom-client-type/custom-client-type.gen.go b/examples/custom-client-type/custom-client-type.gen.go index 79bab485e..6dd2ef019 100644 --- a/examples/custom-client-type/custom-client-type.gen.go +++ b/examples/custom-client-type/custom-client-type.gen.go @@ -1,6 +1,6 @@ // Package customclienttype provides primitives to interact with the openapi HTTP API. // -// Code generated by github.com/deepmap/oapi-codegen/v2 version v2.0.0-00010101000000-000000000000 DO NOT EDIT. +// Code generated by github.com/oapi-codegen/oapi-codegen/v2 version v2.0.0-00010101000000-000000000000 DO NOT EDIT. package customclienttype import ( diff --git a/examples/custom-client-type/doc.go b/examples/custom-client-type/doc.go index 540715b92..778f8a210 100644 --- a/examples/custom-client-type/doc.go +++ b/examples/custom-client-type/doc.go @@ -3,4 +3,4 @@ package customclienttype // This is an example of how to add a prefix to the name of the generated Client struct // See https://github.com/deepmap/oapi-codegen/issues/785 for why this might be necessary -//go:generate go run github.com/deepmap/oapi-codegen/v2/cmd/oapi-codegen -config cfg.yaml api.yaml +//go:generate go run github.com/oapi-codegen/oapi-codegen/v2/cmd/oapi-codegen -config cfg.yaml api.yaml diff --git a/examples/extensions/xdeprecatedreason/gen.go b/examples/extensions/xdeprecatedreason/gen.go index 55e2f610c..aa36e0387 100644 --- a/examples/extensions/xdeprecatedreason/gen.go +++ b/examples/extensions/xdeprecatedreason/gen.go @@ -1,6 +1,6 @@ // Package xdeprecatedreason provides primitives to interact with the openapi HTTP API. // -// Code generated by github.com/deepmap/oapi-codegen/v2 version v2.0.0-00010101000000-000000000000 DO NOT EDIT. +// Code generated by github.com/oapi-codegen/oapi-codegen/v2 version v2.0.0-00010101000000-000000000000 DO NOT EDIT. package xdeprecatedreason // Client defines model for Client. diff --git a/examples/extensions/xdeprecatedreason/generate.go b/examples/extensions/xdeprecatedreason/generate.go index 24fc54ac7..97a610ff3 100644 --- a/examples/extensions/xdeprecatedreason/generate.go +++ b/examples/extensions/xdeprecatedreason/generate.go @@ -1,3 +1,3 @@ package xdeprecatedreason -//go:generate go run github.com/deepmap/oapi-codegen/v2/cmd/oapi-codegen -config cfg.yaml api.yaml +//go:generate go run github.com/oapi-codegen/oapi-codegen/v2/cmd/oapi-codegen -config cfg.yaml api.yaml diff --git a/examples/extensions/xenumnames/gen.go b/examples/extensions/xenumnames/gen.go index 13d68f5e0..73ebfa656 100644 --- a/examples/extensions/xenumnames/gen.go +++ b/examples/extensions/xenumnames/gen.go @@ -1,6 +1,6 @@ // Package xenumnames provides primitives to interact with the openapi HTTP API. // -// Code generated by github.com/deepmap/oapi-codegen/v2 version v2.0.0-00010101000000-000000000000 DO NOT EDIT. +// Code generated by github.com/oapi-codegen/oapi-codegen/v2 version v2.0.0-00010101000000-000000000000 DO NOT EDIT. package xenumnames // Defines values for ClientType. diff --git a/examples/extensions/xenumnames/generate.go b/examples/extensions/xenumnames/generate.go index 25f29663f..599d6f3f9 100644 --- a/examples/extensions/xenumnames/generate.go +++ b/examples/extensions/xenumnames/generate.go @@ -1,3 +1,3 @@ package xenumnames -//go:generate go run github.com/deepmap/oapi-codegen/v2/cmd/oapi-codegen -config cfg.yaml api.yaml +//go:generate go run github.com/oapi-codegen/oapi-codegen/v2/cmd/oapi-codegen -config cfg.yaml api.yaml diff --git a/examples/extensions/xgojsonignore/gen.go b/examples/extensions/xgojsonignore/gen.go index 4d2b1d0c6..17c21373d 100644 --- a/examples/extensions/xgojsonignore/gen.go +++ b/examples/extensions/xgojsonignore/gen.go @@ -1,6 +1,6 @@ // Package xgojsonignore provides primitives to interact with the openapi HTTP API. // -// Code generated by github.com/deepmap/oapi-codegen/v2 version v2.0.0-00010101000000-000000000000 DO NOT EDIT. +// Code generated by github.com/oapi-codegen/oapi-codegen/v2 version v2.0.0-00010101000000-000000000000 DO NOT EDIT. package xgojsonignore // Client defines model for Client. diff --git a/examples/extensions/xgojsonignore/generate.go b/examples/extensions/xgojsonignore/generate.go index 2c5acf839..0d8488e43 100644 --- a/examples/extensions/xgojsonignore/generate.go +++ b/examples/extensions/xgojsonignore/generate.go @@ -1,3 +1,3 @@ package xgojsonignore -//go:generate go run github.com/deepmap/oapi-codegen/v2/cmd/oapi-codegen -config cfg.yaml api.yaml +//go:generate go run github.com/oapi-codegen/oapi-codegen/v2/cmd/oapi-codegen -config cfg.yaml api.yaml diff --git a/examples/extensions/xgoname/gen.go b/examples/extensions/xgoname/gen.go index 27566e07e..c7831379a 100644 --- a/examples/extensions/xgoname/gen.go +++ b/examples/extensions/xgoname/gen.go @@ -1,6 +1,6 @@ // Package xgoname provides primitives to interact with the openapi HTTP API. // -// Code generated by github.com/deepmap/oapi-codegen/v2 version v2.0.0-00010101000000-000000000000 DO NOT EDIT. +// Code generated by github.com/oapi-codegen/oapi-codegen/v2 version v2.0.0-00010101000000-000000000000 DO NOT EDIT. package xgoname // Client defines model for Client. diff --git a/examples/extensions/xgoname/generate.go b/examples/extensions/xgoname/generate.go index 3fe1cb0ec..546211419 100644 --- a/examples/extensions/xgoname/generate.go +++ b/examples/extensions/xgoname/generate.go @@ -1,3 +1,3 @@ package xgoname -//go:generate go run github.com/deepmap/oapi-codegen/v2/cmd/oapi-codegen -config cfg.yaml api.yaml +//go:generate go run github.com/oapi-codegen/oapi-codegen/v2/cmd/oapi-codegen -config cfg.yaml api.yaml diff --git a/examples/extensions/xgotype/gen.go b/examples/extensions/xgotype/gen.go index 5c50fb5ee..376c1fdbf 100644 --- a/examples/extensions/xgotype/gen.go +++ b/examples/extensions/xgotype/gen.go @@ -1,6 +1,6 @@ // Package xgotype provides primitives to interact with the openapi HTTP API. // -// Code generated by github.com/deepmap/oapi-codegen/v2 version v2.0.0-00010101000000-000000000000 DO NOT EDIT. +// Code generated by github.com/oapi-codegen/oapi-codegen/v2 version v2.0.0-00010101000000-000000000000 DO NOT EDIT. package xgotype import ( diff --git a/examples/extensions/xgotype/generate.go b/examples/extensions/xgotype/generate.go index 134bf7fc0..fc28c53de 100644 --- a/examples/extensions/xgotype/generate.go +++ b/examples/extensions/xgotype/generate.go @@ -1,3 +1,3 @@ package xgotype -//go:generate go run github.com/deepmap/oapi-codegen/v2/cmd/oapi-codegen -config cfg.yaml api.yaml +//go:generate go run github.com/oapi-codegen/oapi-codegen/v2/cmd/oapi-codegen -config cfg.yaml api.yaml diff --git a/examples/extensions/xgotypename/gen.go b/examples/extensions/xgotypename/gen.go index da3603758..cc0c9c2bf 100644 --- a/examples/extensions/xgotypename/gen.go +++ b/examples/extensions/xgotypename/gen.go @@ -1,6 +1,6 @@ // Package xgotypename provides primitives to interact with the openapi HTTP API. // -// Code generated by github.com/deepmap/oapi-codegen/v2 version v2.0.0-00010101000000-000000000000 DO NOT EDIT. +// Code generated by github.com/oapi-codegen/oapi-codegen/v2 version v2.0.0-00010101000000-000000000000 DO NOT EDIT. package xgotypename // Client defines model for Client. diff --git a/examples/extensions/xgotypename/generate.go b/examples/extensions/xgotypename/generate.go index 8a47607d4..787661180 100644 --- a/examples/extensions/xgotypename/generate.go +++ b/examples/extensions/xgotypename/generate.go @@ -1,3 +1,3 @@ package xgotypename -//go:generate go run github.com/deepmap/oapi-codegen/v2/cmd/oapi-codegen -config cfg.yaml api.yaml +//go:generate go run github.com/oapi-codegen/oapi-codegen/v2/cmd/oapi-codegen -config cfg.yaml api.yaml diff --git a/examples/extensions/xgotypeskipoptionalpointer/gen.go b/examples/extensions/xgotypeskipoptionalpointer/gen.go index 984d870d9..ddb1df843 100644 --- a/examples/extensions/xgotypeskipoptionalpointer/gen.go +++ b/examples/extensions/xgotypeskipoptionalpointer/gen.go @@ -1,6 +1,6 @@ // Package xgotypeskipoptionalpointer provides primitives to interact with the openapi HTTP API. // -// Code generated by github.com/deepmap/oapi-codegen/v2 version v2.0.0-00010101000000-000000000000 DO NOT EDIT. +// Code generated by github.com/oapi-codegen/oapi-codegen/v2 version v2.0.0-00010101000000-000000000000 DO NOT EDIT. package xgotypeskipoptionalpointer // Client defines model for Client. diff --git a/examples/extensions/xgotypeskipoptionalpointer/generate.go b/examples/extensions/xgotypeskipoptionalpointer/generate.go index ea93abff4..582ec97fd 100644 --- a/examples/extensions/xgotypeskipoptionalpointer/generate.go +++ b/examples/extensions/xgotypeskipoptionalpointer/generate.go @@ -1,3 +1,3 @@ package xgotypeskipoptionalpointer -//go:generate go run github.com/deepmap/oapi-codegen/v2/cmd/oapi-codegen -config cfg.yaml api.yaml +//go:generate go run github.com/oapi-codegen/oapi-codegen/v2/cmd/oapi-codegen -config cfg.yaml api.yaml diff --git a/examples/extensions/xoapicodegenextratags/gen.go b/examples/extensions/xoapicodegenextratags/gen.go index 288674119..25f950e3d 100644 --- a/examples/extensions/xoapicodegenextratags/gen.go +++ b/examples/extensions/xoapicodegenextratags/gen.go @@ -1,6 +1,6 @@ // Package xoapicodegenextratags provides primitives to interact with the openapi HTTP API. // -// Code generated by github.com/deepmap/oapi-codegen/v2 version v2.0.0-00010101000000-000000000000 DO NOT EDIT. +// Code generated by github.com/oapi-codegen/oapi-codegen/v2 version v2.0.0-00010101000000-000000000000 DO NOT EDIT. package xoapicodegenextratags // Client defines model for Client. diff --git a/examples/extensions/xoapicodegenextratags/generate.go b/examples/extensions/xoapicodegenextratags/generate.go index 0cebd6cd1..6906128b0 100644 --- a/examples/extensions/xoapicodegenextratags/generate.go +++ b/examples/extensions/xoapicodegenextratags/generate.go @@ -1,3 +1,3 @@ package xoapicodegenextratags -//go:generate go run github.com/deepmap/oapi-codegen/v2/cmd/oapi-codegen -config cfg.yaml api.yaml +//go:generate go run github.com/oapi-codegen/oapi-codegen/v2/cmd/oapi-codegen -config cfg.yaml api.yaml diff --git a/examples/extensions/xomitempty/gen.go b/examples/extensions/xomitempty/gen.go index 39c4e773c..a4a06f97e 100644 --- a/examples/extensions/xomitempty/gen.go +++ b/examples/extensions/xomitempty/gen.go @@ -1,6 +1,6 @@ // Package xomitempty provides primitives to interact with the openapi HTTP API. // -// Code generated by github.com/deepmap/oapi-codegen/v2 version v2.0.0-00010101000000-000000000000 DO NOT EDIT. +// Code generated by github.com/oapi-codegen/oapi-codegen/v2 version v2.0.0-00010101000000-000000000000 DO NOT EDIT. package xomitempty // Client defines model for Client. diff --git a/examples/extensions/xomitempty/generate.go b/examples/extensions/xomitempty/generate.go index ae9a5d016..c6c48c4fe 100644 --- a/examples/extensions/xomitempty/generate.go +++ b/examples/extensions/xomitempty/generate.go @@ -1,3 +1,3 @@ package xomitempty -//go:generate go run github.com/deepmap/oapi-codegen/v2/cmd/oapi-codegen -config cfg.yaml api.yaml +//go:generate go run github.com/oapi-codegen/oapi-codegen/v2/cmd/oapi-codegen -config cfg.yaml api.yaml diff --git a/examples/extensions/xorder/gen.go b/examples/extensions/xorder/gen.go index 6f6065e2c..bb5841d56 100644 --- a/examples/extensions/xorder/gen.go +++ b/examples/extensions/xorder/gen.go @@ -1,6 +1,6 @@ // Package xorder provides primitives to interact with the openapi HTTP API. // -// Code generated by github.com/deepmap/oapi-codegen/v2 version v2.0.0-00010101000000-000000000000 DO NOT EDIT. +// Code generated by github.com/oapi-codegen/oapi-codegen/v2 version v2.0.0-00010101000000-000000000000 DO NOT EDIT. package xorder // Client defines model for Client. diff --git a/examples/extensions/xorder/generate.go b/examples/extensions/xorder/generate.go index 34a64bf71..9b9d46563 100644 --- a/examples/extensions/xorder/generate.go +++ b/examples/extensions/xorder/generate.go @@ -1,3 +1,3 @@ package xorder -//go:generate go run github.com/deepmap/oapi-codegen/v2/cmd/oapi-codegen -config cfg.yaml api.yaml +//go:generate go run github.com/oapi-codegen/oapi-codegen/v2/cmd/oapi-codegen -config cfg.yaml api.yaml diff --git a/examples/go.mod b/examples/go.mod index d78684b03..077872f27 100644 --- a/examples/go.mod +++ b/examples/go.mod @@ -1,11 +1,10 @@ -module github.com/deepmap/oapi-codegen/v2/examples +module github.com/oapi-codegen/oapi-codegen/v2/examples go 1.20 -replace github.com/deepmap/oapi-codegen/v2 => ../ +replace github.com/oapi-codegen/oapi-codegen/v2 => ../ require ( - github.com/deepmap/oapi-codegen/v2 v2.0.0-00010101000000-000000000000 github.com/getkin/kin-openapi v0.124.0 github.com/gin-gonic/gin v1.10.0 github.com/go-chi/chi/v5 v5.0.10 @@ -20,6 +19,7 @@ require ( github.com/oapi-codegen/gin-middleware v1.0.2 github.com/oapi-codegen/iris-middleware v1.0.5 github.com/oapi-codegen/nethttp-middleware v1.0.2 + github.com/oapi-codegen/oapi-codegen/v2 v2.0.0-00010101000000-000000000000 github.com/oapi-codegen/runtime v1.1.0 github.com/oapi-codegen/testutil v1.0.0 github.com/stretchr/testify v1.9.0 diff --git a/examples/import-mapping/admin/cfg.yaml b/examples/import-mapping/admin/cfg.yaml index 003f174aa..a888e035a 100644 --- a/examples/import-mapping/admin/cfg.yaml +++ b/examples/import-mapping/admin/cfg.yaml @@ -8,4 +8,4 @@ output-options: # to make sure that all types are generated skip-prune: true import-mapping: - ../common/api.yaml: github.com/deepmap/oapi-codegen/v2/examples/import-mapping/common + ../common/api.yaml: github.com/oapi-codegen/oapi-codegen/v2/examples/import-mapping/common diff --git a/examples/import-mapping/admin/generate.go b/examples/import-mapping/admin/generate.go index 893f74c68..0cc4cece1 100644 --- a/examples/import-mapping/admin/generate.go +++ b/examples/import-mapping/admin/generate.go @@ -1,3 +1,3 @@ package admin -//go:generate go run github.com/deepmap/oapi-codegen/v2/cmd/oapi-codegen -config cfg.yaml api.yaml +//go:generate go run github.com/oapi-codegen/oapi-codegen/v2/cmd/oapi-codegen -config cfg.yaml api.yaml diff --git a/examples/import-mapping/admin/server.gen.go b/examples/import-mapping/admin/server.gen.go index e70d9667a..66d84690c 100644 --- a/examples/import-mapping/admin/server.gen.go +++ b/examples/import-mapping/admin/server.gen.go @@ -1,14 +1,14 @@ // Package admin provides primitives to interact with the openapi HTTP API. // -// Code generated by github.com/deepmap/oapi-codegen/v2 version v2.0.0-00010101000000-000000000000 DO NOT EDIT. +// Code generated by github.com/oapi-codegen/oapi-codegen/v2 version v2.0.0-00010101000000-000000000000 DO NOT EDIT. package admin import ( "fmt" "net/http" - externalRef0 "github.com/deepmap/oapi-codegen/v2/examples/import-mapping/common" "github.com/go-chi/chi/v5" + externalRef0 "github.com/oapi-codegen/oapi-codegen/v2/examples/import-mapping/common" "github.com/oapi-codegen/runtime" openapi_types "github.com/oapi-codegen/runtime/types" ) diff --git a/examples/import-mapping/common/generate.go b/examples/import-mapping/common/generate.go index e74ff35bd..4e7fe60ec 100644 --- a/examples/import-mapping/common/generate.go +++ b/examples/import-mapping/common/generate.go @@ -1,3 +1,3 @@ package common -//go:generate go run github.com/deepmap/oapi-codegen/v2/cmd/oapi-codegen -config cfg.yaml api.yaml +//go:generate go run github.com/oapi-codegen/oapi-codegen/v2/cmd/oapi-codegen -config cfg.yaml api.yaml diff --git a/examples/import-mapping/common/types.gen.go b/examples/import-mapping/common/types.gen.go index 28ba244f6..178106064 100644 --- a/examples/import-mapping/common/types.gen.go +++ b/examples/import-mapping/common/types.gen.go @@ -1,6 +1,6 @@ // Package common provides primitives to interact with the openapi HTTP API. // -// Code generated by github.com/deepmap/oapi-codegen/v2 version v2.0.0-00010101000000-000000000000 DO NOT EDIT. +// Code generated by github.com/oapi-codegen/oapi-codegen/v2 version v2.0.0-00010101000000-000000000000 DO NOT EDIT. package common // User defines model for User. diff --git a/examples/minimal-server/chi/api/generate.go b/examples/minimal-server/chi/api/generate.go index 2eec2d3d9..386f093dc 100644 --- a/examples/minimal-server/chi/api/generate.go +++ b/examples/minimal-server/chi/api/generate.go @@ -1,3 +1,3 @@ package api -//go:generate go run github.com/deepmap/oapi-codegen/v2/cmd/oapi-codegen -config cfg.yaml ../../api.yaml +//go:generate go run github.com/oapi-codegen/oapi-codegen/v2/cmd/oapi-codegen -config cfg.yaml ../../api.yaml diff --git a/examples/minimal-server/chi/api/ping.gen.go b/examples/minimal-server/chi/api/ping.gen.go index 823173fcc..3f4b5ce29 100644 --- a/examples/minimal-server/chi/api/ping.gen.go +++ b/examples/minimal-server/chi/api/ping.gen.go @@ -1,6 +1,6 @@ // Package api provides primitives to interact with the openapi HTTP API. // -// Code generated by github.com/deepmap/oapi-codegen/v2 version v2.0.0-00010101000000-000000000000 DO NOT EDIT. +// Code generated by github.com/oapi-codegen/oapi-codegen/v2 version v2.0.0-00010101000000-000000000000 DO NOT EDIT. package api import ( diff --git a/examples/minimal-server/chi/main.go b/examples/minimal-server/chi/main.go index f711001de..56e0a0515 100644 --- a/examples/minimal-server/chi/main.go +++ b/examples/minimal-server/chi/main.go @@ -4,8 +4,8 @@ import ( "log" "net/http" - "github.com/deepmap/oapi-codegen/v2/examples/minimal-server/chi/api" "github.com/go-chi/chi/v5" + "github.com/oapi-codegen/oapi-codegen/v2/examples/minimal-server/chi/api" ) func main() { diff --git a/examples/minimal-server/echo/api/generate.go b/examples/minimal-server/echo/api/generate.go index 2eec2d3d9..386f093dc 100644 --- a/examples/minimal-server/echo/api/generate.go +++ b/examples/minimal-server/echo/api/generate.go @@ -1,3 +1,3 @@ package api -//go:generate go run github.com/deepmap/oapi-codegen/v2/cmd/oapi-codegen -config cfg.yaml ../../api.yaml +//go:generate go run github.com/oapi-codegen/oapi-codegen/v2/cmd/oapi-codegen -config cfg.yaml ../../api.yaml diff --git a/examples/minimal-server/echo/api/ping.gen.go b/examples/minimal-server/echo/api/ping.gen.go index b660981a8..bd78f8f2a 100644 --- a/examples/minimal-server/echo/api/ping.gen.go +++ b/examples/minimal-server/echo/api/ping.gen.go @@ -1,6 +1,6 @@ // Package api provides primitives to interact with the openapi HTTP API. // -// Code generated by github.com/deepmap/oapi-codegen/v2 version v2.0.0-00010101000000-000000000000 DO NOT EDIT. +// Code generated by github.com/oapi-codegen/oapi-codegen/v2 version v2.0.0-00010101000000-000000000000 DO NOT EDIT. package api import ( diff --git a/examples/minimal-server/echo/main.go b/examples/minimal-server/echo/main.go index f424f015b..ae53667f3 100644 --- a/examples/minimal-server/echo/main.go +++ b/examples/minimal-server/echo/main.go @@ -3,8 +3,8 @@ package main import ( "log" - "github.com/deepmap/oapi-codegen/v2/examples/minimal-server/echo/api" "github.com/labstack/echo/v4" + "github.com/oapi-codegen/oapi-codegen/v2/examples/minimal-server/echo/api" ) func main() { diff --git a/examples/minimal-server/fiber/api/generate.go b/examples/minimal-server/fiber/api/generate.go index 2eec2d3d9..386f093dc 100644 --- a/examples/minimal-server/fiber/api/generate.go +++ b/examples/minimal-server/fiber/api/generate.go @@ -1,3 +1,3 @@ package api -//go:generate go run github.com/deepmap/oapi-codegen/v2/cmd/oapi-codegen -config cfg.yaml ../../api.yaml +//go:generate go run github.com/oapi-codegen/oapi-codegen/v2/cmd/oapi-codegen -config cfg.yaml ../../api.yaml diff --git a/examples/minimal-server/fiber/api/ping.gen.go b/examples/minimal-server/fiber/api/ping.gen.go index 78e784bc9..a21e6fa95 100644 --- a/examples/minimal-server/fiber/api/ping.gen.go +++ b/examples/minimal-server/fiber/api/ping.gen.go @@ -1,6 +1,6 @@ // Package api provides primitives to interact with the openapi HTTP API. // -// Code generated by github.com/deepmap/oapi-codegen/v2 version v2.0.0-00010101000000-000000000000 DO NOT EDIT. +// Code generated by github.com/oapi-codegen/oapi-codegen/v2 version v2.0.0-00010101000000-000000000000 DO NOT EDIT. package api import ( diff --git a/examples/minimal-server/fiber/main.go b/examples/minimal-server/fiber/main.go index 2ca3854cd..88504af7b 100644 --- a/examples/minimal-server/fiber/main.go +++ b/examples/minimal-server/fiber/main.go @@ -3,8 +3,8 @@ package main import ( "log" - "github.com/deepmap/oapi-codegen/v2/examples/minimal-server/fiber/api" "github.com/gofiber/fiber/v2" + "github.com/oapi-codegen/oapi-codegen/v2/examples/minimal-server/fiber/api" ) func main() { diff --git a/examples/minimal-server/gin/api/generate.go b/examples/minimal-server/gin/api/generate.go index 2eec2d3d9..386f093dc 100644 --- a/examples/minimal-server/gin/api/generate.go +++ b/examples/minimal-server/gin/api/generate.go @@ -1,3 +1,3 @@ package api -//go:generate go run github.com/deepmap/oapi-codegen/v2/cmd/oapi-codegen -config cfg.yaml ../../api.yaml +//go:generate go run github.com/oapi-codegen/oapi-codegen/v2/cmd/oapi-codegen -config cfg.yaml ../../api.yaml diff --git a/examples/minimal-server/gin/api/ping.gen.go b/examples/minimal-server/gin/api/ping.gen.go index 58852ee51..8e018d4e8 100644 --- a/examples/minimal-server/gin/api/ping.gen.go +++ b/examples/minimal-server/gin/api/ping.gen.go @@ -1,6 +1,6 @@ // Package api provides primitives to interact with the openapi HTTP API. // -// Code generated by github.com/deepmap/oapi-codegen/v2 version v2.0.0-00010101000000-000000000000 DO NOT EDIT. +// Code generated by github.com/oapi-codegen/oapi-codegen/v2 version v2.0.0-00010101000000-000000000000 DO NOT EDIT. package api import ( diff --git a/examples/minimal-server/gin/main.go b/examples/minimal-server/gin/main.go index ca8d4b040..365932e31 100644 --- a/examples/minimal-server/gin/main.go +++ b/examples/minimal-server/gin/main.go @@ -4,8 +4,8 @@ import ( "log" "net/http" - "github.com/deepmap/oapi-codegen/v2/examples/minimal-server/gin/api" "github.com/gin-gonic/gin" + "github.com/oapi-codegen/oapi-codegen/v2/examples/minimal-server/gin/api" ) func main() { diff --git a/examples/minimal-server/gorillamux/api/generate.go b/examples/minimal-server/gorillamux/api/generate.go index 2eec2d3d9..386f093dc 100644 --- a/examples/minimal-server/gorillamux/api/generate.go +++ b/examples/minimal-server/gorillamux/api/generate.go @@ -1,3 +1,3 @@ package api -//go:generate go run github.com/deepmap/oapi-codegen/v2/cmd/oapi-codegen -config cfg.yaml ../../api.yaml +//go:generate go run github.com/oapi-codegen/oapi-codegen/v2/cmd/oapi-codegen -config cfg.yaml ../../api.yaml diff --git a/examples/minimal-server/gorillamux/api/ping.gen.go b/examples/minimal-server/gorillamux/api/ping.gen.go index efb430949..f62e3c7f0 100644 --- a/examples/minimal-server/gorillamux/api/ping.gen.go +++ b/examples/minimal-server/gorillamux/api/ping.gen.go @@ -1,6 +1,6 @@ // Package api provides primitives to interact with the openapi HTTP API. // -// Code generated by github.com/deepmap/oapi-codegen/v2 version v2.0.0-00010101000000-000000000000 DO NOT EDIT. +// Code generated by github.com/oapi-codegen/oapi-codegen/v2 version v2.0.0-00010101000000-000000000000 DO NOT EDIT. package api import ( diff --git a/examples/minimal-server/gorillamux/main.go b/examples/minimal-server/gorillamux/main.go index 2ce286bec..5d7dc87f7 100644 --- a/examples/minimal-server/gorillamux/main.go +++ b/examples/minimal-server/gorillamux/main.go @@ -4,8 +4,8 @@ import ( "log" "net/http" - "github.com/deepmap/oapi-codegen/v2/examples/minimal-server/gorillamux/api" "github.com/gorilla/mux" + "github.com/oapi-codegen/oapi-codegen/v2/examples/minimal-server/gorillamux/api" ) func main() { diff --git a/examples/minimal-server/iris/api/generate.go b/examples/minimal-server/iris/api/generate.go index 2eec2d3d9..386f093dc 100644 --- a/examples/minimal-server/iris/api/generate.go +++ b/examples/minimal-server/iris/api/generate.go @@ -1,3 +1,3 @@ package api -//go:generate go run github.com/deepmap/oapi-codegen/v2/cmd/oapi-codegen -config cfg.yaml ../../api.yaml +//go:generate go run github.com/oapi-codegen/oapi-codegen/v2/cmd/oapi-codegen -config cfg.yaml ../../api.yaml diff --git a/examples/minimal-server/iris/api/ping.gen.go b/examples/minimal-server/iris/api/ping.gen.go index a5f27a62b..144166eba 100644 --- a/examples/minimal-server/iris/api/ping.gen.go +++ b/examples/minimal-server/iris/api/ping.gen.go @@ -1,6 +1,6 @@ // Package api provides primitives to interact with the openapi HTTP API. // -// Code generated by github.com/deepmap/oapi-codegen/v2 version v2.0.0-00010101000000-000000000000 DO NOT EDIT. +// Code generated by github.com/oapi-codegen/oapi-codegen/v2 version v2.0.0-00010101000000-000000000000 DO NOT EDIT. package api import ( diff --git a/examples/minimal-server/iris/main.go b/examples/minimal-server/iris/main.go index 62a4c1c64..a163d6f59 100644 --- a/examples/minimal-server/iris/main.go +++ b/examples/minimal-server/iris/main.go @@ -3,8 +3,8 @@ package main import ( "log" - "github.com/deepmap/oapi-codegen/v2/examples/minimal-server/iris/api" "github.com/kataras/iris/v12" + "github.com/oapi-codegen/oapi-codegen/v2/examples/minimal-server/iris/api" ) func main() { diff --git a/examples/minimal-server/nethttp-compatible/main.go b/examples/minimal-server/nethttp-compatible/main.go index 6b342a219..784b741cf 100644 --- a/examples/minimal-server/nethttp-compatible/main.go +++ b/examples/minimal-server/nethttp-compatible/main.go @@ -4,7 +4,7 @@ import ( "log" "net/http" - "github.com/deepmap/oapi-codegen/v2/examples/minimal-server/gorillamux/api" + "github.com/oapi-codegen/oapi-codegen/v2/examples/minimal-server/gorillamux/api" ) func main() { diff --git a/examples/minimal-server/stdhttp/api/generate.go b/examples/minimal-server/stdhttp/api/generate.go index 2eec2d3d9..386f093dc 100644 --- a/examples/minimal-server/stdhttp/api/generate.go +++ b/examples/minimal-server/stdhttp/api/generate.go @@ -1,3 +1,3 @@ package api -//go:generate go run github.com/deepmap/oapi-codegen/v2/cmd/oapi-codegen -config cfg.yaml ../../api.yaml +//go:generate go run github.com/oapi-codegen/oapi-codegen/v2/cmd/oapi-codegen -config cfg.yaml ../../api.yaml diff --git a/examples/minimal-server/stdhttp/api/ping.gen.go b/examples/minimal-server/stdhttp/api/ping.gen.go index ae777e3ba..6d11afc6e 100644 --- a/examples/minimal-server/stdhttp/api/ping.gen.go +++ b/examples/minimal-server/stdhttp/api/ping.gen.go @@ -2,7 +2,7 @@ // Package api provides primitives to interact with the openapi HTTP API. // -// Code generated by github.com/deepmap/oapi-codegen/v2 version v2.0.0-00010101000000-000000000000 DO NOT EDIT. +// Code generated by github.com/oapi-codegen/oapi-codegen/v2 version v2.0.0-00010101000000-000000000000 DO NOT EDIT. package api import ( diff --git a/examples/minimal-server/stdhttp/go.mod b/examples/minimal-server/stdhttp/go.mod index 07ecb9df5..f2385d10f 100644 --- a/examples/minimal-server/stdhttp/go.mod +++ b/examples/minimal-server/stdhttp/go.mod @@ -1,10 +1,10 @@ -module github.com/deepmap/oapi-codegen/v2/examples/minimal-server/stdhttp +module github.com/oapi-codegen/oapi-codegen/v2/examples/minimal-server/stdhttp go 1.22 -replace github.com/deepmap/oapi-codegen/v2 => ../../../ +replace github.com/oapi-codegen/oapi-codegen/v2 => ../../../ -require github.com/deepmap/oapi-codegen/v2 v2.0.0-00010101000000-000000000000 +require github.com/oapi-codegen/oapi-codegen/v2 v2.0.0-00010101000000-000000000000 require ( github.com/getkin/kin-openapi v0.124.0 // indirect diff --git a/examples/minimal-server/stdhttp/main.go b/examples/minimal-server/stdhttp/main.go index 5f4646261..8ee94ec49 100644 --- a/examples/minimal-server/stdhttp/main.go +++ b/examples/minimal-server/stdhttp/main.go @@ -4,7 +4,7 @@ import ( "log" "net/http" - "github.com/deepmap/oapi-codegen/v2/examples/minimal-server/stdhttp/api" + "github.com/oapi-codegen/oapi-codegen/v2/examples/minimal-server/stdhttp/api" ) func main() { diff --git a/examples/minimal-server/stdhttp/tools/tools.go b/examples/minimal-server/stdhttp/tools/tools.go index 67a500f26..8615cb4c5 100644 --- a/examples/minimal-server/stdhttp/tools/tools.go +++ b/examples/minimal-server/stdhttp/tools/tools.go @@ -4,5 +4,5 @@ package tools import ( - _ "github.com/deepmap/oapi-codegen/v2/cmd/oapi-codegen" + _ "github.com/oapi-codegen/oapi-codegen/v2/cmd/oapi-codegen" ) diff --git a/examples/no-vcs-version-override/echo/api/api.gen.go b/examples/no-vcs-version-override/echo/api/api.gen.go index 6ce0064e5..e95391fd1 100644 --- a/examples/no-vcs-version-override/echo/api/api.gen.go +++ b/examples/no-vcs-version-override/echo/api/api.gen.go @@ -1,6 +1,6 @@ // Package api provides primitives to interact with the openapi HTTP API. // -// Code generated by github.com/deepmap/oapi-codegen/v2 version v123.456.789 DO NOT EDIT. +// Code generated by github.com/oapi-codegen/oapi-codegen/v2 version v123.456.789 DO NOT EDIT. package api import ( diff --git a/examples/no-vcs-version-override/echo/api/doc.go b/examples/no-vcs-version-override/echo/api/doc.go index 82d3898ce..03f5a0318 100644 --- a/examples/no-vcs-version-override/echo/api/doc.go +++ b/examples/no-vcs-version-override/echo/api/doc.go @@ -1,3 +1,3 @@ package api -//go:generate go run -ldflags "-X main.noVCSVersionOverride=v123.456.789" github.com/deepmap/oapi-codegen/v2/cmd/oapi-codegen --config=config.yaml ../../api.yaml +//go:generate go run -ldflags "-X main.noVCSVersionOverride=v123.456.789" github.com/oapi-codegen/oapi-codegen/v2/cmd/oapi-codegen --config=config.yaml ../../api.yaml diff --git a/examples/only-models/generate.go b/examples/only-models/generate.go index a94b7f227..91b495725 100644 --- a/examples/only-models/generate.go +++ b/examples/only-models/generate.go @@ -1,3 +1,3 @@ package onlymodels -//go:generate go run github.com/deepmap/oapi-codegen/v2/cmd/oapi-codegen -config cfg.yaml api.yaml +//go:generate go run github.com/oapi-codegen/oapi-codegen/v2/cmd/oapi-codegen -config cfg.yaml api.yaml diff --git a/examples/only-models/only-models.gen.go b/examples/only-models/only-models.gen.go index 412e82a10..c8f33c9c8 100644 --- a/examples/only-models/only-models.gen.go +++ b/examples/only-models/only-models.gen.go @@ -1,6 +1,6 @@ // Package onlymodels provides primitives to interact with the openapi HTTP API. // -// Code generated by github.com/deepmap/oapi-codegen/v2 version v2.0.0-00010101000000-000000000000 DO NOT EDIT. +// Code generated by github.com/oapi-codegen/oapi-codegen/v2 version v2.0.0-00010101000000-000000000000 DO NOT EDIT. package onlymodels // Client defines model for Client. diff --git a/examples/petstore-expanded/chi/api/petstore.gen.go b/examples/petstore-expanded/chi/api/petstore.gen.go index 5f69e4bfa..89777eba0 100644 --- a/examples/petstore-expanded/chi/api/petstore.gen.go +++ b/examples/petstore-expanded/chi/api/petstore.gen.go @@ -1,6 +1,6 @@ // Package api provides primitives to interact with the openapi HTTP API. // -// Code generated by github.com/deepmap/oapi-codegen/v2 version v2.0.0-00010101000000-000000000000 DO NOT EDIT. +// Code generated by github.com/oapi-codegen/oapi-codegen/v2 version v2.0.0-00010101000000-000000000000 DO NOT EDIT. package api import ( diff --git a/examples/petstore-expanded/chi/api/petstore.go b/examples/petstore-expanded/chi/api/petstore.go index 888d16f13..6ede559ec 100644 --- a/examples/petstore-expanded/chi/api/petstore.go +++ b/examples/petstore-expanded/chi/api/petstore.go @@ -1,4 +1,4 @@ -//go:generate go run github.com/deepmap/oapi-codegen/v2/cmd/oapi-codegen --config=cfg.yaml ../../petstore-expanded.yaml +//go:generate go run github.com/oapi-codegen/oapi-codegen/v2/cmd/oapi-codegen --config=cfg.yaml ../../petstore-expanded.yaml package api diff --git a/examples/petstore-expanded/chi/petstore.go b/examples/petstore-expanded/chi/petstore.go index 20b1f5ce8..b525fa576 100644 --- a/examples/petstore-expanded/chi/petstore.go +++ b/examples/petstore-expanded/chi/petstore.go @@ -12,9 +12,9 @@ import ( "net/http" "os" - "github.com/deepmap/oapi-codegen/v2/examples/petstore-expanded/chi/api" - middleware "github.com/oapi-codegen/nethttp-middleware" "github.com/go-chi/chi/v5" + middleware "github.com/oapi-codegen/nethttp-middleware" + "github.com/oapi-codegen/oapi-codegen/v2/examples/petstore-expanded/chi/api" ) func main() { diff --git a/examples/petstore-expanded/chi/petstore_test.go b/examples/petstore-expanded/chi/petstore_test.go index aa2380e60..e9d7662b4 100644 --- a/examples/petstore-expanded/chi/petstore_test.go +++ b/examples/petstore-expanded/chi/petstore_test.go @@ -7,10 +7,10 @@ import ( "net/http/httptest" "testing" - "github.com/deepmap/oapi-codegen/v2/examples/petstore-expanded/chi/api" + "github.com/go-chi/chi/v5" middleware "github.com/oapi-codegen/nethttp-middleware" + "github.com/oapi-codegen/oapi-codegen/v2/examples/petstore-expanded/chi/api" "github.com/oapi-codegen/testutil" - "github.com/go-chi/chi/v5" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" ) diff --git a/examples/petstore-expanded/echo/api/models/models.gen.go b/examples/petstore-expanded/echo/api/models/models.gen.go index 61880b8d6..0945e02ab 100644 --- a/examples/petstore-expanded/echo/api/models/models.gen.go +++ b/examples/petstore-expanded/echo/api/models/models.gen.go @@ -1,6 +1,6 @@ // Package models provides primitives to interact with the openapi HTTP API. // -// Code generated by github.com/deepmap/oapi-codegen/v2 version v2.0.0-00010101000000-000000000000 DO NOT EDIT. +// Code generated by github.com/oapi-codegen/oapi-codegen/v2 version v2.0.0-00010101000000-000000000000 DO NOT EDIT. package models // Error defines model for Error. diff --git a/examples/petstore-expanded/echo/api/petstore-server.gen.go b/examples/petstore-expanded/echo/api/petstore-server.gen.go index e92c4a0cc..8767c17a1 100644 --- a/examples/petstore-expanded/echo/api/petstore-server.gen.go +++ b/examples/petstore-expanded/echo/api/petstore-server.gen.go @@ -1,6 +1,6 @@ // Package api provides primitives to interact with the openapi HTTP API. // -// Code generated by github.com/deepmap/oapi-codegen/v2 version v2.0.0-00010101000000-000000000000 DO NOT EDIT. +// Code generated by github.com/oapi-codegen/oapi-codegen/v2 version v2.0.0-00010101000000-000000000000 DO NOT EDIT. package api import ( @@ -13,9 +13,9 @@ import ( "path" "strings" - . "github.com/deepmap/oapi-codegen/v2/examples/petstore-expanded/echo/api/models" "github.com/getkin/kin-openapi/openapi3" "github.com/labstack/echo/v4" + . "github.com/oapi-codegen/oapi-codegen/v2/examples/petstore-expanded/echo/api/models" "github.com/oapi-codegen/runtime" ) diff --git a/examples/petstore-expanded/echo/api/petstore.go b/examples/petstore-expanded/echo/api/petstore.go index 4c3f412fb..9934fa992 100644 --- a/examples/petstore-expanded/echo/api/petstore.go +++ b/examples/petstore-expanded/echo/api/petstore.go @@ -12,8 +12,8 @@ // See the License for the specific language governing permissions and // limitations under the License. -//go:generate go run github.com/deepmap/oapi-codegen/v2/cmd/oapi-codegen --config=models.cfg.yaml ../../petstore-expanded.yaml -//go:generate go run github.com/deepmap/oapi-codegen/v2/cmd/oapi-codegen --config=server.cfg.yaml ../../petstore-expanded.yaml +//go:generate go run github.com/oapi-codegen/oapi-codegen/v2/cmd/oapi-codegen --config=models.cfg.yaml ../../petstore-expanded.yaml +//go:generate go run github.com/oapi-codegen/oapi-codegen/v2/cmd/oapi-codegen --config=server.cfg.yaml ../../petstore-expanded.yaml package api @@ -22,8 +22,8 @@ import ( "net/http" "sync" - "github.com/deepmap/oapi-codegen/v2/examples/petstore-expanded/echo/api/models" "github.com/labstack/echo/v4" + "github.com/oapi-codegen/oapi-codegen/v2/examples/petstore-expanded/echo/api/models" ) type PetStore struct { diff --git a/examples/petstore-expanded/echo/api/server.cfg.yaml b/examples/petstore-expanded/echo/api/server.cfg.yaml index bb3f813ab..534f4d8f5 100644 --- a/examples/petstore-expanded/echo/api/server.cfg.yaml +++ b/examples/petstore-expanded/echo/api/server.cfg.yaml @@ -2,7 +2,7 @@ package: api output: petstore-server.gen.go additional-imports: - - package: github.com/deepmap/oapi-codegen/v2/examples/petstore-expanded/echo/api/models + - package: github.com/oapi-codegen/oapi-codegen/v2/examples/petstore-expanded/echo/api/models alias: . generate: echo-server: true diff --git a/examples/petstore-expanded/echo/petstore.go b/examples/petstore-expanded/echo/petstore.go index ea13d7192..5ea025050 100644 --- a/examples/petstore-expanded/echo/petstore.go +++ b/examples/petstore-expanded/echo/petstore.go @@ -11,10 +11,10 @@ import ( "net" "os" - "github.com/deepmap/oapi-codegen/v2/examples/petstore-expanded/echo/api" "github.com/labstack/echo/v4" echomiddleware "github.com/labstack/echo/v4/middleware" middleware "github.com/oapi-codegen/echo-middleware" + "github.com/oapi-codegen/oapi-codegen/v2/examples/petstore-expanded/echo/api" ) func main() { diff --git a/examples/petstore-expanded/echo/petstore_test.go b/examples/petstore-expanded/echo/petstore_test.go index 062812559..5fc058da9 100644 --- a/examples/petstore-expanded/echo/petstore_test.go +++ b/examples/petstore-expanded/echo/petstore_test.go @@ -19,12 +19,12 @@ import ( "net/http" "testing" - "github.com/deepmap/oapi-codegen/v2/examples/petstore-expanded/echo/api" - "github.com/deepmap/oapi-codegen/v2/examples/petstore-expanded/echo/api/models" - "github.com/oapi-codegen/testutil" "github.com/labstack/echo/v4" echoMiddleware "github.com/labstack/echo/v4/middleware" middleware "github.com/oapi-codegen/echo-middleware" + "github.com/oapi-codegen/oapi-codegen/v2/examples/petstore-expanded/echo/api" + "github.com/oapi-codegen/oapi-codegen/v2/examples/petstore-expanded/echo/api/models" + "github.com/oapi-codegen/testutil" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" ) diff --git a/examples/petstore-expanded/echo/pkg_codegen_petstore_test.go b/examples/petstore-expanded/echo/pkg_codegen_petstore_test.go index a6696c296..de651ec54 100644 --- a/examples/petstore-expanded/echo/pkg_codegen_petstore_test.go +++ b/examples/petstore-expanded/echo/pkg_codegen_petstore_test.go @@ -9,9 +9,9 @@ import ( "net/http/httptest" "testing" - examplePetstoreClient "github.com/deepmap/oapi-codegen/v2/examples/petstore-expanded" - examplePetstore "github.com/deepmap/oapi-codegen/v2/examples/petstore-expanded/echo/api" - "github.com/deepmap/oapi-codegen/v2/pkg/codegen" + examplePetstoreClient "github.com/oapi-codegen/oapi-codegen/v2/examples/petstore-expanded" + examplePetstore "github.com/oapi-codegen/oapi-codegen/v2/examples/petstore-expanded/echo/api" + "github.com/oapi-codegen/oapi-codegen/v2/pkg/codegen" "github.com/stretchr/testify/assert" "golang.org/x/lint" ) diff --git a/examples/petstore-expanded/fiber/api/petstore-server.gen.go b/examples/petstore-expanded/fiber/api/petstore-server.gen.go index b3fa4b968..5b01b84a0 100644 --- a/examples/petstore-expanded/fiber/api/petstore-server.gen.go +++ b/examples/petstore-expanded/fiber/api/petstore-server.gen.go @@ -1,6 +1,6 @@ // Package api provides primitives to interact with the openapi HTTP API. // -// Code generated by github.com/deepmap/oapi-codegen/v2 version v2.0.0-00010101000000-000000000000 DO NOT EDIT. +// Code generated by github.com/oapi-codegen/oapi-codegen/v2 version v2.0.0-00010101000000-000000000000 DO NOT EDIT. package api import ( diff --git a/examples/petstore-expanded/fiber/api/petstore-types.gen.go b/examples/petstore-expanded/fiber/api/petstore-types.gen.go index 3d8ce1134..0e4954f34 100644 --- a/examples/petstore-expanded/fiber/api/petstore-types.gen.go +++ b/examples/petstore-expanded/fiber/api/petstore-types.gen.go @@ -1,6 +1,6 @@ // Package api provides primitives to interact with the openapi HTTP API. // -// Code generated by github.com/deepmap/oapi-codegen/v2 version v2.0.0-00010101000000-000000000000 DO NOT EDIT. +// Code generated by github.com/oapi-codegen/oapi-codegen/v2 version v2.0.0-00010101000000-000000000000 DO NOT EDIT. package api // Error defines model for Error. diff --git a/examples/petstore-expanded/fiber/api/petstore.go b/examples/petstore-expanded/fiber/api/petstore.go index df03e511e..38eec12d6 100644 --- a/examples/petstore-expanded/fiber/api/petstore.go +++ b/examples/petstore-expanded/fiber/api/petstore.go @@ -1,5 +1,5 @@ -//go:generate go run github.com/deepmap/oapi-codegen/v2/cmd/oapi-codegen --config=types.cfg.yaml ../../petstore-expanded.yaml -//go:generate go run github.com/deepmap/oapi-codegen/v2/cmd/oapi-codegen --config=server.cfg.yaml ../../petstore-expanded.yaml +//go:generate go run github.com/oapi-codegen/oapi-codegen/v2/cmd/oapi-codegen --config=types.cfg.yaml ../../petstore-expanded.yaml +//go:generate go run github.com/oapi-codegen/oapi-codegen/v2/cmd/oapi-codegen --config=server.cfg.yaml ../../petstore-expanded.yaml package api diff --git a/examples/petstore-expanded/fiber/petstore.go b/examples/petstore-expanded/fiber/petstore.go index 7ea71edce..6332ff886 100644 --- a/examples/petstore-expanded/fiber/petstore.go +++ b/examples/petstore-expanded/fiber/petstore.go @@ -13,8 +13,8 @@ import ( "github.com/gofiber/fiber/v2" - "github.com/deepmap/oapi-codegen/v2/examples/petstore-expanded/fiber/api" middleware "github.com/oapi-codegen/fiber-middleware" + "github.com/oapi-codegen/oapi-codegen/v2/examples/petstore-expanded/fiber/api" ) func main() { diff --git a/examples/petstore-expanded/fiber/petstore_test.go b/examples/petstore-expanded/fiber/petstore_test.go index 4de37519c..dac1d58bf 100644 --- a/examples/petstore-expanded/fiber/petstore_test.go +++ b/examples/petstore-expanded/fiber/petstore_test.go @@ -12,7 +12,7 @@ import ( "github.com/gofiber/fiber/v2" "github.com/stretchr/testify/assert" - "github.com/deepmap/oapi-codegen/v2/examples/petstore-expanded/fiber/api" + "github.com/oapi-codegen/oapi-codegen/v2/examples/petstore-expanded/fiber/api" ) func doGet(t *testing.T, app *fiber.App, rawURL string) (*http.Response, error) { diff --git a/examples/petstore-expanded/gin/api/petstore-server.gen.go b/examples/petstore-expanded/gin/api/petstore-server.gen.go index f048e0066..02499fcc1 100644 --- a/examples/petstore-expanded/gin/api/petstore-server.gen.go +++ b/examples/petstore-expanded/gin/api/petstore-server.gen.go @@ -1,6 +1,6 @@ // Package api provides primitives to interact with the openapi HTTP API. // -// Code generated by github.com/deepmap/oapi-codegen/v2 version v2.0.0-00010101000000-000000000000 DO NOT EDIT. +// Code generated by github.com/oapi-codegen/oapi-codegen/v2 version v2.0.0-00010101000000-000000000000 DO NOT EDIT. package api import ( diff --git a/examples/petstore-expanded/gin/api/petstore-types.gen.go b/examples/petstore-expanded/gin/api/petstore-types.gen.go index 3d8ce1134..0e4954f34 100644 --- a/examples/petstore-expanded/gin/api/petstore-types.gen.go +++ b/examples/petstore-expanded/gin/api/petstore-types.gen.go @@ -1,6 +1,6 @@ // Package api provides primitives to interact with the openapi HTTP API. // -// Code generated by github.com/deepmap/oapi-codegen/v2 version v2.0.0-00010101000000-000000000000 DO NOT EDIT. +// Code generated by github.com/oapi-codegen/oapi-codegen/v2 version v2.0.0-00010101000000-000000000000 DO NOT EDIT. package api // Error defines model for Error. diff --git a/examples/petstore-expanded/gin/api/petstore.go b/examples/petstore-expanded/gin/api/petstore.go index 09c37dba4..094b4ef9e 100644 --- a/examples/petstore-expanded/gin/api/petstore.go +++ b/examples/petstore-expanded/gin/api/petstore.go @@ -12,8 +12,8 @@ // See the License for the specific language governing permissions and // limitations under the License. -//go:generate go run github.com/deepmap/oapi-codegen/v2/cmd/oapi-codegen --config=types.cfg.yaml ../../petstore-expanded.yaml -//go:generate go run github.com/deepmap/oapi-codegen/v2/cmd/oapi-codegen --config=server.cfg.yaml ../../petstore-expanded.yaml +//go:generate go run github.com/oapi-codegen/oapi-codegen/v2/cmd/oapi-codegen --config=types.cfg.yaml ../../petstore-expanded.yaml +//go:generate go run github.com/oapi-codegen/oapi-codegen/v2/cmd/oapi-codegen --config=server.cfg.yaml ../../petstore-expanded.yaml package api diff --git a/examples/petstore-expanded/gin/petstore.go b/examples/petstore-expanded/gin/petstore.go index 04031e67d..8b0717a4c 100644 --- a/examples/petstore-expanded/gin/petstore.go +++ b/examples/petstore-expanded/gin/petstore.go @@ -14,8 +14,8 @@ import ( "github.com/gin-gonic/gin" - "github.com/deepmap/oapi-codegen/v2/examples/petstore-expanded/gin/api" middleware "github.com/oapi-codegen/gin-middleware" + "github.com/oapi-codegen/oapi-codegen/v2/examples/petstore-expanded/gin/api" ) func NewGinPetServer(petStore *api.PetStore, port string) *http.Server { diff --git a/examples/petstore-expanded/gin/petstore_test.go b/examples/petstore-expanded/gin/petstore_test.go index ad9515443..d7a557d1c 100644 --- a/examples/petstore-expanded/gin/petstore_test.go +++ b/examples/petstore-expanded/gin/petstore_test.go @@ -7,7 +7,7 @@ import ( "net/http/httptest" "testing" - "github.com/deepmap/oapi-codegen/v2/examples/petstore-expanded/gin/api" + "github.com/oapi-codegen/oapi-codegen/v2/examples/petstore-expanded/gin/api" "github.com/oapi-codegen/testutil" "github.com/stretchr/testify/assert" ) diff --git a/examples/petstore-expanded/gorilla/api/petstore.gen.go b/examples/petstore-expanded/gorilla/api/petstore.gen.go index 2f65ea25b..78d2178ea 100644 --- a/examples/petstore-expanded/gorilla/api/petstore.gen.go +++ b/examples/petstore-expanded/gorilla/api/petstore.gen.go @@ -1,6 +1,6 @@ // Package api provides primitives to interact with the openapi HTTP API. // -// Code generated by github.com/deepmap/oapi-codegen/v2 version v2.0.0-00010101000000-000000000000 DO NOT EDIT. +// Code generated by github.com/oapi-codegen/oapi-codegen/v2 version v2.0.0-00010101000000-000000000000 DO NOT EDIT. package api import ( diff --git a/examples/petstore-expanded/gorilla/api/petstore.go b/examples/petstore-expanded/gorilla/api/petstore.go index 888d16f13..6ede559ec 100644 --- a/examples/petstore-expanded/gorilla/api/petstore.go +++ b/examples/petstore-expanded/gorilla/api/petstore.go @@ -1,4 +1,4 @@ -//go:generate go run github.com/deepmap/oapi-codegen/v2/cmd/oapi-codegen --config=cfg.yaml ../../petstore-expanded.yaml +//go:generate go run github.com/oapi-codegen/oapi-codegen/v2/cmd/oapi-codegen --config=cfg.yaml ../../petstore-expanded.yaml package api diff --git a/examples/petstore-expanded/gorilla/petstore.go b/examples/petstore-expanded/gorilla/petstore.go index d974efdaa..d1675f1ae 100644 --- a/examples/petstore-expanded/gorilla/petstore.go +++ b/examples/petstore-expanded/gorilla/petstore.go @@ -12,9 +12,9 @@ import ( "net/http" "os" - "github.com/deepmap/oapi-codegen/v2/examples/petstore-expanded/gorilla/api" - middleware "github.com/oapi-codegen/nethttp-middleware" "github.com/gorilla/mux" + middleware "github.com/oapi-codegen/nethttp-middleware" + "github.com/oapi-codegen/oapi-codegen/v2/examples/petstore-expanded/gorilla/api" ) func main() { diff --git a/examples/petstore-expanded/gorilla/petstore_test.go b/examples/petstore-expanded/gorilla/petstore_test.go index a63dd536a..a6cfedecd 100644 --- a/examples/petstore-expanded/gorilla/petstore_test.go +++ b/examples/petstore-expanded/gorilla/petstore_test.go @@ -7,10 +7,10 @@ import ( "net/http/httptest" "testing" - "github.com/deepmap/oapi-codegen/v2/examples/petstore-expanded/gorilla/api" + "github.com/gorilla/mux" middleware "github.com/oapi-codegen/nethttp-middleware" + "github.com/oapi-codegen/oapi-codegen/v2/examples/petstore-expanded/gorilla/api" "github.com/oapi-codegen/testutil" - "github.com/gorilla/mux" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" ) diff --git a/examples/petstore-expanded/internal/doc.go b/examples/petstore-expanded/internal/doc.go index bfd040503..b04cac3f8 100644 --- a/examples/petstore-expanded/internal/doc.go +++ b/examples/petstore-expanded/internal/doc.go @@ -17,4 +17,4 @@ package internal // server. The file petstore.gen.go is automatically generated from the schema // Run oapi-codegen to regenerate the petstore boilerplate -//go:generate go run github.com/deepmap/oapi-codegen/v2/cmd/oapi-codegen --config=config.yaml ../petstore-expanded.yaml +//go:generate go run github.com/oapi-codegen/oapi-codegen/v2/cmd/oapi-codegen --config=config.yaml ../petstore-expanded.yaml diff --git a/examples/petstore-expanded/iris/api/petstore-server.gen.go b/examples/petstore-expanded/iris/api/petstore-server.gen.go index 3abf1dac4..a559c238d 100644 --- a/examples/petstore-expanded/iris/api/petstore-server.gen.go +++ b/examples/petstore-expanded/iris/api/petstore-server.gen.go @@ -1,6 +1,6 @@ // Package api provides primitives to interact with the openapi HTTP API. // -// Code generated by github.com/deepmap/oapi-codegen/v2 version v2.0.0-00010101000000-000000000000 DO NOT EDIT. +// Code generated by github.com/oapi-codegen/oapi-codegen/v2 version v2.0.0-00010101000000-000000000000 DO NOT EDIT. package api import ( diff --git a/examples/petstore-expanded/iris/api/petstore-types.gen.go b/examples/petstore-expanded/iris/api/petstore-types.gen.go index 3d8ce1134..0e4954f34 100644 --- a/examples/petstore-expanded/iris/api/petstore-types.gen.go +++ b/examples/petstore-expanded/iris/api/petstore-types.gen.go @@ -1,6 +1,6 @@ // Package api provides primitives to interact with the openapi HTTP API. // -// Code generated by github.com/deepmap/oapi-codegen/v2 version v2.0.0-00010101000000-000000000000 DO NOT EDIT. +// Code generated by github.com/oapi-codegen/oapi-codegen/v2 version v2.0.0-00010101000000-000000000000 DO NOT EDIT. package api // Error defines model for Error. diff --git a/examples/petstore-expanded/iris/api/petstore.go b/examples/petstore-expanded/iris/api/petstore.go index ab6491d3d..d1e801801 100644 --- a/examples/petstore-expanded/iris/api/petstore.go +++ b/examples/petstore-expanded/iris/api/petstore.go @@ -12,8 +12,8 @@ // See the License for the specific language governing permissions and // limitations under the License. -//go:generate go run github.com/deepmap/oapi-codegen/v2/cmd/oapi-codegen --config=types.cfg.yaml ../../petstore-expanded.yaml -//go:generate go run github.com/deepmap/oapi-codegen/v2/cmd/oapi-codegen --config=server.cfg.yaml ../../petstore-expanded.yaml +//go:generate go run github.com/oapi-codegen/oapi-codegen/v2/cmd/oapi-codegen --config=types.cfg.yaml ../../petstore-expanded.yaml +//go:generate go run github.com/oapi-codegen/oapi-codegen/v2/cmd/oapi-codegen --config=server.cfg.yaml ../../petstore-expanded.yaml package api diff --git a/examples/petstore-expanded/iris/petstore.go b/examples/petstore-expanded/iris/petstore.go index feebfcc40..2b2dea37f 100644 --- a/examples/petstore-expanded/iris/petstore.go +++ b/examples/petstore-expanded/iris/petstore.go @@ -11,9 +11,9 @@ import ( "log" "os" - "github.com/deepmap/oapi-codegen/v2/examples/petstore-expanded/iris/api" - middleware "github.com/oapi-codegen/iris-middleware" "github.com/kataras/iris/v12" + middleware "github.com/oapi-codegen/iris-middleware" + "github.com/oapi-codegen/oapi-codegen/v2/examples/petstore-expanded/iris/api" ) func NewIrisPetServer(petStore *api.PetStore, port int) *iris.Application { diff --git a/examples/petstore-expanded/iris/petstore_test.go b/examples/petstore-expanded/iris/petstore_test.go index facb9f222..837a53369 100644 --- a/examples/petstore-expanded/iris/petstore_test.go +++ b/examples/petstore-expanded/iris/petstore_test.go @@ -21,7 +21,7 @@ import ( "net/http/httptest" "testing" - "github.com/deepmap/oapi-codegen/v2/examples/petstore-expanded/iris/api" + "github.com/oapi-codegen/oapi-codegen/v2/examples/petstore-expanded/iris/api" "github.com/oapi-codegen/testutil" "github.com/stretchr/testify/assert" ) diff --git a/examples/petstore-expanded/petstore-client.gen.go b/examples/petstore-expanded/petstore-client.gen.go index e97ccf6cd..9bd928f49 100644 --- a/examples/petstore-expanded/petstore-client.gen.go +++ b/examples/petstore-expanded/petstore-client.gen.go @@ -1,6 +1,6 @@ // Package petstore provides primitives to interact with the openapi HTTP API. // -// Code generated by github.com/deepmap/oapi-codegen/v2 version v2.0.0-00010101000000-000000000000 DO NOT EDIT. +// Code generated by github.com/oapi-codegen/oapi-codegen/v2 version v2.0.0-00010101000000-000000000000 DO NOT EDIT. package petstore import ( diff --git a/examples/petstore-expanded/stdhttp/api/petstore.gen.go b/examples/petstore-expanded/stdhttp/api/petstore.gen.go index 5e15fe2dc..23dd9d463 100644 --- a/examples/petstore-expanded/stdhttp/api/petstore.gen.go +++ b/examples/petstore-expanded/stdhttp/api/petstore.gen.go @@ -2,7 +2,7 @@ // Package api provides primitives to interact with the openapi HTTP API. // -// Code generated by github.com/deepmap/oapi-codegen/v2 version v2.0.0-00010101000000-000000000000 DO NOT EDIT. +// Code generated by github.com/oapi-codegen/oapi-codegen/v2 version v2.0.0-00010101000000-000000000000 DO NOT EDIT. package api import ( diff --git a/examples/petstore-expanded/stdhttp/api/petstore.go b/examples/petstore-expanded/stdhttp/api/petstore.go index f29236d1a..5b9d8606f 100644 --- a/examples/petstore-expanded/stdhttp/api/petstore.go +++ b/examples/petstore-expanded/stdhttp/api/petstore.go @@ -1,6 +1,6 @@ //go:build go1.22 -//go:generate go run github.com/deepmap/oapi-codegen/v2/cmd/oapi-codegen --config=cfg.yaml ../../petstore-expanded.yaml +//go:generate go run github.com/oapi-codegen/oapi-codegen/v2/cmd/oapi-codegen --config=cfg.yaml ../../petstore-expanded.yaml package api diff --git a/examples/petstore-expanded/stdhttp/go.mod b/examples/petstore-expanded/stdhttp/go.mod index edd0c7d62..a0ff28b6a 100644 --- a/examples/petstore-expanded/stdhttp/go.mod +++ b/examples/petstore-expanded/stdhttp/go.mod @@ -1,13 +1,13 @@ -module github.com/deepmap/oapi-codegen/v2/examples/petstore-expanded/stdhttp +module github.com/oapi-codegen/oapi-codegen/v2/examples/petstore-expanded/stdhttp go 1.22 -replace github.com/deepmap/oapi-codegen/v2 => ../../../ +replace github.com/oapi-codegen/oapi-codegen/v2 => ../../../ require ( - github.com/deepmap/oapi-codegen/v2 v2.0.0-00010101000000-000000000000 github.com/getkin/kin-openapi v0.124.0 github.com/oapi-codegen/nethttp-middleware v1.0.2 + github.com/oapi-codegen/oapi-codegen/v2 v2.0.0-00010101000000-000000000000 github.com/oapi-codegen/runtime v1.1.0 github.com/oapi-codegen/testutil v1.0.0 github.com/stretchr/testify v1.9.0 diff --git a/examples/petstore-expanded/stdhttp/petstore.go b/examples/petstore-expanded/stdhttp/petstore.go index 03dd84879..68e45cc1d 100644 --- a/examples/petstore-expanded/stdhttp/petstore.go +++ b/examples/petstore-expanded/stdhttp/petstore.go @@ -14,8 +14,8 @@ import ( "net/http" "os" - "github.com/deepmap/oapi-codegen/v2/examples/petstore-expanded/stdhttp/api" middleware "github.com/oapi-codegen/nethttp-middleware" + "github.com/oapi-codegen/oapi-codegen/v2/examples/petstore-expanded/stdhttp/api" ) func main() { diff --git a/examples/petstore-expanded/stdhttp/petstore_test.go b/examples/petstore-expanded/stdhttp/petstore_test.go index 380f0de35..bf3df022d 100644 --- a/examples/petstore-expanded/stdhttp/petstore_test.go +++ b/examples/petstore-expanded/stdhttp/petstore_test.go @@ -9,8 +9,8 @@ import ( "net/http/httptest" "testing" - "github.com/deepmap/oapi-codegen/v2/examples/petstore-expanded/stdhttp/api" middleware "github.com/oapi-codegen/nethttp-middleware" + "github.com/oapi-codegen/oapi-codegen/v2/examples/petstore-expanded/stdhttp/api" "github.com/oapi-codegen/testutil" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/examples/petstore-expanded/stdhttp/tools/tools.go b/examples/petstore-expanded/stdhttp/tools/tools.go index 67a500f26..8615cb4c5 100644 --- a/examples/petstore-expanded/stdhttp/tools/tools.go +++ b/examples/petstore-expanded/stdhttp/tools/tools.go @@ -4,5 +4,5 @@ package tools import ( - _ "github.com/deepmap/oapi-codegen/v2/cmd/oapi-codegen" + _ "github.com/oapi-codegen/oapi-codegen/v2/cmd/oapi-codegen" ) diff --git a/examples/petstore-expanded/strict/api/petstore-server.gen.go b/examples/petstore-expanded/strict/api/petstore-server.gen.go index 34b58e69f..656f40d90 100644 --- a/examples/petstore-expanded/strict/api/petstore-server.gen.go +++ b/examples/petstore-expanded/strict/api/petstore-server.gen.go @@ -1,6 +1,6 @@ // Package api provides primitives to interact with the openapi HTTP API. // -// Code generated by github.com/deepmap/oapi-codegen/v2 version v2.0.0-00010101000000-000000000000 DO NOT EDIT. +// Code generated by github.com/oapi-codegen/oapi-codegen/v2 version v2.0.0-00010101000000-000000000000 DO NOT EDIT. package api import ( diff --git a/examples/petstore-expanded/strict/api/petstore-types.gen.go b/examples/petstore-expanded/strict/api/petstore-types.gen.go index 3d8ce1134..0e4954f34 100644 --- a/examples/petstore-expanded/strict/api/petstore-types.gen.go +++ b/examples/petstore-expanded/strict/api/petstore-types.gen.go @@ -1,6 +1,6 @@ // Package api provides primitives to interact with the openapi HTTP API. // -// Code generated by github.com/deepmap/oapi-codegen/v2 version v2.0.0-00010101000000-000000000000 DO NOT EDIT. +// Code generated by github.com/oapi-codegen/oapi-codegen/v2 version v2.0.0-00010101000000-000000000000 DO NOT EDIT. package api // Error defines model for Error. diff --git a/examples/petstore-expanded/strict/api/petstore.go b/examples/petstore-expanded/strict/api/petstore.go index 96ecc6a03..fc5c9fda2 100644 --- a/examples/petstore-expanded/strict/api/petstore.go +++ b/examples/petstore-expanded/strict/api/petstore.go @@ -1,5 +1,5 @@ -//go:generate go run github.com/deepmap/oapi-codegen/v2/cmd/oapi-codegen --config=types.cfg.yaml ../../petstore-expanded.yaml -//go:generate go run github.com/deepmap/oapi-codegen/v2/cmd/oapi-codegen --config=server.cfg.yaml ../../petstore-expanded.yaml +//go:generate go run github.com/oapi-codegen/oapi-codegen/v2/cmd/oapi-codegen --config=types.cfg.yaml ../../petstore-expanded.yaml +//go:generate go run github.com/oapi-codegen/oapi-codegen/v2/cmd/oapi-codegen --config=server.cfg.yaml ../../petstore-expanded.yaml package api diff --git a/examples/petstore-expanded/strict/petstore.go b/examples/petstore-expanded/strict/petstore.go index f0acac4bf..363caf7e1 100644 --- a/examples/petstore-expanded/strict/petstore.go +++ b/examples/petstore-expanded/strict/petstore.go @@ -12,9 +12,9 @@ import ( "net/http" "os" - "github.com/deepmap/oapi-codegen/v2/examples/petstore-expanded/strict/api" - middleware "github.com/oapi-codegen/nethttp-middleware" "github.com/go-chi/chi/v5" + middleware "github.com/oapi-codegen/nethttp-middleware" + "github.com/oapi-codegen/oapi-codegen/v2/examples/petstore-expanded/strict/api" ) func main() { diff --git a/examples/petstore-expanded/strict/petstore_test.go b/examples/petstore-expanded/strict/petstore_test.go index 848c32e62..208b65ea3 100644 --- a/examples/petstore-expanded/strict/petstore_test.go +++ b/examples/petstore-expanded/strict/petstore_test.go @@ -7,10 +7,10 @@ import ( "net/http/httptest" "testing" - "github.com/deepmap/oapi-codegen/v2/examples/petstore-expanded/strict/api" + "github.com/go-chi/chi/v5" middleware "github.com/oapi-codegen/nethttp-middleware" + "github.com/oapi-codegen/oapi-codegen/v2/examples/petstore-expanded/strict/api" "github.com/oapi-codegen/testutil" - "github.com/go-chi/chi/v5" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" ) diff --git a/examples/tools.go b/examples/tools.go index 67a500f26..8615cb4c5 100644 --- a/examples/tools.go +++ b/examples/tools.go @@ -4,5 +4,5 @@ package tools import ( - _ "github.com/deepmap/oapi-codegen/v2/cmd/oapi-codegen" + _ "github.com/oapi-codegen/oapi-codegen/v2/cmd/oapi-codegen" ) diff --git a/go.mod b/go.mod index 3c21deac7..67fc4261f 100644 --- a/go.mod +++ b/go.mod @@ -1,4 +1,4 @@ -module github.com/deepmap/oapi-codegen/v2 +module github.com/oapi-codegen/oapi-codegen/v2 go 1.20 diff --git a/internal/test/all_of/doc.go b/internal/test/all_of/doc.go index a3284a6c1..b154cb224 100644 --- a/internal/test/all_of/doc.go +++ b/internal/test/all_of/doc.go @@ -1,4 +1,4 @@ package allof -//go:generate go run github.com/deepmap/oapi-codegen/v2/cmd/oapi-codegen --config=config1.yaml openapi.yaml -//go:generate go run github.com/deepmap/oapi-codegen/v2/cmd/oapi-codegen --config=config2.yaml openapi.yaml +//go:generate go run github.com/oapi-codegen/oapi-codegen/v2/cmd/oapi-codegen --config=config1.yaml openapi.yaml +//go:generate go run github.com/oapi-codegen/oapi-codegen/v2/cmd/oapi-codegen --config=config2.yaml openapi.yaml diff --git a/internal/test/all_of/v1/openapi.gen.go b/internal/test/all_of/v1/openapi.gen.go index 0b65e403f..db5fd302c 100644 --- a/internal/test/all_of/v1/openapi.gen.go +++ b/internal/test/all_of/v1/openapi.gen.go @@ -1,6 +1,6 @@ // Package v1 provides primitives to interact with the openapi HTTP API. // -// Code generated by github.com/deepmap/oapi-codegen/v2 version v2.0.0-00010101000000-000000000000 DO NOT EDIT. +// Code generated by github.com/oapi-codegen/oapi-codegen/v2 version v2.0.0-00010101000000-000000000000 DO NOT EDIT. package v1 import ( diff --git a/internal/test/all_of/v2/openapi.gen.go b/internal/test/all_of/v2/openapi.gen.go index f00a14f89..ab430340d 100644 --- a/internal/test/all_of/v2/openapi.gen.go +++ b/internal/test/all_of/v2/openapi.gen.go @@ -1,6 +1,6 @@ // Package v2 provides primitives to interact with the openapi HTTP API. // -// Code generated by github.com/deepmap/oapi-codegen/v2 version v2.0.0-00010101000000-000000000000 DO NOT EDIT. +// Code generated by github.com/oapi-codegen/oapi-codegen/v2 version v2.0.0-00010101000000-000000000000 DO NOT EDIT. package v2 import ( diff --git a/internal/test/any_of/param/doc.go b/internal/test/any_of/param/doc.go index 71113bd57..657385e03 100644 --- a/internal/test/any_of/param/doc.go +++ b/internal/test/any_of/param/doc.go @@ -1,3 +1,3 @@ package param -//go:generate go run github.com/deepmap/oapi-codegen/v2/cmd/oapi-codegen --config=config.yaml spec.yaml +//go:generate go run github.com/oapi-codegen/oapi-codegen/v2/cmd/oapi-codegen --config=config.yaml spec.yaml diff --git a/internal/test/any_of/param/param.gen.go b/internal/test/any_of/param/param.gen.go index 1d6b42212..3378ae3da 100644 --- a/internal/test/any_of/param/param.gen.go +++ b/internal/test/any_of/param/param.gen.go @@ -1,6 +1,6 @@ // Package param provides primitives to interact with the openapi HTTP API. // -// Code generated by github.com/deepmap/oapi-codegen/v2 version v2.0.0-00010101000000-000000000000 DO NOT EDIT. +// Code generated by github.com/oapi-codegen/oapi-codegen/v2 version v2.0.0-00010101000000-000000000000 DO NOT EDIT. package param import ( diff --git a/internal/test/any_of/param/param_test.go b/internal/test/any_of/param/param_test.go index 9ae6edd13..94641b365 100644 --- a/internal/test/any_of/param/param_test.go +++ b/internal/test/any_of/param/param_test.go @@ -3,7 +3,7 @@ package param_test import ( "testing" - "github.com/deepmap/oapi-codegen/v2/internal/test/any_of/param" + "github.com/oapi-codegen/oapi-codegen/v2/internal/test/any_of/param" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" ) diff --git a/internal/test/client/client.gen.go b/internal/test/client/client.gen.go index 64c0ca227..275c72cf0 100644 --- a/internal/test/client/client.gen.go +++ b/internal/test/client/client.gen.go @@ -1,6 +1,6 @@ // Package client provides primitives to interact with the openapi HTTP API. // -// Code generated by github.com/deepmap/oapi-codegen/v2 version v2.0.0-00010101000000-000000000000 DO NOT EDIT. +// Code generated by github.com/oapi-codegen/oapi-codegen/v2 version v2.0.0-00010101000000-000000000000 DO NOT EDIT. package client import ( diff --git a/internal/test/client/client_test.go b/internal/test/client/client_test.go index dd08ae2fb..ef7c5df16 100644 --- a/internal/test/client/client_test.go +++ b/internal/test/client/client_test.go @@ -3,7 +3,7 @@ package client import ( "testing" - "github.com/deepmap/oapi-codegen/v2/pkg/securityprovider" + "github.com/oapi-codegen/oapi-codegen/v2/pkg/securityprovider" "github.com/stretchr/testify/assert" ) diff --git a/internal/test/client/doc.go b/internal/test/client/doc.go index a97d93a6b..930039dad 100644 --- a/internal/test/client/doc.go +++ b/internal/test/client/doc.go @@ -1,3 +1,3 @@ package client -//go:generate go run github.com/deepmap/oapi-codegen/v2/cmd/oapi-codegen --package=client --generate=client,types -o client.gen.go client.yaml +//go:generate go run github.com/oapi-codegen/oapi-codegen/v2/cmd/oapi-codegen --package=client --generate=client,types -o client.gen.go client.yaml diff --git a/internal/test/components/components.gen.go b/internal/test/components/components.gen.go index 919ca6a43..95257707b 100644 --- a/internal/test/components/components.gen.go +++ b/internal/test/components/components.gen.go @@ -1,6 +1,6 @@ // Package components provides primitives to interact with the openapi HTTP API. // -// Code generated by github.com/deepmap/oapi-codegen/v2 version v2.0.0-00010101000000-000000000000 DO NOT EDIT. +// Code generated by github.com/oapi-codegen/oapi-codegen/v2 version v2.0.0-00010101000000-000000000000 DO NOT EDIT. package components import ( diff --git a/internal/test/components/doc.go b/internal/test/components/doc.go index 7d5021bcc..64f995a9c 100644 --- a/internal/test/components/doc.go +++ b/internal/test/components/doc.go @@ -1,3 +1,3 @@ package components -//go:generate go run github.com/deepmap/oapi-codegen/v2/cmd/oapi-codegen --config=config.yaml components.yaml +//go:generate go run github.com/oapi-codegen/oapi-codegen/v2/cmd/oapi-codegen --config=config.yaml components.yaml diff --git a/internal/test/extensions/x-order/generate.go b/internal/test/extensions/x-order/generate.go index d49bb7970..8970f968a 100644 --- a/internal/test/extensions/x-order/generate.go +++ b/internal/test/extensions/x-order/generate.go @@ -1,3 +1,3 @@ package xorder -//go:generate go run github.com/deepmap/oapi-codegen/v2/cmd/oapi-codegen --config=config.yaml spec.yaml +//go:generate go run github.com/oapi-codegen/oapi-codegen/v2/cmd/oapi-codegen --config=config.yaml spec.yaml diff --git a/internal/test/extensions/x-order/issue.gen.go b/internal/test/extensions/x-order/issue.gen.go index 6934cea8f..9dda2d072 100644 --- a/internal/test/extensions/x-order/issue.gen.go +++ b/internal/test/extensions/x-order/issue.gen.go @@ -1,6 +1,6 @@ // Package xorder provides primitives to interact with the openapi HTTP API. // -// Code generated by github.com/deepmap/oapi-codegen/v2 version v2.0.0-00010101000000-000000000000 DO NOT EDIT. +// Code generated by github.com/oapi-codegen/oapi-codegen/v2 version v2.0.0-00010101000000-000000000000 DO NOT EDIT. package xorder import ( diff --git a/internal/test/externalref/doc.go b/internal/test/externalref/doc.go index 805be737a..c5aeaa522 100644 --- a/internal/test/externalref/doc.go +++ b/internal/test/externalref/doc.go @@ -1,3 +1,3 @@ package externalref -//go:generate go run github.com/deepmap/oapi-codegen/v2/cmd/oapi-codegen --config=externalref.cfg.yaml spec.yaml +//go:generate go run github.com/oapi-codegen/oapi-codegen/v2/cmd/oapi-codegen --config=externalref.cfg.yaml spec.yaml diff --git a/internal/test/externalref/externalref.cfg.yaml b/internal/test/externalref/externalref.cfg.yaml index dfe7b0558..22a76c3ff 100644 --- a/internal/test/externalref/externalref.cfg.yaml +++ b/internal/test/externalref/externalref.cfg.yaml @@ -4,9 +4,9 @@ generate: models: true embedded-spec: true import-mapping: - ./packageA/spec.yaml: github.com/deepmap/oapi-codegen/v2/internal/test/externalref/packageA - ./packageB/spec.yaml: github.com/deepmap/oapi-codegen/v2/internal/test/externalref/packageB - https://petstore3.swagger.io/api/v3/openapi.json: github.com/deepmap/oapi-codegen/v2/internal/test/externalref/petstore + ./packageA/spec.yaml: github.com/oapi-codegen/oapi-codegen/v2/internal/test/externalref/packageA + ./packageB/spec.yaml: github.com/oapi-codegen/oapi-codegen/v2/internal/test/externalref/packageB + https://petstore3.swagger.io/api/v3/openapi.json: github.com/oapi-codegen/oapi-codegen/v2/internal/test/externalref/petstore output: externalref.gen.go output-options: skip-prune: true diff --git a/internal/test/externalref/externalref.gen.go b/internal/test/externalref/externalref.gen.go index 3f132b055..d21bb6813 100644 --- a/internal/test/externalref/externalref.gen.go +++ b/internal/test/externalref/externalref.gen.go @@ -1,6 +1,6 @@ // Package externalref provides primitives to interact with the openapi HTTP API. // -// Code generated by github.com/deepmap/oapi-codegen/v2 version v2.0.0-00010101000000-000000000000 DO NOT EDIT. +// Code generated by github.com/oapi-codegen/oapi-codegen/v2 version v2.0.0-00010101000000-000000000000 DO NOT EDIT. package externalref import ( @@ -12,10 +12,10 @@ import ( "path" "strings" - externalRef0 "github.com/deepmap/oapi-codegen/v2/internal/test/externalref/packageA" - externalRef1 "github.com/deepmap/oapi-codegen/v2/internal/test/externalref/packageB" - externalRef2 "github.com/deepmap/oapi-codegen/v2/internal/test/externalref/petstore" "github.com/getkin/kin-openapi/openapi3" + externalRef0 "github.com/oapi-codegen/oapi-codegen/v2/internal/test/externalref/packageA" + externalRef1 "github.com/oapi-codegen/oapi-codegen/v2/internal/test/externalref/packageB" + externalRef2 "github.com/oapi-codegen/oapi-codegen/v2/internal/test/externalref/petstore" ) // Container defines model for Container. diff --git a/internal/test/externalref/imports_test.go b/internal/test/externalref/imports_test.go index c491edc25..34fd0ec11 100644 --- a/internal/test/externalref/imports_test.go +++ b/internal/test/externalref/imports_test.go @@ -3,9 +3,9 @@ package externalref import ( "testing" - packageA "github.com/deepmap/oapi-codegen/v2/internal/test/externalref/packageA" - packageB "github.com/deepmap/oapi-codegen/v2/internal/test/externalref/packageB" - petstore "github.com/deepmap/oapi-codegen/v2/internal/test/externalref/petstore" + packageA "github.com/oapi-codegen/oapi-codegen/v2/internal/test/externalref/packageA" + packageB "github.com/oapi-codegen/oapi-codegen/v2/internal/test/externalref/packageB" + petstore "github.com/oapi-codegen/oapi-codegen/v2/internal/test/externalref/petstore" "github.com/stretchr/testify/require" ) diff --git a/internal/test/externalref/packageA/config.yaml b/internal/test/externalref/packageA/config.yaml index 3185cdc7b..6ee1a1369 100644 --- a/internal/test/externalref/packageA/config.yaml +++ b/internal/test/externalref/packageA/config.yaml @@ -6,5 +6,5 @@ generate: output-options: skip-prune: true import-mapping: - ../packageB/spec.yaml: github.com/deepmap/oapi-codegen/v2/internal/test/externalref/packageB + ../packageB/spec.yaml: github.com/oapi-codegen/oapi-codegen/v2/internal/test/externalref/packageB output: externalref.gen.go diff --git a/internal/test/externalref/packageA/doc.go b/internal/test/externalref/packageA/doc.go index 6d11f4bcf..f05471ffb 100644 --- a/internal/test/externalref/packageA/doc.go +++ b/internal/test/externalref/packageA/doc.go @@ -1,3 +1,3 @@ package packagea -//go:generate go run github.com/deepmap/oapi-codegen/v2/cmd/oapi-codegen --config=config.yaml spec.yaml +//go:generate go run github.com/oapi-codegen/oapi-codegen/v2/cmd/oapi-codegen --config=config.yaml spec.yaml diff --git a/internal/test/externalref/packageA/externalref.gen.go b/internal/test/externalref/packageA/externalref.gen.go index 6f569bfa2..d925df21e 100644 --- a/internal/test/externalref/packageA/externalref.gen.go +++ b/internal/test/externalref/packageA/externalref.gen.go @@ -1,6 +1,6 @@ // Package packagea provides primitives to interact with the openapi HTTP API. // -// Code generated by github.com/deepmap/oapi-codegen/v2 version v2.0.0-00010101000000-000000000000 DO NOT EDIT. +// Code generated by github.com/oapi-codegen/oapi-codegen/v2 version v2.0.0-00010101000000-000000000000 DO NOT EDIT. package packagea import ( @@ -12,8 +12,8 @@ import ( "path" "strings" - externalRef0 "github.com/deepmap/oapi-codegen/v2/internal/test/externalref/packageB" "github.com/getkin/kin-openapi/openapi3" + externalRef0 "github.com/oapi-codegen/oapi-codegen/v2/internal/test/externalref/packageB" ) // ObjectA defines model for ObjectA. diff --git a/internal/test/externalref/packageB/doc.go b/internal/test/externalref/packageB/doc.go index 2aba2cdfb..0dc18f825 100644 --- a/internal/test/externalref/packageB/doc.go +++ b/internal/test/externalref/packageB/doc.go @@ -1,3 +1,3 @@ package packageb -//go:generate go run github.com/deepmap/oapi-codegen/v2/cmd/oapi-codegen --config=config.yaml spec.yaml +//go:generate go run github.com/oapi-codegen/oapi-codegen/v2/cmd/oapi-codegen --config=config.yaml spec.yaml diff --git a/internal/test/externalref/packageB/externalref.gen.go b/internal/test/externalref/packageB/externalref.gen.go index e81242edc..c3f879cfd 100644 --- a/internal/test/externalref/packageB/externalref.gen.go +++ b/internal/test/externalref/packageB/externalref.gen.go @@ -1,6 +1,6 @@ // Package packageb provides primitives to interact with the openapi HTTP API. // -// Code generated by github.com/deepmap/oapi-codegen/v2 version v2.0.0-00010101000000-000000000000 DO NOT EDIT. +// Code generated by github.com/oapi-codegen/oapi-codegen/v2 version v2.0.0-00010101000000-000000000000 DO NOT EDIT. package packageb import ( diff --git a/internal/test/externalref/petstore/config.yaml b/internal/test/externalref/petstore/config.yaml index 3185cdc7b..6ee1a1369 100644 --- a/internal/test/externalref/petstore/config.yaml +++ b/internal/test/externalref/petstore/config.yaml @@ -6,5 +6,5 @@ generate: output-options: skip-prune: true import-mapping: - ../packageB/spec.yaml: github.com/deepmap/oapi-codegen/v2/internal/test/externalref/packageB + ../packageB/spec.yaml: github.com/oapi-codegen/oapi-codegen/v2/internal/test/externalref/packageB output: externalref.gen.go diff --git a/internal/test/externalref/petstore/doc.go b/internal/test/externalref/petstore/doc.go index 6d11f4bcf..f05471ffb 100644 --- a/internal/test/externalref/petstore/doc.go +++ b/internal/test/externalref/petstore/doc.go @@ -1,3 +1,3 @@ package packagea -//go:generate go run github.com/deepmap/oapi-codegen/v2/cmd/oapi-codegen --config=config.yaml spec.yaml +//go:generate go run github.com/oapi-codegen/oapi-codegen/v2/cmd/oapi-codegen --config=config.yaml spec.yaml diff --git a/internal/test/externalref/petstore/externalref.gen.go b/internal/test/externalref/petstore/externalref.gen.go index 24b2cedb3..c1d5d3e10 100644 --- a/internal/test/externalref/petstore/externalref.gen.go +++ b/internal/test/externalref/petstore/externalref.gen.go @@ -1,6 +1,6 @@ // Package packagea provides primitives to interact with the openapi HTTP API. // -// Code generated by github.com/deepmap/oapi-codegen/v2 version v2.0.0-00010101000000-000000000000 DO NOT EDIT. +// Code generated by github.com/oapi-codegen/oapi-codegen/v2 version v2.0.0-00010101000000-000000000000 DO NOT EDIT. package packagea import ( @@ -13,8 +13,8 @@ import ( "strings" "time" - externalRef0 "github.com/deepmap/oapi-codegen/v2/internal/test/externalref/packageB" "github.com/getkin/kin-openapi/openapi3" + externalRef0 "github.com/oapi-codegen/oapi-codegen/v2/internal/test/externalref/packageB" ) const ( diff --git a/internal/test/filter/doc.go b/internal/test/filter/doc.go index 9b33988d8..a9051b101 100644 --- a/internal/test/filter/doc.go +++ b/internal/test/filter/doc.go @@ -1,4 +1,4 @@ package client -//go:generate go run github.com/deepmap/oapi-codegen/v2/cmd/oapi-codegen --package=filtertags --generate=server -o tags/server.gen.go -include-tags included-tag1,included-tag2 server.yaml -//go:generate go run github.com/deepmap/oapi-codegen/v2/cmd/oapi-codegen --package=filteroperations --generate=server -o operations/server.gen.go -include-operation-ids included-operation1,included-operation2 server.yaml +//go:generate go run github.com/oapi-codegen/oapi-codegen/v2/cmd/oapi-codegen --package=filtertags --generate=server -o tags/server.gen.go -include-tags included-tag1,included-tag2 server.yaml +//go:generate go run github.com/oapi-codegen/oapi-codegen/v2/cmd/oapi-codegen --package=filteroperations --generate=server -o operations/server.gen.go -include-operation-ids included-operation1,included-operation2 server.yaml diff --git a/internal/test/filter/operations/server.gen.go b/internal/test/filter/operations/server.gen.go index a4db89e6d..49fc69b5e 100644 --- a/internal/test/filter/operations/server.gen.go +++ b/internal/test/filter/operations/server.gen.go @@ -1,6 +1,6 @@ // Package filteroperations provides primitives to interact with the openapi HTTP API. // -// Code generated by github.com/deepmap/oapi-codegen/v2 version v2.0.0-00010101000000-000000000000 DO NOT EDIT. +// Code generated by github.com/oapi-codegen/oapi-codegen/v2 version v2.0.0-00010101000000-000000000000 DO NOT EDIT. package filteroperations import ( diff --git a/internal/test/filter/tags/server.gen.go b/internal/test/filter/tags/server.gen.go index f7c993aaf..8137c0f39 100644 --- a/internal/test/filter/tags/server.gen.go +++ b/internal/test/filter/tags/server.gen.go @@ -1,6 +1,6 @@ // Package filtertags provides primitives to interact with the openapi HTTP API. // -// Code generated by github.com/deepmap/oapi-codegen/v2 version v2.0.0-00010101000000-000000000000 DO NOT EDIT. +// Code generated by github.com/oapi-codegen/oapi-codegen/v2 version v2.0.0-00010101000000-000000000000 DO NOT EDIT. package filtertags import ( diff --git a/internal/test/go.mod b/internal/test/go.mod index 8b6caf300..f6a61a742 100644 --- a/internal/test/go.mod +++ b/internal/test/go.mod @@ -1,11 +1,10 @@ -module github.com/deepmap/oapi-codegen/v2/internal/test +module github.com/oapi-codegen/oapi-codegen/v2/internal/test go 1.20 -replace github.com/deepmap/oapi-codegen/v2 => ../../ +replace github.com/oapi-codegen/oapi-codegen/v2 => ../../ require ( - github.com/deepmap/oapi-codegen/v2 v2.0.0-00010101000000-000000000000 github.com/getkin/kin-openapi v0.124.0 github.com/gin-gonic/gin v1.9.1 github.com/go-chi/chi/v5 v5.0.10 @@ -14,6 +13,7 @@ require ( github.com/kataras/iris/v12 v12.2.6-0.20230908161203-24ba4e8933b9 github.com/labstack/echo/v4 v4.11.3 github.com/oapi-codegen/nullable v1.0.1 + github.com/oapi-codegen/oapi-codegen/v2 v2.0.0-00010101000000-000000000000 github.com/oapi-codegen/runtime v1.1.0 github.com/oapi-codegen/testutil v1.0.0 github.com/stretchr/testify v1.9.0 diff --git a/internal/test/issues/issue-1039/client.gen.go b/internal/test/issues/issue-1039/client.gen.go index cf576c717..3114f2986 100644 --- a/internal/test/issues/issue-1039/client.gen.go +++ b/internal/test/issues/issue-1039/client.gen.go @@ -1,6 +1,6 @@ // Package issue1039 provides primitives to interact with the openapi HTTP API. // -// Code generated by github.com/deepmap/oapi-codegen/v2 version v2.0.0-00010101000000-000000000000 DO NOT EDIT. +// Code generated by github.com/oapi-codegen/oapi-codegen/v2 version v2.0.0-00010101000000-000000000000 DO NOT EDIT. package issue1039 import ( diff --git a/internal/test/issues/issue-1039/defaultbehaviour/types.gen.go b/internal/test/issues/issue-1039/defaultbehaviour/types.gen.go index e16b43613..b148f3783 100644 --- a/internal/test/issues/issue-1039/defaultbehaviour/types.gen.go +++ b/internal/test/issues/issue-1039/defaultbehaviour/types.gen.go @@ -1,6 +1,6 @@ // Package defaultbehaviour provides primitives to interact with the openapi HTTP API. // -// Code generated by github.com/deepmap/oapi-codegen/v2 version v2.0.0-00010101000000-000000000000 DO NOT EDIT. +// Code generated by github.com/oapi-codegen/oapi-codegen/v2 version v2.0.0-00010101000000-000000000000 DO NOT EDIT. package defaultbehaviour // PatchRequest A request to patch an existing user object. diff --git a/internal/test/issues/issue-1039/doc.go b/internal/test/issues/issue-1039/doc.go index 4cb14c3fa..2997380aa 100644 --- a/internal/test/issues/issue-1039/doc.go +++ b/internal/test/issues/issue-1039/doc.go @@ -1,6 +1,6 @@ package issue1039 -//go:generate go run github.com/deepmap/oapi-codegen/v2/cmd/oapi-codegen --config=types-config.yaml spec.yaml -//go:generate go run github.com/deepmap/oapi-codegen/v2/cmd/oapi-codegen --config=type-config-defaultbehaviour.yaml spec.yaml -//go:generate go run github.com/deepmap/oapi-codegen/v2/cmd/oapi-codegen --config=client-config.yaml spec.yaml -//go:generate go run github.com/deepmap/oapi-codegen/v2/cmd/oapi-codegen --config=server-config.yaml spec.yaml +//go:generate go run github.com/oapi-codegen/oapi-codegen/v2/cmd/oapi-codegen --config=types-config.yaml spec.yaml +//go:generate go run github.com/oapi-codegen/oapi-codegen/v2/cmd/oapi-codegen --config=type-config-defaultbehaviour.yaml spec.yaml +//go:generate go run github.com/oapi-codegen/oapi-codegen/v2/cmd/oapi-codegen --config=client-config.yaml spec.yaml +//go:generate go run github.com/oapi-codegen/oapi-codegen/v2/cmd/oapi-codegen --config=server-config.yaml spec.yaml diff --git a/internal/test/issues/issue-1039/server.gen.go b/internal/test/issues/issue-1039/server.gen.go index 578c353fe..ac0e22b78 100644 --- a/internal/test/issues/issue-1039/server.gen.go +++ b/internal/test/issues/issue-1039/server.gen.go @@ -1,6 +1,6 @@ // Package issue1039 provides primitives to interact with the openapi HTTP API. // -// Code generated by github.com/deepmap/oapi-codegen/v2 version v2.0.0-00010101000000-000000000000 DO NOT EDIT. +// Code generated by github.com/oapi-codegen/oapi-codegen/v2 version v2.0.0-00010101000000-000000000000 DO NOT EDIT. package issue1039 import ( diff --git a/internal/test/issues/issue-1039/types.gen.go b/internal/test/issues/issue-1039/types.gen.go index 54c850cb2..9c1191534 100644 --- a/internal/test/issues/issue-1039/types.gen.go +++ b/internal/test/issues/issue-1039/types.gen.go @@ -1,6 +1,6 @@ // Package issue1039 provides primitives to interact with the openapi HTTP API. // -// Code generated by github.com/deepmap/oapi-codegen/v2 version v2.0.0-00010101000000-000000000000 DO NOT EDIT. +// Code generated by github.com/oapi-codegen/oapi-codegen/v2 version v2.0.0-00010101000000-000000000000 DO NOT EDIT. package issue1039 import ( diff --git a/internal/test/issues/issue-1087/api.gen.go b/internal/test/issues/issue-1087/api.gen.go index 78810652f..99d00fd32 100644 --- a/internal/test/issues/issue-1087/api.gen.go +++ b/internal/test/issues/issue-1087/api.gen.go @@ -1,6 +1,6 @@ // Package issue1087 provides primitives to interact with the openapi HTTP API. // -// Code generated by github.com/deepmap/oapi-codegen/v2 version v2.0.0-00010101000000-000000000000 DO NOT EDIT. +// Code generated by github.com/oapi-codegen/oapi-codegen/v2 version v2.0.0-00010101000000-000000000000 DO NOT EDIT. package issue1087 import ( @@ -12,8 +12,8 @@ import ( "net/url" "strings" - externalRef0 "github.com/deepmap/oapi-codegen/v2/internal/test/issues/issue-1087/deps" "github.com/go-chi/chi/v5" + externalRef0 "github.com/oapi-codegen/oapi-codegen/v2/internal/test/issues/issue-1087/deps" ) // Thing defines model for Thing. diff --git a/internal/test/issues/issue-1087/deps/deps.gen.go b/internal/test/issues/issue-1087/deps/deps.gen.go index 91289e99a..8066ab2b5 100644 --- a/internal/test/issues/issue-1087/deps/deps.gen.go +++ b/internal/test/issues/issue-1087/deps/deps.gen.go @@ -1,6 +1,6 @@ // Package deps provides primitives to interact with the openapi HTTP API. // -// Code generated by github.com/deepmap/oapi-codegen/v2 version v2.0.0-00010101000000-000000000000 DO NOT EDIT. +// Code generated by github.com/oapi-codegen/oapi-codegen/v2 version v2.0.0-00010101000000-000000000000 DO NOT EDIT. package deps import ( diff --git a/internal/test/issues/issue-1087/deps/doc.go b/internal/test/issues/issue-1087/deps/doc.go index e03a36546..0684d56ca 100644 --- a/internal/test/issues/issue-1087/deps/doc.go +++ b/internal/test/issues/issue-1087/deps/doc.go @@ -1,3 +1,3 @@ package deps -//go:generate go run github.com/deepmap/oapi-codegen/v2/cmd/oapi-codegen --config=config.yaml my-deps.json +//go:generate go run github.com/oapi-codegen/oapi-codegen/v2/cmd/oapi-codegen --config=config.yaml my-deps.json diff --git a/internal/test/issues/issue-1087/doc.go b/internal/test/issues/issue-1087/doc.go index 324ca0971..2ad8db520 100644 --- a/internal/test/issues/issue-1087/doc.go +++ b/internal/test/issues/issue-1087/doc.go @@ -1,3 +1,3 @@ package issue1087 -//go:generate go run github.com/deepmap/oapi-codegen/v2/cmd/oapi-codegen --config=server.config.yaml spec.yaml +//go:generate go run github.com/oapi-codegen/oapi-codegen/v2/cmd/oapi-codegen --config=server.config.yaml spec.yaml diff --git a/internal/test/issues/issue-1087/server.config.yaml b/internal/test/issues/issue-1087/server.config.yaml index 76e25dc75..6d795c05d 100644 --- a/internal/test/issues/issue-1087/server.config.yaml +++ b/internal/test/issues/issue-1087/server.config.yaml @@ -8,4 +8,4 @@ generate: embedded-spec: false client: true import-mapping: - ./deps/my-deps.json: github.com/deepmap/oapi-codegen/v2/internal/test/issues/issue-1087/deps + ./deps/my-deps.json: github.com/oapi-codegen/oapi-codegen/v2/internal/test/issues/issue-1087/deps diff --git a/internal/test/issues/issue-1093/api/child/child.gen.go b/internal/test/issues/issue-1093/api/child/child.gen.go index 5de595a8a..a18d256df 100644 --- a/internal/test/issues/issue-1093/api/child/child.gen.go +++ b/internal/test/issues/issue-1093/api/child/child.gen.go @@ -1,6 +1,6 @@ // Package api provides primitives to interact with the openapi HTTP API. // -// Code generated by github.com/deepmap/oapi-codegen/v2 version v2.0.0-00010101000000-000000000000 DO NOT EDIT. +// Code generated by github.com/oapi-codegen/oapi-codegen/v2 version v2.0.0-00010101000000-000000000000 DO NOT EDIT. package api import ( @@ -15,9 +15,9 @@ import ( "path" "strings" - externalRef0 "github.com/deepmap/oapi-codegen/v2/internal/test/issues/issue-1093/api/parent" "github.com/getkin/kin-openapi/openapi3" "github.com/gin-gonic/gin" + externalRef0 "github.com/oapi-codegen/oapi-codegen/v2/internal/test/issues/issue-1093/api/parent" strictgin "github.com/oapi-codegen/runtime/strictmiddleware/gin" ) diff --git a/internal/test/issues/issue-1093/api/parent/parent.gen.go b/internal/test/issues/issue-1093/api/parent/parent.gen.go index e59030372..916772b07 100644 --- a/internal/test/issues/issue-1093/api/parent/parent.gen.go +++ b/internal/test/issues/issue-1093/api/parent/parent.gen.go @@ -1,6 +1,6 @@ // Package api provides primitives to interact with the openapi HTTP API. // -// Code generated by github.com/deepmap/oapi-codegen/v2 version v2.0.0-00010101000000-000000000000 DO NOT EDIT. +// Code generated by github.com/oapi-codegen/oapi-codegen/v2 version v2.0.0-00010101000000-000000000000 DO NOT EDIT. package api import ( diff --git a/internal/test/issues/issue-1093/child.cfg.yaml b/internal/test/issues/issue-1093/child.cfg.yaml index 47ba552f1..4efb750c1 100644 --- a/internal/test/issues/issue-1093/child.cfg.yaml +++ b/internal/test/issues/issue-1093/child.cfg.yaml @@ -7,5 +7,5 @@ generate: strict-server: true models: true import-mapping: - parent.api.yaml: github.com/deepmap/oapi-codegen/v2/internal/test/issues/issue-1093/api/parent + parent.api.yaml: github.com/oapi-codegen/oapi-codegen/v2/internal/test/issues/issue-1093/api/parent output: api/child/child.gen.go diff --git a/internal/test/issues/issue-1093/doc.go b/internal/test/issues/issue-1093/doc.go index 0487fc8d3..7916b330b 100644 --- a/internal/test/issues/issue-1093/doc.go +++ b/internal/test/issues/issue-1093/doc.go @@ -2,5 +2,5 @@ // See https://github.com/deepmap/oapi-codegen/issues/1093 package issue1093 -//go:generate go run github.com/deepmap/oapi-codegen/v2/cmd/oapi-codegen --config parent.cfg.yaml parent.api.yaml -//go:generate go run github.com/deepmap/oapi-codegen/v2/cmd/oapi-codegen --config child.cfg.yaml child.api.yaml +//go:generate go run github.com/oapi-codegen/oapi-codegen/v2/cmd/oapi-codegen --config parent.cfg.yaml parent.api.yaml +//go:generate go run github.com/oapi-codegen/oapi-codegen/v2/cmd/oapi-codegen --config child.cfg.yaml child.api.yaml diff --git a/internal/test/issues/issue-1093/issue_test.go b/internal/test/issues/issue-1093/issue_test.go index db7234477..990de8538 100644 --- a/internal/test/issues/issue-1093/issue_test.go +++ b/internal/test/issues/issue-1093/issue_test.go @@ -7,7 +7,7 @@ import ( "github.com/getkin/kin-openapi/openapi3" "github.com/stretchr/testify/require" - "github.com/deepmap/oapi-codegen/v2/pkg/codegen" + "github.com/oapi-codegen/oapi-codegen/v2/pkg/codegen" ) //go:embed child.api.yaml @@ -29,7 +29,7 @@ func TestIssue(t *testing.T) { EmbeddedSpec: true, }, ImportMapping: map[string]string{ - "parent.api.yaml": "github.com/deepmap/oapi-codegen/v2/internal/test/issues/issue-1093/api/parent", + "parent.api.yaml": "github.com/oapi-codegen/oapi-codegen/v2/internal/test/issues/issue-1093/api/parent", }, } diff --git a/internal/test/issues/issue-1127/api.gen.go b/internal/test/issues/issue-1127/api.gen.go index 02e87ebc3..d3fa8e429 100644 --- a/internal/test/issues/issue-1127/api.gen.go +++ b/internal/test/issues/issue-1127/api.gen.go @@ -1,6 +1,6 @@ // Package issue1127 provides primitives to interact with the openapi HTTP API. // -// Code generated by github.com/deepmap/oapi-codegen/v2 version v2.0.0-00010101000000-000000000000 DO NOT EDIT. +// Code generated by github.com/oapi-codegen/oapi-codegen/v2 version v2.0.0-00010101000000-000000000000 DO NOT EDIT. package issue1127 // Whatever defines model for Whatever. diff --git a/internal/test/issues/issue-1127/doc.go b/internal/test/issues/issue-1127/doc.go index 9f60b28de..d591e52f8 100644 --- a/internal/test/issues/issue-1127/doc.go +++ b/internal/test/issues/issue-1127/doc.go @@ -1,3 +1,3 @@ package issue1127 -//go:generate go run github.com/deepmap/oapi-codegen/v2/cmd/oapi-codegen --config=server.config.yaml spec.yaml +//go:generate go run github.com/oapi-codegen/oapi-codegen/v2/cmd/oapi-codegen --config=server.config.yaml spec.yaml diff --git a/internal/test/issues/issue-1168/api.gen.go b/internal/test/issues/issue-1168/api.gen.go index 1f44dc4b3..d681fbd81 100644 --- a/internal/test/issues/issue-1168/api.gen.go +++ b/internal/test/issues/issue-1168/api.gen.go @@ -1,6 +1,6 @@ // Package issue1168 provides primitives to interact with the openapi HTTP API. // -// Code generated by github.com/deepmap/oapi-codegen/v2 version v2.0.0-00010101000000-000000000000 DO NOT EDIT. +// Code generated by github.com/oapi-codegen/oapi-codegen/v2 version v2.0.0-00010101000000-000000000000 DO NOT EDIT. package issue1168 import ( diff --git a/internal/test/issues/issue-1168/doc.go b/internal/test/issues/issue-1168/doc.go index 3d2039729..2541e721d 100644 --- a/internal/test/issues/issue-1168/doc.go +++ b/internal/test/issues/issue-1168/doc.go @@ -1,3 +1,3 @@ package issue1168 -//go:generate go run github.com/deepmap/oapi-codegen/v2/cmd/oapi-codegen --config=server.config.yaml spec.yaml +//go:generate go run github.com/oapi-codegen/oapi-codegen/v2/cmd/oapi-codegen --config=server.config.yaml spec.yaml diff --git a/internal/test/issues/issue-1180/doc.go b/internal/test/issues/issue-1180/doc.go index 5b4cdf7de..5fcca2b96 100644 --- a/internal/test/issues/issue-1180/doc.go +++ b/internal/test/issues/issue-1180/doc.go @@ -1,3 +1,3 @@ package issue1180 -//go:generate go run github.com/deepmap/oapi-codegen/v2/cmd/oapi-codegen --config=config.yaml issue.yaml +//go:generate go run github.com/oapi-codegen/oapi-codegen/v2/cmd/oapi-codegen --config=config.yaml issue.yaml diff --git a/internal/test/issues/issue-1180/issue.gen.go b/internal/test/issues/issue-1180/issue.gen.go index 1b3399abf..cc675b96d 100644 --- a/internal/test/issues/issue-1180/issue.gen.go +++ b/internal/test/issues/issue-1180/issue.gen.go @@ -1,6 +1,6 @@ // Package issue1180 provides primitives to interact with the openapi HTTP API. // -// Code generated by github.com/deepmap/oapi-codegen/v2 version v2.0.0-00010101000000-000000000000 DO NOT EDIT. +// Code generated by github.com/oapi-codegen/oapi-codegen/v2 version v2.0.0-00010101000000-000000000000 DO NOT EDIT. package issue1180 import ( diff --git a/internal/test/issues/issue-1182/pkg1/config.yaml b/internal/test/issues/issue-1182/pkg1/config.yaml index 05f0fb677..a300242fb 100644 --- a/internal/test/issues/issue-1182/pkg1/config.yaml +++ b/internal/test/issues/issue-1182/pkg1/config.yaml @@ -8,4 +8,4 @@ generate: strict-server: true output: pkg1.gen.go import-mapping: - pkg2.yaml: github.com/deepmap/oapi-codegen/v2/internal/test/issues/issue-1182/pkg2 + pkg2.yaml: github.com/oapi-codegen/oapi-codegen/v2/internal/test/issues/issue-1182/pkg2 diff --git a/internal/test/issues/issue-1182/pkg1/doc.go b/internal/test/issues/issue-1182/pkg1/doc.go index 060f76260..8b57f0836 100644 --- a/internal/test/issues/issue-1182/pkg1/doc.go +++ b/internal/test/issues/issue-1182/pkg1/doc.go @@ -1,3 +1,3 @@ package pkg1 -//go:generate go run github.com/deepmap/oapi-codegen/v2/cmd/oapi-codegen --config=config.yaml ../pkg1.yaml +//go:generate go run github.com/oapi-codegen/oapi-codegen/v2/cmd/oapi-codegen --config=config.yaml ../pkg1.yaml diff --git a/internal/test/issues/issue-1182/pkg1/pkg1.gen.go b/internal/test/issues/issue-1182/pkg1/pkg1.gen.go index ce8632bd7..1f278d359 100644 --- a/internal/test/issues/issue-1182/pkg1/pkg1.gen.go +++ b/internal/test/issues/issue-1182/pkg1/pkg1.gen.go @@ -1,6 +1,6 @@ // Package pkg1 provides primitives to interact with the openapi HTTP API. // -// Code generated by github.com/deepmap/oapi-codegen/v2 version v2.0.0-00010101000000-000000000000 DO NOT EDIT. +// Code generated by github.com/oapi-codegen/oapi-codegen/v2 version v2.0.0-00010101000000-000000000000 DO NOT EDIT. package pkg1 import ( @@ -15,9 +15,9 @@ import ( "path" "strings" - externalRef0 "github.com/deepmap/oapi-codegen/v2/internal/test/issues/issue-1182/pkg2" "github.com/getkin/kin-openapi/openapi3" "github.com/labstack/echo/v4" + externalRef0 "github.com/oapi-codegen/oapi-codegen/v2/internal/test/issues/issue-1182/pkg2" strictecho "github.com/oapi-codegen/runtime/strictmiddleware/echo" ) diff --git a/internal/test/issues/issue-1182/pkg2/doc.go b/internal/test/issues/issue-1182/pkg2/doc.go index fcb267c5c..68cb0b78a 100644 --- a/internal/test/issues/issue-1182/pkg2/doc.go +++ b/internal/test/issues/issue-1182/pkg2/doc.go @@ -1,3 +1,3 @@ package pkg2 -//go:generate go run github.com/deepmap/oapi-codegen/v2/cmd/oapi-codegen --config=config.yaml ../pkg2.yaml +//go:generate go run github.com/oapi-codegen/oapi-codegen/v2/cmd/oapi-codegen --config=config.yaml ../pkg2.yaml diff --git a/internal/test/issues/issue-1182/pkg2/pkg2.gen.go b/internal/test/issues/issue-1182/pkg2/pkg2.gen.go index 682bec3c0..51eece40a 100644 --- a/internal/test/issues/issue-1182/pkg2/pkg2.gen.go +++ b/internal/test/issues/issue-1182/pkg2/pkg2.gen.go @@ -1,6 +1,6 @@ // Package pkg2 provides primitives to interact with the openapi HTTP API. // -// Code generated by github.com/deepmap/oapi-codegen/v2 version v2.0.0-00010101000000-000000000000 DO NOT EDIT. +// Code generated by github.com/oapi-codegen/oapi-codegen/v2 version v2.0.0-00010101000000-000000000000 DO NOT EDIT. package pkg2 import ( diff --git a/internal/test/issues/issue-1189/doc.go b/internal/test/issues/issue-1189/doc.go index c5c647f00..e64506f48 100644 --- a/internal/test/issues/issue-1189/doc.go +++ b/internal/test/issues/issue-1189/doc.go @@ -1,3 +1,3 @@ package param -//go:generate go run github.com/deepmap/oapi-codegen/v2/cmd/oapi-codegen --config=config.yaml issue1189.yaml +//go:generate go run github.com/oapi-codegen/oapi-codegen/v2/cmd/oapi-codegen --config=config.yaml issue1189.yaml diff --git a/internal/test/issues/issue-1189/issue1189.gen.go b/internal/test/issues/issue-1189/issue1189.gen.go index 16ebff95a..c1a869ad9 100644 --- a/internal/test/issues/issue-1189/issue1189.gen.go +++ b/internal/test/issues/issue-1189/issue1189.gen.go @@ -1,6 +1,6 @@ // Package param provides primitives to interact with the openapi HTTP API. // -// Code generated by github.com/deepmap/oapi-codegen/v2 version v2.0.0-00010101000000-000000000000 DO NOT EDIT. +// Code generated by github.com/oapi-codegen/oapi-codegen/v2 version v2.0.0-00010101000000-000000000000 DO NOT EDIT. package param import ( diff --git a/internal/test/issues/issue-1208-1209/doc.go b/internal/test/issues/issue-1208-1209/doc.go index bd18f8322..7384a2ab9 100644 --- a/internal/test/issues/issue-1208-1209/doc.go +++ b/internal/test/issues/issue-1208-1209/doc.go @@ -1,3 +1,3 @@ package multijson -//go:generate go run github.com/deepmap/oapi-codegen/v2/cmd/oapi-codegen --config=config.yaml issue-multi-json.yaml +//go:generate go run github.com/oapi-codegen/oapi-codegen/v2/cmd/oapi-codegen --config=config.yaml issue-multi-json.yaml diff --git a/internal/test/issues/issue-1208-1209/issue-multi-json.gen.go b/internal/test/issues/issue-1208-1209/issue-multi-json.gen.go index dc43f33b6..780d45e6a 100644 --- a/internal/test/issues/issue-1208-1209/issue-multi-json.gen.go +++ b/internal/test/issues/issue-1208-1209/issue-multi-json.gen.go @@ -1,6 +1,6 @@ // Package multijson provides primitives to interact with the openapi HTTP API. // -// Code generated by github.com/deepmap/oapi-codegen/v2 version v2.0.0-00010101000000-000000000000 DO NOT EDIT. +// Code generated by github.com/oapi-codegen/oapi-codegen/v2 version v2.0.0-00010101000000-000000000000 DO NOT EDIT. package multijson import ( diff --git a/internal/test/issues/issue-1208-1209/issue-multi-json_test.go b/internal/test/issues/issue-1208-1209/issue-multi-json_test.go index 825a9909e..2c379909e 100644 --- a/internal/test/issues/issue-1208-1209/issue-multi-json_test.go +++ b/internal/test/issues/issue-1208-1209/issue-multi-json_test.go @@ -6,7 +6,7 @@ import ( "net/http" "testing" - multijson "github.com/deepmap/oapi-codegen/v2/internal/test/issues/issue-1208-1209" + multijson "github.com/oapi-codegen/oapi-codegen/v2/internal/test/issues/issue-1208-1209" "github.com/stretchr/testify/assert" ) diff --git a/internal/test/issues/issue-1212/pkg1/config.yaml b/internal/test/issues/issue-1212/pkg1/config.yaml index 8780f76f1..040b8223b 100644 --- a/internal/test/issues/issue-1212/pkg1/config.yaml +++ b/internal/test/issues/issue-1212/pkg1/config.yaml @@ -8,4 +8,4 @@ generate: strict-server: true output: pkg1.gen.go import-mapping: - pkg2.yaml: github.com/deepmap/oapi-codegen/v2/internal/test/issues/issue-1212/pkg2 + pkg2.yaml: github.com/oapi-codegen/oapi-codegen/v2/internal/test/issues/issue-1212/pkg2 diff --git a/internal/test/issues/issue-1212/pkg1/doc.go b/internal/test/issues/issue-1212/pkg1/doc.go index 060f76260..8b57f0836 100644 --- a/internal/test/issues/issue-1212/pkg1/doc.go +++ b/internal/test/issues/issue-1212/pkg1/doc.go @@ -1,3 +1,3 @@ package pkg1 -//go:generate go run github.com/deepmap/oapi-codegen/v2/cmd/oapi-codegen --config=config.yaml ../pkg1.yaml +//go:generate go run github.com/oapi-codegen/oapi-codegen/v2/cmd/oapi-codegen --config=config.yaml ../pkg1.yaml diff --git a/internal/test/issues/issue-1212/pkg1/pkg1.gen.go b/internal/test/issues/issue-1212/pkg1/pkg1.gen.go index 4f0e619c3..bada274bc 100644 --- a/internal/test/issues/issue-1212/pkg1/pkg1.gen.go +++ b/internal/test/issues/issue-1212/pkg1/pkg1.gen.go @@ -1,6 +1,6 @@ // Package pkg1 provides primitives to interact with the openapi HTTP API. // -// Code generated by github.com/deepmap/oapi-codegen/v2 version v2.0.0-00010101000000-000000000000 DO NOT EDIT. +// Code generated by github.com/oapi-codegen/oapi-codegen/v2 version v2.0.0-00010101000000-000000000000 DO NOT EDIT. package pkg1 import ( @@ -17,9 +17,9 @@ import ( "path" "strings" - externalRef0 "github.com/deepmap/oapi-codegen/v2/internal/test/issues/issue-1212/pkg2" "github.com/getkin/kin-openapi/openapi3" "github.com/gin-gonic/gin" + externalRef0 "github.com/oapi-codegen/oapi-codegen/v2/internal/test/issues/issue-1212/pkg2" strictgin "github.com/oapi-codegen/runtime/strictmiddleware/gin" ) diff --git a/internal/test/issues/issue-1212/pkg2/doc.go b/internal/test/issues/issue-1212/pkg2/doc.go index fcb267c5c..68cb0b78a 100644 --- a/internal/test/issues/issue-1212/pkg2/doc.go +++ b/internal/test/issues/issue-1212/pkg2/doc.go @@ -1,3 +1,3 @@ package pkg2 -//go:generate go run github.com/deepmap/oapi-codegen/v2/cmd/oapi-codegen --config=config.yaml ../pkg2.yaml +//go:generate go run github.com/oapi-codegen/oapi-codegen/v2/cmd/oapi-codegen --config=config.yaml ../pkg2.yaml diff --git a/internal/test/issues/issue-1212/pkg2/pkg2.gen.go b/internal/test/issues/issue-1212/pkg2/pkg2.gen.go index fa8d50fde..5a994ed06 100644 --- a/internal/test/issues/issue-1212/pkg2/pkg2.gen.go +++ b/internal/test/issues/issue-1212/pkg2/pkg2.gen.go @@ -1,6 +1,6 @@ // Package pkg2 provides primitives to interact with the openapi HTTP API. // -// Code generated by github.com/deepmap/oapi-codegen/v2 version v2.0.0-00010101000000-000000000000 DO NOT EDIT. +// Code generated by github.com/oapi-codegen/oapi-codegen/v2 version v2.0.0-00010101000000-000000000000 DO NOT EDIT. package pkg2 import ( diff --git a/internal/test/issues/issue-1219/doc.go b/internal/test/issues/issue-1219/doc.go index 6976b420b..7e1118e5c 100644 --- a/internal/test/issues/issue-1219/doc.go +++ b/internal/test/issues/issue-1219/doc.go @@ -1,3 +1,3 @@ package issue1219 -//go:generate go run github.com/deepmap/oapi-codegen/v2/cmd/oapi-codegen --config=config.yaml issue.yaml +//go:generate go run github.com/oapi-codegen/oapi-codegen/v2/cmd/oapi-codegen --config=config.yaml issue.yaml diff --git a/internal/test/issues/issue-1219/issue.gen.go b/internal/test/issues/issue-1219/issue.gen.go index e8df58f14..2beeedc59 100644 --- a/internal/test/issues/issue-1219/issue.gen.go +++ b/internal/test/issues/issue-1219/issue.gen.go @@ -1,6 +1,6 @@ // Package issue1219 provides primitives to interact with the openapi HTTP API. // -// Code generated by github.com/deepmap/oapi-codegen/v2 version v2.0.0-00010101000000-000000000000 DO NOT EDIT. +// Code generated by github.com/oapi-codegen/oapi-codegen/v2 version v2.0.0-00010101000000-000000000000 DO NOT EDIT. package issue1219 import ( diff --git a/internal/test/issues/issue-1219/issue_test.go b/internal/test/issues/issue-1219/issue_test.go index 489675922..aebd0d1af 100644 --- a/internal/test/issues/issue-1219/issue_test.go +++ b/internal/test/issues/issue-1219/issue_test.go @@ -4,7 +4,7 @@ import ( "reflect" "testing" - issue1219 "github.com/deepmap/oapi-codegen/v2/internal/test/issues/issue-1219" + issue1219 "github.com/oapi-codegen/oapi-codegen/v2/internal/test/issues/issue-1219" "github.com/stretchr/testify/assert" ) diff --git a/internal/test/issues/issue-1298/doc.go b/internal/test/issues/issue-1298/doc.go index dbae518f0..b5e5ee95c 100644 --- a/internal/test/issues/issue-1298/doc.go +++ b/internal/test/issues/issue-1298/doc.go @@ -1,3 +1,3 @@ package issue1298 -//go:generate go run github.com/deepmap/oapi-codegen/v2/cmd/oapi-codegen --config=config.yaml issue1298.yaml +//go:generate go run github.com/oapi-codegen/oapi-codegen/v2/cmd/oapi-codegen --config=config.yaml issue1298.yaml diff --git a/internal/test/issues/issue-1298/issue1298.gen.go b/internal/test/issues/issue-1298/issue1298.gen.go index 03f8eb392..94734a577 100644 --- a/internal/test/issues/issue-1298/issue1298.gen.go +++ b/internal/test/issues/issue-1298/issue1298.gen.go @@ -1,6 +1,6 @@ // Package issue1298 provides primitives to interact with the openapi HTTP API. // -// Code generated by github.com/deepmap/oapi-codegen/v2 version v2.0.0-00010101000000-000000000000 DO NOT EDIT. +// Code generated by github.com/oapi-codegen/oapi-codegen/v2 version v2.0.0-00010101000000-000000000000 DO NOT EDIT. package issue1298 import ( diff --git a/internal/test/issues/issue-1298/issue1298_test.go b/internal/test/issues/issue-1298/issue1298_test.go index 62bc46884..0d627f10f 100644 --- a/internal/test/issues/issue-1298/issue1298_test.go +++ b/internal/test/issues/issue-1298/issue1298_test.go @@ -6,8 +6,8 @@ import ( "net/http/httptest" "testing" - issue1298 "github.com/deepmap/oapi-codegen/v2/internal/test/issues/issue-1298" "github.com/gin-gonic/gin" + issue1298 "github.com/oapi-codegen/oapi-codegen/v2/internal/test/issues/issue-1298" "github.com/stretchr/testify/assert" ) diff --git a/internal/test/issues/issue-1378/bionicle/bionicle.gen.go b/internal/test/issues/issue-1378/bionicle/bionicle.gen.go index 4b41f81d0..ec4c1f3b7 100644 --- a/internal/test/issues/issue-1378/bionicle/bionicle.gen.go +++ b/internal/test/issues/issue-1378/bionicle/bionicle.gen.go @@ -1,6 +1,6 @@ // Package bionicle provides primitives to interact with the openapi HTTP API. // -// Code generated by github.com/deepmap/oapi-codegen/v2 version v2.0.0-00010101000000-000000000000 DO NOT EDIT. +// Code generated by github.com/oapi-codegen/oapi-codegen/v2 version v2.0.0-00010101000000-000000000000 DO NOT EDIT. package bionicle import ( @@ -15,9 +15,9 @@ import ( "path" "strings" - externalRef0 "github.com/deepmap/oapi-codegen/v2/internal/test/issues/issue-1378/common" "github.com/getkin/kin-openapi/openapi3" "github.com/gorilla/mux" + externalRef0 "github.com/oapi-codegen/oapi-codegen/v2/internal/test/issues/issue-1378/common" "github.com/oapi-codegen/runtime" strictnethttp "github.com/oapi-codegen/runtime/strictmiddleware/nethttp" ) diff --git a/internal/test/issues/issue-1378/bionicle/config.yaml b/internal/test/issues/issue-1378/bionicle/config.yaml index 76ef0870a..4f81605dc 100644 --- a/internal/test/issues/issue-1378/bionicle/config.yaml +++ b/internal/test/issues/issue-1378/bionicle/config.yaml @@ -6,5 +6,5 @@ generate: strict-server: true models: true import-mapping: - common.yaml: github.com/deepmap/oapi-codegen/v2/internal/test/issues/issue-1378/common + common.yaml: github.com/oapi-codegen/oapi-codegen/v2/internal/test/issues/issue-1378/common output: bionicle.gen.go diff --git a/internal/test/issues/issue-1378/bionicle/generate.go b/internal/test/issues/issue-1378/bionicle/generate.go index 86c5c1ab0..26b366169 100644 --- a/internal/test/issues/issue-1378/bionicle/generate.go +++ b/internal/test/issues/issue-1378/bionicle/generate.go @@ -1,3 +1,3 @@ package bionicle -//go:generate go run github.com/deepmap/oapi-codegen/v2/cmd/oapi-codegen --config=config.yaml ../bionicle.yaml +//go:generate go run github.com/oapi-codegen/oapi-codegen/v2/cmd/oapi-codegen --config=config.yaml ../bionicle.yaml diff --git a/internal/test/issues/issue-1378/common/common.gen.go b/internal/test/issues/issue-1378/common/common.gen.go index ce5ae4acf..d1747783e 100644 --- a/internal/test/issues/issue-1378/common/common.gen.go +++ b/internal/test/issues/issue-1378/common/common.gen.go @@ -1,6 +1,6 @@ // Package common provides primitives to interact with the openapi HTTP API. // -// Code generated by github.com/deepmap/oapi-codegen/v2 version v2.0.0-00010101000000-000000000000 DO NOT EDIT. +// Code generated by github.com/oapi-codegen/oapi-codegen/v2 version v2.0.0-00010101000000-000000000000 DO NOT EDIT. package common import ( diff --git a/internal/test/issues/issue-1378/common/generate.go b/internal/test/issues/issue-1378/common/generate.go index b54279ec4..dbb23b05d 100644 --- a/internal/test/issues/issue-1378/common/generate.go +++ b/internal/test/issues/issue-1378/common/generate.go @@ -1,3 +1,3 @@ package common -//go:generate go run github.com/deepmap/oapi-codegen/v2/cmd/oapi-codegen --config=config.yaml ../common.yaml +//go:generate go run github.com/oapi-codegen/oapi-codegen/v2/cmd/oapi-codegen --config=config.yaml ../common.yaml diff --git a/internal/test/issues/issue-1378/fooservice/config.yaml b/internal/test/issues/issue-1378/fooservice/config.yaml index 993087158..4690bd037 100644 --- a/internal/test/issues/issue-1378/fooservice/config.yaml +++ b/internal/test/issues/issue-1378/fooservice/config.yaml @@ -6,6 +6,6 @@ generate: strict-server: true models: true import-mapping: - common.yaml: github.com/deepmap/oapi-codegen/v2/internal/test/issues/issue-1378/common - bionicle.yaml: github.com/deepmap/oapi-codegen/v2/internal/test/issues/issue-1378/bionicle + common.yaml: github.com/oapi-codegen/oapi-codegen/v2/internal/test/issues/issue-1378/common + bionicle.yaml: github.com/oapi-codegen/oapi-codegen/v2/internal/test/issues/issue-1378/bionicle output: fooservice.gen.go diff --git a/internal/test/issues/issue-1378/fooservice/fooservice.gen.go b/internal/test/issues/issue-1378/fooservice/fooservice.gen.go index 8d2bb1fc7..c74056ac5 100644 --- a/internal/test/issues/issue-1378/fooservice/fooservice.gen.go +++ b/internal/test/issues/issue-1378/fooservice/fooservice.gen.go @@ -1,6 +1,6 @@ // Package fooservice provides primitives to interact with the openapi HTTP API. // -// Code generated by github.com/deepmap/oapi-codegen/v2 version v2.0.0-00010101000000-000000000000 DO NOT EDIT. +// Code generated by github.com/oapi-codegen/oapi-codegen/v2 version v2.0.0-00010101000000-000000000000 DO NOT EDIT. package fooservice import ( @@ -15,10 +15,10 @@ import ( "path" "strings" - externalRef0 "github.com/deepmap/oapi-codegen/v2/internal/test/issues/issue-1378/bionicle" - externalRef1 "github.com/deepmap/oapi-codegen/v2/internal/test/issues/issue-1378/common" "github.com/getkin/kin-openapi/openapi3" "github.com/gorilla/mux" + externalRef0 "github.com/oapi-codegen/oapi-codegen/v2/internal/test/issues/issue-1378/bionicle" + externalRef1 "github.com/oapi-codegen/oapi-codegen/v2/internal/test/issues/issue-1378/common" "github.com/oapi-codegen/runtime" strictnethttp "github.com/oapi-codegen/runtime/strictmiddleware/nethttp" ) diff --git a/internal/test/issues/issue-1378/fooservice/generate.go b/internal/test/issues/issue-1378/fooservice/generate.go index 30826e829..2419719db 100644 --- a/internal/test/issues/issue-1378/fooservice/generate.go +++ b/internal/test/issues/issue-1378/fooservice/generate.go @@ -1,3 +1,3 @@ package fooservice -//go:generate go run github.com/deepmap/oapi-codegen/v2/cmd/oapi-codegen --config=config.yaml ../foo-service.yaml +//go:generate go run github.com/oapi-codegen/oapi-codegen/v2/cmd/oapi-codegen --config=config.yaml ../foo-service.yaml diff --git a/internal/test/issues/issue-1397/doc.go b/internal/test/issues/issue-1397/doc.go index 4dd8581a3..e5964fe29 100644 --- a/internal/test/issues/issue-1397/doc.go +++ b/internal/test/issues/issue-1397/doc.go @@ -1,3 +1,3 @@ package issue1397 -//go:generate go run github.com/deepmap/oapi-codegen/v2/cmd/oapi-codegen --config=config.yaml spec.yaml +//go:generate go run github.com/oapi-codegen/oapi-codegen/v2/cmd/oapi-codegen --config=config.yaml spec.yaml diff --git a/internal/test/issues/issue-1397/issue1397.gen.go b/internal/test/issues/issue-1397/issue1397.gen.go index 36c9a7926..2463641eb 100644 --- a/internal/test/issues/issue-1397/issue1397.gen.go +++ b/internal/test/issues/issue-1397/issue1397.gen.go @@ -1,6 +1,6 @@ // Package issue1397 provides primitives to interact with the openapi HTTP API. // -// Code generated by github.com/deepmap/oapi-codegen/v2 version v2.0.0-00010101000000-000000000000 DO NOT EDIT. +// Code generated by github.com/oapi-codegen/oapi-codegen/v2 version v2.0.0-00010101000000-000000000000 DO NOT EDIT. package issue1397 import ( diff --git a/internal/test/issues/issue-312/doc.go b/internal/test/issues/issue-312/doc.go index 475c1b4c2..768a4595b 100644 --- a/internal/test/issues/issue-312/doc.go +++ b/internal/test/issues/issue-312/doc.go @@ -1,3 +1,3 @@ package issue312 -//go:generate go run github.com/deepmap/oapi-codegen/v2/cmd/oapi-codegen --config=config.yaml spec.yaml +//go:generate go run github.com/oapi-codegen/oapi-codegen/v2/cmd/oapi-codegen --config=config.yaml spec.yaml diff --git a/internal/test/issues/issue-312/issue.gen.go b/internal/test/issues/issue-312/issue.gen.go index 690705d21..f0285c071 100644 --- a/internal/test/issues/issue-312/issue.gen.go +++ b/internal/test/issues/issue-312/issue.gen.go @@ -1,6 +1,6 @@ // Package issue312 provides primitives to interact with the openapi HTTP API. // -// Code generated by github.com/deepmap/oapi-codegen/v2 version v2.0.0-00010101000000-000000000000 DO NOT EDIT. +// Code generated by github.com/oapi-codegen/oapi-codegen/v2 version v2.0.0-00010101000000-000000000000 DO NOT EDIT. package issue312 import ( diff --git a/internal/test/issues/issue-52/doc.go b/internal/test/issues/issue-52/doc.go index aa9f97725..3d239ebdc 100644 --- a/internal/test/issues/issue-52/doc.go +++ b/internal/test/issues/issue-52/doc.go @@ -1,3 +1,3 @@ package issue52 -//go:generate go run github.com/deepmap/oapi-codegen/v2/cmd/oapi-codegen --config=config.yaml spec.yaml +//go:generate go run github.com/oapi-codegen/oapi-codegen/v2/cmd/oapi-codegen --config=config.yaml spec.yaml diff --git a/internal/test/issues/issue-52/issue.gen.go b/internal/test/issues/issue-52/issue.gen.go index 4664ce68c..f024999d6 100644 --- a/internal/test/issues/issue-52/issue.gen.go +++ b/internal/test/issues/issue-52/issue.gen.go @@ -1,6 +1,6 @@ // Package issue52 provides primitives to interact with the openapi HTTP API. // -// Code generated by github.com/deepmap/oapi-codegen/v2 version v2.0.0-00010101000000-000000000000 DO NOT EDIT. +// Code generated by github.com/oapi-codegen/oapi-codegen/v2 version v2.0.0-00010101000000-000000000000 DO NOT EDIT. package issue52 import ( diff --git a/internal/test/issues/issue-52/issue_test.go b/internal/test/issues/issue-52/issue_test.go index 09cadd821..0288c2aea 100644 --- a/internal/test/issues/issue-52/issue_test.go +++ b/internal/test/issues/issue-52/issue_test.go @@ -4,8 +4,8 @@ import ( _ "embed" "testing" - "github.com/deepmap/oapi-codegen/v2/pkg/codegen" "github.com/getkin/kin-openapi/openapi3" + "github.com/oapi-codegen/oapi-codegen/v2/pkg/codegen" "github.com/stretchr/testify/require" ) diff --git a/internal/test/issues/issue-579/gen.go b/internal/test/issues/issue-579/gen.go index c77dc735c..7b198d0cd 100644 --- a/internal/test/issues/issue-579/gen.go +++ b/internal/test/issues/issue-579/gen.go @@ -1,3 +1,3 @@ package issue579 -//go:generate go run github.com/deepmap/oapi-codegen/v2/cmd/oapi-codegen --package=issue579 --generate=types,skip-prune --alias-types -o issue.gen.go spec.yaml +//go:generate go run github.com/oapi-codegen/oapi-codegen/v2/cmd/oapi-codegen --package=issue579 --generate=types,skip-prune --alias-types -o issue.gen.go spec.yaml diff --git a/internal/test/issues/issue-579/issue.gen.go b/internal/test/issues/issue-579/issue.gen.go index 3bb1dc89f..54326646d 100644 --- a/internal/test/issues/issue-579/issue.gen.go +++ b/internal/test/issues/issue-579/issue.gen.go @@ -1,6 +1,6 @@ // Package issue579 provides primitives to interact with the openapi HTTP API. // -// Code generated by github.com/deepmap/oapi-codegen/v2 version v2.0.0-00010101000000-000000000000 DO NOT EDIT. +// Code generated by github.com/oapi-codegen/oapi-codegen/v2 version v2.0.0-00010101000000-000000000000 DO NOT EDIT. package issue579 import ( diff --git a/internal/test/issues/issue-832/generate.go b/internal/test/issues/issue-832/generate.go index 5fdb5aa06..79b06c713 100644 --- a/internal/test/issues/issue-832/generate.go +++ b/internal/test/issues/issue-832/generate.go @@ -1,3 +1,3 @@ package issue_832 -//go:generate go run github.com/deepmap/oapi-codegen/v2/cmd/oapi-codegen --config=config.yaml spec.yaml +//go:generate go run github.com/oapi-codegen/oapi-codegen/v2/cmd/oapi-codegen --config=config.yaml spec.yaml diff --git a/internal/test/issues/issue-832/issue.gen.go b/internal/test/issues/issue-832/issue.gen.go index fc7a529f8..0aa74f232 100644 --- a/internal/test/issues/issue-832/issue.gen.go +++ b/internal/test/issues/issue-832/issue.gen.go @@ -1,6 +1,6 @@ // Package issue_832 provides primitives to interact with the openapi HTTP API. // -// Code generated by github.com/deepmap/oapi-codegen/v2 version v2.0.0-00010101000000-000000000000 DO NOT EDIT. +// Code generated by github.com/oapi-codegen/oapi-codegen/v2 version v2.0.0-00010101000000-000000000000 DO NOT EDIT. package issue_832 import ( diff --git a/internal/test/issues/issue-936/api.gen.go b/internal/test/issues/issue-936/api.gen.go index 2e94df1e9..6b7c0cf22 100644 --- a/internal/test/issues/issue-936/api.gen.go +++ b/internal/test/issues/issue-936/api.gen.go @@ -1,6 +1,6 @@ // Package issue936 provides primitives to interact with the openapi HTTP API. // -// Code generated by github.com/deepmap/oapi-codegen/v2 version v2.0.0-00010101000000-000000000000 DO NOT EDIT. +// Code generated by github.com/oapi-codegen/oapi-codegen/v2 version v2.0.0-00010101000000-000000000000 DO NOT EDIT. package issue936 import ( diff --git a/internal/test/issues/issue-936/gen.go b/internal/test/issues/issue-936/gen.go index a84cbacd2..f1e62f42f 100644 --- a/internal/test/issues/issue-936/gen.go +++ b/internal/test/issues/issue-936/gen.go @@ -1,3 +1,3 @@ package issue936 -//go:generate go run github.com/deepmap/oapi-codegen/v2/cmd/oapi-codegen --config=server.config.yaml spec.yaml +//go:generate go run github.com/oapi-codegen/oapi-codegen/v2/cmd/oapi-codegen --config=server.config.yaml spec.yaml diff --git a/internal/test/issues/issue-grab_import_names/doc.go b/internal/test/issues/issue-grab_import_names/doc.go index ebdbdfc72..e986569fc 100644 --- a/internal/test/issues/issue-grab_import_names/doc.go +++ b/internal/test/issues/issue-grab_import_names/doc.go @@ -1,3 +1,3 @@ package grabimportnames -//go:generate go run github.com/deepmap/oapi-codegen/v2/cmd/oapi-codegen --config=config.yaml spec.yaml +//go:generate go run github.com/oapi-codegen/oapi-codegen/v2/cmd/oapi-codegen --config=config.yaml spec.yaml diff --git a/internal/test/issues/issue-grab_import_names/issue.gen.go b/internal/test/issues/issue-grab_import_names/issue.gen.go index 59924fa3a..52564c0dd 100644 --- a/internal/test/issues/issue-grab_import_names/issue.gen.go +++ b/internal/test/issues/issue-grab_import_names/issue.gen.go @@ -1,6 +1,6 @@ // Package grabimportnames provides primitives to interact with the openapi HTTP API. // -// Code generated by github.com/deepmap/oapi-codegen/v2 version v2.0.0-00010101000000-000000000000 DO NOT EDIT. +// Code generated by github.com/oapi-codegen/oapi-codegen/v2 version v2.0.0-00010101000000-000000000000 DO NOT EDIT. package grabimportnames import ( diff --git a/internal/test/issues/issue-grab_import_names/issue_test.go b/internal/test/issues/issue-grab_import_names/issue_test.go index c954d6542..7d299fa22 100644 --- a/internal/test/issues/issue-grab_import_names/issue_test.go +++ b/internal/test/issues/issue-grab_import_names/issue_test.go @@ -3,8 +3,8 @@ package grabimportnames import ( "testing" - "github.com/deepmap/oapi-codegen/v2/pkg/codegen" "github.com/getkin/kin-openapi/openapi3" + "github.com/oapi-codegen/oapi-codegen/v2/pkg/codegen" "github.com/stretchr/testify/require" ) diff --git a/internal/test/issues/issue-head-digit-of-httpheader/doc.go b/internal/test/issues/issue-head-digit-of-httpheader/doc.go index 69cb64af7..63904053b 100644 --- a/internal/test/issues/issue-head-digit-of-httpheader/doc.go +++ b/internal/test/issues/issue-head-digit-of-httpheader/doc.go @@ -1,3 +1,3 @@ package headdigitofhttpheader -//go:generate go run github.com/deepmap/oapi-codegen/v2/cmd/oapi-codegen --config=config.yaml spec.yaml +//go:generate go run github.com/oapi-codegen/oapi-codegen/v2/cmd/oapi-codegen --config=config.yaml spec.yaml diff --git a/internal/test/issues/issue-head-digit-of-httpheader/issue.gen.go b/internal/test/issues/issue-head-digit-of-httpheader/issue.gen.go index 14688abb4..6eadcef68 100644 --- a/internal/test/issues/issue-head-digit-of-httpheader/issue.gen.go +++ b/internal/test/issues/issue-head-digit-of-httpheader/issue.gen.go @@ -1,6 +1,6 @@ // Package headdigitofhttpheader provides primitives to interact with the openapi HTTP API. // -// Code generated by github.com/deepmap/oapi-codegen/v2 version v2.0.0-00010101000000-000000000000 DO NOT EDIT. +// Code generated by github.com/oapi-codegen/oapi-codegen/v2 version v2.0.0-00010101000000-000000000000 DO NOT EDIT. package headdigitofhttpheader type N200ResponseHeaders struct { diff --git a/internal/test/issues/issue-head-digit-of-operation-id/doc.go b/internal/test/issues/issue-head-digit-of-operation-id/doc.go index 23999975b..fb08e63e8 100644 --- a/internal/test/issues/issue-head-digit-of-operation-id/doc.go +++ b/internal/test/issues/issue-head-digit-of-operation-id/doc.go @@ -1,3 +1,3 @@ package head_digit_of_operation_id -//go:generate go run github.com/deepmap/oapi-codegen/v2/cmd/oapi-codegen --config=config.yaml spec.yaml +//go:generate go run github.com/oapi-codegen/oapi-codegen/v2/cmd/oapi-codegen --config=config.yaml spec.yaml diff --git a/internal/test/issues/issue-head-digit-of-operation-id/issue.gen.go b/internal/test/issues/issue-head-digit-of-operation-id/issue.gen.go index 1d2b6b0ac..00c0844af 100644 --- a/internal/test/issues/issue-head-digit-of-operation-id/issue.gen.go +++ b/internal/test/issues/issue-head-digit-of-operation-id/issue.gen.go @@ -1,4 +1,4 @@ // Package head_digit_of_operation_id provides primitives to interact with the openapi HTTP API. // -// Code generated by github.com/deepmap/oapi-codegen/v2 version v2.0.0-00010101000000-000000000000 DO NOT EDIT. +// Code generated by github.com/oapi-codegen/oapi-codegen/v2 version v2.0.0-00010101000000-000000000000 DO NOT EDIT. package head_digit_of_operation_id diff --git a/internal/test/issues/issue-illegal_enum_names/doc.go b/internal/test/issues/issue-illegal_enum_names/doc.go index 6249ddd6a..d8fb076b4 100644 --- a/internal/test/issues/issue-illegal_enum_names/doc.go +++ b/internal/test/issues/issue-illegal_enum_names/doc.go @@ -1,3 +1,3 @@ package illegalenumnames -//go:generate go run github.com/deepmap/oapi-codegen/v2/cmd/oapi-codegen --config=config.yaml spec.yaml +//go:generate go run github.com/oapi-codegen/oapi-codegen/v2/cmd/oapi-codegen --config=config.yaml spec.yaml diff --git a/internal/test/issues/issue-illegal_enum_names/issue.gen.go b/internal/test/issues/issue-illegal_enum_names/issue.gen.go index 395c171cb..a24b19da0 100644 --- a/internal/test/issues/issue-illegal_enum_names/issue.gen.go +++ b/internal/test/issues/issue-illegal_enum_names/issue.gen.go @@ -1,6 +1,6 @@ // Package illegalenumnames provides primitives to interact with the openapi HTTP API. // -// Code generated by github.com/deepmap/oapi-codegen/v2 version v2.0.0-00010101000000-000000000000 DO NOT EDIT. +// Code generated by github.com/oapi-codegen/oapi-codegen/v2 version v2.0.0-00010101000000-000000000000 DO NOT EDIT. package illegalenumnames import ( diff --git a/internal/test/issues/issue-illegal_enum_names/issue_test.go b/internal/test/issues/issue-illegal_enum_names/issue_test.go index 2fdfb86ac..3a8b47510 100644 --- a/internal/test/issues/issue-illegal_enum_names/issue_test.go +++ b/internal/test/issues/issue-illegal_enum_names/issue_test.go @@ -6,8 +6,8 @@ import ( "go/token" "testing" - "github.com/deepmap/oapi-codegen/v2/pkg/codegen" "github.com/getkin/kin-openapi/openapi3" + "github.com/oapi-codegen/oapi-codegen/v2/pkg/codegen" "github.com/stretchr/testify/require" ) diff --git a/internal/test/issues/issue-removed-external-ref/config.base.yaml b/internal/test/issues/issue-removed-external-ref/config.base.yaml index 0fbeb5323..14faed834 100644 --- a/internal/test/issues/issue-removed-external-ref/config.base.yaml +++ b/internal/test/issues/issue-removed-external-ref/config.base.yaml @@ -6,7 +6,7 @@ generate: strict-server: true models: true import-mapping: - spec-ext.yaml: "github.com/deepmap/oapi-codegen/v2/internal/test/issues/issue-removed-external-ref/gen/spec_ext" + spec-ext.yaml: "github.com/oapi-codegen/oapi-codegen/v2/internal/test/issues/issue-removed-external-ref/gen/spec_ext" output: gen/spec_base/issue.gen.go output-options: skip-prune: true diff --git a/internal/test/issues/issue-removed-external-ref/doc.go b/internal/test/issues/issue-removed-external-ref/doc.go index 9f222d4cf..6af4d981f 100644 --- a/internal/test/issues/issue-removed-external-ref/doc.go +++ b/internal/test/issues/issue-removed-external-ref/doc.go @@ -1,4 +1,4 @@ package head_digit_of_httpheader -//go:generate go run github.com/deepmap/oapi-codegen/v2/cmd/oapi-codegen --config=config.ext.yaml spec-ext.yaml -//go:generate go run github.com/deepmap/oapi-codegen/v2/cmd/oapi-codegen --config=config.base.yaml spec-base.yaml +//go:generate go run github.com/oapi-codegen/oapi-codegen/v2/cmd/oapi-codegen --config=config.ext.yaml spec-ext.yaml +//go:generate go run github.com/oapi-codegen/oapi-codegen/v2/cmd/oapi-codegen --config=config.base.yaml spec-base.yaml diff --git a/internal/test/issues/issue-removed-external-ref/gen/spec_base/issue.gen.go b/internal/test/issues/issue-removed-external-ref/gen/spec_base/issue.gen.go index 6b2de3157..627abde1f 100644 --- a/internal/test/issues/issue-removed-external-ref/gen/spec_base/issue.gen.go +++ b/internal/test/issues/issue-removed-external-ref/gen/spec_base/issue.gen.go @@ -1,6 +1,6 @@ // Package spec_base provides primitives to interact with the openapi HTTP API. // -// Code generated by github.com/deepmap/oapi-codegen/v2 version v2.0.0-00010101000000-000000000000 DO NOT EDIT. +// Code generated by github.com/oapi-codegen/oapi-codegen/v2 version v2.0.0-00010101000000-000000000000 DO NOT EDIT. package spec_base import ( @@ -9,8 +9,8 @@ import ( "fmt" "net/http" - externalRef0 "github.com/deepmap/oapi-codegen/v2/internal/test/issues/issue-removed-external-ref/gen/spec_ext" "github.com/go-chi/chi/v5" + externalRef0 "github.com/oapi-codegen/oapi-codegen/v2/internal/test/issues/issue-removed-external-ref/gen/spec_ext" strictnethttp "github.com/oapi-codegen/runtime/strictmiddleware/nethttp" ) diff --git a/internal/test/issues/issue-removed-external-ref/gen/spec_ext/issue.gen.go b/internal/test/issues/issue-removed-external-ref/gen/spec_ext/issue.gen.go index 42eef1a8b..881f8be12 100644 --- a/internal/test/issues/issue-removed-external-ref/gen/spec_ext/issue.gen.go +++ b/internal/test/issues/issue-removed-external-ref/gen/spec_ext/issue.gen.go @@ -1,6 +1,6 @@ // Package spec_ext provides primitives to interact with the openapi HTTP API. // -// Code generated by github.com/deepmap/oapi-codegen/v2 version v2.0.0-00010101000000-000000000000 DO NOT EDIT. +// Code generated by github.com/oapi-codegen/oapi-codegen/v2 version v2.0.0-00010101000000-000000000000 DO NOT EDIT. package spec_ext import ( diff --git a/internal/test/issues/issue1469/doc.go b/internal/test/issues/issue1469/doc.go index 2b9a09d7f..d72f419f6 100644 --- a/internal/test/issues/issue1469/doc.go +++ b/internal/test/issues/issue1469/doc.go @@ -1,3 +1,3 @@ package issue1469 -//go:generate go run github.com/deepmap/oapi-codegen/v2/cmd/oapi-codegen --config=config.yaml spec.yaml +//go:generate go run github.com/oapi-codegen/oapi-codegen/v2/cmd/oapi-codegen --config=config.yaml spec.yaml diff --git a/internal/test/issues/issue1469/main.gen.go b/internal/test/issues/issue1469/main.gen.go index ef60bbb6a..11f87b0c4 100644 --- a/internal/test/issues/issue1469/main.gen.go +++ b/internal/test/issues/issue1469/main.gen.go @@ -1,6 +1,6 @@ // Package issue1469 provides primitives to interact with the openapi HTTP API. // -// Code generated by github.com/deepmap/oapi-codegen/v2 version v2.0.0-00010101000000-000000000000 DO NOT EDIT. +// Code generated by github.com/oapi-codegen/oapi-codegen/v2 version v2.0.0-00010101000000-000000000000 DO NOT EDIT. package issue1469 import ( diff --git a/internal/test/issues/issue193/generate.go b/internal/test/issues/issue193/generate.go index aa9f97725..3d239ebdc 100644 --- a/internal/test/issues/issue193/generate.go +++ b/internal/test/issues/issue193/generate.go @@ -1,3 +1,3 @@ package issue52 -//go:generate go run github.com/deepmap/oapi-codegen/v2/cmd/oapi-codegen --config=config.yaml spec.yaml +//go:generate go run github.com/oapi-codegen/oapi-codegen/v2/cmd/oapi-codegen --config=config.yaml spec.yaml diff --git a/internal/test/issues/issue193/issue.gen.go b/internal/test/issues/issue193/issue.gen.go index 8c15e23c8..eec8a25df 100644 --- a/internal/test/issues/issue193/issue.gen.go +++ b/internal/test/issues/issue193/issue.gen.go @@ -1,6 +1,6 @@ // Package issue52 provides primitives to interact with the openapi HTTP API. // -// Code generated by github.com/deepmap/oapi-codegen/v2 version v2.0.0-00010101000000-000000000000 DO NOT EDIT. +// Code generated by github.com/oapi-codegen/oapi-codegen/v2 version v2.0.0-00010101000000-000000000000 DO NOT EDIT. package issue52 import ( diff --git a/internal/test/outputoptions/disabletypealiases/generate.go b/internal/test/outputoptions/disabletypealiases/generate.go index 8043e48f5..8f0dd5b3e 100644 --- a/internal/test/outputoptions/disabletypealiases/generate.go +++ b/internal/test/outputoptions/disabletypealiases/generate.go @@ -1,3 +1,3 @@ package types -//go:generate go run github.com/deepmap/oapi-codegen/v2/cmd/oapi-codegen --config=config.yaml spec.yaml +//go:generate go run github.com/oapi-codegen/oapi-codegen/v2/cmd/oapi-codegen --config=config.yaml spec.yaml diff --git a/internal/test/outputoptions/disabletypealiases/types.gen.go b/internal/test/outputoptions/disabletypealiases/types.gen.go index 8bb7b1ef5..f2537cfba 100644 --- a/internal/test/outputoptions/disabletypealiases/types.gen.go +++ b/internal/test/outputoptions/disabletypealiases/types.gen.go @@ -1,6 +1,6 @@ // Package types provides primitives to interact with the openapi HTTP API. // -// Code generated by github.com/deepmap/oapi-codegen/v2 version v2.0.0-00010101000000-000000000000 DO NOT EDIT. +// Code generated by github.com/oapi-codegen/oapi-codegen/v2 version v2.0.0-00010101000000-000000000000 DO NOT EDIT. package types // Example defines model for example. diff --git a/internal/test/outputoptions/name-normalizer/to-camel-case-with-digits/generate.go b/internal/test/outputoptions/name-normalizer/to-camel-case-with-digits/generate.go index 2a2d99595..4b4d2e44e 100644 --- a/internal/test/outputoptions/name-normalizer/to-camel-case-with-digits/generate.go +++ b/internal/test/outputoptions/name-normalizer/to-camel-case-with-digits/generate.go @@ -1,3 +1,3 @@ package tocamelcasewithdigits -//go:generate go run github.com/deepmap/oapi-codegen/v2/cmd/oapi-codegen --config=config.yaml ../spec.yaml +//go:generate go run github.com/oapi-codegen/oapi-codegen/v2/cmd/oapi-codegen --config=config.yaml ../spec.yaml diff --git a/internal/test/outputoptions/name-normalizer/to-camel-case-with-digits/name_normalizer.gen.go b/internal/test/outputoptions/name-normalizer/to-camel-case-with-digits/name_normalizer.gen.go index 915ba02d8..8c8853d6f 100644 --- a/internal/test/outputoptions/name-normalizer/to-camel-case-with-digits/name_normalizer.gen.go +++ b/internal/test/outputoptions/name-normalizer/to-camel-case-with-digits/name_normalizer.gen.go @@ -1,6 +1,6 @@ // Package tocamelcasewithdigits provides primitives to interact with the openapi HTTP API. // -// Code generated by github.com/deepmap/oapi-codegen/v2 version v2.0.0-00010101000000-000000000000 DO NOT EDIT. +// Code generated by github.com/oapi-codegen/oapi-codegen/v2 version v2.0.0-00010101000000-000000000000 DO NOT EDIT. package tocamelcasewithdigits import ( diff --git a/internal/test/outputoptions/name-normalizer/to-camel-case-with-initialisms/generate.go b/internal/test/outputoptions/name-normalizer/to-camel-case-with-initialisms/generate.go index 110652605..5f6549131 100644 --- a/internal/test/outputoptions/name-normalizer/to-camel-case-with-initialisms/generate.go +++ b/internal/test/outputoptions/name-normalizer/to-camel-case-with-initialisms/generate.go @@ -1,3 +1,3 @@ package tocamelcasewithinitialisms -//go:generate go run github.com/deepmap/oapi-codegen/v2/cmd/oapi-codegen --config=config.yaml ../spec.yaml +//go:generate go run github.com/oapi-codegen/oapi-codegen/v2/cmd/oapi-codegen --config=config.yaml ../spec.yaml diff --git a/internal/test/outputoptions/name-normalizer/to-camel-case-with-initialisms/name_normalizer.gen.go b/internal/test/outputoptions/name-normalizer/to-camel-case-with-initialisms/name_normalizer.gen.go index 718c7df05..fc1286b8a 100644 --- a/internal/test/outputoptions/name-normalizer/to-camel-case-with-initialisms/name_normalizer.gen.go +++ b/internal/test/outputoptions/name-normalizer/to-camel-case-with-initialisms/name_normalizer.gen.go @@ -1,6 +1,6 @@ // Package tocamelcasewithinitialisms provides primitives to interact with the openapi HTTP API. // -// Code generated by github.com/deepmap/oapi-codegen/v2 version v2.0.0-00010101000000-000000000000 DO NOT EDIT. +// Code generated by github.com/oapi-codegen/oapi-codegen/v2 version v2.0.0-00010101000000-000000000000 DO NOT EDIT. package tocamelcasewithinitialisms import ( diff --git a/internal/test/outputoptions/name-normalizer/to-camel-case/generate.go b/internal/test/outputoptions/name-normalizer/to-camel-case/generate.go index 5f535284b..a6c179b79 100644 --- a/internal/test/outputoptions/name-normalizer/to-camel-case/generate.go +++ b/internal/test/outputoptions/name-normalizer/to-camel-case/generate.go @@ -1,3 +1,3 @@ package tocamelcase -//go:generate go run github.com/deepmap/oapi-codegen/v2/cmd/oapi-codegen --config=config.yaml ../spec.yaml +//go:generate go run github.com/oapi-codegen/oapi-codegen/v2/cmd/oapi-codegen --config=config.yaml ../spec.yaml diff --git a/internal/test/outputoptions/name-normalizer/to-camel-case/name_normalizer.gen.go b/internal/test/outputoptions/name-normalizer/to-camel-case/name_normalizer.gen.go index afa9c4e4d..449d9e45e 100644 --- a/internal/test/outputoptions/name-normalizer/to-camel-case/name_normalizer.gen.go +++ b/internal/test/outputoptions/name-normalizer/to-camel-case/name_normalizer.gen.go @@ -1,6 +1,6 @@ // Package tocamelcase provides primitives to interact with the openapi HTTP API. // -// Code generated by github.com/deepmap/oapi-codegen/v2 version v2.0.0-00010101000000-000000000000 DO NOT EDIT. +// Code generated by github.com/oapi-codegen/oapi-codegen/v2 version v2.0.0-00010101000000-000000000000 DO NOT EDIT. package tocamelcase import ( diff --git a/internal/test/outputoptions/name-normalizer/unset/generate.go b/internal/test/outputoptions/name-normalizer/unset/generate.go index 94d3d7bb7..84fac60cb 100644 --- a/internal/test/outputoptions/name-normalizer/unset/generate.go +++ b/internal/test/outputoptions/name-normalizer/unset/generate.go @@ -1,3 +1,3 @@ package unset -//go:generate go run github.com/deepmap/oapi-codegen/v2/cmd/oapi-codegen --config=config.yaml ../spec.yaml +//go:generate go run github.com/oapi-codegen/oapi-codegen/v2/cmd/oapi-codegen --config=config.yaml ../spec.yaml diff --git a/internal/test/outputoptions/name-normalizer/unset/name_normalizer.gen.go b/internal/test/outputoptions/name-normalizer/unset/name_normalizer.gen.go index d6f105dbf..ac6f4c896 100644 --- a/internal/test/outputoptions/name-normalizer/unset/name_normalizer.gen.go +++ b/internal/test/outputoptions/name-normalizer/unset/name_normalizer.gen.go @@ -1,6 +1,6 @@ // Package unset provides primitives to interact with the openapi HTTP API. // -// Code generated by github.com/deepmap/oapi-codegen/v2 version v2.0.0-00010101000000-000000000000 DO NOT EDIT. +// Code generated by github.com/oapi-codegen/oapi-codegen/v2 version v2.0.0-00010101000000-000000000000 DO NOT EDIT. package unset import ( diff --git a/internal/test/parameters/doc.go b/internal/test/parameters/doc.go index 25168f610..30d5b502e 100644 --- a/internal/test/parameters/doc.go +++ b/internal/test/parameters/doc.go @@ -1,3 +1,3 @@ package parameters -//go:generate go run github.com/deepmap/oapi-codegen/v2/cmd/oapi-codegen --config=config.yaml parameters.yaml +//go:generate go run github.com/oapi-codegen/oapi-codegen/v2/cmd/oapi-codegen --config=config.yaml parameters.yaml diff --git a/internal/test/parameters/parameters.gen.go b/internal/test/parameters/parameters.gen.go index 1da8aae1d..630770731 100644 --- a/internal/test/parameters/parameters.gen.go +++ b/internal/test/parameters/parameters.gen.go @@ -1,6 +1,6 @@ // Package parameters provides primitives to interact with the openapi HTTP API. // -// Code generated by github.com/deepmap/oapi-codegen/v2 version v2.0.0-00010101000000-000000000000 DO NOT EDIT. +// Code generated by github.com/oapi-codegen/oapi-codegen/v2 version v2.0.0-00010101000000-000000000000 DO NOT EDIT. package parameters import ( diff --git a/internal/test/schemas/doc.go b/internal/test/schemas/doc.go index f743377e5..a4147ee5a 100644 --- a/internal/test/schemas/doc.go +++ b/internal/test/schemas/doc.go @@ -1,3 +1,3 @@ package schemas -//go:generate go run github.com/deepmap/oapi-codegen/v2/cmd/oapi-codegen --config=config.yaml schemas.yaml +//go:generate go run github.com/oapi-codegen/oapi-codegen/v2/cmd/oapi-codegen --config=config.yaml schemas.yaml diff --git a/internal/test/schemas/schemas.gen.go b/internal/test/schemas/schemas.gen.go index 12c629868..09efa4a01 100644 --- a/internal/test/schemas/schemas.gen.go +++ b/internal/test/schemas/schemas.gen.go @@ -1,6 +1,6 @@ // Package schemas provides primitives to interact with the openapi HTTP API. // -// Code generated by github.com/deepmap/oapi-codegen/v2 version v2.0.0-00010101000000-000000000000 DO NOT EDIT. +// Code generated by github.com/oapi-codegen/oapi-codegen/v2 version v2.0.0-00010101000000-000000000000 DO NOT EDIT. package schemas import ( diff --git a/internal/test/server/doc.go b/internal/test/server/doc.go index a766b30b8..f46abed62 100644 --- a/internal/test/server/doc.go +++ b/internal/test/server/doc.go @@ -1,3 +1,3 @@ package server -//go:generate go run github.com/deepmap/oapi-codegen/v2/cmd/oapi-codegen --config=config.yaml ../test-schema.yaml +//go:generate go run github.com/oapi-codegen/oapi-codegen/v2/cmd/oapi-codegen --config=config.yaml ../test-schema.yaml diff --git a/internal/test/server/server.gen.go b/internal/test/server/server.gen.go index 0620e64c8..cfc75b65c 100644 --- a/internal/test/server/server.gen.go +++ b/internal/test/server/server.gen.go @@ -1,6 +1,6 @@ // Package server provides primitives to interact with the openapi HTTP API. // -// Code generated by github.com/deepmap/oapi-codegen/v2 version v2.0.0-00010101000000-000000000000 DO NOT EDIT. +// Code generated by github.com/oapi-codegen/oapi-codegen/v2 version v2.0.0-00010101000000-000000000000 DO NOT EDIT. package server import ( diff --git a/internal/test/strict-server/chi/server.gen.go b/internal/test/strict-server/chi/server.gen.go index c0579f98b..5725eb145 100644 --- a/internal/test/strict-server/chi/server.gen.go +++ b/internal/test/strict-server/chi/server.gen.go @@ -1,6 +1,6 @@ // Package api provides primitives to interact with the openapi HTTP API. // -// Code generated by github.com/deepmap/oapi-codegen/v2 version v2.0.0-00010101000000-000000000000 DO NOT EDIT. +// Code generated by github.com/oapi-codegen/oapi-codegen/v2 version v2.0.0-00010101000000-000000000000 DO NOT EDIT. package api import ( diff --git a/internal/test/strict-server/chi/server.go b/internal/test/strict-server/chi/server.go index fe744e250..c135a2a44 100644 --- a/internal/test/strict-server/chi/server.go +++ b/internal/test/strict-server/chi/server.go @@ -1,5 +1,5 @@ -//go:generate go run github.com/deepmap/oapi-codegen/v2/cmd/oapi-codegen --config=server.cfg.yaml ../strict-schema.yaml -//go:generate go run github.com/deepmap/oapi-codegen/v2/cmd/oapi-codegen --config=types.cfg.yaml ../strict-schema.yaml +//go:generate go run github.com/oapi-codegen/oapi-codegen/v2/cmd/oapi-codegen --config=server.cfg.yaml ../strict-schema.yaml +//go:generate go run github.com/oapi-codegen/oapi-codegen/v2/cmd/oapi-codegen --config=types.cfg.yaml ../strict-schema.yaml package api diff --git a/internal/test/strict-server/chi/types.gen.go b/internal/test/strict-server/chi/types.gen.go index c16705f32..6682c1aca 100644 --- a/internal/test/strict-server/chi/types.gen.go +++ b/internal/test/strict-server/chi/types.gen.go @@ -1,6 +1,6 @@ // Package api provides primitives to interact with the openapi HTTP API. // -// Code generated by github.com/deepmap/oapi-codegen/v2 version v2.0.0-00010101000000-000000000000 DO NOT EDIT. +// Code generated by github.com/oapi-codegen/oapi-codegen/v2 version v2.0.0-00010101000000-000000000000 DO NOT EDIT. package api // Example defines model for example. diff --git a/internal/test/strict-server/client/client.gen.go b/internal/test/strict-server/client/client.gen.go index 16e588bd6..e7959520e 100644 --- a/internal/test/strict-server/client/client.gen.go +++ b/internal/test/strict-server/client/client.gen.go @@ -1,6 +1,6 @@ // Package api provides primitives to interact with the openapi HTTP API. // -// Code generated by github.com/deepmap/oapi-codegen/v2 version v2.0.0-00010101000000-000000000000 DO NOT EDIT. +// Code generated by github.com/oapi-codegen/oapi-codegen/v2 version v2.0.0-00010101000000-000000000000 DO NOT EDIT. package api import ( diff --git a/internal/test/strict-server/client/client.go b/internal/test/strict-server/client/client.go index 51214137c..5b350a488 100644 --- a/internal/test/strict-server/client/client.go +++ b/internal/test/strict-server/client/client.go @@ -1,3 +1,3 @@ -//go:generate go run github.com/deepmap/oapi-codegen/v2/cmd/oapi-codegen --config=client.cfg.yaml ../strict-schema.yaml +//go:generate go run github.com/oapi-codegen/oapi-codegen/v2/cmd/oapi-codegen --config=client.cfg.yaml ../strict-schema.yaml package api diff --git a/internal/test/strict-server/echo/server.gen.go b/internal/test/strict-server/echo/server.gen.go index 8c5205262..f07dfa5e4 100644 --- a/internal/test/strict-server/echo/server.gen.go +++ b/internal/test/strict-server/echo/server.gen.go @@ -1,6 +1,6 @@ // Package api provides primitives to interact with the openapi HTTP API. // -// Code generated by github.com/deepmap/oapi-codegen/v2 version v2.0.0-00010101000000-000000000000 DO NOT EDIT. +// Code generated by github.com/oapi-codegen/oapi-codegen/v2 version v2.0.0-00010101000000-000000000000 DO NOT EDIT. package api import ( diff --git a/internal/test/strict-server/echo/server.go b/internal/test/strict-server/echo/server.go index fe744e250..c135a2a44 100644 --- a/internal/test/strict-server/echo/server.go +++ b/internal/test/strict-server/echo/server.go @@ -1,5 +1,5 @@ -//go:generate go run github.com/deepmap/oapi-codegen/v2/cmd/oapi-codegen --config=server.cfg.yaml ../strict-schema.yaml -//go:generate go run github.com/deepmap/oapi-codegen/v2/cmd/oapi-codegen --config=types.cfg.yaml ../strict-schema.yaml +//go:generate go run github.com/oapi-codegen/oapi-codegen/v2/cmd/oapi-codegen --config=server.cfg.yaml ../strict-schema.yaml +//go:generate go run github.com/oapi-codegen/oapi-codegen/v2/cmd/oapi-codegen --config=types.cfg.yaml ../strict-schema.yaml package api diff --git a/internal/test/strict-server/echo/types.gen.go b/internal/test/strict-server/echo/types.gen.go index c16705f32..6682c1aca 100644 --- a/internal/test/strict-server/echo/types.gen.go +++ b/internal/test/strict-server/echo/types.gen.go @@ -1,6 +1,6 @@ // Package api provides primitives to interact with the openapi HTTP API. // -// Code generated by github.com/deepmap/oapi-codegen/v2 version v2.0.0-00010101000000-000000000000 DO NOT EDIT. +// Code generated by github.com/oapi-codegen/oapi-codegen/v2 version v2.0.0-00010101000000-000000000000 DO NOT EDIT. package api // Example defines model for example. diff --git a/internal/test/strict-server/fiber/server.gen.go b/internal/test/strict-server/fiber/server.gen.go index d86acc1da..b15d923fd 100644 --- a/internal/test/strict-server/fiber/server.gen.go +++ b/internal/test/strict-server/fiber/server.gen.go @@ -1,6 +1,6 @@ // Package api provides primitives to interact with the openapi HTTP API. // -// Code generated by github.com/deepmap/oapi-codegen/v2 version v2.0.0-00010101000000-000000000000 DO NOT EDIT. +// Code generated by github.com/oapi-codegen/oapi-codegen/v2 version v2.0.0-00010101000000-000000000000 DO NOT EDIT. package api import ( diff --git a/internal/test/strict-server/fiber/server.go b/internal/test/strict-server/fiber/server.go index fe744e250..c135a2a44 100644 --- a/internal/test/strict-server/fiber/server.go +++ b/internal/test/strict-server/fiber/server.go @@ -1,5 +1,5 @@ -//go:generate go run github.com/deepmap/oapi-codegen/v2/cmd/oapi-codegen --config=server.cfg.yaml ../strict-schema.yaml -//go:generate go run github.com/deepmap/oapi-codegen/v2/cmd/oapi-codegen --config=types.cfg.yaml ../strict-schema.yaml +//go:generate go run github.com/oapi-codegen/oapi-codegen/v2/cmd/oapi-codegen --config=server.cfg.yaml ../strict-schema.yaml +//go:generate go run github.com/oapi-codegen/oapi-codegen/v2/cmd/oapi-codegen --config=types.cfg.yaml ../strict-schema.yaml package api diff --git a/internal/test/strict-server/fiber/types.gen.go b/internal/test/strict-server/fiber/types.gen.go index c16705f32..6682c1aca 100644 --- a/internal/test/strict-server/fiber/types.gen.go +++ b/internal/test/strict-server/fiber/types.gen.go @@ -1,6 +1,6 @@ // Package api provides primitives to interact with the openapi HTTP API. // -// Code generated by github.com/deepmap/oapi-codegen/v2 version v2.0.0-00010101000000-000000000000 DO NOT EDIT. +// Code generated by github.com/oapi-codegen/oapi-codegen/v2 version v2.0.0-00010101000000-000000000000 DO NOT EDIT. package api // Example defines model for example. diff --git a/internal/test/strict-server/gin/server.gen.go b/internal/test/strict-server/gin/server.gen.go index 4b58ae0e6..21f9f3276 100644 --- a/internal/test/strict-server/gin/server.gen.go +++ b/internal/test/strict-server/gin/server.gen.go @@ -1,6 +1,6 @@ // Package api provides primitives to interact with the openapi HTTP API. // -// Code generated by github.com/deepmap/oapi-codegen/v2 version v2.0.0-00010101000000-000000000000 DO NOT EDIT. +// Code generated by github.com/oapi-codegen/oapi-codegen/v2 version v2.0.0-00010101000000-000000000000 DO NOT EDIT. package api import ( diff --git a/internal/test/strict-server/gin/server.go b/internal/test/strict-server/gin/server.go index fe744e250..c135a2a44 100644 --- a/internal/test/strict-server/gin/server.go +++ b/internal/test/strict-server/gin/server.go @@ -1,5 +1,5 @@ -//go:generate go run github.com/deepmap/oapi-codegen/v2/cmd/oapi-codegen --config=server.cfg.yaml ../strict-schema.yaml -//go:generate go run github.com/deepmap/oapi-codegen/v2/cmd/oapi-codegen --config=types.cfg.yaml ../strict-schema.yaml +//go:generate go run github.com/oapi-codegen/oapi-codegen/v2/cmd/oapi-codegen --config=server.cfg.yaml ../strict-schema.yaml +//go:generate go run github.com/oapi-codegen/oapi-codegen/v2/cmd/oapi-codegen --config=types.cfg.yaml ../strict-schema.yaml package api diff --git a/internal/test/strict-server/gin/types.gen.go b/internal/test/strict-server/gin/types.gen.go index c16705f32..6682c1aca 100644 --- a/internal/test/strict-server/gin/types.gen.go +++ b/internal/test/strict-server/gin/types.gen.go @@ -1,6 +1,6 @@ // Package api provides primitives to interact with the openapi HTTP API. // -// Code generated by github.com/deepmap/oapi-codegen/v2 version v2.0.0-00010101000000-000000000000 DO NOT EDIT. +// Code generated by github.com/oapi-codegen/oapi-codegen/v2 version v2.0.0-00010101000000-000000000000 DO NOT EDIT. package api // Example defines model for example. diff --git a/internal/test/strict-server/gorilla/server.gen.go b/internal/test/strict-server/gorilla/server.gen.go index 388da5199..07612e98f 100644 --- a/internal/test/strict-server/gorilla/server.gen.go +++ b/internal/test/strict-server/gorilla/server.gen.go @@ -1,6 +1,6 @@ // Package api provides primitives to interact with the openapi HTTP API. // -// Code generated by github.com/deepmap/oapi-codegen/v2 version v2.0.0-00010101000000-000000000000 DO NOT EDIT. +// Code generated by github.com/oapi-codegen/oapi-codegen/v2 version v2.0.0-00010101000000-000000000000 DO NOT EDIT. package api import ( diff --git a/internal/test/strict-server/gorilla/server.go b/internal/test/strict-server/gorilla/server.go index 83eb50339..5c5d7c9e7 100644 --- a/internal/test/strict-server/gorilla/server.go +++ b/internal/test/strict-server/gorilla/server.go @@ -1,5 +1,5 @@ -//go:generate go run github.com/deepmap/oapi-codegen/v2/cmd/oapi-codegen --config=server.cfg.yaml ../strict-schema.yaml -//go:generate go run github.com/deepmap/oapi-codegen/v2/cmd/oapi-codegen --config=types.cfg.yaml ../strict-schema.yaml +//go:generate go run github.com/oapi-codegen/oapi-codegen/v2/cmd/oapi-codegen --config=server.cfg.yaml ../strict-schema.yaml +//go:generate go run github.com/oapi-codegen/oapi-codegen/v2/cmd/oapi-codegen --config=types.cfg.yaml ../strict-schema.yaml package api diff --git a/internal/test/strict-server/gorilla/types.gen.go b/internal/test/strict-server/gorilla/types.gen.go index c16705f32..6682c1aca 100644 --- a/internal/test/strict-server/gorilla/types.gen.go +++ b/internal/test/strict-server/gorilla/types.gen.go @@ -1,6 +1,6 @@ // Package api provides primitives to interact with the openapi HTTP API. // -// Code generated by github.com/deepmap/oapi-codegen/v2 version v2.0.0-00010101000000-000000000000 DO NOT EDIT. +// Code generated by github.com/oapi-codegen/oapi-codegen/v2 version v2.0.0-00010101000000-000000000000 DO NOT EDIT. package api // Example defines model for example. diff --git a/internal/test/strict-server/iris/server.gen.go b/internal/test/strict-server/iris/server.gen.go index 54d6f4982..7f224b3b3 100644 --- a/internal/test/strict-server/iris/server.gen.go +++ b/internal/test/strict-server/iris/server.gen.go @@ -1,6 +1,6 @@ // Package api provides primitives to interact with the openapi HTTP API. // -// Code generated by github.com/deepmap/oapi-codegen/v2 version v2.0.0-00010101000000-000000000000 DO NOT EDIT. +// Code generated by github.com/oapi-codegen/oapi-codegen/v2 version v2.0.0-00010101000000-000000000000 DO NOT EDIT. package api import ( diff --git a/internal/test/strict-server/iris/server.go b/internal/test/strict-server/iris/server.go index f35e2f82b..c0ab4c770 100644 --- a/internal/test/strict-server/iris/server.go +++ b/internal/test/strict-server/iris/server.go @@ -1,5 +1,5 @@ -//go:generate go run github.com/deepmap/oapi-codegen/v2/cmd/oapi-codegen --config=server.cfg.yaml ../strict-schema.yaml -//go:generate go run github.com/deepmap/oapi-codegen/v2/cmd/oapi-codegen --config=types.cfg.yaml ../strict-schema.yaml +//go:generate go run github.com/oapi-codegen/oapi-codegen/v2/cmd/oapi-codegen --config=server.cfg.yaml ../strict-schema.yaml +//go:generate go run github.com/oapi-codegen/oapi-codegen/v2/cmd/oapi-codegen --config=types.cfg.yaml ../strict-schema.yaml package api diff --git a/internal/test/strict-server/iris/types.gen.go b/internal/test/strict-server/iris/types.gen.go index c16705f32..6682c1aca 100644 --- a/internal/test/strict-server/iris/types.gen.go +++ b/internal/test/strict-server/iris/types.gen.go @@ -1,6 +1,6 @@ // Package api provides primitives to interact with the openapi HTTP API. // -// Code generated by github.com/deepmap/oapi-codegen/v2 version v2.0.0-00010101000000-000000000000 DO NOT EDIT. +// Code generated by github.com/oapi-codegen/oapi-codegen/v2 version v2.0.0-00010101000000-000000000000 DO NOT EDIT. package api // Example defines model for example. diff --git a/internal/test/strict-server/stdhttp/go.mod b/internal/test/strict-server/stdhttp/go.mod index 78e8b04cd..61c4982ac 100644 --- a/internal/test/strict-server/stdhttp/go.mod +++ b/internal/test/strict-server/stdhttp/go.mod @@ -1,15 +1,15 @@ -module github.com/deepmap/oapi-codegen/v2/internal/test/strict-server/stdhttp +module github.com/oapi-codegen/oapi-codegen/v2/internal/test/strict-server/stdhttp go 1.22 -replace github.com/deepmap/oapi-codegen/v2 => ../../../../ +replace github.com/oapi-codegen/oapi-codegen/v2 => ../../../../ -replace github.com/deepmap/oapi-codegen/v2/internal/test => ../.. +replace github.com/oapi-codegen/oapi-codegen/v2/internal/test => ../.. require ( - github.com/deepmap/oapi-codegen/v2 v2.0.0-00010101000000-000000000000 - github.com/deepmap/oapi-codegen/v2/internal/test v0.0.0-00010101000000-000000000000 github.com/getkin/kin-openapi v0.124.0 + github.com/oapi-codegen/oapi-codegen/v2 v2.0.0-00010101000000-000000000000 + github.com/oapi-codegen/oapi-codegen/v2/internal/test v0.0.0-00010101000000-000000000000 github.com/oapi-codegen/runtime v1.1.0 github.com/oapi-codegen/testutil v1.1.0 github.com/stretchr/testify v1.9.0 diff --git a/internal/test/strict-server/stdhttp/server.gen.go b/internal/test/strict-server/stdhttp/server.gen.go index 2c03a7029..57140ea31 100644 --- a/internal/test/strict-server/stdhttp/server.gen.go +++ b/internal/test/strict-server/stdhttp/server.gen.go @@ -2,7 +2,7 @@ // Package api provides primitives to interact with the openapi HTTP API. // -// Code generated by github.com/deepmap/oapi-codegen/v2 version v2.0.0-00010101000000-000000000000 DO NOT EDIT. +// Code generated by github.com/oapi-codegen/oapi-codegen/v2 version v2.0.0-00010101000000-000000000000 DO NOT EDIT. package api import ( diff --git a/internal/test/strict-server/stdhttp/server.go b/internal/test/strict-server/stdhttp/server.go index e87ae2ff0..a142a6b81 100644 --- a/internal/test/strict-server/stdhttp/server.go +++ b/internal/test/strict-server/stdhttp/server.go @@ -1,7 +1,7 @@ //go:build go1.22 -//go:generate go run github.com/deepmap/oapi-codegen/v2/cmd/oapi-codegen --config=server.cfg.yaml ../strict-schema.yaml -//go:generate go run github.com/deepmap/oapi-codegen/v2/cmd/oapi-codegen --config=types.cfg.yaml ../strict-schema.yaml +//go:generate go run github.com/oapi-codegen/oapi-codegen/v2/cmd/oapi-codegen --config=server.cfg.yaml ../strict-schema.yaml +//go:generate go run github.com/oapi-codegen/oapi-codegen/v2/cmd/oapi-codegen --config=types.cfg.yaml ../strict-schema.yaml package api diff --git a/internal/test/strict-server/stdhttp/std_strict_test.go b/internal/test/strict-server/stdhttp/std_strict_test.go index 9433ebe13..40d362a54 100644 --- a/internal/test/strict-server/stdhttp/std_strict_test.go +++ b/internal/test/strict-server/stdhttp/std_strict_test.go @@ -15,7 +15,7 @@ import ( "github.com/stretchr/testify/assert" - clientAPI "github.com/deepmap/oapi-codegen/v2/internal/test/strict-server/client" + clientAPI "github.com/oapi-codegen/oapi-codegen/v2/internal/test/strict-server/client" "github.com/oapi-codegen/runtime" "github.com/oapi-codegen/testutil" ) diff --git a/internal/test/strict-server/stdhttp/tools/tools.go b/internal/test/strict-server/stdhttp/tools/tools.go index 67a500f26..8615cb4c5 100644 --- a/internal/test/strict-server/stdhttp/tools/tools.go +++ b/internal/test/strict-server/stdhttp/tools/tools.go @@ -4,5 +4,5 @@ package tools import ( - _ "github.com/deepmap/oapi-codegen/v2/cmd/oapi-codegen" + _ "github.com/oapi-codegen/oapi-codegen/v2/cmd/oapi-codegen" ) diff --git a/internal/test/strict-server/stdhttp/types.gen.go b/internal/test/strict-server/stdhttp/types.gen.go index c16705f32..6682c1aca 100644 --- a/internal/test/strict-server/stdhttp/types.gen.go +++ b/internal/test/strict-server/stdhttp/types.gen.go @@ -1,6 +1,6 @@ // Package api provides primitives to interact with the openapi HTTP API. // -// Code generated by github.com/deepmap/oapi-codegen/v2 version v2.0.0-00010101000000-000000000000 DO NOT EDIT. +// Code generated by github.com/oapi-codegen/oapi-codegen/v2 version v2.0.0-00010101000000-000000000000 DO NOT EDIT. package api // Example defines model for example. diff --git a/internal/test/strict-server/strict_test.go b/internal/test/strict-server/strict_test.go index a1143e89f..0ae094df0 100644 --- a/internal/test/strict-server/strict_test.go +++ b/internal/test/strict-server/strict_test.go @@ -19,12 +19,12 @@ import ( "github.com/labstack/echo/v4" "github.com/stretchr/testify/assert" - chiAPI "github.com/deepmap/oapi-codegen/v2/internal/test/strict-server/chi" - clientAPI "github.com/deepmap/oapi-codegen/v2/internal/test/strict-server/client" - echoAPI "github.com/deepmap/oapi-codegen/v2/internal/test/strict-server/echo" - fiberAPI "github.com/deepmap/oapi-codegen/v2/internal/test/strict-server/fiber" - ginAPI "github.com/deepmap/oapi-codegen/v2/internal/test/strict-server/gin" - irisAPI "github.com/deepmap/oapi-codegen/v2/internal/test/strict-server/iris" + chiAPI "github.com/oapi-codegen/oapi-codegen/v2/internal/test/strict-server/chi" + clientAPI "github.com/oapi-codegen/oapi-codegen/v2/internal/test/strict-server/client" + echoAPI "github.com/oapi-codegen/oapi-codegen/v2/internal/test/strict-server/echo" + fiberAPI "github.com/oapi-codegen/oapi-codegen/v2/internal/test/strict-server/fiber" + ginAPI "github.com/oapi-codegen/oapi-codegen/v2/internal/test/strict-server/gin" + irisAPI "github.com/oapi-codegen/oapi-codegen/v2/internal/test/strict-server/iris" "github.com/oapi-codegen/runtime" "github.com/oapi-codegen/testutil" diff --git a/pkg/codegen/codegen.go b/pkg/codegen/codegen.go index e1028ffca..7163998d1 100644 --- a/pkg/codegen/codegen.go +++ b/pkg/codegen/codegen.go @@ -33,7 +33,7 @@ import ( "github.com/getkin/kin-openapi/openapi3" "golang.org/x/tools/imports" - "github.com/deepmap/oapi-codegen/v2/pkg/util" + "github.com/oapi-codegen/oapi-codegen/v2/pkg/util" ) // Embed the templates directory diff --git a/pkg/codegen/codegen_test.go b/pkg/codegen/codegen_test.go index b4b2dfe14..1d752601b 100644 --- a/pkg/codegen/codegen_test.go +++ b/pkg/codegen/codegen_test.go @@ -9,13 +9,13 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/deepmap/oapi-codegen/v2/pkg/util" + "github.com/oapi-codegen/oapi-codegen/v2/pkg/util" ) const ( remoteRefFile = `https://raw.githubusercontent.com/deepmap/oapi-codegen/master/examples/petstore-expanded` + `/petstore-expanded.yaml` - remoteRefImport = `github.com/deepmap/oapi-codegen/v2/examples/petstore-expanded` + remoteRefImport = `github.com/oapi-codegen/oapi-codegen/v2/examples/petstore-expanded` ) func TestExampleOpenAPICodeGeneration(t *testing.T) { @@ -198,7 +198,7 @@ func TestRemoteExternalReference(t *testing.T) { assert.Contains(t, code, "package api") // Check import - assert.Contains(t, code, `externalRef0 "github.com/deepmap/oapi-codegen/v2/examples/petstore-expanded"`) + assert.Contains(t, code, `externalRef0 "github.com/oapi-codegen/oapi-codegen/v2/examples/petstore-expanded"`) // Check generated oneOf structure: assert.Contains(t, code, ` diff --git a/pkg/codegen/operations.go b/pkg/codegen/operations.go index 150e73899..da903810d 100644 --- a/pkg/codegen/operations.go +++ b/pkg/codegen/operations.go @@ -25,7 +25,7 @@ import ( "github.com/getkin/kin-openapi/openapi3" - "github.com/deepmap/oapi-codegen/v2/pkg/util" + "github.com/oapi-codegen/oapi-codegen/v2/pkg/util" ) type ParameterDefinition struct { diff --git a/pkg/codegen/template_helpers.go b/pkg/codegen/template_helpers.go index 09ac1146f..62ea244c8 100644 --- a/pkg/codegen/template_helpers.go +++ b/pkg/codegen/template_helpers.go @@ -23,7 +23,7 @@ import ( "golang.org/x/text/cases" "golang.org/x/text/language" - "github.com/deepmap/oapi-codegen/v2/pkg/util" + "github.com/oapi-codegen/oapi-codegen/v2/pkg/util" ) const (