From 0f7bdc9d0ea3c98bfdb6df6919cb68e00e8d1928 Mon Sep 17 00:00:00 2001
From: Developer 02 <developer02@didaloghe.onmicrosoft.com>
Date: Mon, 25 Nov 2024 11:46:08 +0100
Subject: [PATCH] =?UTF-8?q?refactor:=20Vereinfachung=20der=20Logik=20zur?=
 =?UTF-8?q?=20Zusammenf=C3=BChrung=20von=20Headern=20und=20Abfrageparamete?=
 =?UTF-8?q?rn=20in=20BaseHttpClientService?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- Verbesserung der Zusammenführung von Standard-Headern und Abfrageparametern durch Null-Prüfung und übersichtlichere Handhabung.
- Sicherstellung, dass die Logik einfacher zu verstehen und zu warten ist.
---
 .../BaseHttpClientService.cs                  | 22 ++++++++++++++-----
 1 file changed, 16 insertions(+), 6 deletions(-)

diff --git a/DigitalData.Core.Client/BaseHttpClientService.cs b/DigitalData.Core.Client/BaseHttpClientService.cs
index 08300ef..01a4ae6 100644
--- a/DigitalData.Core.Client/BaseHttpClientService.cs
+++ b/DigitalData.Core.Client/BaseHttpClientService.cs
@@ -47,17 +47,27 @@ namespace DigitalData.Core.Client
             // merge with default headers
             if(_headers is not null)
             {
-                var mergedHeaders = headers?.ToList() ?? new List<KeyValuePair<string, object>>();
-                mergedHeaders.AddRange(_headers);
-                headers = mergedHeaders;
+                if (headers is null)
+                    headers = _headers;
+                else
+                {
+                    var mergedHeaders = headers.ToList();
+                    mergedHeaders.AddRange(_headers);
+                    headers = mergedHeaders;
+                }
             }
 
             // Add default query parameters
             if(_queryParams is not null)
             {
-                var mergedQueryParams = queryParams?.ToList() ?? new List<KeyValuePair<string, object?>>();
-                mergedQueryParams.AddRange(_queryParams);
-                queryParams = mergedQueryParams;
+                if (queryParams is null)
+                    queryParams = _queryParams;
+                else
+                {
+                    var mergedQueryParams = queryParams.ToList();
+                    mergedQueryParams.AddRange(_queryParams);
+                    queryParams = mergedQueryParams;
+                }
             }
 
             // set default HTTP method as GET