[v2] Refactoring (#153 #158)

henrikfroehling · henrikfroehling · commit 487a59f95f2c · 2025-02-12T22:44:18.000+01:00
diff --git a/src/Trakt.NET.sln b/src/Trakt.NET.sln
@@ -126,15 +126,11 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Trakt.NET.HttpClientFactory
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Trakt.NET.Extensions.TMDB", "libs\Trakt.NET.Extensions.TMDB\Trakt.NET.Extensions.TMDB.csproj", "{5E6FE4C0-07D9-010B-E19B-DA162549E9E3}"
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "shared", "shared", "{02EA681E-C7D8-13C7-8484-4AC65E1B71E8}"
-EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "shared", "shared", "{B88173E7-DD80-40D7-B443-73E914D48D26}"
 	ProjectSection(SolutionItems) = preProject
 		libs\shared\Directory.Build.props = libs\shared\Directory.Build.props
 	EndProjectSection
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Trakt.NET.Utilities", "libs\shared\Trakt.NET.Utilities\Trakt.NET.Utilities.csproj", "{16328885-FE44-B25E-AB0F-32A4802C0F5B}"
-EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -181,10 +177,6 @@ Global
 		{5E6FE4C0-07D9-010B-E19B-DA162549E9E3}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{5E6FE4C0-07D9-010B-E19B-DA162549E9E3}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{5E6FE4C0-07D9-010B-E19B-DA162549E9E3}.Release|Any CPU.Build.0 = Release|Any CPU
-		{16328885-FE44-B25E-AB0F-32A4802C0F5B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{16328885-FE44-B25E-AB0F-32A4802C0F5B}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{16328885-FE44-B25E-AB0F-32A4802C0F5B}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{16328885-FE44-B25E-AB0F-32A4802C0F5B}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
@@ -217,9 +209,7 @@ Global
 		{991F0FB1-CDFD-412E-B7B2-81946E12D6D7} = {50AD22EC-EB56-476B-8DCE-4AF2B5BD8B09}
 		{AE64986B-39E8-49C2-A3E0-48FBA888B437} = {E7B2A7FC-F550-4546-8F2C-6FC9AA49F6B5}
 		{5E6FE4C0-07D9-010B-E19B-DA162549E9E3} = {E7B2A7FC-F550-4546-8F2C-6FC9AA49F6B5}
-		{02EA681E-C7D8-13C7-8484-4AC65E1B71E8} = {E7B2A7FC-F550-4546-8F2C-6FC9AA49F6B5}
 		{B88173E7-DD80-40D7-B443-73E914D48D26} = {377A7F6A-A4B9-45F6-AB2A-492F0E1F71AD}
-		{16328885-FE44-B25E-AB0F-32A4802C0F5B} = {02EA681E-C7D8-13C7-8484-4AC65E1B71E8}
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 		SolutionGuid = {7025A39E-11A6-4587-98F7-E887B941D5A0}
diff --git a/src/libs/Trakt.NET.Extensions.TMDB/Internal/Json/SerializerContexts/TMDBJsonSerializerContextFactory.cs b/src/libs/Trakt.NET.Extensions.TMDB/Internal/Json/SerializerContexts/TMDBJsonSerializerContextFactory.cs
@@ -1,6 +1,5 @@
 #if NET6_0_OR_GREATER
 using System.Text.Json.Serialization;
-using TraktNET.Utilities.Json;
 
 namespace TraktNET
 {
diff --git a/src/libs/Trakt.NET.Extensions.TMDB/Internal/TMDBConstants.cs b/src/libs/Trakt.NET.Extensions.TMDB/Internal/TMDBConstants.cs
@@ -1,9 +1,5 @@
 using System.Text.Json;
 
-#if !NET8_0_OR_GREATER
-using TraktNET.Utilities.Json;
-#endif
-
 namespace TraktNET
 {
     internal static class TMDBConstants
diff --git a/src/libs/Trakt.NET.Extensions.TMDB/Trakt.NET.Extensions.TMDB.csproj b/src/libs/Trakt.NET.Extensions.TMDB/Trakt.NET.Extensions.TMDB.csproj
@@ -7,7 +7,6 @@
 
   <ItemGroup>
     <ProjectReference Include="..\Trakt.NET\Trakt.NET.csproj" />
-    <ProjectReference Include="..\shared\Trakt.NET.Utilities\Trakt.NET.Utilities.csproj" />
   </ItemGroup>
 
 </Project>
diff --git a/src/libs/Trakt.NET.Extensions.TMDB/TraktTMDBExtensions.cs b/src/libs/Trakt.NET.Extensions.TMDB/TraktTMDBExtensions.cs
@@ -8,16 +8,16 @@ public static async Task<TMDBMovieImages> GetTMDBImagesAsync(this TraktMovieMini
             return await Task.FromResult(new TMDBMovieImages());
         }
 
-        public static async Task<TMDBMovieImages> GetTMDBImagesAsync(this TraktMovie traktMovie, CancellationToken cancellationToken = default)
+        public static async Task<TMDBVideos> GetTMDBVideosAsync(this TraktMovieMinimal traktMovie, CancellationToken cancellationToken = default)
         {
             // TODO
-            return await Task.FromResult(new TMDBMovieImages());
+            return await Task.FromResult(new TMDBVideos());
         }
 
-        public static async Task<TMDBVideos> GetTMDBVideosAsync(this TraktMovieMinimal traktMovie, CancellationToken cancellationToken = default)
+        public static async Task<TMDBMovieImages> GetTMDBImagesAsync(this TraktMovie traktMovie, CancellationToken cancellationToken = default)
         {
             // TODO
-            return await Task.FromResult(new TMDBVideos());
+            return await Task.FromResult(new TMDBMovieImages());
         }
 
         public static async Task<TMDBVideos> GetTMDBVideosAsync(this TraktMovie traktMovie, CancellationToken cancellationToken = default)
@@ -31,19 +31,19 @@ public static async Task<TMDBShowImages> GetTMDBImagesAsync(this TraktShowMinima
             // TODO
             return await Task.FromResult(new TMDBShowImages());
         }
-
-        public static async Task<TMDBShowImages> GetTMDBImagesAsync(this TraktShow traktShow, CancellationToken cancellationToken = default)
+        public static async Task<TMDBVideos> GetTMDBVideosAsync(this TraktShowMinimal traktShow, CancellationToken cancellationToken = default)
         {
             // TODO
-            return await Task.FromResult(new TMDBShowImages());
+            return await Task.FromResult(new TMDBVideos());
         }
 
-        public static async Task<TMDBVideos> GetTMDBVideosAsync(this TraktShowMinimal traktShow, CancellationToken cancellationToken = default)
+        public static async Task<TMDBShowImages> GetTMDBImagesAsync(this TraktShow traktShow, CancellationToken cancellationToken = default)
         {
             // TODO
-            return await Task.FromResult(new TMDBVideos());
+            return await Task.FromResult(new TMDBShowImages());
         }
 
+
         public static async Task<TMDBVideos> GetTMDBVideosAsync(this TraktShow traktShow, CancellationToken cancellationToken = default)
         {
             // TODO
@@ -56,16 +56,16 @@ public static async Task<TMDBSeasonImages> GetTMDBImagesAsync(this TraktSeasonMi
             return await Task.FromResult(new TMDBSeasonImages());
         }
 
-        public static async Task<TMDBSeasonImages> GetTMDBImagesAsync(this TraktSeason traktSeason, CancellationToken cancellationToken = default)
+        public static async Task<TMDBVideos> GetTMDBVideosAsync(this TraktSeasonMinimal traktSeason, CancellationToken cancellationToken = default)
         {
             // TODO
-            return await Task.FromResult(new TMDBSeasonImages());
+            return await Task.FromResult(new TMDBVideos());
         }
 
-        public static async Task<TMDBVideos> GetTMDBVideosAsync(this TraktSeasonMinimal traktSeason, CancellationToken cancellationToken = default)
+        public static async Task<TMDBSeasonImages> GetTMDBImagesAsync(this TraktSeason traktSeason, CancellationToken cancellationToken = default)
         {
             // TODO
-            return await Task.FromResult(new TMDBVideos());
+            return await Task.FromResult(new TMDBSeasonImages());
         }
 
         public static async Task<TMDBVideos> GetTMDBVideosAsync(this TraktSeason traktSeason, CancellationToken cancellationToken = default)
@@ -80,16 +80,16 @@ public static async Task<TMDBEpisodeImages> GetTMDBImagesAsync(this TraktEpisode
             return await Task.FromResult(new TMDBEpisodeImages());
         }
 
-        public static async Task<TMDBEpisodeImages> GetTMDBImagesAsync(this TraktEpisode traktEpisode, CancellationToken cancellationToken = default)
+        public static async Task<TMDBVideos> GetTMDBVideosAsync(this TraktEpisodeMinimal traktEpisode, CancellationToken cancellationToken = default)
         {
             // TODO
-            return await Task.FromResult(new TMDBEpisodeImages());
+            return await Task.FromResult(new TMDBVideos());
         }
 
-        public static async Task<TMDBVideos> GetTMDBVideosAsync(this TraktEpisodeMinimal traktEpisode, CancellationToken cancellationToken = default)
+        public static async Task<TMDBEpisodeImages> GetTMDBImagesAsync(this TraktEpisode traktEpisode, CancellationToken cancellationToken = default)
         {
             // TODO
-            return await Task.FromResult(new TMDBVideos());
+            return await Task.FromResult(new TMDBEpisodeImages());
         }
 
         public static async Task<TMDBVideos> GetTMDBVideosAsync(this TraktEpisode traktEpisode, CancellationToken cancellationToken = default)
diff --git a/src/libs/Trakt.NET/Internal/Constants.cs b/src/libs/Trakt.NET/Internal/Constants.cs
@@ -1,6 +1,5 @@
 using System.Net;
 using System.Text.Json;
-using TraktNET.Utilities.Json;
 
 namespace TraktNET
 {
diff --git a/src/libs/Trakt.NET/Internal/Extensions/StreamExtensions.cs b/src/libs/Trakt.NET/Internal/Extensions/StreamExtensions.cs
@@ -1,6 +1,4 @@
-#if NET6_0_OR_GREATER
-using TraktNET.Utilities.Json;
-#else
+#if !NET6_0_OR_GREATER
 using System.Text.Json;
 #endif
 
diff --git a/src/libs/Trakt.NET/Internal/Json/LowerSnakeCaseJsonNamingPolicy.cs b/src/libs/Trakt.NET/Internal/Json/LowerSnakeCaseJsonNamingPolicy.cs
@@ -5,7 +5,7 @@
 using System.Runtime.CompilerServices;
 using System.Text.Json;
 
-namespace TraktNET.Utilities.Json
+namespace TraktNET
 {
     public sealed class LowerSnakeCaseJsonNamingPolicy : JsonNamingPolicy
     {
diff --git a/src/libs/Trakt.NET/Internal/Json/SerializerContexts/IJsonSerializerContextFactory.cs b/src/libs/Trakt.NET/Internal/Json/SerializerContexts/IJsonSerializerContextFactory.cs
@@ -1,9 +1,9 @@
 #if NET6_0_OR_GREATER
 using System.Text.Json.Serialization;
 
-namespace TraktNET.Utilities.Json
+namespace TraktNET
 {
-    public interface IJsonSerializerContextFactory
+    internal interface IJsonSerializerContextFactory
     {
         JsonSerializerContext GetContext<TJsonObjectType>();
     }
diff --git a/src/libs/Trakt.NET/Internal/Json/SerializerContexts/JsonContextSerializer.cs b/src/libs/Trakt.NET/Internal/Json/SerializerContexts/JsonContextSerializer.cs
@@ -2,11 +2,11 @@
 using System.Text.Json;
 using System.Text.Json.Serialization;
 
-namespace TraktNET.Utilities.Json
+namespace TraktNET
 {
-    public static class JsonContextSerializer
+    internal static class JsonContextSerializer
     {
-        public static async Task<TJsonObjectType?> DeserializeAsync<TJsonObjectType>(string factoryKey, Stream stream,
+        internal static async Task<TJsonObjectType?> DeserializeAsync<TJsonObjectType>(string factoryKey, Stream stream,
             CancellationToken cancellationToken = default) where TJsonObjectType : class
         {
             JsonSerializerContext jsonSerializerContext = JsonSerializerContextFactoryRegistry.Get(factoryKey).GetContext<TJsonObjectType>();
@@ -15,7 +15,7 @@ public static class JsonContextSerializer
                 jsonSerializerContext, cancellationToken).ConfigureAwait(false) as TJsonObjectType;
         }
 
-        public static async Task<IReadOnlyList<TJsonObjectType>?> DeserializeArrayAsync<TJsonObjectType>(string factoryKey, Stream stream,
+        internal static async Task<IReadOnlyList<TJsonObjectType>?> DeserializeArrayAsync<TJsonObjectType>(string factoryKey, Stream stream,
             CancellationToken cancellationToken = default)
         {
             JsonSerializerContext jsonSerializerContext = JsonSerializerContextFactoryRegistry.Get(factoryKey).GetContext<TJsonObjectType>();
diff --git a/src/libs/Trakt.NET/Internal/Json/SerializerContexts/JsonSerializerContextFactory.cs b/src/libs/Trakt.NET/Internal/Json/SerializerContexts/JsonSerializerContextFactory.cs
@@ -2,7 +2,6 @@
 using System.Diagnostics;
 using System.Text.Json;
 using System.Text.Json.Serialization;
-using TraktNET.Utilities.Json;
 
 #if NET8_0_OR_GREATER
 using System.Collections.Frozen;
diff --git a/src/libs/Trakt.NET/Internal/Json/SerializerContexts/JsonSerializerContextFactoryRegistry.cs b/src/libs/Trakt.NET/Internal/Json/SerializerContexts/JsonSerializerContextFactoryRegistry.cs
@@ -1,19 +1,19 @@
 #if NET6_0_OR_GREATER
 using System.Diagnostics;
 
-namespace TraktNET.Utilities.Json
+namespace TraktNET
 {
-    public static class JsonSerializerContextFactoryRegistry
+    internal static class JsonSerializerContextFactoryRegistry
     {
         private static readonly Dictionary<string, IJsonSerializerContextFactory> s_jsonSerializerFactories = [];
 
-        public static void RegisterFactory(string key, IJsonSerializerContextFactory factory)
+        internal static void RegisterFactory(string key, IJsonSerializerContextFactory factory)
         {
             Debug.Assert(!string.IsNullOrWhiteSpace(key));
             _ = s_jsonSerializerFactories.TryAdd(key, factory);
         }
 
-        public static IJsonSerializerContextFactory Get(string factoryKey)
+        internal static IJsonSerializerContextFactory Get(string factoryKey)
         {
             Debug.Assert(!string.IsNullOrWhiteSpace(factoryKey));
             Debug.Assert(s_jsonSerializerFactories.ContainsKey(factoryKey));
diff --git a/src/libs/Trakt.NET/Internal/Json/TimeOnlyJsonConverter.cs b/src/libs/Trakt.NET/Internal/Json/TimeOnlyJsonConverter.cs
@@ -3,7 +3,7 @@
 using System.Text.Json;
 using System.Text.Json.Serialization;
 
-namespace TraktNET.Utilities.Json
+namespace TraktNET
 {
     public sealed class TimeOnlyJsonConverter : JsonConverter<TimeOnly>
     {
diff --git a/src/libs/Trakt.NET/Internal/TraktClient.cs b/src/libs/Trakt.NET/Internal/TraktClient.cs
@@ -1,7 +1,3 @@
-#if NET6_0_OR_GREATER
-using TraktNET.Utilities.Json;
-#endif
-
 namespace TraktNET
 {
     public sealed partial class TraktClient
diff --git a/src/libs/Trakt.NET/Properties/AssemblyInfo.cs b/src/libs/Trakt.NET/Properties/AssemblyInfo.cs
@@ -6,3 +6,5 @@
 [assembly: InternalsVisibleTo("Trakt.NET.Requests.Tests")]
 [assembly: InternalsVisibleTo("Trakt.NET.Tests.Utility")]
 [assembly: InternalsVisibleTo("Trakt.NET.SourceGeneration.Tests")]
+
+[assembly: InternalsVisibleTo("Trakt.NET.Extensions.TMDB")]
diff --git a/src/libs/Trakt.NET/Trakt.NET.csproj b/src/libs/Trakt.NET/Trakt.NET.csproj
@@ -7,7 +7,6 @@
 
   <ItemGroup>
     <ProjectReference Include="..\..\tools\sourcegeneration\Trakt.NET.SourceGeneration\Trakt.NET.SourceGeneration.csproj" OutputItemType="Analyzer" ReferenceOutputAssembly="false" />
-    <ProjectReference Include="..\shared\Trakt.NET.Utilities\Trakt.NET.Utilities.csproj" />
   </ItemGroup>
 
 </Project>
diff --git a/src/libs/shared/Directory.Build.props b/src/libs/shared/Directory.Build.props
diff --git a/src/libs/shared/Trakt.NET.Utilities/Trakt.NET.Utilities.csproj b/src/libs/shared/Trakt.NET.Utilities/Trakt.NET.Utilities.csproj
diff --git a/src/tests/libs/Trakt.NET.Tests.Utility/TMDBTestUtility.cs b/src/tests/libs/Trakt.NET.Tests.Utility/TMDBTestUtility.cs
@@ -1,7 +1,3 @@
-#if NET6_0_OR_GREATER
-using TraktNET.Utilities.Json;
-#endif
-
 namespace TraktNET
 {
     public static class TMDBTestUtility
diff --git a/src/tests/libs/Trakt.NET.Tests.Utility/TestUtility.cs b/src/tests/libs/Trakt.NET.Tests.Utility/TestUtility.cs
@@ -2,9 +2,7 @@
 using System.Globalization;
 using System.Reflection;
 
-#if NET6_0_OR_GREATER
-using TraktNET.Utilities.Json;
-#else
+#if !NET6_0_OR_GREATER
 using System.Text.Json;
 #endif
 
diff --git a/src/tests/libs/Trakt.NET.Tests.Utility/Trakt.NET.Tests.Utility.csproj b/src/tests/libs/Trakt.NET.Tests.Utility/Trakt.NET.Tests.Utility.csproj
@@ -4,8 +4,4 @@
     <PackageReference Include="RichardSzalay.MockHttp" />
   </ItemGroup>
 
-  <ItemGroup>
-    <ProjectReference Include="..\..\..\libs\shared\Trakt.NET.Utilities\Trakt.NET.Utilities.csproj" />
-  </ItemGroup>
-
 </Project>
diff --git a/src/tests/libs/Trakt.NET.Tests.Utility/TraktTestUtility.cs b/src/tests/libs/Trakt.NET.Tests.Utility/TraktTestUtility.cs
@@ -1,7 +1,3 @@
-#if NET6_0_OR_GREATER
-using TraktNET.Utilities.Json;
-#endif
-
 namespace TraktNET
 {
     public static class TraktTestUtility

Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,5 @@`
`1`	`1`	`#if NET6_0_OR_GREATER`
`2`	`2`	`using System.Text.Json.Serialization;`
`3`		`-using TraktNET.Utilities.Json;`
`4`	`3`
`5`	`4`	`namespace TraktNET`
`6`	`5`	`{`
Original file line number	Diff line number	Diff line change
`@@ -1,9 +1,5 @@`
`1`	`1`	`using System.Text.Json;`
`2`	`2`
`3`		`-#if !NET8_0_OR_GREATER`
`4`		`-using TraktNET.Utilities.Json;`
`5`		`-#endif`
`6`		`-`
`7`	`3`	`namespace TraktNET`
`8`	`4`	`{`
`9`	`5`	`internal static class TMDBConstants`
Original file line number	Diff line number	Diff line change
`@@ -8,16 +8,16 @@ public static async Task<TMDBMovieImages> GetTMDBImagesAsync(this TraktMovieMini`
`8`	`8`	`return await Task.FromResult(new TMDBMovieImages());`
`9`	`9`	`}`
`10`	`10`
`11`		`- public static async Task<TMDBMovieImages> GetTMDBImagesAsync(this TraktMovie traktMovie, CancellationToken cancellationToken = default)`
	`11`	`+ public static async Task<TMDBVideos> GetTMDBVideosAsync(this TraktMovieMinimal traktMovie, CancellationToken cancellationToken = default)`
`12`	`12`	`{`
`13`	`13`	`// TODO`
`14`		`- return await Task.FromResult(new TMDBMovieImages());`
	`14`	`+ return await Task.FromResult(new TMDBVideos());`
`15`	`15`	`}`
`16`	`16`
`17`		`- public static async Task<TMDBVideos> GetTMDBVideosAsync(this TraktMovieMinimal traktMovie, CancellationToken cancellationToken = default)`
	`17`	`+ public static async Task<TMDBMovieImages> GetTMDBImagesAsync(this TraktMovie traktMovie, CancellationToken cancellationToken = default)`
`18`	`18`	`{`
`19`	`19`	`// TODO`
`20`		`- return await Task.FromResult(new TMDBVideos());`
	`20`	`+ return await Task.FromResult(new TMDBMovieImages());`
`21`	`21`	`}`
`22`	`22`
`23`	`23`	`public static async Task<TMDBVideos> GetTMDBVideosAsync(this TraktMovie traktMovie, CancellationToken cancellationToken = default)`
`@@ -31,19 +31,19 @@ public static async Task<TMDBShowImages> GetTMDBImagesAsync(this TraktShowMinima`
`31`	`31`	`// TODO`
`32`	`32`	`return await Task.FromResult(new TMDBShowImages());`
`33`	`33`	`}`
`34`		`-`
`35`		`- public static async Task<TMDBShowImages> GetTMDBImagesAsync(this TraktShow traktShow, CancellationToken cancellationToken = default)`
	`34`	`+ public static async Task<TMDBVideos> GetTMDBVideosAsync(this TraktShowMinimal traktShow, CancellationToken cancellationToken = default)`
`36`	`35`	`{`
`37`	`36`	`// TODO`
`38`		`- return await Task.FromResult(new TMDBShowImages());`
	`37`	`+ return await Task.FromResult(new TMDBVideos());`
`39`	`38`	`}`
`40`	`39`
`41`		`- public static async Task<TMDBVideos> GetTMDBVideosAsync(this TraktShowMinimal traktShow, CancellationToken cancellationToken = default)`
	`40`	`+ public static async Task<TMDBShowImages> GetTMDBImagesAsync(this TraktShow traktShow, CancellationToken cancellationToken = default)`
`42`	`41`	`{`
`43`	`42`	`// TODO`
`44`		`- return await Task.FromResult(new TMDBVideos());`
	`43`	`+ return await Task.FromResult(new TMDBShowImages());`
`45`	`44`	`}`
`46`	`45`
	`46`	`+`
`47`	`47`	`public static async Task<TMDBVideos> GetTMDBVideosAsync(this TraktShow traktShow, CancellationToken cancellationToken = default)`
`48`	`48`	`{`
`49`	`49`	`// TODO`
`@@ -56,16 +56,16 @@ public static async Task<TMDBSeasonImages> GetTMDBImagesAsync(this TraktSeasonMi`
`56`	`56`	`return await Task.FromResult(new TMDBSeasonImages());`
`57`	`57`	`}`
`58`	`58`
`59`		`- public static async Task<TMDBSeasonImages> GetTMDBImagesAsync(this TraktSeason traktSeason, CancellationToken cancellationToken = default)`
	`59`	`+ public static async Task<TMDBVideos> GetTMDBVideosAsync(this TraktSeasonMinimal traktSeason, CancellationToken cancellationToken = default)`
`60`	`60`	`{`
`61`	`61`	`// TODO`
`62`		`- return await Task.FromResult(new TMDBSeasonImages());`
	`62`	`+ return await Task.FromResult(new TMDBVideos());`
`63`	`63`	`}`
`64`	`64`
`65`		`- public static async Task<TMDBVideos> GetTMDBVideosAsync(this TraktSeasonMinimal traktSeason, CancellationToken cancellationToken = default)`
	`65`	`+ public static async Task<TMDBSeasonImages> GetTMDBImagesAsync(this TraktSeason traktSeason, CancellationToken cancellationToken = default)`
`66`	`66`	`{`
`67`	`67`	`// TODO`
`68`		`- return await Task.FromResult(new TMDBVideos());`
	`68`	`+ return await Task.FromResult(new TMDBSeasonImages());`
`69`	`69`	`}`
`70`	`70`
`71`	`71`	`public static async Task<TMDBVideos> GetTMDBVideosAsync(this TraktSeason traktSeason, CancellationToken cancellationToken = default)`
`@@ -80,16 +80,16 @@ public static async Task<TMDBEpisodeImages> GetTMDBImagesAsync(this TraktEpisode`
`80`	`80`	`return await Task.FromResult(new TMDBEpisodeImages());`
`81`	`81`	`}`
`82`	`82`
`83`		`- public static async Task<TMDBEpisodeImages> GetTMDBImagesAsync(this TraktEpisode traktEpisode, CancellationToken cancellationToken = default)`
	`83`	`+ public static async Task<TMDBVideos> GetTMDBVideosAsync(this TraktEpisodeMinimal traktEpisode, CancellationToken cancellationToken = default)`
`84`	`84`	`{`
`85`	`85`	`// TODO`
`86`		`- return await Task.FromResult(new TMDBEpisodeImages());`
	`86`	`+ return await Task.FromResult(new TMDBVideos());`
`87`	`87`	`}`
`88`	`88`
`89`		`- public static async Task<TMDBVideos> GetTMDBVideosAsync(this TraktEpisodeMinimal traktEpisode, CancellationToken cancellationToken = default)`
	`89`	`+ public static async Task<TMDBEpisodeImages> GetTMDBImagesAsync(this TraktEpisode traktEpisode, CancellationToken cancellationToken = default)`
`90`	`90`	`{`
`91`	`91`	`// TODO`
`92`		`- return await Task.FromResult(new TMDBVideos());`
	`92`	`+ return await Task.FromResult(new TMDBEpisodeImages());`
`93`	`93`	`}`
`94`	`94`
`95`	`95`	`public static async Task<TMDBVideos> GetTMDBVideosAsync(this TraktEpisode traktEpisode, CancellationToken cancellationToken = default)`
Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,5 @@`
`1`	`1`	`using System.Net;`
`2`	`2`	`using System.Text.Json;`
`3`		`-using TraktNET.Utilities.Json;`
`4`	`3`
`5`	`4`	`namespace TraktNET`
`6`	`5`	`{`
Original file line number	Diff line number	Diff line change
`@@ -5,7 +5,7 @@`
`5`	`5`	`using System.Runtime.CompilerServices;`
`6`	`6`	`using System.Text.Json;`
`7`	`7`
`8`		`-namespace TraktNET.Utilities.Json`
	`8`	`+namespace TraktNET`
`9`	`9`	`{`
`10`	`10`	`public sealed class LowerSnakeCaseJsonNamingPolicy : JsonNamingPolicy`
`11`	`11`	`{`
Original file line number	Diff line number	Diff line change
`@@ -1,9 +1,9 @@`
`1`	`1`	`#if NET6_0_OR_GREATER`
`2`	`2`	`using System.Text.Json.Serialization;`
`3`	`3`
`4`		`-namespace TraktNET.Utilities.Json`
	`4`	`+namespace TraktNET`
`5`	`5`	`{`
`6`		`- public interface IJsonSerializerContextFactory`
	`6`	`+ internal interface IJsonSerializerContextFactory`
`7`	`7`	`{`
`8`	`8`	`JsonSerializerContext GetContext<TJsonObjectType>();`
`9`	`9`	`}`
Original file line number	Diff line number	Diff line change
`@@ -2,11 +2,11 @@`
`2`	`2`	`using System.Text.Json;`
`3`	`3`	`using System.Text.Json.Serialization;`
`4`	`4`
`5`		`-namespace TraktNET.Utilities.Json`
	`5`	`+namespace TraktNET`
`6`	`6`	`{`
`7`		`- public static class JsonContextSerializer`
	`7`	`+ internal static class JsonContextSerializer`
`8`	`8`	`{`
`9`		`- public static async Task<TJsonObjectType?> DeserializeAsync<TJsonObjectType>(string factoryKey, Stream stream,`
	`9`	`+ internal static async Task<TJsonObjectType?> DeserializeAsync<TJsonObjectType>(string factoryKey, Stream stream,`
`10`	`10`	`CancellationToken cancellationToken = default) where TJsonObjectType : class`
`11`	`11`	`{`
`12`	`12`	`JsonSerializerContext jsonSerializerContext = JsonSerializerContextFactoryRegistry.Get(factoryKey).GetContext<TJsonObjectType>();`
`@@ -15,7 +15,7 @@ public static class JsonContextSerializer`
`15`	`15`	`jsonSerializerContext, cancellationToken).ConfigureAwait(false) as TJsonObjectType;`
`16`	`16`	`}`
`17`	`17`
`18`		`- public static async Task<IReadOnlyList<TJsonObjectType>?> DeserializeArrayAsync<TJsonObjectType>(string factoryKey, Stream stream,`
	`18`	`+ internal static async Task<IReadOnlyList<TJsonObjectType>?> DeserializeArrayAsync<TJsonObjectType>(string factoryKey, Stream stream,`
`19`	`19`	`CancellationToken cancellationToken = default)`
`20`	`20`	`{`
`21`	`21`	`JsonSerializerContext jsonSerializerContext = JsonSerializerContextFactoryRegistry.Get(factoryKey).GetContext<TJsonObjectType>();`