fix: Also support h_GAS with lower case h in custom JSON converte…

…rs (#529) * fix: Also support`h_GAS` with lower case `h` in custom JSON converters fixes System.Text.Json.JsonException: Invalid value for System.Nullable`1[BO4E.ENUM.Gasqualitaet]: h_GAS at BO4E.meta.LenientConverters.SystemTextGasqualitaetStringEnumConverter.Read(Utf8JsonReader& reader, Type typeToConvert, JsonSerializerOptions options) in D:\a\BO4E-dotnet\BO4E-dotnet\BO4E\meta\LenientConverters\GasqualitaetStringEnumConverter.cs:line 29 --------- Co-authored-by: Konstantin <[email protected]>
Hochfrequenz · Sep 23, 2024 · 7cd7e2a · 7cd7e2a
1 parent 1617747
commit 7cd7e2a
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 4 deletions.
diff --git a/BO4E/meta/LenientConverters/GasqualitaetStringEnumConverter.cs b/BO4E/meta/LenientConverters/GasqualitaetStringEnumConverter.cs
@@ -27,11 +27,11 @@ System.Text.Json.JsonSerializerOptions options
         }
         string enumString = reader.GetString();
 
-        return enumString switch
+        return enumString?.ToUpper() switch
         {
             "HGAS" => Gasqualitaet.H_GAS,
             "LGAS" => Gasqualitaet.L_GAS,
-            _ => Enum.TryParse(enumString, out Gasqualitaet result)
+            _ => Enum.TryParse(enumString?.ToUpper(), out Gasqualitaet result)
                 ? result
                 : throw new System.Text.Json.JsonException(
                     $"Invalid value for {typeToConvert}: {enumString}"
@@ -96,11 +96,11 @@ Newtonsoft.Json.JsonSerializer serializer
         {
             string enumString = reader.Value.ToString();
 
-            return enumString switch
+            return enumString?.ToUpper() switch
             {
                 "HGAS" => Gasqualitaet.H_GAS,
                 "LGAS" => Gasqualitaet.L_GAS,
-                _ => Enum.TryParse(enumString, out Gasqualitaet result)
+                _ => Enum.TryParse(enumString?.ToUpper(), out Gasqualitaet result)
                     ? result
                     : throw new Newtonsoft.Json.JsonSerializationException(
                         $"Invalid value for {objectType}: {enumString}"

diff --git a/BO4ETestProject/TestStringEnumConverter.cs b/BO4ETestProject/TestStringEnumConverter.cs
@@ -112,6 +112,7 @@ public class ClassWithNonNullableGasqualitaet
 
     [TestMethod]
     [DataRow("HGAS", Gasqualitaet.H_GAS)]
+    [DataRow("h_GAS", Gasqualitaet.H_GAS)]
     [DataRow("H_GAS", Gasqualitaet.H_GAS)]
     [DataRow("LGAS", Gasqualitaet.L_GAS)]
     [DataRow("L_GAS", Gasqualitaet.L_GAS)]
@@ -148,6 +149,7 @@ public void Test_System_Text_Gasqualitaet_Legacy_Converter_With_Nullable_Gasqual
 
     [TestMethod]
     [DataRow("HGAS", Gasqualitaet.H_GAS)]
+    [DataRow("h_GAS", Gasqualitaet.H_GAS)]
     [DataRow("H_GAS", Gasqualitaet.H_GAS)]
     [DataRow("LGAS", Gasqualitaet.L_GAS)]
     [DataRow("L_GAS", Gasqualitaet.L_GAS)]
@@ -183,6 +185,7 @@ Gasqualitaet expectedGasqualitaet
     [TestMethod]
     [DataRow("HGAS", Gasqualitaet.H_GAS)]
     [DataRow("H_GAS", Gasqualitaet.H_GAS)]
+    [DataRow("h_GAS", Gasqualitaet.H_GAS)]
     [DataRow("LGAS", Gasqualitaet.L_GAS)]
     [DataRow("L_GAS", Gasqualitaet.L_GAS)]
     [DataRow(null, null)]
@@ -223,6 +226,7 @@ public void Test_Newtonsoft_Gasqualitaet_Legacy_Converter_With_Nullable_Gasquali
     [TestMethod]
     [DataRow("HGAS", Gasqualitaet.H_GAS)]
     [DataRow("H_GAS", Gasqualitaet.H_GAS)]
+    [DataRow("h_GAS", Gasqualitaet.H_GAS)]
     [DataRow("LGAS", Gasqualitaet.L_GAS)]
     [DataRow("L_GAS", Gasqualitaet.L_GAS)]
     public void Test_Newtonsoft_Gasqualitaet_Legacy_Converter_With_Non_Nullable_Gasqualitaet(