diff --git a/abstractions/dotnet/src/RequestInfo.cs b/abstractions/dotnet/src/RequestInfo.cs index 4641d4b2e8..805e94223f 100644 --- a/abstractions/dotnet/src/RequestInfo.cs +++ b/abstractions/dotnet/src/RequestInfo.cs @@ -25,8 +25,11 @@ public class RequestInfo /// the current path (scheme, host, port, path, query parameters) of the request. /// the segment to append to the current path. /// whether the path segment is a raw url. When true, the segment is not happened and the current path is parsed for query parameters. - public void SetURI(string currentPath, string pathSegment, bool isRawUrl) { - if (isRawUrl) { + /// Thrown when the built URI is an invalid format. + public void SetURI(string currentPath, string pathSegment, bool isRawUrl) + { + if (isRawUrl) + { if(string.IsNullOrEmpty(currentPath)) throw new ArgumentNullException(nameof(currentPath)); var parseUri = new Uri(currentPath); @@ -34,7 +37,9 @@ public void SetURI(string currentPath, string pathSegment, bool isRawUrl) { QueryParameters.Add(qsp[0], qsp.Length > 1 ? qsp[1] : null); } URI = new Uri(parseUri.GetComponents(UriComponents.SchemeAndServer | UriComponents.Path, UriFormat.Unescaped)); - } else { + } + else + { URI = new Uri(currentPath + pathSegment); } } diff --git a/src/Kiota.Builder/CodeParameterOrderComparer.cs b/src/Kiota.Builder/CodeParameterOrderComparer.cs index 3c1c1a71dc..a448d37727 100644 --- a/src/Kiota.Builder/CodeParameterOrderComparer.cs +++ b/src/Kiota.Builder/CodeParameterOrderComparer.cs @@ -24,9 +24,9 @@ private static int getKindOrderHint(CodeParameterKind kind) { CodeParameterKind.ResponseHandler => 7, CodeParameterKind.Serializer => 8, CodeParameterKind.BackingStore => 9, - CodeParameterKind.Custom => 12, - CodeParameterKind.RequestBody => 11, CodeParameterKind.SetterValue => 10, + CodeParameterKind.RequestBody => 11, + CodeParameterKind.Custom => 12, _ => 13, }; }