Enhance JsonConverter in the Feature module.

framework/src/Volo.Abp.Json/Volo/Abp/Json/SystemTextJson/JsonConverters/AbpHasExtraPropertiesJsonConverter.cs

@@ -20,10 +20,10 @@ namespace Volo.Abp.Json.SystemTextJson.JsonConverters
             {
                 var extensibleObject = JsonSerializer.Deserialize<T>(rootElement.GetRawText(), newOptions);
 
-                var extraProperties = rootElement.EnumerateObject().FirstOrDefault(x => x.Name.Equals(nameof(IHasExtraProperties.ExtraProperties), StringComparison.OrdinalIgnoreCase));
-                if (extraProperties.Value.ValueKind == JsonValueKind.Object)
+                var extraPropertiesJsonProperty = rootElement.EnumerateObject().FirstOrDefault(x => x.Name.Equals(nameof(IHasExtraProperties.ExtraProperties), StringComparison.OrdinalIgnoreCase));
+                if (extraPropertiesJsonProperty.Value.ValueKind == JsonValueKind.Object)
                 {
-                    var extraPropertyDictionary = JsonSerializer.Deserialize(extraProperties.Value.GetRawText(), typeof(ExtraPropertyDictionary), newOptions);
+                    var extraPropertyDictionary = JsonSerializer.Deserialize(extraPropertiesJsonProperty.Value.GetRawText(), typeof(ExtraPropertyDictionary), newOptions);
                     ObjectHelper.TrySetProperty(extensibleObject, x => x.ExtraProperties, () => extraPropertyDictionary);
                 }
 

modules/feature-management/src/Volo.Abp.FeatureManagement.Application.Contracts/Volo/Abp/FeatureManagement/JsonConverters/SelectionStringValueItemSourceJsonConverter.cs

@@ -1,5 +1,4 @@
 using System;
-using System.Collections.Generic;
 using System.Linq;
 using System.Text.Json;
 using System.Text.Json.Serialization;
@@ -11,16 +10,22 @@ namespace Volo.Abp.FeatureManagement.JsonConverters
     {
         public override ISelectionStringValueItemSource Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
         {
-            var newOptions = JsonSerializerOptionsHelper.Create(options, this);
-
             var rootElement = JsonDocument.ParseValue(ref reader).RootElement;
-            var items = rootElement.EnumerateObject().FirstOrDefault(x => x.Name.Equals(nameof(ISelectionStringValueItemSource.Items), StringComparison.OrdinalIgnoreCase)).Value.GetRawText();
+            var itemsJsonProperty = rootElement.EnumerateObject().FirstOrDefault(x =>
+                x.Name.Equals(nameof(ISelectionStringValueItemSource.Items), StringComparison.OrdinalIgnoreCase));
+
+            if (itemsJsonProperty.Value.ValueKind == JsonValueKind.Array)
+            {
+                var newOptions = JsonSerializerOptionsHelper.Create(options, this);
+
+                var selectionStringValueItem =
+                    JsonSerializer.Deserialize<LocalizableSelectionStringValueItem[]>(itemsJsonProperty.Value.GetRawText(), newOptions) ??
+                    Array.Empty<LocalizableSelectionStringValueItem>();
 
-            var selectionStringValueItem =
-                JsonSerializer.Deserialize<List<LocalizableSelectionStringValueItem>>(items, newOptions) ??
-                new List<LocalizableSelectionStringValueItem>();
+                return new StaticSelectionStringValueItemSource(selectionStringValueItem.As<ISelectionStringValueItem[]>());
+            }
 
-            return new StaticSelectionStringValueItemSource(selectionStringValueItem.ToArray().As<ISelectionStringValueItem[]>());
+            throw new JsonException($"Can't to get the {nameof(ISelectionStringValueItemSource.Items)} property of {nameof(ISelectionStringValueItemSource)}!");
         }
 
         public override void Write(Utf8JsonWriter writer, ISelectionStringValueItemSource value, JsonSerializerOptions options)

modules/feature-management/src/Volo.Abp.FeatureManagement.Application.Contracts/Volo/Abp/FeatureManagement/JsonConverters/StringValueTypeJsonConverter.cs

@@ -11,15 +11,25 @@ namespace Volo.Abp.FeatureManagement.JsonConverters
         public override IStringValueType Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
         {
             var rootElement = JsonDocument.ParseValue(ref reader).RootElement;
-            var name = rootElement.EnumerateObject().FirstOrDefault(x => x.Name.Equals(nameof(IStringValueType.Name), StringComparison.OrdinalIgnoreCase)).Value.GetString();
-            var newOptions = JsonSerializerOptionsHelper.Create(options, this, new ValueValidatorJsonConverter(), new SelectionStringValueItemSourceJsonConverter());
-            return name switch
+
+            var nameJsonProperty = rootElement.EnumerateObject().FirstOrDefault(x => x.Name.Equals(nameof(IStringValueType.Name), StringComparison.OrdinalIgnoreCase));
+            if (nameJsonProperty.Value.ValueKind == JsonValueKind.String)
             {
-                "SelectionStringValueType" =>  JsonSerializer.Deserialize<SelectionStringValueType>(rootElement.GetRawText(), newOptions),
-                "FreeTextStringValueType" => JsonSerializer.Deserialize<FreeTextStringValueType>(rootElement.GetRawText(), newOptions),
-                "ToggleStringValueType" => JsonSerializer.Deserialize<ToggleStringValueType>(rootElement.GetRawText(), newOptions),
-                _ => throw new ArgumentException($"{nameof(IStringValueType)} named {name} was not found!")
-            };
+                var name = nameJsonProperty.Value.GetString();
+
+                var newOptions = JsonSerializerOptionsHelper.Create(options, this, new ValueValidatorJsonConverter(),
+                    new SelectionStringValueItemSourceJsonConverter());
+
+                return name switch
+                {
+                    "SelectionStringValueType" =>  JsonSerializer.Deserialize<SelectionStringValueType>(rootElement.GetRawText(), newOptions),
+                    "FreeTextStringValueType" => JsonSerializer.Deserialize<FreeTextStringValueType>(rootElement.GetRawText(), newOptions),
+                    "ToggleStringValueType" => JsonSerializer.Deserialize<ToggleStringValueType>(rootElement.GetRawText(), newOptions),
+                    _ => throw new ArgumentException($"{nameof(IStringValueType)} named {name} was not found!")
+                };
+            }
+
+            throw new JsonException($"Can't to get the {nameof(IStringValueType.Name)} property of {nameof(IStringValueType)}!");
         }
 
         public override void Write(Utf8JsonWriter writer, IStringValueType value, JsonSerializerOptions options)

modules/feature-management/src/Volo.Abp.FeatureManagement.Application.Contracts/Volo/Abp/FeatureManagement/JsonConverters/ValueValidatorJsonConverter.cs

@@ -13,21 +13,30 @@ namespace Volo.Abp.FeatureManagement.JsonConverters
         public override IValueValidator Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
         {
             var rootElement = JsonDocument.ParseValue(ref reader).RootElement;
-            var name = rootElement.EnumerateObject().FirstOrDefault(x => x.Name.Equals(nameof(IValueValidator.Name), StringComparison.OrdinalIgnoreCase)).Value.GetString();
-            var valueValidator = CreateValueValidatorByName(name);
 
-            var propertiesRawText = rootElement.EnumerateObject().FirstOrDefault(x => x.Name.Equals(nameof(IValueValidator.Properties), StringComparison.OrdinalIgnoreCase)).Value.GetRawText();
-            var newOptions = JsonSerializerOptionsHelper.Create(options, this, new ObjectToInferredTypesConverter());
-            var properties = JsonSerializer.Deserialize<IDictionary<string, object>>(propertiesRawText, newOptions);
-            if (properties != null && properties.Any())
+            var nameJsonProperty = rootElement.EnumerateObject().FirstOrDefault(x => x.Name.Equals(nameof(IValueValidator.Name), StringComparison.OrdinalIgnoreCase));
+            if (nameJsonProperty.Value.ValueKind == JsonValueKind.String)
             {
-                foreach (var property in properties)
+                var valueValidator = CreateValueValidatorByName(nameJsonProperty.Value.GetString());
+
+                var propertiesJsonProperty = rootElement.EnumerateObject().FirstOrDefault(x => x.Name.Equals(nameof(IValueValidator.Properties), StringComparison.OrdinalIgnoreCase));
+                if (propertiesJsonProperty.Value.ValueKind == JsonValueKind.Object)
                 {
-                    valueValidator.Properties[property.Key] = property.Value;
+                    var newOptions = JsonSerializerOptionsHelper.Create(options, this, new ObjectToInferredTypesConverter());
+                    var properties = JsonSerializer.Deserialize<IDictionary<string, object>>(propertiesJsonProperty.Value.GetRawText(), newOptions);
+                    if (properties != null && properties.Any())
+                    {
+                        foreach (var property in properties)
+                        {
+                            valueValidator.Properties[property.Key] = property.Value;
+                        }
+                    }
                 }
+
+                return valueValidator;
             }
 
-            return valueValidator;
+            throw new JsonException($"Can't to get the {nameof(IValueValidator.Name)} property of {nameof(IValueValidator)}!");
         }
 
         public override void Write(Utf8JsonWriter writer, IValueValidator value, JsonSerializerOptions options)

modules/feature-management/test/Volo.Abp.FeatureManagement.Application.Tests/Volo/Abp/FeatureManagement/StringValueJsonConverter_Tests.cs

@@ -60,6 +60,14 @@ namespace Volo.Abp.FeatureManagement
                                         MinValue = 10
                                     }
                                 }
+                            },
+                            new FeatureDto
+                            {
+                                Provider = new FeatureProviderDto
+                                {
+                                    Name = "FeatureName",
+                                    Key = "FeatureKey"
+                                }
                             }
                         }
                     }
@@ -85,6 +93,9 @@ namespace Volo.Abp.FeatureManagement
             featureListDto2.Groups[0].Features[2].ValueType.Validator.ShouldBeOfType<NumericValueValidator>();
             featureListDto2.Groups[0].Features[2].ValueType.Validator.As<NumericValueValidator>().MaxValue.ShouldBe(1000);
             featureListDto2.Groups[0].Features[2].ValueType.Validator.As<NumericValueValidator>().MinValue.ShouldBe(10);
+
+            featureListDto2.Groups[0].Features[3].Provider.Name.ShouldBe("FeatureName");
+            featureListDto2.Groups[0].Features[3].Provider.Key.ShouldBe("FeatureKey");
         }
     }
 }