Skip to content

Commit

Permalink
Fixed issues with query string not being passed on to underlying code
Browse files Browse the repository at this point in the history
  • Loading branch information
@abjerner
abjerner committed Dec 18, 2023
1 parent 330ae1d commit ea53ed6
Show file tree
Hide file tree
Showing 3 changed files with 25 additions and 19 deletions.
16 changes: 9 additions & 7 deletions src/Skybrud.Essentials.Http/Client/HttpClient.Patch.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -77,7 +77,7 @@ public virtual IHttpResponse Patch(string url, IHttpPostData postData) {
/// <returns>An instance of <see cref="IHttpResponse"/> representing the response.</returns>
public virtual IHttpResponse Patch(string url, IHttpQueryString queryString, IHttpPostData postData) {
if (string.IsNullOrWhiteSpace(url)) throw new ArgumentNullException(nameof(url));
return GetResponse(HttpRequest.Patch(url, postData));
return GetResponse(HttpRequest.Patch(url, queryString, postData));
}

/// <summary>
Expand Down Expand Up @@ -128,7 +128,7 @@ public virtual IHttpResponse Patch(string url, JToken body, Formatting formattin
public virtual IHttpResponse Patch(string url, IHttpQueryString queryString, JToken body) {
if (string.IsNullOrWhiteSpace(url)) throw new ArgumentNullException(nameof(url));
if (body == null) throw new ArgumentNullException(nameof(body));
return GetResponse(HttpRequest.Patch(url, body));
return GetResponse(HttpRequest.Patch(url, queryString, body));
}

/// <summary>
Expand All @@ -142,7 +142,7 @@ public virtual IHttpResponse Patch(string url, IHttpQueryString queryString, JTo
public virtual IHttpResponse Patch(string url, IHttpQueryString queryString, JToken body, Formatting formatting) {
if (string.IsNullOrWhiteSpace(url)) throw new ArgumentNullException(nameof(url));
if (body == null) throw new ArgumentNullException(nameof(body));
return GetResponse(HttpRequest.Patch(url, body, formatting));
return GetResponse(HttpRequest.Patch(url, queryString, body, formatting));
}

/// <summary>
Expand Down Expand Up @@ -275,10 +275,11 @@ public virtual IHttpResponse Patch(string url, NameValueCollection? queryString,
/// <param name="queryString">The query string.</param>
/// <param name="body">The body of the request.</param>
/// <returns>An instance of <see cref="IHttpResponse"/> representing the raw response.</returns>
public virtual IHttpResponse Patch(string url, NameValueCollection queryString, XNode body) {
public virtual IHttpResponse Patch(string url, NameValueCollection? queryString, XNode body) {
if (string.IsNullOrWhiteSpace(url)) throw new ArgumentNullException(nameof(url));
if (body == null) throw new ArgumentNullException(nameof(body));
return GetResponse(HttpRequest.Patch(url, body));
IHttpQueryString? query = queryString == null ? null : new HttpQueryString(queryString);
return GetResponse(HttpRequest.Patch(url, query, body));
}

/// <summary>
Expand All @@ -289,10 +290,11 @@ public virtual IHttpResponse Patch(string url, NameValueCollection queryString,
/// <param name="body">The body of the request.</param>
/// <param name="options">The options to be used when serializing <paramref name="body"/>.</param>
/// <returns>An instance of <see cref="IHttpResponse"/> representing the raw response.</returns>
public virtual IHttpResponse Patch(string url, NameValueCollection queryString, XNode body, SaveOptions options) {
public virtual IHttpResponse Patch(string url, NameValueCollection? queryString, XNode body, SaveOptions options) {
if (string.IsNullOrWhiteSpace(url)) throw new ArgumentNullException(nameof(url));
if (body == null) throw new ArgumentNullException(nameof(body));
return GetResponse(HttpRequest.Patch(url, body, options));
IHttpQueryString? query = queryString == null ? null : new HttpQueryString(queryString);
return GetResponse(HttpRequest.Patch(url, query, body, options));
}

#endif
Expand Down
12 changes: 7 additions & 5 deletions src/Skybrud.Essentials.Http/Client/HttpClient.Post.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,7 @@ public virtual IHttpResponse Post(string url, IHttpPostData? postData) {
/// <returns>An instance of <see cref="IHttpResponse"/> representing the response.</returns>
public virtual IHttpResponse Post(string url, IHttpQueryString? queryString, IHttpPostData? postData) {
if (string.IsNullOrWhiteSpace(url)) throw new ArgumentNullException(nameof(url));
return GetResponse(HttpRequest.Post(url, postData));
return GetResponse(HttpRequest.Post(url, queryString, postData));
}

/// <summary>
Expand Down Expand Up @@ -126,7 +126,7 @@ public virtual IHttpResponse Post(string url, JToken body, Formatting formatting
public virtual IHttpResponse Post(string url, IHttpQueryString? queryString, JToken body) {
if (string.IsNullOrWhiteSpace(url)) throw new ArgumentNullException(nameof(url));
if (body == null) throw new ArgumentNullException(nameof(body));
return GetResponse(HttpRequest.Post(url, body));
return GetResponse(HttpRequest.Post(url, queryString, body));
}

/// <summary>
Expand All @@ -140,7 +140,7 @@ public virtual IHttpResponse Post(string url, IHttpQueryString? queryString, JTo
public virtual IHttpResponse Post(string url, IHttpQueryString? queryString, JToken body, Formatting formatting) {
if (string.IsNullOrWhiteSpace(url)) throw new ArgumentNullException(nameof(url));
if (body == null) throw new ArgumentNullException(nameof(body));
return GetResponse(HttpRequest.Post(url, body, formatting));
return GetResponse(HttpRequest.Post(url, queryString, body, formatting));
}

/// <summary>
Expand Down Expand Up @@ -276,7 +276,8 @@ public virtual IHttpResponse Post(string url, NameValueCollection? queryString,
public virtual IHttpResponse Post(string url, NameValueCollection? queryString, XNode body) {
if (string.IsNullOrWhiteSpace(url)) throw new ArgumentNullException(nameof(url));
if (body == null) throw new ArgumentNullException(nameof(body));
return GetResponse(HttpRequest.Post(url, body));
IHttpQueryString? query = queryString == null ? null : new HttpQueryString(queryString);
return GetResponse(HttpRequest.Post(url, query, body));
}

/// <summary>
Expand All @@ -290,7 +291,8 @@ public virtual IHttpResponse Post(string url, NameValueCollection? queryString,
public virtual IHttpResponse Post(string url, NameValueCollection? queryString, XNode body, SaveOptions options) {
if (string.IsNullOrWhiteSpace(url)) throw new ArgumentNullException(nameof(url));
if (body == null) throw new ArgumentNullException(nameof(body));
return GetResponse(HttpRequest.Post(url, body, options));
IHttpQueryString? query = queryString == null ? null : new HttpQueryString(queryString);
return GetResponse(HttpRequest.Post(url, query, body, options));
}

#endif
Expand Down
16 changes: 9 additions & 7 deletions src/Skybrud.Essentials.Http/Client/HttpClient.Put.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,7 @@ public virtual IHttpResponse Put(string url, IHttpPostData? postData) {
/// <returns>An instance of <see cref="IHttpResponse"/> representing the response.</returns>
public virtual IHttpResponse Put(string url, IHttpQueryString? queryString, IHttpPostData postData) {
if (string.IsNullOrWhiteSpace(url)) throw new ArgumentNullException(nameof(url));
return GetResponse(HttpRequest.Put(url, postData));
return GetResponse(HttpRequest.Put(url, queryString, postData));
}

/// <summary>
Expand Down Expand Up @@ -126,7 +126,7 @@ public virtual IHttpResponse Put(string url, JToken body, Formatting formatting)
public virtual IHttpResponse Put(string url, IHttpQueryString? queryString, JToken body) {
if (string.IsNullOrWhiteSpace(url)) throw new ArgumentNullException(nameof(url));
if (body == null) throw new ArgumentNullException(nameof(body));
return GetResponse(HttpRequest.Put(url, body));
return GetResponse(HttpRequest.Put(url, queryString, body));
}

/// <summary>
Expand All @@ -140,7 +140,7 @@ public virtual IHttpResponse Put(string url, IHttpQueryString? queryString, JTok
public virtual IHttpResponse Put(string url, IHttpQueryString? queryString, JToken body, Formatting formatting) {
if (string.IsNullOrWhiteSpace(url)) throw new ArgumentNullException(nameof(url));
if (body == null) throw new ArgumentNullException(nameof(body));
return GetResponse(HttpRequest.Put(url, body, formatting));
return GetResponse(HttpRequest.Put(url, queryString, body, formatting));
}

/// <summary>
Expand Down Expand Up @@ -273,10 +273,11 @@ public virtual IHttpResponse Put(string url, NameValueCollection? queryString, J
/// <param name="queryString">The query string.</param>
/// <param name="body">The body of the request.</param>
/// <returns>An instance of <see cref="IHttpResponse"/> representing the raw response.</returns>
public virtual IHttpResponse Put(string url, NameValueCollection queryString, XNode body) {
public virtual IHttpResponse Put(string url, NameValueCollection? queryString, XNode body) {
if (string.IsNullOrWhiteSpace(url)) throw new ArgumentNullException(nameof(url));
if (body == null) throw new ArgumentNullException(nameof(body));
return GetResponse(HttpRequest.Put(url, body));
IHttpQueryString? query = queryString == null ? null : new HttpQueryString(queryString);
return GetResponse(HttpRequest.Put(url, query, body));
}

/// <summary>
Expand All @@ -287,10 +288,11 @@ public virtual IHttpResponse Put(string url, NameValueCollection queryString, XN
/// <param name="body">The body of the request.</param>
/// <param name="options">The options to be used when serializing <paramref name="body"/>.</param>
/// <returns>An instance of <see cref="IHttpResponse"/> representing the raw response.</returns>
public virtual IHttpResponse Put(string url, NameValueCollection queryString, XNode body, SaveOptions options) {
public virtual IHttpResponse Put(string url, NameValueCollection? queryString, XNode body, SaveOptions options) {
if (string.IsNullOrWhiteSpace(url)) throw new ArgumentNullException(nameof(url));
if (body == null) throw new ArgumentNullException(nameof(body));
return GetResponse(HttpRequest.Put(url, body, options));
IHttpQueryString? query = queryString == null ? null : new HttpQueryString(queryString);
return GetResponse(HttpRequest.Put(url, query, body, options));
}

#endif
Expand Down

0 comments on commit ea53ed6

Please sign in to comment.