From ceb48d3af4ca5916e02ffc070cbb9d19fca79809 Mon Sep 17 00:00:00 2001 From: devhl-labs Date: Tue, 11 Jul 2023 02:01:45 -0400 Subject: [PATCH] removed IApi namespace (#16058) --- .../libraries/generichost/ApiFactory.mustache | 6 +- .../DependencyInjectionTests.mustache | 10 ++-- .../generichost/HostConfiguration.mustache | 1 - .../libraries/generichost/IApi.mustache | 2 +- .../csharp/libraries/generichost/api.mustache | 7 +-- .../libraries/generichost/api_test.mustache | 6 +- .../Api/AnotherFakeApiTests.cs | 6 +- .../Api/DefaultApiTests.cs | 6 +- .../Api/DependencyInjectionTests.cs | 58 +++++++++---------- .../Org.OpenAPITools.Test/Api/FakeApiTests.cs | 6 +- .../Api/FakeClassnameTags123ApiTests.cs | 6 +- .../Org.OpenAPITools.Test/Api/PetApiTests.cs | 6 +- .../Api/StoreApiTests.cs | 6 +- .../Org.OpenAPITools.Test/Api/UserApiTests.cs | 6 +- .../Org.OpenAPITools/Api/AnotherFakeApi.cs | 7 +-- .../src/Org.OpenAPITools/Api/DefaultApi.cs | 7 +-- .../src/Org.OpenAPITools/Api/FakeApi.cs | 7 +-- .../Api/FakeClassnameTags123Api.cs | 7 +-- .../src/Org.OpenAPITools/Api/IApi.cs | 2 +- .../src/Org.OpenAPITools/Api/PetApi.cs | 7 +-- .../src/Org.OpenAPITools/Api/StoreApi.cs | 7 +-- .../src/Org.OpenAPITools/Api/UserApi.cs | 7 +-- .../src/Org.OpenAPITools/Client/ApiFactory.cs | 6 +- .../Client/HostConfiguration.cs | 1 - .../Api/AnotherFakeApiTests.cs | 6 +- .../Api/DefaultApiTests.cs | 6 +- .../Api/DependencyInjectionTests.cs | 58 +++++++++---------- .../Org.OpenAPITools.Test/Api/FakeApiTests.cs | 6 +- .../Api/FakeClassnameTags123ApiTests.cs | 6 +- .../Org.OpenAPITools.Test/Api/PetApiTests.cs | 6 +- .../Api/StoreApiTests.cs | 6 +- .../Org.OpenAPITools.Test/Api/UserApiTests.cs | 6 +- .../Org.OpenAPITools/Api/AnotherFakeApi.cs | 7 +-- .../src/Org.OpenAPITools/Api/DefaultApi.cs | 7 +-- .../src/Org.OpenAPITools/Api/FakeApi.cs | 7 +-- .../Api/FakeClassnameTags123Api.cs | 7 +-- .../src/Org.OpenAPITools/Api/IApi.cs | 2 +- .../src/Org.OpenAPITools/Api/PetApi.cs | 7 +-- .../src/Org.OpenAPITools/Api/StoreApi.cs | 7 +-- .../src/Org.OpenAPITools/Api/UserApi.cs | 7 +-- .../src/Org.OpenAPITools/Client/ApiFactory.cs | 6 +- .../Client/HostConfiguration.cs | 1 - .../Api/DefaultApiTests.cs | 6 +- .../Api/DependencyInjectionTests.cs | 10 ++-- .../src/Org.OpenAPITools/Api/DefaultApi.cs | 7 +-- .../src/Org.OpenAPITools/Api/IApi.cs | 2 +- .../src/Org.OpenAPITools/Client/ApiFactory.cs | 6 +- .../Client/HostConfiguration.cs | 1 - .../Api/DefaultApiTests.cs | 6 +- .../Api/DependencyInjectionTests.cs | 10 ++-- .../src/Org.OpenAPITools/Api/DefaultApi.cs | 7 +-- .../src/Org.OpenAPITools/Api/IApi.cs | 2 +- .../src/Org.OpenAPITools/Client/ApiFactory.cs | 6 +- .../Client/HostConfiguration.cs | 1 - .../Api/DefaultApiTests.cs | 6 +- .../Api/DependencyInjectionTests.cs | 10 ++-- .../src/Org.OpenAPITools/Api/DefaultApi.cs | 7 +-- .../src/Org.OpenAPITools/Api/IApi.cs | 2 +- .../src/Org.OpenAPITools/Client/ApiFactory.cs | 6 +- .../Client/HostConfiguration.cs | 1 - .../Api/AnotherFakeApiTests.cs | 6 +- .../Api/DefaultApiTests.cs | 6 +- .../Api/DependencyInjectionTests.cs | 58 +++++++++---------- .../Org.OpenAPITools.Test/Api/FakeApiTests.cs | 6 +- .../Api/FakeClassnameTags123ApiTests.cs | 6 +- .../Org.OpenAPITools.Test/Api/PetApiTests.cs | 6 +- .../Api/StoreApiTests.cs | 6 +- .../Org.OpenAPITools.Test/Api/UserApiTests.cs | 6 +- .../Org.OpenAPITools/Api/AnotherFakeApi.cs | 7 +-- .../src/Org.OpenAPITools/Api/DefaultApi.cs | 7 +-- .../src/Org.OpenAPITools/Api/FakeApi.cs | 7 +-- .../Api/FakeClassnameTags123Api.cs | 7 +-- .../src/Org.OpenAPITools/Api/IApi.cs | 2 +- .../src/Org.OpenAPITools/Api/PetApi.cs | 7 +-- .../src/Org.OpenAPITools/Api/StoreApi.cs | 7 +-- .../src/Org.OpenAPITools/Api/UserApi.cs | 7 +-- .../src/Org.OpenAPITools/Client/ApiFactory.cs | 6 +- .../Client/HostConfiguration.cs | 1 - 78 files changed, 260 insertions(+), 342 deletions(-) diff --git a/modules/openapi-generator/src/main/resources/csharp/libraries/generichost/ApiFactory.mustache b/modules/openapi-generator/src/main/resources/csharp/libraries/generichost/ApiFactory.mustache index f3329b0c7a7..a445d216921 100644 --- a/modules/openapi-generator/src/main/resources/csharp/libraries/generichost/ApiFactory.mustache +++ b/modules/openapi-generator/src/main/resources/csharp/libraries/generichost/ApiFactory.mustache @@ -1,6 +1,6 @@ using System; using Microsoft.Extensions.DependencyInjection; - +using {{packageName}}.{{apiPackage}}; namespace {{packageName}}.{{clientPackage}} { @@ -14,7 +14,7 @@ namespace {{packageName}}.{{clientPackage}} /// /// /// - IResult Create() where IResult : {{interfacePrefix}}{{apiPackage}}.IApi; + IResult Create() where IResult : IApi; } /// @@ -41,7 +41,7 @@ namespace {{packageName}}.{{clientPackage}} /// /// /// - public IResult Create() where IResult : {{interfacePrefix}}{{apiPackage}}.IApi + public IResult Create() where IResult : IApi { return Services.GetRequiredService(); } diff --git a/modules/openapi-generator/src/main/resources/csharp/libraries/generichost/DependencyInjectionTests.mustache b/modules/openapi-generator/src/main/resources/csharp/libraries/generichost/DependencyInjectionTests.mustache index 57d3cc86705..bdee56df281 100644 --- a/modules/openapi-generator/src/main/resources/csharp/libraries/generichost/DependencyInjectionTests.mustache +++ b/modules/openapi-generator/src/main/resources/csharp/libraries/generichost/DependencyInjectionTests.mustache @@ -5,7 +5,7 @@ using Microsoft.Extensions.DependencyInjection; using System.Collections.Generic; using System.Security.Cryptography; using {{packageName}}.{{clientPackage}}; -using {{packageName}}.{{interfacePrefix}}{{apiPackage}}; +using {{packageName}}.{{apiPackage}}; using {{packageName}}.Extensions; using Xunit; @@ -114,7 +114,7 @@ namespace {{packageName}}.Test.{{apiPackage}} [Fact] public void ConfigureApiWithAClientTest() { - {{#apiInfo}}{{#apis}}var {{#lambda.camelcase}}{{classname}}{{/lambda.camelcase}} = _hostUsingConfigureWithAClient.Services.GetRequiredService<{{interfacePrefix}}{{apiPackage}}.{{interfacePrefix}}{{classname}}>(); + {{#apiInfo}}{{#apis}}var {{#lambda.camelcase}}{{classname}}{{/lambda.camelcase}} = _hostUsingConfigureWithAClient.Services.GetRequiredService<{{interfacePrefix}}{{classname}}>(); Assert.True({{#lambda.camelcase}}{{classname}}{{/lambda.camelcase}}.HttpClient.BaseAddress != null);{{^-last}} {{/-last}}{{/apis}}{{/apiInfo}} @@ -126,7 +126,7 @@ namespace {{packageName}}.Test.{{apiPackage}} [Fact] public void ConfigureApiWithoutAClientTest() { - {{#apiInfo}}{{#apis}}var {{#lambda.camelcase}}{{classname}}{{/lambda.camelcase}} = _hostUsingConfigureWithoutAClient.Services.GetRequiredService<{{interfacePrefix}}{{apiPackage}}.{{interfacePrefix}}{{classname}}>(); + {{#apiInfo}}{{#apis}}var {{#lambda.camelcase}}{{classname}}{{/lambda.camelcase}} = _hostUsingConfigureWithoutAClient.Services.GetRequiredService<{{interfacePrefix}}{{classname}}>(); Assert.True({{#lambda.camelcase}}{{classname}}{{/lambda.camelcase}}.HttpClient.BaseAddress != null);{{^-last}} {{/-last}}{{/apis}}{{/apiInfo}} @@ -138,7 +138,7 @@ namespace {{packageName}}.Test.{{apiPackage}} [Fact] public void AddApiWithAClientTest() { - {{#apiInfo}}{{#apis}}var {{#lambda.camelcase}}{{classname}}{{/lambda.camelcase}} = _hostUsingAddWithAClient.Services.GetRequiredService<{{interfacePrefix}}{{apiPackage}}.{{interfacePrefix}}{{classname}}>(); + {{#apiInfo}}{{#apis}}var {{#lambda.camelcase}}{{classname}}{{/lambda.camelcase}} = _hostUsingAddWithAClient.Services.GetRequiredService<{{interfacePrefix}}{{classname}}>(); Assert.True({{#lambda.camelcase}}{{classname}}{{/lambda.camelcase}}.HttpClient.BaseAddress != null);{{^-last}} {{/-last}}{{/apis}}{{/apiInfo}} @@ -150,7 +150,7 @@ namespace {{packageName}}.Test.{{apiPackage}} [Fact] public void AddApiWithoutAClientTest() { - {{#apiInfo}}{{#apis}}var {{#lambda.camelcase}}{{classname}}{{/lambda.camelcase}} = _hostUsingAddWithoutAClient.Services.GetRequiredService<{{interfacePrefix}}{{apiPackage}}.{{interfacePrefix}}{{classname}}>(); + {{#apiInfo}}{{#apis}}var {{#lambda.camelcase}}{{classname}}{{/lambda.camelcase}} = _hostUsingAddWithoutAClient.Services.GetRequiredService<{{interfacePrefix}}{{classname}}>(); Assert.True({{#lambda.camelcase}}{{classname}}{{/lambda.camelcase}}.HttpClient.BaseAddress != null);{{^-last}} {{/-last}}{{/apis}}{{/apiInfo}} diff --git a/modules/openapi-generator/src/main/resources/csharp/libraries/generichost/HostConfiguration.mustache b/modules/openapi-generator/src/main/resources/csharp/libraries/generichost/HostConfiguration.mustache index ec0a819fb75..3f00411d422 100644 --- a/modules/openapi-generator/src/main/resources/csharp/libraries/generichost/HostConfiguration.mustache +++ b/modules/openapi-generator/src/main/resources/csharp/libraries/generichost/HostConfiguration.mustache @@ -11,7 +11,6 @@ using System.Text.Json.Serialization; using System.Net.Http; using Microsoft.Extensions.DependencyInjection; using {{packageName}}.{{apiPackage}}; -using {{packageName}}.{{interfacePrefix}}{{apiPackage}}; using {{packageName}}.{{modelPackage}}; namespace {{packageName}}.{{clientPackage}} diff --git a/modules/openapi-generator/src/main/resources/csharp/libraries/generichost/IApi.mustache b/modules/openapi-generator/src/main/resources/csharp/libraries/generichost/IApi.mustache index 0adffa75098..af31cffe929 100644 --- a/modules/openapi-generator/src/main/resources/csharp/libraries/generichost/IApi.mustache +++ b/modules/openapi-generator/src/main/resources/csharp/libraries/generichost/IApi.mustache @@ -1,6 +1,6 @@ using System.Net.Http; -namespace {{packageName}}.{{interfacePrefix}}{{apiPackage}} +namespace {{packageName}}.{{apiPackage}} { /// /// Any Api client diff --git a/modules/openapi-generator/src/main/resources/csharp/libraries/generichost/api.mustache b/modules/openapi-generator/src/main/resources/csharp/libraries/generichost/api.mustache index f101c1afe1b..b6e0a636968 100644 --- a/modules/openapi-generator/src/main/resources/csharp/libraries/generichost/api.mustache +++ b/modules/openapi-generator/src/main/resources/csharp/libraries/generichost/api.mustache @@ -18,7 +18,7 @@ using {{packageName}}.{{apiPackage}}; using {{packageName}}.{{modelPackage}}; {{/hasImport}} -namespace {{packageName}}.{{interfacePrefix}}{{apiPackage}} +namespace {{packageName}}.{{apiPackage}} { {{#operations}} /// @@ -64,10 +64,7 @@ namespace {{packageName}}.{{interfacePrefix}}{{apiPackage}} {{/-last}} {{/operation}} } -} -namespace {{packageName}}.{{apiPackage}} -{ /// /// Represents a collection of functions to interact with the API endpoints /// This class is registered as transient. @@ -103,7 +100,7 @@ namespace {{packageName}}.{{apiPackage}} /// /// Represents a collection of functions to interact with the API endpoints /// - {{>visibility}} sealed partial class {{classname}} : {{interfacePrefix}}{{apiPackage}}.{{interfacePrefix}}{{classname}} + {{>visibility}} sealed partial class {{classname}} : {{interfacePrefix}}{{classname}} { private JsonSerializerOptions _jsonSerializerOptions; diff --git a/modules/openapi-generator/src/main/resources/csharp/libraries/generichost/api_test.mustache b/modules/openapi-generator/src/main/resources/csharp/libraries/generichost/api_test.mustache index 551bf2757af..a3f7a0c2432 100644 --- a/modules/openapi-generator/src/main/resources/csharp/libraries/generichost/api_test.mustache +++ b/modules/openapi-generator/src/main/resources/csharp/libraries/generichost/api_test.mustache @@ -4,7 +4,7 @@ using System.Collections.Generic; using System.Threading.Tasks; using Xunit; using Microsoft.Extensions.DependencyInjection; -using {{packageName}}.{{interfacePrefix}}{{apiPackage}};{{#hasImport}} +using {{packageName}}.{{apiPackage}};{{#hasImport}} using {{packageName}}.{{modelPackage}};{{/hasImport}} @@ -18,11 +18,11 @@ namespace {{packageName}}.Test.{{apiPackage}} /// public sealed class {{classname}}Tests : ApiTestsBase { - private readonly {{interfacePrefix}}{{apiPackage}}.{{interfacePrefix}}{{classname}} _instance; + private readonly {{interfacePrefix}}{{classname}} _instance; public {{classname}}Tests(): base(Array.Empty()) { - _instance = _host.Services.GetRequiredService<{{interfacePrefix}}{{apiPackage}}.{{interfacePrefix}}{{classname}}>(); + _instance = _host.Services.GetRequiredService<{{interfacePrefix}}{{classname}}>(); } {{#operations}} {{#operation}} diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools.Test/Api/AnotherFakeApiTests.cs b/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools.Test/Api/AnotherFakeApiTests.cs index 9b3d7132dcc..f40c0c63061 100644 --- a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools.Test/Api/AnotherFakeApiTests.cs +++ b/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools.Test/Api/AnotherFakeApiTests.cs @@ -12,7 +12,7 @@ using System.Collections.Generic; using System.Threading.Tasks; using Xunit; using Microsoft.Extensions.DependencyInjection; -using Org.OpenAPITools.IApi; +using Org.OpenAPITools.Api; using Org.OpenAPITools.Model; @@ -43,11 +43,11 @@ namespace Org.OpenAPITools.Test.Api /// public sealed class AnotherFakeApiTests : ApiTestsBase { - private readonly IApi.IAnotherFakeApi _instance; + private readonly IAnotherFakeApi _instance; public AnotherFakeApiTests(): base(Array.Empty()) { - _instance = _host.Services.GetRequiredService(); + _instance = _host.Services.GetRequiredService(); } /// diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools.Test/Api/DefaultApiTests.cs b/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools.Test/Api/DefaultApiTests.cs index 6861aa2a227..a671d79a474 100644 --- a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools.Test/Api/DefaultApiTests.cs +++ b/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools.Test/Api/DefaultApiTests.cs @@ -12,7 +12,7 @@ using System.Collections.Generic; using System.Threading.Tasks; using Xunit; using Microsoft.Extensions.DependencyInjection; -using Org.OpenAPITools.IApi; +using Org.OpenAPITools.Api; using Org.OpenAPITools.Model; @@ -43,11 +43,11 @@ namespace Org.OpenAPITools.Test.Api /// public sealed class DefaultApiTests : ApiTestsBase { - private readonly IApi.IDefaultApi _instance; + private readonly IDefaultApi _instance; public DefaultApiTests(): base(Array.Empty()) { - _instance = _host.Services.GetRequiredService(); + _instance = _host.Services.GetRequiredService(); } /// diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools.Test/Api/DependencyInjectionTests.cs b/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools.Test/Api/DependencyInjectionTests.cs index 256df5697c9..5ad1cd420f9 100644 --- a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools.Test/Api/DependencyInjectionTests.cs +++ b/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools.Test/Api/DependencyInjectionTests.cs @@ -13,7 +13,7 @@ using Microsoft.Extensions.DependencyInjection; using System.Collections.Generic; using System.Security.Cryptography; using Org.OpenAPITools.Client; -using Org.OpenAPITools.IApi; +using Org.OpenAPITools.Api; using Org.OpenAPITools.Extensions; using Xunit; @@ -122,25 +122,25 @@ namespace Org.OpenAPITools.Test.Api [Fact] public void ConfigureApiWithAClientTest() { - var anotherFakeApi = _hostUsingConfigureWithAClient.Services.GetRequiredService(); + var anotherFakeApi = _hostUsingConfigureWithAClient.Services.GetRequiredService(); Assert.True(anotherFakeApi.HttpClient.BaseAddress != null); - var defaultApi = _hostUsingConfigureWithAClient.Services.GetRequiredService(); + var defaultApi = _hostUsingConfigureWithAClient.Services.GetRequiredService(); Assert.True(defaultApi.HttpClient.BaseAddress != null); - var fakeApi = _hostUsingConfigureWithAClient.Services.GetRequiredService(); + var fakeApi = _hostUsingConfigureWithAClient.Services.GetRequiredService(); Assert.True(fakeApi.HttpClient.BaseAddress != null); - var fakeClassnameTags123Api = _hostUsingConfigureWithAClient.Services.GetRequiredService(); + var fakeClassnameTags123Api = _hostUsingConfigureWithAClient.Services.GetRequiredService(); Assert.True(fakeClassnameTags123Api.HttpClient.BaseAddress != null); - var petApi = _hostUsingConfigureWithAClient.Services.GetRequiredService(); + var petApi = _hostUsingConfigureWithAClient.Services.GetRequiredService(); Assert.True(petApi.HttpClient.BaseAddress != null); - var storeApi = _hostUsingConfigureWithAClient.Services.GetRequiredService(); + var storeApi = _hostUsingConfigureWithAClient.Services.GetRequiredService(); Assert.True(storeApi.HttpClient.BaseAddress != null); - var userApi = _hostUsingConfigureWithAClient.Services.GetRequiredService(); + var userApi = _hostUsingConfigureWithAClient.Services.GetRequiredService(); Assert.True(userApi.HttpClient.BaseAddress != null); } @@ -150,25 +150,25 @@ namespace Org.OpenAPITools.Test.Api [Fact] public void ConfigureApiWithoutAClientTest() { - var anotherFakeApi = _hostUsingConfigureWithoutAClient.Services.GetRequiredService(); + var anotherFakeApi = _hostUsingConfigureWithoutAClient.Services.GetRequiredService(); Assert.True(anotherFakeApi.HttpClient.BaseAddress != null); - var defaultApi = _hostUsingConfigureWithoutAClient.Services.GetRequiredService(); + var defaultApi = _hostUsingConfigureWithoutAClient.Services.GetRequiredService(); Assert.True(defaultApi.HttpClient.BaseAddress != null); - var fakeApi = _hostUsingConfigureWithoutAClient.Services.GetRequiredService(); + var fakeApi = _hostUsingConfigureWithoutAClient.Services.GetRequiredService(); Assert.True(fakeApi.HttpClient.BaseAddress != null); - var fakeClassnameTags123Api = _hostUsingConfigureWithoutAClient.Services.GetRequiredService(); + var fakeClassnameTags123Api = _hostUsingConfigureWithoutAClient.Services.GetRequiredService(); Assert.True(fakeClassnameTags123Api.HttpClient.BaseAddress != null); - var petApi = _hostUsingConfigureWithoutAClient.Services.GetRequiredService(); + var petApi = _hostUsingConfigureWithoutAClient.Services.GetRequiredService(); Assert.True(petApi.HttpClient.BaseAddress != null); - var storeApi = _hostUsingConfigureWithoutAClient.Services.GetRequiredService(); + var storeApi = _hostUsingConfigureWithoutAClient.Services.GetRequiredService(); Assert.True(storeApi.HttpClient.BaseAddress != null); - var userApi = _hostUsingConfigureWithoutAClient.Services.GetRequiredService(); + var userApi = _hostUsingConfigureWithoutAClient.Services.GetRequiredService(); Assert.True(userApi.HttpClient.BaseAddress != null); } @@ -178,25 +178,25 @@ namespace Org.OpenAPITools.Test.Api [Fact] public void AddApiWithAClientTest() { - var anotherFakeApi = _hostUsingAddWithAClient.Services.GetRequiredService(); + var anotherFakeApi = _hostUsingAddWithAClient.Services.GetRequiredService(); Assert.True(anotherFakeApi.HttpClient.BaseAddress != null); - var defaultApi = _hostUsingAddWithAClient.Services.GetRequiredService(); + var defaultApi = _hostUsingAddWithAClient.Services.GetRequiredService(); Assert.True(defaultApi.HttpClient.BaseAddress != null); - var fakeApi = _hostUsingAddWithAClient.Services.GetRequiredService(); + var fakeApi = _hostUsingAddWithAClient.Services.GetRequiredService(); Assert.True(fakeApi.HttpClient.BaseAddress != null); - var fakeClassnameTags123Api = _hostUsingAddWithAClient.Services.GetRequiredService(); + var fakeClassnameTags123Api = _hostUsingAddWithAClient.Services.GetRequiredService(); Assert.True(fakeClassnameTags123Api.HttpClient.BaseAddress != null); - var petApi = _hostUsingAddWithAClient.Services.GetRequiredService(); + var petApi = _hostUsingAddWithAClient.Services.GetRequiredService(); Assert.True(petApi.HttpClient.BaseAddress != null); - var storeApi = _hostUsingAddWithAClient.Services.GetRequiredService(); + var storeApi = _hostUsingAddWithAClient.Services.GetRequiredService(); Assert.True(storeApi.HttpClient.BaseAddress != null); - var userApi = _hostUsingAddWithAClient.Services.GetRequiredService(); + var userApi = _hostUsingAddWithAClient.Services.GetRequiredService(); Assert.True(userApi.HttpClient.BaseAddress != null); } @@ -206,25 +206,25 @@ namespace Org.OpenAPITools.Test.Api [Fact] public void AddApiWithoutAClientTest() { - var anotherFakeApi = _hostUsingAddWithoutAClient.Services.GetRequiredService(); + var anotherFakeApi = _hostUsingAddWithoutAClient.Services.GetRequiredService(); Assert.True(anotherFakeApi.HttpClient.BaseAddress != null); - var defaultApi = _hostUsingAddWithoutAClient.Services.GetRequiredService(); + var defaultApi = _hostUsingAddWithoutAClient.Services.GetRequiredService(); Assert.True(defaultApi.HttpClient.BaseAddress != null); - var fakeApi = _hostUsingAddWithoutAClient.Services.GetRequiredService(); + var fakeApi = _hostUsingAddWithoutAClient.Services.GetRequiredService(); Assert.True(fakeApi.HttpClient.BaseAddress != null); - var fakeClassnameTags123Api = _hostUsingAddWithoutAClient.Services.GetRequiredService(); + var fakeClassnameTags123Api = _hostUsingAddWithoutAClient.Services.GetRequiredService(); Assert.True(fakeClassnameTags123Api.HttpClient.BaseAddress != null); - var petApi = _hostUsingAddWithoutAClient.Services.GetRequiredService(); + var petApi = _hostUsingAddWithoutAClient.Services.GetRequiredService(); Assert.True(petApi.HttpClient.BaseAddress != null); - var storeApi = _hostUsingAddWithoutAClient.Services.GetRequiredService(); + var storeApi = _hostUsingAddWithoutAClient.Services.GetRequiredService(); Assert.True(storeApi.HttpClient.BaseAddress != null); - var userApi = _hostUsingAddWithoutAClient.Services.GetRequiredService(); + var userApi = _hostUsingAddWithoutAClient.Services.GetRequiredService(); Assert.True(userApi.HttpClient.BaseAddress != null); } } diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools.Test/Api/FakeApiTests.cs b/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools.Test/Api/FakeApiTests.cs index be1d929d1dd..614b8aff4e0 100644 --- a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools.Test/Api/FakeApiTests.cs +++ b/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools.Test/Api/FakeApiTests.cs @@ -12,7 +12,7 @@ using System.Collections.Generic; using System.Threading.Tasks; using Xunit; using Microsoft.Extensions.DependencyInjection; -using Org.OpenAPITools.IApi; +using Org.OpenAPITools.Api; using Org.OpenAPITools.Model; @@ -43,11 +43,11 @@ namespace Org.OpenAPITools.Test.Api /// public sealed class FakeApiTests : ApiTestsBase { - private readonly IApi.IFakeApi _instance; + private readonly IFakeApi _instance; public FakeApiTests(): base(Array.Empty()) { - _instance = _host.Services.GetRequiredService(); + _instance = _host.Services.GetRequiredService(); } /// diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools.Test/Api/FakeClassnameTags123ApiTests.cs b/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools.Test/Api/FakeClassnameTags123ApiTests.cs index 3f4cc38d494..4869c33576e 100644 --- a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools.Test/Api/FakeClassnameTags123ApiTests.cs +++ b/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools.Test/Api/FakeClassnameTags123ApiTests.cs @@ -12,7 +12,7 @@ using System.Collections.Generic; using System.Threading.Tasks; using Xunit; using Microsoft.Extensions.DependencyInjection; -using Org.OpenAPITools.IApi; +using Org.OpenAPITools.Api; using Org.OpenAPITools.Model; @@ -43,11 +43,11 @@ namespace Org.OpenAPITools.Test.Api /// public sealed class FakeClassnameTags123ApiTests : ApiTestsBase { - private readonly IApi.IFakeClassnameTags123Api _instance; + private readonly IFakeClassnameTags123Api _instance; public FakeClassnameTags123ApiTests(): base(Array.Empty()) { - _instance = _host.Services.GetRequiredService(); + _instance = _host.Services.GetRequiredService(); } /// diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools.Test/Api/PetApiTests.cs b/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools.Test/Api/PetApiTests.cs index 4d9e0a32d2c..d137380a2be 100644 --- a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools.Test/Api/PetApiTests.cs +++ b/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools.Test/Api/PetApiTests.cs @@ -12,7 +12,7 @@ using System.Collections.Generic; using System.Threading.Tasks; using Xunit; using Microsoft.Extensions.DependencyInjection; -using Org.OpenAPITools.IApi; +using Org.OpenAPITools.Api; using Org.OpenAPITools.Model; @@ -43,11 +43,11 @@ namespace Org.OpenAPITools.Test.Api /// public sealed class PetApiTests : ApiTestsBase { - private readonly IApi.IPetApi _instance; + private readonly IPetApi _instance; public PetApiTests(): base(Array.Empty()) { - _instance = _host.Services.GetRequiredService(); + _instance = _host.Services.GetRequiredService(); } /// diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools.Test/Api/StoreApiTests.cs b/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools.Test/Api/StoreApiTests.cs index 78943a47a02..456aeb0d6dd 100644 --- a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools.Test/Api/StoreApiTests.cs +++ b/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools.Test/Api/StoreApiTests.cs @@ -12,7 +12,7 @@ using System.Collections.Generic; using System.Threading.Tasks; using Xunit; using Microsoft.Extensions.DependencyInjection; -using Org.OpenAPITools.IApi; +using Org.OpenAPITools.Api; using Org.OpenAPITools.Model; @@ -43,11 +43,11 @@ namespace Org.OpenAPITools.Test.Api /// public sealed class StoreApiTests : ApiTestsBase { - private readonly IApi.IStoreApi _instance; + private readonly IStoreApi _instance; public StoreApiTests(): base(Array.Empty()) { - _instance = _host.Services.GetRequiredService(); + _instance = _host.Services.GetRequiredService(); } /// diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools.Test/Api/UserApiTests.cs b/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools.Test/Api/UserApiTests.cs index b17385d0209..acdd4d7915d 100644 --- a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools.Test/Api/UserApiTests.cs +++ b/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools.Test/Api/UserApiTests.cs @@ -12,7 +12,7 @@ using System.Collections.Generic; using System.Threading.Tasks; using Xunit; using Microsoft.Extensions.DependencyInjection; -using Org.OpenAPITools.IApi; +using Org.OpenAPITools.Api; using Org.OpenAPITools.Model; @@ -43,11 +43,11 @@ namespace Org.OpenAPITools.Test.Api /// public sealed class UserApiTests : ApiTestsBase { - private readonly IApi.IUserApi _instance; + private readonly IUserApi _instance; public UserApiTests(): base(Array.Empty()) { - _instance = _host.Services.GetRequiredService(); + _instance = _host.Services.GetRequiredService(); } /// diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Api/AnotherFakeApi.cs b/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Api/AnotherFakeApi.cs index 695312bf4d1..17f490b8701 100644 --- a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Api/AnotherFakeApi.cs +++ b/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Api/AnotherFakeApi.cs @@ -22,7 +22,7 @@ using Org.OpenAPITools.Client; using Org.OpenAPITools.Api; using Org.OpenAPITools.Model; -namespace Org.OpenAPITools.IApi +namespace Org.OpenAPITools.Api { /// /// Represents a collection of functions to interact with the API endpoints @@ -58,10 +58,7 @@ namespace Org.OpenAPITools.IApi /// Task<ApiResponse>ModelClient>?> Task?> Call123TestSpecialTagsOrDefaultAsync(ModelClient modelClient, System.Threading.CancellationToken cancellationToken = default); } -} -namespace Org.OpenAPITools.Api -{ /// /// Represents a collection of functions to interact with the API endpoints /// This class is registered as transient. @@ -92,7 +89,7 @@ namespace Org.OpenAPITools.Api /// /// Represents a collection of functions to interact with the API endpoints /// - public sealed partial class AnotherFakeApi : IApi.IAnotherFakeApi + public sealed partial class AnotherFakeApi : IAnotherFakeApi { private JsonSerializerOptions _jsonSerializerOptions; diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Api/DefaultApi.cs b/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Api/DefaultApi.cs index 91831f2632e..7f4b994c9b1 100644 --- a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Api/DefaultApi.cs +++ b/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Api/DefaultApi.cs @@ -22,7 +22,7 @@ using Org.OpenAPITools.Client; using Org.OpenAPITools.Api; using Org.OpenAPITools.Model; -namespace Org.OpenAPITools.IApi +namespace Org.OpenAPITools.Api { /// /// Represents a collection of functions to interact with the API endpoints @@ -100,10 +100,7 @@ namespace Org.OpenAPITools.IApi /// Task<ApiResponse>List<Guid>>?> Task>?> HelloOrDefaultAsync(System.Threading.CancellationToken cancellationToken = default); } -} -namespace Org.OpenAPITools.Api -{ /// /// Represents a collection of functions to interact with the API endpoints /// This class is registered as transient. @@ -174,7 +171,7 @@ namespace Org.OpenAPITools.Api /// /// Represents a collection of functions to interact with the API endpoints /// - public sealed partial class DefaultApi : IApi.IDefaultApi + public sealed partial class DefaultApi : IDefaultApi { private JsonSerializerOptions _jsonSerializerOptions; diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Api/FakeApi.cs b/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Api/FakeApi.cs index 4334c856bb0..49359123e35 100644 --- a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Api/FakeApi.cs +++ b/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Api/FakeApi.cs @@ -22,7 +22,7 @@ using Org.OpenAPITools.Client; using Org.OpenAPITools.Api; using Org.OpenAPITools.Model; -namespace Org.OpenAPITools.IApi +namespace Org.OpenAPITools.Api { /// /// Represents a collection of functions to interact with the API endpoints @@ -448,10 +448,7 @@ namespace Org.OpenAPITools.IApi /// Task<ApiResponse>object>?> Task?> TestQueryParameterCollectionFormatOrDefaultAsync(List pipe, List ioutil, List http, List url, List context, string requiredNotNullable, string? requiredNullable = default, Option notRequiredNotNullable = default, Option notRequiredNullable = default, System.Threading.CancellationToken cancellationToken = default); } -} -namespace Org.OpenAPITools.Api -{ /// /// Represents a collection of functions to interact with the API endpoints /// This class is registered as transient. @@ -762,7 +759,7 @@ namespace Org.OpenAPITools.Api /// /// Represents a collection of functions to interact with the API endpoints /// - public sealed partial class FakeApi : IApi.IFakeApi + public sealed partial class FakeApi : IFakeApi { private JsonSerializerOptions _jsonSerializerOptions; diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Api/FakeClassnameTags123Api.cs b/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Api/FakeClassnameTags123Api.cs index 8ce783a3320..15aa3daba40 100644 --- a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Api/FakeClassnameTags123Api.cs +++ b/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Api/FakeClassnameTags123Api.cs @@ -22,7 +22,7 @@ using Org.OpenAPITools.Client; using Org.OpenAPITools.Api; using Org.OpenAPITools.Model; -namespace Org.OpenAPITools.IApi +namespace Org.OpenAPITools.Api { /// /// Represents a collection of functions to interact with the API endpoints @@ -58,10 +58,7 @@ namespace Org.OpenAPITools.IApi /// Task<ApiResponse>ModelClient>?> Task?> TestClassnameOrDefaultAsync(ModelClient modelClient, System.Threading.CancellationToken cancellationToken = default); } -} -namespace Org.OpenAPITools.Api -{ /// /// Represents a collection of functions to interact with the API endpoints /// This class is registered as transient. @@ -92,7 +89,7 @@ namespace Org.OpenAPITools.Api /// /// Represents a collection of functions to interact with the API endpoints /// - public sealed partial class FakeClassnameTags123Api : IApi.IFakeClassnameTags123Api + public sealed partial class FakeClassnameTags123Api : IFakeClassnameTags123Api { private JsonSerializerOptions _jsonSerializerOptions; diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Api/IApi.cs b/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Api/IApi.cs index 038f19bcfa1..28520f043f2 100644 --- a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Api/IApi.cs +++ b/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Api/IApi.cs @@ -1,6 +1,6 @@ using System.Net.Http; -namespace Org.OpenAPITools.IApi +namespace Org.OpenAPITools.Api { /// /// Any Api client diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Api/PetApi.cs b/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Api/PetApi.cs index ad0b273a169..a80b68cecd5 100644 --- a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Api/PetApi.cs +++ b/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Api/PetApi.cs @@ -22,7 +22,7 @@ using Org.OpenAPITools.Client; using Org.OpenAPITools.Api; using Org.OpenAPITools.Model; -namespace Org.OpenAPITools.IApi +namespace Org.OpenAPITools.Api { /// /// Represents a collection of functions to interact with the API endpoints @@ -256,10 +256,7 @@ namespace Org.OpenAPITools.IApi /// Task<ApiResponse>ApiResponse>?> Task?> UploadFileWithRequiredFileOrDefaultAsync(System.IO.Stream requiredFile, long petId, Option additionalMetadata = default, System.Threading.CancellationToken cancellationToken = default); } -} -namespace Org.OpenAPITools.Api -{ /// /// Represents a collection of functions to interact with the API endpoints /// This class is registered as transient. @@ -450,7 +447,7 @@ namespace Org.OpenAPITools.Api /// /// Represents a collection of functions to interact with the API endpoints /// - public sealed partial class PetApi : IApi.IPetApi + public sealed partial class PetApi : IPetApi { private JsonSerializerOptions _jsonSerializerOptions; diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Api/StoreApi.cs b/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Api/StoreApi.cs index 81c5c0f713d..2499bbaf9d7 100644 --- a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Api/StoreApi.cs +++ b/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Api/StoreApi.cs @@ -22,7 +22,7 @@ using Org.OpenAPITools.Client; using Org.OpenAPITools.Api; using Org.OpenAPITools.Model; -namespace Org.OpenAPITools.IApi +namespace Org.OpenAPITools.Api { /// /// Represents a collection of functions to interact with the API endpoints @@ -125,10 +125,7 @@ namespace Org.OpenAPITools.IApi /// Task<ApiResponse>Order>?> Task?> PlaceOrderOrDefaultAsync(Order order, System.Threading.CancellationToken cancellationToken = default); } -} -namespace Org.OpenAPITools.Api -{ /// /// Represents a collection of functions to interact with the API endpoints /// This class is registered as transient. @@ -219,7 +216,7 @@ namespace Org.OpenAPITools.Api /// /// Represents a collection of functions to interact with the API endpoints /// - public sealed partial class StoreApi : IApi.IStoreApi + public sealed partial class StoreApi : IStoreApi { private JsonSerializerOptions _jsonSerializerOptions; diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Api/UserApi.cs b/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Api/UserApi.cs index 7df84d485d0..d2b35bcc802 100644 --- a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Api/UserApi.cs +++ b/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Api/UserApi.cs @@ -22,7 +22,7 @@ using Org.OpenAPITools.Client; using Org.OpenAPITools.Api; using Org.OpenAPITools.Model; -namespace Org.OpenAPITools.IApi +namespace Org.OpenAPITools.Api { /// /// Represents a collection of functions to interact with the API endpoints @@ -221,10 +221,7 @@ namespace Org.OpenAPITools.IApi /// Task<ApiResponse>object>?> Task?> UpdateUserOrDefaultAsync(User user, string username, System.Threading.CancellationToken cancellationToken = default); } -} -namespace Org.OpenAPITools.Api -{ /// /// Represents a collection of functions to interact with the API endpoints /// This class is registered as transient. @@ -395,7 +392,7 @@ namespace Org.OpenAPITools.Api /// /// Represents a collection of functions to interact with the API endpoints /// - public sealed partial class UserApi : IApi.IUserApi + public sealed partial class UserApi : IUserApi { private JsonSerializerOptions _jsonSerializerOptions; diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Client/ApiFactory.cs b/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Client/ApiFactory.cs index 09e9ecef679..b9b27c613f8 100644 --- a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Client/ApiFactory.cs +++ b/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Client/ApiFactory.cs @@ -1,6 +1,6 @@ using System; using Microsoft.Extensions.DependencyInjection; - +using Org.OpenAPITools.Api; namespace Org.OpenAPITools.Client { @@ -14,7 +14,7 @@ namespace Org.OpenAPITools.Client /// /// /// - IResult Create() where IResult : IApi.IApi; + IResult Create() where IResult : IApi; } /// @@ -41,7 +41,7 @@ namespace Org.OpenAPITools.Client /// /// /// - public IResult Create() where IResult : IApi.IApi + public IResult Create() where IResult : IApi { return Services.GetRequiredService(); } diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Client/HostConfiguration.cs b/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Client/HostConfiguration.cs index d347b5f89cd..bb209290607 100644 --- a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Client/HostConfiguration.cs +++ b/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Client/HostConfiguration.cs @@ -17,7 +17,6 @@ using System.Text.Json.Serialization; using System.Net.Http; using Microsoft.Extensions.DependencyInjection; using Org.OpenAPITools.Api; -using Org.OpenAPITools.IApi; using Org.OpenAPITools.Model; namespace Org.OpenAPITools.Client diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools.Test/Api/AnotherFakeApiTests.cs b/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools.Test/Api/AnotherFakeApiTests.cs index 17a8392e00a..9d8aa32892e 100644 --- a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools.Test/Api/AnotherFakeApiTests.cs +++ b/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools.Test/Api/AnotherFakeApiTests.cs @@ -12,7 +12,7 @@ using System.Collections.Generic; using System.Threading.Tasks; using Xunit; using Microsoft.Extensions.DependencyInjection; -using Org.OpenAPITools.IApi; +using Org.OpenAPITools.Api; using Org.OpenAPITools.Model; @@ -43,11 +43,11 @@ namespace Org.OpenAPITools.Test.Api /// public sealed class AnotherFakeApiTests : ApiTestsBase { - private readonly IApi.IAnotherFakeApi _instance; + private readonly IAnotherFakeApi _instance; public AnotherFakeApiTests(): base(Array.Empty()) { - _instance = _host.Services.GetRequiredService(); + _instance = _host.Services.GetRequiredService(); } /// diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools.Test/Api/DefaultApiTests.cs b/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools.Test/Api/DefaultApiTests.cs index 7d6b4d9f814..80a09133836 100644 --- a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools.Test/Api/DefaultApiTests.cs +++ b/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools.Test/Api/DefaultApiTests.cs @@ -12,7 +12,7 @@ using System.Collections.Generic; using System.Threading.Tasks; using Xunit; using Microsoft.Extensions.DependencyInjection; -using Org.OpenAPITools.IApi; +using Org.OpenAPITools.Api; using Org.OpenAPITools.Model; @@ -43,11 +43,11 @@ namespace Org.OpenAPITools.Test.Api /// public sealed class DefaultApiTests : ApiTestsBase { - private readonly IApi.IDefaultApi _instance; + private readonly IDefaultApi _instance; public DefaultApiTests(): base(Array.Empty()) { - _instance = _host.Services.GetRequiredService(); + _instance = _host.Services.GetRequiredService(); } /// diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools.Test/Api/DependencyInjectionTests.cs b/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools.Test/Api/DependencyInjectionTests.cs index 256df5697c9..5ad1cd420f9 100644 --- a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools.Test/Api/DependencyInjectionTests.cs +++ b/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools.Test/Api/DependencyInjectionTests.cs @@ -13,7 +13,7 @@ using Microsoft.Extensions.DependencyInjection; using System.Collections.Generic; using System.Security.Cryptography; using Org.OpenAPITools.Client; -using Org.OpenAPITools.IApi; +using Org.OpenAPITools.Api; using Org.OpenAPITools.Extensions; using Xunit; @@ -122,25 +122,25 @@ namespace Org.OpenAPITools.Test.Api [Fact] public void ConfigureApiWithAClientTest() { - var anotherFakeApi = _hostUsingConfigureWithAClient.Services.GetRequiredService(); + var anotherFakeApi = _hostUsingConfigureWithAClient.Services.GetRequiredService(); Assert.True(anotherFakeApi.HttpClient.BaseAddress != null); - var defaultApi = _hostUsingConfigureWithAClient.Services.GetRequiredService(); + var defaultApi = _hostUsingConfigureWithAClient.Services.GetRequiredService(); Assert.True(defaultApi.HttpClient.BaseAddress != null); - var fakeApi = _hostUsingConfigureWithAClient.Services.GetRequiredService(); + var fakeApi = _hostUsingConfigureWithAClient.Services.GetRequiredService(); Assert.True(fakeApi.HttpClient.BaseAddress != null); - var fakeClassnameTags123Api = _hostUsingConfigureWithAClient.Services.GetRequiredService(); + var fakeClassnameTags123Api = _hostUsingConfigureWithAClient.Services.GetRequiredService(); Assert.True(fakeClassnameTags123Api.HttpClient.BaseAddress != null); - var petApi = _hostUsingConfigureWithAClient.Services.GetRequiredService(); + var petApi = _hostUsingConfigureWithAClient.Services.GetRequiredService(); Assert.True(petApi.HttpClient.BaseAddress != null); - var storeApi = _hostUsingConfigureWithAClient.Services.GetRequiredService(); + var storeApi = _hostUsingConfigureWithAClient.Services.GetRequiredService(); Assert.True(storeApi.HttpClient.BaseAddress != null); - var userApi = _hostUsingConfigureWithAClient.Services.GetRequiredService(); + var userApi = _hostUsingConfigureWithAClient.Services.GetRequiredService(); Assert.True(userApi.HttpClient.BaseAddress != null); } @@ -150,25 +150,25 @@ namespace Org.OpenAPITools.Test.Api [Fact] public void ConfigureApiWithoutAClientTest() { - var anotherFakeApi = _hostUsingConfigureWithoutAClient.Services.GetRequiredService(); + var anotherFakeApi = _hostUsingConfigureWithoutAClient.Services.GetRequiredService(); Assert.True(anotherFakeApi.HttpClient.BaseAddress != null); - var defaultApi = _hostUsingConfigureWithoutAClient.Services.GetRequiredService(); + var defaultApi = _hostUsingConfigureWithoutAClient.Services.GetRequiredService(); Assert.True(defaultApi.HttpClient.BaseAddress != null); - var fakeApi = _hostUsingConfigureWithoutAClient.Services.GetRequiredService(); + var fakeApi = _hostUsingConfigureWithoutAClient.Services.GetRequiredService(); Assert.True(fakeApi.HttpClient.BaseAddress != null); - var fakeClassnameTags123Api = _hostUsingConfigureWithoutAClient.Services.GetRequiredService(); + var fakeClassnameTags123Api = _hostUsingConfigureWithoutAClient.Services.GetRequiredService(); Assert.True(fakeClassnameTags123Api.HttpClient.BaseAddress != null); - var petApi = _hostUsingConfigureWithoutAClient.Services.GetRequiredService(); + var petApi = _hostUsingConfigureWithoutAClient.Services.GetRequiredService(); Assert.True(petApi.HttpClient.BaseAddress != null); - var storeApi = _hostUsingConfigureWithoutAClient.Services.GetRequiredService(); + var storeApi = _hostUsingConfigureWithoutAClient.Services.GetRequiredService(); Assert.True(storeApi.HttpClient.BaseAddress != null); - var userApi = _hostUsingConfigureWithoutAClient.Services.GetRequiredService(); + var userApi = _hostUsingConfigureWithoutAClient.Services.GetRequiredService(); Assert.True(userApi.HttpClient.BaseAddress != null); } @@ -178,25 +178,25 @@ namespace Org.OpenAPITools.Test.Api [Fact] public void AddApiWithAClientTest() { - var anotherFakeApi = _hostUsingAddWithAClient.Services.GetRequiredService(); + var anotherFakeApi = _hostUsingAddWithAClient.Services.GetRequiredService(); Assert.True(anotherFakeApi.HttpClient.BaseAddress != null); - var defaultApi = _hostUsingAddWithAClient.Services.GetRequiredService(); + var defaultApi = _hostUsingAddWithAClient.Services.GetRequiredService(); Assert.True(defaultApi.HttpClient.BaseAddress != null); - var fakeApi = _hostUsingAddWithAClient.Services.GetRequiredService(); + var fakeApi = _hostUsingAddWithAClient.Services.GetRequiredService(); Assert.True(fakeApi.HttpClient.BaseAddress != null); - var fakeClassnameTags123Api = _hostUsingAddWithAClient.Services.GetRequiredService(); + var fakeClassnameTags123Api = _hostUsingAddWithAClient.Services.GetRequiredService(); Assert.True(fakeClassnameTags123Api.HttpClient.BaseAddress != null); - var petApi = _hostUsingAddWithAClient.Services.GetRequiredService(); + var petApi = _hostUsingAddWithAClient.Services.GetRequiredService(); Assert.True(petApi.HttpClient.BaseAddress != null); - var storeApi = _hostUsingAddWithAClient.Services.GetRequiredService(); + var storeApi = _hostUsingAddWithAClient.Services.GetRequiredService(); Assert.True(storeApi.HttpClient.BaseAddress != null); - var userApi = _hostUsingAddWithAClient.Services.GetRequiredService(); + var userApi = _hostUsingAddWithAClient.Services.GetRequiredService(); Assert.True(userApi.HttpClient.BaseAddress != null); } @@ -206,25 +206,25 @@ namespace Org.OpenAPITools.Test.Api [Fact] public void AddApiWithoutAClientTest() { - var anotherFakeApi = _hostUsingAddWithoutAClient.Services.GetRequiredService(); + var anotherFakeApi = _hostUsingAddWithoutAClient.Services.GetRequiredService(); Assert.True(anotherFakeApi.HttpClient.BaseAddress != null); - var defaultApi = _hostUsingAddWithoutAClient.Services.GetRequiredService(); + var defaultApi = _hostUsingAddWithoutAClient.Services.GetRequiredService(); Assert.True(defaultApi.HttpClient.BaseAddress != null); - var fakeApi = _hostUsingAddWithoutAClient.Services.GetRequiredService(); + var fakeApi = _hostUsingAddWithoutAClient.Services.GetRequiredService(); Assert.True(fakeApi.HttpClient.BaseAddress != null); - var fakeClassnameTags123Api = _hostUsingAddWithoutAClient.Services.GetRequiredService(); + var fakeClassnameTags123Api = _hostUsingAddWithoutAClient.Services.GetRequiredService(); Assert.True(fakeClassnameTags123Api.HttpClient.BaseAddress != null); - var petApi = _hostUsingAddWithoutAClient.Services.GetRequiredService(); + var petApi = _hostUsingAddWithoutAClient.Services.GetRequiredService(); Assert.True(petApi.HttpClient.BaseAddress != null); - var storeApi = _hostUsingAddWithoutAClient.Services.GetRequiredService(); + var storeApi = _hostUsingAddWithoutAClient.Services.GetRequiredService(); Assert.True(storeApi.HttpClient.BaseAddress != null); - var userApi = _hostUsingAddWithoutAClient.Services.GetRequiredService(); + var userApi = _hostUsingAddWithoutAClient.Services.GetRequiredService(); Assert.True(userApi.HttpClient.BaseAddress != null); } } diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools.Test/Api/FakeApiTests.cs b/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools.Test/Api/FakeApiTests.cs index 73b87f569ac..bc5d327bda0 100644 --- a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools.Test/Api/FakeApiTests.cs +++ b/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools.Test/Api/FakeApiTests.cs @@ -12,7 +12,7 @@ using System.Collections.Generic; using System.Threading.Tasks; using Xunit; using Microsoft.Extensions.DependencyInjection; -using Org.OpenAPITools.IApi; +using Org.OpenAPITools.Api; using Org.OpenAPITools.Model; @@ -43,11 +43,11 @@ namespace Org.OpenAPITools.Test.Api /// public sealed class FakeApiTests : ApiTestsBase { - private readonly IApi.IFakeApi _instance; + private readonly IFakeApi _instance; public FakeApiTests(): base(Array.Empty()) { - _instance = _host.Services.GetRequiredService(); + _instance = _host.Services.GetRequiredService(); } /// diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools.Test/Api/FakeClassnameTags123ApiTests.cs b/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools.Test/Api/FakeClassnameTags123ApiTests.cs index 05cc0ae4fed..f57b69b4769 100644 --- a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools.Test/Api/FakeClassnameTags123ApiTests.cs +++ b/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools.Test/Api/FakeClassnameTags123ApiTests.cs @@ -12,7 +12,7 @@ using System.Collections.Generic; using System.Threading.Tasks; using Xunit; using Microsoft.Extensions.DependencyInjection; -using Org.OpenAPITools.IApi; +using Org.OpenAPITools.Api; using Org.OpenAPITools.Model; @@ -43,11 +43,11 @@ namespace Org.OpenAPITools.Test.Api /// public sealed class FakeClassnameTags123ApiTests : ApiTestsBase { - private readonly IApi.IFakeClassnameTags123Api _instance; + private readonly IFakeClassnameTags123Api _instance; public FakeClassnameTags123ApiTests(): base(Array.Empty()) { - _instance = _host.Services.GetRequiredService(); + _instance = _host.Services.GetRequiredService(); } /// diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools.Test/Api/PetApiTests.cs b/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools.Test/Api/PetApiTests.cs index e1c54f8f129..c6da93dbfa7 100644 --- a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools.Test/Api/PetApiTests.cs +++ b/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools.Test/Api/PetApiTests.cs @@ -12,7 +12,7 @@ using System.Collections.Generic; using System.Threading.Tasks; using Xunit; using Microsoft.Extensions.DependencyInjection; -using Org.OpenAPITools.IApi; +using Org.OpenAPITools.Api; using Org.OpenAPITools.Model; @@ -43,11 +43,11 @@ namespace Org.OpenAPITools.Test.Api /// public sealed class PetApiTests : ApiTestsBase { - private readonly IApi.IPetApi _instance; + private readonly IPetApi _instance; public PetApiTests(): base(Array.Empty()) { - _instance = _host.Services.GetRequiredService(); + _instance = _host.Services.GetRequiredService(); } /// diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools.Test/Api/StoreApiTests.cs b/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools.Test/Api/StoreApiTests.cs index 47f3b907009..9c419760def 100644 --- a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools.Test/Api/StoreApiTests.cs +++ b/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools.Test/Api/StoreApiTests.cs @@ -12,7 +12,7 @@ using System.Collections.Generic; using System.Threading.Tasks; using Xunit; using Microsoft.Extensions.DependencyInjection; -using Org.OpenAPITools.IApi; +using Org.OpenAPITools.Api; using Org.OpenAPITools.Model; @@ -43,11 +43,11 @@ namespace Org.OpenAPITools.Test.Api /// public sealed class StoreApiTests : ApiTestsBase { - private readonly IApi.IStoreApi _instance; + private readonly IStoreApi _instance; public StoreApiTests(): base(Array.Empty()) { - _instance = _host.Services.GetRequiredService(); + _instance = _host.Services.GetRequiredService(); } /// diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools.Test/Api/UserApiTests.cs b/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools.Test/Api/UserApiTests.cs index 7f01e423b28..c79f103fbef 100644 --- a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools.Test/Api/UserApiTests.cs +++ b/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools.Test/Api/UserApiTests.cs @@ -12,7 +12,7 @@ using System.Collections.Generic; using System.Threading.Tasks; using Xunit; using Microsoft.Extensions.DependencyInjection; -using Org.OpenAPITools.IApi; +using Org.OpenAPITools.Api; using Org.OpenAPITools.Model; @@ -43,11 +43,11 @@ namespace Org.OpenAPITools.Test.Api /// public sealed class UserApiTests : ApiTestsBase { - private readonly IApi.IUserApi _instance; + private readonly IUserApi _instance; public UserApiTests(): base(Array.Empty()) { - _instance = _host.Services.GetRequiredService(); + _instance = _host.Services.GetRequiredService(); } /// diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Api/AnotherFakeApi.cs b/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Api/AnotherFakeApi.cs index 29644b3f55a..165d3a0183a 100644 --- a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Api/AnotherFakeApi.cs +++ b/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Api/AnotherFakeApi.cs @@ -20,7 +20,7 @@ using Org.OpenAPITools.Client; using Org.OpenAPITools.Api; using Org.OpenAPITools.Model; -namespace Org.OpenAPITools.IApi +namespace Org.OpenAPITools.Api { /// /// Represents a collection of functions to interact with the API endpoints @@ -56,10 +56,7 @@ namespace Org.OpenAPITools.IApi /// Task<ApiResponse>ModelClient>> Task> Call123TestSpecialTagsOrDefaultAsync(ModelClient modelClient, System.Threading.CancellationToken cancellationToken = default); } -} -namespace Org.OpenAPITools.Api -{ /// /// Represents a collection of functions to interact with the API endpoints /// This class is registered as transient. @@ -90,7 +87,7 @@ namespace Org.OpenAPITools.Api /// /// Represents a collection of functions to interact with the API endpoints /// - public sealed partial class AnotherFakeApi : IApi.IAnotherFakeApi + public sealed partial class AnotherFakeApi : IAnotherFakeApi { private JsonSerializerOptions _jsonSerializerOptions; diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Api/DefaultApi.cs b/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Api/DefaultApi.cs index 6be47a6f318..3568c1f6333 100644 --- a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Api/DefaultApi.cs +++ b/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Api/DefaultApi.cs @@ -20,7 +20,7 @@ using Org.OpenAPITools.Client; using Org.OpenAPITools.Api; using Org.OpenAPITools.Model; -namespace Org.OpenAPITools.IApi +namespace Org.OpenAPITools.Api { /// /// Represents a collection of functions to interact with the API endpoints @@ -98,10 +98,7 @@ namespace Org.OpenAPITools.IApi /// Task<ApiResponse>List<Guid>>> Task>> HelloOrDefaultAsync(System.Threading.CancellationToken cancellationToken = default); } -} -namespace Org.OpenAPITools.Api -{ /// /// Represents a collection of functions to interact with the API endpoints /// This class is registered as transient. @@ -172,7 +169,7 @@ namespace Org.OpenAPITools.Api /// /// Represents a collection of functions to interact with the API endpoints /// - public sealed partial class DefaultApi : IApi.IDefaultApi + public sealed partial class DefaultApi : IDefaultApi { private JsonSerializerOptions _jsonSerializerOptions; diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Api/FakeApi.cs b/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Api/FakeApi.cs index b91da3ec838..5b8352b1943 100644 --- a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Api/FakeApi.cs +++ b/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Api/FakeApi.cs @@ -20,7 +20,7 @@ using Org.OpenAPITools.Client; using Org.OpenAPITools.Api; using Org.OpenAPITools.Model; -namespace Org.OpenAPITools.IApi +namespace Org.OpenAPITools.Api { /// /// Represents a collection of functions to interact with the API endpoints @@ -446,10 +446,7 @@ namespace Org.OpenAPITools.IApi /// Task<ApiResponse>object>> Task> TestQueryParameterCollectionFormatOrDefaultAsync(List pipe, List ioutil, List http, List url, List context, string requiredNotNullable, string requiredNullable = default, Option notRequiredNotNullable = default, Option notRequiredNullable = default, System.Threading.CancellationToken cancellationToken = default); } -} -namespace Org.OpenAPITools.Api -{ /// /// Represents a collection of functions to interact with the API endpoints /// This class is registered as transient. @@ -760,7 +757,7 @@ namespace Org.OpenAPITools.Api /// /// Represents a collection of functions to interact with the API endpoints /// - public sealed partial class FakeApi : IApi.IFakeApi + public sealed partial class FakeApi : IFakeApi { private JsonSerializerOptions _jsonSerializerOptions; diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Api/FakeClassnameTags123Api.cs b/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Api/FakeClassnameTags123Api.cs index 28833de3175..1c0b09292be 100644 --- a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Api/FakeClassnameTags123Api.cs +++ b/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Api/FakeClassnameTags123Api.cs @@ -20,7 +20,7 @@ using Org.OpenAPITools.Client; using Org.OpenAPITools.Api; using Org.OpenAPITools.Model; -namespace Org.OpenAPITools.IApi +namespace Org.OpenAPITools.Api { /// /// Represents a collection of functions to interact with the API endpoints @@ -56,10 +56,7 @@ namespace Org.OpenAPITools.IApi /// Task<ApiResponse>ModelClient>> Task> TestClassnameOrDefaultAsync(ModelClient modelClient, System.Threading.CancellationToken cancellationToken = default); } -} -namespace Org.OpenAPITools.Api -{ /// /// Represents a collection of functions to interact with the API endpoints /// This class is registered as transient. @@ -90,7 +87,7 @@ namespace Org.OpenAPITools.Api /// /// Represents a collection of functions to interact with the API endpoints /// - public sealed partial class FakeClassnameTags123Api : IApi.IFakeClassnameTags123Api + public sealed partial class FakeClassnameTags123Api : IFakeClassnameTags123Api { private JsonSerializerOptions _jsonSerializerOptions; diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Api/IApi.cs b/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Api/IApi.cs index 038f19bcfa1..28520f043f2 100644 --- a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Api/IApi.cs +++ b/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Api/IApi.cs @@ -1,6 +1,6 @@ using System.Net.Http; -namespace Org.OpenAPITools.IApi +namespace Org.OpenAPITools.Api { /// /// Any Api client diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Api/PetApi.cs b/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Api/PetApi.cs index 8217daa081c..5dd03f2352d 100644 --- a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Api/PetApi.cs +++ b/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Api/PetApi.cs @@ -20,7 +20,7 @@ using Org.OpenAPITools.Client; using Org.OpenAPITools.Api; using Org.OpenAPITools.Model; -namespace Org.OpenAPITools.IApi +namespace Org.OpenAPITools.Api { /// /// Represents a collection of functions to interact with the API endpoints @@ -254,10 +254,7 @@ namespace Org.OpenAPITools.IApi /// Task<ApiResponse>ApiResponse>> Task> UploadFileWithRequiredFileOrDefaultAsync(System.IO.Stream requiredFile, long petId, Option additionalMetadata = default, System.Threading.CancellationToken cancellationToken = default); } -} -namespace Org.OpenAPITools.Api -{ /// /// Represents a collection of functions to interact with the API endpoints /// This class is registered as transient. @@ -448,7 +445,7 @@ namespace Org.OpenAPITools.Api /// /// Represents a collection of functions to interact with the API endpoints /// - public sealed partial class PetApi : IApi.IPetApi + public sealed partial class PetApi : IPetApi { private JsonSerializerOptions _jsonSerializerOptions; diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Api/StoreApi.cs b/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Api/StoreApi.cs index e4b4f0b5b8e..27dfa739a19 100644 --- a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Api/StoreApi.cs +++ b/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Api/StoreApi.cs @@ -20,7 +20,7 @@ using Org.OpenAPITools.Client; using Org.OpenAPITools.Api; using Org.OpenAPITools.Model; -namespace Org.OpenAPITools.IApi +namespace Org.OpenAPITools.Api { /// /// Represents a collection of functions to interact with the API endpoints @@ -123,10 +123,7 @@ namespace Org.OpenAPITools.IApi /// Task<ApiResponse>Order>> Task> PlaceOrderOrDefaultAsync(Order order, System.Threading.CancellationToken cancellationToken = default); } -} -namespace Org.OpenAPITools.Api -{ /// /// Represents a collection of functions to interact with the API endpoints /// This class is registered as transient. @@ -217,7 +214,7 @@ namespace Org.OpenAPITools.Api /// /// Represents a collection of functions to interact with the API endpoints /// - public sealed partial class StoreApi : IApi.IStoreApi + public sealed partial class StoreApi : IStoreApi { private JsonSerializerOptions _jsonSerializerOptions; diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Api/UserApi.cs b/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Api/UserApi.cs index 06eb3bbf706..1fe6462438a 100644 --- a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Api/UserApi.cs +++ b/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Api/UserApi.cs @@ -20,7 +20,7 @@ using Org.OpenAPITools.Client; using Org.OpenAPITools.Api; using Org.OpenAPITools.Model; -namespace Org.OpenAPITools.IApi +namespace Org.OpenAPITools.Api { /// /// Represents a collection of functions to interact with the API endpoints @@ -219,10 +219,7 @@ namespace Org.OpenAPITools.IApi /// Task<ApiResponse>object>> Task> UpdateUserOrDefaultAsync(User user, string username, System.Threading.CancellationToken cancellationToken = default); } -} -namespace Org.OpenAPITools.Api -{ /// /// Represents a collection of functions to interact with the API endpoints /// This class is registered as transient. @@ -393,7 +390,7 @@ namespace Org.OpenAPITools.Api /// /// Represents a collection of functions to interact with the API endpoints /// - public sealed partial class UserApi : IApi.IUserApi + public sealed partial class UserApi : IUserApi { private JsonSerializerOptions _jsonSerializerOptions; diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Client/ApiFactory.cs b/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Client/ApiFactory.cs index 09e9ecef679..b9b27c613f8 100644 --- a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Client/ApiFactory.cs +++ b/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Client/ApiFactory.cs @@ -1,6 +1,6 @@ using System; using Microsoft.Extensions.DependencyInjection; - +using Org.OpenAPITools.Api; namespace Org.OpenAPITools.Client { @@ -14,7 +14,7 @@ namespace Org.OpenAPITools.Client /// /// /// - IResult Create() where IResult : IApi.IApi; + IResult Create() where IResult : IApi; } /// @@ -41,7 +41,7 @@ namespace Org.OpenAPITools.Client /// /// /// - public IResult Create() where IResult : IApi.IApi + public IResult Create() where IResult : IApi { return Services.GetRequiredService(); } diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Client/HostConfiguration.cs b/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Client/HostConfiguration.cs index 8d01435c285..f7ba191b19c 100644 --- a/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Client/HostConfiguration.cs +++ b/samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Client/HostConfiguration.cs @@ -15,7 +15,6 @@ using System.Text.Json.Serialization; using System.Net.Http; using Microsoft.Extensions.DependencyInjection; using Org.OpenAPITools.Api; -using Org.OpenAPITools.IApi; using Org.OpenAPITools.Model; namespace Org.OpenAPITools.Client diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-netcore-latest-allOf/src/Org.OpenAPITools.Test/Api/DefaultApiTests.cs b/samples/client/petstore/csharp/OpenAPIClient-generichost-netcore-latest-allOf/src/Org.OpenAPITools.Test/Api/DefaultApiTests.cs index 93c82442234..15f4078256d 100644 --- a/samples/client/petstore/csharp/OpenAPIClient-generichost-netcore-latest-allOf/src/Org.OpenAPITools.Test/Api/DefaultApiTests.cs +++ b/samples/client/petstore/csharp/OpenAPIClient-generichost-netcore-latest-allOf/src/Org.OpenAPITools.Test/Api/DefaultApiTests.cs @@ -12,7 +12,7 @@ using System.Collections.Generic; using System.Threading.Tasks; using Xunit; using Microsoft.Extensions.DependencyInjection; -using Org.OpenAPITools.IApi; +using Org.OpenAPITools.Api; using Org.OpenAPITools.Model; @@ -43,11 +43,11 @@ namespace Org.OpenAPITools.Test.Api /// public sealed class DefaultApiTests : ApiTestsBase { - private readonly IApi.IDefaultApi _instance; + private readonly IDefaultApi _instance; public DefaultApiTests(): base(Array.Empty()) { - _instance = _host.Services.GetRequiredService(); + _instance = _host.Services.GetRequiredService(); } /// diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-netcore-latest-allOf/src/Org.OpenAPITools.Test/Api/DependencyInjectionTests.cs b/samples/client/petstore/csharp/OpenAPIClient-generichost-netcore-latest-allOf/src/Org.OpenAPITools.Test/Api/DependencyInjectionTests.cs index 7200578a9ca..ee4506c19b2 100644 --- a/samples/client/petstore/csharp/OpenAPIClient-generichost-netcore-latest-allOf/src/Org.OpenAPITools.Test/Api/DependencyInjectionTests.cs +++ b/samples/client/petstore/csharp/OpenAPIClient-generichost-netcore-latest-allOf/src/Org.OpenAPITools.Test/Api/DependencyInjectionTests.cs @@ -13,7 +13,7 @@ using Microsoft.Extensions.DependencyInjection; using System.Collections.Generic; using System.Security.Cryptography; using Org.OpenAPITools.Client; -using Org.OpenAPITools.IApi; +using Org.OpenAPITools.Api; using Org.OpenAPITools.Extensions; using Xunit; @@ -66,7 +66,7 @@ namespace Org.OpenAPITools.Test.Api [Fact] public void ConfigureApiWithAClientTest() { - var defaultApi = _hostUsingConfigureWithAClient.Services.GetRequiredService(); + var defaultApi = _hostUsingConfigureWithAClient.Services.GetRequiredService(); Assert.True(defaultApi.HttpClient.BaseAddress != null); } @@ -76,7 +76,7 @@ namespace Org.OpenAPITools.Test.Api [Fact] public void ConfigureApiWithoutAClientTest() { - var defaultApi = _hostUsingConfigureWithoutAClient.Services.GetRequiredService(); + var defaultApi = _hostUsingConfigureWithoutAClient.Services.GetRequiredService(); Assert.True(defaultApi.HttpClient.BaseAddress != null); } @@ -86,7 +86,7 @@ namespace Org.OpenAPITools.Test.Api [Fact] public void AddApiWithAClientTest() { - var defaultApi = _hostUsingAddWithAClient.Services.GetRequiredService(); + var defaultApi = _hostUsingAddWithAClient.Services.GetRequiredService(); Assert.True(defaultApi.HttpClient.BaseAddress != null); } @@ -96,7 +96,7 @@ namespace Org.OpenAPITools.Test.Api [Fact] public void AddApiWithoutAClientTest() { - var defaultApi = _hostUsingAddWithoutAClient.Services.GetRequiredService(); + var defaultApi = _hostUsingAddWithoutAClient.Services.GetRequiredService(); Assert.True(defaultApi.HttpClient.BaseAddress != null); } } diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-netcore-latest-allOf/src/Org.OpenAPITools/Api/DefaultApi.cs b/samples/client/petstore/csharp/OpenAPIClient-generichost-netcore-latest-allOf/src/Org.OpenAPITools/Api/DefaultApi.cs index 2dc5e241fad..b4e94a2c418 100644 --- a/samples/client/petstore/csharp/OpenAPIClient-generichost-netcore-latest-allOf/src/Org.OpenAPITools/Api/DefaultApi.cs +++ b/samples/client/petstore/csharp/OpenAPIClient-generichost-netcore-latest-allOf/src/Org.OpenAPITools/Api/DefaultApi.cs @@ -22,7 +22,7 @@ using Org.OpenAPITools.Client; using Org.OpenAPITools.Api; using Org.OpenAPITools.Model; -namespace Org.OpenAPITools.IApi +namespace Org.OpenAPITools.Api { /// /// Represents a collection of functions to interact with the API endpoints @@ -58,10 +58,7 @@ namespace Org.OpenAPITools.IApi /// Task<ApiResponse>Person>?> Task?> ListOrDefaultAsync(string personId, System.Threading.CancellationToken cancellationToken = default); } -} -namespace Org.OpenAPITools.Api -{ /// /// Represents a collection of functions to interact with the API endpoints /// This class is registered as transient. @@ -92,7 +89,7 @@ namespace Org.OpenAPITools.Api /// /// Represents a collection of functions to interact with the API endpoints /// - public sealed partial class DefaultApi : IApi.IDefaultApi + public sealed partial class DefaultApi : IDefaultApi { private JsonSerializerOptions _jsonSerializerOptions; diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-netcore-latest-allOf/src/Org.OpenAPITools/Api/IApi.cs b/samples/client/petstore/csharp/OpenAPIClient-generichost-netcore-latest-allOf/src/Org.OpenAPITools/Api/IApi.cs index 038f19bcfa1..28520f043f2 100644 --- a/samples/client/petstore/csharp/OpenAPIClient-generichost-netcore-latest-allOf/src/Org.OpenAPITools/Api/IApi.cs +++ b/samples/client/petstore/csharp/OpenAPIClient-generichost-netcore-latest-allOf/src/Org.OpenAPITools/Api/IApi.cs @@ -1,6 +1,6 @@ using System.Net.Http; -namespace Org.OpenAPITools.IApi +namespace Org.OpenAPITools.Api { /// /// Any Api client diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-netcore-latest-allOf/src/Org.OpenAPITools/Client/ApiFactory.cs b/samples/client/petstore/csharp/OpenAPIClient-generichost-netcore-latest-allOf/src/Org.OpenAPITools/Client/ApiFactory.cs index 09e9ecef679..b9b27c613f8 100644 --- a/samples/client/petstore/csharp/OpenAPIClient-generichost-netcore-latest-allOf/src/Org.OpenAPITools/Client/ApiFactory.cs +++ b/samples/client/petstore/csharp/OpenAPIClient-generichost-netcore-latest-allOf/src/Org.OpenAPITools/Client/ApiFactory.cs @@ -1,6 +1,6 @@ using System; using Microsoft.Extensions.DependencyInjection; - +using Org.OpenAPITools.Api; namespace Org.OpenAPITools.Client { @@ -14,7 +14,7 @@ namespace Org.OpenAPITools.Client /// /// /// - IResult Create() where IResult : IApi.IApi; + IResult Create() where IResult : IApi; } /// @@ -41,7 +41,7 @@ namespace Org.OpenAPITools.Client /// /// /// - public IResult Create() where IResult : IApi.IApi + public IResult Create() where IResult : IApi { return Services.GetRequiredService(); } diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-netcore-latest-allOf/src/Org.OpenAPITools/Client/HostConfiguration.cs b/samples/client/petstore/csharp/OpenAPIClient-generichost-netcore-latest-allOf/src/Org.OpenAPITools/Client/HostConfiguration.cs index 2b7faf39963..4dbe03c9dd9 100644 --- a/samples/client/petstore/csharp/OpenAPIClient-generichost-netcore-latest-allOf/src/Org.OpenAPITools/Client/HostConfiguration.cs +++ b/samples/client/petstore/csharp/OpenAPIClient-generichost-netcore-latest-allOf/src/Org.OpenAPITools/Client/HostConfiguration.cs @@ -17,7 +17,6 @@ using System.Text.Json.Serialization; using System.Net.Http; using Microsoft.Extensions.DependencyInjection; using Org.OpenAPITools.Api; -using Org.OpenAPITools.IApi; using Org.OpenAPITools.Model; namespace Org.OpenAPITools.Client diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-netcore-latest-anyOf/src/Org.OpenAPITools.Test/Api/DefaultApiTests.cs b/samples/client/petstore/csharp/OpenAPIClient-generichost-netcore-latest-anyOf/src/Org.OpenAPITools.Test/Api/DefaultApiTests.cs index 1e6713689ee..ef682d1d3b5 100644 --- a/samples/client/petstore/csharp/OpenAPIClient-generichost-netcore-latest-anyOf/src/Org.OpenAPITools.Test/Api/DefaultApiTests.cs +++ b/samples/client/petstore/csharp/OpenAPIClient-generichost-netcore-latest-anyOf/src/Org.OpenAPITools.Test/Api/DefaultApiTests.cs @@ -12,7 +12,7 @@ using System.Collections.Generic; using System.Threading.Tasks; using Xunit; using Microsoft.Extensions.DependencyInjection; -using Org.OpenAPITools.IApi; +using Org.OpenAPITools.Api; using Org.OpenAPITools.Model; @@ -43,11 +43,11 @@ namespace Org.OpenAPITools.Test.Api /// public sealed class DefaultApiTests : ApiTestsBase { - private readonly IApi.IDefaultApi _instance; + private readonly IDefaultApi _instance; public DefaultApiTests(): base(Array.Empty()) { - _instance = _host.Services.GetRequiredService(); + _instance = _host.Services.GetRequiredService(); } /// diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-netcore-latest-anyOf/src/Org.OpenAPITools.Test/Api/DependencyInjectionTests.cs b/samples/client/petstore/csharp/OpenAPIClient-generichost-netcore-latest-anyOf/src/Org.OpenAPITools.Test/Api/DependencyInjectionTests.cs index 03165a8e6fc..49e4c513024 100644 --- a/samples/client/petstore/csharp/OpenAPIClient-generichost-netcore-latest-anyOf/src/Org.OpenAPITools.Test/Api/DependencyInjectionTests.cs +++ b/samples/client/petstore/csharp/OpenAPIClient-generichost-netcore-latest-anyOf/src/Org.OpenAPITools.Test/Api/DependencyInjectionTests.cs @@ -13,7 +13,7 @@ using Microsoft.Extensions.DependencyInjection; using System.Collections.Generic; using System.Security.Cryptography; using Org.OpenAPITools.Client; -using Org.OpenAPITools.IApi; +using Org.OpenAPITools.Api; using Org.OpenAPITools.Extensions; using Xunit; @@ -66,7 +66,7 @@ namespace Org.OpenAPITools.Test.Api [Fact] public void ConfigureApiWithAClientTest() { - var defaultApi = _hostUsingConfigureWithAClient.Services.GetRequiredService(); + var defaultApi = _hostUsingConfigureWithAClient.Services.GetRequiredService(); Assert.True(defaultApi.HttpClient.BaseAddress != null); } @@ -76,7 +76,7 @@ namespace Org.OpenAPITools.Test.Api [Fact] public void ConfigureApiWithoutAClientTest() { - var defaultApi = _hostUsingConfigureWithoutAClient.Services.GetRequiredService(); + var defaultApi = _hostUsingConfigureWithoutAClient.Services.GetRequiredService(); Assert.True(defaultApi.HttpClient.BaseAddress != null); } @@ -86,7 +86,7 @@ namespace Org.OpenAPITools.Test.Api [Fact] public void AddApiWithAClientTest() { - var defaultApi = _hostUsingAddWithAClient.Services.GetRequiredService(); + var defaultApi = _hostUsingAddWithAClient.Services.GetRequiredService(); Assert.True(defaultApi.HttpClient.BaseAddress != null); } @@ -96,7 +96,7 @@ namespace Org.OpenAPITools.Test.Api [Fact] public void AddApiWithoutAClientTest() { - var defaultApi = _hostUsingAddWithoutAClient.Services.GetRequiredService(); + var defaultApi = _hostUsingAddWithoutAClient.Services.GetRequiredService(); Assert.True(defaultApi.HttpClient.BaseAddress != null); } } diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-netcore-latest-anyOf/src/Org.OpenAPITools/Api/DefaultApi.cs b/samples/client/petstore/csharp/OpenAPIClient-generichost-netcore-latest-anyOf/src/Org.OpenAPITools/Api/DefaultApi.cs index b02bf29c7cd..61d06e70624 100644 --- a/samples/client/petstore/csharp/OpenAPIClient-generichost-netcore-latest-anyOf/src/Org.OpenAPITools/Api/DefaultApi.cs +++ b/samples/client/petstore/csharp/OpenAPIClient-generichost-netcore-latest-anyOf/src/Org.OpenAPITools/Api/DefaultApi.cs @@ -22,7 +22,7 @@ using Org.OpenAPITools.Client; using Org.OpenAPITools.Api; using Org.OpenAPITools.Model; -namespace Org.OpenAPITools.IApi +namespace Org.OpenAPITools.Api { /// /// Represents a collection of functions to interact with the API endpoints @@ -56,10 +56,7 @@ namespace Org.OpenAPITools.IApi /// Task<ApiResponse>Fruit>?> Task?> RootGetOrDefaultAsync(System.Threading.CancellationToken cancellationToken = default); } -} -namespace Org.OpenAPITools.Api -{ /// /// Represents a collection of functions to interact with the API endpoints /// This class is registered as transient. @@ -90,7 +87,7 @@ namespace Org.OpenAPITools.Api /// /// Represents a collection of functions to interact with the API endpoints /// - public sealed partial class DefaultApi : IApi.IDefaultApi + public sealed partial class DefaultApi : IDefaultApi { private JsonSerializerOptions _jsonSerializerOptions; diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-netcore-latest-anyOf/src/Org.OpenAPITools/Api/IApi.cs b/samples/client/petstore/csharp/OpenAPIClient-generichost-netcore-latest-anyOf/src/Org.OpenAPITools/Api/IApi.cs index 038f19bcfa1..28520f043f2 100644 --- a/samples/client/petstore/csharp/OpenAPIClient-generichost-netcore-latest-anyOf/src/Org.OpenAPITools/Api/IApi.cs +++ b/samples/client/petstore/csharp/OpenAPIClient-generichost-netcore-latest-anyOf/src/Org.OpenAPITools/Api/IApi.cs @@ -1,6 +1,6 @@ using System.Net.Http; -namespace Org.OpenAPITools.IApi +namespace Org.OpenAPITools.Api { /// /// Any Api client diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-netcore-latest-anyOf/src/Org.OpenAPITools/Client/ApiFactory.cs b/samples/client/petstore/csharp/OpenAPIClient-generichost-netcore-latest-anyOf/src/Org.OpenAPITools/Client/ApiFactory.cs index 09e9ecef679..b9b27c613f8 100644 --- a/samples/client/petstore/csharp/OpenAPIClient-generichost-netcore-latest-anyOf/src/Org.OpenAPITools/Client/ApiFactory.cs +++ b/samples/client/petstore/csharp/OpenAPIClient-generichost-netcore-latest-anyOf/src/Org.OpenAPITools/Client/ApiFactory.cs @@ -1,6 +1,6 @@ using System; using Microsoft.Extensions.DependencyInjection; - +using Org.OpenAPITools.Api; namespace Org.OpenAPITools.Client { @@ -14,7 +14,7 @@ namespace Org.OpenAPITools.Client /// /// /// - IResult Create() where IResult : IApi.IApi; + IResult Create() where IResult : IApi; } /// @@ -41,7 +41,7 @@ namespace Org.OpenAPITools.Client /// /// /// - public IResult Create() where IResult : IApi.IApi + public IResult Create() where IResult : IApi { return Services.GetRequiredService(); } diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-netcore-latest-anyOf/src/Org.OpenAPITools/Client/HostConfiguration.cs b/samples/client/petstore/csharp/OpenAPIClient-generichost-netcore-latest-anyOf/src/Org.OpenAPITools/Client/HostConfiguration.cs index 48df438f4ee..a8f8d90ce21 100644 --- a/samples/client/petstore/csharp/OpenAPIClient-generichost-netcore-latest-anyOf/src/Org.OpenAPITools/Client/HostConfiguration.cs +++ b/samples/client/petstore/csharp/OpenAPIClient-generichost-netcore-latest-anyOf/src/Org.OpenAPITools/Client/HostConfiguration.cs @@ -17,7 +17,6 @@ using System.Text.Json.Serialization; using System.Net.Http; using Microsoft.Extensions.DependencyInjection; using Org.OpenAPITools.Api; -using Org.OpenAPITools.IApi; using Org.OpenAPITools.Model; namespace Org.OpenAPITools.Client diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-netcore-latest-oneOf/src/Org.OpenAPITools.Test/Api/DefaultApiTests.cs b/samples/client/petstore/csharp/OpenAPIClient-generichost-netcore-latest-oneOf/src/Org.OpenAPITools.Test/Api/DefaultApiTests.cs index 1e6713689ee..ef682d1d3b5 100644 --- a/samples/client/petstore/csharp/OpenAPIClient-generichost-netcore-latest-oneOf/src/Org.OpenAPITools.Test/Api/DefaultApiTests.cs +++ b/samples/client/petstore/csharp/OpenAPIClient-generichost-netcore-latest-oneOf/src/Org.OpenAPITools.Test/Api/DefaultApiTests.cs @@ -12,7 +12,7 @@ using System.Collections.Generic; using System.Threading.Tasks; using Xunit; using Microsoft.Extensions.DependencyInjection; -using Org.OpenAPITools.IApi; +using Org.OpenAPITools.Api; using Org.OpenAPITools.Model; @@ -43,11 +43,11 @@ namespace Org.OpenAPITools.Test.Api /// public sealed class DefaultApiTests : ApiTestsBase { - private readonly IApi.IDefaultApi _instance; + private readonly IDefaultApi _instance; public DefaultApiTests(): base(Array.Empty()) { - _instance = _host.Services.GetRequiredService(); + _instance = _host.Services.GetRequiredService(); } /// diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-netcore-latest-oneOf/src/Org.OpenAPITools.Test/Api/DependencyInjectionTests.cs b/samples/client/petstore/csharp/OpenAPIClient-generichost-netcore-latest-oneOf/src/Org.OpenAPITools.Test/Api/DependencyInjectionTests.cs index 03165a8e6fc..49e4c513024 100644 --- a/samples/client/petstore/csharp/OpenAPIClient-generichost-netcore-latest-oneOf/src/Org.OpenAPITools.Test/Api/DependencyInjectionTests.cs +++ b/samples/client/petstore/csharp/OpenAPIClient-generichost-netcore-latest-oneOf/src/Org.OpenAPITools.Test/Api/DependencyInjectionTests.cs @@ -13,7 +13,7 @@ using Microsoft.Extensions.DependencyInjection; using System.Collections.Generic; using System.Security.Cryptography; using Org.OpenAPITools.Client; -using Org.OpenAPITools.IApi; +using Org.OpenAPITools.Api; using Org.OpenAPITools.Extensions; using Xunit; @@ -66,7 +66,7 @@ namespace Org.OpenAPITools.Test.Api [Fact] public void ConfigureApiWithAClientTest() { - var defaultApi = _hostUsingConfigureWithAClient.Services.GetRequiredService(); + var defaultApi = _hostUsingConfigureWithAClient.Services.GetRequiredService(); Assert.True(defaultApi.HttpClient.BaseAddress != null); } @@ -76,7 +76,7 @@ namespace Org.OpenAPITools.Test.Api [Fact] public void ConfigureApiWithoutAClientTest() { - var defaultApi = _hostUsingConfigureWithoutAClient.Services.GetRequiredService(); + var defaultApi = _hostUsingConfigureWithoutAClient.Services.GetRequiredService(); Assert.True(defaultApi.HttpClient.BaseAddress != null); } @@ -86,7 +86,7 @@ namespace Org.OpenAPITools.Test.Api [Fact] public void AddApiWithAClientTest() { - var defaultApi = _hostUsingAddWithAClient.Services.GetRequiredService(); + var defaultApi = _hostUsingAddWithAClient.Services.GetRequiredService(); Assert.True(defaultApi.HttpClient.BaseAddress != null); } @@ -96,7 +96,7 @@ namespace Org.OpenAPITools.Test.Api [Fact] public void AddApiWithoutAClientTest() { - var defaultApi = _hostUsingAddWithoutAClient.Services.GetRequiredService(); + var defaultApi = _hostUsingAddWithoutAClient.Services.GetRequiredService(); Assert.True(defaultApi.HttpClient.BaseAddress != null); } } diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-netcore-latest-oneOf/src/Org.OpenAPITools/Api/DefaultApi.cs b/samples/client/petstore/csharp/OpenAPIClient-generichost-netcore-latest-oneOf/src/Org.OpenAPITools/Api/DefaultApi.cs index b02bf29c7cd..61d06e70624 100644 --- a/samples/client/petstore/csharp/OpenAPIClient-generichost-netcore-latest-oneOf/src/Org.OpenAPITools/Api/DefaultApi.cs +++ b/samples/client/petstore/csharp/OpenAPIClient-generichost-netcore-latest-oneOf/src/Org.OpenAPITools/Api/DefaultApi.cs @@ -22,7 +22,7 @@ using Org.OpenAPITools.Client; using Org.OpenAPITools.Api; using Org.OpenAPITools.Model; -namespace Org.OpenAPITools.IApi +namespace Org.OpenAPITools.Api { /// /// Represents a collection of functions to interact with the API endpoints @@ -56,10 +56,7 @@ namespace Org.OpenAPITools.IApi /// Task<ApiResponse>Fruit>?> Task?> RootGetOrDefaultAsync(System.Threading.CancellationToken cancellationToken = default); } -} -namespace Org.OpenAPITools.Api -{ /// /// Represents a collection of functions to interact with the API endpoints /// This class is registered as transient. @@ -90,7 +87,7 @@ namespace Org.OpenAPITools.Api /// /// Represents a collection of functions to interact with the API endpoints /// - public sealed partial class DefaultApi : IApi.IDefaultApi + public sealed partial class DefaultApi : IDefaultApi { private JsonSerializerOptions _jsonSerializerOptions; diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-netcore-latest-oneOf/src/Org.OpenAPITools/Api/IApi.cs b/samples/client/petstore/csharp/OpenAPIClient-generichost-netcore-latest-oneOf/src/Org.OpenAPITools/Api/IApi.cs index 038f19bcfa1..28520f043f2 100644 --- a/samples/client/petstore/csharp/OpenAPIClient-generichost-netcore-latest-oneOf/src/Org.OpenAPITools/Api/IApi.cs +++ b/samples/client/petstore/csharp/OpenAPIClient-generichost-netcore-latest-oneOf/src/Org.OpenAPITools/Api/IApi.cs @@ -1,6 +1,6 @@ using System.Net.Http; -namespace Org.OpenAPITools.IApi +namespace Org.OpenAPITools.Api { /// /// Any Api client diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-netcore-latest-oneOf/src/Org.OpenAPITools/Client/ApiFactory.cs b/samples/client/petstore/csharp/OpenAPIClient-generichost-netcore-latest-oneOf/src/Org.OpenAPITools/Client/ApiFactory.cs index 09e9ecef679..b9b27c613f8 100644 --- a/samples/client/petstore/csharp/OpenAPIClient-generichost-netcore-latest-oneOf/src/Org.OpenAPITools/Client/ApiFactory.cs +++ b/samples/client/petstore/csharp/OpenAPIClient-generichost-netcore-latest-oneOf/src/Org.OpenAPITools/Client/ApiFactory.cs @@ -1,6 +1,6 @@ using System; using Microsoft.Extensions.DependencyInjection; - +using Org.OpenAPITools.Api; namespace Org.OpenAPITools.Client { @@ -14,7 +14,7 @@ namespace Org.OpenAPITools.Client /// /// /// - IResult Create() where IResult : IApi.IApi; + IResult Create() where IResult : IApi; } /// @@ -41,7 +41,7 @@ namespace Org.OpenAPITools.Client /// /// /// - public IResult Create() where IResult : IApi.IApi + public IResult Create() where IResult : IApi { return Services.GetRequiredService(); } diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-netcore-latest-oneOf/src/Org.OpenAPITools/Client/HostConfiguration.cs b/samples/client/petstore/csharp/OpenAPIClient-generichost-netcore-latest-oneOf/src/Org.OpenAPITools/Client/HostConfiguration.cs index 48df438f4ee..a8f8d90ce21 100644 --- a/samples/client/petstore/csharp/OpenAPIClient-generichost-netcore-latest-oneOf/src/Org.OpenAPITools/Client/HostConfiguration.cs +++ b/samples/client/petstore/csharp/OpenAPIClient-generichost-netcore-latest-oneOf/src/Org.OpenAPITools/Client/HostConfiguration.cs @@ -17,7 +17,6 @@ using System.Text.Json.Serialization; using System.Net.Http; using Microsoft.Extensions.DependencyInjection; using Org.OpenAPITools.Api; -using Org.OpenAPITools.IApi; using Org.OpenAPITools.Model; namespace Org.OpenAPITools.Client diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools.Test/Api/AnotherFakeApiTests.cs b/samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools.Test/Api/AnotherFakeApiTests.cs index 17a8392e00a..9d8aa32892e 100644 --- a/samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools.Test/Api/AnotherFakeApiTests.cs +++ b/samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools.Test/Api/AnotherFakeApiTests.cs @@ -12,7 +12,7 @@ using System.Collections.Generic; using System.Threading.Tasks; using Xunit; using Microsoft.Extensions.DependencyInjection; -using Org.OpenAPITools.IApi; +using Org.OpenAPITools.Api; using Org.OpenAPITools.Model; @@ -43,11 +43,11 @@ namespace Org.OpenAPITools.Test.Api /// public sealed class AnotherFakeApiTests : ApiTestsBase { - private readonly IApi.IAnotherFakeApi _instance; + private readonly IAnotherFakeApi _instance; public AnotherFakeApiTests(): base(Array.Empty()) { - _instance = _host.Services.GetRequiredService(); + _instance = _host.Services.GetRequiredService(); } /// diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools.Test/Api/DefaultApiTests.cs b/samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools.Test/Api/DefaultApiTests.cs index 7d6b4d9f814..80a09133836 100644 --- a/samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools.Test/Api/DefaultApiTests.cs +++ b/samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools.Test/Api/DefaultApiTests.cs @@ -12,7 +12,7 @@ using System.Collections.Generic; using System.Threading.Tasks; using Xunit; using Microsoft.Extensions.DependencyInjection; -using Org.OpenAPITools.IApi; +using Org.OpenAPITools.Api; using Org.OpenAPITools.Model; @@ -43,11 +43,11 @@ namespace Org.OpenAPITools.Test.Api /// public sealed class DefaultApiTests : ApiTestsBase { - private readonly IApi.IDefaultApi _instance; + private readonly IDefaultApi _instance; public DefaultApiTests(): base(Array.Empty()) { - _instance = _host.Services.GetRequiredService(); + _instance = _host.Services.GetRequiredService(); } /// diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools.Test/Api/DependencyInjectionTests.cs b/samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools.Test/Api/DependencyInjectionTests.cs index 256df5697c9..5ad1cd420f9 100644 --- a/samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools.Test/Api/DependencyInjectionTests.cs +++ b/samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools.Test/Api/DependencyInjectionTests.cs @@ -13,7 +13,7 @@ using Microsoft.Extensions.DependencyInjection; using System.Collections.Generic; using System.Security.Cryptography; using Org.OpenAPITools.Client; -using Org.OpenAPITools.IApi; +using Org.OpenAPITools.Api; using Org.OpenAPITools.Extensions; using Xunit; @@ -122,25 +122,25 @@ namespace Org.OpenAPITools.Test.Api [Fact] public void ConfigureApiWithAClientTest() { - var anotherFakeApi = _hostUsingConfigureWithAClient.Services.GetRequiredService(); + var anotherFakeApi = _hostUsingConfigureWithAClient.Services.GetRequiredService(); Assert.True(anotherFakeApi.HttpClient.BaseAddress != null); - var defaultApi = _hostUsingConfigureWithAClient.Services.GetRequiredService(); + var defaultApi = _hostUsingConfigureWithAClient.Services.GetRequiredService(); Assert.True(defaultApi.HttpClient.BaseAddress != null); - var fakeApi = _hostUsingConfigureWithAClient.Services.GetRequiredService(); + var fakeApi = _hostUsingConfigureWithAClient.Services.GetRequiredService(); Assert.True(fakeApi.HttpClient.BaseAddress != null); - var fakeClassnameTags123Api = _hostUsingConfigureWithAClient.Services.GetRequiredService(); + var fakeClassnameTags123Api = _hostUsingConfigureWithAClient.Services.GetRequiredService(); Assert.True(fakeClassnameTags123Api.HttpClient.BaseAddress != null); - var petApi = _hostUsingConfigureWithAClient.Services.GetRequiredService(); + var petApi = _hostUsingConfigureWithAClient.Services.GetRequiredService(); Assert.True(petApi.HttpClient.BaseAddress != null); - var storeApi = _hostUsingConfigureWithAClient.Services.GetRequiredService(); + var storeApi = _hostUsingConfigureWithAClient.Services.GetRequiredService(); Assert.True(storeApi.HttpClient.BaseAddress != null); - var userApi = _hostUsingConfigureWithAClient.Services.GetRequiredService(); + var userApi = _hostUsingConfigureWithAClient.Services.GetRequiredService(); Assert.True(userApi.HttpClient.BaseAddress != null); } @@ -150,25 +150,25 @@ namespace Org.OpenAPITools.Test.Api [Fact] public void ConfigureApiWithoutAClientTest() { - var anotherFakeApi = _hostUsingConfigureWithoutAClient.Services.GetRequiredService(); + var anotherFakeApi = _hostUsingConfigureWithoutAClient.Services.GetRequiredService(); Assert.True(anotherFakeApi.HttpClient.BaseAddress != null); - var defaultApi = _hostUsingConfigureWithoutAClient.Services.GetRequiredService(); + var defaultApi = _hostUsingConfigureWithoutAClient.Services.GetRequiredService(); Assert.True(defaultApi.HttpClient.BaseAddress != null); - var fakeApi = _hostUsingConfigureWithoutAClient.Services.GetRequiredService(); + var fakeApi = _hostUsingConfigureWithoutAClient.Services.GetRequiredService(); Assert.True(fakeApi.HttpClient.BaseAddress != null); - var fakeClassnameTags123Api = _hostUsingConfigureWithoutAClient.Services.GetRequiredService(); + var fakeClassnameTags123Api = _hostUsingConfigureWithoutAClient.Services.GetRequiredService(); Assert.True(fakeClassnameTags123Api.HttpClient.BaseAddress != null); - var petApi = _hostUsingConfigureWithoutAClient.Services.GetRequiredService(); + var petApi = _hostUsingConfigureWithoutAClient.Services.GetRequiredService(); Assert.True(petApi.HttpClient.BaseAddress != null); - var storeApi = _hostUsingConfigureWithoutAClient.Services.GetRequiredService(); + var storeApi = _hostUsingConfigureWithoutAClient.Services.GetRequiredService(); Assert.True(storeApi.HttpClient.BaseAddress != null); - var userApi = _hostUsingConfigureWithoutAClient.Services.GetRequiredService(); + var userApi = _hostUsingConfigureWithoutAClient.Services.GetRequiredService(); Assert.True(userApi.HttpClient.BaseAddress != null); } @@ -178,25 +178,25 @@ namespace Org.OpenAPITools.Test.Api [Fact] public void AddApiWithAClientTest() { - var anotherFakeApi = _hostUsingAddWithAClient.Services.GetRequiredService(); + var anotherFakeApi = _hostUsingAddWithAClient.Services.GetRequiredService(); Assert.True(anotherFakeApi.HttpClient.BaseAddress != null); - var defaultApi = _hostUsingAddWithAClient.Services.GetRequiredService(); + var defaultApi = _hostUsingAddWithAClient.Services.GetRequiredService(); Assert.True(defaultApi.HttpClient.BaseAddress != null); - var fakeApi = _hostUsingAddWithAClient.Services.GetRequiredService(); + var fakeApi = _hostUsingAddWithAClient.Services.GetRequiredService(); Assert.True(fakeApi.HttpClient.BaseAddress != null); - var fakeClassnameTags123Api = _hostUsingAddWithAClient.Services.GetRequiredService(); + var fakeClassnameTags123Api = _hostUsingAddWithAClient.Services.GetRequiredService(); Assert.True(fakeClassnameTags123Api.HttpClient.BaseAddress != null); - var petApi = _hostUsingAddWithAClient.Services.GetRequiredService(); + var petApi = _hostUsingAddWithAClient.Services.GetRequiredService(); Assert.True(petApi.HttpClient.BaseAddress != null); - var storeApi = _hostUsingAddWithAClient.Services.GetRequiredService(); + var storeApi = _hostUsingAddWithAClient.Services.GetRequiredService(); Assert.True(storeApi.HttpClient.BaseAddress != null); - var userApi = _hostUsingAddWithAClient.Services.GetRequiredService(); + var userApi = _hostUsingAddWithAClient.Services.GetRequiredService(); Assert.True(userApi.HttpClient.BaseAddress != null); } @@ -206,25 +206,25 @@ namespace Org.OpenAPITools.Test.Api [Fact] public void AddApiWithoutAClientTest() { - var anotherFakeApi = _hostUsingAddWithoutAClient.Services.GetRequiredService(); + var anotherFakeApi = _hostUsingAddWithoutAClient.Services.GetRequiredService(); Assert.True(anotherFakeApi.HttpClient.BaseAddress != null); - var defaultApi = _hostUsingAddWithoutAClient.Services.GetRequiredService(); + var defaultApi = _hostUsingAddWithoutAClient.Services.GetRequiredService(); Assert.True(defaultApi.HttpClient.BaseAddress != null); - var fakeApi = _hostUsingAddWithoutAClient.Services.GetRequiredService(); + var fakeApi = _hostUsingAddWithoutAClient.Services.GetRequiredService(); Assert.True(fakeApi.HttpClient.BaseAddress != null); - var fakeClassnameTags123Api = _hostUsingAddWithoutAClient.Services.GetRequiredService(); + var fakeClassnameTags123Api = _hostUsingAddWithoutAClient.Services.GetRequiredService(); Assert.True(fakeClassnameTags123Api.HttpClient.BaseAddress != null); - var petApi = _hostUsingAddWithoutAClient.Services.GetRequiredService(); + var petApi = _hostUsingAddWithoutAClient.Services.GetRequiredService(); Assert.True(petApi.HttpClient.BaseAddress != null); - var storeApi = _hostUsingAddWithoutAClient.Services.GetRequiredService(); + var storeApi = _hostUsingAddWithoutAClient.Services.GetRequiredService(); Assert.True(storeApi.HttpClient.BaseAddress != null); - var userApi = _hostUsingAddWithoutAClient.Services.GetRequiredService(); + var userApi = _hostUsingAddWithoutAClient.Services.GetRequiredService(); Assert.True(userApi.HttpClient.BaseAddress != null); } } diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools.Test/Api/FakeApiTests.cs b/samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools.Test/Api/FakeApiTests.cs index 73b87f569ac..bc5d327bda0 100644 --- a/samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools.Test/Api/FakeApiTests.cs +++ b/samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools.Test/Api/FakeApiTests.cs @@ -12,7 +12,7 @@ using System.Collections.Generic; using System.Threading.Tasks; using Xunit; using Microsoft.Extensions.DependencyInjection; -using Org.OpenAPITools.IApi; +using Org.OpenAPITools.Api; using Org.OpenAPITools.Model; @@ -43,11 +43,11 @@ namespace Org.OpenAPITools.Test.Api /// public sealed class FakeApiTests : ApiTestsBase { - private readonly IApi.IFakeApi _instance; + private readonly IFakeApi _instance; public FakeApiTests(): base(Array.Empty()) { - _instance = _host.Services.GetRequiredService(); + _instance = _host.Services.GetRequiredService(); } /// diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools.Test/Api/FakeClassnameTags123ApiTests.cs b/samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools.Test/Api/FakeClassnameTags123ApiTests.cs index 05cc0ae4fed..f57b69b4769 100644 --- a/samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools.Test/Api/FakeClassnameTags123ApiTests.cs +++ b/samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools.Test/Api/FakeClassnameTags123ApiTests.cs @@ -12,7 +12,7 @@ using System.Collections.Generic; using System.Threading.Tasks; using Xunit; using Microsoft.Extensions.DependencyInjection; -using Org.OpenAPITools.IApi; +using Org.OpenAPITools.Api; using Org.OpenAPITools.Model; @@ -43,11 +43,11 @@ namespace Org.OpenAPITools.Test.Api /// public sealed class FakeClassnameTags123ApiTests : ApiTestsBase { - private readonly IApi.IFakeClassnameTags123Api _instance; + private readonly IFakeClassnameTags123Api _instance; public FakeClassnameTags123ApiTests(): base(Array.Empty()) { - _instance = _host.Services.GetRequiredService(); + _instance = _host.Services.GetRequiredService(); } /// diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools.Test/Api/PetApiTests.cs b/samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools.Test/Api/PetApiTests.cs index e1c54f8f129..c6da93dbfa7 100644 --- a/samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools.Test/Api/PetApiTests.cs +++ b/samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools.Test/Api/PetApiTests.cs @@ -12,7 +12,7 @@ using System.Collections.Generic; using System.Threading.Tasks; using Xunit; using Microsoft.Extensions.DependencyInjection; -using Org.OpenAPITools.IApi; +using Org.OpenAPITools.Api; using Org.OpenAPITools.Model; @@ -43,11 +43,11 @@ namespace Org.OpenAPITools.Test.Api /// public sealed class PetApiTests : ApiTestsBase { - private readonly IApi.IPetApi _instance; + private readonly IPetApi _instance; public PetApiTests(): base(Array.Empty()) { - _instance = _host.Services.GetRequiredService(); + _instance = _host.Services.GetRequiredService(); } /// diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools.Test/Api/StoreApiTests.cs b/samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools.Test/Api/StoreApiTests.cs index 47f3b907009..9c419760def 100644 --- a/samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools.Test/Api/StoreApiTests.cs +++ b/samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools.Test/Api/StoreApiTests.cs @@ -12,7 +12,7 @@ using System.Collections.Generic; using System.Threading.Tasks; using Xunit; using Microsoft.Extensions.DependencyInjection; -using Org.OpenAPITools.IApi; +using Org.OpenAPITools.Api; using Org.OpenAPITools.Model; @@ -43,11 +43,11 @@ namespace Org.OpenAPITools.Test.Api /// public sealed class StoreApiTests : ApiTestsBase { - private readonly IApi.IStoreApi _instance; + private readonly IStoreApi _instance; public StoreApiTests(): base(Array.Empty()) { - _instance = _host.Services.GetRequiredService(); + _instance = _host.Services.GetRequiredService(); } /// diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools.Test/Api/UserApiTests.cs b/samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools.Test/Api/UserApiTests.cs index 7f01e423b28..c79f103fbef 100644 --- a/samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools.Test/Api/UserApiTests.cs +++ b/samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools.Test/Api/UserApiTests.cs @@ -12,7 +12,7 @@ using System.Collections.Generic; using System.Threading.Tasks; using Xunit; using Microsoft.Extensions.DependencyInjection; -using Org.OpenAPITools.IApi; +using Org.OpenAPITools.Api; using Org.OpenAPITools.Model; @@ -43,11 +43,11 @@ namespace Org.OpenAPITools.Test.Api /// public sealed class UserApiTests : ApiTestsBase { - private readonly IApi.IUserApi _instance; + private readonly IUserApi _instance; public UserApiTests(): base(Array.Empty()) { - _instance = _host.Services.GetRequiredService(); + _instance = _host.Services.GetRequiredService(); } /// diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Api/AnotherFakeApi.cs b/samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Api/AnotherFakeApi.cs index 7975c5936ac..86dc387d166 100644 --- a/samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Api/AnotherFakeApi.cs +++ b/samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Api/AnotherFakeApi.cs @@ -20,7 +20,7 @@ using Org.OpenAPITools.Client; using Org.OpenAPITools.Api; using Org.OpenAPITools.Model; -namespace Org.OpenAPITools.IApi +namespace Org.OpenAPITools.Api { /// /// Represents a collection of functions to interact with the API endpoints @@ -56,10 +56,7 @@ namespace Org.OpenAPITools.IApi /// Task<ApiResponse>ModelClient>> Task> Call123TestSpecialTagsOrDefaultAsync(ModelClient modelClient, System.Threading.CancellationToken cancellationToken = default); } -} -namespace Org.OpenAPITools.Api -{ /// /// Represents a collection of functions to interact with the API endpoints /// This class is registered as transient. @@ -90,7 +87,7 @@ namespace Org.OpenAPITools.Api /// /// Represents a collection of functions to interact with the API endpoints /// - public sealed partial class AnotherFakeApi : IApi.IAnotherFakeApi + public sealed partial class AnotherFakeApi : IAnotherFakeApi { private JsonSerializerOptions _jsonSerializerOptions; diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Api/DefaultApi.cs b/samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Api/DefaultApi.cs index 33ff8b8df44..5110738866a 100644 --- a/samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Api/DefaultApi.cs +++ b/samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Api/DefaultApi.cs @@ -20,7 +20,7 @@ using Org.OpenAPITools.Client; using Org.OpenAPITools.Api; using Org.OpenAPITools.Model; -namespace Org.OpenAPITools.IApi +namespace Org.OpenAPITools.Api { /// /// Represents a collection of functions to interact with the API endpoints @@ -98,10 +98,7 @@ namespace Org.OpenAPITools.IApi /// Task<ApiResponse>List<Guid>>> Task>> HelloOrDefaultAsync(System.Threading.CancellationToken cancellationToken = default); } -} -namespace Org.OpenAPITools.Api -{ /// /// Represents a collection of functions to interact with the API endpoints /// This class is registered as transient. @@ -172,7 +169,7 @@ namespace Org.OpenAPITools.Api /// /// Represents a collection of functions to interact with the API endpoints /// - public sealed partial class DefaultApi : IApi.IDefaultApi + public sealed partial class DefaultApi : IDefaultApi { private JsonSerializerOptions _jsonSerializerOptions; diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Api/FakeApi.cs b/samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Api/FakeApi.cs index f3d60a343ea..b7ed8d0447c 100644 --- a/samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Api/FakeApi.cs +++ b/samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Api/FakeApi.cs @@ -20,7 +20,7 @@ using Org.OpenAPITools.Client; using Org.OpenAPITools.Api; using Org.OpenAPITools.Model; -namespace Org.OpenAPITools.IApi +namespace Org.OpenAPITools.Api { /// /// Represents a collection of functions to interact with the API endpoints @@ -446,10 +446,7 @@ namespace Org.OpenAPITools.IApi /// Task<ApiResponse>object>> Task> TestQueryParameterCollectionFormatOrDefaultAsync(List pipe, List ioutil, List http, List url, List context, string requiredNotNullable, string requiredNullable = default, Option notRequiredNotNullable = default, Option notRequiredNullable = default, System.Threading.CancellationToken cancellationToken = default); } -} -namespace Org.OpenAPITools.Api -{ /// /// Represents a collection of functions to interact with the API endpoints /// This class is registered as transient. @@ -760,7 +757,7 @@ namespace Org.OpenAPITools.Api /// /// Represents a collection of functions to interact with the API endpoints /// - public sealed partial class FakeApi : IApi.IFakeApi + public sealed partial class FakeApi : IFakeApi { private JsonSerializerOptions _jsonSerializerOptions; diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Api/FakeClassnameTags123Api.cs b/samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Api/FakeClassnameTags123Api.cs index f9103b3aef0..95f8ccfd9bd 100644 --- a/samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Api/FakeClassnameTags123Api.cs +++ b/samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Api/FakeClassnameTags123Api.cs @@ -20,7 +20,7 @@ using Org.OpenAPITools.Client; using Org.OpenAPITools.Api; using Org.OpenAPITools.Model; -namespace Org.OpenAPITools.IApi +namespace Org.OpenAPITools.Api { /// /// Represents a collection of functions to interact with the API endpoints @@ -56,10 +56,7 @@ namespace Org.OpenAPITools.IApi /// Task<ApiResponse>ModelClient>> Task> TestClassnameOrDefaultAsync(ModelClient modelClient, System.Threading.CancellationToken cancellationToken = default); } -} -namespace Org.OpenAPITools.Api -{ /// /// Represents a collection of functions to interact with the API endpoints /// This class is registered as transient. @@ -90,7 +87,7 @@ namespace Org.OpenAPITools.Api /// /// Represents a collection of functions to interact with the API endpoints /// - public sealed partial class FakeClassnameTags123Api : IApi.IFakeClassnameTags123Api + public sealed partial class FakeClassnameTags123Api : IFakeClassnameTags123Api { private JsonSerializerOptions _jsonSerializerOptions; diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Api/IApi.cs b/samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Api/IApi.cs index 038f19bcfa1..28520f043f2 100644 --- a/samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Api/IApi.cs +++ b/samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Api/IApi.cs @@ -1,6 +1,6 @@ using System.Net.Http; -namespace Org.OpenAPITools.IApi +namespace Org.OpenAPITools.Api { /// /// Any Api client diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Api/PetApi.cs b/samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Api/PetApi.cs index 2bdddb195ae..d9846df6fd9 100644 --- a/samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Api/PetApi.cs +++ b/samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Api/PetApi.cs @@ -20,7 +20,7 @@ using Org.OpenAPITools.Client; using Org.OpenAPITools.Api; using Org.OpenAPITools.Model; -namespace Org.OpenAPITools.IApi +namespace Org.OpenAPITools.Api { /// /// Represents a collection of functions to interact with the API endpoints @@ -254,10 +254,7 @@ namespace Org.OpenAPITools.IApi /// Task<ApiResponse>ApiResponse>> Task> UploadFileWithRequiredFileOrDefaultAsync(System.IO.Stream requiredFile, long petId, Option additionalMetadata = default, System.Threading.CancellationToken cancellationToken = default); } -} -namespace Org.OpenAPITools.Api -{ /// /// Represents a collection of functions to interact with the API endpoints /// This class is registered as transient. @@ -448,7 +445,7 @@ namespace Org.OpenAPITools.Api /// /// Represents a collection of functions to interact with the API endpoints /// - public sealed partial class PetApi : IApi.IPetApi + public sealed partial class PetApi : IPetApi { private JsonSerializerOptions _jsonSerializerOptions; diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Api/StoreApi.cs b/samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Api/StoreApi.cs index 47a994825d0..d7891b1b6d5 100644 --- a/samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Api/StoreApi.cs +++ b/samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Api/StoreApi.cs @@ -20,7 +20,7 @@ using Org.OpenAPITools.Client; using Org.OpenAPITools.Api; using Org.OpenAPITools.Model; -namespace Org.OpenAPITools.IApi +namespace Org.OpenAPITools.Api { /// /// Represents a collection of functions to interact with the API endpoints @@ -123,10 +123,7 @@ namespace Org.OpenAPITools.IApi /// Task<ApiResponse>Order>> Task> PlaceOrderOrDefaultAsync(Order order, System.Threading.CancellationToken cancellationToken = default); } -} -namespace Org.OpenAPITools.Api -{ /// /// Represents a collection of functions to interact with the API endpoints /// This class is registered as transient. @@ -217,7 +214,7 @@ namespace Org.OpenAPITools.Api /// /// Represents a collection of functions to interact with the API endpoints /// - public sealed partial class StoreApi : IApi.IStoreApi + public sealed partial class StoreApi : IStoreApi { private JsonSerializerOptions _jsonSerializerOptions; diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Api/UserApi.cs b/samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Api/UserApi.cs index 1c341786c0a..d275abc8f58 100644 --- a/samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Api/UserApi.cs +++ b/samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Api/UserApi.cs @@ -20,7 +20,7 @@ using Org.OpenAPITools.Client; using Org.OpenAPITools.Api; using Org.OpenAPITools.Model; -namespace Org.OpenAPITools.IApi +namespace Org.OpenAPITools.Api { /// /// Represents a collection of functions to interact with the API endpoints @@ -219,10 +219,7 @@ namespace Org.OpenAPITools.IApi /// Task<ApiResponse>object>> Task> UpdateUserOrDefaultAsync(User user, string username, System.Threading.CancellationToken cancellationToken = default); } -} -namespace Org.OpenAPITools.Api -{ /// /// Represents a collection of functions to interact with the API endpoints /// This class is registered as transient. @@ -393,7 +390,7 @@ namespace Org.OpenAPITools.Api /// /// Represents a collection of functions to interact with the API endpoints /// - public sealed partial class UserApi : IApi.IUserApi + public sealed partial class UserApi : IUserApi { private JsonSerializerOptions _jsonSerializerOptions; diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Client/ApiFactory.cs b/samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Client/ApiFactory.cs index 09e9ecef679..b9b27c613f8 100644 --- a/samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Client/ApiFactory.cs +++ b/samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Client/ApiFactory.cs @@ -1,6 +1,6 @@ using System; using Microsoft.Extensions.DependencyInjection; - +using Org.OpenAPITools.Api; namespace Org.OpenAPITools.Client { @@ -14,7 +14,7 @@ namespace Org.OpenAPITools.Client /// /// /// - IResult Create() where IResult : IApi.IApi; + IResult Create() where IResult : IApi; } /// @@ -41,7 +41,7 @@ namespace Org.OpenAPITools.Client /// /// /// - public IResult Create() where IResult : IApi.IApi + public IResult Create() where IResult : IApi { return Services.GetRequiredService(); } diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Client/HostConfiguration.cs b/samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Client/HostConfiguration.cs index 8d01435c285..f7ba191b19c 100644 --- a/samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Client/HostConfiguration.cs +++ b/samples/client/petstore/csharp/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Client/HostConfiguration.cs @@ -15,7 +15,6 @@ using System.Text.Json.Serialization; using System.Net.Http; using Microsoft.Extensions.DependencyInjection; using Org.OpenAPITools.Api; -using Org.OpenAPITools.IApi; using Org.OpenAPITools.Model; namespace Org.OpenAPITools.Client