cleanup & added tostring to provider (#5)

closes #4

Author: chrisstraw

src/OLT.Extensions.Configuration.RESTApi/Builders/AuthenticationBuilder.cs

@@ -1,6 +1,6 @@
 namespace OLT.Extensions.Configuration.RESTApi.Builders;
 
-public class AuthenticationBuilder : IAuthenticationBuilder
+public class AuthenticationBuilder //: IAuthenticationBuilder
 {
     internal AuthenticationBuilder(ApiOptionsBuilder optionsBuilder)
     {

src/OLT.Extensions.Configuration.RESTApi/Builders/IAuthenticationBuilder.cs

@@ -1,6 +1,6 @@
-namespace OLT.Extensions.Configuration.RESTApi.Builders;
+//namespace OLT.Extensions.Configuration.RESTApi.Builders;
 
-public interface IAuthenticationBuilder
-{
+//public interface IAuthenticationBuilder
+//{
 
-}
+//}

src/OLT.Extensions.Configuration.RESTApi/Builders/QueryBuilder.cs

@@ -1,23 +1,23 @@
-using Flurl.Http;
+//using Flurl.Http;
 
-namespace OLT.Extensions.Configuration.RESTApi.Builders;
+//namespace OLT.Extensions.Configuration.RESTApi.Builders;
 
-internal class QueryBuilder : IHttpQueryBuilder
-{
-    public QueryBuilder(string key, string value)
-    {
-        ArgumentNullException.ThrowIfNullOrEmpty(key);
-        ArgumentNullException.ThrowIfNullOrEmpty(value);
-        Key = key;
-        Value = value;
-    }
+//internal class QueryBuilder : IHttpQueryBuilder
+//{
+//    public QueryBuilder(string key, string value)
+//    {
+//        ArgumentNullException.ThrowIfNullOrEmpty(key);
+//        ArgumentNullException.ThrowIfNullOrEmpty(value);
+//        Key = key;
+//        Value = value;
+//    }
 
-    public string Key { get; set; }
-    public string Value { get; set; }
+//    public string Key { get; set; }
+//    public string Value { get; set; }
 
-    public void Build(IFlurlRequest request)
-    {        
-        request.SetQueryParam(Key, Value, Flurl.NullValueHandling.Remove);
-    }
-}
+//    public void Build(IFlurlRequest request)
+//    {        
+//        request.SetQueryParam(Key, Value, Flurl.NullValueHandling.Remove);
+//    }
+//}
 

src/OLT.Extensions.Configuration.RESTApi/ConfigurationProvider.cs

@@ -9,7 +9,6 @@ namespace OLT.Extensions.Configuration.RESTApi;
 public class RestApiConfigProviderConfigurationProvider : Microsoft.Extensions.Configuration.ConfigurationProvider, IDisposable
 {
     private readonly Lazy<IFlurlClient> _client;
-    private readonly RestApiProviderConfigurationSource _source;
     private readonly Timer? _refreshTimer;
 
     private static readonly TimeSpan MinDelayForUnhandledFailure = TimeSpan.FromSeconds(5);
@@ -19,13 +18,13 @@ public class RestApiConfigProviderConfigurationProvider : Microsoft.Extensions.C
 
     public RestApiConfigProviderConfigurationProvider(RestApiProviderConfigurationSource source)
     {
-        _source = source ?? throw new ArgumentNullException(nameof(source));
+        Source = source ?? throw new ArgumentNullException(nameof(source));
 
-        _source.Request.WithTimeout(_source.Timeout);
+        Source.Request.WithTimeout(Source.Timeout);
 
         _client = new Lazy<IFlurlClient>(() =>
         {
-            var result = _source.Request.EnsureClient();            
+            var result = Source.Request.EnsureClient();            
             return result;
         });
 
@@ -36,6 +35,7 @@ public RestApiConfigProviderConfigurationProvider(RestApiProviderConfigurationSo
 
     }
 
+    public virtual RestApiProviderConfigurationSource Source { get; }
 
     public override void Load()
     {        
@@ -58,7 +58,7 @@ private async Task LoadAsync(bool reload)
 
         try
         {
-            var newData = await _source.Request.GetJsonAsync<Dictionary<string, string?>>().ConfigureAwait(false) ?? new Dictionary<string, string?>();
+            var newData = await Source.Request.GetJsonAsync<Dictionary<string, string?>>().ConfigureAwait(false) ?? new Dictionary<string, string?>();
             if (Data != null && !Data.EquivalentTo(newData))
             {
                 Data = newData;
@@ -72,7 +72,7 @@ private async Task LoadAsync(bool reload)
         }
         catch
         {
-            if (_source.Optional) return;
+            if (Source.Optional) return;
 
             if (!reload) throw;
         }
@@ -116,4 +116,11 @@ public void Dispose()
         _client.Value.Dispose();        
     }
 
+    /// <summary>
+    /// Generates a string representing this provider name and relevant details.
+    /// </summary>
+    /// <returns>The configuration name.</returns>
+    public override string ToString()
+        => $"{GetType().Name} for '{Source.Request.Url.ToString()}' ({(Source.Optional ? "Optional" : "Required")})";
+
 }

src/OLT.Extensions.Configuration.RESTApi/ApiConfigBuilderExtensions.cs renamed to src/OLT.Extensions.Configuration.RESTApi/Extensions/ApiConfigBuilderExtensions.cs

@@ -1,6 +1,6 @@
-namespace OLT.Extensions.Configuration.RESTApi;
+//namespace OLT.Extensions.Configuration.RESTApi;
 
-public interface IHttpClientBuilder
-{
-    void Build(Flurl.Http.IFlurlRequest request);
-}
+//public interface IHttpClientBuilder
+//{
+//    void Build(Flurl.Http.IFlurlRequest request);
+//}

src/OLT.Extensions.Configuration.RESTApi/AuthenticationBuilderExtensions.cs renamed to src/OLT.Extensions.Configuration.RESTApi/Extensions/AuthenticationBuilderExtensions.cs

@@ -1,7 +1,7 @@
-namespace OLT.Extensions.Configuration.RESTApi;
+//namespace OLT.Extensions.Configuration.RESTApi;
 
-public interface IHttpHeaderBuilder : IHttpClientBuilder
-{
-    string Name { get; }
-    string? Value { get; }
-}
+//public interface IHttpHeaderBuilder : IHttpClientBuilder
+//{
+//    string Name { get; }
+//    string? Value { get; }
+//}

src/OLT.Extensions.Configuration.RESTApi/ConfigurationBuilderExtensions.cs renamed to src/OLT.Extensions.Configuration.RESTApi/Extensions/ConfigurationBuilderExtensions.cs

@@ -1,7 +1,7 @@
-namespace OLT.Extensions.Configuration.RESTApi;
+//namespace OLT.Extensions.Configuration.RESTApi;
 
-public interface IHttpQueryBuilder : IHttpClientBuilder
-{
-    string Key { get; }
-    string Value { get; }
-}
+//public interface IHttpQueryBuilder : IHttpClientBuilder
+//{
+//    string Key { get; }
+//    string Value { get; }
+//}