Skip to content

Commit 153d80f

Browse files
wing328wing328
committed
update C# samples
1 parent 5e44ee2 commit 153d80f

11 files changed

Lines changed: 341 additions & 44 deletions

File tree

‎samples/client/petstore/csharp/generichost/latest/NullTypes/src/Org.OpenAPITools/Client/HostConfiguration.cs‎

Lines changed: 31 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -55,18 +55,45 @@ public HostConfiguration(IServiceCollection services)
5555
_services.AddSingleton<DefaultApiEvents>();
5656
}
5757

58+
/// <summary>
59+
/// Configures the HttpClients.
60+
/// </summary>
61+
/// <param name="builder"></param>
62+
/// <returns></returns>
63+
public HostConfiguration AddApiHttpClients(Action<IHttpClientBuilder>? builder = null)
64+
{
65+
return AddApiHttpClients((Action<IServiceProvider, HttpClient>?)null, builder);
66+
}
67+
68+
/// <summary>
69+
/// Configures the HttpClients.
70+
/// </summary>
71+
/// <param name="client"></param>
72+
/// <param name="builder"></param>
73+
/// <returns></returns>
74+
public HostConfiguration AddApiHttpClients(
75+
Action<HttpClient>? client,
76+
Action<IHttpClientBuilder>? builder = null)
77+
{
78+
var wrapped = client != null ? new Action<IServiceProvider, HttpClient>((_, httpClient) =>
79+
{
80+
client(httpClient);
81+
}) : null;
82+
return AddApiHttpClients(wrapped, builder);
83+
}
84+
5885
/// <summary>
5986
/// Configures the HttpClients.
6087
/// </summary>
6188
/// <param name="client"></param>
6289
/// <param name="builder"></param>
6390
/// <returns></returns>
64-
public HostConfiguration AddApiHttpClients
65-
(
66-
Action<HttpClient>? client = null, Action<IHttpClientBuilder>? builder = null)
91+
public HostConfiguration AddApiHttpClients(
92+
Action<IServiceProvider, HttpClient>? client,
93+
Action<IHttpClientBuilder>? builder = null)
6794
{
6895
if (client == null)
69-
client = c => c.BaseAddress = new Uri(ClientUtils.BASE_ADDRESS);
96+
client = (_, c) => c.BaseAddress = new Uri(ClientUtils.BASE_ADDRESS);
7097

7198
List<IHttpClientBuilder> builders = new List<IHttpClientBuilder>();
7299

‎samples/client/petstore/csharp/generichost/latest/UseDateTimeOffset/src/Org.OpenAPITools/Client/HostConfiguration.cs‎

Lines changed: 31 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -166,18 +166,45 @@ public HostConfiguration(IServiceCollection services)
166166
_services.AddSingleton<UserApiEvents>();
167167
}
168168

169+
/// <summary>
170+
/// Configures the HttpClients.
171+
/// </summary>
172+
/// <param name="builder"></param>
173+
/// <returns></returns>
174+
public HostConfiguration AddApiHttpClients(Action<IHttpClientBuilder>? builder = null)
175+
{
176+
return AddApiHttpClients((Action<IServiceProvider, HttpClient>?)null, builder);
177+
}
178+
179+
/// <summary>
180+
/// Configures the HttpClients.
181+
/// </summary>
182+
/// <param name="client"></param>
183+
/// <param name="builder"></param>
184+
/// <returns></returns>
185+
public HostConfiguration AddApiHttpClients(
186+
Action<HttpClient>? client,
187+
Action<IHttpClientBuilder>? builder = null)
188+
{
189+
var wrapped = client != null ? new Action<IServiceProvider, HttpClient>((_, httpClient) =>
190+
{
191+
client(httpClient);
192+
}) : null;
193+
return AddApiHttpClients(wrapped, builder);
194+
}
195+
169196
/// <summary>
170197
/// Configures the HttpClients.
171198
/// </summary>
172199
/// <param name="client"></param>
173200
/// <param name="builder"></param>
174201
/// <returns></returns>
175-
public HostConfiguration AddApiHttpClients
176-
(
177-
Action<HttpClient>? client = null, Action<IHttpClientBuilder>? builder = null)
202+
public HostConfiguration AddApiHttpClients(
203+
Action<IServiceProvider, HttpClient>? client,
204+
Action<IHttpClientBuilder>? builder = null)
178205
{
179206
if (client == null)
180-
client = c => c.BaseAddress = new Uri(ClientUtils.BASE_ADDRESS);
207+
client = (_, c) => c.BaseAddress = new Uri(ClientUtils.BASE_ADDRESS);
181208

182209
List<IHttpClientBuilder> builders = new List<IHttpClientBuilder>();
183210

‎samples/client/petstore/csharp/generichost/net10/AllOf/src/Org.OpenAPITools/Client/HostConfiguration.cs‎

Lines changed: 31 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -52,18 +52,45 @@ public HostConfiguration(IServiceCollection services)
5252
_services.AddSingleton<DefaultApiEvents>();
5353
}
5454

