icdsystems/ICD.Common.Utils
1
0
Fork 0
mirror of https://github.com/ICDSystems/ICD.Common.Utils.git synced 2026-02-16 13:15:07 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/fix/json-dict' into KrangAtHome

Browse Source
This commit is contained in:
Drew Tingen
2019-08-07 13:28:26 -04:00
parent 6af3e5b2ff 65f76402cc
commit edb5534b9d
1 changed files with 84 additions and 78 deletions
Download Patch File Download Diff File Expand all files Collapse all files

162
ICD.Common.Utils/Extensions/JsonSerializerExtensions.cs
View File

@@ -1,6 +1,5 @@
using System; using System;
using System.Collections.Generic; using System.Collections.Generic;
using System.Globalization;
using System.Linq; using System.Linq;
using Newtonsoft.Json; using Newtonsoft.Json;
@@ -8,6 +7,9 @@ namespace ICD.Common.Utils.Extensions
{ {
public static class JsonSerializerExtensions public static class JsonSerializerExtensions
{ {
private const string PROPERTY_KEY = "k";
private const string PROPERTY_VALUE = "v";
/// <summary> /// <summary>
/// Deserializes an array of items from the reader's current value. /// Deserializes an array of items from the reader's current value.
/// </summary> /// </summary>
@@ -81,7 +83,15 @@ namespace ICD.Common.Utils.Extensions
public static IEnumerable<KeyValuePair<TKey, TValue>> DeserializeDict<TKey, TValue>(this JsonSerializer extends, public static IEnumerable<KeyValuePair<TKey, TValue>> DeserializeDict<TKey, TValue>(this JsonSerializer extends,
JsonReader reader) JsonReader reader)
{ {
return extends.DeserializeDict<TKey, TValue>(reader, p => (TKey)Convert.ChangeType(p, typeof(TKey), CultureInfo.InvariantCulture)); if (extends == null)
throw new ArgumentNullException("extends");
if (reader == null)
throw new ArgumentNullException("reader");
return extends.DeserializeDict(reader,
(s, r) => s.Deserialize<TKey>(r),
(s, r) => s.Deserialize<TValue>(r));
} }
/// <summary> /// <summary>
@@ -91,27 +101,13 @@ namespace ICD.Common.Utils.Extensions
/// <typeparam name="TValue"></typeparam> /// <typeparam name="TValue"></typeparam>
/// <param name="extends"></param> /// <param name="extends"></param>
/// <param name="reader"></param> /// <param name="reader"></param>
/// <param name="getKey"></param> /// <param name="readKey"></param>
public static IEnumerable<KeyValuePair<TKey, TValue>> DeserializeDict<TKey, TValue>(this JsonSerializer extends,
JsonReader reader,
Func<string, TKey> getKey)
{
return extends.DeserializeDict(reader, getKey, (s, r) => extends.Deserialize<TValue>(reader));
}
/// <summary>
/// Deserializes a dictionary of items from the reader's current value.
/// </summary>
/// <typeparam name="TKey"></typeparam>
/// <typeparam name="TValue"></typeparam>
/// <param name="extends"></param>
/// <param name="reader"></param>
/// <param name="getKey"></param>
/// <param name="readValue"></param> /// <param name="readValue"></param>
public static IEnumerable<KeyValuePair<TKey, TValue>> DeserializeDict<TKey, TValue>(this JsonSerializer extends, public static IEnumerable<KeyValuePair<TKey, TValue>> DeserializeDict<TKey, TValue>(this JsonSerializer extends,
JsonReader reader, JsonReader reader,
Func<string, TKey> getKey, Func<JsonSerializer, JsonReader,
Func<JsonSerializer, JsonReader, TKey> readKey,
Func<JsonSerializer, JsonReader,
TValue> readValue) TValue> readValue)
{ {
if (extends == null) if (extends == null)
@@ -120,36 +116,39 @@ namespace ICD.Common.Utils.Extensions
if (reader == null) if (reader == null)
throw new ArgumentNullException("reader"); throw new ArgumentNullException("reader");
if (getKey == null) if (readKey == null)
throw new ArgumentNullException("getKey"); throw new ArgumentNullException("readKey");
if (readValue == null) if (readValue == null)
throw new ArgumentNullException("readValue"); throw new ArgumentNullException("readValue");
if (reader.TokenType == JsonToken.Null) return extends.DeserializeArray(reader, (s, r) => s.DeserializeKeyValuePair(r, readKey, readValue));
return Enumerable.Empty<KeyValuePair<TKey, TValue>>(); }
public static KeyValuePair<TKey, TValue> DeserializeKeyValuePair<TKey, TValue>(this JsonSerializer extends, JsonReader reader,
Func<JsonSerializer, JsonReader,
TKey> readKey,
Func<JsonSerializer, JsonReader,
TValue> readValue)
{
if (extends == null)
throw new ArgumentNullException("extends");
if (reader == null)
throw new ArgumentNullException("reader");
if (readKey == null)
throw new ArgumentNullException("readKey");
if (readValue == null)
throw new ArgumentNullException("readValue");
if (reader.TokenType != JsonToken.StartObject) if (reader.TokenType != JsonToken.StartObject)
throw new FormatException(string.Format("Expected token {0} got {1}", JsonToken.StartObject, reader.TokenType)); throw new FormatException(string.Format("Expected token {0} got {1}", JsonToken.StartObject, reader.TokenType));
// ToArray to ensure everything gets read before moving onto the next token TKey key = default(TKey);
return DeserializeDictIterator(extends, reader, getKey, readValue).ToArray(); TValue value = default(TValue);
}
/// <summary>
/// Deserializes a dictionary of items from the reader's current value.
/// </summary>
/// <typeparam name="TKey"></typeparam>
/// <typeparam name="TValue"></typeparam>
/// <param name="serializer"></param>
/// <param name="reader"></param>
/// <param name="getKey"></param>
/// <param name="readValue"></param>
private static IEnumerable<KeyValuePair<TKey, TValue>> DeserializeDictIterator<TKey, TValue>(
JsonSerializer serializer, JsonReader reader,
Func<string, TKey> getKey,
Func<JsonSerializer, JsonReader, TValue> readValue)
{
// Step into the first property // Step into the first property
reader.Read(); reader.Read();
@@ -158,17 +157,25 @@ namespace ICD.Common.Utils.Extensions
if (reader.TokenType != JsonToken.PropertyName) if (reader.TokenType != JsonToken.PropertyName)
throw new FormatException(); throw new FormatException();
TKey key = getKey((string)reader.Value); switch ((string)reader.Value)
{
case PROPERTY_KEY:
key = readKey(extends, reader);
break;
// Step into the value case PROPERTY_VALUE:
reader.Read(); value = readValue(extends, reader);
break;
TValue value = readValue(serializer, reader); default:
yield return new KeyValuePair<TKey, TValue>(key, value); throw new FormatException(string.Format("Unexpected property {0}", reader.Value));
}
// Step out of the value // Step out of the value
reader.Read(); reader.Read();
} }
return new KeyValuePair<TKey, TValue>(key, value);
} }
/// <summary> /// <summary>
@@ -228,7 +235,9 @@ namespace ICD.Common.Utils.Extensions
public static void SerializeDict<TKey, TValue>(this JsonSerializer extends, JsonWriter writer, public static void SerializeDict<TKey, TValue>(this JsonSerializer extends, JsonWriter writer,
IEnumerable<KeyValuePair<TKey, TValue>> items) IEnumerable<KeyValuePair<TKey, TValue>> items)
{ {
extends.SerializeDict(writer, items, k => k.ToString()); extends.SerializeDict(writer, items,
(s, w, k) => s.Serialize(w, k),
(s, w, v) => s.Serialize(w, v));
} }
/// <summary> /// <summary>
@@ -239,27 +248,11 @@ namespace ICD.Common.Utils.Extensions
/// <param name="extends"></param> /// <param name="extends"></param>
/// <param name="writer"></param> /// <param name="writer"></param>
/// <param name="items"></param> /// <param name="items"></param>
/// <param name="getPropertyName"></param> /// <param name="writeKey"></param>
public static void SerializeDict<TKey, TValue>(this JsonSerializer extends, JsonWriter writer,
IEnumerable<KeyValuePair<TKey, TValue>> items,
Func<TKey, string> getPropertyName)
{
extends.SerializeDict(writer, items, getPropertyName, (s, w, v) => s.Serialize(w, v));
}
/// <summary>
/// Serializes the given sequence of items to the writer.
/// </summary>
/// <typeparam name="TKey"></typeparam>
/// <typeparam name="TValue"></typeparam>
/// <param name="extends"></param>
/// <param name="writer"></param>
/// <param name="items"></param>
/// <param name="getPropertyName"></param>
/// <param name="writeValue"></param> /// <param name="writeValue"></param>
public static void SerializeDict<TKey, TValue>(this JsonSerializer extends, JsonWriter writer, public static void SerializeDict<TKey, TValue>(this JsonSerializer extends, JsonWriter writer,
IEnumerable<KeyValuePair<TKey, TValue>> items, IEnumerable<KeyValuePair<TKey, TValue>> items,
Func<TKey, string> getPropertyName, Action<JsonSerializer, JsonWriter, TKey> writeKey,
Action<JsonSerializer, JsonWriter, TValue> writeValue) Action<JsonSerializer, JsonWriter, TValue> writeValue)
{ {
if (extends == null) if (extends == null)
@@ -268,26 +261,39 @@ namespace ICD.Common.Utils.Extensions
if (writer == null) if (writer == null)
throw new ArgumentNullException("writer"); throw new ArgumentNullException("writer");
if (getPropertyName == null) if (writeKey == null)
throw new ArgumentNullException("getPropertyName"); throw new ArgumentNullException("writeKey");
if (writeValue == null) if (writeValue == null)
throw new ArgumentNullException("writeValue"); throw new ArgumentNullException("writeValue");
if (items == null) extends.SerializeArray(writer, items, (s, w, kvp) => s.SerializeKeyValuePair(w, kvp, writeKey, writeValue));
{ }
writer.WriteNull();
return; public static void SerializeKeyValuePair<TKey, TValue>(this JsonSerializer extends, JsonWriter writer,
} KeyValuePair<TKey, TValue> kvp,
Action<JsonSerializer, JsonWriter, TKey> writeKey,
Action<JsonSerializer, JsonWriter, TValue> writeValue)
{
if (extends == null)
throw new ArgumentNullException("extends");
if (writer == null)
throw new ArgumentNullException("writer");
if (writeKey == null)
throw new ArgumentNullException("writeKey");
if (writeValue == null)
throw new ArgumentNullException("writeValue");
writer.WriteStartObject(); writer.WriteStartObject();
{ {
foreach (KeyValuePair<TKey, TValue> kvp in items) writer.WritePropertyName(PROPERTY_KEY);
{ writeKey(extends, writer, kvp.Key);
string propertyName = getPropertyName(kvp.Key);
writer.WritePropertyName(propertyName); writer.WritePropertyName(PROPERTY_VALUE);
writeValue(extends, writer, kvp.Value); writeValue(extends, writer, kvp.Value);
}
} }
writer.WriteEndObject(); writer.WriteEndObject();
} }