Remove Newtonsoft.Json dependency and enhance FieldValueHelper enum resolution (#274)

* Remove Newtonsoft.Json dependency and enhance FieldValueHelper enum resolution

Remove the transitive Newtonsoft.Json dependency that was unnecessarily pulled in via Foundatio.JsonNet, completing the System.Text.Json migration:

- Delete AggregationsNewtonsoftJsonConverter and BucketsNewtonsoftJsonConverter
- Remove all [Newtonsoft.Json.*] attributes from IAggregate, IBucket, FindResults, FindHit, and CountResult models (STJ equivalents already in place)
- Remove Foundatio.JsonNet PackageReference/ProjectReference from csproj
- Update SerializerTestHelper to STJ-only

Additionally, enhance FieldValueHelper.GetEnumStringValue to resolve enum values using [EnumMember(Value)] as a fallback after [JsonStringEnumMemberName], fixing silent Elasticsearch query bugs when custom enum serialization names are used.

Add comprehensive FieldValueHelper unit tests covering enum attribute resolution and all primitive type conversions.

* Migrate test serialization from Newtonsoft to STJ and cache enum lookups

- Replace all JsonConvert usage in ES tests with System.Text.Json.JsonSerializer

- Add ConcurrentDictionary cache for enum string resolution in FieldValueHelper

- Use GetField instead of GetMember for more efficient reflection

* Remove enum cache — reflection cost is negligible for query-builder call site

* Add bounded per-type enum lookup cache for GetEnumStringValue

Caches attribute resolution per enum Type (not per value), so growth is bounded by the number of distinct enum types in the app. Flags combinations and undefined values fall through to ToString() without polluting the cache.

* Add edge-case tests and remove redundant deserialization blocks

* Apply suggestion from @niemyjski

Author: niemyjski

src/Foundatio.Repositories.Elasticsearch/Utility/FieldValueHelper.cs

@@ -1,10 +1,17 @@
 using System;
+using System.Collections.Concurrent;
+using System.Collections.Generic;
+using System.Reflection;
+using System.Runtime.Serialization;
+using System.Text.Json.Serialization;
 using Elastic.Clients.Elasticsearch;
 
 namespace Foundatio.Repositories.Elasticsearch.Utility;
 
 public static class FieldValueHelper
 {
+    private static readonly ConcurrentDictionary<Type, Dictionary<string, string>> _enumTypeLookup = new();
+
     public static FieldValue ToFieldValue(object? value)
     {
         return value switch
@@ -25,7 +32,34 @@ public static FieldValue ToFieldValue(object? value)
             decimal m => FieldValue.Double((double)m),
             DateTime dt => FieldValue.String(dt.ToString("o")),
             DateTimeOffset dto => FieldValue.String(dto.ToString("o")),
+            Enum e => FieldValue.String(GetEnumStringValue(e)),
             _ => FieldValue.String(value.ToString()!)
         };
     }
+
+    private static string GetEnumStringValue(Enum value)
+    {
+        var lookup = _enumTypeLookup.GetOrAdd(value.GetType(), static type =>
+        {
+            var map = new Dictionary<string, string>();
+            foreach (var field in type.GetFields(BindingFlags.Public | BindingFlags.Static))
+            {
+                var jsonAttr = field.GetCustomAttribute<JsonStringEnumMemberNameAttribute>();
+                if (jsonAttr is not null)
+                {
+                    map[field.Name] = jsonAttr.Name;
+                    continue;
+                }
+
+                var enumMemberAttr = field.GetCustomAttribute<EnumMemberAttribute>();
+                if (enumMemberAttr?.Value is not null)
+                    map[field.Name] = enumMemberAttr.Value;
+            }
+
+            return map;
+        });
+
+        var name = value.ToString();
+        return lookup.TryGetValue(name, out var resolved) ? resolved : name;
+    }
 }

src/Foundatio.Repositories/Foundatio.Repositories.csproj

@@ -2,8 +2,5 @@
   <ItemGroup>
     <PackageReference Include="Foundatio" Version="13.0.1" Condition="'$(ReferenceFoundatioSource)' == '' OR '$(ReferenceFoundatioSource)' == 'false'" />
     <ProjectReference Include="$(FoundatioProjectsDir)Foundatio\src\Foundatio\Foundatio.csproj" Condition="'$(ReferenceFoundatioSource)' == 'true'" />
