Merge pull request #74 from csantero/cleanup-formatter

csantero · csantero · commit e55a851f642e · 2015-02-21T22:26:47.000-05:00
cleanup formatter code a little
diff --git a/JSONAPI/Json/JsonApiFormatter.cs b/JSONAPI/Json/JsonApiFormatter.cs
@@ -515,7 +515,6 @@ private object ReadFromStream(Type type, Stream readStream, HttpContent content,
                 var effectiveEncoding = SelectCharacterEncoding(contentHeaders);
                 JsonReader reader = this.CreateJsonReader(typeof (IDictionary<string, object>), readStream,
                     effectiveEncoding);
-                JsonSerializer serializer = this.CreateJsonSerializer();
 
                 reader.Read();
                 if (reader.TokenType != JsonToken.StartObject)
@@ -548,7 +547,7 @@ private object ReadFromStream(Type type, Stream readStream, HttpContent content,
                                         reader.Read(); // Burn off StartArray token
                                         while (reader.TokenType == JsonToken.StartObject)
                                         {
-                                            ((IList) retval).Add(Deserialize(singleType, readStream, reader, serializer));
+                                            ((IList) retval).Add(Deserialize(singleType, reader));
                                         }
                                         // burn EndArray token...
                                         if (reader.TokenType != JsonToken.EndArray)
@@ -562,7 +561,7 @@ private object ReadFromStream(Type type, Stream readStream, HttpContent content,
                                         // Because we choose what to deserialize based on the ApiController method signature
                                         // (not choose the method signature based on what we're deserializing), the `type`
                                         // parameter will always be `IList<Model>` even if a single model is sent!
-                                        retval = Deserialize(singleType, readStream, reader, serializer);
+                                        retval = Deserialize(singleType, reader);
                                     }
                                 }
                                 else
@@ -652,7 +651,7 @@ private object ReadFromStream(Type type, Stream readStream, HttpContent content,
             return GetDefaultValueForType(type);
         }
 
-        public object Deserialize(Type objectType, Stream readStream, JsonReader reader, JsonSerializer serializer)
+        private object Deserialize(Type objectType, JsonReader reader)
         {
             object retval = Activator.CreateInstance(objectType);
 
@@ -671,7 +670,7 @@ public object Deserialize(Type objectType, Stream readStream, JsonReader reader,
                     {
                         reader.Read(); // burn the PropertyName token
                         //TODO: linked resources (Done??)
-                        DeserializeLinkedResources(retval, readStream, reader, serializer);
+                        DeserializeLinkedResources(retval, reader);
                     }
                     else if (prop != null)
                     {
@@ -782,7 +781,7 @@ select prop
             return retval;
         }
 
-        private void DeserializeLinkedResources(object obj, Stream readStream, JsonReader reader, JsonSerializer serializer)
+        private void DeserializeLinkedResources(object obj, JsonReader reader)
         {
             //reader.Read();
             if (reader.TokenType != JsonToken.StartObject) throw new JsonSerializationException("'links' property is not an object!");

Original file line number	Diff line number	Diff line change
`@@ -515,7 +515,6 @@ private object ReadFromStream(Type type, Stream readStream, HttpContent content,`
`515`	`515`	`var effectiveEncoding = SelectCharacterEncoding(contentHeaders);`
`516`	`516`	`JsonReader reader = this.CreateJsonReader(typeof (IDictionary<string, object>), readStream,`
`517`	`517`	`effectiveEncoding);`
`518`		`- JsonSerializer serializer = this.CreateJsonSerializer();`
`519`	`518`
`520`	`519`	`reader.Read();`
`521`	`520`	`if (reader.TokenType != JsonToken.StartObject)`
`@@ -548,7 +547,7 @@ private object ReadFromStream(Type type, Stream readStream, HttpContent content,`
`548`	`547`	`reader.Read(); // Burn off StartArray token`
`549`	`548`	`while (reader.TokenType == JsonToken.StartObject)`
`550`	`549`	`{`
`551`		`- ((IList) retval).Add(Deserialize(singleType, readStream, reader, serializer));`
	`550`	`+ ((IList) retval).Add(Deserialize(singleType, reader));`
`552`	`551`	`}`
`553`	`552`	`// burn EndArray token...`
`554`	`553`	`if (reader.TokenType != JsonToken.EndArray)`
`@@ -562,7 +561,7 @@ private object ReadFromStream(Type type, Stream readStream, HttpContent content,`
`562`	`561`	`// Because we choose what to deserialize based on the ApiController method signature`
`563`	`562`	// (not choose the method signature based on what we're deserializing), the `type`
`564`	`563`	// parameter will always be `IList<Model>` even if a single model is sent!
`565`		`- retval = Deserialize(singleType, readStream, reader, serializer);`
	`564`	`+ retval = Deserialize(singleType, reader);`
`566`	`565`	`}`
`567`	`566`	`}`
`568`	`567`	`else`
`@@ -652,7 +651,7 @@ private object ReadFromStream(Type type, Stream readStream, HttpContent content,`
`652`	`651`	`return GetDefaultValueForType(type);`
`653`	`652`	`}`
`654`	`653`
`655`		`- public object Deserialize(Type objectType, Stream readStream, JsonReader reader, JsonSerializer serializer)`
	`654`	`+ private object Deserialize(Type objectType, JsonReader reader)`
`656`	`655`	`{`
`657`	`656`	`object retval = Activator.CreateInstance(objectType);`
`658`	`657`
`@@ -671,7 +670,7 @@ public object Deserialize(Type objectType, Stream readStream, JsonReader reader,`
`671`	`670`	`{`
`672`	`671`	`reader.Read(); // burn the PropertyName token`
`673`	`672`	`//TODO: linked resources (Done??)`
`674`		`- DeserializeLinkedResources(retval, readStream, reader, serializer);`
	`673`	`+ DeserializeLinkedResources(retval, reader);`
`675`	`674`	`}`
`676`	`675`	`else if (prop != null)`
`677`	`676`	`{`
`@@ -782,7 +781,7 @@ select prop`
`782`	`781`	`return retval;`
`783`	`782`	`}`
`784`	`783`
`785`		`- private void DeserializeLinkedResources(object obj, Stream readStream, JsonReader reader, JsonSerializer serializer)`
	`784`	`+ private void DeserializeLinkedResources(object obj, JsonReader reader)`
`786`	`785`	`{`
`787`	`786`	`//reader.Read();`
`788`	`787`	`if (reader.TokenType != JsonToken.StartObject) throw new JsonSerializationException("'links' property is not an object!");`