Add Uri overloads to WebAPIQuerier methods

Dysnomia-Studio · Nov 25, 2023 · f4c4514 · f4c4514
1 parent a0f2fe4
commit f4c4514
Showing 1 changed file with 50 additions and 10 deletions.
diff --git a/Dysnomia.Common.WebAPIWrapper/WebAPIQuerier.cs b/Dysnomia.Common.WebAPIWrapper/WebAPIQuerier.cs
@@ -77,54 +77,94 @@ protected static async Task ThrowApiErrorsAsync(HttpResponseMessage response) {
 			ThrowOnStatusCode(response.StatusCode, apiError);
 		}
 
-		protected async Task<string> GetStringAsync(string url, Dictionary<string, string> headers) {
+		protected async Task<string> GetStringAsync(Uri url, Dictionary<string, string> headers) {
 			var response = await GetClient(headers).GetAsync(url);
 
 			await ThrowApiErrorsAsync(response);
 
 			return await response.Content.ReadAsStringAsync();
 		}
 
-		protected async Task<string> GetStringAsync(string url) {
+		protected async Task<string> GetStringAsync(Uri url) {
 			return await GetStringAsync(url, null);
 		}
 
-		protected async Task<T> GetAsync<T>(string url, Dictionary<string, string> headers) {
+		protected async Task<string> GetStringAsync(string url, Dictionary<string, string> headers) {
+			return await GetStringAsync(new Uri(url), headers);
+		}
+
+		protected async Task<string> GetStringAsync(string url) {
+			return await GetStringAsync(new Uri(url), null);
+		}
+
+		protected async Task<T> GetAsync<T>(Uri url, Dictionary<string, string> headers) {
 			return JsonSerializer.Deserialize<T>(await GetStringAsync(url, headers));
 		}
 
-		protected async Task<T> GetAsync<T>(string url) {
+		protected async Task<T> GetAsync<T>(Uri url) {
 			return await GetAsync<T>(url, null);
 		}
 
-		protected async Task<string> PostStringAsync(string url, HttpContent content, Dictionary<string, string> headers) {
+		protected async Task<T> GetAsync<T>(string url, Dictionary<string, string> headers) {
+			return await GetAsync<T>(new Uri(url), headers);
+		}
+
+		protected async Task<T> GetAsync<T>(string url) {
+			return await GetAsync<T>(new Uri(url), null);
+		}
+
+		protected async Task<string> PostStringAsync(Uri url, HttpContent content, Dictionary<string, string> headers) {
 			var response = await GetClient(headers).PostAsync(url, content);
 
 			await ThrowApiErrorsAsync(response);
 
 			return await response.Content.ReadAsStringAsync();
 		}
 
-		protected async Task<string> PostStringAsync(string url, HttpContent content) {
+		protected async Task<string> PostStringAsync(Uri url, HttpContent content) {
 			return await PostStringAsync(url, content, null);
 		}
 
-		protected async Task PostAsync(string url, HttpContent content, Dictionary<string, string> headers) {
+		protected async Task<string> PostStringAsync(string url, HttpContent content, Dictionary<string, string> headers) {
+			return await PostStringAsync(new Uri(url), content, headers);
+		}
+
+		protected async Task<string> PostStringAsync(string url, HttpContent content) {
+			return await PostStringAsync(new Uri(url), content, null);
+		}
+
+		protected async Task PostAsync(Uri url, HttpContent content, Dictionary<string, string> headers) {
 			var response = await GetClient(headers).PostAsync(url, content);
 
 			await ThrowApiErrorsAsync(response);
 		}
 
-		protected async Task PostAsync(string url, HttpContent content) {
+		protected async Task PostAsync(Uri url, HttpContent content) {
 			await PostAsync(url, content, null);
 		}
 
-		protected async Task<T> PostAsync<T>(string url, HttpContent content, Dictionary<string, string> headers) {
+		protected async Task PostAsync(string url, HttpContent content, Dictionary<string, string> headers) {
+			await PostAsync(new Uri(url), content, headers);
+		}
+
+		protected async Task PostAsync(string url, HttpContent content) {
+			await PostAsync(new Uri(url), content, null);
+		}
+
+		protected async Task<T> PostAsync<T>(Uri url, HttpContent content, Dictionary<string, string> headers) {
 			return JsonSerializer.Deserialize<T>(await PostStringAsync(url, content, headers));
 		}
 
-		protected async Task<T> PostAsync<T>(string url, HttpContent content) {
+		protected async Task<T> PostAsync<T>(Uri url, HttpContent content) {
 			return await PostAsync<T>(url, content, null);
 		}
+
+		protected async Task<T> PostAsync<T>(string url, HttpContent content, Dictionary<string, string> headers) {
+			return await PostAsync<T>(new Uri(url), content, headers);
+		}
+
+		protected async Task<T> PostAsync<T>(string url, HttpContent content) {
+			return await PostAsync<T>(new Uri(url), content, null);
+		}
 	}
 }