From bcfb5a8a7022bffaea08680716776f26aaf84bc5 Mon Sep 17 00:00:00 2001 From: Developer 02 Date: Mon, 25 Nov 2024 10:09:05 +0100 Subject: [PATCH] =?UTF-8?q?feat(BaseHttpClientService):=20Uri=20Getter=20u?= =?UTF-8?q?nd=20Setter=20entfernt=20und=20gesch=C3=BCtzte=20readonly=20=5F?= =?UTF-8?q?uri=20Variable=20hinzugef=C3=BCgt.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Client/IBaseHttpClientService.cs | 2 -- DigitalData.Core.Client/BaseHttpClientService.cs | 8 ++++---- 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/DigitalData.Core.Abstractions/Client/IBaseHttpClientService.cs b/DigitalData.Core.Abstractions/Client/IBaseHttpClientService.cs index 9906a90..058944a 100644 --- a/DigitalData.Core.Abstractions/Client/IBaseHttpClientService.cs +++ b/DigitalData.Core.Abstractions/Client/IBaseHttpClientService.cs @@ -4,8 +4,6 @@ namespace DigitalData.Core.Abstractions.Client { public interface IBaseHttpClientService { - string Uri { get; init; } - CookieCollection GetCookies(string path = ""); Task FetchAsync( diff --git a/DigitalData.Core.Client/BaseHttpClientService.cs b/DigitalData.Core.Client/BaseHttpClientService.cs index 55104bb..6b8c4a7 100644 --- a/DigitalData.Core.Client/BaseHttpClientService.cs +++ b/DigitalData.Core.Client/BaseHttpClientService.cs @@ -12,7 +12,7 @@ namespace DigitalData.Core.Client protected readonly CookieContainer _cookies; [StringSyntax("Uri")] - public string Uri { get; init; } + protected readonly string _uri; public string Path { get; init; } = string.Empty; @@ -24,13 +24,13 @@ namespace DigitalData.Core.Client { _client = client; _cookies = cookieContainer; - Uri = clientOptions.Value.Uri.Trim(URI_TRIM_CHARS); + _uri = clientOptions.Value.Uri.Trim(URI_TRIM_CHARS); Path = clientOptions.Value.Path.Trim(URI_TRIM_CHARS); _headers = clientOptions.Value.Headers; _queryParams = clientOptions.Value.QueryParams; } - public CookieCollection GetCookies(string path = "") => _cookies.GetCookies(uri: new Uri(UriCombine(Uri, path, path.Trim(URI_TRIM_CHARS)))); + public CookieCollection GetCookies(string path = "") => _cookies.GetCookies(uri: new Uri(UriCombine(_uri, path, path.Trim(URI_TRIM_CHARS)))); public async Task FetchAsync( string? scheme = null, @@ -65,7 +65,7 @@ namespace DigitalData.Core.Client method ??= HttpMethod.Get; // create URL - var uriBuilder = new UriBuilder(Uri); + var uriBuilder = new UriBuilder(_uri); if (scheme is not null) uriBuilder.Scheme = scheme; if (port is int portInt)