Use json source generator

src/Common/src/Common/HealthChecks/HealthCheckResult.cs

@@ -19,6 +19,7 @@ public sealed class HealthCheckResult
     /// <remarks>
     /// Used by the health middleware to determine the HTTP Status code.
     /// </remarks>
+    [JsonPropertyName("status")]
     [JsonConverter(typeof(SnakeCaseAllCapsEnumMemberJsonConverter))]
     public HealthStatus Status { get; set; } = HealthStatus.Unknown;
 
@@ -28,11 +29,13 @@ public sealed class HealthCheckResult
     /// <remarks>
     /// Currently only used on check failures.
     /// </remarks>
+    [JsonPropertyName("description")]
     public string? Description { get; set; }
 
     /// <summary>
     /// Gets details of the health check.
     /// </summary>
+    [JsonPropertyName("details")]
     [JsonIgnoreEmptyCollection]
     public IDictionary<string, object> Details { get; } = new Dictionary<string, object>();
 }

src/Common/test/Certificates.Test/ConfigureCertificateOptionsTest.cs

@@ -5,7 +5,6 @@
 using System.Runtime.InteropServices;
 using System.Security.Cryptography;
 using System.Security.Cryptography.X509Certificates;
-using System.Text.Json;
 using Microsoft.Extensions.Configuration;
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Options;
@@ -212,19 +211,25 @@ public async Task CertificateOptions_update_on_changed_path(string certificateNa
 
     private static string BuildAppSettingsJson(string certificateName, string certificatePath, string keyPath)
     {
-        string certificateBlock = $"""
-                "CertificateFilePath": {JsonSerializer.Serialize(certificatePath)},
-                "PrivateKeyFilePath": {JsonSerializer.Serialize(keyPath)}
-            """;
-
-        string namedCertificateSection = string.IsNullOrEmpty(certificateName)
-            ? certificateBlock
-            : $"{JsonSerializer.Serialize(certificateName)}: {{ {certificateBlock} }}";
+        string escapedCertificatePath = certificatePath.Replace(@"\", @"\\", StringComparison.Ordinal);
+        string escapedKeyPath = keyPath.Replace(@"\", @"\\", StringComparison.Ordinal);
 
-        return $$"""
+        return string.IsNullOrEmpty(certificateName)
+            ? $$"""
+            {
+              "Certificates": {
+                "CertificateFilePath": "{{escapedCertificatePath}}",
+                "PrivateKeyFilePath": "{{escapedKeyPath}}"
+              }
+            }
+            """
+            : $$"""
             {
               "Certificates": {
-                {{namedCertificateSection}}
+                "{{certificateName}}": {
+                  "CertificateFilePath": "{{escapedCertificatePath}}",
+                  "PrivateKeyFilePath": "{{escapedKeyPath}}"
+                }
               }
             }
             """;

src/Discovery/src/Eureka/AppInfo/ApplicationInfo.cs

@@ -53,7 +53,7 @@ private List<InstanceInfo> GetInstancesSnapshot()
     /// <inheritdoc />
     public override string ToString()
     {
-        return JsonSerializer.Serialize(this, DebugSerializerOptions.Instance);
+        return JsonSerializer.Serialize(this, DebugJsonSerializerContext.Default.ApplicationInfo);
     }
 
     internal void Add(InstanceInfo instance)

src/Discovery/src/Eureka/AppInfo/ApplicationInfoCollection.cs

@@ -73,7 +73,7 @@ internal ReadOnlyCollection<InstanceInfo> GetInstancesByVipAddress(string vipAdd
     /// <inheritdoc />
     public override string ToString()
     {
-        return JsonSerializer.Serialize(this, DebugSerializerOptions.Instance);
+        return JsonSerializer.Serialize(this, DebugJsonSerializerContext.Default.ApplicationInfoCollection);
     }
 
     IEnumerator IEnumerable.GetEnumerator()

src/Discovery/src/Eureka/AppInfo/DataCenterName.cs

@@ -6,8 +6,11 @@
 #pragma warning disable SA1602 // Enumeration items should be documented
 #endif
 
+using System.Text.Json.Serialization;
+
 namespace Steeltoe.Discovery.Eureka.AppInfo;
 
+[JsonConverter(typeof(JsonStringEnumConverter<DataCenterName>))]
 public enum DataCenterName
 {
     Netflix,

src/Discovery/src/Eureka/AppInfo/InstanceInfo.cs

@@ -268,7 +268,7 @@ public override int GetHashCode()
     /// <inheritdoc />
     public override string ToString()
     {
-        return JsonSerializer.Serialize(this, DebugSerializerOptions.Instance);
+        return JsonSerializer.Serialize(this, DebugJsonSerializerContext.Default.InstanceInfo);
     }
 
     internal static InstanceInfo FromConfiguration(EurekaInstanceOptions options, TimeProvider timeProvider)

src/Discovery/src/Eureka/AppInfo/LeaseInfo.cs

@@ -48,7 +48,7 @@ private LeaseInfo()
     /// <inheritdoc />
     public override string ToString()
     {
-        return JsonSerializer.Serialize(this, DebugSerializerOptions.Instance);
+        return JsonSerializer.Serialize(this, DebugJsonSerializerContext.Default.LeaseInfo);
     }
 
     internal static LeaseInfo? FromJson(JsonLeaseInfo? jsonLeaseInfo)

src/Discovery/src/Eureka/EurekaClient.cs

@@ -8,7 +8,6 @@
 using System.Net.Http.Json;
 using System.Text;
 using System.Text.Json;
-using System.Text.Json.Serialization;
 using Microsoft.AspNetCore.Http.Extensions;
 using Microsoft.Extensions.Logging;
 using Microsoft.Extensions.Options;
@@ -37,21 +36,6 @@ public sealed partial class EurekaClient
     private static readonly Task<object?> TaskOfNull = Task.FromResult<object?>(null);
     private static readonly TimeSpan GetAccessTokenTimeout = TimeSpan.FromSeconds(10);
 
-    private static readonly JsonSerializerOptions RequestSerializerOptions = new()
-    {
-        DefaultIgnoreCondition = JsonIgnoreCondition.WhenWritingNull
-    };
-
-    private static readonly JsonSerializerOptions ResponseSerializerOptions = new()
-    {
-        PropertyNamingPolicy = JsonNamingPolicy.CamelCase,
-        Converters =
-        {
-            new JsonApplicationConverter(),
-            new JsonInstanceInfoConverter()
-        }
-    };
-
     private readonly IHttpClientFactory _httpClientFactory;
     private readonly IOptionsMonitor<EurekaClientOptions> _optionsMonitor;
     private readonly EurekaServiceUriStateManager _eurekaServiceUriStateManager;
@@ -98,7 +82,7 @@ public async Task RegisterAsync(InstanceInfo instance, CancellationToken cancell
         string requestBody = JsonSerializer.Serialize(new JsonInstanceInfoRoot
         {
             Instance = instance.ToJson()
-        }, RequestSerializerOptions);
+        }, EurekaJsonSerializerContext.Default.JsonInstanceInfoRoot);
 
         string path = $"apps/{WebUtility.UrlEncode(instance.AppName)}";
         await ExecuteRequestAsync(HttpMethod.Post, path, null, requestBody, cancellationToken);
@@ -224,7 +208,7 @@ private async Task<ApplicationInfoCollection> GetApplicationsAtPathAsync(string
     {
         return await ExecuteRequestAsync(HttpMethod.Get, path, null, null, async response =>
         {
-            var root = await response.Content.ReadFromJsonAsync<JsonApplicationsRoot>(ResponseSerializerOptions, cancellationToken);
+            JsonApplicationsRoot? root = await response.Content.ReadFromJsonAsync(EurekaJsonSerializerContext.Default.JsonApplicationsRoot, cancellationToken);
             return ApplicationInfoCollection.FromJson(root?.Applications, _timeProvider);
         }, cancellationToken);
     }

src/Discovery/src/Eureka/Transport/DebugJsonSerializerContext.cs

@@ -0,0 +1,12 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the Apache 2.0 License.
+// See the LICENSE file in the project root for more information.
+
+using System.Text.Json.Serialization;
+using Steeltoe.Discovery.Eureka.AppInfo;
+
+namespace Steeltoe.Discovery.Eureka.Transport;
+
+[JsonSourceGenerationOptions(WriteIndented = true, DefaultIgnoreCondition = JsonIgnoreCondition.WhenWritingNull)]
+[JsonSerializable(typeof(ApplicationInfoCollection))]
+internal sealed partial class DebugJsonSerializerContext : JsonSerializerContext;

src/Discovery/src/Eureka/Transport/EurekaJsonSerializerContext.cs

@@ -0,0 +1,14 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the Apache 2.0 License.
+// See the LICENSE file in the project root for more information.
+
+using System.Text.Json.Serialization;
+
+namespace Steeltoe.Discovery.Eureka.Transport;
+
+[JsonSourceGenerationOptions(PropertyNamingPolicy = JsonKnownNamingPolicy.CamelCase, DefaultIgnoreCondition = JsonIgnoreCondition.WhenWritingNull)]
+[JsonSerializable(typeof(JsonApplicationsRoot))]
+[JsonSerializable(typeof(List<JsonApplication?>))]
+[JsonSerializable(typeof(JsonInstanceInfoRoot))]
+[JsonSerializable(typeof(List<JsonInstanceInfo?>))]
+internal sealed partial class EurekaJsonSerializerContext : JsonSerializerContext;

src/Discovery/src/Eureka/Transport/JsonApplicationConverter.cs

@@ -13,10 +13,10 @@ internal sealed class JsonApplicationConverter : JsonConverter<IList<JsonApplica
     {
         if (reader.TokenType == JsonTokenType.StartArray)
         {
-            return JsonSerializer.Deserialize<List<JsonApplication?>>(ref reader, options)!;
+            return JsonSerializer.Deserialize(ref reader, EurekaJsonSerializerContext.Default.ListJsonApplication)!;
         }
 
-        var application = JsonSerializer.Deserialize<JsonApplication>(ref reader, options);
+        JsonApplication? application = JsonSerializer.Deserialize(ref reader, EurekaJsonSerializerContext.Default.JsonApplication);
         return application != null ? [application] : [];
     }
 

src/Discovery/src/Eureka/Transport/JsonInstanceInfoConverter.cs

@@ -13,10 +13,10 @@ internal sealed class JsonInstanceInfoConverter : JsonConverter<IList<JsonInstan
     {
         if (reader.TokenType == JsonTokenType.StartArray)
         {
-            return JsonSerializer.Deserialize<List<JsonInstanceInfo?>>(ref reader, options)!;
+            return JsonSerializer.Deserialize(ref reader, EurekaJsonSerializerContext.Default.ListJsonInstanceInfo)!;
         }
 
-        var instanceInfo = JsonSerializer.Deserialize<JsonInstanceInfo>(ref reader, options);
+        JsonInstanceInfo? instanceInfo = JsonSerializer.Deserialize(ref reader, EurekaJsonSerializerContext.Default.JsonInstanceInfo);
         return instanceInfo != null ? [instanceInfo] : [];
     }
 

src/Discovery/src/HttpClients/LoadBalancers/ServiceInstancesJsonSerializerContext.cs

@@ -0,0 +1,11 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the Apache 2.0 License.
+// See the LICENSE file in the project root for more information.
+
+using System.Text.Json.Serialization;
+
+namespace Steeltoe.Discovery.HttpClients.LoadBalancers;
+
+[JsonSourceGenerationOptions]
+[JsonSerializable(typeof(ServiceInstancesResolver.JsonSerializableServiceInstance[]))]
+internal sealed partial class ServiceInstancesJsonSerializerContext : JsonSerializerContext;

src/Discovery/src/HttpClients/LoadBalancers/ServiceInstancesResolver.cs

@@ -116,7 +116,8 @@ public async Task<IList<IServiceInstance>> ResolveInstancesAsync(string serviceI
     {
         if (cacheValue is { Length: > 0 })
         {
-            var serializableInstances = JsonSerializer.Deserialize<List<JsonSerializableServiceInstance>>(cacheValue);
+            JsonSerializableServiceInstance[]? serializableInstances =
+                JsonSerializer.Deserialize(cacheValue, ServiceInstancesJsonSerializerContext.Default.JsonSerializableServiceInstanceArray);
 
             if (serializableInstances != null)
             {
@@ -127,10 +128,10 @@ public async Task<IList<IServiceInstance>> ResolveInstancesAsync(string serviceI
         return null;
     }
 
-    private static byte[] ToCacheValue(IEnumerable<IServiceInstance> instances)
+    private static byte[] ToCacheValue(List<IServiceInstance> instances)
     {
         JsonSerializableServiceInstance[] serializableInstances = instances.Select(JsonSerializableServiceInstance.CopyFrom).ToArray();
-        return JsonSerializer.SerializeToUtf8Bytes(serializableInstances);
+        return JsonSerializer.SerializeToUtf8Bytes(serializableInstances, ServiceInstancesJsonSerializerContext.Default.JsonSerializableServiceInstanceArray);
     }
 
     [LoggerMessage(Level = LogLevel.Warning, Message = "No discovery clients are registered.")]
@@ -142,7 +143,7 @@ private static byte[] ToCacheValue(IEnumerable<IServiceInstance> instances)
     [LoggerMessage(Level = LogLevel.Error, Message = "Failed to get instances from {DiscoveryClient}.")]
     private partial void LogFailedToGetInstances(Exception exception, Type discoveryClient);
 
-    private sealed class JsonSerializableServiceInstance : IServiceInstance
+    internal sealed class JsonSerializableServiceInstance : IServiceInstance
     {
         // Trust that deserialized instances meet the IServiceInstance contract, so suppress nullability warnings.