Always deserialize with type converters

Author: JoeBiellik

Configuration/ConfigurationManager.cs

@@ -3,8 +3,6 @@
 using NFive.SDK.Core.Plugins;
 using System;
 using System.IO;
-using YamlDotNet.Serialization;
-using YamlDotNet.Serialization.NamingConventions;
 
 namespace NFive.SDK.Plugins.Configuration
 {
@@ -51,12 +49,7 @@ public static object Load(string path, Type type)
 
 			if (!File.Exists(path)) InitializeType(path, type);
 
-			var deserializer = new DeserializerBuilder()
-				.WithNamingConvention(new UnderscoredNamingConvention())
-				//.IgnoreUnmatchedProperties()
-				.Build();
-
-			return deserializer.Deserialize(File.ReadAllText(path), type);
+			return Yaml.Deserialize(File.ReadAllText(path), type);
 		}
 
 		/// <summary>
@@ -111,16 +104,8 @@ public static void InitializeType(string file, Type type)
 			// Create new instance of type
 			var configuration = (IControllerConfiguration)Activator.CreateInstance(type);
 
-			// Serialize configuration
-			var yml = new SerializerBuilder()
-				.WithNamingConvention(new UnderscoredNamingConvention())
-				.EmitDefaults()
-				.WithTypeInspector(i => new PluginTypeInspector(i))
-				.Build()
-				.Serialize(configuration);
-
 			// Write Yaml to file
-			File.WriteAllText(file, yml);
+			File.WriteAllText(file, Yaml.Serialize(configuration));
 		}
 	}
 }

Configuration/Yaml.cs

@@ -1,3 +1,4 @@
+using System;
 using YamlDotNet.Serialization;
 using YamlDotNet.Serialization.NamingConventions;
 
@@ -22,17 +23,34 @@ public static string Serialize(object obj)
 				.WithTypeConverter(new TimeSpanConverter())
 				.WithTypeConverter(new VersionConverter())
 				.WithTypeConverter(new VersionRangeConverter())
+				//.EmitDefaults()
 				.Build()
 				.Serialize(obj);
 		}
 
 		/// <summary>
 		/// Deserializes the specified Yaml.
 		/// </summary>
-		/// <typeparam name="T">Type to deserialize as.</typeparam>
+		/// <typeparam name="T">The type to deserialize as.</typeparam>
 		/// <param name="yml">The Yaml string.</param>
 		/// <returns>The deserialized object.</returns>
 		public static T Deserialize<T>(string yml)
+		{
+			return Deserializer().Deserialize<T>(yml);
+		}
+
+		/// <summary>
+		/// Deserializes the specified Yaml.
+		/// </summary>
+		/// <param name="yml">The Yaml string.</param>
+		/// <param name="type">The type to deserialize as.</param>
+		/// <returns>The deserialized object.</returns>
+		public static object Deserialize(string yml, Type type)
+		{
+			return Deserializer().Deserialize(yml, type);
+		}
+
+		private static IDeserializer Deserializer()
 		{
 			return new DeserializerBuilder()
 				.WithNamingConvention(new UnderscoredNamingConvention())
@@ -42,8 +60,7 @@ public static T Deserialize<T>(string yml)
 				.WithTypeConverter(new TimeSpanConverter())
 				.WithTypeConverter(new VersionConverter())
 				.WithTypeConverter(new VersionRangeConverter())
-				.Build()
-				.Deserialize<T>(yml);
+				.Build();
 		}
 	}
 }