Skip to content

Commit c61a98d

Browse files
committed
remove redundant is required directive
1 parent 31d1266 commit c61a98d

4 files changed

Lines changed: 15 additions & 20 deletions

File tree

src/OpenAPI.WebApiGenerator/CodeGeneration/HttpRequestExtensionsGenerator.cs

Lines changed: 6 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -8,29 +8,26 @@ internal sealed class HttpRequestExtensionsGenerator(
88
internal string CreateBindParameterInvocation(
99
string requestVariableName,
1010
string bindingTypeName,
11-
string parameterSpecificationAsJson,
12-
bool isRequired)
11+
string parameterSpecificationAsJson)
1312
{
1413
return
1514
$""""
1615
{@namespace}.{HttpRequestExtensionsClassName}.Bind<{bindingTypeName}>(
1716
{requestVariableName},
1817
"""
1918
{parameterSpecificationAsJson}
20-
""",
21-
{isRequired.ToString().ToLowerInvariant()})
19+
""")
2220
"""";
2321
}
2422

2523
internal string CreateBindBodyInvocation(
2624
string requestVariableName,
27-
string bindingTypeName,
28-
bool isRequired)
25+
string bindingTypeName)
2926
{
3027
return
3128
$"""
3229
await {@namespace}.{HttpRequestExtensionsClassName}.BindBodyAsync<{bindingTypeName}>(
33-
{requestVariableName}, {isRequired.ToString().ToLowerInvariant()}, cancellationToken)
30+
{requestVariableName}, cancellationToken)
3431
.ConfigureAwait(false)
3532
""";
3633
}
@@ -62,8 +59,7 @@ internal static class {{{HttpRequestExtensionsClassName}}}
6259
/// <returns></returns>
6360
/// <exception cref="BadHttpRequestException"></exception>
6461
internal static T Bind<T>(this HttpRequest request,
65-
string parameterSpecificationAsJson,
66-
bool isRequired)
62+
string parameterSpecificationAsJson)
6763
where T : struct, IJsonValue<T>
6864
{
6965
var parameter = Parameter.FromOpenApi20ParameterSpecification(parameterSpecificationAsJson);
@@ -76,8 +72,7 @@ _ when TryGetValue(request, parameter, out var stringValue) =>
7672
};
7773
}
7874
79-
internal static async Task<T> BindBodyAsync<T>(this HttpRequest request,
80-
bool isRequired,
75+
internal static async Task<T> BindBodyAsync<T>(this HttpRequest request,
8176
CancellationToken cancellationToken)
8277
where T : struct, IJsonValue<T>
8378
{

src/OpenAPI.WebApiGenerator/CodeGeneration/ParameterGenerator.cs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -41,9 +41,9 @@ internal string GenerateRequestBindingDirective(string requestVariableName)
4141
textWriter.Flush();
4242

4343
return $"{PropertyName} = {httpRequestExtensionsGenerator.CreateBindParameterInvocation(
44-
requestVariableName,
45-
FullyQualifiedTypeDeclarationIdentifier,
46-
textWriter.GetStringBuilder().ToString(),
47-
IsParameterRequired).Indent(4).TrimStart()}{(IsParameterRequired ? "" : ".AsOptional()")},";
44+
requestVariableName,
45+
FullyQualifiedTypeDeclarationIdentifier,
46+
textWriter.GetStringBuilder().ToString())
47+
.Indent(4).TrimStart()}{(IsParameterRequired ? "" : ".AsOptional()")},";
4848
}
4949
}

src/OpenAPI.WebApiGenerator/CodeGeneration/RequestBodyContentGenerator.cs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -19,13 +19,13 @@ internal sealed class RequestBodyContentGenerator(
1919

2020
internal string ContentType => contentType;
2121

22-
internal string GenerateRequestBindingDirective(bool isRequired) =>
22+
internal string GenerateRequestBindingDirective() =>
2323
$"""
2424
{PropertyName} =
2525
({httpRequestExtensionsGenerator.CreateBindBodyInvocation(
26-
"request",
27-
FullyQualifiedTypeDeclarationIdentifier,
28-
isRequired).Indent(8).Trim()})
26+
"request",
27+
FullyQualifiedTypeDeclarationIdentifier)
28+
.Indent(8).Trim()})
2929
.AsOptional()
3030
""";
3131

src/OpenAPI.WebApiGenerator/CodeGeneration/RequestBodyGenerator.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -87,7 +87,7 @@ internal sealed class RequestContent
8787
case "{{content.ContentType.ToLower()}}":
8888
return new RequestContent
8989
{
90-
{{content.GenerateRequestBindingDirective(_body.Required).Indent(20)}}
90+
{{content.GenerateRequestBindingDirective().Indent(20)}}
9191
};
9292
""")}}{{(_body.Required ? "" :
9393
"""

0 commit comments

Comments
 (0)