-
-    <PackageReference Include="Foundatio.JsonNet" Version="13.0.1" Condition="'$(ReferenceFoundatioSource)' == '' OR '$(ReferenceFoundatioSource)' == 'false'" />
-    <ProjectReference Include="$(FoundatioProjectsDir)Foundatio\src\Foundatio.JsonNet\Foundatio.JsonNet.csproj" Condition="'$(ReferenceFoundatioSource)' == 'true'" />
   </ItemGroup>
 </Project>

src/Foundatio.Repositories/Models/Aggregations/IAggregate.cs

@@ -10,7 +10,6 @@ namespace Foundatio.Repositories.Models;
 /// Aggregations provide summarized data about the documents matching a query, such as
 /// counts, averages, date histograms, and term frequencies.
 /// </remarks>
-[Newtonsoft.Json.JsonConverter(typeof(AggregationsNewtonsoftJsonConverter))]
 [System.Text.Json.Serialization.JsonConverter(typeof(AggregationsSystemTextJsonConverter))]
 public interface IAggregate
 {

src/Foundatio.Repositories/Models/Aggregations/IBucket.cs

@@ -10,7 +10,6 @@ namespace Foundatio.Repositories.Models;
 /// Buckets group documents based on field values, ranges, or other criteria. Each bucket
 /// contains a subset of documents and can include nested aggregations.
 /// </remarks>
-[Newtonsoft.Json.JsonConverter(typeof(BucketsNewtonsoftJsonConverter))]
 [System.Text.Json.Serialization.JsonConverter(typeof(BucketsSystemTextJsonConverter))]
 public interface IBucket
 {

src/Foundatio.Repositories/Models/FindResults.cs

@@ -39,7 +39,6 @@ public FindResults()
     /// <param name="aggregations">The aggregation results.</param>
     /// <param name="getNextPageFunc">A function to retrieve the next page of results.</param>
     /// <param name="data">Additional metadata.</param>
-    [Newtonsoft.Json.JsonConstructor]
     public FindResults(IEnumerable<FindHit<T>>? hits = null, long total = 0, IReadOnlyDictionary<string, IAggregate>? aggregations = null, Func<FindResults<T>, Task<FindResults<T>>>? getNextPageFunc = null, IDictionary<string, object?>? data = null)
         : base(total, aggregations, data)
     {
@@ -81,14 +80,12 @@ protected set
     /// Gets the current page number (1-based).
     /// </summary>
     [JsonInclude]
-    [Newtonsoft.Json.JsonProperty]
     public int Page { get; protected set; } = 1;
 
     /// <summary>
     /// Gets whether there are more pages of results available.
     /// </summary>
     [JsonInclude]
-    [Newtonsoft.Json.JsonProperty]
     public bool HasMore { get; protected set; }
 
     int IFindResults<T>.Page
@@ -201,7 +198,6 @@ public class CountResult : IHaveData
     /// <param name="aggregations">The aggregation results.</param>
     /// <param name="data">Additional metadata.</param>
     [JsonConstructor]
-    [Newtonsoft.Json.JsonConstructor]
     public CountResult(long total = 0, IReadOnlyDictionary<string, IAggregate>? aggregations = null, IDictionary<string, object?>? data = null)
     {
         Aggregations = aggregations ?? EmptyReadOnly<string, IAggregate>.Dictionary;
@@ -287,7 +283,6 @@ public class FindHit<T> : IHaveData
     /// <param name="routing">The routing value.</param>
     /// <param name="data">Additional metadata.</param>
     [JsonConstructor]
-    [Newtonsoft.Json.JsonConstructor]
     public FindHit(string? id, T? document, double score, string? version = null, string? routing = null, IDictionary<string, object?>? data = null)
     {
         Id = id;

src/Foundatio.Repositories/Serialization/AggregationsNewtonsoftJsonConverter.cs

@@ -9,7 +9,6 @@
 using Foundatio.Repositories.Elasticsearch.Tests.Repositories.Models;
 using Foundatio.Repositories.Models;
 using Microsoft.Extensions.Time.Testing;
-using Newtonsoft.Json;
 using Xunit;
 
 namespace Foundatio.Repositories.Elasticsearch.Tests;
@@ -498,8 +497,8 @@ public async Task GetTermAggregationsAsync()
         Assert.Equal(10, termsAge.Buckets.Count);
         Assert.Equal(1, termsAge.Buckets.First(f => f.Key == 19).Total);
 
-        string json = JsonConvert.SerializeObject(result);
-        var roundTripped = JsonConvert.DeserializeObject<CountResult>(json);
+        string json = System.Text.Json.JsonSerializer.Serialize(result);
+        var roundTripped = System.Text.Json.JsonSerializer.Deserialize<CountResult>(json);
         Assert.NotNull(roundTripped);
         Assert.Equal(10, roundTripped.Total);
         Assert.Single(roundTripped.Aggregations);
@@ -521,10 +520,10 @@ public async Task GetTermAggregationsAsync()
         Assert.NotNull(termsYears);
         Assert.Single(termsYears.Buckets);
 
-        json = JsonConvert.SerializeObject(result, Formatting.Indented);
-        roundTripped = JsonConvert.DeserializeObject<CountResult>(json);
+        json = System.Text.Json.JsonSerializer.Serialize(result, new System.Text.Json.JsonSerializerOptions { WriteIndented = true });
+        roundTripped = System.Text.Json.JsonSerializer.Deserialize<CountResult>(json);
         Assert.NotNull(roundTripped);
-        string roundTrippedJson = JsonConvert.SerializeObject(roundTripped, Formatting.Indented);
+        string roundTrippedJson = System.Text.Json.JsonSerializer.Serialize(roundTripped, new System.Text.Json.JsonSerializerOptions { WriteIndented = true });
         Assert.Equal(json, roundTrippedJson);
         Assert.Equal(10, roundTripped.Total);
         Assert.Single(roundTripped.Aggregations);
@@ -565,8 +564,8 @@ await _employeeRepository.AddAsync(new List<Employee> {
             oldestDate = oldestDate.AddDays(1);
         }
 
-        string json = JsonConvert.SerializeObject(result);
-        var roundTripped = JsonConvert.DeserializeObject<CountResult>(json);
+        string json = System.Text.Json.JsonSerializer.Serialize(result);
+        var roundTripped = System.Text.Json.JsonSerializer.Deserialize<CountResult>(json);
         Assert.NotNull(roundTripped);
 
         dateHistogramAgg = roundTripped.Aggregations.DateHistogram("date_nextReview");
@@ -600,8 +599,8 @@ await _employeeRepository.AddAsync(new List<Employee> {
         Assert.NotNull(dateTermsAgg);
         Assert.Equal(utcToday.SubtractDays(2), dateTermsAgg.Value);
 
-        string json = JsonConvert.SerializeObject(result);
-        var roundTripped = JsonConvert.DeserializeObject<CountResult>(json);
+        string json = System.Text.Json.JsonSerializer.Serialize(result);
+        var roundTripped = System.Text.Json.JsonSerializer.Deserialize<CountResult>(json);
         Assert.NotNull(roundTripped);
 
         dateTermsAgg = roundTripped.Aggregations.Min<DateTime>("min_nextReview");
@@ -631,8 +630,8 @@ public async Task GetTermAggregationsWithTopHitsAsync()
         Assert.Equal(19, employees.First().Age);
         Assert.Equal(1, employees.First().YearsEmployed);
 
-        string json = JsonConvert.SerializeObject(result);
-        var roundTripped = JsonConvert.DeserializeObject<CountResult>(json);
+        string json = System.Text.Json.JsonSerializer.Serialize(result);
+        var roundTripped = System.Text.Json.JsonSerializer.Deserialize<CountResult>(json);
         Assert.NotNull(roundTripped);
         Assert.Equal(10, roundTripped.Total);
         Assert.Single(roundTripped.Aggregations);
@@ -642,21 +641,6 @@ public async Task GetTermAggregationsWithTopHitsAsync()
         bucket = roundTrippedTermsAge.Buckets.First(f => f.Key == 19);
         Assert.Equal(1, bucket.Total);
 
-        string systemTextJson = System.Text.Json.JsonSerializer.Serialize(result);
-        Assert.True(System.Text.Json.Nodes.JsonNode.DeepEquals(
-            System.Text.Json.Nodes.JsonNode.Parse(json),
-            System.Text.Json.Nodes.JsonNode.Parse(systemTextJson)),
-            "Newtonsoft and System.Text.Json serialization should produce semantically equivalent JSON");
-        roundTripped = System.Text.Json.JsonSerializer.Deserialize<CountResult>(systemTextJson);
-        Assert.NotNull(roundTripped);
-        Assert.Equal(10, roundTripped.Total);
-        Assert.Single(roundTripped.Aggregations);
-        var sysTermsAge = roundTripped.Aggregations.Terms<int>("terms_age");
-        Assert.NotNull(sysTermsAge);
-        Assert.Equal(10, sysTermsAge.Buckets.Count);
-        bucket = sysTermsAge.Buckets.First(f => f.Key == 19);
-        Assert.Equal(1, bucket.Total);
-
         tophits = bucket.Aggregations.TopHits();
         Assert.NotNull(tophits);
         employees = tophits.Documents<Employee>(_serializer);