Skip to content

Commit 3c68cf2

Browse files
authored
minor cleanup for nuget build (#2)
1 parent e6ba842 commit 3c68cf2

File tree

5 files changed

+38
-15
lines changed

5 files changed

+38
-15
lines changed

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

Lines changed: 26 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -60,8 +60,32 @@ public static ApiOptionsBuilder SetHeaderAcceptJson(this ApiOptionsBuilder build
6060
}
6161

6262

63+
/// <summary>
64+
/// Adds Path Segment to the end of the endpoint
65+
/// </summary>
66+
/// <remarks>
67+
/// Base Endpoint = https://my.domain/api/configuration
68+
/// <list type="table">
69+
/// <item>
70+
/// <term>app1</term>
71+
/// <description>https://my.domain/api/configuration/app1</description>
72+
/// </item>
73+
/// <item>
74+
/// <term>foobar</term>
75+
/// <description>https://my.domain/api/configuration/foobar</description>
76+
/// </item>
77+
/// </list>
78+
/// </remarks>
79+
/// <param name="builder"></param>
80+
/// <param name="segment"></param>
81+
/// <returns></returns>
82+
public static ApiOptionsBuilder AppendPathSegment(this ApiOptionsBuilder builder, string segment)
83+
{
84+
ArgumentNullException.ThrowIfNull(builder);
85+
ArgumentNullException.ThrowIfNullOrEmpty(segment);
86+
builder.Request.AppendPathSegment(segment);
87+
return builder;
88+
}
6389

6490

65-
66-
6791
}

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

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@
33

