Skip to content

Commit afce371

Browse files
authored
Change name of options class for visibility (#19)
1 parent d326b57 commit afce371

7 files changed

+18
-13
lines changed

README.md

+3-2
Original file line numberDiff line numberDiff line change
@@ -422,16 +422,17 @@ public static class FluentHttpClientExtensions
422422
}
423423
```
424424

425-
## Default Json Serialization Options
425+
## Default JsonSerializerOptions
426426

427427
Unless explicitly passed in the method call for serialization or deserialization of JSON, the following default `JsonSerializerOptions` will be used:
428428

429429
```csharp
430430
new JsonSerializerOptions
431431
{
432432
PropertyNameCaseInsensitive = true,
433+
NumberHandling = JsonNumberHandling.AllowReadingFromString,
433434
DefaultIgnoreCondition = JsonIgnoreCondition.WhenWritingNull
434435
};
435436
```
436437

437-
This default can be overridden or modified via the `FluentHttpClient.DefaultJsonSerializerOptions` property.
438+
This default can be overridden or modified via the `FluentHttpClientOptions.DefaultJsonSerializerOptions` property.

src/FluentHttpClient.Tests/QueryParamsTests.cs

+2-2
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ public class QueryParamsTests
77
[Fact]
88
public void DoesNotRemoveEmptyValues()
99
{
10-
FluentHttpClient.RemoveEmptyQueryParameters = false;
10+
FluentHttpClientOptions.RemoveEmptyQueryParameters = false;
1111

1212
var expected = "?name=bob&age=&color=blue";
1313

@@ -25,7 +25,7 @@ public void DoesNotRemoveEmptyValues()
2525
[Fact]
2626
public void RemovesEmptyValues()
2727
{
28-
FluentHttpClient.RemoveEmptyQueryParameters = true;
28+
FluentHttpClientOptions.RemoveEmptyQueryParameters = true;
2929

3030
var expected = "?name=bob&color=blue";
3131

src/FluentHttpClient/FluentHttpClient.csproj

+1-1
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
<PackageTags>fluent httpclient rest http api web client</PackageTags>
1616
<AssemblyVersion>$(Version)</AssemblyVersion>
1717
<FileVersion>$(Version)</FileVersion>
18-
<Version>3.0.4</Version>
18+
<Version>3.0.5</Version>
1919
<GeneratePackageOnBuild>true</GeneratePackageOnBuild>
2020
<PackageReadmeFile>README.md</PackageReadmeFile>
2121
<PackageLicenseFile>LICENSE</PackageLicenseFile>

src/FluentHttpClient/FluentHttpClient.cs src/FluentHttpClient/FluentHttpClientOptions.cs

+5-1
Original file line numberDiff line numberDiff line change
@@ -3,11 +3,15 @@
33

44
namespace FluentHttpClient;
55

6-
public static class FluentHttpClient
6+
public static class FluentHttpClientOptions
77
{
8+
/// <summary>
9+
/// Default JsonSerializerOptions that will be use when serializing and deserializing if none are provided.
10+
/// </summary>
811
public static JsonSerializerOptions DefaultJsonSerializerOptions { get; set; } = new JsonSerializerOptions
912
{
1013
PropertyNameCaseInsensitive = true,
14+
NumberHandling = JsonNumberHandling.AllowReadingFromString,
1115
DefaultIgnoreCondition = JsonIgnoreCondition.WhenWritingNull
1216
};
1317

src/FluentHttpClient/FluentJsonDeserialization.cs

+5-5
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ public static class FluentJsonDeserialization
66
{
77
public static async Task<T?> DeserializeJsonAsync<T>(this Task<Stream> result)
88
{
9-
return await result.DeserializeJsonAsync<T>(FluentHttpClient.DefaultJsonSerializerOptions);
9+
return await result.DeserializeJsonAsync<T>(FluentHttpClientOptions.DefaultJsonSerializerOptions);
1010
}
1111

1212
public static async Task<T?> DeserializeJsonAsync<T>(this Task<Stream> result, JsonSerializerOptions options)
@@ -16,7 +16,7 @@ public static class FluentJsonDeserialization
1616

1717
public static async Task<T?> DeserializeJsonAsync<T>(this Task<String> result)
1818
{
19-
return await result.DeserializeJsonAsync<T>(FluentHttpClient.DefaultJsonSerializerOptions);
19+
return await result.DeserializeJsonAsync<T>(FluentHttpClientOptions.DefaultJsonSerializerOptions);
2020
}
2121

2222
public static async Task<T?> DeserializeJsonAsync<T>(this Task<string> result, JsonSerializerOptions options)
@@ -26,7 +26,7 @@ public static class FluentJsonDeserialization
2626

2727
public static async Task<T?> DeserializeJsonAsync<T>(this Task<HttpResponseMessage> result)
2828
{
29-
return await result.DeserializeJsonAsync<T>(FluentHttpClient.DefaultJsonSerializerOptions);
29+
return await result.DeserializeJsonAsync<T>(FluentHttpClientOptions.DefaultJsonSerializerOptions);
3030
}
3131

3232
public static async Task<T?> DeserializeJsonAsync<T>(this Task<HttpResponseMessage> taskResponse, JsonSerializerOptions options)
@@ -37,7 +37,7 @@ public static class FluentJsonDeserialization
3737

3838
public static async Task<T?> DeserializeJsonAsync<T>(this Task<HttpResponseMessage> result, Func<HttpResponseMessage, T> defaultAction)
3939
{
40-
return await result.DeserializeJsonAsync<T>(defaultAction, FluentHttpClient.DefaultJsonSerializerOptions);
40+
return await result.DeserializeJsonAsync<T>(defaultAction, FluentHttpClientOptions.DefaultJsonSerializerOptions);
4141
}
4242

4343
public static async Task<T?> DeserializeJsonAsync<T>(this Task<HttpResponseMessage> taskResponse, Func<HttpResponseMessage, T> defaultAction, JsonSerializerOptions options)
@@ -50,7 +50,7 @@ public static class FluentJsonDeserialization
5050

5151
public static async Task<T?> DeserializeJsonAsync<T>(this Task<HttpResponseMessage> result, Func<HttpResponseMessage, Task<T>> defaultAction)
5252
{
53-
return await result.DeserializeJsonAsync<T>(defaultAction, FluentHttpClient.DefaultJsonSerializerOptions);
53+
return await result.DeserializeJsonAsync<T>(defaultAction, FluentHttpClientOptions.DefaultJsonSerializerOptions);
5454
}
5555

5656
public static async Task<T?> DeserializeJsonAsync<T>(this Task<HttpResponseMessage> taskResponse, Func<HttpResponseMessage, Task<T>> defaultAction, JsonSerializerOptions options)

src/FluentHttpClient/HttpRequestBuilderExtensions.cs

+1-1
Original file line numberDiff line numberDiff line change
@@ -155,7 +155,7 @@ public static partial class HttpRequestBuilderExtensions
155155
{
156156
public static HttpRequestBuilder WithJsonContent(this HttpRequestBuilder builder, object content)
157157
{
158-
return builder.WithJsonContent(content, FluentHttpClient.DefaultJsonSerializerOptions);
158+
return builder.WithJsonContent(content, FluentHttpClientOptions.DefaultJsonSerializerOptions);
159159
}
160160

161161
public static HttpRequestBuilder WithJsonContent(this HttpRequestBuilder builder, object content, JsonSerializerOptions options)

src/FluentHttpClient/QueryParams.cs

+1-1
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ public override string ToString()
1515
from key in AllKeys
1616
let value = Get(key)
1717
where (
18-
!FluentHttpClient.RemoveEmptyQueryParameters
18+
!FluentHttpClientOptions.RemoveEmptyQueryParameters
1919
|| !string.IsNullOrWhiteSpace(value)
2020
)
2121
select $"{Uri.EscapeDataString(key)}={Uri.EscapeDataString(value)}"

0 commit comments

Comments
 (0)