remove ServiceStack.Text.Json namespace

mythz · mythz · commit 90c652aa0fcd · 2017-04-16T05:45:04.000-04:00
diff --git a/src/ServiceStack.Text/Common/DeserializeType.cs b/src/ServiceStack.Text/Common/DeserializeType.cs
@@ -15,7 +15,6 @@
 using System.Globalization;
 using System.Linq;
 using System.Reflection;
-using ServiceStack.Text.Json;
 
 namespace ServiceStack.Text.Common
 {
@@ -76,7 +75,7 @@ public static Type ExtractType(string strType)
         {
             if (strType == null || strType.Length <= 1) return null;
 
-            var hasWhitespace = JsonUtils.WhiteSpaceChars.Contains(strType[1]);
+            var hasWhitespace = Json.JsonUtils.WhiteSpaceChars.Contains(strType[1]);
             if (hasWhitespace)
             {
                 var pos = strType.IndexOf('"');
@@ -237,7 +236,7 @@ public static object ParsePrimitive(string value)
 
         internal static object ParsePrimitive(string value, char firstChar)
         {
-            if (typeof(TSerializer) == typeof(JsonTypeSerializer))
+            if (typeof(TSerializer) == typeof(Json.JsonTypeSerializer))
             {
                 return firstChar == JsWriter.QuoteChar
                     ? ParseQuotedPrimitive(value)
@@ -257,7 +256,7 @@ public static Type ExtractType(ITypeSerializer Serializer, string strType)
         {
             if (strType == null || strType.Length <= 1) return null;
 
-            var hasWhitespace = JsonUtils.WhiteSpaceChars.Contains(strType[1]);
+            var hasWhitespace = Json.JsonUtils.WhiteSpaceChars.Contains(strType[1]);
             if (hasWhitespace)
             {
                 var pos = strType.IndexOf('"');

Original file line number	Diff line number	Diff line change
`@@ -15,7 +15,6 @@`
`15`	`15`	`using System.Globalization;`
`16`	`16`	`using System.Linq;`
`17`	`17`	`using System.Reflection;`
`18`		`-using ServiceStack.Text.Json;`
`19`	`18`
`20`	`19`	`namespace ServiceStack.Text.Common`
`21`	`20`	`{`
`@@ -76,7 +75,7 @@ public static Type ExtractType(string strType)`
`76`	`75`	`{`
`77`	`76`	`if (strType == null \|\| strType.Length <= 1) return null;`
`78`	`77`
`79`		`- var hasWhitespace = JsonUtils.WhiteSpaceChars.Contains(strType[1]);`
	`78`	`+ var hasWhitespace = Json.JsonUtils.WhiteSpaceChars.Contains(strType[1]);`
`80`	`79`	`if (hasWhitespace)`
`81`	`80`	`{`
`82`	`81`	`var pos = strType.IndexOf('"');`
`@@ -237,7 +236,7 @@ public static object ParsePrimitive(string value)`
`237`	`236`
`238`	`237`	`internal static object ParsePrimitive(string value, char firstChar)`
`239`	`238`	`{`
`240`		`- if (typeof(TSerializer) == typeof(JsonTypeSerializer))`
	`239`	`+ if (typeof(TSerializer) == typeof(Json.JsonTypeSerializer))`
`241`	`240`	`{`
`242`	`241`	`return firstChar == JsWriter.QuoteChar`
`243`	`242`	`? ParseQuotedPrimitive(value)`
`@@ -257,7 +256,7 @@ public static Type ExtractType(ITypeSerializer Serializer, string strType)`
`257`	`256`	`{`
`258`	`257`	`if (strType == null \|\| strType.Length <= 1) return null;`
`259`	`258`
`260`		`- var hasWhitespace = JsonUtils.WhiteSpaceChars.Contains(strType[1]);`
	`259`	`+ var hasWhitespace = Json.JsonUtils.WhiteSpaceChars.Contains(strType[1]);`
`261`	`260`	`if (hasWhitespace)`
`262`	`261`	`{`
`263`	`262`	`var pos = strType.IndexOf('"');`