added option to serialize Json formatted or not (#63)

steveshortt · steveshortt · commit 644037be5eaf · 2017-06-15T17:01:24.000-05:00
diff --git a/Synapse.Common/Properties/AssemblyInfo.cs b/Synapse.Common/Properties/AssemblyInfo.cs
@@ -38,4 +38,4 @@
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
 [assembly: AssemblyVersion( "0.1.0.0" )]
-[assembly: AssemblyFileVersion( "0.1.17155.0" )]
+[assembly: AssemblyFileVersion( "0.1.17166.0" )]
diff --git a/Synapse.Core/Properties/AssemblyInfo.cs b/Synapse.Core/Properties/AssemblyInfo.cs
@@ -37,4 +37,4 @@
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
 [assembly: AssemblyVersion( "0.1.0.0" )]
-[assembly: AssemblyFileVersion( "0.1.17155.0" )]
+[assembly: AssemblyFileVersion( "0.1.17166.0" )]
diff --git a/Synapse.Core/Utilities/YamlHelpers.cs b/Synapse.Core/Utilities/YamlHelpers.cs
@@ -28,21 +28,21 @@ public static void Serialize(TextWriter tw, object data, bool serializeAsJson =
             serializer.Serialize( tw, data );
         }
 
-        public static string Serialize(object data, bool serializeAsJson = false, bool emitDefaultValues = false)
+        public static string Serialize(object data, bool serializeAsJson = false, bool formatJson = true, bool emitDefaultValues = false)
         {
             string result = null;
 
             if( !string.IsNullOrWhiteSpace( data?.ToString() ) )
                 using( StringWriter writer = new StringWriter() )
                 {
                     Serialize( writer, data, serializeAsJson, emitDefaultValues );
-                    result = serializeAsJson ? JsonHelpers.FormatJson( writer.ToString() ) : writer.ToString();
+                    result = serializeAsJson && formatJson ? JsonHelpers.FormatJson( writer.ToString() ) : writer.ToString();
                 }
 
             return result;
         }
 
-        public static void SerializeFile(string path, object data, bool serializeAsJson = false, bool emitDefaultValues = false)
+        public static void SerializeFile(string path, object data, bool serializeAsJson = false, bool formatJson = true, bool emitDefaultValues = false)
         {
             if( !serializeAsJson )
             {
@@ -51,7 +51,7 @@ public static void SerializeFile(string path, object data, bool serializeAsJson
             }
             else //gets formatted json
             {
-                string result = Serialize( data, serializeAsJson, emitDefaultValues );
+                string result = Serialize( data, serializeAsJson, formatJson, emitDefaultValues );
                 File.WriteAllText( path, result );
             }
         }
diff --git a/Synapse.cli/Properties/AssemblyInfo.cs b/Synapse.cli/Properties/AssemblyInfo.cs
@@ -33,4 +33,4 @@
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
 [assembly: AssemblyVersion( "0.1.0.0" )]
-[assembly: AssemblyFileVersion( "0.1.17155.0" )]
+[assembly: AssemblyFileVersion( "0.1.17166.0" )]

Original file line number	Diff line number	Diff line change
`@@ -28,21 +28,21 @@ public static void Serialize(TextWriter tw, object data, bool serializeAsJson =`
`28`	`28`	`serializer.Serialize( tw, data );`
`29`	`29`	`}`
`30`	`30`
`31`		`- public static string Serialize(object data, bool serializeAsJson = false, bool emitDefaultValues = false)`
	`31`	`+ public static string Serialize(object data, bool serializeAsJson = false, bool formatJson = true, bool emitDefaultValues = false)`
`32`	`32`	`{`
`33`	`33`	`string result = null;`
`34`	`34`
`35`	`35`	`if( !string.IsNullOrWhiteSpace( data?.ToString() ) )`
`36`	`36`	`using( StringWriter writer = new StringWriter() )`
`37`	`37`	`{`
`38`	`38`	`Serialize( writer, data, serializeAsJson, emitDefaultValues );`
`39`		`- result = serializeAsJson ? JsonHelpers.FormatJson( writer.ToString() ) : writer.ToString();`
	`39`	`+ result = serializeAsJson && formatJson ? JsonHelpers.FormatJson( writer.ToString() ) : writer.ToString();`
`40`	`40`	`}`
`41`	`41`
`42`	`42`	`return result;`
`43`	`43`	`}`
`44`	`44`
`45`		`- public static void SerializeFile(string path, object data, bool serializeAsJson = false, bool emitDefaultValues = false)`
	`45`	`+ public static void SerializeFile(string path, object data, bool serializeAsJson = false, bool formatJson = true, bool emitDefaultValues = false)`
`46`	`46`	`{`
`47`	`47`	`if( !serializeAsJson )`
`48`	`48`	`{`
`@@ -51,7 +51,7 @@ public static void SerializeFile(string path, object data, bool serializeAsJson`
`51`	`51`	`}`
`52`	`52`	`else //gets formatted json`
`53`	`53`	`{`
`54`		`- string result = Serialize( data, serializeAsJson, emitDefaultValues );`
	`54`	`+ string result = Serialize( data, serializeAsJson, formatJson, emitDefaultValues );`
`55`	`55`	`File.WriteAllText( path, result );`
`56`	`56`	`}`
`57`	`57`	`}`