55+
/// <summary>
56+
/// Configures the HttpClients.
57+
/// </summary>
58+
/// <param name="builder"></param>
59+
/// <returns></returns>
60+
public HostConfiguration AddApiHttpClients(Action<IHttpClientBuilder>? builder = null)
61+
{
62+
return AddApiHttpClients((Action<IServiceProvider, HttpClient>?)null, builder);
63+
}
64+
65+
/// <summary>
66+
/// Configures the HttpClients.
67+
/// </summary>
68+
/// <param name="client"></param>
69+
/// <param name="builder"></param>
70+
/// <returns></returns>
71+
public HostConfiguration AddApiHttpClients(
72+
Action<HttpClient>? client,
73+
Action<IHttpClientBuilder>? builder = null)
74+
{
75+
var wrapped = client != null ? new Action<IServiceProvider, HttpClient>((_, httpClient) =>
76+
{
77+
client(httpClient);
78+
}) : null;
79+
return AddApiHttpClients(wrapped, builder);
80+
}
81+
5582
/// <summary>
5683
/// Configures the HttpClients.
5784
/// </summary>
5885
/// <param name="client"></param>
5986
/// <param name="builder"></param>
6087
/// <returns></returns>
61-
public HostConfiguration AddApiHttpClients
62-
(
63-
Action<HttpClient>? client = null, Action<IHttpClientBuilder>? builder = null)
88+
public HostConfiguration AddApiHttpClients(
89+
Action<IServiceProvider, HttpClient>? client,
90+
Action<IHttpClientBuilder>? builder = null)
6491
{
6592
if (client == null)
66-
client = c => c.BaseAddress = new Uri(ClientUtils.BASE_ADDRESS);
93+
client = (_, c) => c.BaseAddress = new Uri(ClientUtils.BASE_ADDRESS);
6794

6895
List<IHttpClientBuilder> builders = new List<IHttpClientBuilder>();
6996

‎samples/client/petstore/csharp/generichost/net10/AnyOf/src/Org.OpenAPITools/Client/HostConfiguration.cs‎

Lines changed: 31 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -52,18 +52,45 @@ public HostConfiguration(IServiceCollection services)
5252
_services.AddSingleton<DefaultApiEvents>();
5353
}
5454

55+
/// <summary>
56+
/// Configures the HttpClients.
57+
/// </summary>
58+
/// <param name="builder"></param>
59+
/// <returns></returns>
60+
public HostConfiguration AddApiHttpClients(Action<IHttpClientBuilder>? builder = null)
61+
{
62+
return AddApiHttpClients((Action<IServiceProvider, HttpClient>?)null, builder);
63+
}
64+
65+
/// <summary>
66+
/// Configures the HttpClients.
67+
/// </summary>
68+
/// <param name="client"></param>
69+
/// <param name="builder"></param>
70+
/// <returns></returns>
71+
public HostConfiguration AddApiHttpClients(
72+
Action<HttpClient>? client,
73+
Action<IHttpClientBuilder>? builder = null)
74+
{
75+
var wrapped = client != null ? new Action<IServiceProvider, HttpClient>((_, httpClient) =>
76+
{
77+
client(httpClient);
78+
}) : null;
79+
return AddApiHttpClients(wrapped, builder);
80+
}
81+
5582
/// <summary>
5683
/// Configures the HttpClients.
5784
/// </summary>
5885
/// <param name="client"></param>
5986
/// <param name="builder"></param>
6087
/// <returns></returns>
61-
public HostConfiguration AddApiHttpClients
62-
(
63-
Action<HttpClient>? client = null, Action<IHttpClientBuilder>? builder = null)
88+
public HostConfiguration AddApiHttpClients(
89+
Action<IServiceProvider, HttpClient>? client,
90+
Action<IHttpClientBuilder>? builder = null)
6491
{
6592
if (client == null)
66-
client = c => c.BaseAddress = new Uri(ClientUtils.BASE_ADDRESS);
93+
client = (_, c) => c.BaseAddress = new Uri(ClientUtils.BASE_ADDRESS);
6794

6895
List<IHttpClientBuilder> builders = new List<IHttpClientBuilder>();
6996

‎samples/client/petstore/csharp/generichost/net10/AnyOfNoCompare/src/Org.OpenAPITools/Client/HostConfiguration.cs‎

Lines changed: 31 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -52,18 +52,45 @@ public HostConfiguration(IServiceCollection services)
5252
_services.AddSingleton<DefaultApiEvents>();
5353
}
5454

