Skip to content

Commit f191984

Browse files
McMlokMcMlok
committed
Add HTTP client name to fix client duplicity
1 parent 6b1b5cc commit f191984

File tree

37 files changed

+215
-215
lines changed

37 files changed

+215
-215
lines changed

‎modules/openapi-generator/src/main/resources/csharp/libraries/generichost/HostConfiguration.mustache‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ namespace {{packageName}}.{{clientPackage}}
3030
internal bool HttpClientsAdded { get; private set; }
3131

3232
/// <summary>
33-
/// Instantiates the class
33+
/// Instantiates the class
3434
/// </summary>
3535
/// <param name="services"></param>
3636
public HostConfiguration(IServiceCollection services)
@@ -98,7 +98,7 @@ namespace {{packageName}}.{{clientPackage}}
9898
9999
List<IHttpClientBuilder> builders = new List<IHttpClientBuilder>();
100100
101-
{{#apiInfo}}{{#apis}}builders.Add(_services.AddHttpClient<{{interfacePrefix}}{{classname}}, {{classname}}>(client));
101+
{{#apiInfo}}{{#apis}}builders.Add(_services.AddHttpClient<{{interfacePrefix}}{{classname}}, {{classname}}>("{{packageName}}.{{apiPackage}}.{{interfacePrefix}}{{classname}}", client));
102102
{{/apis}}{{/apiInfo}}
103103
if (builder != null)
104104
foreach (IHttpClientBuilder instance in builders)
@@ -152,7 +152,7 @@ namespace {{packageName}}.{{clientPackage}}
152152
/// <typeparam name="TTokenProvider"></typeparam>
153153
/// <typeparam name="TTokenBase"></typeparam>
154154
/// <returns></returns>
155-
public HostConfiguration UseProvider<TTokenProvider, TTokenBase>()
155+
public HostConfiguration UseProvider<TTokenProvider, TTokenBase>()
156156
where TTokenProvider : TokenProvider<TTokenBase>
157157
where TTokenBase : TokenBase
158158
{

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ public class HostConfiguration
3232
internal bool HttpClientsAdded { get; private set; }
3333

3434
/// <summary>
35-
/// Instantiates the class
35+
/// Instantiates the class
3636
/// </summary>
3737
/// <param name="services"></param>
3838
public HostConfiguration(IServiceCollection services)
@@ -69,8 +69,8 @@ public HostConfiguration AddApiHttpClients
6969

7070
List<IHttpClientBuilder> builders = new List<IHttpClientBuilder>();
7171

72-
builders.Add(_services.AddHttpClient<IDefaultApi, DefaultApi>(client));
73-
72+
builders.Add(_services.AddHttpClient<IDefaultApi, DefaultApi>("Org.OpenAPITools.Api.IDefaultApi", client));
73+
7474
if (builder != null)
7575
foreach (IHttpClientBuilder instance in builders)
7676
builder(instance);
@@ -123,7 +123,7 @@ public HostConfiguration AddTokens<TTokenBase>(IEnumerable<TTokenBase> tokens) w
123123
/// <typeparam name="TTokenProvider"></typeparam>
124124
/// <typeparam name="TTokenBase"></typeparam>
125125
/// <returns></returns>
126-
public HostConfiguration UseProvider<TTokenProvider, TTokenBase>()
126+
public HostConfiguration UseProvider<TTokenProvider, TTokenBase>()
127127
where TTokenProvider : TokenProvider<TTokenBase>
128128
where TTokenBase : TokenBase
129129
{

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ public class HostConfiguration
3232
internal bool HttpClientsAdded { get; private set; }
3333

3434
/// <summary>
35-
/// Instantiates the class
35+
/// Instantiates the class
3636
/// </summary>
3737
/// <param name="services"></param>
3838
public HostConfiguration(IServiceCollection services)
@@ -66,8 +66,8 @@ public HostConfiguration AddApiHttpClients
6666

6767
List<IHttpClientBuilder> builders = new List<IHttpClientBuilder>();
6868

69-
builders.Add(_services.AddHttpClient<IDefaultApi, DefaultApi>(client));
70-
69+
builders.Add(_services.AddHttpClient<IDefaultApi, DefaultApi>("Org.OpenAPITools.Api.IDefaultApi", client));
70+
7171
if (builder != null)
7272
foreach (IHttpClientBuilder instance in builders)
7373
builder(instance);
@@ -120,7 +120,7 @@ public HostConfiguration AddTokens<TTokenBase>(IEnumerable<TTokenBase> tokens) w
120120
/// <typeparam name="TTokenProvider"></typeparam>
121121
/// <typeparam name="TTokenBase"></typeparam>
122122
/// <returns></returns>
123-
public HostConfiguration UseProvider<TTokenProvider, TTokenBase>()
123+
public HostConfiguration UseProvider<TTokenProvider, TTokenBase>()
124124
where TTokenProvider : TokenProvider<TTokenBase>
125125
where TTokenBase : TokenBase
126126
{

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

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ public class HostConfiguration
3232
internal bool HttpClientsAdded { get; private set; }
3333

3434
/// <summary>
35-
/// Instantiates the class
35+
/// Instantiates the class
3636
/// </summary>
3737
/// <param name="services"></param>
3838
public HostConfiguration(IServiceCollection services)
@@ -66,10 +66,10 @@ public HostConfiguration AddApiHttpClients
6666

6767
List<IHttpClientBuilder> builders = new List<IHttpClientBuilder>();
6868

69-
builders.Add(_services.AddHttpClient<IAPIKEYSApi, APIKEYSApi>(client));
70-
builders.Add(_services.AddHttpClient<IAPIKeysApi, APIKeysApi>(client));
71-
builders.Add(_services.AddHttpClient<IApiKeysApi, ApiKeysApi>(client));
72-
69+
builders.Add(_services.AddHttpClient<IAPIKEYSApi, APIKEYSApi>("Org.OpenAPITools.Api.IAPIKEYSApi", client));
70+
builders.Add(_services.AddHttpClient<IAPIKeysApi, APIKeysApi>("Org.OpenAPITools.Api.IAPIKeysApi", client));
71+
builders.Add(_services.AddHttpClient<IApiKeysApi, ApiKeysApi>("Org.OpenAPITools.Api.IApiKeysApi", client));
72+
7373
if (builder != null)
7474
foreach (IHttpClientBuilder instance in builders)
7575
builder(instance);
@@ -122,7 +122,7 @@ public HostConfiguration AddTokens<TTokenBase>(IEnumerable<TTokenBase> tokens) w
122122
/// <typeparam name="TTokenProvider"></typeparam>
123123
/// <typeparam name="TTokenBase"></typeparam>
124124
/// <returns></returns>
125-
public HostConfiguration UseProvider<TTokenProvider, TTokenBase>()
125+
public HostConfiguration UseProvider<TTokenProvider, TTokenBase>()
126126
where TTokenProvider : TokenProvider<TTokenBase>
127127
where TTokenBase : TokenBase
128128
{

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ public class HostConfiguration
3030
internal bool HttpClientsAdded { get; private set; }
3131

3232
/// <summary>
33-
/// Instantiates the class
33+
/// Instantiates the class
3434
/// </summary>
3535
/// <param name="services"></param>
3636
public HostConfiguration(IServiceCollection services)
@@ -63,8 +63,8 @@ public HostConfiguration AddApiHttpClients
6363

6464
List<IHttpClientBuilder> builders = new List<IHttpClientBuilder>();
6565

66-
builders.Add(_services.AddHttpClient<IDefaultApi, DefaultApi>(client));
67-
66+
builders.Add(_services.AddHttpClient<IDefaultApi, DefaultApi>("Org.OpenAPITools.Api.IDefaultApi", client));
67+
6868
if (builder != null)
6969
foreach (IHttpClientBuilder instance in builders)
7070
builder(instance);
@@ -117,7 +117,7 @@ public HostConfiguration AddTokens<TTokenBase>(IEnumerable<TTokenBase> tokens) w
117117
/// <typeparam name="TTokenProvider"></typeparam>
118118
/// <typeparam name="TTokenBase"></typeparam>
119119
/// <returns></returns>
120-
public HostConfiguration UseProvider<TTokenProvider, TTokenBase>()
120+
public HostConfiguration UseProvider<TTokenProvider, TTokenBase>()
121121
where TTokenProvider : TokenProvider<TTokenBase>
122122
where TTokenBase : TokenBase
123123
{

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ public class HostConfiguration
3030
internal bool HttpClientsAdded { get; private set; }
3131

3232
/// <summary>
33-
/// Instantiates the class
33+
/// Instantiates the class
3434
/// </summary>
3535
/// <param name="services"></param>
3636
public HostConfiguration(IServiceCollection services)
@@ -63,8 +63,8 @@ public HostConfiguration AddApiHttpClients
6363

6464
List<IHttpClientBuilder> builders = new List<IHttpClientBuilder>();
6565

66-
builders.Add(_services.AddHttpClient<IDefaultApi, DefaultApi>(client));
67-
66+
builders.Add(_services.AddHttpClient<IDefaultApi, DefaultApi>("Org.OpenAPITools.Api.IDefaultApi", client));
67+
6868
if (builder != null)
6969
foreach (IHttpClientBuilder instance in builders)
7070
builder(instance);
@@ -117,7 +117,7 @@ public HostConfiguration AddTokens<TTokenBase>(IEnumerable<TTokenBase> tokens) w
117117
/// <typeparam name="TTokenProvider"></typeparam>
118118
/// <typeparam name="TTokenBase"></typeparam>
119119
/// <returns></returns>
120-
public HostConfiguration UseProvider<TTokenProvider, TTokenBase>()
120+
public HostConfiguration UseProvider<TTokenProvider, TTokenBase>()
121121
where TTokenProvider : TokenProvider<TTokenBase>
122122
where TTokenBase : TokenBase
123123
{

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ public class HostConfiguration
3030
internal bool HttpClientsAdded { get; private set; }
3131

3232
/// <summary>
33-
/// Instantiates the class
33+
/// Instantiates the class
3434
/// </summary>
3535
/// <param name="services"></param>
3636
public HostConfiguration(IServiceCollection services)
@@ -63,8 +63,8 @@ public HostConfiguration AddApiHttpClients
6363

6464
List<IHttpClientBuilder> builders = new List<IHttpClientBuilder>();
6565

66-
builders.Add(_services.AddHttpClient<IDefaultApi, DefaultApi>(client));
67-
66+
builders.Add(_services.AddHttpClient<IDefaultApi, DefaultApi>("Org.OpenAPITools.Api.IDefaultApi", client));
67+
6868
if (builder != null)
6969
foreach (IHttpClientBuilder instance in builders)
7070
builder(instance);
@@ -117,7 +117,7 @@ public HostConfiguration AddTokens<TTokenBase>(IEnumerable<TTokenBase> tokens) w
117117
/// <typeparam name="TTokenProvider"></typeparam>
118118
/// <typeparam name="TTokenBase"></typeparam>
119119
/// <returns></returns>
120-
public HostConfiguration UseProvider<TTokenProvider, TTokenBase>()
120+
public HostConfiguration UseProvider<TTokenProvider, TTokenBase>()
121121
where TTokenProvider : TokenProvider<TTokenBase>
122122
where TTokenBase : TokenBase
123123
{

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

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ public class HostConfiguration
3030
internal bool HttpClientsAdded { get; private set; }
3131

3232
/// <summary>
33-
/// Instantiates the class
33+
/// Instantiates the class
3434
/// </summary>
3535
/// <param name="services"></param>
3636
public HostConfiguration(IServiceCollection services)
@@ -225,14 +225,14 @@ public HostConfiguration AddApiHttpClients
225225

226226
List<IHttpClientBuilder> builders = new List<IHttpClientBuilder>();
227227

228-
builders.Add(_services.AddHttpClient<IAnotherFakeApi, AnotherFakeApi>(client));
229-
builders.Add(_services.AddHttpClient<IDefaultApi, DefaultApi>(client));
230-
builders.Add(_services.AddHttpClient<IFakeApi, FakeApi>(client));
231-
builders.Add(_services.AddHttpClient<IFakeClassnameTags123Api, FakeClassnameTags123Api>(client));
232-
builders.Add(_services.AddHttpClient<IPetApi, PetApi>(client));
233-
builders.Add(_services.AddHttpClient<IStoreApi, StoreApi>(client));
234-
builders.Add(_services.AddHttpClient<IUserApi, UserApi>(client));
235-
228+
builders.Add(_services.AddHttpClient<IAnotherFakeApi, AnotherFakeApi>("Org.OpenAPITools.Api.IAnotherFakeApi", client));
229+
builders.Add(_services.AddHttpClient<IDefaultApi, DefaultApi>("Org.OpenAPITools.Api.IDefaultApi", client));
230+
builders.Add(_services.AddHttpClient<IFakeApi, FakeApi>("Org.OpenAPITools.Api.IFakeApi", client));
231+
builders.Add(_services.AddHttpClient<IFakeClassnameTags123Api, FakeClassnameTags123Api>("Org.OpenAPITools.Api.IFakeClassnameTags123Api", client));
232+
builders.Add(_services.AddHttpClient<IPetApi, PetApi>("Org.OpenAPITools.Api.IPetApi", client));
233+
builders.Add(_services.AddHttpClient<IStoreApi, StoreApi>("Org.OpenAPITools.Api.IStoreApi", client));
234+
builders.Add(_services.AddHttpClient<IUserApi, UserApi>("Org.OpenAPITools.Api.IUserApi", client));
235+
236236
if (builder != null)
237237
foreach (IHttpClientBuilder instance in builders)
238238
builder(instance);
@@ -285,7 +285,7 @@ public HostConfiguration AddTokens<TTokenBase>(IEnumerable<TTokenBase> tokens) w
285285
/// <typeparam name="TTokenProvider"></typeparam>
286286
/// <typeparam name="TTokenBase"></typeparam>
287287
/// <returns></returns>
288-
public HostConfiguration UseProvider<TTokenProvider, TTokenBase>()
288+
public HostConfiguration UseProvider<TTokenProvider, TTokenBase>()
289289
where TTokenProvider : TokenProvider<TTokenBase>
290290
where TTokenBase : TokenBase
291291
{

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ public class HostConfiguration
3030
internal bool HttpClientsAdded { get; private set; }
3131

3232
/// <summary>
33-
/// Instantiates the class
33+
/// Instantiates the class
3434
/// </summary>
3535
/// <param name="services"></param>
3636
public HostConfiguration(IServiceCollection services)
@@ -64,8 +64,8 @@ public HostConfiguration AddApiHttpClients
6464

6565
List<IHttpClientBuilder> builders = new List<IHttpClientBuilder>();
6666

67-
builders.Add(_services.AddHttpClient<IDefaultApi, DefaultApi>(client));
68-
67+
builders.Add(_services.AddHttpClient<IDefaultApi, DefaultApi>("Org.OpenAPITools.Api.IDefaultApi", client));
68+
6969
if (builder != null)
7070
foreach (IHttpClientBuilder instance in builders)
7171
builder(instance);
@@ -118,7 +118,7 @@ public HostConfiguration AddTokens<TTokenBase>(IEnumerable<TTokenBase> tokens) w
118118
/// <typeparam name="TTokenProvider"></typeparam>
119119
/// <typeparam name="TTokenBase"></typeparam>
120120
/// <returns></returns>
121-
public HostConfiguration UseProvider<TTokenProvider, TTokenBase>()
121+
public HostConfiguration UseProvider<TTokenProvider, TTokenBase>()
122122
where TTokenProvider : TokenProvider<TTokenBase>
123123
where TTokenBase : TokenBase
124124
{

‎samples/client/petstore/csharp/generichost/net4.7/Petstore/src/Org.OpenAPITools/Client/HostConfiguration.cs‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ public class HostConfiguration
3030
internal bool HttpClientsAdded { get; private set; }
3131

3232
/// <summary>
33-
/// Instantiates the class
33+
/// Instantiates the class
3434
/// </summary>
3535
/// <param name="services"></param>
3636
public HostConfiguration(IServiceCollection services)
@@ -177,14 +177,14 @@ public HostConfiguration AddApiHttpClients
177177

178178
List<IHttpClientBuilder> builders = new List<IHttpClientBuilder>();
179179

180-
builders.Add(_services.AddHttpClient<IAnotherFakeApi, AnotherFakeApi>(client));
181-
builders.Add(_services.AddHttpClient<IDefaultApi, DefaultApi>(client));
182-
builders.Add(_services.AddHttpClient<IFakeApi, FakeApi>(client));
183-
builders.Add(_services.AddHttpClient<IFakeClassnameTags123Api, FakeClassnameTags123Api>(client));
184-
builders.Add(_services.AddHttpClient<IPetApi, PetApi>(client));
185-
builders.Add(_services.AddHttpClient<IStoreApi, StoreApi>(client));
186-
builders.Add(_services.AddHttpClient<IUserApi, UserApi>(client));
187-
180+
builders.Add(_services.AddHttpClient<IAnotherFakeApi, AnotherFakeApi>("Org.OpenAPITools.Api.IAnotherFakeApi", client));
181+
builders.Add(_services.AddHttpClient<IDefaultApi, DefaultApi>("Org.OpenAPITools.Api.IDefaultApi", client));
182+
builders.Add(_services.AddHttpClient<IFakeApi, FakeApi>("Org.OpenAPITools.Api.IFakeApi", client));
183+
builders.Add(_services.AddHttpClient<IFakeClassnameTags123Api, FakeClassnameTags123Api>("Org.OpenAPITools.Api.IFakeClassnameTags123Api", client));
184+
builders.Add(_services.AddHttpClient<IPetApi, PetApi>("Org.OpenAPITools.Api.IPetApi", client));
185+
builders.Add(_services.AddHttpClient<IStoreApi, StoreApi>("Org.OpenAPITools.Api.IStoreApi", client));
186+
builders.Add(_services.AddHttpClient<IUserApi, UserApi>("Org.OpenAPITools.Api.IUserApi", client));
187+
188188
if (builder != null)
189189
foreach (IHttpClientBuilder instance in builders)
190190
builder(instance);
@@ -237,7 +237,7 @@ public HostConfiguration AddTokens<TTokenBase>(IEnumerable<TTokenBase> tokens) w
237237
/// <typeparam name="TTokenProvider"></typeparam>
238238
/// <typeparam name="TTokenBase"></typeparam>
239239
/// <returns></returns>
240-
public HostConfiguration UseProvider<TTokenProvider, TTokenBase>()
240+
public HostConfiguration UseProvider<TTokenProvider, TTokenBase>()
241241
where TTokenProvider : TokenProvider<TTokenBase>
242242
where TTokenBase : TokenBase
243243
{

0 commit comments

Comments
 (0)