Address review feedback: Add null check in FormatComplexKey and test for JsonPropertyName attributes

Co-authored-by: captainsafia <[email protected]>

Author: Copilot

src/Http/Http.Abstractions/src/Validation/ValidateContext.cs

@@ -134,6 +134,7 @@ private string FormatComplexKey(string key)
         int lastIndex = 0;
         int i = 0;
         bool inBracket = false;
+        var propertyNamingPolicy = SerializerOptions?.PropertyNamingPolicy;
 
         while (i < key.Length)
         {
@@ -145,7 +146,9 @@ private string FormatComplexKey(string key)
                 if (i > lastIndex)
                 {
                     string segment = key.Substring(lastIndex, i - lastIndex);
-                    string formattedSegment = SerializerOptions!.PropertyNamingPolicy!.ConvertName(segment);
+                    string formattedSegment = propertyNamingPolicy != null 
+                        ? propertyNamingPolicy.ConvertName(segment) 
+                        : segment;
                     result.Append(formattedSegment);
                 }
 
@@ -172,7 +175,9 @@ private string FormatComplexKey(string key)
                 if (i > lastIndex)
                 {
                     string segment = key.Substring(lastIndex, i - lastIndex);
-                    string formattedSegment = SerializerOptions!.PropertyNamingPolicy!.ConvertName(segment);
+                    string formattedSegment = propertyNamingPolicy != null 
+                        ? propertyNamingPolicy.ConvertName(segment) 
+                        : segment;
                     result.Append(formattedSegment);
                 }
                 result.Append(c);
@@ -186,9 +191,9 @@ private string FormatComplexKey(string key)
         if (lastIndex < key.Length)
         {
             string segment = key.Substring(lastIndex);
-            if (!inBracket)
+            if (!inBracket && propertyNamingPolicy != null)
             {
-                segment = SerializerOptions!.PropertyNamingPolicy!.ConvertName(segment);
+                segment = propertyNamingPolicy.ConvertName(segment);
             }
             result.Append(segment);
         }

src/Http/Http.Abstractions/test/Validation/ValidatableTypeInfoTests.cs

@@ -857,12 +857,62 @@ private class PersonWithJsonNames
         public string? LastName { get; set; }
     }
 
+[Fact]
+    public async Task Validate_RespectsJsonPropertyNameAttribute_ForValidationErrors()
+    {
+        // Arrange
+        var modelType = new TestValidatableTypeInfo(
+            typeof(ModelWithJsonPropertyNames),
+            [
+                CreatePropertyInfo(typeof(ModelWithJsonPropertyNames), typeof(string), "UserName", "UserName",
+                    [new RequiredAttribute()]),
+                CreatePropertyInfo(typeof(ModelWithJsonPropertyNames), typeof(string), "EmailAddress", "EmailAddress",
+                    [new EmailAddressAttribute()])
+            ]);
+
+        var model = new ModelWithJsonPropertyNames { EmailAddress = "invalid-email" }; // Missing username and invalid email
+
+        var jsonOptions = new JsonSerializerOptions();
+        // Add a custom converter that knows about JsonPropertyName attributes
+        jsonOptions.PropertyNamingPolicy = JsonNamingPolicy.CamelCase;
+
+        var context = new ValidateContext
+        {
+            ValidationOptions = new TestValidationOptions(new Dictionary<Type, ValidatableTypeInfo>
+            {
+                { typeof(ModelWithJsonPropertyNames), modelType }
+            }),
+            ValidationContext = new ValidationContext(model),
+            SerializerOptions = jsonOptions
+        };
+
+        // Act
+        await modelType.ValidateAsync(model, context, default);
+
+        // Assert
+        Assert.NotNull(context.ValidationErrors);
+        Assert.Collection(context.ValidationErrors,
+            kvp => 
+            {
+                // Currently uses camelCase naming policy, not JsonPropertyName
+                Assert.Equal("userName", kvp.Key);
+                Assert.Equal("The UserName field is required.", kvp.Value.First());
+            },
+            kvp => 
+            {
+                // Currently uses camelCase naming policy, not JsonPropertyName
+                Assert.Equal("emailAddress", kvp.Key); 
+                Assert.Equal("The EmailAddress field is not a valid e-mail address.", kvp.Value.First());
+            });
+    }
+
     private class ModelWithJsonPropertyNames
     {
         [JsonPropertyName("username")]
         public string? UserName { get; set; }
 
         [JsonPropertyName("email")]
+        [EmailAddress]
         public string? EmailAddress { get; set; }
     }