Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Use global namespace to resolve System.Text.Json #6822

Merged
merged 3 commits into from
Jan 16, 2024
Merged

Use global namespace to resolve System.Text.Json #6822

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
cd2b250
update null comparison to reference System.Text.Json via global names…
aidy-jenkins Jan 15, 2024
476b0a1
Merge branch 'main' into aidy/fix-6820-strawberry-shake
michaelstaib Jan 16, 2024
952f1cd
updated-lock-files
michaelstaib Jan 16, 2024
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
3,051 changes: 0 additions & 3,051 deletions src/HotChocolate/Core/test/Types.Analyzers.Tests/packages.lock.json
View file
Open in desktop

Large diffs are not rendered by default.

1,604 changes: 0 additions & 1,604 deletions src/HotChocolate/Fusion/test/Shared/packages.lock.json
View file
Open in desktop

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion ...ryShake/CodeGeneration/src/CodeGeneration.CSharp/Generators/JsonResultBuilderGenerator.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -229,7 +229,7 @@ private void AddDeserializeMethod(
// element will be not null, but instead a JSON element of kind JsonValueKind.Null.
var jsonElementNullValueKindCheck = IfBuilder
.New()
.SetCondition($"{_obj}.Value.ValueKind == System.Text.Json.JsonValueKind.Null")
.SetCondition($"{_obj}.Value.ValueKind == global::System.Text.Json.JsonValueKind.Null")
.AddCode(
typeReference.IsNonNull()
? ExceptionBuilder.New(TypeNames.ArgumentNullException)
Expand Down
2 changes: 1 addition & 1 deletion .../test/CodeGeneration.CSharp.Tests/Integration/AnyScalarDefaultSerializationTest.Client.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -383,7 +383,7 @@ public GetJsonBuilder(global::StrawberryShake.IEntityStore entityStore, global::
throw new global::System.ArgumentNullException();
}

if (obj.Value.ValueKind == System.Text.Json.JsonValueKind.Null)
if (obj.Value.ValueKind == global::System.Text.Json.JsonValueKind.Null)
{
throw new global::System.ArgumentNullException();
}
Expand Down
6 changes: 3 additions & 3 deletions .../CodeGeneration/test/CodeGeneration.CSharp.Tests/Integration/EntityIdOrDataTest.Client.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -864,7 +864,7 @@ public GetFooBuilder(global::StrawberryShake.IEntityStore entityStore, global::S
return null;
}

if (obj.Value.ValueKind == System.Text.Json.JsonValueKind.Null)
if (obj.Value.ValueKind == global::System.Text.Json.JsonValueKind.Null)
{
return null;
}
Expand All @@ -885,7 +885,7 @@ public GetFooBuilder(global::StrawberryShake.IEntityStore entityStore, global::S
return null;
}

if (obj.Value.ValueKind == System.Text.Json.JsonValueKind.Null)
if (obj.Value.ValueKind == global::System.Text.Json.JsonValueKind.Null)
{
return null;
}
Expand Down Expand Up @@ -947,7 +947,7 @@ public GetFooBuilder(global::StrawberryShake.IEntityStore entityStore, global::S
return null;
}

if (obj.Value.ValueKind == System.Text.Json.JsonValueKind.Null)
if (obj.Value.ValueKind == global::System.Text.Json.JsonValueKind.Null)
{
return null;
}
Expand Down
24 changes: 12 additions & 12 deletions ...ke/CodeGeneration/test/CodeGeneration.CSharp.Tests/Integration/MultiProfileTest.Client.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1905,7 +1905,7 @@ public GetHeroBuilder(global::StrawberryShake.IEntityStore entityStore, global::
return null;
}

if (obj.Value.ValueKind == System.Text.Json.JsonValueKind.Null)
if (obj.Value.ValueKind == global::System.Text.Json.JsonValueKind.Null)
{
return null;
}
Expand Down Expand Up @@ -1950,7 +1950,7 @@ public GetHeroBuilder(global::StrawberryShake.IEntityStore entityStore, global::
throw new global::System.ArgumentNullException();
}

if (obj.Value.ValueKind == System.Text.Json.JsonValueKind.Null)
if (obj.Value.ValueKind == global::System.Text.Json.JsonValueKind.Null)
{
throw new global::System.ArgumentNullException();
}
Expand All @@ -1965,7 +1965,7 @@ public GetHeroBuilder(global::StrawberryShake.IEntityStore entityStore, global::
return null;
}

if (obj.Value.ValueKind == System.Text.Json.JsonValueKind.Null)
if (obj.Value.ValueKind == global::System.Text.Json.JsonValueKind.Null)
{
return null;
}
Expand All @@ -1986,7 +1986,7 @@ public GetHeroBuilder(global::StrawberryShake.IEntityStore entityStore, global::
return null;
}

if (obj.Value.ValueKind == System.Text.Json.JsonValueKind.Null)
if (obj.Value.ValueKind == global::System.Text.Json.JsonValueKind.Null)
{
return null;
}
Expand All @@ -2007,7 +2007,7 @@ public GetHeroBuilder(global::StrawberryShake.IEntityStore entityStore, global::
return null;
}

if (obj.Value.ValueKind == System.Text.Json.JsonValueKind.Null)
if (obj.Value.ValueKind == global::System.Text.Json.JsonValueKind.Null)
{
return null;
}
Expand Down Expand Up @@ -2083,7 +2083,7 @@ public OnReviewSubBuilder(global::StrawberryShake.IEntityStore entityStore, glob
throw new global::System.ArgumentNullException();
}

if (obj.Value.ValueKind == System.Text.Json.JsonValueKind.Null)
if (obj.Value.ValueKind == global::System.Text.Json.JsonValueKind.Null)
{
throw new global::System.ArgumentNullException();
}
Expand All @@ -2104,7 +2104,7 @@ public OnReviewSubBuilder(global::StrawberryShake.IEntityStore entityStore, glob
throw new global::System.ArgumentNullException();
}

if (obj.Value.ValueKind == System.Text.Json.JsonValueKind.Null)
if (obj.Value.ValueKind == global::System.Text.Json.JsonValueKind.Null)
{
throw new global::System.ArgumentNullException();
}
Expand All @@ -2119,7 +2119,7 @@ public OnReviewSubBuilder(global::StrawberryShake.IEntityStore entityStore, glob
throw new global::System.ArgumentNullException();
}

if (obj.Value.ValueKind == System.Text.Json.JsonValueKind.Null)
if (obj.Value.ValueKind == global::System.Text.Json.JsonValueKind.Null)
{
throw new global::System.ArgumentNullException();
}
Expand All @@ -2134,7 +2134,7 @@ public OnReviewSubBuilder(global::StrawberryShake.IEntityStore entityStore, glob
return null;
}

if (obj.Value.ValueKind == System.Text.Json.JsonValueKind.Null)
if (obj.Value.ValueKind == global::System.Text.Json.JsonValueKind.Null)
{
return null;
}
Expand Down Expand Up @@ -2182,7 +2182,7 @@ public CreateReviewMutBuilder(global::StrawberryShake.IEntityStore entityStore,
throw new global::System.ArgumentNullException();
}

if (obj.Value.ValueKind == System.Text.Json.JsonValueKind.Null)
if (obj.Value.ValueKind == global::System.Text.Json.JsonValueKind.Null)
{
throw new global::System.ArgumentNullException();
}
Expand All @@ -2203,7 +2203,7 @@ public CreateReviewMutBuilder(global::StrawberryShake.IEntityStore entityStore,
throw new global::System.ArgumentNullException();
}

if (obj.Value.ValueKind == System.Text.Json.JsonValueKind.Null)
if (obj.Value.ValueKind == global::System.Text.Json.JsonValueKind.Null)
{
throw new global::System.ArgumentNullException();
}
Expand All @@ -2218,7 +2218,7 @@ public CreateReviewMutBuilder(global::StrawberryShake.IEntityStore entityStore,
return null;
}

if (obj.Value.ValueKind == System.Text.Json.JsonValueKind.Null)
if (obj.Value.ValueKind == global::System.Text.Json.JsonValueKind.Null)
{
return null;
}
Expand Down
10 changes: 5 additions & 5 deletions .../test/CodeGeneration.CSharp.Tests/Integration/StarWarsGetFriendsDeferInListTest.Client.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1018,7 +1018,7 @@ public GetHeroBuilder(global::StrawberryShake.IEntityStore entityStore, global::
return null;
}

if (obj.Value.ValueKind == System.Text.Json.JsonValueKind.Null)
if (obj.Value.ValueKind == global::System.Text.Json.JsonValueKind.Null)
{
return null;
}
Expand Down Expand Up @@ -1063,7 +1063,7 @@ public GetHeroBuilder(global::StrawberryShake.IEntityStore entityStore, global::
return null;
}

if (obj.Value.ValueKind == System.Text.Json.JsonValueKind.Null)
if (obj.Value.ValueKind == global::System.Text.Json.JsonValueKind.Null)
{
return null;
}
Expand All @@ -1084,7 +1084,7 @@ public GetHeroBuilder(global::StrawberryShake.IEntityStore entityStore, global::
return null;
}

if (obj.Value.ValueKind == System.Text.Json.JsonValueKind.Null)
if (obj.Value.ValueKind == global::System.Text.Json.JsonValueKind.Null)
{
return null;
}
Expand All @@ -1105,7 +1105,7 @@ public GetHeroBuilder(global::StrawberryShake.IEntityStore entityStore, global::
return null;
}

if (obj.Value.ValueKind == System.Text.Json.JsonValueKind.Null)
if (obj.Value.ValueKind == global::System.Text.Json.JsonValueKind.Null)
{
return null;
}
Expand Down Expand Up @@ -1150,7 +1150,7 @@ public GetHeroBuilder(global::StrawberryShake.IEntityStore entityStore, global::
return null;
}

if (obj.Value.ValueKind == System.Text.Json.JsonValueKind.Null)
if (obj.Value.ValueKind == global::System.Text.Json.JsonValueKind.Null)
{
return null;
}
Expand Down
10 changes: 5 additions & 5 deletions ...ion/test/CodeGeneration.CSharp.Tests/Integration/StarWarsGetFriendsDeferredTest.Client.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1027,7 +1027,7 @@ public GetHeroBuilder(global::StrawberryShake.IEntityStore entityStore, global::
return null;
}

if (obj.Value.ValueKind == System.Text.Json.JsonValueKind.Null)
if (obj.Value.ValueKind == global::System.Text.Json.JsonValueKind.Null)
{
return null;
}
Expand Down Expand Up @@ -1072,7 +1072,7 @@ public GetHeroBuilder(global::StrawberryShake.IEntityStore entityStore, global::
throw new global::System.ArgumentNullException();
}

if (obj.Value.ValueKind == System.Text.Json.JsonValueKind.Null)
if (obj.Value.ValueKind == global::System.Text.Json.JsonValueKind.Null)
{
throw new global::System.ArgumentNullException();
}
Expand All @@ -1087,7 +1087,7 @@ public GetHeroBuilder(global::StrawberryShake.IEntityStore entityStore, global::
return null;
}

if (obj.Value.ValueKind == System.Text.Json.JsonValueKind.Null)
if (obj.Value.ValueKind == global::System.Text.Json.JsonValueKind.Null)
{
return null;
}
Expand All @@ -1108,7 +1108,7 @@ public GetHeroBuilder(global::StrawberryShake.IEntityStore entityStore, global::
return null;
}

if (obj.Value.ValueKind == System.Text.Json.JsonValueKind.Null)
if (obj.Value.ValueKind == global::System.Text.Json.JsonValueKind.Null)
{
return null;
}
Expand All @@ -1129,7 +1129,7 @@ public GetHeroBuilder(global::StrawberryShake.IEntityStore entityStore, global::
return null;
}

if (obj.Value.ValueKind == System.Text.Json.JsonValueKind.Null)
if (obj.Value.ValueKind == global::System.Text.Json.JsonValueKind.Null)
{
return null;
}
Expand Down
8 changes: 4 additions & 4 deletions ...tion/test/CodeGeneration.CSharp.Tests/Integration/StarWarsGetFriendsNoStoreTest.Client.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -881,7 +881,7 @@ public GetHeroBuilder(global::StrawberryShake.IOperationResultDataFactory<global
return null;
}

if (obj.Value.ValueKind == System.Text.Json.JsonValueKind.Null)
if (obj.Value.ValueKind == global::System.Text.Json.JsonValueKind.Null)
{
return null;
}
Expand All @@ -907,7 +907,7 @@ public GetHeroBuilder(global::StrawberryShake.IOperationResultDataFactory<global
throw new global::System.ArgumentNullException();
}

if (obj.Value.ValueKind == System.Text.Json.JsonValueKind.Null)
if (obj.Value.ValueKind == global::System.Text.Json.JsonValueKind.Null)
{
throw new global::System.ArgumentNullException();
}
Expand All @@ -922,7 +922,7 @@ public GetHeroBuilder(global::StrawberryShake.IOperationResultDataFactory<global
return null;
}

if (obj.Value.ValueKind == System.Text.Json.JsonValueKind.Null)
if (obj.Value.ValueKind == global::System.Text.Json.JsonValueKind.Null)
{
return null;
}
Expand All @@ -943,7 +943,7 @@ public GetHeroBuilder(global::StrawberryShake.IOperationResultDataFactory<global
return null;
}

if (obj.Value.ValueKind == System.Text.Json.JsonValueKind.Null)
if (obj.Value.ValueKind == global::System.Text.Json.JsonValueKind.Null)
{
return null;
}
Expand Down
10 changes: 5 additions & 5 deletions ...eGeneration/test/CodeGeneration.CSharp.Tests/Integration/StarWarsGetFriendsTest.Client.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -917,7 +917,7 @@ public GetHeroBuilder(global::StrawberryShake.IEntityStore entityStore, global::
return null;
}

if (obj.Value.ValueKind == System.Text.Json.JsonValueKind.Null)
if (obj.Value.ValueKind == global::System.Text.Json.JsonValueKind.Null)
{
return null;
}
Expand Down Expand Up @@ -962,7 +962,7 @@ public GetHeroBuilder(global::StrawberryShake.IEntityStore entityStore, global::
throw new global::System.ArgumentNullException();
}

if (obj.Value.ValueKind == System.Text.Json.JsonValueKind.Null)
if (obj.Value.ValueKind == global::System.Text.Json.JsonValueKind.Null)
{
throw new global::System.ArgumentNullException();
}
Expand All @@ -977,7 +977,7 @@ public GetHeroBuilder(global::StrawberryShake.IEntityStore entityStore, global::
return null;
}

if (obj.Value.ValueKind == System.Text.Json.JsonValueKind.Null)
if (obj.Value.ValueKind == global::System.Text.Json.JsonValueKind.Null)
{
return null;
}
Expand All @@ -998,7 +998,7 @@ public GetHeroBuilder(global::StrawberryShake.IEntityStore entityStore, global::
return null;
}

if (obj.Value.ValueKind == System.Text.Json.JsonValueKind.Null)
if (obj.Value.ValueKind == global::System.Text.Json.JsonValueKind.Null)
{
return null;
}
Expand All @@ -1019,7 +1019,7 @@ public GetHeroBuilder(global::StrawberryShake.IEntityStore entityStore, global::
return null;
}

if (obj.Value.ValueKind == System.Text.Json.JsonValueKind.Null)
if (obj.Value.ValueKind == global::System.Text.Json.JsonValueKind.Null)
{
return null;
}
Expand Down
4 changes: 2 additions & 2 deletions ...CodeGeneration/test/CodeGeneration.CSharp.Tests/Integration/StarWarsGetHeroTest.Client.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -609,7 +609,7 @@ public GetHeroBuilder(global::StrawberryShake.IEntityStore entityStore, global::
return null;
}

if (obj.Value.ValueKind == System.Text.Json.JsonValueKind.Null)
if (obj.Value.ValueKind == global::System.Text.Json.JsonValueKind.Null)
{
return null;
}
Expand Down Expand Up @@ -654,7 +654,7 @@ public GetHeroBuilder(global::StrawberryShake.IEntityStore entityStore, global::
throw new global::System.ArgumentNullException();
}

if (obj.Value.ValueKind == System.Text.Json.JsonValueKind.Null)
if (obj.Value.ValueKind == global::System.Text.Json.JsonValueKind.Null)
{
throw new global::System.ArgumentNullException();
}
Expand Down
6 changes: 3 additions & 3 deletions ...neration/test/CodeGeneration.CSharp.Tests/Integration/StarWarsGetHeroTraitsTest.Client.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -639,7 +639,7 @@ public GetHeroBuilder(global::StrawberryShake.IEntityStore entityStore, global::
return null;
}

if (obj.Value.ValueKind == System.Text.Json.JsonValueKind.Null)
if (obj.Value.ValueKind == global::System.Text.Json.JsonValueKind.Null)
{
return null;
}
Expand Down Expand Up @@ -684,7 +684,7 @@ public GetHeroBuilder(global::StrawberryShake.IEntityStore entityStore, global::
throw new global::System.ArgumentNullException();
}

if (obj.Value.ValueKind == System.Text.Json.JsonValueKind.Null)
if (obj.Value.ValueKind == global::System.Text.Json.JsonValueKind.Null)
{
throw new global::System.ArgumentNullException();
}
Expand All @@ -699,7 +699,7 @@ public GetHeroBuilder(global::StrawberryShake.IEntityStore entityStore, global::
return null;
}

if (obj.Value.ValueKind == System.Text.Json.JsonValueKind.Null)
if (obj.Value.ValueKind == global::System.Text.Json.JsonValueKind.Null)
{
return null;
}
Expand Down
Loading
Loading