Added JsonContext for AOT support & cleanup

Author: CwistSilver

Mojang.Api.Skins.Test/Cache/LiteDBCacheTests.cs

@@ -111,7 +111,7 @@ public async Task Clear_ClearsCacheAsync()
         foreach (var directory in directories)
         {
             Assert.Empty(Directory.GetFiles(directory));
-        }    
+        }
     }
 
     [Fact]

Mojang.Api.Skins.Test/SkinsClientTests.cs

@@ -14,19 +14,19 @@
 namespace Mojang.Api.Skins.Test;
 public class SkinsClientTests
 {
-    private ProfileProperties _profileProperties = new ProfileProperties
+    private readonly ProfileProperties _profileProperties = new()
     {
         Name = "FakePlayer",
         Id = Guid.NewGuid(),
-        Properties = new ProfileProperty[] {
+        Properties = [
             new ProfileProperty() {
                 Name = "textures",
                 Value = "ewogICJ0aW1lc3RhbXAiIDogMTcwNTI0MDM4NTE1MSwKICAicHJvZmlsZUlkIiA6ICJlZGM2MzE5YjQ5NjM0ZDhmYmZkNTI1N2QxNzg5N2I0NSIsCiAgInByb2ZpbGVOYW1lIiA6ICJDd2lzdFNpbHYzciIsCiAgInRleHR1cmVzIiA6IHsKICAgICJTS0lOIiA6IHsKICAgICAgInVybCIgOiAiaHR0cDovL3RleHR1cmVzLm1pbmVjcmFmdC5uZXQvdGV4dHVyZS83ZTNjNWQ1MTM4MTE1YTRmNjBjYTRmMGMwMTEyZjk3NmFmYmJjZjk3MGNmY2Y5ZWM1NDk0NDMyNTQ1Njg0NWIxIgogICAgfSwKICAgICJDQVBFIiA6IHsKICAgICAgInVybCIgOiAiaHR0cDovL3RleHR1cmVzLm1pbmVjcmFmdC5uZXQvdGV4dHVyZS8yMzQwYzBlMDNkZDI0YTExYjE1YThiMzNjMmE3ZTllMzJhYmIyMDUxYjI0ODFkMGJhN2RlZmQ2MzVjYTdhOTMzIgogICAgfQogIH0KfQ=="
             }
-        }
+        ]
     };
-    private SkinData _defaultSkinData = new SkinData { SkinType = SkinType.Slim, TextureBytes = new byte[] { 1, 2, 3, 4, 5, 6 }, TextureSize = new Size(64, 64) };
-    private CapeData _defaultCapeData = new CapeData { CapeName = "TestCape", TextureBytes = new byte[] { 1, 2, 3 }, TextureSize = new Size(64, 32) };
+    private readonly SkinData _defaultSkinData = new() { SkinType = SkinType.Slim, TextureBytes = [1, 2, 3, 4, 5, 6], TextureSize = new Size(64, 64) };
+    private readonly CapeData _defaultCapeData = new() { CapeName = "TestCape", TextureBytes = [1, 2, 3], TextureSize = new Size(64, 32) };
 
 
     private readonly Mock<IProfileInformationRepository> _profileInformationRepositoryMock;
@@ -47,7 +47,7 @@ public SkinsClientTests()
         _textureCropperMock = new Mock<ITextureCropper>();
         _modernSkinConverterMock = new Mock<IModernSkinConverter>();
         _skinTypeIdentifierMock = new Mock<ISkinTypeIdentifier>();
-    }   
+    }
 
     [Fact]
     public async Task GetAsync_ByName_ReturnsValidPlayerData()
@@ -140,5 +140,5 @@ public void GetFromFile_WithCape_ReturnsValidPlayerData()
         _profileTexturesRepositoryMock.Verify(repo => repo.GetCapeLocal(_defaultCapeData.TextureBytes), Times.Once());
     }
 
-    private SkinsClient CreateClient() => new SkinsClient(_profileInformationRepositoryMock.Object, _profilePropertiesRepositoryMock.Object, _profileTexturesRepositoryMock.Object, _capeTextureIdentifierMock.Object, _imageUtilitiesMock.Object, _textureCropperMock.Object, _modernSkinConverterMock.Object, _skinTypeIdentifierMock.Object);
+    private SkinsClient CreateClient() => new(_profileInformationRepositoryMock.Object, _profilePropertiesRepositoryMock.Object, _profileTexturesRepositoryMock.Object, _capeTextureIdentifierMock.Object, _imageUtilitiesMock.Object, _textureCropperMock.Object, _modernSkinConverterMock.Object, _skinTypeIdentifierMock.Object);
 }

Mojang.Api.Skins/Cache/LiteDBCache.cs

@@ -58,7 +58,7 @@ public void AddOrSet(string key, object value)
         }
 
         return (T)result.Value;
