diff --git a/src/NSwag.CodeGeneration.CSharp/Templates/Client.Class.liquid b/src/NSwag.CodeGeneration.CSharp/Templates/Client.Class.liquid index 00ba41876..b1bf8481e 100644 --- a/src/NSwag.CodeGeneration.CSharp/Templates/Client.Class.liquid +++ b/src/NSwag.CodeGeneration.CSharp/Templates/Client.Class.liquid @@ -131,7 +131,7 @@ {% if GenerateOptionalParameters == false -%} {% template Client.Method.Documentation %} {% template Client.Method.Annotations %} - {{ operation.MethodAccessModifier }} virtual {{ operation.ResultType }} {{ operation.ActualOperationName }}Async({% for parameter in operation.Parameters %}{{ parameter.Type }} {{ parameter.VariableName }}{% if GenerateOptionalParameters and parameter.IsOptional %} = null{% endif %}{% if parameter.IsLast == false %}, {% endif %}{% endfor %}) + {{ operation.MethodAccessModifier }} virtual {{ operation.ResultType }} {{ operation.ActualOperationName }}Async({% for parameter in operation.Parameters %}{{ parameter.Type }} {{ parameter.VariableName }}{% if GenerateOptionalParameters and parameter.IsOptional %}{% if parameter.HasDefault %} = {{ parameter.Default }}{% else %} = null{% endif %}{% endif %}{% if parameter.IsLast == false %}, {% endif %}{% endfor %}) { return {{ operation.ActualOperationName }}Async({% for parameter in operation.Parameters %}{{ parameter.VariableName }}, {% endfor %}System.Threading.CancellationToken.None); } @@ -140,7 +140,7 @@ {% if GenerateSyncMethods -%} {% template Client.Method.Documentation %} {% template Client.Method.Annotations %} - {{ operation.MethodAccessModifier }} virtual {{ operation.SyncResultType }} {{ operation.ActualOperationName }}({% for parameter in operation.Parameters %}{{ parameter.Type }} {{ parameter.VariableName }}{% if GenerateOptionalParameters and parameter.IsOptional %} = null{% endif %}{% if parameter.IsLast == false %}, {% endif %}{% endfor %}) + {{ operation.MethodAccessModifier }} virtual {{ operation.SyncResultType }} {{ operation.ActualOperationName }}({% for parameter in operation.Parameters %}{{ parameter.Type }} {{ parameter.VariableName }}{% if GenerateOptionalParameters and parameter.IsOptional %}{% if parameter.HasDefault %} = {{ parameter.Default }}{% else %} = null{% endif %}{% endif %}{% if parameter.IsLast == false %}, {% endif %}{% endfor %}) { {% if operation.HasResult or operation.WrapResponse %}return {% endif %}System.Threading.Tasks.Task.Run(async () => await {{ operation.ActualOperationName }}Async({% for parameter in operation.Parameters %}{{ parameter.VariableName }}, {% endfor %}System.Threading.CancellationToken.None)).GetAwaiter().GetResult(); } @@ -149,7 +149,7 @@ /// A cancellation token that can be used by other objects or threads to receive notice of cancellation. {% template Client.Method.Documentation %} {% template Client.Method.Annotations %} - {{ operation.MethodAccessModifier }} virtual async {{ operation.ResultType }} {{ operation.ActualOperationName }}Async({% for parameter in operation.Parameters %}{{ parameter.Type }} {{ parameter.VariableName }}{% if GenerateOptionalParameters and parameter.IsOptional %} = null{% endif %}, {% endfor %}System.Threading.CancellationToken cancellationToken{% if GenerateOptionalParameters %} = default(System.Threading.CancellationToken){% endif %}) + {{ operation.MethodAccessModifier }} virtual async {{ operation.ResultType }} {{ operation.ActualOperationName }}Async({% for parameter in operation.Parameters %}{{ parameter.Type }} {{ parameter.VariableName }}{% if GenerateOptionalParameters and parameter.IsOptional %}{% if parameter.HasDefault %} = {{ parameter.Default }}{% else %} = null{% endif %}{% endif %}, {% endfor %}System.Threading.CancellationToken cancellationToken{% if GenerateOptionalParameters %} = default(System.Threading.CancellationToken){% endif %}) { {% for parameter in operation.PathParameters -%} {% if parameter.IsNullable == false and parameter.IsRequired -%} diff --git a/src/NSwag.CodeGeneration.CSharp/Templates/Client.Interface.liquid b/src/NSwag.CodeGeneration.CSharp/Templates/Client.Interface.liquid index c1d63ef4d..69cd82570 100644 --- a/src/NSwag.CodeGeneration.CSharp/Templates/Client.Interface.liquid +++ b/src/NSwag.CodeGeneration.CSharp/Templates/Client.Interface.liquid @@ -7,19 +7,19 @@ {% if GenerateOptionalParameters == false -%} {% template Client.Method.Documentation %} {% template Client.Method.Annotations %} - {{ operation.ResultType }} {{ operation.ActualOperationName }}Async({% for parameter in operation.Parameters %}{{ parameter.Type }} {{ parameter.VariableName }}{% if GenerateOptionalParameters and parameter.IsOptional %} = null{% endif %}{% if parameter.IsLast == false %}, {% endif %}{% endfor %}); + {{ operation.ResultType }} {{ operation.ActualOperationName }}Async({% for parameter in operation.Parameters %}{{ parameter.Type }} {{ parameter.VariableName }}{% if GenerateOptionalParameters and parameter.IsOptional %}{% if parameter.HasDefault %} = {{ parameter.Default }}{% else %} = null{% endif %}{% endif %}{% if parameter.IsLast == false %}, {% endif %}{% endfor %}); {% endif -%} {% if GenerateSyncMethods -%} {% template Client.Method.Documentation %} {% template Client.Method.Annotations %} - {{ operation.SyncResultType }} {{ operation.ActualOperationName }}({% for parameter in operation.Parameters %}{{ parameter.Type }} {{ parameter.VariableName }}{% if GenerateOptionalParameters and parameter.IsOptional %} = null{% endif %}{% if parameter.IsLast == false %}, {% endif %}{% endfor %}); + {{ operation.SyncResultType }} {{ operation.ActualOperationName }}({% for parameter in operation.Parameters %}{{ parameter.Type }} {{ parameter.VariableName }}{% if GenerateOptionalParameters and parameter.IsOptional %}{% if parameter.HasDefault %} = {{ parameter.Default }}{% else %} = null{% endif %}{% endif %}{% if parameter.IsLast == false %}, {% endif %}{% endfor %}); {%- endif %} /// A cancellation token that can be used by other objects or threads to receive notice of cancellation. {% template Client.Method.Documentation %} {% template Client.Method.Annotations %} - {{ operation.ResultType }} {{ operation.ActualOperationName }}Async({% for parameter in operation.Parameters %}{{ parameter.Type }} {{ parameter.VariableName }}{% if GenerateOptionalParameters and parameter.IsOptional %} = null{% endif %}, {% endfor %}System.Threading.CancellationToken cancellationToken{% if GenerateOptionalParameters %} = default(System.Threading.CancellationToken){% endif %}); + {{ operation.ResultType }} {{ operation.ActualOperationName }}Async({% for parameter in operation.Parameters %}{{ parameter.Type }} {{ parameter.VariableName }}{% if GenerateOptionalParameters and parameter.IsOptional %}{% if parameter.HasDefault %} = {{ parameter.Default }}{% else %} = null{% endif %}{% endif %}, {% endfor %}System.Threading.CancellationToken cancellationToken{% if GenerateOptionalParameters %} = default(System.Threading.CancellationToken){% endif %}); {% endfor -%} } \ No newline at end of file