55+
/// <summary>
56+
/// Configures the HttpClients.
57+
/// </summary>
58+
/// <param name="builder"></param>
59+
/// <returns></returns>
60+
public HostConfiguration AddApiHttpClients(Action<IHttpClientBuilder>? builder = null)
61+
{
62+
return AddApiHttpClients((Action<IServiceProvider, HttpClient>?)null, builder);
63+
}
64+
65+
/// <summary>
66+
/// Configures the HttpClients.
67+
/// </summary>
68+
/// <param name="client"></param>
69+
/// <param name="builder"></param>
70+
/// <returns></returns>
71+
public HostConfiguration AddApiHttpClients(
72+
Action<HttpClient>? client,
73+
Action<IHttpClientBuilder>? builder = null)
74+
{
75+
var wrapped = client != null ? new Action<IServiceProvider, HttpClient>((_, httpClient) =>
76+
{
77+
client(httpClient);
78+
}) : null;
79+
return AddApiHttpClients(wrapped, builder);
80+
}
81+
5582
/// <summary>
5683
/// Configures the HttpClients.
5784
/// </summary>
5885
/// <param name="client"></param>
5986
/// <param name="builder"></param>
6087
/// <returns></returns>
61-
public HostConfiguration AddApiHttpClients
62-
(
63-
Action<HttpClient>? client = null, Action<IHttpClientBuilder>? builder = null)
88+
public HostConfiguration AddApiHttpClients(
89+
Action<IServiceProvider, HttpClient>? client,
90+
Action<IHttpClientBuilder>? builder = null)
6491
{
6592
if (client == null)
66-
client = c => c.BaseAddress = new Uri(ClientUtils.BASE_ADDRESS);
93+
client = (_, c) => c.BaseAddress = new Uri(ClientUtils.BASE_ADDRESS);
6794

6895
List<IHttpClientBuilder> builders = new List<IHttpClientBuilder>();
6996

‎samples/client/petstore/csharp/generichost/net10/FormModels/src/Org.OpenAPITools/Client/HostConfiguration.cs‎

Lines changed: 31 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -212,18 +212,45 @@ public HostConfiguration(IServiceCollection services)
212212
_services.AddSingleton<UserApiEvents>();
213213
}
214214

215+
/// <summary>
216+
/// Configures the HttpClients.
217+
/// </summary>
218+
/// <param name="builder"></param>
219+
/// <returns></returns>
220+
public HostConfiguration AddApiHttpClients(Action<IHttpClientBuilder> builder = null)
221+
{
222+
return AddApiHttpClients((Action<IServiceProvider, HttpClient>)null, builder);
223+
}
224+
225+
/// <summary>
226+
/// Configures the HttpClients.
227+
/// </summary>
228+
/// <param name="client"></param>
229+
/// <param name="builder"></param>
230+
/// <returns></returns>
231+
public HostConfiguration AddApiHttpClients(
232+
Action<HttpClient> client,
233+
Action<IHttpClientBuilder> builder = null)
234+
{
235+
var wrapped = client != null ? new Action<IServiceProvider, HttpClient>((_, httpClient) =>
236+
{
237+
client(httpClient);
238+
}) : null;
239+
return AddApiHttpClients(wrapped, builder);
240+
}
241+
215242
/// <summary>
216243
/// Configures the HttpClients.
217244
/// </summary>
218245
/// <param name="client"></param>
219246
/// <param name="builder"></param>
220247
/// <returns></returns>
221-
public HostConfiguration AddApiHttpClients
222-
(
223-
Action<HttpClient> client = null, Action<IHttpClientBuilder> builder = null)
248+
public HostConfiguration AddApiHttpClients(
249+
Action<IServiceProvider, HttpClient> client,
250+
Action<IHttpClientBuilder> builder = null)
224251
{
225252
if (client == null)
226-
client = c => c.BaseAddress = new Uri(ClientUtils.BASE_ADDRESS);
253+
client = (_, c) => c.BaseAddress = new Uri(ClientUtils.BASE_ADDRESS);
227254

228255
List<IHttpClientBuilder> builders = new List<IHttpClientBuilder>();
229256

‎samples/client/petstore/csharp/generichost/net10/NullReferenceTypes/src/Org.OpenAPITools/Client/HostConfiguration.cs‎

Lines changed: 31 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -166,18 +166,45 @@ public HostConfiguration(IServiceCollection services)
166166
_services.AddSingleton<UserApiEvents>();
167167
}
168168

