Skip to content

Add structPrefix support to go-experimental #7327

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Sep 1, 2020
Merged

Add structPrefix support to go-experimental #7327

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
22 changes: 11 additions & 11 deletions modules/openapi-generator/src/main/resources/go-experimental/api.mustache
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,15 +27,15 @@ type {{classname}} interface {
{{/notes}}
* @param ctx _context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background().{{#pathParams}}
* @param {{paramName}}{{#description}} {{{.}}}{{/description}}{{/pathParams}}
* @return Api{{operationId}}Request
* @return {{#structPrefix}}{{&classname}}{{/structPrefix}}Api{{operationId}}Request
*/
{{{nickname}}}(ctx _context.Context{{#pathParams}}, {{paramName}} {{{dataType}}}{{/pathParams}}) Api{{operationId}}Request
{{{nickname}}}(ctx _context.Context{{#pathParams}}, {{paramName}} {{{dataType}}}{{/pathParams}}) {{#structPrefix}}{{&classname}}{{/structPrefix}}Api{{operationId}}Request

/*
* {{nickname}}Execute executes the request{{#returnType}}
* @return {{{.}}}{{/returnType}}
*/
{{nickname}}Execute(r Api{{operationId}}Request) ({{#returnType}}{{{.}}}, {{/returnType}}*_nethttp.Response, error)
{{nickname}}Execute(r {{#structPrefix}}{{&classname}}{{/structPrefix}}Api{{operationId}}Request) ({{#returnType}}{{{.}}}, {{/returnType}}*_nethttp.Response, error)
{{/operation}}
}
{{/generateInterfaces}}
Expand All @@ -44,7 +44,7 @@ type {{classname}} interface {
type {{classname}}Service service
{{#operation}}

type Api{{operationId}}Request struct {
type {{#structPrefix}}{{&classname}}{{/structPrefix}}Api{{operationId}}Request struct {
ctx _context.Context{{#generateInterfaces}}
ApiService {{classname}}
{{/generateInterfaces}}{{^generateInterfaces}}
Expand All @@ -55,13 +55,13 @@ type Api{{operationId}}Request struct {
{{/allParams}}
}
{{#allParams}}{{^isPathParam}}
func (r Api{{operationId}}Request) {{vendorExtensions.x-export-param-name}}({{paramName}} {{{dataType}}}) Api{{operationId}}Request {
func (r {{#structPrefix}}{{&classname}}{{/structPrefix}}Api{{operationId}}Request) {{vendorExtensions.x-export-param-name}}({{paramName}} {{{dataType}}}) {{#structPrefix}}{{&classname}}{{/structPrefix}}Api{{operationId}}Request {
r.{{paramName}} = &{{paramName}}
return r
}{{/isPathParam}}{{/allParams}}

func (r Api{{operationId}}Request) Execute() ({{#returnType}}{{{.}}}, {{/returnType}}*_nethttp.Response, error) {
return r.ApiService.{{nickname}}Execute(r)
func (r {{#structPrefix}}{{&classname}}{{/structPrefix}}Api{{operationId}}Request) Execute() ({{#returnType}}{{{.}}}, {{/returnType}}*_nethttp.Response, error) {
return r.ApiService.{{nickname}}Execute(r)
}

/*
Expand All @@ -71,10 +71,10 @@ func (r Api{{operationId}}Request) Execute() ({{#returnType}}{{{.}}}, {{/returnT
{{/notes}}
* @param ctx _context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background().{{#pathParams}}
* @param {{paramName}}{{#description}} {{{.}}}{{/description}}{{/pathParams}}
* @return Api{{operationId}}Request
* @return {{#structPrefix}}{{&classname}}{{/structPrefix}}Api{{operationId}}Request
*/
func (a *{{{classname}}}Service) {{{nickname}}}(ctx _context.Context{{#pathParams}}, {{paramName}} {{{dataType}}}{{/pathParams}}) Api{{operationId}}Request {
return Api{{operationId}}Request{
func (a *{{{classname}}}Service) {{{nickname}}}(ctx _context.Context{{#pathParams}}, {{paramName}} {{{dataType}}}{{/pathParams}}) {{#structPrefix}}{{&classname}}{{/structPrefix}}Api{{operationId}}Request {
return {{#structPrefix}}{{&classname}}{{/structPrefix}}Api{{operationId}}Request{
ApiService: a,
ctx: ctx,{{#pathParams}}
{{paramName}}: {{paramName}},{{/pathParams}}
Expand All @@ -85,7 +85,7 @@ func (a *{{{classname}}}Service) {{{nickname}}}(ctx _context.Context{{#pathParam
* Execute executes the request{{#returnType}}
* @return {{{.}}}{{/returnType}}
*/
func (a *{{{classname}}}Service) {{nickname}}Execute(r Api{{operationId}}Request) ({{#returnType}}{{{.}}}, {{/returnType}}*_nethttp.Response, error) {
func (a *{{{classname}}}Service) {{nickname}}Execute(r {{#structPrefix}}{{&classname}}{{/structPrefix}}Api{{operationId}}Request) ({{#returnType}}{{{.}}}, {{/returnType}}*_nethttp.Response, error) {
var (
localVarHTTPMethod = _nethttp.Method{{httpMethod}}
localVarPostBody interface{}
Expand Down
2 changes: 1 addition & 1 deletion samples/client/petstore/go-experimental/go-petstore/api_another_fake.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ func (r ApiCall123TestSpecialTagsRequest) Body(body Client) ApiCall123TestSpecia
}

func (r ApiCall123TestSpecialTagsRequest) Execute() (Client, *_nethttp.Response, error) {
return r.ApiService.Call123TestSpecialTagsExecute(r)
return r.ApiService.Call123TestSpecialTagsExecute(r)
}

/*
Expand Down
28 changes: 14 additions & 14 deletions samples/client/petstore/go-experimental/go-petstore/api_fake.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -229,7 +229,7 @@ func (r ApiCreateXmlItemRequest) XmlItem(xmlItem XmlItem) ApiCreateXmlItemReques
}

func (r ApiCreateXmlItemRequest) Execute() (*_nethttp.Response, error) {
return r.ApiService.CreateXmlItemExecute(r)
return r.ApiService.CreateXmlItemExecute(r)
}

/*
Expand Down Expand Up @@ -329,7 +329,7 @@ func (r ApiFakeOuterBooleanSerializeRequest) Body(body bool) ApiFakeOuterBoolean
}

func (r ApiFakeOuterBooleanSerializeRequest) Execute() (bool, *_nethttp.Response, error) {
return r.ApiService.FakeOuterBooleanSerializeExecute(r)
return r.ApiService.FakeOuterBooleanSerializeExecute(r)
}

/*
Expand Down Expand Up @@ -437,7 +437,7 @@ func (r ApiFakeOuterCompositeSerializeRequest) Body(body OuterComposite) ApiFake
}

func (r ApiFakeOuterCompositeSerializeRequest) Execute() (OuterComposite, *_nethttp.Response, error) {
return r.ApiService.FakeOuterCompositeSerializeExecute(r)
return r.ApiService.FakeOuterCompositeSerializeExecute(r)
}

/*
Expand Down Expand Up @@ -545,7 +545,7 @@ func (r ApiFakeOuterNumberSerializeRequest) Body(body float32) ApiFakeOuterNumbe
}

func (r ApiFakeOuterNumberSerializeRequest) Execute() (float32, *_nethttp.Response, error) {
return r.ApiService.FakeOuterNumberSerializeExecute(r)
return r.ApiService.FakeOuterNumberSerializeExecute(r)
}

/*
Expand Down Expand Up @@ -653,7 +653,7 @@ func (r ApiFakeOuterStringSerializeRequest) Body(body string) ApiFakeOuterString
}

func (r ApiFakeOuterStringSerializeRequest) Execute() (string, *_nethttp.Response, error) {
return r.ApiService.FakeOuterStringSerializeExecute(r)
return r.ApiService.FakeOuterStringSerializeExecute(r)
}

/*
Expand Down Expand Up @@ -761,7 +761,7 @@ func (r ApiTestBodyWithFileSchemaRequest) Body(body FileSchemaTestClass) ApiTest
}

func (r ApiTestBodyWithFileSchemaRequest) Execute() (*_nethttp.Response, error) {
return r.ApiService.TestBodyWithFileSchemaExecute(r)
return r.ApiService.TestBodyWithFileSchemaExecute(r)
}

/*
Expand Down Expand Up @@ -866,7 +866,7 @@ func (r ApiTestBodyWithQueryParamsRequest) Body(body User) ApiTestBodyWithQueryP
}

func (r ApiTestBodyWithQueryParamsRequest) Execute() (*_nethttp.Response, error) {
return r.ApiService.TestBodyWithQueryParamsExecute(r)
return r.ApiService.TestBodyWithQueryParamsExecute(r)
}

/*
Expand Down Expand Up @@ -969,7 +969,7 @@ func (r ApiTestClientModelRequest) Body(body Client) ApiTestClientModelRequest {
}

func (r ApiTestClientModelRequest) Execute() (Client, *_nethttp.Response, error) {
return r.ApiService.TestClientModelExecute(r)
return r.ApiService.TestClientModelExecute(r)
}

/*
Expand Down Expand Up @@ -1145,7 +1145,7 @@ func (r ApiTestEndpointParametersRequest) Callback(callback string) ApiTestEndpo
}

func (r ApiTestEndpointParametersRequest) Execute() (*_nethttp.Response, error) {
return r.ApiService.TestEndpointParametersExecute(r)
return r.ApiService.TestEndpointParametersExecute(r)
}

/*
Expand Down Expand Up @@ -1344,7 +1344,7 @@ func (r ApiTestEnumParametersRequest) EnumFormString(enumFormString string) ApiT
}

func (r ApiTestEnumParametersRequest) Execute() (*_nethttp.Response, error) {
return r.ApiService.TestEnumParametersExecute(r)
return r.ApiService.TestEnumParametersExecute(r)
}

/*
Expand Down Expand Up @@ -1488,7 +1488,7 @@ func (r ApiTestGroupParametersRequest) Int64Group(int64Group int64) ApiTestGroup
}

func (r ApiTestGroupParametersRequest) Execute() (*_nethttp.Response, error) {
return r.ApiService.TestGroupParametersExecute(r)
return r.ApiService.TestGroupParametersExecute(r)
}

/*
Expand Down Expand Up @@ -1604,7 +1604,7 @@ func (r ApiTestInlineAdditionalPropertiesRequest) Param(param map[string]string)
}

func (r ApiTestInlineAdditionalPropertiesRequest) Execute() (*_nethttp.Response, error) {
return r.ApiService.TestInlineAdditionalPropertiesExecute(r)
return r.ApiService.TestInlineAdditionalPropertiesExecute(r)
}

/*
Expand Down Expand Up @@ -1708,7 +1708,7 @@ func (r ApiTestJsonFormDataRequest) Param2(param2 string) ApiTestJsonFormDataReq
}

func (r ApiTestJsonFormDataRequest) Execute() (*_nethttp.Response, error) {
return r.ApiService.TestJsonFormDataExecute(r)
return r.ApiService.TestJsonFormDataExecute(r)
}

/*
Expand Down Expand Up @@ -1830,7 +1830,7 @@ func (r ApiTestQueryParameterCollectionFormatRequest) Context(context []string)
}

func (r ApiTestQueryParameterCollectionFormatRequest) Execute() (*_nethttp.Response, error) {
return r.ApiService.TestQueryParameterCollectionFormatExecute(r)
return r.ApiService.TestQueryParameterCollectionFormatExecute(r)
}

/*
Expand Down
2 changes: 1 addition & 1 deletion samples/client/petstore/go-experimental/go-petstore/api_fake_classname_tags123.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ func (r ApiTestClassnameRequest) Body(body Client) ApiTestClassnameRequest {
}

func (r ApiTestClassnameRequest) Execute() (Client, *_nethttp.Response, error) {
return r.ApiService.TestClassnameExecute(r)
return r.ApiService.TestClassnameExecute(r)
}

/*
Expand Down
18 changes: 9 additions & 9 deletions samples/client/petstore/go-experimental/go-petstore/api_pet.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -162,7 +162,7 @@ func (r ApiAddPetRequest) Body(body Pet) ApiAddPetRequest {
}

func (r ApiAddPetRequest) Execute() (*_nethttp.Response, error) {
return r.ApiService.AddPetExecute(r)
return r.ApiService.AddPetExecute(r)
}

/*
Expand Down Expand Up @@ -262,7 +262,7 @@ func (r ApiDeletePetRequest) ApiKey(apiKey string) ApiDeletePetRequest {
}

func (r ApiDeletePetRequest) Execute() (*_nethttp.Response, error) {
return r.ApiService.DeletePetExecute(r)
return r.ApiService.DeletePetExecute(r)
}

/*
Expand Down Expand Up @@ -362,7 +362,7 @@ func (r ApiFindPetsByStatusRequest) Status(status []string) ApiFindPetsByStatusR
}

func (r ApiFindPetsByStatusRequest) Execute() ([]Pet, *_nethttp.Response, error) {
return r.ApiService.FindPetsByStatusExecute(r)
return r.ApiService.FindPetsByStatusExecute(r)
}

/*
Expand Down Expand Up @@ -472,7 +472,7 @@ func (r ApiFindPetsByTagsRequest) Tags(tags []string) ApiFindPetsByTagsRequest {
}

func (r ApiFindPetsByTagsRequest) Execute() ([]Pet, *_nethttp.Response, error) {
return r.ApiService.FindPetsByTagsExecute(r)
return r.ApiService.FindPetsByTagsExecute(r)
}

/*
Expand Down Expand Up @@ -578,7 +578,7 @@ type ApiGetPetByIdRequest struct {


func (r ApiGetPetByIdRequest) Execute() (Pet, *_nethttp.Response, error) {
return r.ApiService.GetPetByIdExecute(r)
return r.ApiService.GetPetByIdExecute(r)
}

/*
Expand Down Expand Up @@ -701,7 +701,7 @@ func (r ApiUpdatePetRequest) Body(body Pet) ApiUpdatePetRequest {
}

func (r ApiUpdatePetRequest) Execute() (*_nethttp.Response, error) {
return r.ApiService.UpdatePetExecute(r)
return r.ApiService.UpdatePetExecute(r)
}

/*
Expand Down Expand Up @@ -806,7 +806,7 @@ func (r ApiUpdatePetWithFormRequest) Status(status string) ApiUpdatePetWithFormR
}

func (r ApiUpdatePetWithFormRequest) Execute() (*_nethttp.Response, error) {
return r.ApiService.UpdatePetWithFormExecute(r)
return r.ApiService.UpdatePetWithFormExecute(r)
}

/*
Expand Down Expand Up @@ -915,7 +915,7 @@ func (r ApiUploadFileRequest) File(file *os.File) ApiUploadFileRequest {
}

func (r ApiUploadFileRequest) Execute() (ApiResponse, *_nethttp.Response, error) {
return r.ApiService.UploadFileExecute(r)
return r.ApiService.UploadFileExecute(r)
}

/*
Expand Down Expand Up @@ -1043,7 +1043,7 @@ func (r ApiUploadFileWithRequiredFileRequest) AdditionalMetadata(additionalMetad
}

func (r ApiUploadFileWithRequiredFileRequest) Execute() (ApiResponse, *_nethttp.Response, error) {
return r.ApiService.UploadFileWithRequiredFileExecute(r)
return r.ApiService.UploadFileWithRequiredFileExecute(r)
}

/*
Expand Down
8 changes: 4 additions & 4 deletions samples/client/petstore/go-experimental/go-petstore/api_store.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -92,7 +92,7 @@ type ApiDeleteOrderRequest struct {


func (r ApiDeleteOrderRequest) Execute() (*_nethttp.Response, error) {
return r.ApiService.DeleteOrderExecute(r)
return r.ApiService.DeleteOrderExecute(r)
}

/*
Expand Down Expand Up @@ -185,7 +185,7 @@ type ApiGetInventoryRequest struct {


func (r ApiGetInventoryRequest) Execute() (map[string]int32, *_nethttp.Response, error) {
return r.ApiService.GetInventoryExecute(r)
return r.ApiService.GetInventoryExecute(r)
}

/*
Expand Down Expand Up @@ -301,7 +301,7 @@ type ApiGetOrderByIdRequest struct {


func (r ApiGetOrderByIdRequest) Execute() (Order, *_nethttp.Response, error) {
return r.ApiService.GetOrderByIdExecute(r)
return r.ApiService.GetOrderByIdExecute(r)
}

/*
Expand Down Expand Up @@ -416,7 +416,7 @@ func (r ApiPlaceOrderRequest) Body(body Order) ApiPlaceOrderRequest {
}

func (r ApiPlaceOrderRequest) Execute() (Order, *_nethttp.Response, error) {
return r.ApiService.PlaceOrderExecute(r)
return r.ApiService.PlaceOrderExecute(r)
}

/*
Expand Down
Loading