Skip to content
This repository was archived by the owner on Jun 16, 2026. It is now read-only.
Merged
Show file tree
Hide file tree
Changes from 3 commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
36 changes: 24 additions & 12 deletions samples/AnomalyDetector/src/Generated/AnomalyDetectorClient.cs

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

40 changes: 33 additions & 7 deletions src/AutoRest.CSharp/LowLevel/Output/ConvenienceMethod.cs
Original file line number Diff line number Diff line change
Expand Up @@ -21,17 +21,20 @@ internal record ConvenienceMethod(MethodSignature Signature, IReadOnlyList<Proto
{
public (IReadOnlyList<FormattableString> ParameterValues, Action<CodeWriter> Converter) GetParameterValues(CodeWriterDeclaration contextVariable)
{
var (parameterValues, spreadVariable) = PrepareConvenienceMethodParameters(contextVariable);
var (parameterValues, contentInfo, spreadVariable) = PrepareConvenienceMethodParameters(contextVariable);

var converter = EnsureConvenienceBodyConverter(spreadVariable, contextVariable);
var converter = EnsureConvenienceBodyConverter(spreadVariable, contextVariable, contentInfo);

return (parameterValues, converter);
}

private (IReadOnlyList<FormattableString> ParameterValues, CodeWriterDeclaration? SpreadVariable) PrepareConvenienceMethodParameters(CodeWriterDeclaration contextVariable)
private record ContentInfo(CodeWriterDeclaration ContentVariable, FormattableString ContentValue);
Comment thread
pshao25 marked this conversation as resolved.
Outdated

private (IReadOnlyList<FormattableString> ParameterValues, ContentInfo? ContentInfo, CodeWriterDeclaration? SpreadVariable) PrepareConvenienceMethodParameters(CodeWriterDeclaration contextVariable)
{
CodeWriterDeclaration? spreadVariable = null;
var parameters = new List<FormattableString>();
ContentInfo? contentInfo = null;
foreach (var converter in ProtocolToConvenienceParameterConverters)
{
var protocolParameter = converter.Protocol;
Expand All @@ -43,7 +46,18 @@ internal record ConvenienceMethod(MethodSignature Signature, IReadOnlyList<Proto
else if (convenienceParameter != null)
{
if (converter.ConvenienceSpread == null)
parameters.Add(convenienceParameter.GetConversionFormattable(protocolParameter.Type));
{
var parameter = convenienceParameter.GetConversionFormattable(protocolParameter.Type);
if (protocolParameter.Type.EqualsIgnoreNullable(typeof(RequestContent)))
{
contentInfo = new ContentInfo(new CodeWriterDeclaration(KnownParameters.RequestContent.Name), $"{parameter:I}");
parameters.Add($"{contentInfo.ContentVariable:I}");
}
else
{
parameters.Add(parameter);
}
}
else
{
// we put a declaration here to avoid possible local variable naming collisions
Expand All @@ -57,14 +71,21 @@ internal record ConvenienceMethod(MethodSignature Signature, IReadOnlyList<Proto
}
}

return (parameters, spreadVariable);
return (parameters, contentInfo, spreadVariable);
}

private Action<CodeWriter> EnsureConvenienceBodyConverter(CodeWriterDeclaration? spreadVariable, CodeWriterDeclaration contextVariable)
private Action<CodeWriter> EnsureConvenienceBodyConverter(CodeWriterDeclaration? spreadVariable, CodeWriterDeclaration contextVariable, ContentInfo? contentInfo)
{
var convenienceSpread = ProtocolToConvenienceParameterConverters.Select(c => c.ConvenienceSpread).WhereNotNull().SingleOrDefault();
if (spreadVariable == null || convenienceSpread == null)
return writer => WriteCancellationTokenToRequestContext(writer, contextVariable);
return writer =>
{
WriteCancellationTokenToRequestContext(writer, contextVariable);
if (contentInfo != null)
{
WriteBodyToRequestContent(writer, contentInfo.ContentVariable, contentInfo.ContentValue);
}
};

// we need to get all the property initializers therefore here we use serialization constructor
var serializationCtor = convenienceSpread.BackingModel.SerializationConstructor;
Expand All @@ -91,6 +112,11 @@ private static void WriteCancellationTokenToRequestContext(CodeWriter writer, Co
writer.Line($"{typeof(RequestContext)} {contextVariable:D} = FromCancellationToken({KnownParameters.CancellationTokenParameter.Name});");
}

private static void WriteBodyToRequestContent(CodeWriter writer, CodeWriterDeclaration contentVariable, FormattableString requestContentValue)
{
writer.Line($"using {typeof(RequestContent)} {contentVariable:D} = {requestContentValue};");
}

public bool IsDeprecatedForExamples()
{
if (Deprecated is not null)
Expand Down

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading