Skip to content

Commit bbccd28

Browse files
alec-petersenalec-petersen
authored
Replace MaxTimeout usage with Timeout, update Timeout to be a TimeSpan type (#19875)
1 parent d9229c7 commit bbccd28

File tree

46 files changed

+88
-88
lines changed

Some content is hidden

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

46 files changed

+88
-88
lines changed

‎bin/utils/test_file_list.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
- filename: "samples/client/petstore/csharp/restsharp/standard2.0/Petstore/src/Org.OpenAPITools.Test/JSONComposedSchemaTests.cs"
44
sha256: e323c7e646a0ceb6d1d8f34f287175ac666fdbbe057791b45d138de3d9582666
55
- filename: "samples/client/petstore/csharp/restsharp/standard2.0/Petstore/src/Org.OpenAPITools.Test/Api/PetApiTests.cs"
6-
sha256: 7dad88554fe630d25c787cae05305d302d5e34ca810aee4fa23f20055f9188e1
6+
sha256: b98a6043573332de4f049db50b36bce7b5fada8511769da97f6561066a0f8c5c
77
- filename: "samples/client/petstore/csharp/restsharp/standard2.0/Petstore/src/Org.OpenAPITools.Test/linux-logo.png"
88
sha256: 0a67c32728197e942b13bdda064b73793f12f5c795f1e5cf35a3adf69c973230
99
# java okhttp gson test files

‎modules/openapi-generator/src/main/resources/csharp/ApiClient.mustache

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -455,7 +455,7 @@ namespace {{packageName}}.Client
455455
var clientOptions = new RestClientOptions(baseUrl)
456456
{
457457
ClientCertificates = configuration.ClientCertificates,
458-
MaxTimeout = configuration.Timeout,
458+
Timeout = configuration.Timeout,
459459
Proxy = configuration.Proxy,
460460
UserAgent = configuration.UserAgent,
461461
UseDefaultCredentials = configuration.UseDefaultCredentials,

‎modules/openapi-generator/src/main/resources/csharp/Configuration.mustache

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -202,7 +202,7 @@ namespace {{packageName}}.Client
202202
};
203203

204204
// Setting Timeout has side effects (forces ApiClient creation).
205-
Timeout = 100000;
205+
Timeout = TimeSpan.FromSeconds(100);
206206
}
207207

208208
/// <summary>
@@ -286,9 +286,9 @@ namespace {{packageName}}.Client
286286
public virtual IDictionary<string, string> DefaultHeaders { get; set; }
287287

288288
/// <summary>
289-
/// Gets or sets the HTTP timeout (milliseconds) of ApiClient. Default to 100000 milliseconds.
289+
/// Gets or sets the HTTP timeout of ApiClient. Defaults to 100 seconds.
290290
/// </summary>
291-
public virtual int Timeout { get; set; }
291+
public virtual TimeSpan Timeout { get; set; }
292292

293293
/// <summary>
294294
/// Gets or sets the proxy

‎modules/openapi-generator/src/main/resources/csharp/IReadableConfiguration.mustache

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -101,10 +101,10 @@ namespace {{packageName}}.Client
101101
string TempFolderPath { get; }
102102

103103
/// <summary>
104-
/// Gets the HTTP connection timeout (in milliseconds)
104+
/// Gets the HTTP connection timeout.
105105
/// </summary>
106106
/// <value>HTTP connection timeout.</value>
107-
int Timeout { get; }
107+
TimeSpan Timeout { get; }
108108

109109
/// <summary>
110110
/// Gets the proxy.

