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

Improvements to JsonItemWrapper serialization

Browse Source
This commit is contained in:
Jack Kanarish
2018-03-08 17:34:06 -05:00
parent 55f09a46be
commit 20221678ba
2 changed files with 21 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
ICD.Common.Utils.Tests/Json/JsonItemWrapperTest.cs
View File

@@ -1,5 +1,7 @@
using System; using System;
using System.Collections.Generic;
using ICD.Common.Utils.Json; using ICD.Common.Utils.Json;
using Newtonsoft.Json.Linq;
using NUnit.Framework; using NUnit.Framework;
namespace ICD.Common.Utils.Tests.Json namespace ICD.Common.Utils.Tests.Json
@@ -7,12 +9,6 @@ namespace ICD.Common.Utils.Tests.Json
[TestFixture] [TestFixture]
public sealed class JsonItemWrapperTest public sealed class JsonItemWrapperTest
{ {
[TestCase(null, null)]
public void ItemTypeStringTest(object item, string expected)
{
Assert.AreEqual(expected, new JsonItemWrapper(item).ItemTypeString);
}
[TestCase(null, null)] [TestCase(null, null)]
[TestCase("", typeof(string))] [TestCase("", typeof(string))]
[TestCase(1, typeof(int))] [TestCase(1, typeof(int))]
@@ -31,13 +27,22 @@ namespace ICD.Common.Utils.Tests.Json
[Test] [Test]
public void WriteTest() public void WriteTest()
{ {
JsonItemWrapper wrapper = new JsonItemWrapper(new List<int> {1, 2, 3});
string json = JsonUtils.Serialize(wrapper.Write);
Assert.Inconclusive(); Assert.Inconclusive();
} }
[Test] [Test]
public void ReadTest() public void ReadTest()
{ {
Assert.Inconclusive(); const string json = "{\"t\":\"System.Collections.Generic.List`1[[System.Int32, System.Private.CoreLib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=7cec85d7bea7798e]]\",\"i\":\"[1,2,3]\"}";
JObject jObject = JObject.Parse(json);
List<int> wrappedObject = JsonItemWrapper.ReadToObject(jObject) as List<int>;
Assert.NotNull(wrappedObject);
Assert.AreEqual(3, wrappedObject.Count);
} }
} }
} }

27
ICD.Common.Utils/Json/JsonItemWrapper.cs
View File

@@ -1,4 +1,5 @@
using System; using System;
using ICD.Common.Utils.Extensions;
using Newtonsoft.Json; using Newtonsoft.Json;
using Newtonsoft.Json.Linq; using Newtonsoft.Json.Linq;
@@ -12,26 +13,17 @@ namespace ICD.Common.Utils.Json
private const string TYPE_TOKEN = "t"; private const string TYPE_TOKEN = "t";
private const string ITEM_TOKEN = "i"; private const string ITEM_TOKEN = "i";
private readonly string m_ItemTypeString;
private readonly object m_Item; private readonly object m_Item;
/// <summary>
/// Gets the string representation of the item type. Returns null if the item is null.
/// </summary>
public string ItemTypeString { get { return m_ItemTypeString; } }
/// <summary> /// <summary>
/// Gets the Type of the item. Returns null if the item is null. /// Gets the Type of the item. Returns null if the item is null.
/// </summary> /// </summary>
public Type ItemType public Type ItemType { get { return m_Item == null ? null : m_Item.GetType(); } }
{
get { return string.IsNullOrEmpty(m_ItemTypeString) ? null : Type.GetType(m_ItemTypeString); }
}
/// <summary> /// <summary>
/// Gets the wrapped item. /// Gets the wrapped item.
/// </summary> /// </summary>
public object Item { get { return string.IsNullOrEmpty(m_ItemTypeString) ? null : m_Item; } } public object Item { get { return m_Item; } }
/// <summary> /// <summary>
/// Constructor. /// Constructor.
@@ -39,7 +31,6 @@ namespace ICD.Common.Utils.Json
/// <param name="item"></param> /// <param name="item"></param>
public JsonItemWrapper(object item) public JsonItemWrapper(object item)
{ {
m_ItemTypeString = item == null ? null : item.GetType().FullName;
m_Item = item; m_Item = item;
} }
@@ -53,13 +44,13 @@ namespace ICD.Common.Utils.Json
throw new ArgumentNullException("writer"); throw new ArgumentNullException("writer");
writer.WriteStartObject(); writer.WriteStartObject();
{
writer.WritePropertyName(TYPE_TOKEN);
writer.WriteType(ItemType);
writer.WritePropertyName(TYPE_TOKEN); writer.WritePropertyName(ITEM_TOKEN);
writer.WriteValue(m_ItemTypeString); writer.WriteValue(JsonConvert.SerializeObject(m_Item));
}
writer.WritePropertyName(ITEM_TOKEN);
writer.WriteValue(JsonConvert.SerializeObject(m_Item));
writer.WriteEndObject(); writer.WriteEndObject();
} }