Skip to content

Commit 9cc5dfb

Browse files
committed
PR feedback
1 parent ed22208 commit 9cc5dfb

File tree

4 files changed

+15
-15
lines changed

4 files changed

+15
-15
lines changed

src/Grpc/JsonTranscoding/src/Microsoft.AspNetCore.Grpc.JsonTranscoding/GrpcJsonSettings.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -39,13 +39,13 @@ public sealed class GrpcJsonSettings
3939
/// </summary>
4040
/// <remarks>
4141
/// <para>
42-
/// The Protobuf JSON specification requires JSON property names to match field names exactly, including case.
42+
/// The Protobuf JSON specification requires JSON property names to match message field names exactly, including case.
4343
/// Enabling this option may reduce interoperability, as case-insensitive field matching might not be supported
4444
/// by other JSON transcoding implementations.
4545
/// </para>
4646
/// <para>
4747
/// For more information, see <see href="https://protobuf.dev/programming-guides/json/"/>.
4848
/// </para>
4949
/// </remarks>
50-
public bool FieldNamesCaseInsensitive { get; set; }
50+
public bool PropertyNameCaseInsensitive { get; set; }
5151
}

src/Grpc/JsonTranscoding/src/Microsoft.AspNetCore.Grpc.JsonTranscoding/Internal/Json/JsonConverterHelper.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ internal static JsonSerializerOptions CreateSerializerOptions(JsonContext contex
4747
NumberHandling = JsonNumberHandling.AllowNamedFloatingPointLiterals,
4848
Encoder = JavaScriptEncoder.UnsafeRelaxedJsonEscaping,
4949
TypeInfoResolver = typeInfoResolver,
50-
PropertyNameCaseInsensitive = context.Settings.FieldNamesCaseInsensitive,
50+
PropertyNameCaseInsensitive = context.Settings.PropertyNameCaseInsensitive,
5151
};
5252
options.Converters.Add(new NullValueConverter());
5353
options.Converters.Add(new ByteStringConverter());
Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
#nullable enable
2-
Microsoft.AspNetCore.Grpc.JsonTranscoding.GrpcJsonSettings.FieldNamesCaseInsensitive.get -> bool
3-
Microsoft.AspNetCore.Grpc.JsonTranscoding.GrpcJsonSettings.FieldNamesCaseInsensitive.set -> void
2+
Microsoft.AspNetCore.Grpc.JsonTranscoding.GrpcJsonSettings.PropertyNameCaseInsensitive.get -> bool
3+
Microsoft.AspNetCore.Grpc.JsonTranscoding.GrpcJsonSettings.PropertyNameCaseInsensitive.set -> void

src/Grpc/JsonTranscoding/test/Microsoft.AspNetCore.Grpc.JsonTranscoding.Tests/ConverterTests/JsonConverterReadTests.cs

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@ public void NonJsonName_CaseInsensitive()
6666
""HIDING_FIELD_NAME"": ""A field name""
6767
}";
6868

69-
var m = AssertReadJson<HelloRequest>(json, serializeOld: false, settings: new GrpcJsonSettings { FieldNamesCaseInsensitive = true });
69+
var m = AssertReadJson<HelloRequest>(json, serializeOld: false, settings: new GrpcJsonSettings { PropertyNameCaseInsensitive = true });
7070
Assert.Equal("A field name", m.HidingFieldName);
7171
}
7272

@@ -77,7 +77,7 @@ public void HidingJsonName_CaseInsensitive()
7777
""FIELD_NAME"": ""A field name""
7878
}";
7979

80-
var m = AssertReadJson<HelloRequest>(json, serializeOld: false, settings: new GrpcJsonSettings { FieldNamesCaseInsensitive = true });
80+
var m = AssertReadJson<HelloRequest>(json, serializeOld: false, settings: new GrpcJsonSettings { PropertyNameCaseInsensitive = true });
8181
Assert.Equal("", m.FieldName);
8282
Assert.Equal("A field name", m.HidingFieldName);
8383
}
@@ -89,7 +89,7 @@ public void JsonCustomizedName_CaseInsensitive()
8989
""JSON_CUSTOMIZED_NAME"": ""A field name""
9090
}";
9191

92-
var m = AssertReadJson<HelloRequest>(json, serializeOld: false, settings: new GrpcJsonSettings { FieldNamesCaseInsensitive = true });
92+
var m = AssertReadJson<HelloRequest>(json, serializeOld: false, settings: new GrpcJsonSettings { PropertyNameCaseInsensitive = true });
9393
Assert.Equal("A field name", m.FieldName);
9494
}
9595

@@ -486,7 +486,7 @@ public void MapMessages_CaseInsensitive()
486486
}
487487
}";
488488