‎modules/openapi-generator/src/main/resources/csharp/libraries/httpclient/ApiClient.mustache

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -481,7 +481,7 @@ namespace {{packageName}}.Client
481481
482482
try
483483
{
484-
if (configuration.Timeout > 0)
484+
if (configuration.Timeout > TimeSpan.Zero)
485485
{
486486
timeoutTokenSource = new CancellationTokenSource(configuration.Timeout);
487487
finalTokenSource = CancellationTokenSource.CreateLinkedTokenSource(finalToken, timeoutTokenSource.Token);

‎samples/client/echo_api/csharp-restsharp/src/Org.OpenAPITools/Client/ApiClient.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -455,7 +455,7 @@ private async Task<ApiResponse<T>> ExecClientAsync<T>(Func<RestClient, Task<Rest
455455
var clientOptions = new RestClientOptions(baseUrl)
456456
{
457457
ClientCertificates = configuration.ClientCertificates,
458-
MaxTimeout = configuration.Timeout,
458+
Timeout = configuration.Timeout,
459459
Proxy = configuration.Proxy,
460460
UserAgent = configuration.UserAgent,
461461
UseDefaultCredentials = configuration.UseDefaultCredentials,

‎samples/client/echo_api/csharp-restsharp/src/Org.OpenAPITools/Client/Configuration.cs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -137,7 +137,7 @@ public Configuration()
137137
};
138138

139139
// Setting Timeout has side effects (forces ApiClient creation).
140-
Timeout = 100000;
140+
Timeout = TimeSpan.FromSeconds(100);
141141
}
142142

143143
/// <summary>
@@ -221,9 +221,9 @@ public virtual IDictionary<string, string> DefaultHeader
221221
public virtual IDictionary<string, string> DefaultHeaders { get; set; }
222222

223223
/// <summary>
224-
/// Gets or sets the HTTP timeout (milliseconds) of ApiClient. Default to 100000 milliseconds.
224+
/// Gets or sets the HTTP timeout of ApiClient. Defaults to 100 seconds.
225225
/// </summary>
226-
public virtual int Timeout { get; set; }
226+
public virtual TimeSpan Timeout { get; set; }
227227

228228
/// <summary>
229229
/// Gets or sets the proxy

‎samples/client/echo_api/csharp-restsharp/src/Org.OpenAPITools/Client/IReadableConfiguration.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -72,10 +72,10 @@ public interface IReadableConfiguration
7272
string TempFolderPath { get; }
7373

7474
/// <summary>
75-
/// Gets the HTTP connection timeout (in milliseconds)
75+
/// Gets the HTTP connection timeout.
7676
/// </summary>
7777
/// <value>HTTP connection timeout.</value>
78-
int Timeout { get; }
78+
TimeSpan Timeout { get; }
7979

8080
/// <summary>
8181
/// Gets the proxy.

‎samples/client/others/csharp-complex-files/src/Org.OpenAPITools/Client/ApiClient.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -455,7 +455,7 @@ private async Task<ApiResponse<T>> ExecClientAsync<T>(Func<RestClient, Task<Rest
455455
var clientOptions = new RestClientOptions(baseUrl)
456456
{
457457
ClientCertificates = configuration.ClientCertificates,
458-
MaxTimeout = configuration.Timeout,
458+
Timeout = configuration.Timeout,
459459
Proxy = configuration.Proxy,
460460
UserAgent = configuration.UserAgent,
461461
UseDefaultCredentials = configuration.UseDefaultCredentials,

‎samples/client/others/csharp-complex-files/src/Org.OpenAPITools/Client/Configuration.cs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -131,7 +131,7 @@ public Configuration()
131131
};
132132

133133
// Setting Timeout has side effects (forces ApiClient creation).
134-
Timeout = 100000;
134+
Timeout = TimeSpan.FromSeconds(100);
135135
}
136136

137137
/// <summary>
@@ -215,9 +215,9 @@ public virtual IDictionary<string, string> DefaultHeader
215215
public virtual IDictionary<string, string> DefaultHeaders { get; set; }
216216

217217
/// <summary>
218-
/// Gets or sets the HTTP timeout (milliseconds) of ApiClient. Default to 100000 milliseconds.
218+
/// Gets or sets the HTTP timeout of ApiClient. Defaults to 100 seconds.
219219
/// </summary>
220-
public virtual int Timeout { get; set; }
220+
public virtual TimeSpan Timeout { get; set; }
221221

222222
/// <summary>
223223
/// Gets or sets the proxy

‎samples/client/others/csharp-complex-files/src/Org.OpenAPITools/Client/IReadableConfiguration.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -71,10 +71,10 @@ public interface IReadableConfiguration
7171
string TempFolderPath { get; }
7272

7373
/// <summary>
74-
/// Gets the HTTP connection timeout (in milliseconds)
74+
/// Gets the HTTP connection timeout.
7575
/// </summary>
7676
/// <value>HTTP connection timeout.</value>
77-
int Timeout { get; }
77+
TimeSpan Timeout { get; }
7878

7979
/// <summary>
8080
/// Gets the proxy.

‎samples/client/petstore/csharp/httpclient/standard2.0/Petstore/src/Org.OpenAPITools.Test/Api/PetApiTests.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -155,7 +155,7 @@ public void GetPetByIdTest()
155155
{
156156
// set timeout to 10 seconds
157157
Configuration c1 = new Configuration();
158-
c1.Timeout = 10000;
158+
c1.Timeout = TimeSpan.FromSeconds(10);
159159
c1.UserAgent = "TEST_USER_AGENT";
160160

161161
HttpClient httpClient = new HttpClient();

‎samples/client/petstore/csharp/httpclient/standard2.0/Petstore/src/Org.OpenAPITools.Test/Api/PetApiTestsV2.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ public PetApiTestsV2()
4444
_petApi = new PetApi(_httpClient, new Configuration
4545
{
4646
BasePath = BasePath,
47-
Timeout = 10000,
47+
Timeout = TimeSpan.FromSeconds(10),
4848
UserAgent = "TEST_USER_AGENT"
4949
});
5050

‎samples/client/petstore/csharp/httpclient/standard2.0/Petstore/src/Org.OpenAPITools/Client/ApiClient.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -482,7 +482,7 @@ private async Task<ApiResponse<T>> ExecAsync<T>(HttpRequestMessage req,
482482

483483
try
484484
{
485-
if (configuration.Timeout > 0)
485+
if (configuration.Timeout > TimeSpan.Zero)
486486
{
487487
timeoutTokenSource = new CancellationTokenSource(configuration.Timeout);
488488
finalTokenSource = CancellationTokenSource.CreateLinkedTokenSource(finalToken, timeoutTokenSource.Token);

‎samples/client/petstore/csharp/httpclient/standard2.0/Petstore/src/Org.OpenAPITools/Client/Configuration.cs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -231,7 +231,7 @@ public Configuration()
231231
};
232232

233233
// Setting Timeout has side effects (forces ApiClient creation).
234-
Timeout = 100000;
234+
Timeout = TimeSpan.FromSeconds(100);
235235
}
236236

237237
/// <summary>
@@ -315,9 +315,9 @@ public virtual IDictionary<string, string> DefaultHeader
315315
public virtual IDictionary<string, string> DefaultHeaders { get; set; }
316316

317317
/// <summary>
318-
/// Gets or sets the HTTP timeout (milliseconds) of ApiClient. Default to 100000 milliseconds.
318+
/// Gets or sets the HTTP timeout of ApiClient. Defaults to 100 seconds.
319319
/// </summary>
320-
public virtual int Timeout { get; set; }
320+
public virtual TimeSpan Timeout { get; set; }
321321

322322
/// <summary>
323323
/// Gets or sets the proxy

‎samples/client/petstore/csharp/httpclient/standard2.0/Petstore/src/Org.OpenAPITools/Client/IReadableConfiguration.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -71,10 +71,10 @@ public interface IReadableConfiguration
7171
string TempFolderPath { get; }
7272

7373
/// <summary>
74-
/// Gets the HTTP connection timeout (in milliseconds)
74+
/// Gets the HTTP connection timeout.
7575
/// </summary>
7676
/// <value>HTTP connection timeout.</value>
77-
int Timeout { get; }
77+
TimeSpan Timeout { get; }
7878

7979
/// <summary>
8080
/// Gets the proxy.

‎samples/client/petstore/csharp/restsharp/net4.7/MultipleFrameworks/src/Org.OpenAPITools/Client/ApiClient.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -456,7 +456,7 @@ private async Task<ApiResponse<T>> ExecClientAsync<T>(Func<RestClient, Task<Rest
456456
var clientOptions = new RestClientOptions(baseUrl)
457457
{
458458
ClientCertificates = configuration.ClientCertificates,
459-
MaxTimeout = configuration.Timeout,
459+
Timeout = configuration.Timeout,
460460
Proxy = configuration.Proxy,
461461
UserAgent = configuration.UserAgent,
462462
UseDefaultCredentials = configuration.UseDefaultCredentials,

‎samples/client/petstore/csharp/restsharp/net4.7/MultipleFrameworks/src/Org.OpenAPITools/Client/Configuration.cs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -132,7 +132,7 @@ public Configuration()
132132
};
133133

134134
// Setting Timeout has side effects (forces ApiClient creation).
135-
Timeout = 100000;
135+
Timeout = TimeSpan.FromSeconds(100);
136136
}
137137

138138
/// <summary>
@@ -216,9 +216,9 @@ public virtual IDictionary<string, string> DefaultHeader
216216
public virtual IDictionary<string, string> DefaultHeaders { get; set; }
217217

218218
/// <summary>
219-
/// Gets or sets the HTTP timeout (milliseconds) of ApiClient. Default to 100000 milliseconds.
219+
/// Gets or sets the HTTP timeout of ApiClient. Defaults to 100 seconds.
220220
/// </summary>
221-
public virtual int Timeout { get; set; }
221+
public virtual TimeSpan Timeout { get; set; }
222222

223223
/// <summary>
224224
/// Gets or sets the proxy

‎samples/client/petstore/csharp/restsharp/net4.7/MultipleFrameworks/src/Org.OpenAPITools/Client/IReadableConfiguration.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -102,10 +102,10 @@ public interface IReadableConfiguration
102102
string TempFolderPath { get; }
103103

104104
/// <summary>
105-
/// Gets the HTTP connection timeout (in milliseconds)
105+
/// Gets the HTTP connection timeout.
106106
/// </summary>
107107
/// <value>HTTP connection timeout.</value>
108-
int Timeout { get; }
108+
TimeSpan Timeout { get; }
109109

110110
/// <summary>
111111
/// Gets the proxy.

‎samples/client/petstore/csharp/restsharp/net4.7/Petstore/src/Org.OpenAPITools/Client/ApiClient.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -456,7 +456,7 @@ private async Task<ApiResponse<T>> ExecClientAsync<T>(Func<RestClient, Task<Rest
456456
var clientOptions = new RestClientOptions(baseUrl)
457457
{
458458
ClientCertificates = configuration.ClientCertificates,
459-
MaxTimeout = configuration.Timeout,
459+
Timeout = configuration.Timeout,
460460
Proxy = configuration.Proxy,
461461
UserAgent = configuration.UserAgent,
462462
UseDefaultCredentials = configuration.UseDefaultCredentials,

‎samples/client/petstore/csharp/restsharp/net4.7/Petstore/src/Org.OpenAPITools/Client/Configuration.cs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -237,7 +237,7 @@ public Configuration()
237237
};
238238

239239
// Setting Timeout has side effects (forces ApiClient creation).
240-
Timeout = 100000;
240+
Timeout = TimeSpan.FromSeconds(100);
241241
}
242242

243243
/// <summary>
@@ -321,9 +321,9 @@ public virtual IDictionary<string, string> DefaultHeader
321321
public virtual IDictionary<string, string> DefaultHeaders { get; set; }
322322

323323
/// <summary>
324-
/// Gets or sets the HTTP timeout (milliseconds) of ApiClient. Default to 100000 milliseconds.
324+
/// Gets or sets the HTTP timeout of ApiClient. Defaults to 100 seconds.
325325
/// </summary>
326-
public virtual int Timeout { get; set; }
326+
public virtual TimeSpan Timeout { get; set; }
327327

328328
/// <summary>
329329
/// Gets or sets the proxy

‎samples/client/petstore/csharp/restsharp/net4.7/Petstore/src/Org.OpenAPITools/Client/IReadableConfiguration.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -102,10 +102,10 @@ public interface IReadableConfiguration
102102
string TempFolderPath { get; }
103103

104104
/// <summary>
105-
/// Gets the HTTP connection timeout (in milliseconds)
105+
/// Gets the HTTP connection timeout.
106106
/// </summary>
107107
/// <value>HTTP connection timeout.</value>
108-
int Timeout { get; }
108+
TimeSpan Timeout { get; }
109109

110110
/// <summary>
111111
/// Gets the proxy.

‎samples/client/petstore/csharp/restsharp/net4.8/Petstore/src/Org.OpenAPITools/Client/ApiClient.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -456,7 +456,7 @@ private async Task<ApiResponse<T>> ExecClientAsync<T>(Func<RestClient, Task<Rest
456456
var clientOptions = new RestClientOptions(baseUrl)
457457
{
458458
ClientCertificates = configuration.ClientCertificates,
459-
MaxTimeout = configuration.Timeout,
459+
Timeout = configuration.Timeout,
460460
Proxy = configuration.Proxy,
461461
UserAgent = configuration.UserAgent,
462462
UseDefaultCredentials = configuration.UseDefaultCredentials,

‎samples/client/petstore/csharp/restsharp/net4.8/Petstore/src/Org.OpenAPITools/Client/Configuration.cs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -237,7 +237,7 @@ public Configuration()
237237
};
238238

239239
// Setting Timeout has side effects (forces ApiClient creation).
240-
Timeout = 100000;
240+
Timeout = TimeSpan.FromSeconds(100);
241241
}
242242

243243
/// <summary>
@@ -321,9 +321,9 @@ public virtual IDictionary<string, string> DefaultHeader
321321
public virtual IDictionary<string, string> DefaultHeaders { get; set; }
322322

323323
/// <summary>
324-
/// Gets or sets the HTTP timeout (milliseconds) of ApiClient. Default to 100000 milliseconds.
324+
/// Gets or sets the HTTP timeout of ApiClient. Defaults to 100 seconds.
325325
/// </summary>
326-
public virtual int Timeout { get; set; }
326+
public virtual TimeSpan Timeout { get; set; }
327327

328328
/// <summary>
329329
/// Gets or sets the proxy

‎samples/client/petstore/csharp/restsharp/net4.8/Petstore/src/Org.OpenAPITools/Client/IReadableConfiguration.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -102,10 +102,10 @@ public interface IReadableConfiguration
102102
string TempFolderPath { get; }
103103

104104
/// <summary>
105-
/// Gets the HTTP connection timeout (in milliseconds)
105+
/// Gets the HTTP connection timeout.
106106
/// </summary>
107107
/// <value>HTTP connection timeout.</value>
108-
int Timeout { get; }
108+
TimeSpan Timeout { get; }
109109

110110
/// <summary>
111111
/// Gets the proxy.

‎samples/client/petstore/csharp/restsharp/net6/ParameterMappings/src/Org.OpenAPITools/Client/ApiClient.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -454,7 +454,7 @@ private async Task<ApiResponse<T>> ExecClientAsync<T>(Func<RestClient, Task<Rest
454454
var clientOptions = new RestClientOptions(baseUrl)
455455
{
456456
ClientCertificates = configuration.ClientCertificates,
457-
MaxTimeout = configuration.Timeout,
457+
Timeout = configuration.Timeout,
458458
Proxy = configuration.Proxy,
459459
UserAgent = configuration.UserAgent,
460460
UseDefaultCredentials = configuration.UseDefaultCredentials,

‎samples/client/petstore/csharp/restsharp/net6/ParameterMappings/src/Org.OpenAPITools/Client/Configuration.cs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -136,7 +136,7 @@ public Configuration()
136136
};
137137

138138
// Setting Timeout has side effects (forces ApiClient creation).
139-
Timeout = 100000;
139+
Timeout = TimeSpan.FromSeconds(100);
140140
}
141141

142142
/// <summary>
@@ -220,9 +220,9 @@ public virtual IDictionary<string, string> DefaultHeader
220220
public virtual IDictionary<string, string> DefaultHeaders { get; set; }
221221

222222
/// <summary>
223-
/// Gets or sets the HTTP timeout (milliseconds) of ApiClient. Default to 100000 milliseconds.
223+
/// Gets or sets the HTTP timeout of ApiClient. Defaults to 100 seconds.
224224
/// </summary>
225-
public virtual int Timeout { get; set; }
225+
public virtual TimeSpan Timeout { get; set; }
226226

227227
/// <summary>
228228
/// Gets or sets the proxy

‎samples/client/petstore/csharp/restsharp/net6/ParameterMappings/src/Org.OpenAPITools/Client/IReadableConfiguration.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -71,10 +71,10 @@ public interface IReadableConfiguration
7171
string TempFolderPath { get; }
7272

7373
/// <summary>
74-
/// Gets the HTTP connection timeout (in milliseconds)
74+
/// Gets the HTTP connection timeout.
7575
/// </summary>
7676
/// <value>HTTP connection timeout.</value>
77-
int Timeout { get; }
77+
TimeSpan Timeout { get; }
7878

7979
/// <summary>
8080
/// Gets the proxy.

‎samples/client/petstore/csharp/restsharp/net7/EnumMappings/src/Org.OpenAPITools/Client/ApiClient.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -455,7 +455,7 @@ private async Task<ApiResponse<T>> ExecClientAsync<T>(Func<RestClient, Task<Rest
455455
var clientOptions = new RestClientOptions(baseUrl)
456456
{
457457
ClientCertificates = configuration.ClientCertificates,
458-
MaxTimeout = configuration.Timeout,
458+
Timeout = configuration.Timeout,
459459
Proxy = configuration.Proxy,
460460
UserAgent = configuration.UserAgent,
461461
UseDefaultCredentials = configuration.UseDefaultCredentials,

0 commit comments

Comments
 (0)