Skip to content

Commit

Permalink
Revert "Add JsonMarshal.GetRawUtf8Value (dotnet#104595)"
Browse files Browse the repository at this point in the history 
This reverts commit 635f9af.
  • Loading branch information
@matouskozak
matouskozak committed Jul 11, 2024
1 parent 32ae4c3 commit dfd5dfb
Show file tree
Hide file tree
Showing 4 changed files with 0 additions and 168 deletions.
7 changes: 0 additions & 7 deletions src/libraries/System.Text.Json/ref/System.Text.Json.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,13 +4,6 @@
// Changes to this file must follow the https://aka.ms/api-review process.
// ------------------------------------------------------------------------------

namespace System.Runtime.InteropServices
{
public static partial class JsonMarshal
{
public static System.ReadOnlySpan<byte> GetRawUtf8Value(System.Text.Json.JsonElement element) { throw null; }
}
}
namespace System.Text.Json
{
public enum JsonCommentHandling : byte
Expand Down
1 change: 0 additions & 1 deletion src/libraries/System.Text.Json/src/System.Text.Json.csproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,6 @@ The System.Text.Json library is built-in as part of the shared framework in .NET
<Compile Include="..\Common\JsonUnknownTypeHandling.cs" Link="Common\System\Text\Json\Serialization\JsonUnknownTypeHandling.cs" />
<Compile Include="..\Common\ReflectionExtensions.cs" Link="Common\System\Text\Json\Serialization\ReflectionExtensions.cs" />
<Compile Include="..\Common\ThrowHelper.cs" Link="Common\System\Text\Json\ThrowHelper.cs" />
<Compile Include="System\Runtime\InteropServices\JsonMarshal.cs" />
<Compile Include="System\Text\Json\AppContextSwitchHelper.cs" />
<Compile Include="System\Text\Json\BitStack.cs" />
<Compile Include="System\Text\Json\Document\JsonDocument.cs" />
Expand Down
30 changes: 0 additions & 30 deletions src/libraries/System.Text.Json/src/System/Runtime/InteropServices/JsonMarshal.cs
View file

This file was deleted.

130 changes: 0 additions & 130 deletions src/libraries/System.Text.Json/tests/System.Text.Json.Tests/JsonElementParseTests.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@

using Xunit;
using System.Collections.Generic;
using System.Runtime.InteropServices;

namespace System.Text.Json.Tests
{
Expand Down Expand Up @@ -226,134 +225,5 @@ public static void TryParseValueInvalidDataFail(string json)

Assert.Equal(0, reader.BytesConsumed);
}

[Theory]
[InlineData("null")]
[InlineData("\r\n null ")]
[InlineData("false")]
[InlineData("true ")]
[InlineData(" 42.0 ")]
[InlineData(" \"str\" \r\n")]
[InlineData(" \"string with escaping: \\u0041\\u0042\\u0043\" \r\n")]
[InlineData(" [ ]")]
[InlineData(" [null, true, 42.0, \"str\", [], {}, ]")]
[InlineData(" { } ")]
[InlineData("""
{
/* I am a comment */
"key1" : 1,
"key2" : null,
"key3" : true,
}
""")]
public static void JsonMarshal_GetRawUtf8Value_RootValue_ReturnsFullValue(string json)
{
JsonDocumentOptions options = new JsonDocumentOptions { AllowTrailingCommas = true, CommentHandling = JsonCommentHandling.Skip };
using JsonDocument jDoc = JsonDocument.Parse(json, options);
JsonElement element = jDoc.RootElement;

ReadOnlySpan<byte> rawValue = JsonMarshal.GetRawUtf8Value(element);
Assert.Equal(json.Trim(), Encoding.UTF8.GetString(rawValue.ToArray()));
}

[Fact]
public static void JsonMarshal_GetRawUtf8Value_NestedValues_ReturnsExpectedValue()
{
const string json = """
{
"date": "2021-06-01T00:00:00Z",
"temperatureC": 25,
"summary": "Hot",

/* The next property is a JSON object */

"nested": {
/* This is a nested JSON object */

"nestedDate": "2021-06-01T00:00:00Z",
"nestedTemperatureC": 25,
"nestedSummary": "Hot"
},

/* The next property is a JSON array */

"nestedArray": [
/* This is a JSON array */
{
"nestedDate": "2021-06-01T00:00:00Z",
"nestedTemperatureC": 25,
"nestedSummary": "Hot"
},
]
}
""";

JsonDocumentOptions options = new JsonDocumentOptions { AllowTrailingCommas = true, CommentHandling = JsonCommentHandling.Skip };
using JsonDocument jDoc = JsonDocument.Parse(json, options);
JsonElement element = jDoc.RootElement;

AssertGetRawValue(json, element);
AssertGetRawValue("\"2021-06-01T00:00:00Z\"", element.GetProperty("date"));
AssertGetRawValue("25", element.GetProperty("temperatureC"));
AssertGetRawValue("\"Hot\"", element.GetProperty("summary"));

JsonElement nested = element.GetProperty("nested");
AssertGetRawValue("""
{
/* This is a nested JSON object */

"nestedDate": "2021-06-01T00:00:00Z",
"nestedTemperatureC": 25,
"nestedSummary": "Hot"
}
""", nested);

AssertGetRawValue("\"2021-06-01T00:00:00Z\"", nested.GetProperty("nestedDate"));
AssertGetRawValue("25", nested.GetProperty("nestedTemperatureC"));
AssertGetRawValue("\"Hot\"", nested.GetProperty("nestedSummary"));

JsonElement nestedArray = element.GetProperty("nestedArray");
AssertGetRawValue("""
[
/* This is a JSON array */
{
"nestedDate": "2021-06-01T00:00:00Z",
"nestedTemperatureC": 25,
"nestedSummary": "Hot"
},
]
""", nestedArray);

JsonElement nestedArrayElement = nestedArray[0];
AssertGetRawValue("""
{
"nestedDate": "2021-06-01T00:00:00Z",
"nestedTemperatureC": 25,
"nestedSummary": "Hot"
}
""", nestedArrayElement);

AssertGetRawValue("\"2021-06-01T00:00:00Z\"", nestedArrayElement.GetProperty("nestedDate"));
AssertGetRawValue("25", nestedArrayElement.GetProperty("nestedTemperatureC"));
AssertGetRawValue("\"Hot\"", nestedArrayElement.GetProperty("nestedSummary"));

static void AssertGetRawValue(string expectedJson, JsonElement element)
{
ReadOnlySpan<byte> rawValue = JsonMarshal.GetRawUtf8Value(element);
Assert.Equal(expectedJson.Trim(), Encoding.UTF8.GetString(rawValue.ToArray()));
}
}

[Fact]
public static void JsonMarshal_GetRawUtf8Value_DisposedDocument_ThrowsObjectDisposedException()
{
JsonDocument jDoc = JsonDocument.Parse("{}");
JsonElement element = jDoc.RootElement;
jDoc.Dispose();

Assert.Throws<ObjectDisposedException>(() => JsonMarshal.GetRawUtf8Value(element));
}
}
}

0 comments on commit dfd5dfb

Please sign in to comment.