489-
AssertReadJson<HelloRequest>(json, serializeOld: false, settings: new GrpcJsonSettings { FieldNamesCaseInsensitive = true });
489+
AssertReadJson<HelloRequest>(json, serializeOld: false, settings: new GrpcJsonSettings { PropertyNameCaseInsensitive = true });
490490
}
491491

492492
[Fact]
@@ -547,7 +547,7 @@ public void OneOf_CaseInsensitive_Success()
547547
""ONEOFNAME1"": ""test""
548548
}";
549549

550-
AssertReadJson<HelloRequest>(json, serializeOld: false, settings: new GrpcJsonSettings { FieldNamesCaseInsensitive = true });
550+
AssertReadJson<HelloRequest>(json, serializeOld: false, settings: new GrpcJsonSettings { PropertyNameCaseInsensitive = true });
551551
}
552552

553553
[Fact]
@@ -569,7 +569,7 @@ public void OneOf_CaseInsensitive_Failure()
569569
""ONEOFNAME2"": ""test""
570570
}";
571571

572-
AssertReadJsonError<HelloRequest>(json, ex => Assert.Equal("Multiple values specified for oneof oneof_test", ex.Message.TrimEnd('.')), deserializeOld: false, settings: new GrpcJsonSettings { FieldNamesCaseInsensitive = true });
572+
AssertReadJsonError<HelloRequest>(json, ex => Assert.Equal("Multiple values specified for oneof oneof_test", ex.Message.TrimEnd('.')), deserializeOld: false, settings: new GrpcJsonSettings { PropertyNameCaseInsensitive = true });
573573
}
574574

575575
[Fact]
@@ -634,7 +634,7 @@ public void NullableWrappers_CaseInsensitive()
634634
""BYTESVALUE"": ""SGVsbG8gd29ybGQ=""
635635
}";
636636

637-
var result = AssertReadJson<HelloRequest.Types.Wrappers>(json, serializeOld: false, settings: new GrpcJsonSettings { FieldNamesCaseInsensitive = true });
637+
var result = AssertReadJson<HelloRequest.Types.Wrappers>(json, serializeOld: false, settings: new GrpcJsonSettings { PropertyNameCaseInsensitive = true });
638638
Assert.Equal("A string", result.StringValue);
639639
}
640640

@@ -728,7 +728,7 @@ public void JsonNamePriority_CaseInsensitive_JsonName()
728728
{
729729
var json = @"{""B"":10,""A"":20,""D"":30}";
730730

731-
var m = AssertReadJson<Issue047349Message>(json, serializeOld: false, settings: new GrpcJsonSettings { FieldNamesCaseInsensitive = true });
731+
var m = AssertReadJson<Issue047349Message>(json, serializeOld: false, settings: new GrpcJsonSettings { PropertyNameCaseInsensitive = true });
732732

733733
Assert.Equal(10, m.A);
734734
Assert.Equal(20, m.B);
@@ -752,7 +752,7 @@ public void JsonNamePriority_CaseInsensitive_FieldNameFallback()
752752
{
753753
var json = @"{""B"":10,""A"":20,""C"":30}";
754754

755-
var m = AssertReadJson<Issue047349Message>(json, serializeOld: false, settings: new GrpcJsonSettings { FieldNamesCaseInsensitive = true });
755+
var m = AssertReadJson<Issue047349Message>(json, serializeOld: false, settings: new GrpcJsonSettings { PropertyNameCaseInsensitive = true });
756756

757757
Assert.Equal(10, m.A);
758758
Assert.Equal(20, m.B);
@@ -775,7 +775,7 @@ public void FieldNameCase_CaseInsensitive_Failure()
775775
{
776776
var json = @"{""a"":10,""A"":20}";
777777

778-
AssertReadJsonError<FieldNameCaseMessage>(json, ex => Assert.Equal("The JSON property name for 'Transcoding.FieldNameCaseMessage.A' collides with another property.", ex.Message), deserializeOld: false, settings: new GrpcJsonSettings { FieldNamesCaseInsensitive = true });
778+
AssertReadJsonError<FieldNameCaseMessage>(json, ex => Assert.Equal("The JSON property name for 'Transcoding.FieldNameCaseMessage.A' collides with another property.", ex.Message), deserializeOld: false, settings: new GrpcJsonSettings { PropertyNameCaseInsensitive = true });
779779
}
780780

781781
private TValue AssertReadJson<TValue>(string value, GrpcJsonSettings? settings = null, DescriptorRegistry? descriptorRegistry = null, bool serializeOld = true) where TValue : IMessage, new()

0 commit comments

Comments
 (0)