Revert unnecessary Guid serialization logic in TypeSerializers, it's already supported

mythz · mythz · commit fd09ca971697 · 2014-03-27T02:42:59.000-04:00
diff --git a/src/ServiceStack.Text/Json/JsonTypeSerializer.cs b/src/ServiceStack.Text/Json/JsonTypeSerializer.cs
@@ -168,17 +168,13 @@ public void WriteNullableTimeSpan(TextWriter writer, object oTimeSpan)
 
         public void WriteGuid(TextWriter writer, object oValue)
         {
-            WriteRawString(writer, JsConfig<Guid>.RawSerializeFn != null
-                ? JsConfig<Guid>.RawSerializeFn((Guid) oValue)
-                : ((Guid) oValue).ToString("N"));
+            WriteRawString(writer, ((Guid)oValue).ToString("N"));
         }
 
         public void WriteNullableGuid(TextWriter writer, object oValue)
         {
             if (oValue == null) return;
-            WriteRawString(writer, JsConfig<Guid>.RawSerializeFn != null
-                ? JsConfig<Guid>.RawSerializeFn((Guid)oValue)
-                : ((Guid)oValue).ToString("N"));
+            WriteRawString(writer, ((Guid)oValue).ToString("N"));
         }
 
         public void WriteBytes(TextWriter writer, object oByteValue)
diff --git a/src/ServiceStack.Text/Jsv/JsvTypeSerializer.cs b/src/ServiceStack.Text/Jsv/JsvTypeSerializer.cs
@@ -144,18 +144,14 @@ public void WriteNullableTimeSpan(TextWriter writer, object oTimeSpan)
 
 		public void WriteGuid(TextWriter writer, object oValue)
 		{
-		    writer.Write(JsConfig<Guid>.RawSerializeFn != null
-		        ? JsConfig<Guid>.RawSerializeFn((Guid) oValue)
-		        : ((Guid) oValue).ToString("N"));
+			writer.Write(((Guid)oValue).ToString("N"));
 		}
 
-        public void WriteNullableGuid(TextWriter writer, object oValue)
+		public void WriteNullableGuid(TextWriter writer, object oValue)
 		{
 			if (oValue == null) return;
-            writer.Write(JsConfig<Guid>.RawSerializeFn != null
-                ? JsConfig<Guid>.RawSerializeFn((Guid)oValue)
-                : ((Guid)oValue).ToString("N"));
-        }
+			writer.Write(((Guid)oValue).ToString("N"));
+		}
 
 		public void WriteBytes(TextWriter writer, object oByteValue)
 		{

Original file line number	Diff line number	Diff line change
`@@ -168,17 +168,13 @@ public void WriteNullableTimeSpan(TextWriter writer, object oTimeSpan)`
`168`	`168`
`169`	`169`	`public void WriteGuid(TextWriter writer, object oValue)`
`170`	`170`	`{`
`171`		`- WriteRawString(writer, JsConfig<Guid>.RawSerializeFn != null`
`172`		`- ? JsConfig<Guid>.RawSerializeFn((Guid) oValue)`
`173`		`- : ((Guid) oValue).ToString("N"));`
	`171`	`+ WriteRawString(writer, ((Guid)oValue).ToString("N"));`
`174`	`172`	`}`
`175`	`173`
`176`	`174`	`public void WriteNullableGuid(TextWriter writer, object oValue)`
`177`	`175`	`{`
`178`	`176`	`if (oValue == null) return;`
`179`		`- WriteRawString(writer, JsConfig<Guid>.RawSerializeFn != null`
`180`		`- ? JsConfig<Guid>.RawSerializeFn((Guid)oValue)`
`181`		`- : ((Guid)oValue).ToString("N"));`
	`177`	`+ WriteRawString(writer, ((Guid)oValue).ToString("N"));`
`182`	`178`	`}`
`183`	`179`
`184`	`180`	`public void WriteBytes(TextWriter writer, object oByteValue)`
Original file line number	Diff line number	Diff line change
`@@ -144,18 +144,14 @@ public void WriteNullableTimeSpan(TextWriter writer, object oTimeSpan)`
`144`	`144`
`145`	`145`	`public void WriteGuid(TextWriter writer, object oValue)`
`146`	`146`	`{`
`147`		`- writer.Write(JsConfig<Guid>.RawSerializeFn != null`
`148`		`- ? JsConfig<Guid>.RawSerializeFn((Guid) oValue)`
`149`		`- : ((Guid) oValue).ToString("N"));`
	`147`	`+ writer.Write(((Guid)oValue).ToString("N"));`
`150`	`148`	`}`
`151`	`149`
`152`		`- public void WriteNullableGuid(TextWriter writer, object oValue)`
	`150`	`+ public void WriteNullableGuid(TextWriter writer, object oValue)`
`153`	`151`	`{`
`154`	`152`	`if (oValue == null) return;`
`155`		`- writer.Write(JsConfig<Guid>.RawSerializeFn != null`
`156`		`- ? JsConfig<Guid>.RawSerializeFn((Guid)oValue)`
`157`		`- : ((Guid)oValue).ToString("N"));`
`158`		`- }`
	`153`	`+ writer.Write(((Guid)oValue).ToString("N"));`
	`154`	`+ }`
`159`	`155`
`160`	`156`	`public void WriteBytes(TextWriter writer, object oByteValue)`
`161`	`157`	`{`