diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/AbstractCSharpCodegen.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/AbstractCSharpCodegen.java index 17cecd8553e..6c379d8fe6b 100644 --- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/AbstractCSharpCodegen.java +++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/AbstractCSharpCodegen.java @@ -457,7 +457,8 @@ public abstract class AbstractCSharpCodegen extends DefaultCodegen implements Co .put("required", new RequiredParameterLambda().generator(this)) .put("optional", new OptionalParameterLambda().generator(this)) .put("joinWithComma", new JoinWithCommaLambda()) - .put("trimLineBreaks", new TrimLineBreaksLambda()); + .put("trimLineBreaks", new TrimLineBreaksLambda()) + .put("trimTrailingWhiteSpace", new TrimTrailingWhiteSpaceLambda()); } @Override diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/templating/mustache/TrimTrailingWhiteSpaceLambda.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/templating/mustache/TrimTrailingWhiteSpaceLambda.java new file mode 100644 index 00000000000..9f39bdf3543 --- /dev/null +++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/templating/mustache/TrimTrailingWhiteSpaceLambda.java @@ -0,0 +1,43 @@ +/* + * Copyright 2018 OpenAPI-Generator Contributors (https://openapi-generator.tech) + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * https://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package org.openapitools.codegen.templating.mustache; + +import java.io.IOException; +import java.io.Writer; + +import com.samskivert.mustache.Mustache; +import com.samskivert.mustache.Template.Fragment; + +/** + * Replaces duplicate line break characters in a fragment with single line break. + * + * Register: + * 
+ * additionalProperties.put("trimTrailingWhiteSpace", new TrimTrailingWhiteSpaceLambda());
+ *
+ * + * Use: + * 
+ * {{#trimTrailingWhiteSpace}}{{name}}{{/trimTrailingWhiteSpace}}
+ *
+ */ +public class TrimTrailingWhiteSpaceLambda implements Mustache.Lambda { + @Override + public void execute(Fragment fragment, Writer writer) throws IOException { + writer.write(fragment.execute().stripTrailing()); + } +} diff --git a/modules/openapi-generator/src/main/resources/csharp-netcore/libraries/generichost/ApiTestsBase.mustache b/modules/openapi-generator/src/main/resources/csharp-netcore/libraries/generichost/ApiTestsBase.mustache index e899a5b6911..5bb3280186a 100644 --- a/modules/openapi-generator/src/main/resources/csharp-netcore/libraries/generichost/ApiTestsBase.mustache +++ b/modules/openapi-generator/src/main/resources/csharp-netcore/libraries/generichost/ApiTestsBase.mustache @@ -28,21 +28,36 @@ namespace {{packageName}}.Test.{{apiPackage}} public static IHostBuilder CreateHostBuilder(string[] args) => Host.CreateDefaultBuilder(args) .Configure{{apiName}}((context, services, options) => { - {{#hasApiKeyMethods}}ApiKeyToken apiKeyToken = new{{^net70OrLater}} ApiKeyToken{{/net70OrLater}}(context.Configuration[""], timeout: TimeSpan.FromSeconds(1)); + {{#lambda.trimTrailingWhiteSpace}} + {{#hasApiKeyMethods}} + string apiKeyTokenValue = context.Configuration[""] ?? throw new Exception("Token not found."); + ApiKeyToken apiKeyToken = new{{^net70OrLater}} ApiKeyToken{{/net70OrLater}}(apiKeyTokenValue, timeout: TimeSpan.FromSeconds(1)); options.AddTokens(apiKeyToken); - {{/hasApiKeyMethods}}{{#hasHttpBearerMethods}} - BearerToken bearerToken = new{{^net70OrLater}} BearerToken{{/net70OrLater}}(context.Configuration[""], timeout: TimeSpan.FromSeconds(1)); + + {{/hasApiKeyMethods}} + {{#hasHttpBearerMethods}} + string bearerTokenValue = context.Configuration[""] ?? throw new Exception("Token not found."); + BearerToken bearerToken = new{{^net70OrLater}} BearerToken{{/net70OrLater}}(bearerTokenValue, timeout: TimeSpan.FromSeconds(1)); options.AddTokens(bearerToken); - {{/hasHttpBearerMethods}}{{#hasHttpBasicMethods}} - BasicToken basicToken = new{{^net70OrLater}} BasicToken{{/net70OrLater}}(context.Configuration[""], context.Configuration[""], timeout: TimeSpan.FromSeconds(1)); + + {{/hasHttpBearerMethods}} + {{#hasHttpBasicMethods}} + string basicTokenUsername = context.Configuration[""] ?? throw new Exception("Username not found."); + string basicTokenPassword = context.Configuration[""] ?? throw new Exception("Password not found."); + BasicToken basicToken = new{{^net70OrLater}} BasicToken{{/net70OrLater}}(basicTokenUsername, basicTokenPassword, timeout: TimeSpan.FromSeconds(1)); options.AddTokens(basicToken); - {{/hasHttpBasicMethods}}{{#hasHttpSignatureMethods}} + + {{/hasHttpBasicMethods}} + {{#hasHttpSignatureMethods}} HttpSigningConfiguration config = new{{^net70OrLater}} HttpSigningConfiguration{{/net70OrLater}}("", "", null, new List(), HashAlgorithmName.SHA256, "", 0); HttpSignatureToken httpSignatureToken = new{{^net70OrLater}} HttpSignatureToken{{/net70OrLater}}(config, timeout: TimeSpan.FromSeconds(1)); options.AddTokens(httpSignatureToken); - {{/hasHttpSignatureMethods}}{{#hasOAuthMethods}} - OAuthToken oauthToken = new{{^net70OrLater}} OAuthToken{{/net70OrLater}}(context.Configuration[""], timeout: TimeSpan.FromSeconds(1)); - options.AddTokens(oauthToken);{{/hasOAuthMethods}} + + {{/hasHttpSignatureMethods}} + {{#hasOAuthMethods}} + string oauthTokenValue = context.Configuration[""] ?? throw new Exception("Token not found."); + OAuthToken oauthToken = new{{^net70OrLater}} OAuthToken{{/net70OrLater}}(oauthTokenValue, timeout: TimeSpan.FromSeconds(1)); + options.AddTokens(oauthToken);{{/hasOAuthMethods}}{{/lambda.trimTrailingWhiteSpace}} }); } } diff --git a/modules/openapi-generator/src/main/resources/csharp-netcore/libraries/generichost/IServiceCollectionExtensions.mustache b/modules/openapi-generator/src/main/resources/csharp-netcore/libraries/generichost/IServiceCollectionExtensions.mustache index f1f4be90af1..54b897f509b 100644 --- a/modules/openapi-generator/src/main/resources/csharp-netcore/libraries/generichost/IServiceCollectionExtensions.mustache +++ b/modules/openapi-generator/src/main/resources/csharp-netcore/libraries/generichost/IServiceCollectionExtensions.mustache @@ -21,7 +21,6 @@ namespace {{packageName}}.Extensions /// Add the api to your host builder. /// /// - /// public static void Add{{apiName}}<{{#apiInfo}}{{#apis}}T{{classname}}{{^-last}}, {{/-last}}{{/apis}}{{/apiInfo}}>(this IServiceCollection services) {{#apiInfo}} {{#apis}} @@ -29,7 +28,7 @@ namespace {{packageName}}.Extensions {{/apis}} {{/apiInfo}} { - HostConfiguration<{{#apiInfo}}{{#apis}}T{{classname}}{{^-last}}, {{/-last}}{{/apis}}{{/apiInfo}}> config = new HostConfiguration<{{#apiInfo}}{{#apis}}T{{classname}}{{^-last}}, {{/-last}}{{/apis}}{{/apiInfo}}>(services); + HostConfiguration<{{#apiInfo}}{{#apis}}T{{classname}}{{^-last}}, {{/-last}}{{/apis}}{{/apiInfo}}> config = new{{^net70OrLater}} HostConfiguration<{{#apiInfo}}{{#apis}}T{{classname}}{{^-last}}, {{/-last}}{{/apis}}{{/apiInfo}}>{{/net70OrLater}}(services); Add{{apiName}}(services, config); } @@ -37,7 +36,6 @@ namespace {{packageName}}.Extensions /// Add the api to your host builder. /// /// - /// public static void Add{{apiName}}(this IServiceCollection services) { HostConfiguration<{{>DefaultApis}}> config = new HostConfiguration<{{>DefaultApis}}>(services); @@ -57,7 +55,7 @@ namespace {{packageName}}.Extensions {{/apis}} {{/apiInfo}} { - HostConfiguration<{{#apiInfo}}{{#apis}}T{{classname}}{{^-last}}, {{/-last}}{{/apis}}{{/apiInfo}}> config = new HostConfiguration<{{#apiInfo}}{{#apis}}T{{classname}}{{^-last}}, {{/-last}}{{/apis}}{{/apiInfo}}>(services); + HostConfiguration<{{#apiInfo}}{{#apis}}T{{classname}}{{^-last}}, {{/-last}}{{/apis}}{{/apiInfo}}> config = new{{^net70OrLater}} HostConfiguration<{{#apiInfo}}{{#apis}}T{{classname}}{{^-last}}, {{/-last}}{{/apis}}{{/apiInfo}}>{{/net70OrLater}}(services); options(config); Add{{apiName}}(services, config); } diff --git a/modules/openapi-generator/src/main/resources/csharp-netcore/netcore_project.mustache b/modules/openapi-generator/src/main/resources/csharp-netcore/netcore_project.mustache index fa1448fe448..f7a47dfa74e 100644 --- a/modules/openapi-generator/src/main/resources/csharp-netcore/netcore_project.mustache +++ b/modules/openapi-generator/src/main/resources/csharp-netcore/netcore_project.mustache @@ -51,7 +51,7 @@ {{/validatable}} -{{^net60OrLater}} +{{^useGenericHost}} {{#net48}} @@ -64,5 +64,5 @@ {{/net48}} -{{/net60OrLater}} +{{/useGenericHost}} {{>netcore_project.additions}} diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools.Test/Api/ApiTestsBase.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools.Test/Api/ApiTestsBase.cs index 9998e96c63f..09680ae4ced 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools.Test/Api/ApiTestsBase.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools.Test/Api/ApiTestsBase.cs @@ -52,20 +52,25 @@ namespace Org.OpenAPITools.Test.Api public static IHostBuilder CreateHostBuilder(string[] args) => Host.CreateDefaultBuilder(args) .ConfigureApi((context, services, options) => { - ApiKeyToken apiKeyToken = new(context.Configuration[""], timeout: TimeSpan.FromSeconds(1)); + string apiKeyTokenValue = context.Configuration[""] ?? throw new Exception("Token not found."); + ApiKeyToken apiKeyToken = new(apiKeyTokenValue, timeout: TimeSpan.FromSeconds(1)); options.AddTokens(apiKeyToken); - - BearerToken bearerToken = new(context.Configuration[""], timeout: TimeSpan.FromSeconds(1)); + + string bearerTokenValue = context.Configuration[""] ?? throw new Exception("Token not found."); + BearerToken bearerToken = new(bearerTokenValue, timeout: TimeSpan.FromSeconds(1)); options.AddTokens(bearerToken); - - BasicToken basicToken = new(context.Configuration[""], context.Configuration[""], timeout: TimeSpan.FromSeconds(1)); + + string basicTokenUsername = context.Configuration[""] ?? throw new Exception("Username not found."); + string basicTokenPassword = context.Configuration[""] ?? throw new Exception("Password not found."); + BasicToken basicToken = new(basicTokenUsername, basicTokenPassword, timeout: TimeSpan.FromSeconds(1)); options.AddTokens(basicToken); - + HttpSigningConfiguration config = new("", "", null, new List(), HashAlgorithmName.SHA256, "", 0); HttpSignatureToken httpSignatureToken = new(config, timeout: TimeSpan.FromSeconds(1)); options.AddTokens(httpSignatureToken); - - OAuthToken oauthToken = new(context.Configuration[""], timeout: TimeSpan.FromSeconds(1)); + + string oauthTokenValue = context.Configuration[""] ?? throw new Exception("Token not found."); + OAuthToken oauthToken = new(oauthTokenValue, timeout: TimeSpan.FromSeconds(1)); options.AddTokens(oauthToken); }); } diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Extensions/IServiceCollectionExtensions.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Extensions/IServiceCollectionExtensions.cs index 1ed9bbd90ad..7efb851d8f0 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Extensions/IServiceCollectionExtensions.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0-nrt/src/Org.OpenAPITools/Extensions/IServiceCollectionExtensions.cs @@ -36,7 +36,7 @@ namespace Org.OpenAPITools.Extensions where TStoreApi : class, IApi.IStoreApi where TUserApi : class, IApi.IUserApi { - HostConfiguration config = new HostConfiguration(services); + HostConfiguration config = new(services); options(config); AddApi(services, config); } diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools.Test/Api/ApiTestsBase.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools.Test/Api/ApiTestsBase.cs index 9998e96c63f..09680ae4ced 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools.Test/Api/ApiTestsBase.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools.Test/Api/ApiTestsBase.cs @@ -52,20 +52,25 @@ namespace Org.OpenAPITools.Test.Api public static IHostBuilder CreateHostBuilder(string[] args) => Host.CreateDefaultBuilder(args) .ConfigureApi((context, services, options) => { - ApiKeyToken apiKeyToken = new(context.Configuration[""], timeout: TimeSpan.FromSeconds(1)); + string apiKeyTokenValue = context.Configuration[""] ?? throw new Exception("Token not found."); + ApiKeyToken apiKeyToken = new(apiKeyTokenValue, timeout: TimeSpan.FromSeconds(1)); options.AddTokens(apiKeyToken); - - BearerToken bearerToken = new(context.Configuration[""], timeout: TimeSpan.FromSeconds(1)); + + string bearerTokenValue = context.Configuration[""] ?? throw new Exception("Token not found."); + BearerToken bearerToken = new(bearerTokenValue, timeout: TimeSpan.FromSeconds(1)); options.AddTokens(bearerToken); - - BasicToken basicToken = new(context.Configuration[""], context.Configuration[""], timeout: TimeSpan.FromSeconds(1)); + + string basicTokenUsername = context.Configuration[""] ?? throw new Exception("Username not found."); + string basicTokenPassword = context.Configuration[""] ?? throw new Exception("Password not found."); + BasicToken basicToken = new(basicTokenUsername, basicTokenPassword, timeout: TimeSpan.FromSeconds(1)); options.AddTokens(basicToken); - + HttpSigningConfiguration config = new("", "", null, new List(), HashAlgorithmName.SHA256, "", 0); HttpSignatureToken httpSignatureToken = new(config, timeout: TimeSpan.FromSeconds(1)); options.AddTokens(httpSignatureToken); - - OAuthToken oauthToken = new(context.Configuration[""], timeout: TimeSpan.FromSeconds(1)); + + string oauthTokenValue = context.Configuration[""] ?? throw new Exception("Token not found."); + OAuthToken oauthToken = new(oauthTokenValue, timeout: TimeSpan.FromSeconds(1)); options.AddTokens(oauthToken); }); } diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Extensions/IServiceCollectionExtensions.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Extensions/IServiceCollectionExtensions.cs index b7cfb5f6f9c..0cfa0f2cc58 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Extensions/IServiceCollectionExtensions.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-net6.0/src/Org.OpenAPITools/Extensions/IServiceCollectionExtensions.cs @@ -34,7 +34,7 @@ namespace Org.OpenAPITools.Extensions where TStoreApi : class, IApi.IStoreApi where TUserApi : class, IApi.IUserApi { - HostConfiguration config = new HostConfiguration(services); + HostConfiguration config = new(services); options(config); AddApi(services, config); } diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netcore-latest-allOf/src/Org.OpenAPITools.Test/Api/ApiTestsBase.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netcore-latest-allOf/src/Org.OpenAPITools.Test/Api/ApiTestsBase.cs index 7cc496a25fc..5dd80394d3f 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netcore-latest-allOf/src/Org.OpenAPITools.Test/Api/ApiTestsBase.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netcore-latest-allOf/src/Org.OpenAPITools.Test/Api/ApiTestsBase.cs @@ -52,7 +52,7 @@ namespace Org.OpenAPITools.Test.Api public static IHostBuilder CreateHostBuilder(string[] args) => Host.CreateDefaultBuilder(args) .ConfigureApi((context, services, options) => { - + }); } } diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netcore-latest-allOf/src/Org.OpenAPITools/Extensions/IServiceCollectionExtensions.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netcore-latest-allOf/src/Org.OpenAPITools/Extensions/IServiceCollectionExtensions.cs index b765454c522..e457cbcc66c 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netcore-latest-allOf/src/Org.OpenAPITools/Extensions/IServiceCollectionExtensions.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netcore-latest-allOf/src/Org.OpenAPITools/Extensions/IServiceCollectionExtensions.cs @@ -26,11 +26,10 @@ namespace Org.OpenAPITools.Extensions /// Add the api to your host builder. /// /// - /// public static void AddApi(this IServiceCollection services) where TDefaultApi : class, IApi.IDefaultApi { - HostConfiguration config = new HostConfiguration(services); + HostConfiguration config = new(services); AddApi(services, config); } @@ -38,7 +37,6 @@ namespace Org.OpenAPITools.Extensions /// Add the api to your host builder. /// /// - /// public static void AddApi(this IServiceCollection services) { HostConfiguration config = new HostConfiguration(services); @@ -53,7 +51,7 @@ namespace Org.OpenAPITools.Extensions public static void AddApi(this IServiceCollection services, Action> options) where TDefaultApi : class, IApi.IDefaultApi { - HostConfiguration config = new HostConfiguration(services); + HostConfiguration config = new(services); options(config); AddApi(services, config); } diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netcore-latest-anyOf/src/Org.OpenAPITools.Test/Api/ApiTestsBase.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netcore-latest-anyOf/src/Org.OpenAPITools.Test/Api/ApiTestsBase.cs index d66ca3bec96..5a82cd6c99d 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netcore-latest-anyOf/src/Org.OpenAPITools.Test/Api/ApiTestsBase.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netcore-latest-anyOf/src/Org.OpenAPITools.Test/Api/ApiTestsBase.cs @@ -52,7 +52,7 @@ namespace Org.OpenAPITools.Test.Api public static IHostBuilder CreateHostBuilder(string[] args) => Host.CreateDefaultBuilder(args) .ConfigureApi((context, services, options) => { - + }); } } diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netcore-latest-anyOf/src/Org.OpenAPITools/Extensions/IServiceCollectionExtensions.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netcore-latest-anyOf/src/Org.OpenAPITools/Extensions/IServiceCollectionExtensions.cs index 600e947355b..4397068001a 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netcore-latest-anyOf/src/Org.OpenAPITools/Extensions/IServiceCollectionExtensions.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netcore-latest-anyOf/src/Org.OpenAPITools/Extensions/IServiceCollectionExtensions.cs @@ -26,11 +26,10 @@ namespace Org.OpenAPITools.Extensions /// Add the api to your host builder. /// /// - /// public static void AddApi(this IServiceCollection services) where TDefaultApi : class, IApi.IDefaultApi { - HostConfiguration config = new HostConfiguration(services); + HostConfiguration config = new(services); AddApi(services, config); } @@ -38,7 +37,6 @@ namespace Org.OpenAPITools.Extensions /// Add the api to your host builder. /// /// - /// public static void AddApi(this IServiceCollection services) { HostConfiguration config = new HostConfiguration(services); @@ -53,7 +51,7 @@ namespace Org.OpenAPITools.Extensions public static void AddApi(this IServiceCollection services, Action> options) where TDefaultApi : class, IApi.IDefaultApi { - HostConfiguration config = new HostConfiguration(services); + HostConfiguration config = new(services); options(config); AddApi(services, config); } diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netcore-latest-oneOf/src/Org.OpenAPITools.Test/Api/ApiTestsBase.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netcore-latest-oneOf/src/Org.OpenAPITools.Test/Api/ApiTestsBase.cs index d66ca3bec96..5a82cd6c99d 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netcore-latest-oneOf/src/Org.OpenAPITools.Test/Api/ApiTestsBase.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netcore-latest-oneOf/src/Org.OpenAPITools.Test/Api/ApiTestsBase.cs @@ -52,7 +52,7 @@ namespace Org.OpenAPITools.Test.Api public static IHostBuilder CreateHostBuilder(string[] args) => Host.CreateDefaultBuilder(args) .ConfigureApi((context, services, options) => { - + }); } } diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netcore-latest-oneOf/src/Org.OpenAPITools/Extensions/IServiceCollectionExtensions.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netcore-latest-oneOf/src/Org.OpenAPITools/Extensions/IServiceCollectionExtensions.cs index 600e947355b..4397068001a 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netcore-latest-oneOf/src/Org.OpenAPITools/Extensions/IServiceCollectionExtensions.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netcore-latest-oneOf/src/Org.OpenAPITools/Extensions/IServiceCollectionExtensions.cs @@ -26,11 +26,10 @@ namespace Org.OpenAPITools.Extensions /// Add the api to your host builder. /// /// - /// public static void AddApi(this IServiceCollection services) where TDefaultApi : class, IApi.IDefaultApi { - HostConfiguration config = new HostConfiguration(services); + HostConfiguration config = new(services); AddApi(services, config); } @@ -38,7 +37,6 @@ namespace Org.OpenAPITools.Extensions /// Add the api to your host builder. /// /// - /// public static void AddApi(this IServiceCollection services) { HostConfiguration config = new HostConfiguration(services); @@ -53,7 +51,7 @@ namespace Org.OpenAPITools.Extensions public static void AddApi(this IServiceCollection services, Action> options) where TDefaultApi : class, IApi.IDefaultApi { - HostConfiguration config = new HostConfiguration(services); + HostConfiguration config = new(services); options(config); AddApi(services, config); } diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools.Test/Api/ApiTestsBase.cs b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools.Test/Api/ApiTestsBase.cs index 75e37de2412..b44e3191e8d 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools.Test/Api/ApiTestsBase.cs +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools.Test/Api/ApiTestsBase.cs @@ -52,20 +52,25 @@ namespace Org.OpenAPITools.Test.Api public static IHostBuilder CreateHostBuilder(string[] args) => Host.CreateDefaultBuilder(args) .ConfigureApi((context, services, options) => { - ApiKeyToken apiKeyToken = new ApiKeyToken(context.Configuration[""], timeout: TimeSpan.FromSeconds(1)); + string apiKeyTokenValue = context.Configuration[""] ?? throw new Exception("Token not found."); + ApiKeyToken apiKeyToken = new ApiKeyToken(apiKeyTokenValue, timeout: TimeSpan.FromSeconds(1)); options.AddTokens(apiKeyToken); - - BearerToken bearerToken = new BearerToken(context.Configuration[""], timeout: TimeSpan.FromSeconds(1)); + + string bearerTokenValue = context.Configuration[""] ?? throw new Exception("Token not found."); + BearerToken bearerToken = new BearerToken(bearerTokenValue, timeout: TimeSpan.FromSeconds(1)); options.AddTokens(bearerToken); - - BasicToken basicToken = new BasicToken(context.Configuration[""], context.Configuration[""], timeout: TimeSpan.FromSeconds(1)); + + string basicTokenUsername = context.Configuration[""] ?? throw new Exception("Username not found."); + string basicTokenPassword = context.Configuration[""] ?? throw new Exception("Password not found."); + BasicToken basicToken = new BasicToken(basicTokenUsername, basicTokenPassword, timeout: TimeSpan.FromSeconds(1)); options.AddTokens(basicToken); - + HttpSigningConfiguration config = new HttpSigningConfiguration("", "", null, new List(), HashAlgorithmName.SHA256, "", 0); HttpSignatureToken httpSignatureToken = new HttpSignatureToken(config, timeout: TimeSpan.FromSeconds(1)); options.AddTokens(httpSignatureToken); - - OAuthToken oauthToken = new OAuthToken(context.Configuration[""], timeout: TimeSpan.FromSeconds(1)); + + string oauthTokenValue = context.Configuration[""] ?? throw new Exception("Token not found."); + OAuthToken oauthToken = new OAuthToken(oauthTokenValue, timeout: TimeSpan.FromSeconds(1)); options.AddTokens(oauthToken); }); } diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Org.OpenAPITools.csproj b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Org.OpenAPITools.csproj index 6fe89418c30..5cbefcd8fba 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Org.OpenAPITools.csproj +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-generichost-netstandard2.0/src/Org.OpenAPITools/Org.OpenAPITools.csproj @@ -28,10 +28,4 @@ - - - - - - diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/src/Org.OpenAPITools/Org.OpenAPITools.csproj b/samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/src/Org.OpenAPITools/Org.OpenAPITools.csproj index 60b0e36b344..d3f3b489b0f 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/src/Org.OpenAPITools/Org.OpenAPITools.csproj +++ b/samples/client/petstore/csharp-netcore/OpenAPIClient-net5.0/src/Org.OpenAPITools/Org.OpenAPITools.csproj @@ -28,4 +28,10 @@ + + + + + + diff --git a/samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools/Org.OpenAPITools.csproj b/samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools/Org.OpenAPITools.csproj index 60b0e36b344..d3f3b489b0f 100644 --- a/samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools/Org.OpenAPITools.csproj +++ b/samples/client/petstore/csharp-netcore/OpenAPIClientCore/src/Org.OpenAPITools/Org.OpenAPITools.csproj @@ -28,4 +28,10 @@ + + + + + +