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

feat: Additional validation

Browse Source
This commit is contained in:
Chris Cameron
2018-04-05 17:03:24 -04:00
parent 907697813d
commit 27f5fd0fe7
2 changed files with 38 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
ICD.Common.Utils/Json/AbstractGenericJsonConverter.cs
View File

@@ -14,6 +14,12 @@ namespace ICD.Common.Utils.Json
/// <param name="serializer">The calling serializer.</param> /// <param name="serializer">The calling serializer.</param>
public sealed override void WriteJson(JsonWriter writer, object value, JsonSerializer serializer) public sealed override void WriteJson(JsonWriter writer, object value, JsonSerializer serializer)
{ {
if (writer == null)
throw new ArgumentNullException("writer");
if (serializer == null)
throw new ArgumentNullException("serializer");
if (value == null) if (value == null)
{ {
writer.WriteNull(); writer.WriteNull();
@@ -45,6 +51,12 @@ namespace ICD.Common.Utils.Json
public sealed override object ReadJson(JsonReader reader, Type objectType, object existingValue, public sealed override object ReadJson(JsonReader reader, Type objectType, object existingValue,
JsonSerializer serializer) JsonSerializer serializer)
{ {
if (reader == null)
throw new ArgumentNullException("reader");
if (serializer == null)
throw new ArgumentNullException("serializer");
return ReadJson(reader, (T)existingValue, serializer); return ReadJson(reader, (T)existingValue, serializer);
} }

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

@@ -37,6 +37,9 @@ namespace ICD.Common.Utils.Json
/// </summary> /// </summary>
public static void CacheType(Type type) public static void CacheType(Type type)
{ {
if (type == null)
throw new ArgumentNullException("type");
string serialized = JsonConvert.SerializeObject(ReflectionUtils.CreateInstance(type)); string serialized = JsonConvert.SerializeObject(ReflectionUtils.CreateInstance(type));
JsonConvert.DeserializeObject(serialized, type); JsonConvert.DeserializeObject(serialized, type);
} }
@@ -91,7 +94,11 @@ namespace ICD.Common.Utils.Json
[PublicAPI] [PublicAPI]
public static void Print(string json) public static void Print(string json)
{ {
IcdConsole.PrintLine(Format(json)); if (json == null)
throw new ArgumentNullException("json");
string formatted = Format(json);
IcdConsole.PrintLine(formatted);
} }
/// <summary> /// <summary>
@@ -113,6 +120,9 @@ namespace ICD.Common.Utils.Json
[PublicAPI] [PublicAPI]
public static string Format(string json) public static string Format(string json)
{ {
if (json == null)
throw new ArgumentNullException("json");
int indent = 0; int indent = 0;
bool quoted = false; bool quoted = false;
StringBuilder sb = new StringBuilder(); StringBuilder sb = new StringBuilder();
@@ -298,6 +308,12 @@ namespace ICD.Common.Utils.Json
/// <returns></returns> /// <returns></returns>
public static object Deserialize(Type type, JToken token) public static object Deserialize(Type type, JToken token)
{ {
if (type == null)
throw new ArgumentNullException("type");
if (token == null)
throw new ArgumentNullException("token");
return Deserialize(type, token, new JsonSerializer()); return Deserialize(type, token, new JsonSerializer());
} }
@@ -310,6 +326,15 @@ namespace ICD.Common.Utils.Json
/// <returns></returns> /// <returns></returns>
public static object Deserialize(Type type, JToken token, JsonSerializer serializer) public static object Deserialize(Type type, JToken token, JsonSerializer serializer)
{ {
if (type == null)
throw new ArgumentNullException("type");
if (token == null)
throw new ArgumentNullException("token");
if (serializer == null)
throw new ArgumentNullException("serializer");
using (JTokenReader jsonReader = new JTokenReader(token)) using (JTokenReader jsonReader = new JTokenReader(token))
return serializer.Deserialize(jsonReader, type); return serializer.Deserialize(jsonReader, type);
} }