Fix review comments for #207 (#210)

EasyNetQ · Jan 6, 2023 · eb0489d · eb0489d
1 parent f9a6f42
commit eb0489d
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 4 deletions.
diff --git a/Source/EasyNetQ.Management.Client/Serialization/ObjectHelpers.cs b/Source/EasyNetQ.Management.Client/Serialization/ObjectHelpers.cs
@@ -5,6 +5,9 @@ namespace EasyNetQ.Management.Client.Serialization;
 
 internal static class ObjectHelpers
 {
+    private static readonly object False = false;
+    private static readonly object True = true;
+
     public static void WriteObjectValue(this Utf8JsonWriter writer, object? value)
     {
         switch (value)
@@ -43,7 +46,7 @@ public static void WriteObjectValue(this Utf8JsonWriter writer, object? value)
                 writer.WriteEndArray();
                 return;
             default:
-                throw new ArgumentOutOfRangeException();
+                throw new ArgumentOutOfRangeException(nameof(value), value, null);
         }
     }
 
@@ -66,9 +69,9 @@ public static void WriteObjectValue(this Utf8JsonWriter writer, object? value)
                     return new ReadOnlyDictionary<string, object?>(dictionary);
                 }
             case { ValueKind: JsonValueKind.True }:
-                return true;
+                return True;
             case { ValueKind: JsonValueKind.False }:
-                return false;
+                return False;
             case { ValueKind: JsonValueKind.Number }:
                 return jsonElement.TryGetInt64(out var longValue) ? longValue : jsonElement.GetDouble();
             case { ValueKind: JsonValueKind.String }:
@@ -79,7 +82,7 @@ public static void WriteObjectValue(this Utf8JsonWriter writer, object? value)
             case { ValueKind: JsonValueKind.Null }:
                 return null;
             default:
-                throw new ArgumentOutOfRangeException();
+                throw new ArgumentOutOfRangeException(nameof(jsonElement), jsonElement, null);
         }
     }
 }
diff --git a/Source/EasyNetQ.Management.Client/Serialization/StringObjectReadOnlyDictionaryConverter.cs b/Source/EasyNetQ.Management.Client/Serialization/StringObjectReadOnlyDictionaryConverter.cs
@@ -12,6 +12,8 @@ internal sealed class StringObjectReadOnlyDictionaryConverter : JsonConverter<IR
 
         switch (jsonElement)
         {
+            case { ValueKind: JsonValueKind.Array } when jsonElement.GetArrayLength() > 0:
+                throw new JsonException("Empty array is required");
             case { ValueKind: JsonValueKind.Array }:
                 return new ReadOnlyDictionary<string, object?>(new Dictionary<string, object?>());
             case { ValueKind: JsonValueKind.Object }: