Skip to content
Closed
Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
26 commits
Select commit Hold shift + click to select a range
c870c41
Initial commit,...
jgonz120 Nov 3, 2023
9083583
Finshed up moving all the objects to use STJ
jgonz120 Nov 6, 2023
49541e0
Added a really long unit test but then just validated using other uni…
jgonz120 Nov 8, 2023
4d1fe5b
Went through the lock file converters, using Utf8JsonReaderExtensions
jgonz120 Nov 8, 2023
a1af274
Seperated the STJ logic from the JsonPackageSpec reader
jgonz120 Nov 9, 2023
39fffa5
Small optimizations
jgonz120 Nov 10, 2023
da7d17c
Split the JsonPackageReader, added obsolete and surpressed in tests
jgonz120 Nov 10, 2023
9f9738f
Changes to get unit tests working for exceptions
jgonz120 Nov 13, 2023
d3d9f32
merge
jgonz120 Nov 13, 2023
0e02fe1
Updated Package reader with new field
jgonz120 Nov 13, 2023
8422e96
Updated exception unit test
jgonz120 Nov 14, 2023
a5fdf9a
Fix unit tests wrt to exceptions
jgonz120 Nov 14, 2023
57813dd
Implemented deserialization with memory stream
jgonz120 Nov 16, 2023
1cb4fd3
Updated tests to work with new streaming logic
jgonz120 Nov 16, 2023
08b36d1
Update tests to use double quotes instead of single quotes for json
jgonz120 Nov 20, 2023
6e3a887
Additonal single quote removals
jgonz120 Nov 20, 2023
1dc7682
Fix another test that uses single quotes
jgonz120 Nov 21, 2023
e62dcfe
Added unit tests and renamed some functions
jgonz120 Nov 21, 2023
5cd4486
Arrange files
jgonz120 Nov 21, 2023
e1d989d
Rename StreamingUtf8JsonReader to Utf8JsonStreamReader
jgonz120 Nov 21, 2023
68c2021
change classes to no longer implement converter
jgonz120 Nov 22, 2023
3ab5dd4
Added environment variable check
jgonz120 Nov 22, 2023
d0fa9ca
updated comments
jgonz120 Nov 22, 2023
20658a6
merge with dev
jgonz120 Dec 4, 2023
9df9654
Remove the floating package version
jgonz120 Dec 4, 2023
3895c46
removed unused references
jgonz120 Dec 4, 2023
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Rename StreamingUtf8JsonReader to Utf8JsonStreamReader
  • Loading branch information
jgonz120 committed Nov 21, 2023
commit e1d989d6ed93d9c3c2d7be399c08778a8d9e503f
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ public static PackageSpec GetPackageSpec(JObject json)

public static PackageSpec GetPackageSpec(Stream stream, string name, string packageSpecPath, string snapshotValue)
{
return StreamingUtf8JsonPackageSpecReader.GetPackageSpec(stream, name, packageSpecPath, snapshotValue);
return Utf8JsonPackageSpecStreamReader.GetPackageSpec(stream, name, packageSpecPath, snapshotValue);
}

[Obsolete("This method is obsolete and will be removed in a future release.")]
Expand Down
2 changes: 1 addition & 1 deletion src/NuGet.Core/NuGet.ProjectModel/JsonUtility.cs
Original file line number Diff line number Diff line change
Expand Up @@ -77,7 +77,7 @@ internal static async Task<T> LoadJsonAsync<T>(Stream stream)

