Skip to content

Commit d50d31c

Browse files
wing328wing328
authored
add structPrefix support to go-experimental (#7327)
1 parent 20eb4d0 commit d50d31c

15 files changed

Lines changed: 177 additions & 154 deletions

File tree

‎modules/openapi-generator/src/main/resources/go-experimental/api.mustache‎

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -27,15 +27,15 @@ type {{classname}} interface {
2727
{{/notes}}
2828
* @param ctx _context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background().{{#pathParams}}
2929
* @param {{paramName}}{{#description}} {{{.}}}{{/description}}{{/pathParams}}
30-
* @return Api{{operationId}}Request
30+
* @return {{#structPrefix}}{{&classname}}{{/structPrefix}}Api{{operationId}}Request
3131
*/
32-
{{{nickname}}}(ctx _context.Context{{#pathParams}}, {{paramName}} {{{dataType}}}{{/pathParams}}) Api{{operationId}}Request
32+
{{{nickname}}}(ctx _context.Context{{#pathParams}}, {{paramName}} {{{dataType}}}{{/pathParams}}) {{#structPrefix}}{{&classname}}{{/structPrefix}}Api{{operationId}}Request
3333

3434
/*
3535
* {{nickname}}Execute executes the request{{#returnType}}
3636
* @return {{{.}}}{{/returnType}}
3737
*/
38-
{{nickname}}Execute(r Api{{operationId}}Request) ({{#returnType}}{{{.}}}, {{/returnType}}*_nethttp.Response, error)
38+
{{nickname}}Execute(r {{#structPrefix}}{{&classname}}{{/structPrefix}}Api{{operationId}}Request) ({{#returnType}}{{{.}}}, {{/returnType}}*_nethttp.Response, error)
3939
{{/operation}}
4040
}
4141
{{/generateInterfaces}}
@@ -44,7 +44,7 @@ type {{classname}} interface {
4444
type {{classname}}Service service
4545
{{#operation}}
4646

47-
type Api{{operationId}}Request struct {
47+
type {{#structPrefix}}{{&classname}}{{/structPrefix}}Api{{operationId}}Request struct {
4848
ctx _context.Context{{#generateInterfaces}}
4949
ApiService {{classname}}
5050
{{/generateInterfaces}}{{^generateInterfaces}}
@@ -55,13 +55,13 @@ type Api{{operationId}}Request struct {
5555
{{/allParams}}
5656
}
5757
{{#allParams}}{{^isPathParam}}
58-
func (r Api{{operationId}}Request) {{vendorExtensions.x-export-param-name}}({{paramName}} {{{dataType}}}) Api{{operationId}}Request {
58+
func (r {{#structPrefix}}{{&classname}}{{/structPrefix}}Api{{operationId}}Request) {{vendorExtensions.x-export-param-name}}({{paramName}} {{{dataType}}}) {{#structPrefix}}{{&classname}}{{/structPrefix}}Api{{operationId}}Request {
5959
r.{{paramName}} = &{{paramName}}
6060
return r
6161
}{{/isPathParam}}{{/allParams}}
6262

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

6767
/*
@@ -71,10 +71,10 @@ func (r Api{{operationId}}Request) Execute() ({{#returnType}}{{{.}}}, {{/returnT
7171
{{/notes}}
7272
* @param ctx _context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background().{{#pathParams}}
7373
* @param {{paramName}}{{#description}} {{{.}}}{{/description}}{{/pathParams}}
74-
* @return Api{{operationId}}Request
74+
* @return {{#structPrefix}}{{&classname}}{{/structPrefix}}Api{{operationId}}Request
7575
*/
76-
func (a *{{{classname}}}Service) {{{nickname}}}(ctx _context.Context{{#pathParams}}, {{paramName}} {{{dataType}}}{{/pathParams}}) Api{{operationId}}Request {
77-
return Api{{operationId}}Request{
76+
func (a *{{{classname}}}Service) {{{nickname}}}(ctx _context.Context{{#pathParams}}, {{paramName}} {{{dataType}}}{{/pathParams}}) {{#structPrefix}}{{&classname}}{{/structPrefix}}Api{{operationId}}Request {
77+
return {{#structPrefix}}{{&classname}}{{/structPrefix}}Api{{operationId}}Request{
7878
ApiService: a,
7979
ctx: ctx,{{#pathParams}}
8080
{{paramName}}: {{paramName}},{{/pathParams}}
@@ -85,7 +85,7 @@ func (a *{{{classname}}}Service) {{{nickname}}}(ctx _context.Context{{#pathParam
8585
* Execute executes the request{{#returnType}}
8686
* @return {{{.}}}{{/returnType}}
8787
*/
88-
func (a *{{{classname}}}Service) {{nickname}}Execute(r Api{{operationId}}Request) ({{#returnType}}{{{.}}}, {{/returnType}}*_nethttp.Response, error) {
88+
func (a *{{{classname}}}Service) {{nickname}}Execute(r {{#structPrefix}}{{&classname}}{{/structPrefix}}Api{{operationId}}Request) ({{#returnType}}{{{.}}}, {{/returnType}}*_nethttp.Response, error) {
8989
var (
9090
localVarHTTPMethod = _nethttp.Method{{httpMethod}}
9191
localVarPostBody interface{}

‎samples/client/petstore/go-experimental/go-petstore/api_another_fake.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ func (r ApiCall123TestSpecialTagsRequest) Body(body Client) ApiCall123TestSpecia
5353
}
5454

5555
func (r ApiCall123TestSpecialTagsRequest) Execute() (Client, *_nethttp.Response, error) {
56-
return r.ApiService.Call123TestSpecialTagsExecute(r)
56+
return r.ApiService.Call123TestSpecialTagsExecute(r)
5757
}
5858

5959
/*

‎samples/client/petstore/go-experimental/go-petstore/api_fake.go‎

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -229,7 +229,7 @@ func (r ApiCreateXmlItemRequest) XmlItem(xmlItem XmlItem) ApiCreateXmlItemReques
229229
}
230230

231231
func (r ApiCreateXmlItemRequest) Execute() (*_nethttp.Response, error) {
232-
return r.ApiService.CreateXmlItemExecute(r)
232+
return r.ApiService.CreateXmlItemExecute(r)
233233
}
234234

235235
/*
@@ -329,7 +329,7 @@ func (r ApiFakeOuterBooleanSerializeRequest) Body(body bool) ApiFakeOuterBoolean
329329
}
330330

331331
func (r ApiFakeOuterBooleanSerializeRequest) Execute() (bool, *_nethttp.Response, error) {
332-
return r.ApiService.FakeOuterBooleanSerializeExecute(r)
332+
return r.ApiService.FakeOuterBooleanSerializeExecute(r)
333333
}
334334

335335
/*
@@ -437,7 +437,7 @@ func (r ApiFakeOuterCompositeSerializeRequest) Body(body OuterComposite) ApiFake
437437
}
438438

439439
func (r ApiFakeOuterCompositeSerializeRequest) Execute() (OuterComposite, *_nethttp.Response, error) {
440-
return r.ApiService.FakeOuterCompositeSerializeExecute(r)
440+
return r.ApiService.FakeOuterCompositeSerializeExecute(r)
441441
}
442442

443443
/*
@@ -545,7 +545,7 @@ func (r ApiFakeOuterNumberSerializeRequest) Body(body float32) ApiFakeOuterNumbe
545545
}
546546

547547
func (r ApiFakeOuterNumberSerializeRequest) Execute() (float32, *_nethttp.Response, error) {
548-
return r.ApiService.FakeOuterNumberSerializeExecute(r)
548+
return r.ApiService.FakeOuterNumberSerializeExecute(r)
549549
}
550550

551551
/*
@@ -653,7 +653,7 @@ func (r ApiFakeOuterStringSerializeRequest) Body(body string) ApiFakeOuterString
653653
}
654654

655655
func (r ApiFakeOuterStringSerializeRequest) Execute() (string, *_nethttp.Response, error) {
656-
return r.ApiService.FakeOuterStringSerializeExecute(r)
656+
return r.ApiService.FakeOuterStringSerializeExecute(r)
657657
}
658658

659659
/*
@@ -761,7 +761,7 @@ func (r ApiTestBodyWithFileSchemaRequest) Body(body FileSchemaTestClass) ApiTest
761761
}
762762

763763
func (r ApiTestBodyWithFileSchemaRequest) Execute() (*_nethttp.Response, error) {
764-
return r.ApiService.TestBodyWithFileSchemaExecute(r)
764+
return r.ApiService.TestBodyWithFileSchemaExecute(r)
765765
}
766766

767767
/*
@@ -866,7 +866,7 @@ func (r ApiTestBodyWithQueryParamsRequest) Body(body User) ApiTestBodyWithQueryP
866866
}
867867

868868
func (r ApiTestBodyWithQueryParamsRequest) Execute() (*_nethttp.Response, error) {
869-
return r.ApiService.TestBodyWithQueryParamsExecute(r)
869+
return r.ApiService.TestBodyWithQueryParamsExecute(r)
870870
}
871871

872872
/*
@@ -969,7 +969,7 @@ func (r ApiTestClientModelRequest) Body(body Client) ApiTestClientModelRequest {
969969
}
970970

971971
func (r ApiTestClientModelRequest) Execute() (Client, *_nethttp.Response, error) {
972-
return r.ApiService.TestClientModelExecute(r)
972+
return r.ApiService.TestClientModelExecute(r)
973973
}
974974

975975
/*
@@ -1145,7 +1145,7 @@ func (r ApiTestEndpointParametersRequest) Callback(callback string) ApiTestEndpo
11451145
}
11461146

11471147
func (r ApiTestEndpointParametersRequest) Execute() (*_nethttp.Response, error) {
1148-
return r.ApiService.TestEndpointParametersExecute(r)
1148+
return r.ApiService.TestEndpointParametersExecute(r)
11491149
}
11501150

11511151
/*
@@ -1344,7 +1344,7 @@ func (r ApiTestEnumParametersRequest) EnumFormString(enumFormString string) ApiT
13441344
}
13451345

13461346
func (r ApiTestEnumParametersRequest) Execute() (*_nethttp.Response, error) {
1347-
return r.ApiService.TestEnumParametersExecute(r)
1347+
return r.ApiService.TestEnumParametersExecute(r)
13481348
}
13491349

13501350
/*
@@ -1488,7 +1488,7 @@ func (r ApiTestGroupParametersRequest) Int64Group(int64Group int64) ApiTestGroup
14881488
}
14891489

14901490
func (r ApiTestGroupParametersRequest) Execute() (*_nethttp.Response, error) {
1491-
return r.ApiService.TestGroupParametersExecute(r)
1491+
return r.ApiService.TestGroupParametersExecute(r)
14921492
}
14931493

14941494
/*
@@ -1604,7 +1604,7 @@ func (r ApiTestInlineAdditionalPropertiesRequest) Param(param map[string]string)
16041604
}
16051605

16061606
func (r ApiTestInlineAdditionalPropertiesRequest) Execute() (*_nethttp.Response, error) {
1607-
return r.ApiService.TestInlineAdditionalPropertiesExecute(r)
1607+
return r.ApiService.TestInlineAdditionalPropertiesExecute(r)
16081608
}
16091609

16101610
/*
@@ -1708,7 +1708,7 @@ func (r ApiTestJsonFormDataRequest) Param2(param2 string) ApiTestJsonFormDataReq
17081708
}
17091709

17101710
func (r ApiTestJsonFormDataRequest) Execute() (*_nethttp.Response, error) {
1711-
return r.ApiService.TestJsonFormDataExecute(r)
1711+
return r.ApiService.TestJsonFormDataExecute(r)
17121712
}
17131713

17141714
/*
@@ -1830,7 +1830,7 @@ func (r ApiTestQueryParameterCollectionFormatRequest) Context(context []string)
18301830
}
18311831

18321832
func (r ApiTestQueryParameterCollectionFormatRequest) Execute() (*_nethttp.Response, error) {
1833-
return r.ApiService.TestQueryParameterCollectionFormatExecute(r)
1833+
return r.ApiService.TestQueryParameterCollectionFormatExecute(r)
18341834
}
18351835

18361836
/*

‎samples/client/petstore/go-experimental/go-petstore/api_fake_classname_tags123.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ func (r ApiTestClassnameRequest) Body(body Client) ApiTestClassnameRequest {
5353
}
5454

5555
func (r ApiTestClassnameRequest) Execute() (Client, *_nethttp.Response, error) {
56-
return r.ApiService.TestClassnameExecute(r)
56+
return r.ApiService.TestClassnameExecute(r)
5757
}
5858

5959
/*

‎samples/client/petstore/go-experimental/go-petstore/api_pet.go‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -162,7 +162,7 @@ func (r ApiAddPetRequest) Body(body Pet) ApiAddPetRequest {
162162
}
163163

164164
func (r ApiAddPetRequest) Execute() (*_nethttp.Response, error) {
165-
return r.ApiService.AddPetExecute(r)
165+
return r.ApiService.AddPetExecute(r)
166166
}
167167

168168
/*
@@ -262,7 +262,7 @@ func (r ApiDeletePetRequest) ApiKey(apiKey string) ApiDeletePetRequest {
262262
}
263263

264264
func (r ApiDeletePetRequest) Execute() (*_nethttp.Response, error) {
265-
return r.ApiService.DeletePetExecute(r)
265+
return r.ApiService.DeletePetExecute(r)
266266
}
267267

268268
/*
@@ -362,7 +362,7 @@ func (r ApiFindPetsByStatusRequest) Status(status []string) ApiFindPetsByStatusR
362362
}
363363

364364
func (r ApiFindPetsByStatusRequest) Execute() ([]Pet, *_nethttp.Response, error) {
365-
return r.ApiService.FindPetsByStatusExecute(r)
365+
return r.ApiService.FindPetsByStatusExecute(r)
366366
}
367367

368368
/*
@@ -472,7 +472,7 @@ func (r ApiFindPetsByTagsRequest) Tags(tags []string) ApiFindPetsByTagsRequest {
472472
}
473473

474474
func (r ApiFindPetsByTagsRequest) Execute() ([]Pet, *_nethttp.Response, error) {
475-
return r.ApiService.FindPetsByTagsExecute(r)
475+
return r.ApiService.FindPetsByTagsExecute(r)
476476
}
477477

478478
/*
@@ -578,7 +578,7 @@ type ApiGetPetByIdRequest struct {
578578

579579

580580
func (r ApiGetPetByIdRequest) Execute() (Pet, *_nethttp.Response, error) {
581-
return r.ApiService.GetPetByIdExecute(r)
581+
return r.ApiService.GetPetByIdExecute(r)
582582
}
583583

584584
/*
@@ -701,7 +701,7 @@ func (r ApiUpdatePetRequest) Body(body Pet) ApiUpdatePetRequest {
701701
}
702702

703703
func (r ApiUpdatePetRequest) Execute() (*_nethttp.Response, error) {
704-
return r.ApiService.UpdatePetExecute(r)
704+
return r.ApiService.UpdatePetExecute(r)
705705
}
706706

707707
/*
@@ -806,7 +806,7 @@ func (r ApiUpdatePetWithFormRequest) Status(status string) ApiUpdatePetWithFormR
806806
}
807807

808808
func (r ApiUpdatePetWithFormRequest) Execute() (*_nethttp.Response, error) {
809-
return r.ApiService.UpdatePetWithFormExecute(r)
809+
return r.ApiService.UpdatePetWithFormExecute(r)
810810
}
811811

812812
/*
@@ -915,7 +915,7 @@ func (r ApiUploadFileRequest) File(file *os.File) ApiUploadFileRequest {
915915
}
916916

917917
func (r ApiUploadFileRequest) Execute() (ApiResponse, *_nethttp.Response, error) {
918-
return r.ApiService.UploadFileExecute(r)
918+
return r.ApiService.UploadFileExecute(r)
919919
}
920920

921921
/*
@@ -1043,7 +1043,7 @@ func (r ApiUploadFileWithRequiredFileRequest) AdditionalMetadata(additionalMetad
10431043
}
10441044

10451045
func (r ApiUploadFileWithRequiredFileRequest) Execute() (ApiResponse, *_nethttp.Response, error) {
1046-
return r.ApiService.UploadFileWithRequiredFileExecute(r)
1046+
return r.ApiService.UploadFileWithRequiredFileExecute(r)
10471047
}
10481048

10491049
/*

‎samples/client/petstore/go-experimental/go-petstore/api_store.go‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -92,7 +92,7 @@ type ApiDeleteOrderRequest struct {
9292

9393

9494
func (r ApiDeleteOrderRequest) Execute() (*_nethttp.Response, error) {
95-
return r.ApiService.DeleteOrderExecute(r)
95+
return r.ApiService.DeleteOrderExecute(r)
9696
}
9797

9898
/*
@@ -185,7 +185,7 @@ type ApiGetInventoryRequest struct {
185185

186186

187187
func (r ApiGetInventoryRequest) Execute() (map[string]int32, *_nethttp.Response, error) {
188-
return r.ApiService.GetInventoryExecute(r)
188+
return r.ApiService.GetInventoryExecute(r)
189189
}
190190

191191
/*
@@ -301,7 +301,7 @@ type ApiGetOrderByIdRequest struct {
301301

302302

303303
func (r ApiGetOrderByIdRequest) Execute() (Order, *_nethttp.Response, error) {
304-
return r.ApiService.GetOrderByIdExecute(r)
304+
return r.ApiService.GetOrderByIdExecute(r)
305305
}
306306

307307
/*
@@ -416,7 +416,7 @@ func (r ApiPlaceOrderRequest) Body(body Order) ApiPlaceOrderRequest {
416416
}
417417

418418
func (r ApiPlaceOrderRequest) Execute() (Order, *_nethttp.Response, error) {
419-
return r.ApiService.PlaceOrderExecute(r)
419+
return r.ApiService.PlaceOrderExecute(r)
420420
}
421421

422422
/*

0 commit comments

Comments
 (0)