169+
/// <summary>
170+
/// Configures the HttpClients.
171+
/// </summary>
172+
/// <param name="builder"></param>
173+
/// <returns></returns>
174+
public HostConfiguration AddApiHttpClients(Action<IHttpClientBuilder>? builder = null)
175+
{
176+
return AddApiHttpClients((Action<IServiceProvider, HttpClient>?)null, builder);
177+
}
178+
179+
/// <summary>
180+
/// Configures the HttpClients.
181+
/// </summary>
182+
/// <param name="client"></param>
183+
/// <param name="builder"></param>
184+
/// <returns></returns>
185+
public HostConfiguration AddApiHttpClients(
186+
Action<HttpClient>? client,
187+
Action<IHttpClientBuilder>? builder = null)
188+
{
189+
var wrapped = client != null ? new Action<IServiceProvider, HttpClient>((_, httpClient) =>
190+
{
191+
client(httpClient);
192+
}) : null;
193+
return AddApiHttpClients(wrapped, builder);
194+
}
195+
169196
/// <summary>
170197
/// Configures the HttpClients.
171198
/// </summary>
172199
/// <param name="client"></param>
173200
/// <param name="builder"></param>
174201
/// <returns></returns>
175-
public HostConfiguration AddApiHttpClients
176-
(
177-
Action<HttpClient>? client = null, Action<IHttpClientBuilder>? builder = null)
202+
public HostConfiguration AddApiHttpClients(
203+
Action<IServiceProvider, HttpClient>? client,
204+
Action<IHttpClientBuilder>? builder = null)
178205
{
179206
if (client == null)
180-
client = c => c.BaseAddress = new Uri(ClientUtils.BASE_ADDRESS);
207+
client = (_, c) => c.BaseAddress = new Uri(ClientUtils.BASE_ADDRESS);
181208

182209
List<IHttpClientBuilder> builders = new List<IHttpClientBuilder>();
183210

‎samples/client/petstore/csharp/generichost/net10/OneOf/src/Org.OpenAPITools/Client/HostConfiguration.cs‎

Lines changed: 31 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -53,18 +53,45 @@ public HostConfiguration(IServiceCollection services)
5353
_services.AddSingleton<DefaultApiEvents>();
5454
}
5555

56+
/// <summary>
57+
/// Configures the HttpClients.
58+
/// </summary>
59+
/// <param name="builder"></param>
60+
/// <returns></returns>
61+
public HostConfiguration AddApiHttpClients(Action<IHttpClientBuilder>? builder = null)
62+
{
63+
return AddApiHttpClients((Action<IServiceProvider, HttpClient>?)null, builder);
64+
}
65+
66+
/// <summary>
67+
/// Configures the HttpClients.
68+
/// </summary>
69+
/// <param name="client"></param>
70+
/// <param name="builder"></param>
71+
/// <returns></returns>
72+
public HostConfiguration AddApiHttpClients(
73+
Action<HttpClient>? client,
74+
Action<IHttpClientBuilder>? builder = null)
75+
{
76+
var wrapped = client != null ? new Action<IServiceProvider, HttpClient>((_, httpClient) =>
77+
{
78+
client(httpClient);
79+
}) : null;
80+
return AddApiHttpClients(wrapped, builder);
81+
}
82+
5683
/// <summary>
5784
/// Configures the HttpClients.
5885
/// </summary>
5986
/// <param name="client"></param>
6087
/// <param name="builder"></param>
6188
/// <returns></returns>
62-
public HostConfiguration AddApiHttpClients
63-
(
64-
Action<HttpClient>? client = null, Action<IHttpClientBuilder>? builder = null)
89+
public HostConfiguration AddApiHttpClients(
90+
Action<IServiceProvider, HttpClient>? client,
91+
Action<IHttpClientBuilder>? builder = null)
6592
{
6693
if (client == null)
67-
client = c => c.BaseAddress = new Uri(ClientUtils.BASE_ADDRESS);
94+
client = (_, c) => c.BaseAddress = new Uri(ClientUtils.BASE_ADDRESS);
6895

6996
List<IHttpClientBuilder> builders = new List<IHttpClientBuilder>();
7097

0 commit comments

Comments
 (0)