Skip to content

Commit a4985ca

Browse files
McMlokMcMlok
authored
[csharp][generichost] Add HTTP client name to fix client duplicity (#22118)
* Add HTTP client name to fix client duplicity * Fix samples
1 parent 422e30a commit a4985ca

37 files changed

Lines changed: 117 additions & 117 deletions

File tree

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -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)

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@ public HostConfiguration AddApiHttpClients
6969

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

72-
builders.Add(_services.AddHttpClient<IDefaultApi, DefaultApi>(client));
72+
builders.Add(_services.AddHttpClient<IDefaultApi, DefaultApi>("Org.OpenAPITools.Api.IDefaultApi", client));
7373

7474
if (builder != null)
7575
foreach (IHttpClientBuilder instance in builders)

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@ public HostConfiguration AddApiHttpClients
6666

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

69-
builders.Add(_services.AddHttpClient<IDefaultApi, DefaultApi>(client));
69+
builders.Add(_services.AddHttpClient<IDefaultApi, DefaultApi>("Org.OpenAPITools.Api.IDefaultApi", client));
7070

7171
if (builder != null)
7272
foreach (IHttpClientBuilder instance in builders)

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -66,9 +66,9 @@ 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));
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));
7272

7373
if (builder != null)
7474
foreach (IHttpClientBuilder instance in builders)

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@ public HostConfiguration AddApiHttpClients
6363

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

66-
builders.Add(_services.AddHttpClient<IDefaultApi, DefaultApi>(client));
66+
builders.Add(_services.AddHttpClient<IDefaultApi, DefaultApi>("Org.OpenAPITools.Api.IDefaultApi", client));
6767

6868
if (builder != null)
6969
foreach (IHttpClientBuilder instance in builders)

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@ public HostConfiguration AddApiHttpClients
6363

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

66-
builders.Add(_services.AddHttpClient<IDefaultApi, DefaultApi>(client));
66+
builders.Add(_services.AddHttpClient<IDefaultApi, DefaultApi>("Org.OpenAPITools.Api.IDefaultApi", client));
6767

6868
if (builder != null)
6969
foreach (IHttpClientBuilder instance in builders)

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@ public HostConfiguration AddApiHttpClients
6363

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

66-
builders.Add(_services.AddHttpClient<IDefaultApi, DefaultApi>(client));
66+
builders.Add(_services.AddHttpClient<IDefaultApi, DefaultApi>("Org.OpenAPITools.Api.IDefaultApi", client));
6767

6868
if (builder != null)
6969
foreach (IHttpClientBuilder instance in builders)

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

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -227,13 +227,13 @@ public HostConfiguration AddApiHttpClients
227227

228228
List<IHttpClientBuilder> builders = new List<IHttpClientBuilder>();
229229

230-
builders.Add(_services.AddHttpClient<IAnotherFakeApi, AnotherFakeApi>(client));
231-
builders.Add(_services.AddHttpClient<IDefaultApi, DefaultApi>(client));
232-
builders.Add(_services.AddHttpClient<IFakeApi, FakeApi>(client));
233-
builders.Add(_services.AddHttpClient<IFakeClassnameTags123Api, FakeClassnameTags123Api>(client));
234-
builders.Add(_services.AddHttpClient<IPetApi, PetApi>(client));
235-
builders.Add(_services.AddHttpClient<IStoreApi, StoreApi>(client));
236-
builders.Add(_services.AddHttpClient<IUserApi, UserApi>(client));
230+
builders.Add(_services.AddHttpClient<IAnotherFakeApi, AnotherFakeApi>("Org.OpenAPITools.Api.IAnotherFakeApi", client));
231+
builders.Add(_services.AddHttpClient<IDefaultApi, DefaultApi>("Org.OpenAPITools.Api.IDefaultApi", client));
232+
builders.Add(_services.AddHttpClient<IFakeApi, FakeApi>("Org.OpenAPITools.Api.IFakeApi", client));
233+
builders.Add(_services.AddHttpClient<IFakeClassnameTags123Api, FakeClassnameTags123Api>("Org.OpenAPITools.Api.IFakeClassnameTags123Api", client));
234+
builders.Add(_services.AddHttpClient<IPetApi, PetApi>("Org.OpenAPITools.Api.IPetApi", client));
235+
builders.Add(_services.AddHttpClient<IStoreApi, StoreApi>("Org.OpenAPITools.Api.IStoreApi", client));
236+
builders.Add(_services.AddHttpClient<IUserApi, UserApi>("Org.OpenAPITools.Api.IUserApi", client));
237237

238238
if (builder != null)
239239
foreach (IHttpClientBuilder instance in builders)

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@ public HostConfiguration AddApiHttpClients
6464

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

67-
builders.Add(_services.AddHttpClient<IDefaultApi, DefaultApi>(client));
67+
builders.Add(_services.AddHttpClient<IDefaultApi, DefaultApi>("Org.OpenAPITools.Api.IDefaultApi", client));
6868

6969
if (builder != null)
7070
foreach (IHttpClientBuilder instance in builders)

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

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -177,13 +177,13 @@ 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));
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));
187187

188188
if (builder != null)
189189
foreach (IHttpClientBuilder instance in builders)

0 commit comments

Comments
 (0)