From 71927e513218ac94057e6124885c1c44deefe4ee Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Henrik=20Fr=C3=B6hling?= Date: Sat, 30 Sep 2017 19:02:29 +0200 Subject: [PATCH] GH-78: Add correct types in JsonFactoryContainer --- .../Objects/JsonReader/JsonFactoryContainer.cs | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/Source/Lib/TraktApiSharp/Objects/JsonReader/JsonFactoryContainer.cs b/Source/Lib/TraktApiSharp/Objects/JsonReader/JsonFactoryContainer.cs index 0f911587a..5984d2bdd 100644 --- a/Source/Lib/TraktApiSharp/Objects/JsonReader/JsonFactoryContainer.cs +++ b/Source/Lib/TraktApiSharp/Objects/JsonReader/JsonFactoryContainer.cs @@ -1,6 +1,6 @@ namespace TraktApiSharp.Objects.JsonReader { - using Authentication; + using Authentication.Implementations; using Authentication.JsonReader.Factories; using Basic; using Basic.JsonReader.Factories; @@ -68,23 +68,23 @@ internal static class JsonFactoryContainer { private static readonly Dictionary s_readerFactories = new Dictionary(); - public static IObjectJsonReader CreateObjectReader() + internal static IObjectJsonReader CreateObjectReader() { - var factory = GetReaderFactory(); + IJsonReaderFactory factory = GetReaderFactory(); Debug.Assert(factory != null, $"factory for {nameof(TReturnType)} should not be null"); return factory.CreateObjectReader(); } - public static IArrayJsonReader CreateArrayReader() + internal static IArrayJsonReader CreateArrayReader() { - var factory = GetReaderFactory(); + IJsonReaderFactory factory = GetReaderFactory(); Debug.Assert(factory != null, $"factory for {nameof(TReturnType)} should not be null"); return factory.CreateArrayReader(); } - public static IJsonReaderFactory GetReaderFactory() + internal static IJsonReaderFactory GetReaderFactory() { - var type = typeof(TReturnType); + Type type = typeof(TReturnType); if (!s_readerFactories.ContainsKey(type)) throw new NotSupportedException($"A json reader factory for {nameof(TReturnType)} is not supported."); @@ -95,8 +95,8 @@ public static IJsonReaderFactory GetReaderFactory() static JsonFactoryContainer() { // authentication objects - s_readerFactories.Add(typeof(ITraktAuthorization), new AuthorizationJsonReaderFactory()); - s_readerFactories.Add(typeof(ITraktDevice), new DeviceJsonReaderFactory()); + s_readerFactories.Add(typeof(TraktAuthorization), new AuthorizationJsonReaderFactory()); + s_readerFactories.Add(typeof(TraktDevice), new DeviceJsonReaderFactory()); // basic objects s_readerFactories.Add(typeof(ITraktCastAndCrew), new CastAndCrewJsonReaderFactory());