44
public class ApiOptionsBuilder
55
{
6-
private TimeSpan? _reloadAfter;
76
private readonly string _endpoint;
87
private readonly Flurl.Url _url;
98

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

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -15,9 +15,9 @@ public static class ConfigurationBuilderExtensions
1515
/// <param name="optional"></param>
1616
/// <returns>The <see cref="IConfigurationBuilder"/></returns>
1717
/// <exception cref="ArgumentNullException"></exception>
18-
public static IConfigurationBuilder AddRestApiConfigProvider(this IConfigurationBuilder builder, string endpoint, bool optional)
18+
public static IConfigurationBuilder AddRestApi(this IConfigurationBuilder builder, string endpoint, bool optional)
1919
{
20-
return builder.AddRestApiConfigProvider(ConfigureSource(new ApiOptionsBuilder(endpoint), optional, null));
20+
return builder.AddRestApi(ConfigureSource(new ApiOptionsBuilder(endpoint), optional, null));
2121
}
2222

2323
/// <summary>
@@ -32,9 +32,9 @@ public static IConfigurationBuilder AddRestApiConfigProvider(this IConfiguration
3232
/// <param name="reloadAfter"></param>
3333
/// <returns>The <see cref="IConfigurationBuilder"/></returns>
3434
/// <exception cref="ArgumentNullException"></exception>
35-
public static IConfigurationBuilder AddRestApiConfigProvider(this IConfigurationBuilder builder, string endpoint, bool optional, TimeSpan reloadAfter)
35+
public static IConfigurationBuilder AddRestApi(this IConfigurationBuilder builder, string endpoint, bool optional, TimeSpan reloadAfter)
3636
{
37-
return builder.AddRestApiConfigProvider(ConfigureSource(new ApiOptionsBuilder(endpoint), optional, reloadAfter));
37+
return builder.AddRestApi(ConfigureSource(new ApiOptionsBuilder(endpoint), optional, reloadAfter));
3838
}
3939

4040
/// <summary>
@@ -46,11 +46,11 @@ public static IConfigurationBuilder AddRestApiConfigProvider(this IConfiguration
4646
/// <param name="action"></param>
4747
/// <returns>The <see cref="IConfigurationBuilder"/></returns>
4848
/// <exception cref="ArgumentNullException"></exception>
49-
public static IConfigurationBuilder AddRestApiConfigProvider(this IConfigurationBuilder builder, string endpoint, bool optional, Action<ApiOptionsBuilder> action)
49+
public static IConfigurationBuilder AddRestApi(this IConfigurationBuilder builder, string endpoint, bool optional, Action<ApiOptionsBuilder> action)
5050
{
5151
var optionsBuilder = new ApiOptionsBuilder(endpoint);
5252
action(optionsBuilder);
53-
return builder.AddRestApiConfigProvider(ConfigureSource(optionsBuilder, optional, null));
53+
return builder.AddRestApi(ConfigureSource(optionsBuilder, optional, null));
5454
}
5555

5656
/// <summary>
@@ -63,11 +63,11 @@ public static IConfigurationBuilder AddRestApiConfigProvider(this IConfiguration
6363
/// <param name="action"></param>
6464
/// <returns>The <see cref="IConfigurationBuilder"/></returns>
6565
/// <exception cref="ArgumentNullException"></exception>
66-
public static IConfigurationBuilder AddRestApiConfigProvider(this IConfigurationBuilder builder, string endpoint, bool optional, TimeSpan reloadAfter, Action<ApiOptionsBuilder> action)
66+
public static IConfigurationBuilder AddRestApi(this IConfigurationBuilder builder, string endpoint, bool optional, TimeSpan reloadAfter, Action<ApiOptionsBuilder> action)
6767
{
6868
var optionsBuilder = new ApiOptionsBuilder(endpoint);
6969
action(optionsBuilder);
70-
return builder.AddRestApiConfigProvider(ConfigureSource(optionsBuilder, optional, reloadAfter));
70+
return builder.AddRestApi(ConfigureSource(optionsBuilder, optional, reloadAfter));
7171
}
7272

7373

@@ -79,7 +79,7 @@ public static IConfigurationBuilder AddRestApiConfigProvider(this IConfiguration
7979
/// <param name="configureSource"></param>
8080
/// <returns>The <see cref="IConfigurationBuilder"/></returns>
8181
/// <exception cref="ArgumentNullException"></exception>
82-
public static IConfigurationBuilder AddRestApiConfigProvider(this IConfigurationBuilder builder, Action<RestApiProviderConfigurationSource> configureSource)
82+
public static IConfigurationBuilder AddRestApi(this IConfigurationBuilder builder, Action<RestApiProviderConfigurationSource> configureSource)
8383
{
8484
if (configureSource == null) throw new ArgumentNullException(nameof(configureSource));
8585
var source = new RestApiProviderConfigurationSource();

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
namespace OLT.Extensions.Configuration.RESTApi;
22

3-
public static class DictionaryExtensions
3+
internal static class DictionaryExtensions
44
{
55
public static bool EquivalentTo<TKey, TValue>(this IDictionary<TKey, TValue> first, IDictionary<TKey, TValue> second) => EquivalentTo(first, second, null);
66

7-
public static bool EquivalentTo<TKey, TValue>(this IDictionary<TKey, TValue> first, IDictionary<TKey, TValue> second, IEqualityComparer<TValue> valueComparer)
7+
public static bool EquivalentTo<TKey, TValue>(this IDictionary<TKey, TValue> first, IDictionary<TKey, TValue> second, IEqualityComparer<TValue>? valueComparer)
88
{
99
if (first == second) return true;
1010
if (first == null || second == null) return false;

tests/OLT.Extensions.Configuration.RESTApi.Tests/ConfigurationsUnitTest.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ public void BuildConfiguration_ShouldReturnConfigurationSource()
1919
var environment = configSection["Environment"] ?? string.Empty;
2020
var apiKey = configSection["ApiKey"] ?? string.Empty;
2121

22-
ConfigurationBuilderExtensions.AddRestApiConfigProvider(configBuilder, endpoint, true, options =>
22+
ConfigurationBuilderExtensions.AddRestApi(configBuilder, endpoint, true, options =>
2323
{
2424
options
2525
.SetHeaderAcceptJson()

0 commit comments

Comments
 (0)