internal static T LoadJson<T>(Stream stream)
{
var streamingJsonReader = new StreamingUtf8JsonReader(stream);
var streamingJsonReader = new Utf8JsonStreamReader(stream);
var options = CreateJsonSerializerOptions();
var objectConverter = (StreamableJsonConverter<T>)options.GetConverter(typeof(T));
return objectConverter.ReadWithStream(ref streamingJsonReader, options);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -133,7 +133,7 @@ public override AssetsLogMessage Read(ref Utf8JsonReader reader, Type typeToConv
return null;
}

public override AssetsLogMessage ReadWithStream(ref StreamingUtf8JsonReader reader, JsonSerializerOptions options)
public override AssetsLogMessage ReadWithStream(ref Utf8JsonStreamReader reader, JsonSerializerOptions options)
{
if (reader.TokenType != JsonTokenType.StartObject)
{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -127,7 +127,7 @@ public override LockFile Read(ref Utf8JsonReader reader, Type typeToConvert, Jso
return lockFile;
}

public override LockFile ReadWithStream(ref StreamingUtf8JsonReader reader, JsonSerializerOptions options)
public override LockFile ReadWithStream(ref Utf8JsonStreamReader reader, JsonSerializerOptions options)
{
if (reader.TokenType != JsonTokenType.StartObject)
{
Expand Down Expand Up @@ -173,7 +173,7 @@ public override LockFile ReadWithStream(ref StreamingUtf8JsonReader reader, Json
else if (reader.ValueTextEquals(Utf8Project))
{
reader.Read();
lockFile.PackageSpec = StreamingUtf8JsonPackageSpecReader.GetPackageSpec(
lockFile.PackageSpec = Utf8JsonPackageSpecStreamReader.GetPackageSpec(
ref reader,
name: null,
packageSpecPath: null,
Expand All @@ -190,7 +190,7 @@ public override LockFile ReadWithStream(ref StreamingUtf8JsonReader reader, Json
NuGetFramework framework = NuGetFramework.Parse(frameworkPropertyName);
var dependencies = new List<LibraryDependency>();

StreamingUtf8JsonPackageSpecReader.ReadCentralTransitiveDependencyGroup(
Utf8JsonPackageSpecStreamReader.ReadCentralTransitiveDependencyGroup(
jsonReader: ref reader,
results: dependencies,
packageSpecPath: string.Empty);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@ public override T Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerial
return lockFileItem as T;
}

public override T ReadWithStream(ref StreamingUtf8JsonReader reader, JsonSerializerOptions options)
public override T ReadWithStream(ref Utf8JsonStreamReader reader, JsonSerializerOptions options)
{
var genericType = typeof(T);

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -91,7 +91,7 @@ public override LockFileLibrary Read(ref Utf8JsonReader reader, Type typeToConve
return lockFileLibrary;
}

public override LockFileLibrary ReadWithStream(ref StreamingUtf8JsonReader reader, JsonSerializerOptions options)
public override LockFileLibrary ReadWithStream(ref Utf8JsonStreamReader reader, JsonSerializerOptions options)
{

if (reader.TokenType != JsonTokenType.PropertyName)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ public override LockFileTarget Read(ref Utf8JsonReader reader, Type typeToConver
return lockFileTarget;
}

public override LockFileTarget ReadWithStream(ref StreamingUtf8JsonReader reader, JsonSerializerOptions options)
public override LockFileTarget ReadWithStream(ref Utf8JsonStreamReader reader, JsonSerializerOptions options)
{
if (reader.TokenType != JsonTokenType.PropertyName)
{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -210,7 +210,7 @@ private IList<PackageDependency> ReadPackageDependencyList(ref Utf8JsonReader re
}


private IList<PackageDependency> ReadPackageDependencyList(ref StreamingUtf8JsonReader reader)
private IList<PackageDependency> ReadPackageDependencyList(ref Utf8JsonStreamReader reader)
{
if (reader.TokenType != JsonTokenType.StartObject)
{
Expand All @@ -236,7 +236,7 @@ public override void Write(Utf8JsonWriter writer, LockFileTargetLibrary value, J
throw new NotImplementedException();
}

public override LockFileTargetLibrary ReadWithStream(ref StreamingUtf8JsonReader reader, JsonSerializerOptions options)
public override LockFileTargetLibrary ReadWithStream(ref Utf8JsonStreamReader reader, JsonSerializerOptions options)
{
if (reader.TokenType != JsonTokenType.PropertyName)
{
Expand Down
4 changes: 2 additions & 2 deletions src/NuGet.Core/NuGet.ProjectModel/PackageSpecConverter.cs
Original file line number Diff line number Diff line change
Expand Up @@ -16,9 +16,9 @@ public override PackageSpec Read(ref Utf8JsonReader reader, Type typeToConvert,
return StjPackageSpecReader.GetPackageSpec(ref reader, options, name: null, packageSpecPath: null, snapshotValue: null);
}

public override PackageSpec ReadWithStream(ref StreamingUtf8JsonReader reader, JsonSerializerOptions options)
public override PackageSpec ReadWithStream(ref Utf8JsonStreamReader reader, JsonSerializerOptions options)
{
return StreamingUtf8JsonPackageSpecReader.GetPackageSpec(ref reader, name: null, packageSpecPath: null, snapshotValue: null);
return Utf8JsonPackageSpecStreamReader.GetPackageSpec(ref reader, name: null, packageSpecPath: null, snapshotValue: null);
}

public override void Write(Utf8JsonWriter writer, PackageSpec value, JsonSerializerOptions options)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ public override ProjectFileDependencyGroup Read(ref Utf8JsonReader reader, Type
return new ProjectFileDependencyGroup(frameworkName, dependencies);
}

public override ProjectFileDependencyGroup ReadWithStream(ref StreamingUtf8JsonReader reader, JsonSerializerOptions options)
public override ProjectFileDependencyGroup ReadWithStream(ref Utf8JsonStreamReader reader, JsonSerializerOptions options)
{
if (reader.TokenType != JsonTokenType.PropertyName)
{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,6 @@ namespace NuGet.ProjectModel
{
internal abstract class StreamableJsonConverter<T> : JsonConverter<T>
{
public abstract T ReadWithStream(ref StreamingUtf8JsonReader reader, JsonSerializerOptions options);
public abstract T ReadWithStream(ref Utf8JsonStreamReader reader, JsonSerializerOptions options);
}
}
Loading