Skip to content

WebCmdlets relocate to Common Path #19122

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

Closed
CarloToso wants to merge 2 commits into from
Closed

WebCmdlets relocate to Common Path #19122

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
1c834f0
Relocate to Common Path
CarloToso Feb 9, 2023
3d06b20
FIx CodeFactor
CarloToso Feb 9, 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
0 ...mmon/BasicHtmlWebResponseObject.Common.cs → ...y/WebCmdlet/BasicHtmlWebResponseObject.cs
View file
Open in desktop
File renamed without changes.
0 ...nds/utility/WebCmdlet/WebRequestMethod.cs → ...bCmdlet/Common/WebRequestMethod.Common.cs
View file
Open in desktop
File renamed without changes.
2 changes: 1 addition & 1 deletion .../WebCmdlet/Common/ContentHelper.Common.cs → ...mmands/utility/WebCmdlet/ContentHelper.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -130,7 +130,7 @@ private static bool CheckIsText(string contentType)
if (extensionKey != null)
{
string perceivedType = extensionKey.GetValue("PerceivedType") as string;
isText = (perceivedType == "text");
isText = perceivedType == "text";
}
}
}
Expand Down
0 ...WebCmdlet/CoreCLR/HttpKnownHeaderNames.cs → ...utility/WebCmdlet/HttpKnownHeaderNames.cs
View file
Open in desktop
File renamed without changes.
0 ...Common/HttpVersionCompletionsAttribute.cs → ...Cmdlet/HttpVersionCompletionsAttribute.cs
View file
Open in desktop
File renamed without changes.
14 changes: 8 additions & 6 deletions .../Common/InvokeRestMethodCommand.Common.cs → ...lity/WebCmdlet/InvokeRestMethodCommand.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -120,11 +120,11 @@ internal override void ProcessResponse(HttpResponseMessage response)

bool convertSuccess = false;

// Default to try json first since it's more common
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
else
{
convertSuccess = TryConvertToXml(str, out obj, ref ex) || TryConvertToJson(str, out obj, ref ex);
Expand Down Expand Up @@ -216,10 +216,9 @@ private bool TryProcessFeedStream(Stream responseStream)
while (!reader.EOF)
{
// If node is Element and it's the 'Item' or 'Entry' node, emit that node.
if ((reader.NodeType == XmlNodeType.Element) &&
(string.Equals("Item", reader.Name, StringComparison.OrdinalIgnoreCase) ||
string.Equals("Entry", reader.Name, StringComparison.OrdinalIgnoreCase))
)
if (reader.NodeType == XmlNodeType.Element
&& (string.Equals("Item", reader.Name, StringComparison.OrdinalIgnoreCase)
|| string.Equals("Entry", reader.Name, StringComparison.OrdinalIgnoreCase)))
{
// This one will do reader.Read() internally
XmlNode result = workingDocument.ReadNode(reader);
Expand All @@ -232,7 +231,10 @@ private bool TryProcessFeedStream(Stream responseStream)
}
}
}
catch (XmlException) { }
catch (XmlException)
{
// Catch XmlException
}
finally
{
responseStream.Seek(0, SeekOrigin.Begin);
Expand Down
0 ...nds/utility/WebCmdlet/CoreCLR/WebProxy.cs → ...ty/commands/utility/WebCmdlet/WebProxy.cs
View file
Open in desktop
File renamed without changes.
1 change: 1 addition & 0 deletions ...dlet/CoreCLR/WebResponseHelper.CoreClr.cs → ...ds/utility/WebCmdlet/WebResponseHelper.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@ internal static Dictionary<string, IEnumerable<string>> GetHeadersDictionary(Htt
{
headers[entry.Key] = entry.Value;
}

// In CoreFX, HttpResponseMessage separates content related headers, such as Content-Type to
// HttpResponseMessage.Content.Headers. The remaining headers are in HttpResponseMessage.Headers.
// The keys in both should be unique with no duplicates between them.
Expand Down
9 changes: 5 additions & 4 deletions ...Cmdlet/Common/WebResponseObject.Common.cs → ...ds/utility/WebCmdlet/WebResponseObject.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ public class WebResponseObject
public HttpResponseMessage BaseResponse { get; set; }

/// <summary>
/// Gets or protected sets the response body content.
/// Gets or sets the response body content.
/// </summary>
public byte[] Content { get; protected set; }

Expand All @@ -35,7 +35,7 @@ public class WebResponseObject
private Dictionary<string, IEnumerable<string>> _headers = null;

/// <summary>
/// Gets or protected sets the full response content.
/// Gets or sets the full response content.
/// </summary>
/// <value>
/// Full response content, including the HTTP status line, headers, and body.
Expand All @@ -48,7 +48,7 @@ public class WebResponseObject
public long RawContentLength => RawContentStream is null ? -1 : RawContentStream.Length;

/// <summary>
/// Gets or protected sets the response body content as a <see cref="MemoryStream"/>.
/// Gets or sets the response body content as a <see cref="MemoryStream"/>.
/// </summary>
public MemoryStream RawContentStream { get; protected set; }

Expand Down Expand Up @@ -150,7 +150,8 @@ private void SetResponse(HttpResponseMessage response, Stream contentStream)
int initialCapacity = (int)Math.Min(contentLength, StreamHelper.DefaultReadBuffer);
RawContentStream = new WebResponseContentMemoryStream(st, initialCapacity, cmdlet: null, response.Content.Headers.ContentLength.GetValueOrDefault());
}
// set the position of the content stream to the beginning

// Set the position of the content stream to the beginning
RawContentStream.Position = 0;
}

Expand Down
0 ...reCLR/WebResponseObjectFactory.CoreClr.cs → ...ity/WebCmdlet/WebResponseObjectFactory.cs
View file
Open in desktop
File renamed without changes.