Skip to content

Commit

Permalink
annotate Geraetemerkmal? properties with STJ+Newtonsoft JsonConvert…
Browse files Browse the repository at this point in the history
…ers (#557)

Co-authored-by: Konstantin <[email protected]>
  • Loading branch information
hf-kklein and Konstantin authored Nov 7, 2024
1 parent 001f371 commit 16bbdef
Show file tree
Hide file tree
Showing 2 changed files with 10 additions and 0 deletions.
5 changes: 5 additions & 0 deletions BO4E/BO/Zaehler.cs
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
using BO4E.COM;
using BO4E.ENUM;
using BO4E.meta;
using BO4E.meta.LenientConverters;
using Newtonsoft.Json;
using ProtoBuf;

Expand Down Expand Up @@ -189,6 +190,10 @@ private DateTime _LetzteEichung
[ProtoMember(1019)]
[JsonPropertyOrder(25)]
[NonOfficial(NonOfficialCategory.REGULATORY_REQUIREMENTS)]
[Newtonsoft.Json.JsonConverter(typeof(LenientGeraetemerkmalGasConverter))]
[System.Text.Json.Serialization.JsonConverter(
typeof(LenientSystemTextNullableGeraetemerkmalGasConverter)
)]
public Geraetemerkmal? Zaehlergroesse { get; set; }

/// <summary>Liste der Geräte, die zu diesem Zähler gehören.</summary>
Expand Down
5 changes: 5 additions & 0 deletions BO4E/COM/Geraeteeigenschaften.cs
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
using System.Text.Json.Serialization;
using BO4E.ENUM;
using BO4E.meta;
using BO4E.meta.LenientConverters;
using Newtonsoft.Json;
using ProtoBuf;

Expand All @@ -29,6 +30,10 @@ public class Geraeteeigenschaften : COM
[JsonPropertyName("geraetemerkmal")]
[ProtoMember(4)]
[JsonPropertyOrder(11)]
[Newtonsoft.Json.JsonConverter(typeof(LenientGeraetemerkmalGasConverter))]
[System.Text.Json.Serialization.JsonConverter(
typeof(LenientSystemTextNullableGeraetemerkmalGasConverter)
)]
public Geraetemerkmal? Geraetemerkmal { get; set; }

/// <summary>
Expand Down

0 comments on commit 16bbdef

Please sign in to comment.