From 9cfa1d11c01ac19d0c09513e3f3d82dcde9965dd Mon Sep 17 00:00:00 2001 From: Michael Staib Date: Fri, 18 Feb 2022 10:22:23 +0100 Subject: [PATCH] Reworked code generation for better compatibility with classic .NET (#4768) --- .../src/Core/FetchOnceDataLoader.cs | 1 - .../Generators/OperationDocumentGenerator.cs | 6 ++-- ...nyScalarDefaultSerializationTest.Client.cs | 6 ++-- .../Integration/EntityIdOrDataTest.Client.cs | 6 ++-- .../Integration/MultiProfileTest.Client.cs | 18 +++++------ .../StarWarsGetFriendsNoStoreTest.Client.cs | 6 ++-- .../StarWarsGetFriendsTest.Client.cs | 6 ++-- .../Integration/StarWarsGetHeroTest.Client.cs | 6 ++-- .../StarWarsIntrospectionTest.Client.cs | 6 ++-- ...StarWarsTypeNameOnInterfacesTest.Client.cs | 6 ++-- .../StarWarsTypeNameOnUnionsTest.Client.cs | 6 ++-- .../StarWarsUnionListTest.Client.cs | 6 ++-- ...ectionGeneratorTests.Default_Combined.snap | 18 +++++------ ...sts.Default_DifferentTransportMethods.snap | 18 +++++------ ...ectionGeneratorTests.Default_InMemory.snap | 18 +++++------ ...onGeneratorTests.Default_MultiProfile.snap | 18 +++++------ ...ectionGeneratorTests.Default_Mutation.snap | 6 ++-- ...InjectionGeneratorTests.Default_Query.snap | 6 ++-- ...onGeneratorTests.Default_Subscription.snap | 6 ++-- ...ookClient_DataInEntity_UnionDataTypes.snap | 6 ++-- ...aInEntity_UnionDataTypes_With_Records.snap | 6 ++-- ...ookClient_DataOnly_InterfaceDataTypes.snap | 6 ++-- ...aOnly_InterfaceDataTypes_With_Records.snap | 6 ++-- ...te_BookClient_DataOnly_UnionDataTypes.snap | 6 ++-- ..._DataOnly_UnionDataTypes_With_Records.snap | 6 ++-- ...rate_ChatClient_ConnectionNotAnEntity.snap | 6 ++-- ...nt_ConnectionNotAnEntity_With_Records.snap | 6 ++-- ...lient_MapperMapsEntityOnRootCorrectly.snap | 12 ++++---- ...apsEntityOnRootCorrectly_With_Records.snap | 12 ++++---- ...ryGeneratorTests.Simple_ComplexEntity.snap | 6 ++-- ...torTests.Simple_DateTimeOffset_Entity.snap | 6 ++-- ...FactoryGeneratorTests.Simple_IdEntity.snap | 6 ++-- ...FactoryGeneratorTests.Simple_NoEntity.snap | 6 ++-- ...toryGeneratorTests.Simple_Uuid_Entity.snap | 6 ++-- ...tityOrIdGeneratorTests.InterfaceField.snap | 6 ++-- ...ntityOrIdGeneratorTests.InterfaceList.snap | 6 ++-- ...GeneratorTests.NonNullableValueTypeId.snap | 6 ++-- .../EntityOrIdGeneratorTests.UnionField.snap | 6 ++-- .../EntityOrIdGeneratorTests.UnionList.snap | 6 ++-- ...yOrIdGeneratorTests.UnionListInEntity.snap | 6 ++-- ...dGeneratorTests.UnionWithNestedObject.snap | 6 ++-- ....Generate_ChatClient_InvalidNullCheck.snap | 6 ++-- ...ErrorGeneratorTests.Generate_NoErrors.snap | 6 ++-- ...pe_Fields_Are_Inspected_For_LeafTypes.snap | 6 ++-- ...InputGeneratorTests.KeywordCollisions.snap | 6 ++-- ...eneratorTests.Operation_With_Comments.snap | 6 ++-- ...tion_With_Comments_With_Input_Records.snap | 6 ++-- ...ests.Operation_With_Complex_Arguments.snap | 6 ++-- ...ests.Generate_StarWarsIntegrationTest.snap | 12 ++++---- ...torTests.Interface_With_Default_Names.snap | 6 ++-- ...e_With_Fragment_Definition_Two_Models.snap | 6 ++-- ...torTests.Operation_With_Leaf_Argument.snap | 6 ++-- ...torTests.Operation_With_Type_Argument.snap | 6 ++-- ...neratorTests.StarWarsTypeNameOnUnions.snap | 6 ++-- ...rWarsGeneratorTests.StarWarsUnionList.snap | 6 ++-- ...Tests.Subscription_With_Default_Names.snap | 6 ++-- ...sts.Generate_ChatClient_AllOperations.snap | 30 +++++++++---------- ...NullableValueType_WithoutGlobal_Input.snap | 6 ++-- ...atorTests.NonNullable_ValueType_Input.snap | 6 ++-- ...ionGeneratorTests.Nullable_List_Input.snap | 6 ++-- ...neratorTests.Nullable_ValueType_Input.snap | 6 ++-- ...sts.Operation_With_MultipleOperations.snap | 18 +++++------ ...ests.Response_Name_Is_Correctly_Cased.snap | 6 ++-- ...ryGeneratorTests.Simple_Custom_Scalar.snap | 6 ++-- ...esultTypeGeneratorTests.Nested_Entity.snap | 6 ++-- ...eneratorTests.Operation_With_Comments.snap | 6 ++-- ...torTests.Operation_With_Complex_Types.snap | 6 ++-- ...atorTests.Operation_With_NullableData.snap | 6 ++-- .../ScalarGeneratorTests.Any_Scalar.snap | 6 ++-- .../ScalarGeneratorTests.Any_Type.snap | 6 ++-- ...arGeneratorTests.ByteArray_ScalarType.snap | 6 ++-- ...omplete_Schema_With_Uuid_And_DateTime.snap | 6 ++-- ...rTests.Custom_Scalar_With_RuntimeType.snap | 6 ++-- ...ar_With_RuntimeType_ValueType_AsInput.snap | 6 ++-- ....Custom_Scalar_With_SerializationType.snap | 6 ++-- ...ith_SerializationType_And_RuntimeType.snap | 6 ++-- ...ustom_Scalar_With_Unknown_RuntimeType.snap | 6 ++-- ...larGeneratorTests.Only_Custom_Scalars.snap | 6 ++-- ...rTests.Scalars_Are_Correctly_Inferred.snap | 6 ++-- ...arGeneratorTests.Simple_Custom_Scalar.snap | 6 ++-- ...rGeneratorTests.TimeSpan_Not_Detected.snap | 6 ++-- .../ScalarGeneratorTests.Uri_Type.snap | 6 ++-- .../ScalarGeneratorTests.Uuid_Type.snap | 6 ++-- ...aGeneratorTests.Create_DataType_Query.snap | 6 ++-- ...hemaGeneratorTests.Create_GetFeatById.snap | 6 ++-- ...emaGeneratorTests.Create_GetFeatsPage.snap | 6 ++-- ...pleSearch_From_ActiveDirectory_Schema.snap | 6 ++-- ...atorTests.Create_Query_With_Skip_Take.snap | 6 ++-- ...orTests.Create_UpdateMembers_Mutation.snap | 6 ++-- ...eratorTests.FieldsWithUnderlineInName.snap | 6 ++-- ...emaGeneratorTests.Full_Extension_File.snap | 6 ++-- .../SchemaGeneratorTests.HasuraMutation.snap | 6 ++-- ...hemaGeneratorTests.IntrospectionQuery.snap | 6 ++-- ...eneratorTests.LowerCaseScalarArgument.snap | 6 ++-- ...GeneratorTests.MultiLineDocumentation.snap | 6 ++-- ...aGeneratorTests.NodeTypenameCollision.snap | 6 ++-- .../SchemaGeneratorTests.NonNullLists.snap | 6 ++-- ...chemaGeneratorTests.QueryInterference.snap | 12 ++++---- ...atorTests.Query_With_Nested_Fragments.snap | 6 ++-- ...eneratorTests.Schema_With_Spec_Errors.snap | 6 ++-- ...ests.Generate_StarWarsIntegrationTest.snap | 12 ++++---- ...torTests.Interface_With_Default_Names.snap | 6 ++-- ...e_With_Fragment_Definition_Two_Models.snap | 6 ++-- ...torTests.Operation_With_Leaf_Argument.snap | 6 ++-- ...torTests.Operation_With_Type_Argument.snap | 6 ++-- ...neratorTests.StarWarsTypeNameOnUnions.snap | 6 ++-- ...rWarsGeneratorTests.StarWarsUnionList.snap | 6 ++-- ...Tests.Subscription_With_Default_Names.snap | 6 ++-- ...azorGeneratorTests.Query_And_Mutation.snap | 12 ++++---- 109 files changed, 390 insertions(+), 391 deletions(-) diff --git a/src/GreenDonut/src/Core/FetchOnceDataLoader.cs b/src/GreenDonut/src/Core/FetchOnceDataLoader.cs index cf72cc09938..6f1f7a7e64c 100644 --- a/src/GreenDonut/src/Core/FetchOnceDataLoader.cs +++ b/src/GreenDonut/src/Core/FetchOnceDataLoader.cs @@ -22,7 +22,6 @@ protected FetchOnceDataLoader(DataLoaderOptions? options = null) /// A single result which may contain a value or information about the /// error which may occurred during the call. /// - public Task LoadAsync(CancellationToken cancellationToken) => LoadAsync("default", cancellationToken); diff --git a/src/StrawberryShake/CodeGeneration/src/CodeGeneration.CSharp/Generators/OperationDocumentGenerator.cs b/src/StrawberryShake/CodeGeneration/src/CodeGeneration.CSharp/Generators/OperationDocumentGenerator.cs index a32648ca37d..bafde991abe 100644 --- a/src/StrawberryShake/CodeGeneration/src/CodeGeneration.CSharp/Generators/OperationDocumentGenerator.cs +++ b/src/StrawberryShake/CodeGeneration/src/CodeGeneration.CSharp/Generators/OperationDocumentGenerator.cs @@ -87,18 +87,18 @@ public class OperationDocumentGenerator : ClassBaseGenerator