diff options
| author | LukePulverenti Luke Pulverenti luke pulverenti <LukePulverenti Luke Pulverenti luke.pulverenti@gmail.com> | 2012-09-11 15:37:14 -0400 |
|---|---|---|
| committer | LukePulverenti Luke Pulverenti luke pulverenti <LukePulverenti Luke Pulverenti luke.pulverenti@gmail.com> | 2012-09-11 15:37:14 -0400 |
| commit | f1e668bad82ff591ed4135459c4f26ae500a4025 (patch) | |
| tree | 4857d3c3a0fd110b3a5821fcb143168d40975669 /MediaBrowser.ApiInteraction/DataSerializer.cs | |
| parent | 670a53258ef79ee92f578335577df4f768c9d7d4 (diff) | |
More code cleanups
Diffstat (limited to 'MediaBrowser.ApiInteraction/DataSerializer.cs')
| -rw-r--r-- | MediaBrowser.ApiInteraction/DataSerializer.cs | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/MediaBrowser.ApiInteraction/DataSerializer.cs b/MediaBrowser.ApiInteraction/DataSerializer.cs index 2783f4ea12..3c3f8fae2f 100644 --- a/MediaBrowser.ApiInteraction/DataSerializer.cs +++ b/MediaBrowser.ApiInteraction/DataSerializer.cs @@ -25,11 +25,11 @@ namespace MediaBrowser.ApiInteraction //return Serializer.Deserialize<T>(stream);
return ProtobufModelSerializer.Deserialize(stream, null, typeof(T)) as T;
}
- else if (format == SerializationFormats.Jsv)
+ if (format == SerializationFormats.Jsv)
{
return TypeSerializer.DeserializeFromStream<T>(stream);
}
- else if (format == SerializationFormats.Json)
+ if (format == SerializationFormats.Json)
{
return JsonSerializer.DeserializeFromStream<T>(stream);
}
@@ -42,16 +42,16 @@ namespace MediaBrowser.ApiInteraction /// </summary>
public static object DeserializeFromStream(Stream stream, SerializationFormats format, Type type)
{
- if (format == ApiInteraction.SerializationFormats.Protobuf)
+ if (format == SerializationFormats.Protobuf)
{
//throw new NotImplementedException();
return ProtobufModelSerializer.Deserialize(stream, null, type);
}
- else if (format == ApiInteraction.SerializationFormats.Jsv)
+ if (format == SerializationFormats.Jsv)
{
return TypeSerializer.DeserializeFromStream(type, stream);
}
- else if (format == ApiInteraction.SerializationFormats.Json)
+ if (format == SerializationFormats.Json)
{
return JsonSerializer.DeserializeFromStream(type, stream);
}
@@ -61,7 +61,7 @@ namespace MediaBrowser.ApiInteraction public static void Configure()
{
- JsConfig.DateHandler = ServiceStack.Text.JsonDateHandler.ISO8601;
+ JsConfig.DateHandler = JsonDateHandler.ISO8601;
JsConfig.ExcludeTypeInfo = true;
JsConfig.IncludeNullValues = false;
}
|