Compare commits

..

No commits in common. "HEAD" and "2.0.0" have entirely different histories.

4 changed files with 1 additions and 60 deletions

View file

@ -41,8 +41,6 @@ To have a consistent experience across all packages, some public interfaces have
### Added ### Added
- **request.validation:** Support `PropertyPath` JSON converter for string values and dictionary property names
### Changed ### Changed
### Removed ### Removed

View file

@ -9,8 +9,7 @@
</PropertyGroup> </PropertyGroup>
<PropertyGroup> <PropertyGroup>
<VersionPrefix>2.1.0</VersionPrefix> <VersionPrefix>2.0.0</VersionPrefix>
<VersionSuffix>preview</VersionSuffix>
</PropertyGroup> </PropertyGroup>
<PropertyGroup> <PropertyGroup>

View file

@ -12,19 +12,6 @@ internal sealed class PropertyPathTests
PropertyNamingPolicy = JsonNamingPolicy.CamelCase, PropertyNamingPolicy = JsonNamingPolicy.CamelCase,
}; };
private static readonly JsonSerializerOptions CamelCaseDictionaryKeyJsonOptions = new()
{
DictionaryKeyPolicy = JsonNamingPolicy.CamelCase,
};
[Test]
public async Task I_can_serialize_property_paths_as_json_strings_using_the_json_naming_policy()
{
var json = JsonSerializer.Serialize((PropertyPath)"Address.Street", CamelCaseJsonOptions);
await Assert.That(json).IsEqualTo(/*lang=json,strict*/ "\"address.street\"");
}
[Test] [Test]
public async Task I_can_serialize_property_paths_using_the_json_naming_policy() public async Task I_can_serialize_property_paths_using_the_json_naming_policy()
{ {
@ -67,32 +54,6 @@ internal sealed class PropertyPathTests
await Assert.That(json).IsEqualTo(/*lang=json,strict*/ """{"propertyPath":"matrix[1][2].value","severity":0,"message":"Value is required.","code":null,"attemptedValue":null}"""); await Assert.That(json).IsEqualTo(/*lang=json,strict*/ """{"propertyPath":"matrix[1][2].value","severity":0,"message":"Value is required.","code":null,"attemptedValue":null}""");
} }
[Test]
public async Task I_can_serialize_property_paths_as_dictionary_keys_using_the_dictionary_key_policy()
{
Dictionary<PropertyPath, string> errors = new()
{
["Address.Street"] = "Street is required.",
};
var json = JsonSerializer.Serialize(errors, CamelCaseDictionaryKeyJsonOptions);
await Assert.That(json).IsEqualTo(/*lang=json,strict*/ """{"address.street":"Street is required."}""");
}
[Test]
public async Task I_can_deserialize_property_paths_from_dictionary_keys()
{
var json = /*lang=json,strict*/ """{"Address.Street":"Street is required."}""";
var errors = JsonSerializer.Deserialize<Dictionary<PropertyPath, string>>(json);
await Assert.That(errors).IsNotNull();
await Assert.That(errors!.Count).IsEqualTo(1);
await Assert.That(errors.ContainsKey("Address.Street")).IsTrue();
await Assert.That(errors["Address.Street"]).IsEqualTo("Street is required.");
}
[Test] [Test]
public async Task I_can_iterate_and_index_segments() public async Task I_can_iterate_and_index_segments()
{ {

View file

@ -399,26 +399,9 @@ internal sealed class PropertyPathJsonConverter : JsonConverter<PropertyPath>
throw new JsonException($"Expected {nameof(JsonTokenType.String)} but got {reader.TokenType}."); throw new JsonException($"Expected {nameof(JsonTokenType.String)} but got {reader.TokenType}.");
} }
/// <inheritdoc />
public override PropertyPath ReadAsPropertyName(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
{
if (reader.TokenType is JsonTokenType.PropertyName)
{
return new PropertyPath(reader.GetString()!);
}
throw new JsonException($"Expected {nameof(JsonTokenType.PropertyName)} but got {reader.TokenType}.");
}
/// <inheritdoc /> /// <inheritdoc />
public override void Write(Utf8JsonWriter writer, PropertyPath value, JsonSerializerOptions options) public override void Write(Utf8JsonWriter writer, PropertyPath value, JsonSerializerOptions options)
{ {
writer.WriteStringValue(value.ToJsonName(options.PropertyNamingPolicy)); writer.WriteStringValue(value.ToJsonName(options.PropertyNamingPolicy));
} }
/// <inheritdoc />
public override void WriteAsPropertyName(Utf8JsonWriter writer, PropertyPath value, JsonSerializerOptions options)
{
writer.WritePropertyName(value.ToJsonName(options.DictionaryKeyPolicy));
}
} }