Skip to content

Small cleanup Invoke-RestMethod #19490

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
iSazonov merged 12 commits into from
May 22, 2023
Merged

Small cleanup Invoke-RestMethod #19490

Changes from all commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
d9dd8ba
simplify CheckReturnType
CarloToso Apr 9, 2023
b5a5601
remove var
CarloToso Apr 9, 2023
60b148b
encoding.HeaderName is never null or empty
CarloToso Apr 9, 2023
6122df5
reorder
CarloToso Apr 9, 2023
d81b18e
capitalize comments
CarloToso Apr 9, 2023
ec6014a
out ErrorRecord
CarloToso Apr 9, 2023
0a43252
remove base
CarloToso Apr 9, 2023
b8836e7
Merge branch 'master' into cleanup-invokerestmethod
CarloToso Apr 11, 2023
f2dff39
revert base
CarloToso Apr 12, 2023
4e40c77
Merge branch 'master' into cleanup-invokerestmethod
CarloToso May 8, 2023
53c23b0
fix nullable
CarloToso May 8, 2023
45ec2ab
update code
CarloToso May 10, 2023
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
32 changes: 14 additions & 18 deletions ...hell.Commands.Utility/commands/utility/WebCmdlet/Common/InvokeRestMethodCommand.Common.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -84,7 +84,7 @@ internal override void ProcessResponse(HttpResponseMessage response)

if (ShouldWriteToPipeline)
{
using var responseStream = new BufferingStreamReader(baseResponseStream, _cancelToken.Token);
using BufferingStreamReader responseStream = new(baseResponseStream, _cancelToken.Token);

// First see if it is an RSS / ATOM feed, in which case we can
// stream it - unless the user has overridden it with a return type of "XML"
Expand All @@ -94,45 +94,44 @@ internal override void ProcessResponse(HttpResponseMessage response)
}
else
{
// Determine the response type
RestReturnType returnType = CheckReturnType(response);

// Try to get the response encoding from the ContentType header.
string? characterSet = WebResponseHelper.GetCharacterSet(response);

string str = StreamHelper.DecodeStream(responseStream, characterSet, out Encoding encoding, _cancelToken.Token);

object? obj = null;
Exception? ex = null;

string encodingVerboseName;
try
{
encodingVerboseName = string.IsNullOrEmpty(encoding.HeaderName) ? encoding.EncodingName : encoding.HeaderName;
encodingVerboseName = encoding.HeaderName;
}
catch (NotSupportedException)
catch
{
encodingVerboseName = encoding.EncodingName;
encodingVerboseName = string.Empty;
}

// NOTE: Tests use this verbose output to verify the encoding.
WriteVerbose(string.Create(System.Globalization.CultureInfo.InvariantCulture, $"Content encoding: {encodingVerboseName}"));

// Determine the response type
RestReturnType returnType = CheckReturnType(response);

bool convertSuccess = false;
object? obj = null;
Exception? ex = null;

if (returnType == RestReturnType.Json)
{
convertSuccess = TryConvertToJson(str, out obj, ref ex) || TryConvertToXml(str, out obj, ref ex);
}
// default to try xml first since it's more common
// Default to try xml first since it's more common
else
{
convertSuccess = TryConvertToXml(str, out obj, ref ex) || TryConvertToJson(str, out obj, ref ex);
}

if (!convertSuccess)
{
// fallback to string
// Fallback to string
obj = str;
}

Expand Down Expand Up @@ -171,11 +170,8 @@ private static RestReturnType CheckReturnType(HttpResponseMessage response)

RestReturnType rt = RestReturnType.Detect;
string? contentType = ContentHelper.GetContentType(response);
if (string.IsNullOrEmpty(contentType))
{
rt = RestReturnType.Detect;
}
else if (ContentHelper.IsJson(contentType))

if (ContentHelper.IsJson(contentType))
{
rt = RestReturnType.Json;
}
Expand Down Expand Up @@ -272,7 +268,7 @@ private static bool TryConvertToXml(string xml, [NotNullWhen(true)] out object?
XmlReaderSettings settings = GetSecureXmlReaderSettings();
XmlReader xmlReader = XmlReader.Create(new StringReader(xml), settings);

var xmlDoc = new XmlDocument();
XmlDocument xmlDoc = new();
xmlDoc.PreserveWhitespace = true;
xmlDoc.Load(xmlReader);

Expand Down