Skip to content

Commit 67cbfb3

Browse files
macjohnnymacjohnny
authored
Revert "Add create requestOpts method to {{classname}}Interface #21708 (#21709)" (#22814)
This reverts commit 51d5310.
1 parent 0d10a5b commit 67cbfb3

49 files changed

Lines changed: 1304 additions & 3840 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎modules/openapi-generator/src/main/resources/typescript-fetch/apis.mustache‎

Lines changed: 9 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -42,20 +42,6 @@ export interface {{#prefixParameterInterfaces}}{{classname}}{{/prefixParameterIn
4242
*/
4343
export interface {{classname}}Interface {
4444
{{#operation}}
45-
/**
46-
* Creates request options for {{nickname}} without sending the request
47-
{{#allParams}}
48-
* @param {{=<% %>=}}{<%&dataType%>}<%={{ }}=%> {{^required}}[{{/required}}{{paramName}}{{^required}}]{{/required}} {{description}}
49-
{{/allParams}}
50-
* @param {*} [options] Override http request option.
51-
{{#isDeprecated}}
52-
* @deprecated
53-
{{/isDeprecated}}
54-
* @throws {RequiredError}
55-
* @memberof {{classname}}Interface
56-
*/
57-
{{nickname}}RequestOpts({{#allParams.0}}requestParameters: {{#prefixParameterInterfaces}}{{classname}}{{/prefixParameterInterfaces}}{{operationIdCamelCase}}Request, {{/allParams.0}}initOverrides?: RequestInit | runtime.InitOverrideFunction): Promise<runtime.RequestOpts>;
58-
5945
/**
6046
* {{&notes}}
6147
{{#summary}}
@@ -109,12 +95,17 @@ export class {{classname}} extends runtime.BaseAPI {
10995
11096
{{#operation}}
11197
/**
112-
* Creates request options for {{nickname}} without sending the request
98+
{{#notes}}
99+
* {{&notes}}
100+
{{/notes}}
101+
{{#summary}}
102+
* {{&summary}}
103+
{{/summary}}
113104
{{#isDeprecated}}
114105
* @deprecated
115106
{{/isDeprecated}}
116107
*/
117-
async {{nickname}}RequestOpts({{#allParams.0}}requestParameters: {{#prefixParameterInterfaces}}{{classname}}{{/prefixParameterInterfaces}}{{operationIdCamelCase}}Request, {{/allParams.0}}initOverrides?: RequestInit | runtime.InitOverrideFunction): Promise<runtime.RequestOpts> {
108+
async {{nickname}}Raw({{#allParams.0}}requestParameters: {{#prefixParameterInterfaces}}{{classname}}{{/prefixParameterInterfaces}}{{operationIdCamelCase}}Request, {{/allParams.0}}initOverrides?: RequestInit | runtime.InitOverrideFunction): Promise<runtime.ApiResponse<{{{returnType}}}{{^returnType}}void{{/returnType}}>> {
118109
{{#allParams}}
119110
{{#required}}
120111
if (requestParameters['{{paramName}}'] == null) {
@@ -313,7 +304,7 @@ export class {{classname}} extends runtime.BaseAPI {
313304
{{/isDateTimeType}}
314305
{{/pathParams}}
315306
316-
return {
307+
const response = await this.request({
317308
path: urlPath,
318309
method: '{{httpMethod}}',
319310
headers: headerParameters,
@@ -346,23 +337,7 @@ export class {{classname}} extends runtime.BaseAPI {
346337
{{#hasFormParams}}
347338
body: formParams,
348339
{{/hasFormParams}}
349-
};
350-
}
351-
352-
/**
353-
{{#notes}}
354-
* {{&notes}}
355-
{{/notes}}
356-
{{#summary}}
357-
* {{&summary}}
358-
{{/summary}}
359-
{{#isDeprecated}}
360-
* @deprecated
361-
{{/isDeprecated}}
362-
*/
363-
async {{nickname}}Raw({{#allParams.0}}requestParameters: {{#prefixParameterInterfaces}}{{classname}}{{/prefixParameterInterfaces}}{{operationIdCamelCase}}Request, {{/allParams.0}}initOverrides?: RequestInit | runtime.InitOverrideFunction): Promise<runtime.ApiResponse<{{{returnType}}}{{^returnType}}void{{/returnType}}>> {
364-
const requestConfig = await this.{{nickname}}RequestConfig({{#allParams.0}}requestParameters, {{/allParams.0}}initOverrides);
365-
const response = await this.request(requestConfig, initOverrides);
340+
}, initOverrides);
366341
367342
{{#returnType}}
368343
{{#isResponseFile}}

‎samples/client/petstore/typescript-fetch/builds/allOf-nullable/apis/DefaultApi.ts‎

Lines changed: 3 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -32,9 +32,8 @@ export interface ListRequest {
3232
export class DefaultApi extends runtime.BaseAPI {
3333

3434
/**
35-
* Creates request options for list without sending the request
3635
*/
37-
async listRequestOpts(requestParameters: ListRequest, initOverrides?: RequestInit | runtime.InitOverrideFunction): Promise<runtime.RequestOpts> {
36+
async listRaw(requestParameters: ListRequest, initOverrides?: RequestInit | runtime.InitOverrideFunction): Promise<runtime.ApiResponse<Club>> {
3837
if (requestParameters['personId'] == null) {
3938
throw new runtime.RequiredError(
4039
'personId',
@@ -50,19 +49,12 @@ export class DefaultApi extends runtime.BaseAPI {
5049
let urlPath = `/person/display/{personId}`;
5150
urlPath = urlPath.replace(`{${"personId"}}`, encodeURIComponent(String(requestParameters['personId'])));
5251

53-
return {
52+
const response = await this.request({
5453
path: urlPath,
5554
method: 'GET',
5655
headers: headerParameters,
5756
query: queryParameters,
58-
};
59-
}
60-
61-
/**
62-
*/
63-
async listRaw(requestParameters: ListRequest, initOverrides?: RequestInit | runtime.InitOverrideFunction): Promise<runtime.ApiResponse<Club>> {
64-
const requestConfig = await this.listRequestConfig(requestParameters, initOverrides);
65-
const response = await this.request(requestConfig, initOverrides);
57+
}, initOverrides);
6658

6759
return new runtime.JSONApiResponse(response, (jsonValue) => ClubFromJSON(jsonValue));
6860
}

‎samples/client/petstore/typescript-fetch/builds/allOf-readonly/apis/DefaultApi.ts‎

Lines changed: 3 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -32,9 +32,8 @@ export interface ListRequest {
3232
export class DefaultApi extends runtime.BaseAPI {
3333

3434
/**
35-
* Creates request options for list without sending the request
3635
*/
37-
async listRequestOpts(requestParameters: ListRequest, initOverrides?: RequestInit | runtime.InitOverrideFunction): Promise<runtime.RequestOpts> {
36+
async listRaw(requestParameters: ListRequest, initOverrides?: RequestInit | runtime.InitOverrideFunction): Promise<runtime.ApiResponse<Club>> {
3837
if (requestParameters['personId'] == null) {
3938
throw new runtime.RequiredError(
4039
'personId',
@@ -50,19 +49,12 @@ export class DefaultApi extends runtime.BaseAPI {
5049
let urlPath = `/person/display/{personId}`;
5150
urlPath = urlPath.replace(`{${"personId"}}`, encodeURIComponent(String(requestParameters['personId'])));
5251

53-
return {
52+
const response = await this.request({
5453
path: urlPath,
5554
method: 'GET',
5655
headers: headerParameters,
5756
query: queryParameters,
58-
};
59-
}
60-
61-
/**
62-
*/
63-
async listRaw(requestParameters: ListRequest, initOverrides?: RequestInit | runtime.InitOverrideFunction): Promise<runtime.ApiResponse<Club>> {
64-
const requestConfig = await this.listRequestConfig(requestParameters, initOverrides);
65-
const response = await this.request(requestConfig, initOverrides);
57+
}, initOverrides);
6658

6759
return new runtime.JSONApiResponse(response, (jsonValue) => ClubFromJSON(jsonValue));
6860
}

‎samples/client/petstore/typescript-fetch/builds/default-v3.0/apis/AnotherFakeApi.ts‎

Lines changed: 5 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -32,9 +32,10 @@ export interface 123testSpecialTagsRequest {
3232
export class AnotherFakeApi extends runtime.BaseAPI {
3333

3434
/**
35-
* Creates request options for _123testSpecialTags without sending the request
35+
* To test special tags and operation ID starting with number
36+
* To test special tags
3637
*/
37-
async _123testSpecialTagsRequestOpts(requestParameters: 123testSpecialTagsRequest, initOverrides?: RequestInit | runtime.InitOverrideFunction): Promise<runtime.RequestOpts> {
38+
async _123testSpecialTagsRaw(requestParameters: 123testSpecialTagsRequest, initOverrides?: RequestInit | runtime.InitOverrideFunction): Promise<runtime.ApiResponse<Client>> {
3839
if (requestParameters['client'] == null) {
3940
throw new runtime.RequiredError(
4041
'client',
@@ -51,22 +52,13 @@ export class AnotherFakeApi extends runtime.BaseAPI {
5152

5253
let urlPath = `/another-fake/dummy`;
5354

54-
return {
55+
const response = await this.request({
5556
path: urlPath,
5657
method: 'PATCH',
5758
headers: headerParameters,
5859
query: queryParameters,
5960
body: ClientToJSON(requestParameters['client']),
60-
};
61-
}
62-
63-
/**
64-
* To test special tags and operation ID starting with number
65-
* To test special tags
66-
*/
67-
async _123testSpecialTagsRaw(requestParameters: 123testSpecialTagsRequest, initOverrides?: RequestInit | runtime.InitOverrideFunction): Promise<runtime.ApiResponse<Client>> {
68-
const requestConfig = await this._123testSpecialTagsRequestConfig(requestParameters, initOverrides);
69-
const response = await this.request(requestConfig, initOverrides);
61+
}, initOverrides);
7062

7163
return new runtime.JSONApiResponse(response, (jsonValue) => ClientFromJSON(jsonValue));
7264
}

‎samples/client/petstore/typescript-fetch/builds/default-v3.0/apis/DefaultApi.ts‎

Lines changed: 3 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -28,29 +28,21 @@ import {
2828
export class DefaultApi extends runtime.BaseAPI {
2929

3030
/**
31-
* Creates request options for fooGet without sending the request
3231
*/
33-
async fooGetRequestOpts(initOverrides?: RequestInit | runtime.InitOverrideFunction): Promise<runtime.RequestOpts> {
32+
async fooGetRaw(initOverrides?: RequestInit | runtime.InitOverrideFunction): Promise<runtime.ApiResponse<FooGetDefaultResponse>> {
3433
const queryParameters: any = {};
3534

3635
const headerParameters: runtime.HTTPHeaders = {};
3736

3837

3938
let urlPath = `/foo`;
4039

41-
return {
40+
const response = await this.request({
4241
path: urlPath,
4342
method: 'GET',
4443
headers: headerParameters,
4544
query: queryParameters,
46-
};
47-
}
48-
49-
/**
50-
*/
51-
async fooGetRaw(initOverrides?: RequestInit | runtime.InitOverrideFunction): Promise<runtime.ApiResponse<FooGetDefaultResponse>> {
52-
const requestConfig = await this.fooGetRequestConfig(initOverrides);
53-
const response = await this.request(requestConfig, initOverrides);
45+
}, initOverrides);
5446

5547
return new runtime.JSONApiResponse(response, (jsonValue) => FooGetDefaultResponseFromJSON(jsonValue));
5648
}

0 commit comments

Comments
 (0)