Fixed restsharp#116

Author: DixonDs

RestSharp.Tests/JsonTests.cs

@@ -12,19 +12,19 @@
 //   distributed under the License is distributed on an "AS IS" BASIS,
 //   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 //   See the License for the specific language governing permissions and
-//   limitations under the License. 
+//   limitations under the License.
 
-#endregion
+#endregion License
 
+using NUnit.Framework;
+using RestSharp.Deserializers;
+using RestSharp.Tests.SampleClasses;
 using System;
 using System.Collections;
 using System.Collections.Generic;
 using System.Globalization;
 using System.IO;
 using System.Linq;
-using NUnit.Framework;
-using RestSharp.Deserializers;
-using RestSharp.Tests.SampleClasses;
 
 namespace RestSharp.Tests
 {
@@ -195,7 +195,7 @@ public void Can_Deserialize_List_of_Guid()
             data["Ids"] = new JsonArray { id1, id2 };
 
             JsonDeserializer d = new JsonDeserializer();
-            RestResponse response = new RestResponse { Content = data.ToString()  };
+            RestResponse response = new RestResponse { Content = data.ToString() };
             GuidList p = d.Deserialize<GuidList>(response);
 
             Assert.AreEqual(2, p.Ids.Count);
@@ -780,6 +780,17 @@ public void Can_Deserialize_Dictionary_of_Lists()
             Assert.IsNotEmpty(output.EmployeesPay);
         }
 
+        [Test]
+        public void Can_Deserialize_Plain_Values()
+        {
+            const string json = "\"c02bdd1e-cce3-4b9c-8473-165e6e93b92a\"";
+            RestResponse response = new RestResponse { Content = json };
+            JsonDeserializer d = new JsonDeserializer();
+            Guid result = d.Deserialize<Guid>(response);
+
+            Assert.AreEqual(result, new Guid("c02bdd1e-cce3-4b9c-8473-165e6e93b92a"));
+        }
+
         private static string CreateJsonWithUnderscores()
         {
             JsonObject doc = new JsonObject();
@@ -1013,4 +1024,4 @@ private static T GetPayLoad<T>(string fileName)
             return d.Deserialize<T>(response);
         }
     }
-}
+}

RestSharp/Deserializers/JsonDeserializer.cs

@@ -1,10 +1,10 @@
-using System;
+using RestSharp.Extensions;
+using System;
 using System.Collections;
 using System.Collections.Generic;
 using System.Globalization;
 using System.Linq;
 using System.Reflection;
-using RestSharp.Extensions;
 
 namespace RestSharp.Deserializers
 {
@@ -27,51 +27,30 @@ public JsonDeserializer()
 
         public T Deserialize<T>(IRestResponse response)
         {
-            T target = Activator.CreateInstance<T>();
+            object json = this.FindRoot(response.Content);
 
-            if (target is IList)
-            {
-                Type objType = target.GetType();
-
-                if (this.RootElement.HasValue())
-                {
-                    object root = this.FindRoot(response.Content);
-
-                    target = (T) this.BuildList(objType, root);
-                }
-                else
-                {
-                    object data = SimpleJson.DeserializeObject(response.Content);
-
-                    target = (T) this.BuildList(objType, data);
-                }
-            }
-            else if (target is IDictionary)
-            {
-                object root = this.FindRoot(response.Content);
-
-                target = (T) this.BuildDictionary(target.GetType(), root);
-            }
-            else
-            {
-                object root = this.FindRoot(response.Content);
-
-                target = (T) this.Map(target, (IDictionary<string, object>) root);
-            }
-
-            return target;
+            return (T)this.ConvertValue(typeof(T), json);
         }
 
         private object FindRoot(string content)
         {
-            IDictionary<string, object> data = (IDictionary<string, object>) SimpleJson.DeserializeObject(content);
+            object json = SimpleJson.DeserializeObject(content);
 
-            if (this.RootElement.HasValue() && data.ContainsKey(this.RootElement))
+            if (this.RootElement.HasValue())
             {
-                return data[this.RootElement];
+                IDictionary<string, object> dictionary = json as IDictionary<string, object>;
+
+                if (dictionary != null)
+                {
+                    object result;
+                    if (dictionary.TryGetValue(this.RootElement, out result))
+                    {
+                        return result;
+                    }
+                }
             }
 
-            return data;
+            return json;
         }
 
         private object Map(object target, IDictionary<string, object> data)
@@ -89,7 +68,7 @@ private object Map(object target, IDictionary<string, object> data)
 
                 if (attributes.Length > 0)
                 {
-                    DeserializeAsAttribute attribute = (DeserializeAsAttribute) attributes[0];
+                    DeserializeAsAttribute attribute = (DeserializeAsAttribute)attributes[0];
                     name = attribute.Name;
                 }
                 else
@@ -117,7 +96,7 @@ private object Map(object target, IDictionary<string, object> data)
                     }
                     else
                     {
-                        currentData = (IDictionary<string, object>) currentData[actualName];
+                        currentData = (IDictionary<string, object>)currentData[actualName];
                     }
                 }
 
@@ -132,11 +111,11 @@ private object Map(object target, IDictionary<string, object> data)
 
         private IDictionary BuildDictionary(Type type, object parent)
         {
-            IDictionary dict = (IDictionary) Activator.CreateInstance(type);
+            IDictionary dict = (IDictionary)Activator.CreateInstance(type);
             Type keyType = type.GetGenericArguments()[0];
             Type valueType = type.GetGenericArguments()[1];
 
-            foreach (KeyValuePair<string, object> child in (IDictionary<string, object>) parent)
+            foreach (KeyValuePair<string, object> child in (IDictionary<string, object>)parent)
             {
                 object key = keyType != typeof(string)
                     ? Convert.ChangeType(child.Key, keyType, CultureInfo.InvariantCulture)
@@ -161,15 +140,15 @@ private IDictionary BuildDictionary(Type type, object parent)
 
         private IList BuildList(Type type, object parent)
         {
-            IList list = (IList) Activator.CreateInstance(type);
+            IList list = (IList)Activator.CreateInstance(type);
             Type listType = type.GetInterfaces()
                                 .First
                 (x => x.IsGenericType && x.GetGenericTypeDefinition() == typeof(IList<>));
             Type itemType = listType.GetGenericArguments()[0];
 
             if (parent is IList)
             {
-                foreach (object element in (IList) parent)
+                foreach (object element in (IList)parent)
                 {
                     if (itemType.IsPrimitive)
                     {
@@ -272,14 +251,14 @@ private object ConvertValue(Type type, object value)
 
                 if (type == typeof(DateTimeOffset))
                 {
-                    return (DateTimeOffset) dt;
+                    return (DateTimeOffset)dt;
                 }
             }
             else if (type == typeof(decimal))
             {
                 if (value is double)
                 {
-                    return (decimal) ((double) value);
+                    return (decimal)((double)value);
                 }
 
                 if (stringValue.Contains("e"))
@@ -339,7 +318,7 @@ private object ConvertValue(Type type, object value)
             }
             else if (type == typeof(JsonObject))
             {
-                // simplify JsonObject into a Dictionary<string, object> 
+                // simplify JsonObject into a Dictionary<string, object>
                 return this.BuildDictionary(typeof(Dictionary<string, object>), value);
             }
             else
@@ -355,9 +334,9 @@ private object CreateAndMap(Type type, object element)
         {
             object instance = Activator.CreateInstance(type);
 
-            this.Map(instance, (IDictionary<string, object>) element);
+            this.Map(instance, (IDictionary<string, object>)element);
 
             return instance;
         }
     }
-}
+}