Merge pull request #63 from route4me/yurii-bart-feat-add-injectable-logger

r4m-semeyon · web-flow · commit 87777c18c3de · 2025-12-19T13:07:08.000+06:00
Yurii bart feat add injectable logger
diff --git a/route4me-csharp-sdk/Route4MeSDKLibrary/HttpClientHolder.cs b/route4me-csharp-sdk/Route4MeSDKLibrary/HttpClientHolder.cs
@@ -1,20 +1,29 @@
 ﻿using System;
 using System.Net.Http;
 
+using Microsoft.Extensions.Logging;
+
 namespace Route4MeSDKLibrary
 {
     internal class HttpClientHolder : IDisposable
     {
         private readonly string _baseAddress;
 
-        public HttpClientHolder(HttpClient httpClient, string baseAddress)
+        public HttpClientHolder(HttpClient httpClient, string baseAddress, ILogger logger = null)
         {
             HttpClient = httpClient;
             _baseAddress = baseAddress;
+            Logger = logger;
         }
 
         public HttpClient HttpClient { get; }
 
+        /// <summary>
+        ///     Logger instance for this HTTP client holder.
+        ///     Thread-safe as each holder instance has its own logger reference.
+        /// </summary>
+        public ILogger Logger { get; }
+
         public void Dispose()
         {
             HttpClientHolderManager.ReleaseHttpClientHolder(_baseAddress);
diff --git a/route4me-csharp-sdk/Route4MeSDKLibrary/HttpClientHolderManager.cs b/route4me-csharp-sdk/Route4MeSDKLibrary/HttpClientHolderManager.cs
@@ -4,6 +4,8 @@
 using System.Net.Http;
 using System.Net.Http.Headers;
 
+using Microsoft.Extensions.Logging;
+
 namespace Route4MeSDKLibrary
 {
     /// <summary>
@@ -30,7 +32,7 @@ static HttpClientHolderManager()
             new SequentialTimer(OnTimerCallback, TimeSpan.FromHours(2));
         }
 
-        public static HttpClientHolder AcquireHttpClientHolder(string baseAddress, string apiKey = null)
+        public static HttpClientHolder AcquireHttpClientHolder(string baseAddress, string apiKey = null, ILogger logger = null)
         {
             lock (SyncRoot)
             {
@@ -47,7 +49,7 @@ public static HttpClientHolder AcquireHttpClientHolder(string baseAddress, strin
                     HttpClientWrappers.Add(baseAddress, wrapper);
                 }
 
-                return new HttpClientHolder(wrapper.HttpClient, baseAddress);
+                return new HttpClientHolder(wrapper.HttpClient, baseAddress, logger);
             }
         }
 
diff --git a/route4me-csharp-sdk/Route4MeSDKLibrary/Managers/AccountProfileManagerV5.cs b/route4me-csharp-sdk/Route4MeSDKLibrary/Managers/AccountProfileManagerV5.cs
@@ -1,6 +1,8 @@
 ﻿using System;
 using System.Threading.Tasks;
 
+using Microsoft.Extensions.Logging;
+
 using Route4MeSDK;
 using Route4MeSDK.DataTypes.V5;
 using Route4MeSDK.QueryTypes;
@@ -13,6 +15,10 @@ public AccountProfileManagerV5(string apiKey) : base(apiKey)
         {
         }
 
+        public AccountProfileManagerV5(string apiKey, ILogger logger) : base(apiKey, logger)
+        {
+        }
+
         /// <summary>
         ///     Get account profile
         /// </summary>
diff --git a/route4me-csharp-sdk/Route4MeSDKLibrary/Managers/AddressBarcodeManagerV5.cs b/route4me-csharp-sdk/Route4MeSDKLibrary/Managers/AddressBarcodeManagerV5.cs
@@ -1,6 +1,8 @@
 ﻿using System;
 using System.Threading.Tasks;
 
+using Microsoft.Extensions.Logging;
+
 using Route4MeSDK;
 using Route4MeSDK.DataTypes.V5;
 using Route4MeSDK.QueryTypes.V5;
@@ -13,6 +15,10 @@ public AddressBarcodeManagerV5(string apiKey) : base(apiKey)
         {
         }
 
+        public AddressBarcodeManagerV5(string apiKey, ILogger logger) : base(apiKey, logger)
+        {
+        }
+
         /// <summary>
         ///     Returns address barcodes
         /// </summary>
diff --git a/route4me-csharp-sdk/Route4MeSDKLibrary/Managers/AddressBookContactsManagerV5.cs b/route4me-csharp-sdk/Route4MeSDKLibrary/Managers/AddressBookContactsManagerV5.cs
@@ -3,6 +3,8 @@
 using System.Text;
 using System.Threading.Tasks;
 
+using Microsoft.Extensions.Logging;
+
 using Route4MeSDK;
 using Route4MeSDK.DataTypes.V5;
 using Route4MeSDK.QueryTypes;
@@ -21,6 +23,10 @@ public AddressBookContactsManagerV5(string apiKey) : base(apiKey)
         {
         }
 
+        public AddressBookContactsManagerV5(string apiKey, ILogger logger) : base(apiKey, logger)
+        {
+        }
+
         /// <summary>
         ///     Remove the address book contacts.
         /// </summary>
diff --git a/route4me-csharp-sdk/Route4MeSDKLibrary/Managers/CustomerManagerV5.cs b/route4me-csharp-sdk/Route4MeSDKLibrary/Managers/CustomerManagerV5.cs
@@ -2,6 +2,8 @@
 using System.Collections.Generic;
 using System.Threading.Tasks;
 
+using Microsoft.Extensions.Logging;
+
 using Route4MeSDK;
 using Route4MeSDK.DataTypes.V5;
 using Route4MeSDK.QueryTypes;
@@ -17,6 +19,10 @@ public CustomerManagerV5(string apiKey) : base(apiKey)
         {
         }
 
+        public CustomerManagerV5(string apiKey, ILogger logger) : base(apiKey, logger)
+        {
+        }
+
         #region Get Customers List
 
         /// <summary>
diff --git a/route4me-csharp-sdk/Route4MeSDKLibrary/Managers/DriveReviewManagerV5.cs b/route4me-csharp-sdk/Route4MeSDKLibrary/Managers/DriveReviewManagerV5.cs
@@ -2,6 +2,8 @@
 using System.Collections.Generic;
 using System.Threading.Tasks;
 
+using Microsoft.Extensions.Logging;
+
 using Route4MeSDK;
 using Route4MeSDK.DataTypes.V5;
 using Route4MeSDK.QueryTypes.V5;
@@ -14,6 +16,10 @@ public DriveReviewManagerV5(string apiKey) : base(apiKey)
         {
         }
 
+        public DriveReviewManagerV5(string apiKey, ILogger logger) : base(apiKey, logger)
+        {
+        }
+
         /// <summary>
         ///     Get list of the drive reviews.
         /// </summary>
diff --git a/route4me-csharp-sdk/Route4MeSDKLibrary/Managers/FacilityManagerV5.cs b/route4me-csharp-sdk/Route4MeSDKLibrary/Managers/FacilityManagerV5.cs
@@ -1,6 +1,8 @@
 using System;
 using System.Threading.Tasks;
 
+using Microsoft.Extensions.Logging;
+
 using Route4MeSDK;
 using Route4MeSDK.DataTypes.V5;
 using Route4MeSDK.QueryTypes;
@@ -23,6 +25,10 @@ public FacilityManagerV5(string apiKey) : base(apiKey)
         {
         }
 
+        public FacilityManagerV5(string apiKey, ILogger logger) : base(apiKey, logger)
+        {
+        }
+
         /// <summary>
         /// Get a single facility by ID
         /// </summary>
diff --git a/route4me-csharp-sdk/Route4MeSDKLibrary/Managers/LocationManagerV5.cs b/route4me-csharp-sdk/Route4MeSDKLibrary/Managers/LocationManagerV5.cs
@@ -2,6 +2,8 @@
 using System.Collections.Generic;
 using System.Threading.Tasks;
 
+using Microsoft.Extensions.Logging;
+
 using Route4MeSDK;
 using Route4MeSDK.DataTypes.V5;
 using Route4MeSDK.QueryTypes;
@@ -21,6 +23,10 @@ public LocationManagerV5(string apiKey) : base(apiKey)
         {
         }
 
+        public LocationManagerV5(string apiKey, ILogger logger) : base(apiKey, logger)
+        {
+        }
+
         #region Location Endpoints
 
         /// <summary>
diff --git a/route4me-csharp-sdk/Route4MeSDKLibrary/Managers/NotesManagerV5.cs b/route4me-csharp-sdk/Route4MeSDKLibrary/Managers/NotesManagerV5.cs
@@ -2,6 +2,8 @@
 using System.Collections.Generic;
 using System.Threading.Tasks;
 
+using Microsoft.Extensions.Logging;
+
 using Route4MeSDK;
 using Route4MeSDK.DataTypes.V5;
 using Route4MeSDK.DataTypes.V5.Notes;
@@ -19,6 +21,10 @@ public NotesManagerV5(string apiKey) : base(apiKey)
         {
         }
 
+        public NotesManagerV5(string apiKey, ILogger logger) : base(apiKey, logger)
+        {
+        }
+
         #region Notes CRUD
 
         /// <summary>
diff --git a/route4me-csharp-sdk/Route4MeSDKLibrary/Managers/OptimizationManagerV5.cs b/route4me-csharp-sdk/Route4MeSDKLibrary/Managers/OptimizationManagerV5.cs
@@ -1,6 +1,8 @@
 ﻿using System;
 using System.Threading.Tasks;
 
+using Microsoft.Extensions.Logging;
+
 using Route4MeSDK;
 using Route4MeSDK.DataTypes.V5;
 using Route4MeSDK.QueryTypes.V5;
@@ -16,6 +18,10 @@ public OptimizationManagerV5(string apiKey) : base(apiKey)
         {
         }
 
+        public OptimizationManagerV5(string apiKey, ILogger logger) : base(apiKey, logger)
+        {
+        }
+
         /// <summary>
         ///     Generates optimized routes
         /// </summary>
diff --git a/route4me-csharp-sdk/Route4MeSDKLibrary/Managers/OptimizationProfileManagerV5.cs b/route4me-csharp-sdk/Route4MeSDKLibrary/Managers/OptimizationProfileManagerV5.cs
@@ -1,6 +1,8 @@
 ﻿using System;
 using System.Threading.Tasks;
 
+using Microsoft.Extensions.Logging;
+
 using Route4MeSDK;
 using Route4MeSDK.DataTypes.V5;
 using Route4MeSDK.QueryTypes;
@@ -22,6 +24,10 @@ public OptimizationProfileManagerV5(string apiKey) : base(apiKey)
         {
         }
 
+        public OptimizationProfileManagerV5(string apiKey, ILogger logger) : base(apiKey, logger)
+        {
+        }
+
         /// <summary>
         /// Retrieves a list of all optimization profiles for the authenticated account.
         /// </summary>
diff --git a/route4me-csharp-sdk/Route4MeSDKLibrary/Managers/OrderManagerV5.cs b/route4me-csharp-sdk/Route4MeSDKLibrary/Managers/OrderManagerV5.cs
@@ -1,6 +1,8 @@
 ﻿using System;
 using System.Threading.Tasks;
 
+using Microsoft.Extensions.Logging;
+
 using Route4MeSDK;
 using Route4MeSDK.DataTypes.V5;
 using Route4MeSDK.QueryTypes;
@@ -18,6 +20,10 @@ public OrderManagerV5(string apiKey) : base(apiKey)
         {
         }
 
+        public OrderManagerV5(string apiKey, ILogger logger) : base(apiKey, logger)
+        {
+        }
+
         /// <summary>
         ///  Display the Archive Orders.
         /// </summary>
diff --git a/route4me-csharp-sdk/Route4MeSDKLibrary/Managers/PodWorkflowManagerV5.cs b/route4me-csharp-sdk/Route4MeSDKLibrary/Managers/PodWorkflowManagerV5.cs
@@ -1,6 +1,8 @@
 ﻿using System;
 using System.Threading.Tasks;
 
+using Microsoft.Extensions.Logging;
+
 using Route4MeSDK;
 using Route4MeSDK.DataTypes.V5;
 using Route4MeSDK.QueryTypes;
@@ -16,6 +18,10 @@ public PodWorkflowManagerV5(string apiKey) : base(apiKey)
         {
         }
 
+        public PodWorkflowManagerV5(string apiKey, ILogger logger) : base(apiKey, logger)
+        {
+        }
+
         /// <summary>
         /// Get POD workflows
         /// </summary>
diff --git a/route4me-csharp-sdk/Route4MeSDKLibrary/Managers/Route4MeManagerBase.cs b/route4me-csharp-sdk/Route4MeSDKLibrary/Managers/Route4MeManagerBase.cs
@@ -8,6 +8,8 @@
 using System.Threading;
 using System.Threading.Tasks;
 
+using Microsoft.Extensions.Logging;
+
 using Newtonsoft.Json;
 
 using Route4MeSDK;
@@ -19,10 +21,18 @@ namespace Route4MeSDKLibrary.Managers
     public abstract class Route4MeManagerBase
     {
         protected readonly string ApiKey;
+        protected readonly ILogger Logger;
 
         protected Route4MeManagerBase(string apiKey)
         {
             ApiKey = apiKey;
+            Logger = null;
+        }
+
+        protected Route4MeManagerBase(string apiKey, ILogger logger)
+        {
+            ApiKey = apiKey;
+            Logger = logger;
         }
 
         public string GetStringResponseFromAPI(GenericParameters optimizationParameters,
@@ -151,7 +161,7 @@ protected async Task<Tuple<T, ResultResponse, string>> GetJsonObjectFromAPIAsync
             try
             {
                 using (var httpClientHolder =
-                       HttpClientHolderManager.AcquireHttpClientHolder(uri.GetLeftPart(UriPartial.Authority), v5 ? ApiKey : null))
+                       HttpClientHolderManager.AcquireHttpClientHolder(uri.GetLeftPart(UriPartial.Authority), v5 ? ApiKey : null, Logger))
                 {
                     switch (httpMethod)
                     {
@@ -393,7 +403,7 @@ protected T GetJsonObjectFromAPI<T>(GenericParameters optimizationParameters,
             try
             {
                 using (var httpClientHolder =
-                       HttpClientHolderManager.AcquireHttpClientHolder(uri.GetLeftPart(UriPartial.Authority), v5 ? ApiKey : null))
+                       HttpClientHolderManager.AcquireHttpClientHolder(uri.GetLeftPart(UriPartial.Authority), v5 ? ApiKey : null, Logger))
                 {
                     switch (httpMethod)
                     {
diff --git a/route4me-csharp-sdk/Route4MeSDKLibrary/Managers/RouteManagerV5.cs b/route4me-csharp-sdk/Route4MeSDKLibrary/Managers/RouteManagerV5.cs
@@ -4,6 +4,8 @@
 using System.Text;
 using System.Threading.Tasks;
 
+using Microsoft.Extensions.Logging;
+
 using Route4MeSDK;
 using Route4MeSDK.DataTypes.V5;
 using Route4MeSDK.QueryTypes;
@@ -21,6 +23,10 @@ public RouteManagerV5(string apiKey) : base(apiKey)
         {
         }
 
+        public RouteManagerV5(string apiKey, ILogger logger) : base(apiKey, logger)
+        {
+        }
+
         /// <summary>
         /// Retrieves a list of the routes.
         /// </summary>
diff --git a/route4me-csharp-sdk/Route4MeSDKLibrary/Managers/RouteStatusManagerV5.cs b/route4me-csharp-sdk/Route4MeSDKLibrary/Managers/RouteStatusManagerV5.cs
@@ -1,6 +1,8 @@
 ﻿using System;
 using System.Threading.Tasks;
 
+using Microsoft.Extensions.Logging;
+
 using Route4MeSDK;
 using Route4MeSDK.DataTypes.V5;
 using Route4MeSDK.QueryTypes;
@@ -15,6 +17,10 @@ public RouteStatusManagerV5(string apiKey) : base(apiKey)
         {
         }
 
+        public RouteStatusManagerV5(string apiKey, ILogger logger) : base(apiKey, logger)
+        {
+        }
+
         /// <summary>
         /// Get the status by specifying the path parameter ID.
         /// </summary>
diff --git a/route4me-csharp-sdk/Route4MeSDKLibrary/Managers/SchedulesManagerV5.cs b/route4me-csharp-sdk/Route4MeSDKLibrary/Managers/SchedulesManagerV5.cs
diff --git a/route4me-csharp-sdk/Route4MeSDKLibrary/Managers/TeamManagementManagerV5.cs b/route4me-csharp-sdk/Route4MeSDKLibrary/Managers/TeamManagementManagerV5.cs
diff --git a/route4me-csharp-sdk/Route4MeSDKLibrary/Managers/TelematicsManagerV5.cs b/route4me-csharp-sdk/Route4MeSDKLibrary/Managers/TelematicsManagerV5.cs
diff --git a/route4me-csharp-sdk/Route4MeSDKLibrary/Managers/VehicleManagerV5.cs b/route4me-csharp-sdk/Route4MeSDKLibrary/Managers/VehicleManagerV5.cs
diff --git a/route4me-csharp-sdk/Route4MeSDKLibrary/Route4MeManager.cs b/route4me-csharp-sdk/Route4MeSDKLibrary/Route4MeManager.cs
diff --git a/route4me-csharp-sdk/Route4MeSDKLibrary/Route4MeSDKLibrary.csproj b/route4me-csharp-sdk/Route4MeSDKLibrary/Route4MeSDKLibrary.csproj
diff --git a/route4me-csharp-sdk/Route4MeSDKTest/Examples/API5/LoggingExample.cs b/route4me-csharp-sdk/Route4MeSDKTest/Examples/API5/LoggingExample.cs
diff --git a/route4me-csharp-sdk/Route4MeSDKTest/Route4MeSDKTest.csproj b/route4me-csharp-sdk/Route4MeSDKTest/Route4MeSDKTest.csproj

Original file line number	Diff line number	Diff line change
`@@ -1,20 +1,29 @@`
`1`	`1`	`using System;`
`2`	`2`	`using System.Net.Http;`
`3`	`3`
	`4`	`+using Microsoft.Extensions.Logging;`
	`5`	`+`
`4`	`6`	`namespace Route4MeSDKLibrary`
`5`	`7`	`{`
`6`	`8`	`internal class HttpClientHolder : IDisposable`
`7`	`9`	`{`
`8`	`10`	`private readonly string _baseAddress;`
`9`	`11`
`10`		`- public HttpClientHolder(HttpClient httpClient, string baseAddress)`
	`12`	`+ public HttpClientHolder(HttpClient httpClient, string baseAddress, ILogger logger = null)`
`11`	`13`	`{`
`12`	`14`	`HttpClient = httpClient;`
`13`	`15`	`_baseAddress = baseAddress;`
	`16`	`+ Logger = logger;`
`14`	`17`	`}`
`15`	`18`
`16`	`19`	`public HttpClient HttpClient { get; }`
`17`	`20`
	`21`	`+ /// <summary>`
	`22`	`+ /// Logger instance for this HTTP client holder.`
	`23`	`+ /// Thread-safe as each holder instance has its own logger reference.`
	`24`	`+ /// </summary>`
	`25`	`+ public ILogger Logger { get; }`
	`26`	`+`
`18`	`27`	`public void Dispose()`
`19`	`28`	`{`
`20`	`29`	`HttpClientHolderManager.ReleaseHttpClientHolder(_baseAddress);`
Original file line number	Diff line number	Diff line change
`@@ -4,6 +4,8 @@`
`4`	`4`	`using System.Net.Http;`
`5`	`5`	`using System.Net.Http.Headers;`
`6`	`6`
	`7`	`+using Microsoft.Extensions.Logging;`
	`8`	`+`
`7`	`9`	`namespace Route4MeSDKLibrary`
`8`	`10`	`{`
`9`	`11`	`/// <summary>`
`@@ -30,7 +32,7 @@ static HttpClientHolderManager()`
`30`	`32`	`new SequentialTimer(OnTimerCallback, TimeSpan.FromHours(2));`
`31`	`33`	`}`
`32`	`34`
`33`		`- public static HttpClientHolder AcquireHttpClientHolder(string baseAddress, string apiKey = null)`
	`35`	`+ public static HttpClientHolder AcquireHttpClientHolder(string baseAddress, string apiKey = null, ILogger logger = null)`
`34`	`36`	`{`
`35`	`37`	`lock (SyncRoot)`
`36`	`38`	`{`
`@@ -47,7 +49,7 @@ public static HttpClientHolder AcquireHttpClientHolder(string baseAddress, strin`
`47`	`49`	`HttpClientWrappers.Add(baseAddress, wrapper);`
`48`	`50`	`}`
`49`	`51`
`50`		`- return new HttpClientHolder(wrapper.HttpClient, baseAddress);`
	`52`	`+ return new HttpClientHolder(wrapper.HttpClient, baseAddress, logger);`
`51`	`53`	`}`
`52`	`54`	`}`
`53`	`55`