Skip to content

Fix #560 Device with all numeric name cannot be deserialized #612

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Jan 17, 2022
Merged

Fix #560 Device with all numeric name cannot be deserialized #612

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/Client/NetDaemon.HassClient.Tests/Json/HassDeviceConverterTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ public void TestConvertionWithNumericValue()
""connections"": [],
""manufacturer"": ""Google Inc."",
""model"": 123123,
""name"": ""My TV"",
""name"": 123,
""sw_version"": null,
""id"": ""42cdda32a2a3428e86c2e27699d79ead"",
""via_device_id"": null,
Expand Down
3 changes: 2 additions & 1 deletion src/Client/NetDaemon.HassClient/Common/HomeAssistant/Model/HassDevice.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,13 +5,14 @@ public record HassDevice
[JsonPropertyName("manufacturer")] public string? Manufacturer { get; init; }

[JsonPropertyName("model")]
[JsonConverter(typeof(HassDeviceModelConverter))]
[JsonConverter(typeof(ReadNumberAsStringConverter))]
public string? Model { get; init; }

[JsonPropertyName("id")] public string? Id { get; init; }

[JsonPropertyName("area_id")] public string? AreaId { get; init; }

[JsonConverter(typeof(ReadNumberAsStringConverter))]
[JsonPropertyName("name")] public string? Name { get; init; }

[JsonPropertyName("name_by_user")] public string? NameByUser { get; init; }
Expand Down
2 changes: 1 addition & 1 deletion ...Internal/Json/HassDeviceModelConverter.cs → ...ernal/Json/ReadNumberAsStringConverter.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
namespace NetDaemon.Client.Internal.Json;

internal class HassDeviceModelConverter : JsonConverter<string>
internal class ReadNumberAsStringConverter : JsonConverter<string>
{
public override string? Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
{
Expand Down