-    } 
+    }
 
     public async Task CacheImageAsync(string key, byte[] data)
     {

Mojang.Api.Skins/ImageService/Identifier/Cape/CapeTextureIdentifier.cs

@@ -1,5 +1,4 @@
 using Mojang.Api.Skins.ImageService.General;
-using System.Runtime.InteropServices;
 
 namespace Mojang.Api.Skins.ImageService.Identifier.Cape;
 public sealed class CapeTextureIdentifier : ICapeTextureIdentifier

Mojang.Api.Skins/JsonContext.cs

@@ -0,0 +1,12 @@
+using Mojang.Api.Skins.Data.MojangApi;
+using System.Text.Json.Serialization;
+
+namespace Mojang.Api.Skins;
+[JsonSourceGenerationOptions(WriteIndented = true)]
+[JsonSerializable(typeof(ApiErrorResponse))]
+[JsonSerializable(typeof(ProfileInformation))]
+[JsonSerializable(typeof(ProfileProperties))]
+[JsonSerializable(typeof(ProfileTextureInformation))]
+internal partial class JsonContext : JsonSerializerContext
+{
+}

Mojang.Api.Skins/Repository/MinecraftProfileInformation/ProfileInformationRepository.cs

@@ -1,7 +1,6 @@
 using Mojang.Api.Skins.Data;
 using Mojang.Api.Skins.Data.MojangApi;
 using System.Net.Http.Json;
-using System.Text.Json;
 
 namespace Mojang.Api.Skins.Repository.MinecraftProfileInformation;
 public sealed class ProfileInformationRepository : IProfileInformationRepository
@@ -47,12 +46,12 @@ public async Task<ProfileInformation> Get(string playerName)
 
         if (!response.IsSuccessStatusCode)
         {
-            var errorResponse = await response.Content.ReadFromJsonAsync<ApiErrorResponse>().ConfigureAwait(false); ;
+            var errorResponse = await response.Content.ReadFromJsonAsync(JsonContext.Default.ApiErrorResponse).ConfigureAwait(false);
             var errorMessage = errorResponse != null ? errorResponse.ErrorMessage : "Unknown error occurred.";
             throw new HttpRequestException(errorMessage);
         }
 
-        var profileInformation = await response.Content.ReadFromJsonAsync<ProfileInformation>().ConfigureAwait(false);
+        var profileInformation = await response.Content.ReadFromJsonAsync(JsonContext.Default.ProfileInformation).ConfigureAwait(false);
 
         lock (_lock)
             Options.Cache?.AddOrSet(cacheKey, profileInformation!.Id);

Mojang.Api.Skins/Repository/MinecraftProfileProperties/ProfilePropertiesRepository.cs

@@ -44,12 +44,12 @@ public async Task<ProfileProperties> Get(Guid playerUUID)
         var response = await _httpClient.GetAsync(string.Format(MinecraftProfilePropertiesURL, playerUUID.ToString("N"))).ConfigureAwait(false);
         if (!response.IsSuccessStatusCode)
         {
-            var errorResponse = await response.Content.ReadFromJsonAsync<ApiErrorResponse>();
+            var errorResponse = await response.Content.ReadFromJsonAsync(JsonContext.Default.ApiErrorResponse).ConfigureAwait(false);
             var errorMessage = errorResponse != null ? errorResponse.ErrorMessage : "Unknown error occurred.";
             throw new HttpRequestException(errorMessage);
         }
 
-        var profileProperties = await response.Content.ReadFromJsonAsync<ProfileProperties>();
+        var profileProperties = await response.Content.ReadFromJsonAsync(JsonContext.Default.ProfileProperties).ConfigureAwait(false);
 
         lock (_lock)
             Options.Cache?.AddOrSet(cacheKey, profileProperties!);

Mojang.Api.Skins/Repository/MinecraftProfileTextures/ProfileTexturesRepository.cs

@@ -221,7 +221,7 @@ private ProfileTextureInformation DecodeProfileTextureInformation(ProfilePropert
         var base64Bytes = Convert.FromBase64String(texturesProperty.Value);
         var decodedString = System.Text.Encoding.UTF8.GetString(base64Bytes);
 
-        var profileTextureInformation = JsonSerializer.Deserialize<ProfileTextureInformation>(decodedString);
+        var profileTextureInformation = JsonSerializer.Deserialize(decodedString, JsonContext.Default.ProfileTextureInformation);
 
         return profileTextureInformation ?? throw new InvalidOperationException("Failed to deserialize the profile texture information.");
     }

Mojang.Api.Skins/Utilities/HttpClientExtension.cs

@@ -1,9 +1,6 @@
-using Mojang.Api.Skins.Data.MojangApi;
-using Polly;
+using Polly;
 using Polly.Extensions.Http;
-using System.Diagnostics;
 using System.Net.Http.Headers;
-using System.Text.Json;
 
 namespace Mojang.Api.Skins.Utilities;
 internal static class HttpClientExtension
@@ -26,18 +23,7 @@ internal static IAsyncPolicy<HttpResponseMessage> GetRetryPolicy()
                 if (message.IsSuccessStatusCode)
                     return false;
 
-               return true;
-                //var contentAsString = message.Content.ReadAsStringAsync().ConfigureAwait(false).GetAwaiter().GetResult();
-                //Debug.WriteLine(contentAsString);
-                //try
-                //{
-                //    var apiErrorResponse = JsonSerializer.Deserialize<ApiErrorResponse>(contentAsString);
-                //    return apiErrorResponse == null;
-                //}
-                //catch
-                //{
-                //    return true;
-                //}
+                return true;
             })
             .WaitAndRetryAsync(3, retryAttempt => TimeSpan.FromSeconds(Math.Pow(2, retryAttempt)));
     }