refactor ConfigBuilder

Author: Ahoo-Wang

build/version.props

@@ -2,7 +2,7 @@
 	<PropertyGroup>
 		<VersionMajor>2</VersionMajor>
 		<VersionMinor>2</VersionMinor>
-		<VersionPatch>53</VersionPatch>
+		<VersionPatch>55</VersionPatch>
 		<VersionPrefix>$(VersionMajor).$(VersionMinor).$(VersionPatch)</VersionPrefix>
 	</PropertyGroup>
 </Project>

src/SmartCode/Configuration/ConfigBuilders/ConfigBuilder.cs

@@ -1,16 +1,34 @@
 using System;
 using System.Collections.Generic;
+using System.IO;
 using System.Text;
 using System.Threading.Tasks;
 
 namespace SmartCode.Configuration.ConfigBuilders
 {
     public abstract class ConfigBuilder : IConfigBuilder
     {
-        protected Project Project { get; set; }
-        public abstract Project Build();
+        public string ConfigPath { get; }
+        public Project Project { get; set; }
 
-        protected void InitDefault()
+        protected ConfigBuilder(string configPath)
+        {
+            ConfigPath = configPath;
+        }
+        public Project Build()
+        {
+            using (StreamReader configStream = new StreamReader(ConfigPath))
+            {
+                var jsonConfigStr = configStream.ReadToEnd();
+                Project = Deserialize(jsonConfigStr);
+            }
+            InitDefault();
+            return Project;
+        }
+
+        protected abstract Project Deserialize(string content);
+        
+        private void InitDefault()
         {
             if (Project.Output != null)
             {

src/SmartCode/Configuration/ConfigBuilders/JsonBuilder.cs

@@ -4,25 +4,18 @@
 using System.Text;
 using System.Threading.Tasks;
 using Newtonsoft.Json;
+
 namespace SmartCode.Configuration.ConfigBuilders
 {
     public class JsonBuilder : ConfigBuilder
     {
-        private readonly string _configPath;
-
-        public JsonBuilder(string configPath)
+        public JsonBuilder(string configPath) : base(configPath)
         {
-            _configPath = configPath;
         }
-        public override Project Build()
+
+        protected override Project Deserialize(string content)
         {
-            using (StreamReader configStream = new StreamReader(_configPath))
-            {
-                var jsonConfigStr = configStream.ReadToEnd();
-                Project = JsonConvert.DeserializeObject<Project>(jsonConfigStr);
-            }
-            InitDefault();
-            return Project;
+            return JsonConvert.DeserializeObject<Project>(content);
         }
     }
-}
+}

src/SmartCode/Configuration/ConfigBuilders/YamlBuilder.cs

@@ -10,23 +10,15 @@ namespace SmartCode.Configuration.ConfigBuilders
 {
     public class YamlBuilder : ConfigBuilder
     {
-        private readonly string _configPath;
         private readonly IDeserializer _deserializer;
-        public YamlBuilder(string configPath)
+        public YamlBuilder(string configPath):base(configPath)
         {
-            _configPath = configPath;
             _deserializer = new DeserializerBuilder().Build();
         }
 
-        public override Project Build()
+        protected override Project Deserialize(string content)
         {
-            using (StreamReader configStream = new StreamReader(_configPath))
-            {
-                var yamlConfigStr = configStream.ReadToEnd();
-                Project = _deserializer.Deserialize<Project>(yamlConfigStr);
-            }
-            InitDefault();
-            return Project;
+           return  _deserializer.Deserialize<Project>(content);
         }
     }
 }