unify cancellationtoken usage

siemens · Dec 2, 2023 · ad3a3c7 · ad3a3c7
1 parent f6fba5c
commit ad3a3c7
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 25 deletions.
diff --git a/src/Webserver.API/Services/ApiStandardServiceFactory.cs b/src/Webserver.API/Services/ApiStandardServiceFactory.cs
@@ -280,20 +280,6 @@ public HttpClient GetHttpClient(HttpClientConnectionConfiguration connectionConf
         /// <param name="username">username to login with</param>
         /// <param name="password">password to login with</param>
         /// <returns>A usable and authenticated <see cref="ApiHttpClientRequestHandler"/></returns>
-        public async Task<IApiRequestHandler> GetApiHttpClientRequestHandlerAsync(string baseAddress, string username, string password)
-        {
-            var httpClient = await GetHttpClientAsync(baseAddress, username, password);
-            return new ApiHttpClientRequestHandler(httpClient, _apiRequestFactory, _apiResponseChecker);
-        }
-
-        /// <summary>
-        /// Get an <see cref="ApiHttpClientRequestHandler"/> using standard values for <see cref="HttpClientConnectionConfiguration"/> 
-        /// </summary>
-        /// <param name="baseAddress">ip address or dns name of your plc</param>
-        /// <param name="username">username to login with</param>
-        /// <param name="password">password to login with</param>
-        /// <param name="cancellationToken">Cancellation token to cancel pending requests.</param>
-        /// <returns>A usable and authenticated <see cref="ApiHttpClientRequestHandler"/></returns>
         public async Task<IApiRequestHandler> GetApiHttpClientRequestHandlerAsync(string baseAddress, string username, string password, CancellationToken cancellationToken = default(CancellationToken))
         {
             var httpClient = await GetHttpClientAsync(baseAddress, username, password, cancellationToken);

diff --git a/src/Webserver.API/Services/IApiServiceFactory.cs b/src/Webserver.API/Services/IApiServiceFactory.cs
@@ -45,7 +45,7 @@ public interface IApiServiceFactory
         /// <param name="connectionConfiguration">Connection configuration to use</param>
         /// <param name="cancellationToken">Cancellation token to cancel pending requests.</param>
         /// <returns>A usable and authenticated <see cref="ApiHttpClientRequestHandler"/></returns>
-        Task<IApiRequestHandler> GetApiHttpClientRequestHandlerAsync(HttpClientConnectionConfiguration connectionConfiguration, CancellationToken cancellationToken);
+        Task<IApiRequestHandler> GetApiHttpClientRequestHandlerAsync(HttpClientConnectionConfiguration connectionConfiguration, CancellationToken cancellationToken = default(CancellationToken));
         /// <summary>
         /// Get an httpclient using the given <see cref="HttpClientConnectionConfiguration"/>
         /// </summary>
@@ -60,16 +60,7 @@ public interface IApiServiceFactory
         /// <param name="username">username to login with</param>
         /// <param name="password">password to login with</param>
         /// <returns>A usable and authenticated <see cref="ApiHttpClientRequestHandler"/></returns>
-        Task<IApiRequestHandler> GetApiHttpClientRequestHandlerAsync(string baseAddress, string username, string password);
-        /// <summary>
-        /// Get an <see cref="ApiHttpClientRequestHandler"/>
-        /// </summary>
-        /// <param name="baseAddress">ip address or dns name of your plc</param>
-        /// <param name="username">username to login with</param>
-        /// <param name="password">password to login with</param>
-        /// <param name="cancellationToken">Cancellation token to cancel pending requests.</param>
-        /// <returns>A usable and authenticated <see cref="ApiHttpClientRequestHandler"/></returns>
-        Task<IApiRequestHandler> GetApiHttpClientRequestHandlerAsync(string baseAddress, string username, string password, CancellationToken cancellationToken);
+        Task<IApiRequestHandler> GetApiHttpClientRequestHandlerAsync(string baseAddress, string username, string password, CancellationToken cancellationToken = default(CancellationToken));
         /// <summary>
         /// Get A resourceHandler with the given requestHandler and the set resourcebuilder
         /// </summary>