Skip to content

Commit

Permalink
fix: read feature on MaybeJsonConverter (#539)
Browse files Browse the repository at this point in the history
* Fix MaybeJsonConverter Read method

* Simplify read implementation
  • Loading branch information
Tr00d committed Oct 18, 2023
1 parent ba41a7e commit e0f4b43
Show file tree
Hide file tree
Showing 3 changed files with 27 additions and 7 deletions.
23 changes: 23 additions & 0 deletions Vonage.Common.Test/Serialization/MaybeJsonConverterTest.cs
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
using System.Text.Json;
using Vonage.Common.Serialization;
using Vonage.Common.Test.Extensions;

namespace Vonage.Common.Test.Serialization
{
public class MaybeJsonConverterTest
{
[Fact]
public void Read_ShouldDeserializeUri_GivenJsonIsUriString()
{
var reader =
new Utf8JsonReader(
"\"https://api.nexmo.com/v2/verify/c11236f4-00bf-4b89-84ba-88b25df97315/silent-auth/redirect\""u8
.ToArray().AsSpan());
reader.Read();
new MaybeJsonConverter<Uri>().Read(ref reader, typeof(Uri), new JsonSerializerOptions())
.Should()
.BeSome(new Uri(
"https://api.nexmo.com/v2/verify/c11236f4-00bf-4b89-84ba-88b25df97315/silent-auth/redirect"));
}
}
}
9 changes: 3 additions & 6 deletions Vonage.Common/Serialization/MaybeJsonConverter.cs
Original file line number Diff line number Diff line change
Expand Up @@ -11,19 +11,16 @@ namespace Vonage.Common.Serialization;
/// <typeparam name="T">The underlying type.</typeparam>
public class MaybeJsonConverter<T> : JsonConverter<Maybe<T>>
{
public MaybeJsonConverter() => this.serializer = new JsonSerializer();

/// <inheritdoc />
public override Maybe<T> Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options) =>
this.serializer
.DeserializeObject<T>(reader.GetString())
this.Serializer.DeserializeObject<T>($"\"{reader.GetString()}\"")
.Match(Maybe<T>.Some, _ => Maybe<T>.None);

/// <inheritdoc />
public override void Write(Utf8JsonWriter writer, Maybe<T> value, JsonSerializerOptions options) =>
value
.Map(some => this.serializer.SerializeObject(some))
.Map(some => this.Serializer.SerializeObject(some))
.IfSome(some => writer.WriteRawValue(some));

protected JsonSerializer serializer;
protected JsonSerializer Serializer = new();
}
2 changes: 1 addition & 1 deletion Vonage/Common/VonageMaybeJsonConverter.cs
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ public class VonageMaybeJsonConverter<T> : MaybeJsonConverter<T>
/// Constructor.
/// </summary>
public VonageMaybeJsonConverter() =>
this.serializer = JsonSerializer.BuildWithSnakeCase()
this.Serializer = JsonSerializer.BuildWithSnakeCase()
.WithConverter(new EnumDescriptionJsonConverter<RoomApprovalLevel>())
.WithConverter(new EnumDescriptionJsonConverter<RecordingStatus>())
.WithConverter(new EnumDescriptionJsonConverter<RoomType>())
Expand Down

0 comments on commit e0f4b43

Please sign in to comment.