From 7a9f5c98efeae7972607a2de5aa1015c245fe476 Mon Sep 17 00:00:00 2001 From: Jiho Lee Date: Wed, 22 Apr 2026 17:24:42 -0700 Subject: [PATCH 1/7] Default addGeneratedAnnotation and disableDatesInGeneratedAnnotation to true --- .../expected/DgsClient.kt | 2 + .../expected/DgsConstants.kt | 10 + .../expected/Generated.kt | 7 + .../expected/client/PersonProjection.kt | 4 + .../expected/client/QueryProjection.kt | 4 + .../expected/types/Person.kt | 8 + .../expected/types/PersonFilter.kt | 4 + .../expected/types/Query.kt | 8 + .../expected/DgsClient.kt | 2 + .../expected/DgsConstants.kt | 10 + .../expected/Generated.kt | 7 + .../expected/client/PersonProjection.kt | 4 + .../expected/client/QueryProjection.kt | 4 + .../expected/types/Person.kt | 8 + .../expected/types/PersonFilter.kt | 4 + .../expected/types/Query.kt | 8 + .../expected/DgsClient.kt | 2 + .../expected/DgsConstants.kt | 6 + .../expected/Generated.kt | 7 + .../expected/client/PersonProjection.kt | 4 + .../expected/client/QueryProjection.kt | 4 + .../expected/types/Person.kt | 4 + .../expected/types/Query.kt | 8 + .../expected/DgsClient.kt | 2 + .../expected/DgsConstants.kt | 6 + .../expected/Generated.kt | 7 + .../expected/client/PersonProjection.kt | 4 + .../expected/client/QueryProjection.kt | 4 + .../expected/types/Person.kt | 8 + .../expected/types/Query.kt | 8 + .../expected/DgsClient.kt | 2 + .../expected/DgsConstants.kt | 6 + .../expected/Generated.kt | 7 + .../expected/client/PersonProjection.kt | 4 + .../expected/client/QueryProjection.kt | 4 + .../expected/types/Person.kt | 8 + .../expected/types/Query.kt | 8 + .../cases/dataClassDocs/expected/DgsClient.kt | 2 + .../dataClassDocs/expected/DgsConstants.kt | 10 + .../cases/dataClassDocs/expected/Generated.kt | 7 + .../expected/client/MovieProjection.kt | 4 + .../expected/client/QueryProjection.kt | 4 + .../dataClassDocs/expected/types/Movie.kt | 8 + .../expected/types/MovieFilter.kt | 4 + .../dataClassDocs/expected/types/Query.kt | 8 + .../dataClassFieldDocs/expected/DgsClient.kt | 2 + .../expected/DgsConstants.kt | 10 + .../dataClassFieldDocs/expected/Generated.kt | 7 + .../expected/client/MovieProjection.kt | 4 + .../expected/client/QueryProjection.kt | 4 + .../expected/types/Movie.kt | 8 + .../expected/types/MovieFilter.kt | 4 + .../expected/types/Query.kt | 8 + .../expected/DgsClient.kt | 2 + .../expected/DgsConstants.kt | 6 + .../expected/Generated.kt | 7 + .../expected/client/PersonProjection.kt | 4 + .../expected/client/QueryProjection.kt | 4 + .../expected/types/Person.kt | 8 + .../expected/types/Query.kt | 8 + .../expected/DgsClient.kt | 2 + .../expected/DgsConstants.kt | 6 + .../expected/Generated.kt | 7 + .../expected/client/QueryProjection.kt | 4 + .../client/RequiredTestTypeProjection.kt | 4 + .../expected/types/Query.kt | 8 + .../expected/types/RequiredTestType.kt | 8 + .../expected/DgsClient.kt | 2 + .../expected/DgsConstants.kt | 12 + .../expected/Generated.kt | 7 + .../client/EntityConnectionProjection.kt | 4 + .../expected/client/EntityEdgeProjection.kt | 4 + .../expected/client/EntityProjection.kt | 4 + .../expected/client/PageInfoProjection.kt | 4 + .../expected/client/QueryProjection.kt | 4 + .../expected/types/Entity.kt | 8 + .../expected/types/EntityConnection.kt | 8 + .../expected/types/EntityEdge.kt | 8 + .../expected/types/PageInfo.kt | 8 + .../expected/types/Query.kt | 8 + .../expected/DgsClient.kt | 2 + .../expected/DgsConstants.kt | 10 + .../expected/Generated.kt | 7 + .../expected/client/CarProjection.kt | 4 + .../expected/client/EngineProjection.kt | 4 + .../expected/client/PerformanceProjection.kt | 4 + .../expected/client/QueryProjection.kt | 4 + .../expected/types/Car.kt | 8 + .../expected/types/Engine.kt | 8 + .../expected/types/Performance.kt | 8 + .../expected/types/Query.kt | 8 + .../expected/DgsClient.kt | 2 + .../expected/DgsConstants.kt | 6 + .../expected/Generated.kt | 7 + .../expected/client/PersonProjection.kt | 4 + .../expected/client/QueryProjection.kt | 4 + .../expected/types/Person.kt | 4 + .../expected/types/Query.kt | 8 + .../expected/DgsClient.kt | 2 + .../expected/DgsConstants.kt | 8 + .../expected/Generated.kt | 7 + .../expected/client/EmployeeProjection.kt | 4 + .../expected/client/PersonProjection.kt | 4 + .../expected/client/QueryProjection.kt | 4 + .../expected/types/Employee.kt | 8 + .../expected/types/Person.kt | 4 + .../expected/types/Query.kt | 8 + .../expected/DgsClient.kt | 2 + .../expected/DgsConstants.kt | 8 + .../expected/Generated.kt | 7 + .../expected/client/EmployeeProjection.kt | 4 + .../expected/client/PersonProjection.kt | 4 + .../expected/client/QueryProjection.kt | 4 + .../expected/types/Employee.kt | 8 + .../expected/types/Person.kt | 4 + .../expected/types/Query.kt | 8 + .../expected/DgsClient.kt | 2 + .../expected/DgsConstants.kt | 10 + .../expected/Generated.kt | 7 + .../expected/client/EmployeeProjection.kt | 4 + .../expected/client/PersonProjection.kt | 4 + .../expected/client/QueryProjection.kt | 4 + .../expected/client/TalentProjection.kt | 4 + .../expected/types/Employee.kt | 4 + .../expected/types/Person.kt | 4 + .../expected/types/Query.kt | 8 + .../expected/types/Talent.kt | 8 + .../expected/DgsClient.kt | 2 + .../expected/DgsConstants.kt | 6 + .../expected/Generated.kt | 7 + .../expected/client/PersonProjection.kt | 4 + .../expected/client/QueryProjection.kt | 4 + .../expected/types/Person.kt | 8 + .../expected/types/Query.kt | 8 + .../expected/DgsClient.kt | 2 + .../expected/DgsConstants.kt | 10 + .../expected/Generated.kt | 7 + .../expected/client/EntityProjection.kt | 4 + .../expected/client/NodeProjection.kt | 4 + .../expected/client/ProductProjection.kt | 4 + .../expected/client/QueryProjection.kt | 4 + .../expected/types/Entity.kt | 4 + .../expected/types/Product.kt | 8 + .../expected/types/Query.kt | 8 + .../expected/DgsClient.kt | 2 + .../expected/DgsConstants.kt | 12 + .../expected/Generated.kt | 7 + .../client/EntityConnectionProjection.kt | 4 + .../expected/client/EntityEdgeProjection.kt | 4 + .../expected/client/EntityProjection.kt | 4 + .../expected/client/PageInfoProjection.kt | 4 + .../expected/client/QueryProjection.kt | 4 + .../expected/types/Entity.kt | 8 + .../expected/types/EntityEdge.kt | 8 + .../expected/types/Query.kt | 8 + .../expected/DgsClient.kt | 2 + .../expected/DgsConstants.kt | 8 + .../expected/Generated.kt | 7 + .../expected/client/EmployeeProjection.kt | 4 + .../expected/client/PersonProjection.kt | 4 + .../expected/client/QueryProjection.kt | 4 + .../expected/types/Employee.kt | 8 + .../expected/types/Person.kt | 4 + .../expected/types/Query.kt | 8 + .../expected/DgsClient.kt | 2 + .../expected/DgsConstants.kt | 6 + .../expected/Generated.kt | 7 + .../expected/client/MyTypeProjection.kt | 4 + .../expected/client/OtherTypeProjection.kt | 4 + .../expected/types/MyType.kt | 8 + .../expected/types/OtherType.kt | 8 + .../expected/DgsClient.kt | 2 + .../expected/DgsConstants.kt | 6 + .../expected/Generated.kt | 7 + .../expected/client/PersonProjection.kt | 4 + .../expected/client/QueryProjection.kt | 4 + .../expected/types/Person.kt | 8 + .../expected/types/Query.kt | 8 + .../expected/DgsClient.kt | 2 + .../expected/DgsConstants.kt | 4 + .../expected/Generated.kt | 7 + .../expected/client/MyTypeProjection.kt | 4 + .../expected/types/MyType.kt | 8 + .../expected/DgsClient.kt | 2 + .../expected/DgsConstants.kt | 4 + .../expected/Generated.kt | 7 + .../expected/client/MyTypeProjection.kt | 4 + .../expected/types/MyType.kt | 8 + .../expected/DgsClient.kt | 2 + .../expected/DgsConstants.kt | 6 + .../expected/Generated.kt | 7 + .../expected/client/PersonProjection.kt | 4 + .../expected/client/QueryProjection.kt | 4 + .../expected/types/Person.kt | 8 + .../expected/types/Query.kt | 8 + .../expected/DgsClient.kt | 2 + .../expected/DgsConstants.kt | 4 + .../expected/Generated.kt | 7 + .../expected/client/MyTypeProjection.kt | 4 + .../expected/types/MyType.kt | 8 + .../expected/DgsClient.kt | 2 + .../expected/DgsConstants.kt | 6 + .../expected/Generated.kt | 7 + .../expected/client/PersonProjection.kt | 4 + .../expected/client/QueryProjection.kt | 4 + .../expected/types/Person.kt | 8 + .../expected/types/Query.kt | 8 + .../expected/DgsClient.kt | 2 + .../expected/DgsConstants.kt | 10 + .../expected/Generated.kt | 7 + .../expected/client/PersonProjection.kt | 4 + .../expected/client/QueryProjection.kt | 4 + .../expected/client/SampleTypeProjection.kt | 4 + .../expected/types/Person.kt | 8 + .../expected/types/Query.kt | 8 + .../expected/types/SampleType.kt | 8 + .../expected/DgsClient.kt | 2 + .../expected/DgsConstants.kt | 6 + .../expected/Generated.kt | 7 + .../expected/client/PersonProjection.kt | 4 + .../expected/client/QueryProjection.kt | 4 + .../expected/types/Person.kt | 8 + .../expected/types/Query.kt | 8 + .../codegen/cases/enum/expected/DgsClient.kt | 2 + .../cases/enum/expected/DgsConstants.kt | 4 + .../codegen/cases/enum/expected/Generated.kt | 7 + .../enum/expected/client/QueryProjection.kt | 4 + .../enum/expected/types/EmployeeTypes.kt | 13 + .../cases/enum/expected/types/Query.kt | 8 + .../cases/enumDocs/expected/DgsClient.kt | 2 + .../cases/enumDocs/expected/DgsConstants.kt | 2 + .../cases/enumDocs/expected/Generated.kt | 7 + .../cases/enumDocs/expected/types/Color.kt | 13 + .../expected/DgsClient.kt | 2 + .../expected/DgsConstants.kt | 4 + .../expected/Generated.kt | 7 + .../expected/client/QueryProjection.kt | 4 + .../expected/types/EmployeeTypes.kt | 15 + .../expected/types/Query.kt | 8 + .../expected/DgsClient.kt | 2 + .../expected/DgsConstants.kt | 8 + .../expected/Generated.kt | 7 + .../expected/client/AProjection.kt | 4 + .../expected/client/BProjection.kt | 4 + .../expected/client/ExampleProjection.kt | 4 + .../expected/types/A.kt | 4 + .../expected/types/B.kt | 4 + .../expected/types/Example.kt | 8 + .../codegen/cases/input/expected/DgsClient.kt | 2 + .../cases/input/expected/DgsConstants.kt | 8 + .../codegen/cases/input/expected/Generated.kt | 7 + .../input/expected/client/QueryProjection.kt | 4 + .../cases/input/expected/types/MovieFilter.kt | 4 + .../cases/input/expected/types/Query.kt | 8 + .../expected/DgsClient.kt | 2 + .../expected/DgsConstants.kt | 8 + .../expected/Generated.kt | 7 + .../expected/client/QueryProjection.kt | 4 + .../expected/types/OrderFilter.kt | 4 + .../expected/types/Query.kt | 8 + .../expected/DgsClient.kt | 2 + .../expected/DgsConstants.kt | 8 + .../expected/Generated.kt | 7 + .../expected/client/QueryProjection.kt | 4 + .../expected/types/OrderFilter.kt | 4 + .../expected/types/Query.kt | 8 + .../expected/DgsClient.kt | 2 + .../expected/DgsConstants.kt | 4 + .../expected/Generated.kt | 7 + .../expected/types/Color.kt | 11 + .../expected/types/SomeType.kt | 4 + .../expected/DgsClient.kt | 2 + .../expected/DgsConstants.kt | 4 + .../expected/Generated.kt | 7 + .../expected/types/SomeType.kt | 4 + .../expected/DgsClient.kt | 2 + .../expected/DgsConstants.kt | 4 + .../expected/Generated.kt | 7 + .../expected/types/SomeType.kt | 4 + .../expected/DgsClient.kt | 2 + .../expected/DgsConstants.kt | 4 + .../expected/Generated.kt | 7 + .../expected/types/SomeType.kt | 4 + .../expected/DgsClient.kt | 2 + .../expected/DgsConstants.kt | 4 + .../expected/Generated.kt | 7 + .../expected/types/Color.kt | 9 + .../expected/types/ColorFilter.kt | 4 + .../expected/DgsClient.kt | 2 + .../expected/DgsConstants.kt | 6 + .../expected/Generated.kt | 7 + .../expected/types/Car.kt | 4 + .../expected/types/Hobby.kt | 11 + .../expected/types/Person.kt | 4 + .../expected/DgsClient.kt | 2 + .../expected/DgsConstants.kt | 8 + .../expected/Generated.kt | 7 + .../expected/types/Car.kt | 4 + .../expected/types/MovieFilter.kt | 4 + .../expected/types/Person.kt | 4 + .../expected/DgsClient.kt | 2 + .../expected/DgsConstants.kt | 8 + .../expected/Generated.kt | 7 + .../expected/client/QueryProjection.kt | 4 + .../expected/types/MovieFilter.kt | 4 + .../expected/types/Query.kt | 8 + .../expected/DgsClient.kt | 2 + .../expected/DgsConstants.kt | 4 + .../expected/Generated.kt | 7 + .../expected/types/SampleInput.kt | 4 + .../expected/DgsClient.kt | 2 + .../expected/DgsConstants.kt | 8 + .../expected/Generated.kt | 7 + .../expected/client/BirdProjection.kt | 4 + .../expected/client/DogProjection.kt | 4 + .../expected/client/PetProjection.kt | 4 + .../expected/types/Bird.kt | 8 + .../expected/types/Dog.kt | 8 + .../expected/types/Pet.kt | 4 + .../expected/DgsClient.kt | 2 + .../expected/DgsConstants.kt | 10 + .../expected/Generated.kt | 7 + .../expected/client/DietProjection.kt | 4 + .../expected/client/DogProjection.kt | 4 + .../expected/client/PetProjection.kt | 4 + .../expected/client/VegetarianProjection.kt | 4 + .../expected/types/Diet.kt | 4 + .../expected/types/Dog.kt | 8 + .../expected/types/Pet.kt | 4 + .../expected/types/Vegetarian.kt | 8 + .../expected/DgsClient.kt | 2 + .../expected/DgsConstants.kt | 8 + .../expected/Generated.kt | 7 + .../expected/client/EmployeeProjection.kt | 4 + .../expected/client/PersonProjection.kt | 4 + .../expected/client/QueryProjection.kt | 4 + .../expected/types/Employee.kt | 8 + .../expected/types/Person.kt | 4 + .../expected/types/Query.kt | 8 + .../cases/interfaceDocs/expected/DgsClient.kt | 2 + .../interfaceDocs/expected/DgsConstants.kt | 4 + .../cases/interfaceDocs/expected/Generated.kt | 7 + .../expected/client/TitledProjection.kt | 4 + .../interfaceDocs/expected/types/Titled.kt | 4 + .../interfaceFieldsDocs/expected/DgsClient.kt | 2 + .../expected/DgsConstants.kt | 4 + .../interfaceFieldsDocs/expected/Generated.kt | 7 + .../expected/client/TitledProjection.kt | 4 + .../expected/types/Titled.kt | 4 + .../expected/DgsClient.kt | 2 + .../expected/DgsConstants.kt | 10 + .../expected/Generated.kt | 7 + .../expected/client/FruitProjection.kt | 4 + .../expected/client/QueryProjection.kt | 4 + .../expected/client/SeedProjection.kt | 4 + .../expected/client/StoneFruitProjection.kt | 4 + .../expected/types/Fruit.kt | 4 + .../expected/types/Query.kt | 8 + .../expected/types/Seed.kt | 8 + .../expected/types/StoneFruit.kt | 4 + .../expected/DgsClient.kt | 2 + .../expected/DgsConstants.kt | 8 + .../expected/Generated.kt | 7 + .../expected/client/IProjection.kt | 4 + .../expected/client/QueryProjection.kt | 4 + .../expected/client/TProjection.kt | 4 + .../expected/types/I.kt | 4 + .../expected/types/Query.kt | 8 + .../expected/types/T.kt | 8 + .../projectionWithEnum/expected/DgsClient.kt | 2 + .../expected/DgsConstants.kt | 4 + .../projectionWithEnum/expected/Generated.kt | 7 + .../expected/client/QueryProjection.kt | 4 + .../projectionWithEnum/expected/types/E.kt | 9 + .../expected/types/Query.kt | 8 + .../expected/DgsClient.kt | 2 + .../expected/DgsConstants.kt | 12 + .../expected/Generated.kt | 7 + .../expected/client/QueryProjection.kt | 4 + .../expected/types/I1.kt | 4 + .../expected/types/I2.kt | 4 + .../expected/types/Query.kt | 8 + .../expected/DgsClient.kt | 2 + .../expected/DgsConstants.kt | 8 + .../expected/Generated.kt | 7 + .../expected/client/QueryProjection.kt | 4 + .../expected/types/I.kt | 4 + .../expected/types/Query.kt | 8 + .../expected/DgsClient.kt | 2 + .../expected/DgsConstants.kt | 4 + .../expected/Generated.kt | 7 + .../expected/client/QueryProjection.kt | 4 + .../expected/types/Query.kt | 8 + .../projectionWithType/expected/DgsClient.kt | 2 + .../expected/DgsConstants.kt | 8 + .../projectionWithType/expected/Generated.kt | 7 + .../expected/client/EmployeeProjection.kt | 4 + .../expected/client/PersonProjection.kt | 4 + .../expected/client/QueryProjection.kt | 4 + .../expected/types/Employee.kt | 8 + .../expected/types/Person.kt | 4 + .../expected/types/Query.kt | 8 + .../expected/DgsClient.kt | 2 + .../expected/DgsConstants.kt | 12 + .../expected/Generated.kt | 7 + .../expected/client/EmployeeProjection.kt | 4 + .../expected/client/PersonProjection.kt | 4 + .../expected/client/QueryProjection.kt | 4 + .../expected/types/Employee.kt | 8 + .../expected/types/I.kt | 4 + .../expected/types/Person.kt | 4 + .../expected/types/Query.kt | 8 + .../projectionWithUnion/expected/DgsClient.kt | 2 + .../expected/DgsConstants.kt | 10 + .../projectionWithUnion/expected/Generated.kt | 7 + .../expected/client/EmployeeProjection.kt | 4 + .../expected/client/PersonProjection.kt | 4 + .../expected/client/QueryProjection.kt | 4 + .../expected/client/UProjection.kt | 4 + .../expected/types/Employee.kt | 8 + .../expected/types/Person.kt | 4 + .../expected/types/Query.kt | 8 + .../projectionWithUnion/expected/types/U.kt | 4 + .../skipCodegenOnFields/expected/DgsClient.kt | 2 + .../expected/DgsConstants.kt | 4 + .../skipCodegenOnFields/expected/Generated.kt | 7 + .../expected/client/PersonProjection.kt | 4 + .../expected/types/Person.kt | 8 + .../expected/DgsClient.kt | 2 + .../expected/DgsConstants.kt | 4 + .../expected/Generated.kt | 7 + .../expected/client/PersonProjection.kt | 4 + .../expected/types/Person.kt | 4 + .../skipCodegenOnTypes/expected/DgsClient.kt | 2 + .../expected/DgsConstants.kt | 6 + .../skipCodegenOnTypes/expected/Generated.kt | 7 + .../expected/client/PersonProjection.kt | 4 + .../expected/types/Person.kt | 8 + .../codegen/cases/union/expected/DgsClient.kt | 2 + .../cases/union/expected/DgsConstants.kt | 10 + .../codegen/cases/union/expected/Generated.kt | 7 + .../union/expected/client/ActorProjection.kt | 4 + .../union/expected/client/MovieProjection.kt | 4 + .../union/expected/client/QueryProjection.kt | 4 + .../expected/client/SearchResultProjection.kt | 4 + .../cases/union/expected/types/Actor.kt | 8 + .../cases/union/expected/types/Movie.kt | 8 + .../cases/union/expected/types/Query.kt | 8 + .../union/expected/types/SearchResult.kt | 4 + .../expected/DgsClient.kt | 2 + .../expected/DgsConstants.kt | 14 + .../expected/Generated.kt | 7 + .../expected/client/DroidProjection.kt | 4 + .../expected/client/HumanProjection.kt | 4 + .../expected/client/QueryProjection.kt | 4 + .../client/SearchResultPageProjection.kt | 4 + .../expected/client/SearchResultProjection.kt | 4 + .../expected/types/Droid.kt | 8 + .../expected/types/Human.kt | 8 + .../expected/types/Query.kt | 8 + .../expected/types/SearchResult.kt | 4 + .../expected/types/SearchResultPage.kt | 8 + .../expected/DgsClient.kt | 2 + .../expected/DgsConstants.kt | 12 + .../expected/Generated.kt | 7 + .../expected/client/ActorProjection.kt | 4 + .../expected/client/MovieProjection.kt | 4 + .../expected/client/QueryProjection.kt | 4 + .../expected/client/RatingProjection.kt | 4 + .../expected/client/SearchResultProjection.kt | 4 + .../expected/types/Actor.kt | 8 + .../expected/types/Movie.kt | 8 + .../expected/types/Query.kt | 8 + .../expected/types/Rating.kt | 8 + .../expected/types/SearchResult.kt | 4 + .../netflix/graphql/dgs/codegen/CodeGen.kt | 4 +- .../graphql/dgs/codegen/CodeGenTest.kt | 882 ++++++++++-------- .../graphql/dgs/codegen/Kotlin2CodeGenTest.kt | 19 +- .../graphql/dgs/codegen/KotlinCodeGenTest.kt | 714 ++++++++------ .../clientapi/ClientApiGenFragmentTest.kt | 3 + .../clientapi/ClientApiGenMutationTest.kt | 20 +- .../clientapi/ClientApiGenProjectionTest.kt | 38 +- .../clientapi/ClientApiGenQueryTest.kt | 39 +- .../clientapi/ClientApiGenSubscriptionTest.kt | 6 +- .../dgs/codegen/gradle/GenerateJavaTask.kt | 4 +- .../test-project-no-schema-files/build.gradle | 9 + .../build_with_default_dir.gradle | 9 + .../test/resources/test-project/build.gradle | 9 + .../build_with_default_dir.gradle | 8 + 489 files changed, 3667 insertions(+), 710 deletions(-) create mode 100644 graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/constantsForInputTypes/expected/Generated.kt create mode 100644 graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/constantsWithExtendedInputTypes/expected/Generated.kt create mode 100644 graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/constantsWithExtendedInterface/expected/Generated.kt create mode 100644 graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/constantsWithExtendedQuery/expected/Generated.kt create mode 100644 graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/constantsWithExtendedTypes/expected/Generated.kt create mode 100644 graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassDocs/expected/Generated.kt create mode 100644 graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassFieldDocs/expected/Generated.kt create mode 100644 graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWIthNoFields/expected/Generated.kt create mode 100644 graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithBooleanField/expected/Generated.kt create mode 100644 graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithDeclaredScalars/expected/Generated.kt create mode 100644 graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithDeeplyNestedComplexField/expected/Generated.kt create mode 100644 graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithExtendedInterface/expected/Generated.kt create mode 100644 graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithExtendedInterfaceInheritance/expected/Generated.kt create mode 100644 graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithInterface/expected/Generated.kt create mode 100644 graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithInterfaceInheritance/expected/Generated.kt create mode 100644 graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithListProperties/expected/Generated.kt create mode 100644 graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithMappedInterfaces/expected/Generated.kt create mode 100644 graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithMappedTypes/expected/Generated.kt create mode 100644 graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithNonNullableAndInterface/expected/Generated.kt create mode 100644 graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithNonNullableComplexType/expected/Generated.kt create mode 100644 graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithNonNullableListOfNullableValues/expected/Generated.kt create mode 100644 graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithNonNullablePrimitive/expected/Generated.kt create mode 100644 graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithNonNullablePrimitiveInList/expected/Generated.kt create mode 100644 graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithNonNullableProperties/expected/Generated.kt create mode 100644 graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithNullablePrimitive/expected/Generated.kt create mode 100644 graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithRecursiveField/expected/Generated.kt create mode 100644 graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithReservedWord/expected/Generated.kt create mode 100644 graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithStringProperties/expected/Generated.kt create mode 100644 graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/enum/expected/Generated.kt create mode 100644 graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/enumDocs/expected/Generated.kt create mode 100644 graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/enumWithExtendedType/expected/Generated.kt create mode 100644 graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/extendedDataClassWithInterface/expected/Generated.kt create mode 100644 graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/input/expected/Generated.kt create mode 100644 graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/inputWithDefaultBigDecimal/expected/Generated.kt create mode 100644 graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/inputWithDefaultCurrency/expected/Generated.kt create mode 100644 graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/inputWithDefaultEnumValueForArray/expected/Generated.kt create mode 100644 graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/inputWithDefaultIntValueForArray/expected/Generated.kt create mode 100644 graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/inputWithDefaultStringValueForArray/expected/Generated.kt create mode 100644 graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/inputWithDefaultValueForArray/expected/Generated.kt create mode 100644 graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/inputWithDefaultValueForEnum/expected/Generated.kt create mode 100644 graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/inputWithDefaultValueForNonNullableFields/expected/Generated.kt create mode 100644 graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/inputWithDefaultValueForObject/expected/Generated.kt create mode 100644 graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/inputWithExtendedType/expected/Generated.kt create mode 100644 graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/inputWithReservedWord/expected/Generated.kt create mode 100644 graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/interfaceClassWithInterfaceFields/expected/Generated.kt create mode 100644 graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/interfaceClassWithInterfaceFieldsOfDifferentType/expected/Generated.kt create mode 100644 graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/interfaceClassWithNonNullableFields/expected/Generated.kt create mode 100644 graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/interfaceDocs/expected/Generated.kt create mode 100644 graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/interfaceFieldsDocs/expected/Generated.kt create mode 100644 graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/interfaceWithInterfaceInheritance/expected/Generated.kt create mode 100644 graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/interfaceWithUnderscoreFields/expected/Generated.kt create mode 100644 graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/projectionWithEnum/expected/Generated.kt create mode 100644 graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/projectionWithNestedInputs/expected/Generated.kt create mode 100644 graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/projectionWithPrimitiveAndArgs/expected/Generated.kt create mode 100644 graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/projectionWithPrimitives/expected/Generated.kt create mode 100644 graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/projectionWithType/expected/Generated.kt create mode 100644 graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/projectionWithTypeAndArgs/expected/Generated.kt create mode 100644 graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/projectionWithUnion/expected/Generated.kt create mode 100644 graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/skipCodegenOnFields/expected/Generated.kt create mode 100644 graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/skipCodegenOnInterfaceFields/expected/Generated.kt create mode 100644 graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/skipCodegenOnTypes/expected/Generated.kt create mode 100644 graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/union/expected/Generated.kt create mode 100644 graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/unionTypesWithoutInterfaceCanDeserialize/expected/Generated.kt create mode 100644 graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/unionWithExtendedType/expected/Generated.kt diff --git a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/constantsForInputTypes/expected/DgsClient.kt b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/constantsForInputTypes/expected/DgsClient.kt index b65854b90..628070598 100644 --- a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/constantsForInputTypes/expected/DgsClient.kt +++ b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/constantsForInputTypes/expected/DgsClient.kt @@ -6,6 +6,8 @@ import com.netflix.graphql.dgs.codegen.cases.constantsForInputTypes.expected.cli import graphql.language.OperationDefinition import kotlin.String +@jakarta.`annotation`.Generated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) +@Generated public object DgsClient { public fun buildQuery(inputValueSerializer: InputValueSerializerInterface? = null, _projection: QueryProjection.() -> QueryProjection): String = diff --git a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/constantsForInputTypes/expected/DgsConstants.kt b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/constantsForInputTypes/expected/DgsConstants.kt index 36b049c5f..21fed2b9c 100644 --- a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/constantsForInputTypes/expected/DgsConstants.kt +++ b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/constantsForInputTypes/expected/DgsConstants.kt @@ -2,19 +2,27 @@ package com.netflix.graphql.dgs.codegen.cases.constantsForInputTypes.expected import kotlin.String +@jakarta.`annotation`.Generated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) +@Generated public object DgsConstants { public const val QUERY_TYPE: String = "Query" + @jakarta.`annotation`.Generated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) + @Generated public object QUERY { public const val TYPE_NAME: String = "Query" public const val People: String = "people" + @jakarta.`annotation`.Generated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) + @Generated public object PEOPLE_INPUT_ARGUMENT { public const val Filter: String = "filter" } } + @jakarta.`annotation`.Generated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) + @Generated public object PERSON { public const val TYPE_NAME: String = "Person" @@ -23,6 +31,8 @@ public object DgsConstants { public const val Lastname: String = "lastname" } + @jakarta.`annotation`.Generated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) + @Generated public object PERSONFILTER { public const val TYPE_NAME: String = "PersonFilter" diff --git a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/constantsForInputTypes/expected/Generated.kt b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/constantsForInputTypes/expected/Generated.kt new file mode 100644 index 000000000..ac17585d7 --- /dev/null +++ b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/constantsForInputTypes/expected/Generated.kt @@ -0,0 +1,7 @@ +package com.netflix.graphql.dgs.codegen.cases.constantsForInputTypes.expected + +import kotlin.`annotation`.AnnotationRetention +import kotlin.`annotation`.Retention + +@Retention(value = AnnotationRetention.BINARY) +public annotation class Generated diff --git a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/constantsForInputTypes/expected/client/PersonProjection.kt b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/constantsForInputTypes/expected/client/PersonProjection.kt index 15f63ddde..7b5c44d7a 100644 --- a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/constantsForInputTypes/expected/client/PersonProjection.kt +++ b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/constantsForInputTypes/expected/client/PersonProjection.kt @@ -2,7 +2,11 @@ package com.netflix.graphql.dgs.codegen.cases.constantsForInputTypes.expected.cl import com.netflix.graphql.dgs.client.codegen.InputValueSerializerInterface import com.netflix.graphql.dgs.codegen.GraphQLProjection +import com.netflix.graphql.dgs.codegen.cases.constantsForInputTypes.expected.Generated as ExpectedGenerated +import jakarta.`annotation`.Generated as AnnotationGenerated +@AnnotationGenerated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) +@ExpectedGenerated public class PersonProjection( inputValueSerializer: InputValueSerializerInterface? = null, ) : GraphQLProjection(inputValueSerializer) { diff --git a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/constantsForInputTypes/expected/client/QueryProjection.kt b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/constantsForInputTypes/expected/client/QueryProjection.kt index 56793e0c5..9aafde108 100644 --- a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/constantsForInputTypes/expected/client/QueryProjection.kt +++ b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/constantsForInputTypes/expected/client/QueryProjection.kt @@ -4,7 +4,11 @@ import com.netflix.graphql.dgs.client.codegen.InputValueSerializerInterface import com.netflix.graphql.dgs.codegen.GraphQLProjection import com.netflix.graphql.dgs.codegen.cases.constantsForInputTypes.expected.types.PersonFilter import kotlin.String +import com.netflix.graphql.dgs.codegen.cases.constantsForInputTypes.expected.Generated as ExpectedGenerated +import jakarta.`annotation`.Generated as AnnotationGenerated +@AnnotationGenerated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) +@ExpectedGenerated public class QueryProjection( inputValueSerializer: InputValueSerializerInterface? = null, ) : GraphQLProjection(inputValueSerializer) { diff --git a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/constantsForInputTypes/expected/types/Person.kt b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/constantsForInputTypes/expected/types/Person.kt index 5c6f4523f..6d0d4fb30 100644 --- a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/constantsForInputTypes/expected/types/Person.kt +++ b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/constantsForInputTypes/expected/types/Person.kt @@ -8,7 +8,11 @@ import com.fasterxml.jackson.databind.`annotation`.JsonPOJOBuilder import java.lang.IllegalStateException import kotlin.String import kotlin.jvm.JvmName +import com.netflix.graphql.dgs.codegen.cases.constantsForInputTypes.expected.Generated as ExpectedGenerated +import jakarta.`annotation`.Generated as AnnotationGenerated +@AnnotationGenerated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) +@ExpectedGenerated @JsonTypeInfo(use = JsonTypeInfo.Id.NONE) @JsonDeserialize(builder = Person.Builder::class) public class Person( @@ -27,6 +31,8 @@ public class Person( public val lastname: String? get() = __lastname.invoke() + @AnnotationGenerated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) + @ExpectedGenerated public companion object { private val firstnameDefault: () -> String? = { throw IllegalStateException("Field `firstname` was not requested") } @@ -35,6 +41,8 @@ public class Person( { throw IllegalStateException("Field `lastname` was not requested") } } + @AnnotationGenerated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) + @ExpectedGenerated @JsonPOJOBuilder @JsonIgnoreProperties("__typename") public class Builder { diff --git a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/constantsForInputTypes/expected/types/PersonFilter.kt b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/constantsForInputTypes/expected/types/PersonFilter.kt index 43082678e..2f4cc7e69 100644 --- a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/constantsForInputTypes/expected/types/PersonFilter.kt +++ b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/constantsForInputTypes/expected/types/PersonFilter.kt @@ -6,7 +6,11 @@ import kotlin.Any import kotlin.Pair import kotlin.String import kotlin.collections.List +import com.netflix.graphql.dgs.codegen.cases.constantsForInputTypes.expected.Generated as ExpectedGenerated +import jakarta.`annotation`.Generated as AnnotationGenerated +@AnnotationGenerated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) +@ExpectedGenerated public data class PersonFilter( @JsonProperty("email") public val email: String? = default("email", null), diff --git a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/constantsForInputTypes/expected/types/Query.kt b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/constantsForInputTypes/expected/types/Query.kt index 444457f09..07f29fae8 100644 --- a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/constantsForInputTypes/expected/types/Query.kt +++ b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/constantsForInputTypes/expected/types/Query.kt @@ -8,7 +8,11 @@ import com.fasterxml.jackson.databind.`annotation`.JsonPOJOBuilder import java.lang.IllegalStateException import kotlin.collections.List import kotlin.jvm.JvmName +import com.netflix.graphql.dgs.codegen.cases.constantsForInputTypes.expected.Generated as ExpectedGenerated +import jakarta.`annotation`.Generated as AnnotationGenerated +@AnnotationGenerated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) +@ExpectedGenerated @JsonTypeInfo(use = JsonTypeInfo.Id.NONE) @JsonDeserialize(builder = Query.Builder::class) public class Query( @@ -20,11 +24,15 @@ public class Query( public val people: List? get() = __people.invoke() + @AnnotationGenerated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) + @ExpectedGenerated public companion object { private val peopleDefault: () -> List? = { throw IllegalStateException("Field `people` was not requested") } } + @AnnotationGenerated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) + @ExpectedGenerated @JsonPOJOBuilder @JsonIgnoreProperties("__typename") public class Builder { diff --git a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/constantsWithExtendedInputTypes/expected/DgsClient.kt b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/constantsWithExtendedInputTypes/expected/DgsClient.kt index a14ef3448..ebdc2ae16 100644 --- a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/constantsWithExtendedInputTypes/expected/DgsClient.kt +++ b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/constantsWithExtendedInputTypes/expected/DgsClient.kt @@ -6,6 +6,8 @@ import com.netflix.graphql.dgs.codegen.cases.constantsWithExtendedInputTypes.exp import graphql.language.OperationDefinition import kotlin.String +@jakarta.`annotation`.Generated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) +@Generated public object DgsClient { public fun buildQuery(inputValueSerializer: InputValueSerializerInterface? = null, _projection: QueryProjection.() -> QueryProjection): String = diff --git a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/constantsWithExtendedInputTypes/expected/DgsConstants.kt b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/constantsWithExtendedInputTypes/expected/DgsConstants.kt index 50119d7ca..c12ef5be7 100644 --- a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/constantsWithExtendedInputTypes/expected/DgsConstants.kt +++ b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/constantsWithExtendedInputTypes/expected/DgsConstants.kt @@ -2,19 +2,27 @@ package com.netflix.graphql.dgs.codegen.cases.constantsWithExtendedInputTypes.ex import kotlin.String +@jakarta.`annotation`.Generated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) +@Generated public object DgsConstants { public const val QUERY_TYPE: String = "Query" + @jakarta.`annotation`.Generated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) + @Generated public object QUERY { public const val TYPE_NAME: String = "Query" public const val People: String = "people" + @jakarta.`annotation`.Generated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) + @Generated public object PEOPLE_INPUT_ARGUMENT { public const val Filter: String = "filter" } } + @jakarta.`annotation`.Generated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) + @Generated public object PERSON { public const val TYPE_NAME: String = "Person" @@ -23,6 +31,8 @@ public object DgsConstants { public const val Lastname: String = "lastname" } + @jakarta.`annotation`.Generated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) + @Generated public object PERSONFILTER { public const val TYPE_NAME: String = "PersonFilter" diff --git a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/constantsWithExtendedInputTypes/expected/Generated.kt b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/constantsWithExtendedInputTypes/expected/Generated.kt new file mode 100644 index 000000000..0470eb749 --- /dev/null +++ b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/constantsWithExtendedInputTypes/expected/Generated.kt @@ -0,0 +1,7 @@ +package com.netflix.graphql.dgs.codegen.cases.constantsWithExtendedInputTypes.expected + +import kotlin.`annotation`.AnnotationRetention +import kotlin.`annotation`.Retention + +@Retention(value = AnnotationRetention.BINARY) +public annotation class Generated diff --git a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/constantsWithExtendedInputTypes/expected/client/PersonProjection.kt b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/constantsWithExtendedInputTypes/expected/client/PersonProjection.kt index 7fce836c4..2b79fcf99 100644 --- a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/constantsWithExtendedInputTypes/expected/client/PersonProjection.kt +++ b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/constantsWithExtendedInputTypes/expected/client/PersonProjection.kt @@ -2,7 +2,11 @@ package com.netflix.graphql.dgs.codegen.cases.constantsWithExtendedInputTypes.ex import com.netflix.graphql.dgs.client.codegen.InputValueSerializerInterface import com.netflix.graphql.dgs.codegen.GraphQLProjection +import com.netflix.graphql.dgs.codegen.cases.constantsWithExtendedInputTypes.expected.Generated as ExpectedGenerated +import jakarta.`annotation`.Generated as AnnotationGenerated +@AnnotationGenerated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) +@ExpectedGenerated public class PersonProjection( inputValueSerializer: InputValueSerializerInterface? = null, ) : GraphQLProjection(inputValueSerializer) { diff --git a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/constantsWithExtendedInputTypes/expected/client/QueryProjection.kt b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/constantsWithExtendedInputTypes/expected/client/QueryProjection.kt index b2ed7b5e3..0abed196a 100644 --- a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/constantsWithExtendedInputTypes/expected/client/QueryProjection.kt +++ b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/constantsWithExtendedInputTypes/expected/client/QueryProjection.kt @@ -4,7 +4,11 @@ import com.netflix.graphql.dgs.client.codegen.InputValueSerializerInterface import com.netflix.graphql.dgs.codegen.GraphQLProjection import com.netflix.graphql.dgs.codegen.cases.constantsWithExtendedInputTypes.expected.types.PersonFilter import kotlin.String +import com.netflix.graphql.dgs.codegen.cases.constantsWithExtendedInputTypes.expected.Generated as ExpectedGenerated +import jakarta.`annotation`.Generated as AnnotationGenerated +@AnnotationGenerated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) +@ExpectedGenerated public class QueryProjection( inputValueSerializer: InputValueSerializerInterface? = null, ) : GraphQLProjection(inputValueSerializer) { diff --git a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/constantsWithExtendedInputTypes/expected/types/Person.kt b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/constantsWithExtendedInputTypes/expected/types/Person.kt index d855e5afc..e562ba154 100644 --- a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/constantsWithExtendedInputTypes/expected/types/Person.kt +++ b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/constantsWithExtendedInputTypes/expected/types/Person.kt @@ -8,7 +8,11 @@ import com.fasterxml.jackson.databind.`annotation`.JsonPOJOBuilder import java.lang.IllegalStateException import kotlin.String import kotlin.jvm.JvmName +import com.netflix.graphql.dgs.codegen.cases.constantsWithExtendedInputTypes.expected.Generated as ExpectedGenerated +import jakarta.`annotation`.Generated as AnnotationGenerated +@AnnotationGenerated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) +@ExpectedGenerated @JsonTypeInfo(use = JsonTypeInfo.Id.NONE) @JsonDeserialize(builder = Person.Builder::class) public class Person( @@ -27,6 +31,8 @@ public class Person( public val lastname: String? get() = __lastname.invoke() + @AnnotationGenerated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) + @ExpectedGenerated public companion object { private val firstnameDefault: () -> String? = { throw IllegalStateException("Field `firstname` was not requested") } @@ -35,6 +41,8 @@ public class Person( { throw IllegalStateException("Field `lastname` was not requested") } } + @AnnotationGenerated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) + @ExpectedGenerated @JsonPOJOBuilder @JsonIgnoreProperties("__typename") public class Builder { diff --git a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/constantsWithExtendedInputTypes/expected/types/PersonFilter.kt b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/constantsWithExtendedInputTypes/expected/types/PersonFilter.kt index bc09e48f1..3ee24e0ba 100644 --- a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/constantsWithExtendedInputTypes/expected/types/PersonFilter.kt +++ b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/constantsWithExtendedInputTypes/expected/types/PersonFilter.kt @@ -7,7 +7,11 @@ import kotlin.Int import kotlin.Pair import kotlin.String import kotlin.collections.List +import com.netflix.graphql.dgs.codegen.cases.constantsWithExtendedInputTypes.expected.Generated as ExpectedGenerated +import jakarta.`annotation`.Generated as AnnotationGenerated +@AnnotationGenerated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) +@ExpectedGenerated public data class PersonFilter( @JsonProperty("email") public val email: String? = default("email", null), diff --git a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/constantsWithExtendedInputTypes/expected/types/Query.kt b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/constantsWithExtendedInputTypes/expected/types/Query.kt index 7696e9ba4..ce4bbe886 100644 --- a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/constantsWithExtendedInputTypes/expected/types/Query.kt +++ b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/constantsWithExtendedInputTypes/expected/types/Query.kt @@ -8,7 +8,11 @@ import com.fasterxml.jackson.databind.`annotation`.JsonPOJOBuilder import java.lang.IllegalStateException import kotlin.collections.List import kotlin.jvm.JvmName +import com.netflix.graphql.dgs.codegen.cases.constantsWithExtendedInputTypes.expected.Generated as ExpectedGenerated +import jakarta.`annotation`.Generated as AnnotationGenerated +@AnnotationGenerated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) +@ExpectedGenerated @JsonTypeInfo(use = JsonTypeInfo.Id.NONE) @JsonDeserialize(builder = Query.Builder::class) public class Query( @@ -20,11 +24,15 @@ public class Query( public val people: List? get() = __people.invoke() + @AnnotationGenerated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) + @ExpectedGenerated public companion object { private val peopleDefault: () -> List? = { throw IllegalStateException("Field `people` was not requested") } } + @AnnotationGenerated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) + @ExpectedGenerated @JsonPOJOBuilder @JsonIgnoreProperties("__typename") public class Builder { diff --git a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/constantsWithExtendedInterface/expected/DgsClient.kt b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/constantsWithExtendedInterface/expected/DgsClient.kt index 77eaca230..38307a631 100644 --- a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/constantsWithExtendedInterface/expected/DgsClient.kt +++ b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/constantsWithExtendedInterface/expected/DgsClient.kt @@ -6,6 +6,8 @@ import com.netflix.graphql.dgs.codegen.cases.constantsWithExtendedInterface.expe import graphql.language.OperationDefinition import kotlin.String +@jakarta.`annotation`.Generated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) +@Generated public object DgsClient { public fun buildQuery(inputValueSerializer: InputValueSerializerInterface? = null, _projection: QueryProjection.() -> QueryProjection): String = diff --git a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/constantsWithExtendedInterface/expected/DgsConstants.kt b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/constantsWithExtendedInterface/expected/DgsConstants.kt index 82d6a66e0..fcc293860 100644 --- a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/constantsWithExtendedInterface/expected/DgsConstants.kt +++ b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/constantsWithExtendedInterface/expected/DgsConstants.kt @@ -2,15 +2,21 @@ package com.netflix.graphql.dgs.codegen.cases.constantsWithExtendedInterface.exp import kotlin.String +@jakarta.`annotation`.Generated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) +@Generated public object DgsConstants { public const val QUERY_TYPE: String = "Query" + @jakarta.`annotation`.Generated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) + @Generated public object QUERY { public const val TYPE_NAME: String = "Query" public const val People: String = "people" } + @jakarta.`annotation`.Generated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) + @Generated public object PERSON { public const val TYPE_NAME: String = "Person" diff --git a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/constantsWithExtendedInterface/expected/Generated.kt b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/constantsWithExtendedInterface/expected/Generated.kt new file mode 100644 index 000000000..6b2ed09e7 --- /dev/null +++ b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/constantsWithExtendedInterface/expected/Generated.kt @@ -0,0 +1,7 @@ +package com.netflix.graphql.dgs.codegen.cases.constantsWithExtendedInterface.expected + +import kotlin.`annotation`.AnnotationRetention +import kotlin.`annotation`.Retention + +@Retention(value = AnnotationRetention.BINARY) +public annotation class Generated diff --git a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/constantsWithExtendedInterface/expected/client/PersonProjection.kt b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/constantsWithExtendedInterface/expected/client/PersonProjection.kt index a02f67d22..e73d69b34 100644 --- a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/constantsWithExtendedInterface/expected/client/PersonProjection.kt +++ b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/constantsWithExtendedInterface/expected/client/PersonProjection.kt @@ -2,7 +2,11 @@ package com.netflix.graphql.dgs.codegen.cases.constantsWithExtendedInterface.exp import com.netflix.graphql.dgs.client.codegen.InputValueSerializerInterface import com.netflix.graphql.dgs.codegen.GraphQLProjection +import com.netflix.graphql.dgs.codegen.cases.constantsWithExtendedInterface.expected.Generated as ExpectedGenerated +import jakarta.`annotation`.Generated as AnnotationGenerated +@AnnotationGenerated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) +@ExpectedGenerated public class PersonProjection( inputValueSerializer: InputValueSerializerInterface? = null, ) : GraphQLProjection(inputValueSerializer) { diff --git a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/constantsWithExtendedInterface/expected/client/QueryProjection.kt b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/constantsWithExtendedInterface/expected/client/QueryProjection.kt index 326b24d03..0365f110c 100644 --- a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/constantsWithExtendedInterface/expected/client/QueryProjection.kt +++ b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/constantsWithExtendedInterface/expected/client/QueryProjection.kt @@ -3,7 +3,11 @@ package com.netflix.graphql.dgs.codegen.cases.constantsWithExtendedInterface.exp import com.netflix.graphql.dgs.client.codegen.InputValueSerializerInterface import com.netflix.graphql.dgs.codegen.GraphQLProjection import kotlin.String +import com.netflix.graphql.dgs.codegen.cases.constantsWithExtendedInterface.expected.Generated as ExpectedGenerated +import jakarta.`annotation`.Generated as AnnotationGenerated +@AnnotationGenerated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) +@ExpectedGenerated public class QueryProjection( inputValueSerializer: InputValueSerializerInterface? = null, ) : GraphQLProjection(inputValueSerializer) { diff --git a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/constantsWithExtendedInterface/expected/types/Person.kt b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/constantsWithExtendedInterface/expected/types/Person.kt index 92a402f7b..093c2e484 100644 --- a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/constantsWithExtendedInterface/expected/types/Person.kt +++ b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/constantsWithExtendedInterface/expected/types/Person.kt @@ -5,7 +5,11 @@ import kotlin.Int import kotlin.String import kotlin.Suppress import kotlin.jvm.JvmName +import com.netflix.graphql.dgs.codegen.cases.constantsWithExtendedInterface.expected.Generated as ExpectedGenerated +import jakarta.`annotation`.Generated as AnnotationGenerated +@AnnotationGenerated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) +@ExpectedGenerated @JsonTypeInfo( use = JsonTypeInfo.Id.NAME, include = JsonTypeInfo.As.PROPERTY, diff --git a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/constantsWithExtendedInterface/expected/types/Query.kt b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/constantsWithExtendedInterface/expected/types/Query.kt index 2961f273a..6d3d23633 100644 --- a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/constantsWithExtendedInterface/expected/types/Query.kt +++ b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/constantsWithExtendedInterface/expected/types/Query.kt @@ -8,7 +8,11 @@ import com.fasterxml.jackson.databind.`annotation`.JsonPOJOBuilder import java.lang.IllegalStateException import kotlin.collections.List import kotlin.jvm.JvmName +import com.netflix.graphql.dgs.codegen.cases.constantsWithExtendedInterface.expected.Generated as ExpectedGenerated +import jakarta.`annotation`.Generated as AnnotationGenerated +@AnnotationGenerated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) +@ExpectedGenerated @JsonTypeInfo(use = JsonTypeInfo.Id.NONE) @JsonDeserialize(builder = Query.Builder::class) public class Query( @@ -20,11 +24,15 @@ public class Query( public val people: List? get() = __people.invoke() + @AnnotationGenerated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) + @ExpectedGenerated public companion object { private val peopleDefault: () -> List? = { throw IllegalStateException("Field `people` was not requested") } } + @AnnotationGenerated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) + @ExpectedGenerated @JsonPOJOBuilder @JsonIgnoreProperties("__typename") public class Builder { diff --git a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/constantsWithExtendedQuery/expected/DgsClient.kt b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/constantsWithExtendedQuery/expected/DgsClient.kt index ce8ffb697..e1bd72c23 100644 --- a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/constantsWithExtendedQuery/expected/DgsClient.kt +++ b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/constantsWithExtendedQuery/expected/DgsClient.kt @@ -6,6 +6,8 @@ import com.netflix.graphql.dgs.codegen.cases.constantsWithExtendedQuery.expected import graphql.language.OperationDefinition import kotlin.String +@jakarta.`annotation`.Generated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) +@Generated public object DgsClient { public fun buildQuery(inputValueSerializer: InputValueSerializerInterface? = null, _projection: QueryProjection.() -> QueryProjection): String = diff --git a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/constantsWithExtendedQuery/expected/DgsConstants.kt b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/constantsWithExtendedQuery/expected/DgsConstants.kt index e726f8519..9552986ee 100644 --- a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/constantsWithExtendedQuery/expected/DgsConstants.kt +++ b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/constantsWithExtendedQuery/expected/DgsConstants.kt @@ -2,9 +2,13 @@ package com.netflix.graphql.dgs.codegen.cases.constantsWithExtendedQuery.expecte import kotlin.String +@jakarta.`annotation`.Generated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) +@Generated public object DgsConstants { public const val QUERY_TYPE: String = "Query" + @jakarta.`annotation`.Generated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) + @Generated public object QUERY { public const val TYPE_NAME: String = "Query" @@ -13,6 +17,8 @@ public object DgsConstants { public const val Friends: String = "friends" } + @jakarta.`annotation`.Generated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) + @Generated public object PERSON { public const val TYPE_NAME: String = "Person" diff --git a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/constantsWithExtendedQuery/expected/Generated.kt b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/constantsWithExtendedQuery/expected/Generated.kt new file mode 100644 index 000000000..d205bff19 --- /dev/null +++ b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/constantsWithExtendedQuery/expected/Generated.kt @@ -0,0 +1,7 @@ +package com.netflix.graphql.dgs.codegen.cases.constantsWithExtendedQuery.expected + +import kotlin.`annotation`.AnnotationRetention +import kotlin.`annotation`.Retention + +@Retention(value = AnnotationRetention.BINARY) +public annotation class Generated diff --git a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/constantsWithExtendedQuery/expected/client/PersonProjection.kt b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/constantsWithExtendedQuery/expected/client/PersonProjection.kt index 7571d4b39..2ede68aa2 100644 --- a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/constantsWithExtendedQuery/expected/client/PersonProjection.kt +++ b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/constantsWithExtendedQuery/expected/client/PersonProjection.kt @@ -2,7 +2,11 @@ package com.netflix.graphql.dgs.codegen.cases.constantsWithExtendedQuery.expecte import com.netflix.graphql.dgs.client.codegen.InputValueSerializerInterface import com.netflix.graphql.dgs.codegen.GraphQLProjection +import com.netflix.graphql.dgs.codegen.cases.constantsWithExtendedQuery.expected.Generated as ExpectedGenerated +import jakarta.`annotation`.Generated as AnnotationGenerated +@AnnotationGenerated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) +@ExpectedGenerated public class PersonProjection( inputValueSerializer: InputValueSerializerInterface? = null, ) : GraphQLProjection(inputValueSerializer) { diff --git a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/constantsWithExtendedQuery/expected/client/QueryProjection.kt b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/constantsWithExtendedQuery/expected/client/QueryProjection.kt index 222b76194..fd2ae7fae 100644 --- a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/constantsWithExtendedQuery/expected/client/QueryProjection.kt +++ b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/constantsWithExtendedQuery/expected/client/QueryProjection.kt @@ -3,7 +3,11 @@ package com.netflix.graphql.dgs.codegen.cases.constantsWithExtendedQuery.expecte import com.netflix.graphql.dgs.client.codegen.InputValueSerializerInterface import com.netflix.graphql.dgs.codegen.GraphQLProjection import kotlin.String +import com.netflix.graphql.dgs.codegen.cases.constantsWithExtendedQuery.expected.Generated as ExpectedGenerated +import jakarta.`annotation`.Generated as AnnotationGenerated +@AnnotationGenerated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) +@ExpectedGenerated public class QueryProjection( inputValueSerializer: InputValueSerializerInterface? = null, ) : GraphQLProjection(inputValueSerializer) { diff --git a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/constantsWithExtendedQuery/expected/types/Person.kt b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/constantsWithExtendedQuery/expected/types/Person.kt index da3f6ef37..1e7cf3b13 100644 --- a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/constantsWithExtendedQuery/expected/types/Person.kt +++ b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/constantsWithExtendedQuery/expected/types/Person.kt @@ -8,7 +8,11 @@ import com.fasterxml.jackson.databind.`annotation`.JsonPOJOBuilder import java.lang.IllegalStateException import kotlin.String import kotlin.jvm.JvmName +import com.netflix.graphql.dgs.codegen.cases.constantsWithExtendedQuery.expected.Generated as ExpectedGenerated +import jakarta.`annotation`.Generated as AnnotationGenerated +@AnnotationGenerated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) +@ExpectedGenerated @JsonTypeInfo(use = JsonTypeInfo.Id.NONE) @JsonDeserialize(builder = Person.Builder::class) public class Person( @@ -27,6 +31,8 @@ public class Person( public val lastname: String? get() = __lastname.invoke() + @AnnotationGenerated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) + @ExpectedGenerated public companion object { private val firstnameDefault: () -> String? = { throw IllegalStateException("Field `firstname` was not requested") } @@ -35,6 +41,8 @@ public class Person( { throw IllegalStateException("Field `lastname` was not requested") } } + @AnnotationGenerated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) + @ExpectedGenerated @JsonPOJOBuilder @JsonIgnoreProperties("__typename") public class Builder { diff --git a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/constantsWithExtendedQuery/expected/types/Query.kt b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/constantsWithExtendedQuery/expected/types/Query.kt index 8ecf2b9cb..299a2b5e5 100644 --- a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/constantsWithExtendedQuery/expected/types/Query.kt +++ b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/constantsWithExtendedQuery/expected/types/Query.kt @@ -8,7 +8,11 @@ import com.fasterxml.jackson.databind.`annotation`.JsonPOJOBuilder import java.lang.IllegalStateException import kotlin.collections.List import kotlin.jvm.JvmName +import com.netflix.graphql.dgs.codegen.cases.constantsWithExtendedQuery.expected.Generated as ExpectedGenerated +import jakarta.`annotation`.Generated as AnnotationGenerated +@AnnotationGenerated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) +@ExpectedGenerated @JsonTypeInfo(use = JsonTypeInfo.Id.NONE) @JsonDeserialize(builder = Query.Builder::class) public class Query( @@ -27,6 +31,8 @@ public class Query( public val friends: List? get() = __friends.invoke() + @AnnotationGenerated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) + @ExpectedGenerated public companion object { private val peopleDefault: () -> List? = { throw IllegalStateException("Field `people` was not requested") } @@ -35,6 +41,8 @@ public class Query( { throw IllegalStateException("Field `friends` was not requested") } } + @AnnotationGenerated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) + @ExpectedGenerated @JsonPOJOBuilder @JsonIgnoreProperties("__typename") public class Builder { diff --git a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/constantsWithExtendedTypes/expected/DgsClient.kt b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/constantsWithExtendedTypes/expected/DgsClient.kt index 3998f0453..627838960 100644 --- a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/constantsWithExtendedTypes/expected/DgsClient.kt +++ b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/constantsWithExtendedTypes/expected/DgsClient.kt @@ -6,6 +6,8 @@ import com.netflix.graphql.dgs.codegen.cases.constantsWithExtendedTypes.expected import graphql.language.OperationDefinition import kotlin.String +@jakarta.`annotation`.Generated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) +@Generated public object DgsClient { public fun buildQuery(inputValueSerializer: InputValueSerializerInterface? = null, _projection: QueryProjection.() -> QueryProjection): String = diff --git a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/constantsWithExtendedTypes/expected/DgsConstants.kt b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/constantsWithExtendedTypes/expected/DgsConstants.kt index 8b6ca5986..27dfd608f 100644 --- a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/constantsWithExtendedTypes/expected/DgsConstants.kt +++ b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/constantsWithExtendedTypes/expected/DgsConstants.kt @@ -2,15 +2,21 @@ package com.netflix.graphql.dgs.codegen.cases.constantsWithExtendedTypes.expecte import kotlin.String +@jakarta.`annotation`.Generated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) +@Generated public object DgsConstants { public const val QUERY_TYPE: String = "Query" + @jakarta.`annotation`.Generated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) + @Generated public object QUERY { public const val TYPE_NAME: String = "Query" public const val People: String = "people" } + @jakarta.`annotation`.Generated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) + @Generated public object PERSON { public const val TYPE_NAME: String = "Person" diff --git a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/constantsWithExtendedTypes/expected/Generated.kt b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/constantsWithExtendedTypes/expected/Generated.kt new file mode 100644 index 000000000..c4fe3f871 --- /dev/null +++ b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/constantsWithExtendedTypes/expected/Generated.kt @@ -0,0 +1,7 @@ +package com.netflix.graphql.dgs.codegen.cases.constantsWithExtendedTypes.expected + +import kotlin.`annotation`.AnnotationRetention +import kotlin.`annotation`.Retention + +@Retention(value = AnnotationRetention.BINARY) +public annotation class Generated diff --git a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/constantsWithExtendedTypes/expected/client/PersonProjection.kt b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/constantsWithExtendedTypes/expected/client/PersonProjection.kt index 80dfe0624..9b7cbc72a 100644 --- a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/constantsWithExtendedTypes/expected/client/PersonProjection.kt +++ b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/constantsWithExtendedTypes/expected/client/PersonProjection.kt @@ -2,7 +2,11 @@ package com.netflix.graphql.dgs.codegen.cases.constantsWithExtendedTypes.expecte import com.netflix.graphql.dgs.client.codegen.InputValueSerializerInterface import com.netflix.graphql.dgs.codegen.GraphQLProjection +import com.netflix.graphql.dgs.codegen.cases.constantsWithExtendedTypes.expected.Generated as ExpectedGenerated +import jakarta.`annotation`.Generated as AnnotationGenerated +@AnnotationGenerated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) +@ExpectedGenerated public class PersonProjection( inputValueSerializer: InputValueSerializerInterface? = null, ) : GraphQLProjection(inputValueSerializer) { diff --git a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/constantsWithExtendedTypes/expected/client/QueryProjection.kt b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/constantsWithExtendedTypes/expected/client/QueryProjection.kt index 9e9e79f41..9487a3167 100644 --- a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/constantsWithExtendedTypes/expected/client/QueryProjection.kt +++ b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/constantsWithExtendedTypes/expected/client/QueryProjection.kt @@ -3,7 +3,11 @@ package com.netflix.graphql.dgs.codegen.cases.constantsWithExtendedTypes.expecte import com.netflix.graphql.dgs.client.codegen.InputValueSerializerInterface import com.netflix.graphql.dgs.codegen.GraphQLProjection import kotlin.String +import com.netflix.graphql.dgs.codegen.cases.constantsWithExtendedTypes.expected.Generated as ExpectedGenerated +import jakarta.`annotation`.Generated as AnnotationGenerated +@AnnotationGenerated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) +@ExpectedGenerated public class QueryProjection( inputValueSerializer: InputValueSerializerInterface? = null, ) : GraphQLProjection(inputValueSerializer) { diff --git a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/constantsWithExtendedTypes/expected/types/Person.kt b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/constantsWithExtendedTypes/expected/types/Person.kt index 82eaf19f6..a0668ecaf 100644 --- a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/constantsWithExtendedTypes/expected/types/Person.kt +++ b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/constantsWithExtendedTypes/expected/types/Person.kt @@ -8,7 +8,11 @@ import com.fasterxml.jackson.databind.`annotation`.JsonPOJOBuilder import java.lang.IllegalStateException import kotlin.String import kotlin.jvm.JvmName +import com.netflix.graphql.dgs.codegen.cases.constantsWithExtendedTypes.expected.Generated as ExpectedGenerated +import jakarta.`annotation`.Generated as AnnotationGenerated +@AnnotationGenerated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) +@ExpectedGenerated @JsonTypeInfo(use = JsonTypeInfo.Id.NONE) @JsonDeserialize(builder = Person.Builder::class) public class Person( @@ -34,6 +38,8 @@ public class Person( public val email: String? get() = __email.invoke() + @AnnotationGenerated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) + @ExpectedGenerated public companion object { private val firstnameDefault: () -> String? = { throw IllegalStateException("Field `firstname` was not requested") } @@ -45,6 +51,8 @@ public class Person( { throw IllegalStateException("Field `email` was not requested") } } + @AnnotationGenerated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) + @ExpectedGenerated @JsonPOJOBuilder @JsonIgnoreProperties("__typename") public class Builder { diff --git a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/constantsWithExtendedTypes/expected/types/Query.kt b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/constantsWithExtendedTypes/expected/types/Query.kt index 6bd54c0ef..37dae79d9 100644 --- a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/constantsWithExtendedTypes/expected/types/Query.kt +++ b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/constantsWithExtendedTypes/expected/types/Query.kt @@ -8,7 +8,11 @@ import com.fasterxml.jackson.databind.`annotation`.JsonPOJOBuilder import java.lang.IllegalStateException import kotlin.collections.List import kotlin.jvm.JvmName +import com.netflix.graphql.dgs.codegen.cases.constantsWithExtendedTypes.expected.Generated as ExpectedGenerated +import jakarta.`annotation`.Generated as AnnotationGenerated +@AnnotationGenerated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) +@ExpectedGenerated @JsonTypeInfo(use = JsonTypeInfo.Id.NONE) @JsonDeserialize(builder = Query.Builder::class) public class Query( @@ -20,11 +24,15 @@ public class Query( public val people: List? get() = __people.invoke() + @AnnotationGenerated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) + @ExpectedGenerated public companion object { private val peopleDefault: () -> List? = { throw IllegalStateException("Field `people` was not requested") } } + @AnnotationGenerated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) + @ExpectedGenerated @JsonPOJOBuilder @JsonIgnoreProperties("__typename") public class Builder { diff --git a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassDocs/expected/DgsClient.kt b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassDocs/expected/DgsClient.kt index 56cac36cd..7e7f68baa 100644 --- a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassDocs/expected/DgsClient.kt +++ b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassDocs/expected/DgsClient.kt @@ -6,6 +6,8 @@ import com.netflix.graphql.dgs.codegen.cases.dataClassDocs.expected.client.Query import graphql.language.OperationDefinition import kotlin.String +@jakarta.`annotation`.Generated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) +@Generated public object DgsClient { public fun buildQuery(inputValueSerializer: InputValueSerializerInterface? = null, _projection: QueryProjection.() -> QueryProjection): String = diff --git a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassDocs/expected/DgsConstants.kt b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassDocs/expected/DgsConstants.kt index c470db1f7..d5719fef8 100644 --- a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassDocs/expected/DgsConstants.kt +++ b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassDocs/expected/DgsConstants.kt @@ -2,25 +2,35 @@ package com.netflix.graphql.dgs.codegen.cases.dataClassDocs.expected import kotlin.String +@jakarta.`annotation`.Generated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) +@Generated public object DgsConstants { public const val QUERY_TYPE: String = "Query" + @jakarta.`annotation`.Generated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) + @Generated public object QUERY { public const val TYPE_NAME: String = "Query" public const val Search: String = "search" + @jakarta.`annotation`.Generated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) + @Generated public object SEARCH_INPUT_ARGUMENT { public const val MovieFilter: String = "movieFilter" } } + @jakarta.`annotation`.Generated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) + @Generated public object MOVIE { public const val TYPE_NAME: String = "Movie" public const val Title: String = "title" } + @jakarta.`annotation`.Generated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) + @Generated public object MOVIEFILTER { public const val TYPE_NAME: String = "MovieFilter" diff --git a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassDocs/expected/Generated.kt b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassDocs/expected/Generated.kt new file mode 100644 index 000000000..b1ea96b19 --- /dev/null +++ b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassDocs/expected/Generated.kt @@ -0,0 +1,7 @@ +package com.netflix.graphql.dgs.codegen.cases.dataClassDocs.expected + +import kotlin.`annotation`.AnnotationRetention +import kotlin.`annotation`.Retention + +@Retention(value = AnnotationRetention.BINARY) +public annotation class Generated diff --git a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassDocs/expected/client/MovieProjection.kt b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassDocs/expected/client/MovieProjection.kt index 1be5ef5a0..5d78fb38b 100644 --- a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassDocs/expected/client/MovieProjection.kt +++ b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassDocs/expected/client/MovieProjection.kt @@ -2,7 +2,11 @@ package com.netflix.graphql.dgs.codegen.cases.dataClassDocs.expected.client import com.netflix.graphql.dgs.client.codegen.InputValueSerializerInterface import com.netflix.graphql.dgs.codegen.GraphQLProjection +import com.netflix.graphql.dgs.codegen.cases.dataClassDocs.expected.Generated as ExpectedGenerated +import jakarta.`annotation`.Generated as AnnotationGenerated +@AnnotationGenerated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) +@ExpectedGenerated public class MovieProjection( inputValueSerializer: InputValueSerializerInterface? = null, ) : GraphQLProjection(inputValueSerializer) { diff --git a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassDocs/expected/client/QueryProjection.kt b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassDocs/expected/client/QueryProjection.kt index 095223465..e23d22a57 100644 --- a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassDocs/expected/client/QueryProjection.kt +++ b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassDocs/expected/client/QueryProjection.kt @@ -4,7 +4,11 @@ import com.netflix.graphql.dgs.client.codegen.InputValueSerializerInterface import com.netflix.graphql.dgs.codegen.GraphQLProjection import com.netflix.graphql.dgs.codegen.cases.dataClassDocs.expected.types.MovieFilter import kotlin.String +import com.netflix.graphql.dgs.codegen.cases.dataClassDocs.expected.Generated as ExpectedGenerated +import jakarta.`annotation`.Generated as AnnotationGenerated +@AnnotationGenerated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) +@ExpectedGenerated public class QueryProjection( inputValueSerializer: InputValueSerializerInterface? = null, ) : GraphQLProjection(inputValueSerializer) { diff --git a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassDocs/expected/types/Movie.kt b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassDocs/expected/types/Movie.kt index 64f1ac388..591ec6346 100644 --- a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassDocs/expected/types/Movie.kt +++ b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassDocs/expected/types/Movie.kt @@ -8,11 +8,15 @@ import com.fasterxml.jackson.databind.`annotation`.JsonPOJOBuilder import java.lang.IllegalStateException import kotlin.String import kotlin.jvm.JvmName +import com.netflix.graphql.dgs.codegen.cases.dataClassDocs.expected.Generated as ExpectedGenerated +import jakarta.`annotation`.Generated as AnnotationGenerated /** * Movies are fun to watch. * They also work well as examples in GraphQL. */ +@AnnotationGenerated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) +@ExpectedGenerated @JsonTypeInfo(use = JsonTypeInfo.Id.NONE) @JsonDeserialize(builder = Movie.Builder::class) public class Movie( @@ -24,11 +28,15 @@ public class Movie( public val title: String? get() = __title.invoke() + @AnnotationGenerated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) + @ExpectedGenerated public companion object { private val titleDefault: () -> String? = { throw IllegalStateException("Field `title` was not requested") } } + @AnnotationGenerated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) + @ExpectedGenerated @JsonPOJOBuilder @JsonIgnoreProperties("__typename") public class Builder { diff --git a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassDocs/expected/types/MovieFilter.kt b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassDocs/expected/types/MovieFilter.kt index 20510a93e..4bbd8a681 100644 --- a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassDocs/expected/types/MovieFilter.kt +++ b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassDocs/expected/types/MovieFilter.kt @@ -6,12 +6,16 @@ import kotlin.Any import kotlin.Pair import kotlin.String import kotlin.collections.List +import com.netflix.graphql.dgs.codegen.cases.dataClassDocs.expected.Generated as ExpectedGenerated +import jakarta.`annotation`.Generated as AnnotationGenerated /** * Example filter for Movies. * * It takes a title and such. */ +@AnnotationGenerated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) +@ExpectedGenerated public data class MovieFilter( @JsonProperty("titleFilter") public val titleFilter: String? = default("titleFilter", null), diff --git a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassDocs/expected/types/Query.kt b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassDocs/expected/types/Query.kt index d6474ef21..8eb997b73 100644 --- a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassDocs/expected/types/Query.kt +++ b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassDocs/expected/types/Query.kt @@ -7,7 +7,11 @@ import com.fasterxml.jackson.databind.`annotation`.JsonDeserialize import com.fasterxml.jackson.databind.`annotation`.JsonPOJOBuilder import java.lang.IllegalStateException import kotlin.jvm.JvmName +import com.netflix.graphql.dgs.codegen.cases.dataClassDocs.expected.Generated as ExpectedGenerated +import jakarta.`annotation`.Generated as AnnotationGenerated +@AnnotationGenerated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) +@ExpectedGenerated @JsonTypeInfo(use = JsonTypeInfo.Id.NONE) @JsonDeserialize(builder = Query.Builder::class) public class Query( @@ -19,11 +23,15 @@ public class Query( public val search: Movie? get() = __search.invoke() + @AnnotationGenerated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) + @ExpectedGenerated public companion object { private val searchDefault: () -> Movie? = { throw IllegalStateException("Field `search` was not requested") } } + @AnnotationGenerated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) + @ExpectedGenerated @JsonPOJOBuilder @JsonIgnoreProperties("__typename") public class Builder { diff --git a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassFieldDocs/expected/DgsClient.kt b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassFieldDocs/expected/DgsClient.kt index b4f7417bd..48f11228d 100644 --- a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassFieldDocs/expected/DgsClient.kt +++ b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassFieldDocs/expected/DgsClient.kt @@ -6,6 +6,8 @@ import com.netflix.graphql.dgs.codegen.cases.dataClassFieldDocs.expected.client. import graphql.language.OperationDefinition import kotlin.String +@jakarta.`annotation`.Generated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) +@Generated public object DgsClient { public fun buildQuery(inputValueSerializer: InputValueSerializerInterface? = null, _projection: QueryProjection.() -> QueryProjection): String = diff --git a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassFieldDocs/expected/DgsConstants.kt b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassFieldDocs/expected/DgsConstants.kt index 94b2cd0fe..350d7db68 100644 --- a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassFieldDocs/expected/DgsConstants.kt +++ b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassFieldDocs/expected/DgsConstants.kt @@ -2,25 +2,35 @@ package com.netflix.graphql.dgs.codegen.cases.dataClassFieldDocs.expected import kotlin.String +@jakarta.`annotation`.Generated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) +@Generated public object DgsConstants { public const val QUERY_TYPE: String = "Query" + @jakarta.`annotation`.Generated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) + @Generated public object QUERY { public const val TYPE_NAME: String = "Query" public const val Search: String = "search" + @jakarta.`annotation`.Generated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) + @Generated public object SEARCH_INPUT_ARGUMENT { public const val MovieFilter: String = "movieFilter" } } + @jakarta.`annotation`.Generated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) + @Generated public object MOVIE { public const val TYPE_NAME: String = "Movie" public const val Title: String = "title" } + @jakarta.`annotation`.Generated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) + @Generated public object MOVIEFILTER { public const val TYPE_NAME: String = "MovieFilter" diff --git a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassFieldDocs/expected/Generated.kt b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassFieldDocs/expected/Generated.kt new file mode 100644 index 000000000..a5562bee6 --- /dev/null +++ b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassFieldDocs/expected/Generated.kt @@ -0,0 +1,7 @@ +package com.netflix.graphql.dgs.codegen.cases.dataClassFieldDocs.expected + +import kotlin.`annotation`.AnnotationRetention +import kotlin.`annotation`.Retention + +@Retention(value = AnnotationRetention.BINARY) +public annotation class Generated diff --git a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassFieldDocs/expected/client/MovieProjection.kt b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassFieldDocs/expected/client/MovieProjection.kt index 4788342db..1eefdc655 100644 --- a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassFieldDocs/expected/client/MovieProjection.kt +++ b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassFieldDocs/expected/client/MovieProjection.kt @@ -2,7 +2,11 @@ package com.netflix.graphql.dgs.codegen.cases.dataClassFieldDocs.expected.client import com.netflix.graphql.dgs.client.codegen.InputValueSerializerInterface import com.netflix.graphql.dgs.codegen.GraphQLProjection +import com.netflix.graphql.dgs.codegen.cases.dataClassFieldDocs.expected.Generated as ExpectedGenerated +import jakarta.`annotation`.Generated as AnnotationGenerated +@AnnotationGenerated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) +@ExpectedGenerated public class MovieProjection( inputValueSerializer: InputValueSerializerInterface? = null, ) : GraphQLProjection(inputValueSerializer) { diff --git a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassFieldDocs/expected/client/QueryProjection.kt b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassFieldDocs/expected/client/QueryProjection.kt index e5afed51c..21a89f403 100644 --- a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassFieldDocs/expected/client/QueryProjection.kt +++ b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassFieldDocs/expected/client/QueryProjection.kt @@ -4,7 +4,11 @@ import com.netflix.graphql.dgs.client.codegen.InputValueSerializerInterface import com.netflix.graphql.dgs.codegen.GraphQLProjection import com.netflix.graphql.dgs.codegen.cases.dataClassFieldDocs.expected.types.MovieFilter import kotlin.String +import com.netflix.graphql.dgs.codegen.cases.dataClassFieldDocs.expected.Generated as ExpectedGenerated +import jakarta.`annotation`.Generated as AnnotationGenerated +@AnnotationGenerated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) +@ExpectedGenerated public class QueryProjection( inputValueSerializer: InputValueSerializerInterface? = null, ) : GraphQLProjection(inputValueSerializer) { diff --git a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassFieldDocs/expected/types/Movie.kt b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassFieldDocs/expected/types/Movie.kt index b56b7fd0e..10064bed7 100644 --- a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassFieldDocs/expected/types/Movie.kt +++ b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassFieldDocs/expected/types/Movie.kt @@ -8,7 +8,11 @@ import com.fasterxml.jackson.databind.`annotation`.JsonPOJOBuilder import java.lang.IllegalStateException import kotlin.String import kotlin.jvm.JvmName +import com.netflix.graphql.dgs.codegen.cases.dataClassFieldDocs.expected.Generated as ExpectedGenerated +import jakarta.`annotation`.Generated as AnnotationGenerated +@AnnotationGenerated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) +@ExpectedGenerated @JsonTypeInfo(use = JsonTypeInfo.Id.NONE) @JsonDeserialize(builder = Movie.Builder::class) public class Movie( @@ -23,11 +27,15 @@ public class Movie( public val title: String? get() = __title.invoke() + @AnnotationGenerated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) + @ExpectedGenerated public companion object { private val titleDefault: () -> String? = { throw IllegalStateException("Field `title` was not requested") } } + @AnnotationGenerated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) + @ExpectedGenerated @JsonPOJOBuilder @JsonIgnoreProperties("__typename") public class Builder { diff --git a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassFieldDocs/expected/types/MovieFilter.kt b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassFieldDocs/expected/types/MovieFilter.kt index dfb71ce60..7637044ed 100644 --- a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassFieldDocs/expected/types/MovieFilter.kt +++ b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassFieldDocs/expected/types/MovieFilter.kt @@ -6,7 +6,11 @@ import kotlin.Any import kotlin.Pair import kotlin.String import kotlin.collections.List +import com.netflix.graphql.dgs.codegen.cases.dataClassFieldDocs.expected.Generated as ExpectedGenerated +import jakarta.`annotation`.Generated as AnnotationGenerated +@AnnotationGenerated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) +@ExpectedGenerated public data class MovieFilter( @JsonProperty("titleFilter") public val titleFilter: String? = default("titleFilter", null), diff --git a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassFieldDocs/expected/types/Query.kt b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassFieldDocs/expected/types/Query.kt index 74e1ad41b..8c1f89ccd 100644 --- a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassFieldDocs/expected/types/Query.kt +++ b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassFieldDocs/expected/types/Query.kt @@ -7,7 +7,11 @@ import com.fasterxml.jackson.databind.`annotation`.JsonDeserialize import com.fasterxml.jackson.databind.`annotation`.JsonPOJOBuilder import java.lang.IllegalStateException import kotlin.jvm.JvmName +import com.netflix.graphql.dgs.codegen.cases.dataClassFieldDocs.expected.Generated as ExpectedGenerated +import jakarta.`annotation`.Generated as AnnotationGenerated +@AnnotationGenerated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) +@ExpectedGenerated @JsonTypeInfo(use = JsonTypeInfo.Id.NONE) @JsonDeserialize(builder = Query.Builder::class) public class Query( @@ -19,11 +23,15 @@ public class Query( public val search: Movie? get() = __search.invoke() + @AnnotationGenerated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) + @ExpectedGenerated public companion object { private val searchDefault: () -> Movie? = { throw IllegalStateException("Field `search` was not requested") } } + @AnnotationGenerated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) + @ExpectedGenerated @JsonPOJOBuilder @JsonIgnoreProperties("__typename") public class Builder { diff --git a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWIthNoFields/expected/DgsClient.kt b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWIthNoFields/expected/DgsClient.kt index 72cabca6d..7d5d0702c 100644 --- a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWIthNoFields/expected/DgsClient.kt +++ b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWIthNoFields/expected/DgsClient.kt @@ -6,6 +6,8 @@ import com.netflix.graphql.dgs.codegen.cases.dataClassWIthNoFields.expected.clie import graphql.language.OperationDefinition import kotlin.String +@jakarta.`annotation`.Generated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) +@Generated public object DgsClient { public fun buildQuery(inputValueSerializer: InputValueSerializerInterface? = null, _projection: QueryProjection.() -> QueryProjection): String = diff --git a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWIthNoFields/expected/DgsConstants.kt b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWIthNoFields/expected/DgsConstants.kt index aac43b021..0905a1083 100644 --- a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWIthNoFields/expected/DgsConstants.kt +++ b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWIthNoFields/expected/DgsConstants.kt @@ -2,15 +2,21 @@ package com.netflix.graphql.dgs.codegen.cases.dataClassWIthNoFields.expected import kotlin.String +@jakarta.`annotation`.Generated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) +@Generated public object DgsConstants { public const val QUERY_TYPE: String = "Query" + @jakarta.`annotation`.Generated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) + @Generated public object QUERY { public const val TYPE_NAME: String = "Query" public const val Me: String = "me" } + @jakarta.`annotation`.Generated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) + @Generated public object PERSON { public const val TYPE_NAME: String = "Person" } diff --git a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWIthNoFields/expected/Generated.kt b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWIthNoFields/expected/Generated.kt new file mode 100644 index 000000000..09022abc7 --- /dev/null +++ b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWIthNoFields/expected/Generated.kt @@ -0,0 +1,7 @@ +package com.netflix.graphql.dgs.codegen.cases.dataClassWIthNoFields.expected + +import kotlin.`annotation`.AnnotationRetention +import kotlin.`annotation`.Retention + +@Retention(value = AnnotationRetention.BINARY) +public annotation class Generated diff --git a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWIthNoFields/expected/client/PersonProjection.kt b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWIthNoFields/expected/client/PersonProjection.kt index fb74196e3..7eca9b60f 100644 --- a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWIthNoFields/expected/client/PersonProjection.kt +++ b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWIthNoFields/expected/client/PersonProjection.kt @@ -2,7 +2,11 @@ package com.netflix.graphql.dgs.codegen.cases.dataClassWIthNoFields.expected.cli import com.netflix.graphql.dgs.client.codegen.InputValueSerializerInterface import com.netflix.graphql.dgs.codegen.GraphQLProjection +import com.netflix.graphql.dgs.codegen.cases.dataClassWIthNoFields.expected.Generated as ExpectedGenerated +import jakarta.`annotation`.Generated as AnnotationGenerated +@AnnotationGenerated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) +@ExpectedGenerated public class PersonProjection( inputValueSerializer: InputValueSerializerInterface? = null, ) : GraphQLProjection(inputValueSerializer) diff --git a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWIthNoFields/expected/client/QueryProjection.kt b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWIthNoFields/expected/client/QueryProjection.kt index c1b9249f3..76c8121eb 100644 --- a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWIthNoFields/expected/client/QueryProjection.kt +++ b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWIthNoFields/expected/client/QueryProjection.kt @@ -3,7 +3,11 @@ package com.netflix.graphql.dgs.codegen.cases.dataClassWIthNoFields.expected.cli import com.netflix.graphql.dgs.client.codegen.InputValueSerializerInterface import com.netflix.graphql.dgs.codegen.GraphQLProjection import kotlin.String +import com.netflix.graphql.dgs.codegen.cases.dataClassWIthNoFields.expected.Generated as ExpectedGenerated +import jakarta.`annotation`.Generated as AnnotationGenerated +@AnnotationGenerated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) +@ExpectedGenerated public class QueryProjection( inputValueSerializer: InputValueSerializerInterface? = null, ) : GraphQLProjection(inputValueSerializer) { diff --git a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWIthNoFields/expected/types/Person.kt b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWIthNoFields/expected/types/Person.kt index 0b969e337..169e9e881 100644 --- a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWIthNoFields/expected/types/Person.kt +++ b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWIthNoFields/expected/types/Person.kt @@ -4,12 +4,20 @@ import com.fasterxml.jackson.`annotation`.JsonIgnoreProperties import com.fasterxml.jackson.`annotation`.JsonTypeInfo import com.fasterxml.jackson.databind.`annotation`.JsonDeserialize import com.fasterxml.jackson.databind.`annotation`.JsonPOJOBuilder +import com.netflix.graphql.dgs.codegen.cases.dataClassWIthNoFields.expected.Generated as ExpectedGenerated +import jakarta.`annotation`.Generated as AnnotationGenerated +@AnnotationGenerated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) +@ExpectedGenerated @JsonTypeInfo(use = JsonTypeInfo.Id.NONE) @JsonDeserialize(builder = Person.Builder::class) public class Person() { + @AnnotationGenerated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) + @ExpectedGenerated public companion object + @AnnotationGenerated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) + @ExpectedGenerated @JsonPOJOBuilder @JsonIgnoreProperties("__typename") public class Builder { diff --git a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWIthNoFields/expected/types/Query.kt b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWIthNoFields/expected/types/Query.kt index e6c0d19ce..209967204 100644 --- a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWIthNoFields/expected/types/Query.kt +++ b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWIthNoFields/expected/types/Query.kt @@ -7,7 +7,11 @@ import com.fasterxml.jackson.databind.`annotation`.JsonDeserialize import com.fasterxml.jackson.databind.`annotation`.JsonPOJOBuilder import java.lang.IllegalStateException import kotlin.jvm.JvmName +import com.netflix.graphql.dgs.codegen.cases.dataClassWIthNoFields.expected.Generated as ExpectedGenerated +import jakarta.`annotation`.Generated as AnnotationGenerated +@AnnotationGenerated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) +@ExpectedGenerated @JsonTypeInfo(use = JsonTypeInfo.Id.NONE) @JsonDeserialize(builder = Query.Builder::class) public class Query( @@ -19,11 +23,15 @@ public class Query( public val me: Person? get() = __me.invoke() + @AnnotationGenerated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) + @ExpectedGenerated public companion object { private val meDefault: () -> Person? = { throw IllegalStateException("Field `me` was not requested") } } + @AnnotationGenerated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) + @ExpectedGenerated @JsonPOJOBuilder @JsonIgnoreProperties("__typename") public class Builder { diff --git a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithBooleanField/expected/DgsClient.kt b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithBooleanField/expected/DgsClient.kt index c52f28271..4952ba835 100644 --- a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithBooleanField/expected/DgsClient.kt +++ b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithBooleanField/expected/DgsClient.kt @@ -6,6 +6,8 @@ import com.netflix.graphql.dgs.codegen.cases.dataClassWithBooleanField.expected. import graphql.language.OperationDefinition import kotlin.String +@jakarta.`annotation`.Generated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) +@Generated public object DgsClient { public fun buildQuery(inputValueSerializer: InputValueSerializerInterface? = null, _projection: QueryProjection.() -> QueryProjection): String = diff --git a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithBooleanField/expected/DgsConstants.kt b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithBooleanField/expected/DgsConstants.kt index f60193cdc..1b793f2da 100644 --- a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithBooleanField/expected/DgsConstants.kt +++ b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithBooleanField/expected/DgsConstants.kt @@ -2,15 +2,21 @@ package com.netflix.graphql.dgs.codegen.cases.dataClassWithBooleanField.expected import kotlin.String +@jakarta.`annotation`.Generated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) +@Generated public object DgsConstants { public const val QUERY_TYPE: String = "Query" + @jakarta.`annotation`.Generated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) + @Generated public object QUERY { public const val TYPE_NAME: String = "Query" public const val Test: String = "test" } + @jakarta.`annotation`.Generated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) + @Generated public object REQUIREDTESTTYPE { public const val TYPE_NAME: String = "RequiredTestType" diff --git a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithBooleanField/expected/Generated.kt b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithBooleanField/expected/Generated.kt new file mode 100644 index 000000000..3c2e95722 --- /dev/null +++ b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithBooleanField/expected/Generated.kt @@ -0,0 +1,7 @@ +package com.netflix.graphql.dgs.codegen.cases.dataClassWithBooleanField.expected + +import kotlin.`annotation`.AnnotationRetention +import kotlin.`annotation`.Retention + +@Retention(value = AnnotationRetention.BINARY) +public annotation class Generated diff --git a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithBooleanField/expected/client/QueryProjection.kt b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithBooleanField/expected/client/QueryProjection.kt index d338b748d..abf861e26 100644 --- a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithBooleanField/expected/client/QueryProjection.kt +++ b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithBooleanField/expected/client/QueryProjection.kt @@ -3,7 +3,11 @@ package com.netflix.graphql.dgs.codegen.cases.dataClassWithBooleanField.expected import com.netflix.graphql.dgs.client.codegen.InputValueSerializerInterface import com.netflix.graphql.dgs.codegen.GraphQLProjection import kotlin.String +import com.netflix.graphql.dgs.codegen.cases.dataClassWithBooleanField.expected.Generated as ExpectedGenerated +import jakarta.`annotation`.Generated as AnnotationGenerated +@AnnotationGenerated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) +@ExpectedGenerated public class QueryProjection( inputValueSerializer: InputValueSerializerInterface? = null, ) : GraphQLProjection(inputValueSerializer) { diff --git a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithBooleanField/expected/client/RequiredTestTypeProjection.kt b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithBooleanField/expected/client/RequiredTestTypeProjection.kt index 160bba5c3..ef2199877 100644 --- a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithBooleanField/expected/client/RequiredTestTypeProjection.kt +++ b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithBooleanField/expected/client/RequiredTestTypeProjection.kt @@ -2,7 +2,11 @@ package com.netflix.graphql.dgs.codegen.cases.dataClassWithBooleanField.expected import com.netflix.graphql.dgs.client.codegen.InputValueSerializerInterface import com.netflix.graphql.dgs.codegen.GraphQLProjection +import com.netflix.graphql.dgs.codegen.cases.dataClassWithBooleanField.expected.Generated as ExpectedGenerated +import jakarta.`annotation`.Generated as AnnotationGenerated +@AnnotationGenerated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) +@ExpectedGenerated public class RequiredTestTypeProjection( inputValueSerializer: InputValueSerializerInterface? = null, ) : GraphQLProjection(inputValueSerializer) { diff --git a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithBooleanField/expected/types/Query.kt b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithBooleanField/expected/types/Query.kt index 0d16e85d6..da9a6bbf0 100644 --- a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithBooleanField/expected/types/Query.kt +++ b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithBooleanField/expected/types/Query.kt @@ -7,7 +7,11 @@ import com.fasterxml.jackson.databind.`annotation`.JsonDeserialize import com.fasterxml.jackson.databind.`annotation`.JsonPOJOBuilder import java.lang.IllegalStateException import kotlin.jvm.JvmName +import com.netflix.graphql.dgs.codegen.cases.dataClassWithBooleanField.expected.Generated as ExpectedGenerated +import jakarta.`annotation`.Generated as AnnotationGenerated +@AnnotationGenerated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) +@ExpectedGenerated @JsonTypeInfo(use = JsonTypeInfo.Id.NONE) @JsonDeserialize(builder = Query.Builder::class) public class Query( @@ -19,11 +23,15 @@ public class Query( public val test: RequiredTestType? get() = __test.invoke() + @AnnotationGenerated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) + @ExpectedGenerated public companion object { private val testDefault: () -> RequiredTestType? = { throw IllegalStateException("Field `test` was not requested") } } + @AnnotationGenerated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) + @ExpectedGenerated @JsonPOJOBuilder @JsonIgnoreProperties("__typename") public class Builder { diff --git a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithBooleanField/expected/types/RequiredTestType.kt b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithBooleanField/expected/types/RequiredTestType.kt index f5b7c7cb4..e618ddd2f 100644 --- a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithBooleanField/expected/types/RequiredTestType.kt +++ b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithBooleanField/expected/types/RequiredTestType.kt @@ -8,7 +8,11 @@ import com.fasterxml.jackson.databind.`annotation`.JsonPOJOBuilder import java.lang.IllegalStateException import kotlin.Boolean import kotlin.jvm.JvmName +import com.netflix.graphql.dgs.codegen.cases.dataClassWithBooleanField.expected.Generated as ExpectedGenerated +import jakarta.`annotation`.Generated as AnnotationGenerated +@AnnotationGenerated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) +@ExpectedGenerated @JsonTypeInfo(use = JsonTypeInfo.Id.NONE) @JsonDeserialize(builder = RequiredTestType.Builder::class) public class RequiredTestType( @@ -20,11 +24,15 @@ public class RequiredTestType( public val isRequired: Boolean get() = __isRequired.invoke() + @AnnotationGenerated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) + @ExpectedGenerated public companion object { private val isRequiredDefault: () -> Boolean = { throw IllegalStateException("Field `isRequired` was not requested") } } + @AnnotationGenerated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) + @ExpectedGenerated @JsonPOJOBuilder @JsonIgnoreProperties("__typename") public class Builder { diff --git a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithDeclaredScalars/expected/DgsClient.kt b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithDeclaredScalars/expected/DgsClient.kt index 18888d910..70e44a0f9 100644 --- a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithDeclaredScalars/expected/DgsClient.kt +++ b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithDeclaredScalars/expected/DgsClient.kt @@ -6,6 +6,8 @@ import com.netflix.graphql.dgs.codegen.cases.dataClassWithDeclaredScalars.expect import graphql.language.OperationDefinition import kotlin.String +@jakarta.`annotation`.Generated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) +@Generated public object DgsClient { public fun buildQuery(inputValueSerializer: InputValueSerializerInterface? = null, _projection: QueryProjection.() -> QueryProjection): String = diff --git a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithDeclaredScalars/expected/DgsConstants.kt b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithDeclaredScalars/expected/DgsConstants.kt index 747c2920a..2d2c7557b 100644 --- a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithDeclaredScalars/expected/DgsConstants.kt +++ b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithDeclaredScalars/expected/DgsConstants.kt @@ -2,9 +2,13 @@ package com.netflix.graphql.dgs.codegen.cases.dataClassWithDeclaredScalars.expec import kotlin.String +@jakarta.`annotation`.Generated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) +@Generated public object DgsConstants { public const val QUERY_TYPE: String = "Query" + @jakarta.`annotation`.Generated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) + @Generated public object QUERY { public const val TYPE_NAME: String = "Query" @@ -13,6 +17,8 @@ public object DgsConstants { public const val EntityConnection: String = "entityConnection" } + @jakarta.`annotation`.Generated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) + @Generated public object ENTITY { public const val TYPE_NAME: String = "Entity" @@ -21,6 +27,8 @@ public object DgsConstants { public const val DateTime: String = "dateTime" } + @jakarta.`annotation`.Generated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) + @Generated public object ENTITYCONNECTION { public const val TYPE_NAME: String = "EntityConnection" @@ -29,6 +37,8 @@ public object DgsConstants { public const val Edges: String = "edges" } + @jakarta.`annotation`.Generated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) + @Generated public object ENTITYEDGE { public const val TYPE_NAME: String = "EntityEdge" @@ -37,6 +47,8 @@ public object DgsConstants { public const val Node: String = "node" } + @jakarta.`annotation`.Generated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) + @Generated public object PAGEINFO { public const val TYPE_NAME: String = "PageInfo" diff --git a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithDeclaredScalars/expected/Generated.kt b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithDeclaredScalars/expected/Generated.kt new file mode 100644 index 000000000..41a88eb51 --- /dev/null +++ b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithDeclaredScalars/expected/Generated.kt @@ -0,0 +1,7 @@ +package com.netflix.graphql.dgs.codegen.cases.dataClassWithDeclaredScalars.expected + +import kotlin.`annotation`.AnnotationRetention +import kotlin.`annotation`.Retention + +@Retention(value = AnnotationRetention.BINARY) +public annotation class Generated diff --git a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithDeclaredScalars/expected/client/EntityConnectionProjection.kt b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithDeclaredScalars/expected/client/EntityConnectionProjection.kt index 1d4e1fae2..e48bfe292 100644 --- a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithDeclaredScalars/expected/client/EntityConnectionProjection.kt +++ b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithDeclaredScalars/expected/client/EntityConnectionProjection.kt @@ -3,7 +3,11 @@ package com.netflix.graphql.dgs.codegen.cases.dataClassWithDeclaredScalars.expec import com.netflix.graphql.dgs.client.codegen.InputValueSerializerInterface import com.netflix.graphql.dgs.codegen.GraphQLProjection import kotlin.String +import com.netflix.graphql.dgs.codegen.cases.dataClassWithDeclaredScalars.expected.Generated as ExpectedGenerated +import jakarta.`annotation`.Generated as AnnotationGenerated +@AnnotationGenerated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) +@ExpectedGenerated public class EntityConnectionProjection( inputValueSerializer: InputValueSerializerInterface? = null, ) : GraphQLProjection(inputValueSerializer) { diff --git a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithDeclaredScalars/expected/client/EntityEdgeProjection.kt b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithDeclaredScalars/expected/client/EntityEdgeProjection.kt index be311c5af..1ac09d609 100644 --- a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithDeclaredScalars/expected/client/EntityEdgeProjection.kt +++ b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithDeclaredScalars/expected/client/EntityEdgeProjection.kt @@ -3,7 +3,11 @@ package com.netflix.graphql.dgs.codegen.cases.dataClassWithDeclaredScalars.expec import com.netflix.graphql.dgs.client.codegen.InputValueSerializerInterface import com.netflix.graphql.dgs.codegen.GraphQLProjection import kotlin.String +import com.netflix.graphql.dgs.codegen.cases.dataClassWithDeclaredScalars.expected.Generated as ExpectedGenerated +import jakarta.`annotation`.Generated as AnnotationGenerated +@AnnotationGenerated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) +@ExpectedGenerated public class EntityEdgeProjection( inputValueSerializer: InputValueSerializerInterface? = null, ) : GraphQLProjection(inputValueSerializer) { diff --git a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithDeclaredScalars/expected/client/EntityProjection.kt b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithDeclaredScalars/expected/client/EntityProjection.kt index 8ec0ae9dd..180f1b64c 100644 --- a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithDeclaredScalars/expected/client/EntityProjection.kt +++ b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithDeclaredScalars/expected/client/EntityProjection.kt @@ -2,7 +2,11 @@ package com.netflix.graphql.dgs.codegen.cases.dataClassWithDeclaredScalars.expec import com.netflix.graphql.dgs.client.codegen.InputValueSerializerInterface import com.netflix.graphql.dgs.codegen.GraphQLProjection +import com.netflix.graphql.dgs.codegen.cases.dataClassWithDeclaredScalars.expected.Generated as ExpectedGenerated +import jakarta.`annotation`.Generated as AnnotationGenerated +@AnnotationGenerated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) +@ExpectedGenerated public class EntityProjection( inputValueSerializer: InputValueSerializerInterface? = null, ) : GraphQLProjection(inputValueSerializer) { diff --git a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithDeclaredScalars/expected/client/PageInfoProjection.kt b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithDeclaredScalars/expected/client/PageInfoProjection.kt index 272a94d30..656099646 100644 --- a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithDeclaredScalars/expected/client/PageInfoProjection.kt +++ b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithDeclaredScalars/expected/client/PageInfoProjection.kt @@ -2,7 +2,11 @@ package com.netflix.graphql.dgs.codegen.cases.dataClassWithDeclaredScalars.expec import com.netflix.graphql.dgs.client.codegen.InputValueSerializerInterface import com.netflix.graphql.dgs.codegen.GraphQLProjection +import com.netflix.graphql.dgs.codegen.cases.dataClassWithDeclaredScalars.expected.Generated as ExpectedGenerated +import jakarta.`annotation`.Generated as AnnotationGenerated +@AnnotationGenerated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) +@ExpectedGenerated public class PageInfoProjection( inputValueSerializer: InputValueSerializerInterface? = null, ) : GraphQLProjection(inputValueSerializer) { diff --git a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithDeclaredScalars/expected/client/QueryProjection.kt b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithDeclaredScalars/expected/client/QueryProjection.kt index b0cba58a8..27af047d7 100644 --- a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithDeclaredScalars/expected/client/QueryProjection.kt +++ b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithDeclaredScalars/expected/client/QueryProjection.kt @@ -3,7 +3,11 @@ package com.netflix.graphql.dgs.codegen.cases.dataClassWithDeclaredScalars.expec import com.netflix.graphql.dgs.client.codegen.InputValueSerializerInterface import com.netflix.graphql.dgs.codegen.GraphQLProjection import kotlin.String +import com.netflix.graphql.dgs.codegen.cases.dataClassWithDeclaredScalars.expected.Generated as ExpectedGenerated +import jakarta.`annotation`.Generated as AnnotationGenerated +@AnnotationGenerated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) +@ExpectedGenerated public class QueryProjection( inputValueSerializer: InputValueSerializerInterface? = null, ) : GraphQLProjection(inputValueSerializer) { diff --git a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithDeclaredScalars/expected/types/Entity.kt b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithDeclaredScalars/expected/types/Entity.kt index 675fae78e..b3b1acb41 100644 --- a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithDeclaredScalars/expected/types/Entity.kt +++ b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithDeclaredScalars/expected/types/Entity.kt @@ -9,7 +9,11 @@ import java.lang.IllegalStateException import java.time.OffsetDateTime import kotlin.Long import kotlin.jvm.JvmName +import com.netflix.graphql.dgs.codegen.cases.dataClassWithDeclaredScalars.expected.Generated as ExpectedGenerated +import jakarta.`annotation`.Generated as AnnotationGenerated +@AnnotationGenerated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) +@ExpectedGenerated @JsonTypeInfo(use = JsonTypeInfo.Id.NONE) @JsonDeserialize(builder = Entity.Builder::class) public class Entity( @@ -28,6 +32,8 @@ public class Entity( public val dateTime: OffsetDateTime? get() = __dateTime.invoke() + @AnnotationGenerated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) + @ExpectedGenerated public companion object { private val longDefault: () -> Long? = { throw IllegalStateException("Field `long` was not requested") } @@ -36,6 +42,8 @@ public class Entity( { throw IllegalStateException("Field `dateTime` was not requested") } } + @AnnotationGenerated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) + @ExpectedGenerated @JsonPOJOBuilder @JsonIgnoreProperties("__typename") public class Builder { diff --git a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithDeclaredScalars/expected/types/EntityConnection.kt b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithDeclaredScalars/expected/types/EntityConnection.kt index 1ef984539..afb9cd067 100644 --- a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithDeclaredScalars/expected/types/EntityConnection.kt +++ b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithDeclaredScalars/expected/types/EntityConnection.kt @@ -8,7 +8,11 @@ import com.fasterxml.jackson.databind.`annotation`.JsonPOJOBuilder import java.lang.IllegalStateException import kotlin.collections.List import kotlin.jvm.JvmName +import com.netflix.graphql.dgs.codegen.cases.dataClassWithDeclaredScalars.expected.Generated as ExpectedGenerated +import jakarta.`annotation`.Generated as AnnotationGenerated +@AnnotationGenerated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) +@ExpectedGenerated @JsonTypeInfo(use = JsonTypeInfo.Id.NONE) @JsonDeserialize(builder = EntityConnection.Builder::class) public class EntityConnection( @@ -27,6 +31,8 @@ public class EntityConnection( public val edges: List? get() = __edges.invoke() + @AnnotationGenerated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) + @ExpectedGenerated public companion object { private val pageInfoDefault: () -> PageInfo = { throw IllegalStateException("Field `pageInfo` was not requested") } @@ -35,6 +41,8 @@ public class EntityConnection( { throw IllegalStateException("Field `edges` was not requested") } } + @AnnotationGenerated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) + @ExpectedGenerated @JsonPOJOBuilder @JsonIgnoreProperties("__typename") public class Builder { diff --git a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithDeclaredScalars/expected/types/EntityEdge.kt b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithDeclaredScalars/expected/types/EntityEdge.kt index 2ff90a47d..1905fea87 100644 --- a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithDeclaredScalars/expected/types/EntityEdge.kt +++ b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithDeclaredScalars/expected/types/EntityEdge.kt @@ -8,7 +8,11 @@ import com.fasterxml.jackson.databind.`annotation`.JsonPOJOBuilder import java.lang.IllegalStateException import kotlin.String import kotlin.jvm.JvmName +import com.netflix.graphql.dgs.codegen.cases.dataClassWithDeclaredScalars.expected.Generated as ExpectedGenerated +import jakarta.`annotation`.Generated as AnnotationGenerated +@AnnotationGenerated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) +@ExpectedGenerated @JsonTypeInfo(use = JsonTypeInfo.Id.NONE) @JsonDeserialize(builder = EntityEdge.Builder::class) public class EntityEdge( @@ -27,6 +31,8 @@ public class EntityEdge( public val node: Entity? get() = __node.invoke() + @AnnotationGenerated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) + @ExpectedGenerated public companion object { private val cursorDefault: () -> String = { throw IllegalStateException("Field `cursor` was not requested") } @@ -35,6 +41,8 @@ public class EntityEdge( { throw IllegalStateException("Field `node` was not requested") } } + @AnnotationGenerated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) + @ExpectedGenerated @JsonPOJOBuilder @JsonIgnoreProperties("__typename") public class Builder { diff --git a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithDeclaredScalars/expected/types/PageInfo.kt b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithDeclaredScalars/expected/types/PageInfo.kt index 16cd49208..5a6dfce0e 100644 --- a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithDeclaredScalars/expected/types/PageInfo.kt +++ b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithDeclaredScalars/expected/types/PageInfo.kt @@ -9,7 +9,11 @@ import java.lang.IllegalStateException import kotlin.Boolean import kotlin.String import kotlin.jvm.JvmName +import com.netflix.graphql.dgs.codegen.cases.dataClassWithDeclaredScalars.expected.Generated as ExpectedGenerated +import jakarta.`annotation`.Generated as AnnotationGenerated +@AnnotationGenerated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) +@ExpectedGenerated @JsonTypeInfo(use = JsonTypeInfo.Id.NONE) @JsonDeserialize(builder = PageInfo.Builder::class) public class PageInfo( @@ -42,6 +46,8 @@ public class PageInfo( public val hasPreviousPage: Boolean get() = __hasPreviousPage.invoke() + @AnnotationGenerated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) + @ExpectedGenerated public companion object { private val startCursorDefault: () -> String? = { throw IllegalStateException("Field `startCursor` was not requested") } @@ -56,6 +62,8 @@ public class PageInfo( { throw IllegalStateException("Field `hasPreviousPage` was not requested") } } + @AnnotationGenerated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) + @ExpectedGenerated @JsonPOJOBuilder @JsonIgnoreProperties("__typename") public class Builder { diff --git a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithDeclaredScalars/expected/types/Query.kt b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithDeclaredScalars/expected/types/Query.kt index b03b6ed47..c8cd6e909 100644 --- a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithDeclaredScalars/expected/types/Query.kt +++ b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithDeclaredScalars/expected/types/Query.kt @@ -8,7 +8,11 @@ import com.fasterxml.jackson.databind.`annotation`.JsonPOJOBuilder import java.lang.IllegalStateException import kotlin.collections.List import kotlin.jvm.JvmName +import com.netflix.graphql.dgs.codegen.cases.dataClassWithDeclaredScalars.expected.Generated as ExpectedGenerated +import jakarta.`annotation`.Generated as AnnotationGenerated +@AnnotationGenerated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) +@ExpectedGenerated @JsonTypeInfo(use = JsonTypeInfo.Id.NONE) @JsonDeserialize(builder = Query.Builder::class) public class Query( @@ -27,6 +31,8 @@ public class Query( public val entityConnection: EntityConnection? get() = __entityConnection.invoke() + @AnnotationGenerated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) + @ExpectedGenerated public companion object { private val entityDefault: () -> List? = { throw IllegalStateException("Field `entity` was not requested") } @@ -35,6 +41,8 @@ public class Query( { throw IllegalStateException("Field `entityConnection` was not requested") } } + @AnnotationGenerated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) + @ExpectedGenerated @JsonPOJOBuilder @JsonIgnoreProperties("__typename") public class Builder { diff --git a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithDeeplyNestedComplexField/expected/DgsClient.kt b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithDeeplyNestedComplexField/expected/DgsClient.kt index e8f105249..ba703ec32 100644 --- a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithDeeplyNestedComplexField/expected/DgsClient.kt +++ b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithDeeplyNestedComplexField/expected/DgsClient.kt @@ -6,6 +6,8 @@ import com.netflix.graphql.dgs.codegen.cases.dataClassWithDeeplyNestedComplexFie import graphql.language.OperationDefinition import kotlin.String +@jakarta.`annotation`.Generated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) +@Generated public object DgsClient { public fun buildQuery(inputValueSerializer: InputValueSerializerInterface? = null, _projection: QueryProjection.() -> QueryProjection): String = diff --git a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithDeeplyNestedComplexField/expected/DgsConstants.kt b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithDeeplyNestedComplexField/expected/DgsConstants.kt index 73bce8552..38d622b59 100644 --- a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithDeeplyNestedComplexField/expected/DgsConstants.kt +++ b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithDeeplyNestedComplexField/expected/DgsConstants.kt @@ -2,15 +2,21 @@ package com.netflix.graphql.dgs.codegen.cases.dataClassWithDeeplyNestedComplexFi import kotlin.String +@jakarta.`annotation`.Generated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) +@Generated public object DgsConstants { public const val QUERY_TYPE: String = "Query" + @jakarta.`annotation`.Generated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) + @Generated public object QUERY { public const val TYPE_NAME: String = "Query" public const val Cars: String = "cars" } + @jakarta.`annotation`.Generated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) + @Generated public object CAR { public const val TYPE_NAME: String = "Car" @@ -21,6 +27,8 @@ public object DgsConstants { public const val Engine: String = "engine" } + @jakarta.`annotation`.Generated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) + @Generated public object ENGINE { public const val TYPE_NAME: String = "Engine" @@ -33,6 +41,8 @@ public object DgsConstants { public const val Performance: String = "performance" } + @jakarta.`annotation`.Generated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) + @Generated public object PERFORMANCE { public const val TYPE_NAME: String = "Performance" diff --git a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithDeeplyNestedComplexField/expected/Generated.kt b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithDeeplyNestedComplexField/expected/Generated.kt new file mode 100644 index 000000000..b60e8e40e --- /dev/null +++ b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithDeeplyNestedComplexField/expected/Generated.kt @@ -0,0 +1,7 @@ +package com.netflix.graphql.dgs.codegen.cases.dataClassWithDeeplyNestedComplexField.expected + +import kotlin.`annotation`.AnnotationRetention +import kotlin.`annotation`.Retention + +@Retention(value = AnnotationRetention.BINARY) +public annotation class Generated diff --git a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithDeeplyNestedComplexField/expected/client/CarProjection.kt b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithDeeplyNestedComplexField/expected/client/CarProjection.kt index 67b022e37..d1071ddf6 100644 --- a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithDeeplyNestedComplexField/expected/client/CarProjection.kt +++ b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithDeeplyNestedComplexField/expected/client/CarProjection.kt @@ -3,7 +3,11 @@ package com.netflix.graphql.dgs.codegen.cases.dataClassWithDeeplyNestedComplexFi import com.netflix.graphql.dgs.client.codegen.InputValueSerializerInterface import com.netflix.graphql.dgs.codegen.GraphQLProjection import kotlin.String +import com.netflix.graphql.dgs.codegen.cases.dataClassWithDeeplyNestedComplexField.expected.Generated as ExpectedGenerated +import jakarta.`annotation`.Generated as AnnotationGenerated +@AnnotationGenerated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) +@ExpectedGenerated public class CarProjection( inputValueSerializer: InputValueSerializerInterface? = null, ) : GraphQLProjection(inputValueSerializer) { diff --git a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithDeeplyNestedComplexField/expected/client/EngineProjection.kt b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithDeeplyNestedComplexField/expected/client/EngineProjection.kt index d236cf8b9..3e07117d3 100644 --- a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithDeeplyNestedComplexField/expected/client/EngineProjection.kt +++ b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithDeeplyNestedComplexField/expected/client/EngineProjection.kt @@ -3,7 +3,11 @@ package com.netflix.graphql.dgs.codegen.cases.dataClassWithDeeplyNestedComplexFi import com.netflix.graphql.dgs.client.codegen.InputValueSerializerInterface import com.netflix.graphql.dgs.codegen.GraphQLProjection import kotlin.String +import com.netflix.graphql.dgs.codegen.cases.dataClassWithDeeplyNestedComplexField.expected.Generated as ExpectedGenerated +import jakarta.`annotation`.Generated as AnnotationGenerated +@AnnotationGenerated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) +@ExpectedGenerated public class EngineProjection( inputValueSerializer: InputValueSerializerInterface? = null, ) : GraphQLProjection(inputValueSerializer) { diff --git a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithDeeplyNestedComplexField/expected/client/PerformanceProjection.kt b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithDeeplyNestedComplexField/expected/client/PerformanceProjection.kt index 2223ab002..4ea646546 100644 --- a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithDeeplyNestedComplexField/expected/client/PerformanceProjection.kt +++ b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithDeeplyNestedComplexField/expected/client/PerformanceProjection.kt @@ -2,7 +2,11 @@ package com.netflix.graphql.dgs.codegen.cases.dataClassWithDeeplyNestedComplexFi import com.netflix.graphql.dgs.client.codegen.InputValueSerializerInterface import com.netflix.graphql.dgs.codegen.GraphQLProjection +import com.netflix.graphql.dgs.codegen.cases.dataClassWithDeeplyNestedComplexField.expected.Generated as ExpectedGenerated +import jakarta.`annotation`.Generated as AnnotationGenerated +@AnnotationGenerated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) +@ExpectedGenerated public class PerformanceProjection( inputValueSerializer: InputValueSerializerInterface? = null, ) : GraphQLProjection(inputValueSerializer) { diff --git a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithDeeplyNestedComplexField/expected/client/QueryProjection.kt b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithDeeplyNestedComplexField/expected/client/QueryProjection.kt index 7694bb472..cca278728 100644 --- a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithDeeplyNestedComplexField/expected/client/QueryProjection.kt +++ b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithDeeplyNestedComplexField/expected/client/QueryProjection.kt @@ -3,7 +3,11 @@ package com.netflix.graphql.dgs.codegen.cases.dataClassWithDeeplyNestedComplexFi import com.netflix.graphql.dgs.client.codegen.InputValueSerializerInterface import com.netflix.graphql.dgs.codegen.GraphQLProjection import kotlin.String +import com.netflix.graphql.dgs.codegen.cases.dataClassWithDeeplyNestedComplexField.expected.Generated as ExpectedGenerated +import jakarta.`annotation`.Generated as AnnotationGenerated +@AnnotationGenerated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) +@ExpectedGenerated public class QueryProjection( inputValueSerializer: InputValueSerializerInterface? = null, ) : GraphQLProjection(inputValueSerializer) { diff --git a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithDeeplyNestedComplexField/expected/types/Car.kt b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithDeeplyNestedComplexField/expected/types/Car.kt index 4b1761276..0f3f9c6d6 100644 --- a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithDeeplyNestedComplexField/expected/types/Car.kt +++ b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithDeeplyNestedComplexField/expected/types/Car.kt @@ -8,7 +8,11 @@ import com.fasterxml.jackson.databind.`annotation`.JsonPOJOBuilder import java.lang.IllegalStateException import kotlin.String import kotlin.jvm.JvmName +import com.netflix.graphql.dgs.codegen.cases.dataClassWithDeeplyNestedComplexField.expected.Generated as ExpectedGenerated +import jakarta.`annotation`.Generated as AnnotationGenerated +@AnnotationGenerated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) +@ExpectedGenerated @JsonTypeInfo(use = JsonTypeInfo.Id.NONE) @JsonDeserialize(builder = Car.Builder::class) public class Car( @@ -34,6 +38,8 @@ public class Car( public val engine: Engine? get() = __engine.invoke() + @AnnotationGenerated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) + @ExpectedGenerated public companion object { private val makeDefault: () -> String? = { throw IllegalStateException("Field `make` was not requested") } @@ -45,6 +51,8 @@ public class Car( { throw IllegalStateException("Field `engine` was not requested") } } + @AnnotationGenerated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) + @ExpectedGenerated @JsonPOJOBuilder @JsonIgnoreProperties("__typename") public class Builder { diff --git a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithDeeplyNestedComplexField/expected/types/Engine.kt b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithDeeplyNestedComplexField/expected/types/Engine.kt index 933dd8a2c..56bb9a24a 100644 --- a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithDeeplyNestedComplexField/expected/types/Engine.kt +++ b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithDeeplyNestedComplexField/expected/types/Engine.kt @@ -10,7 +10,11 @@ import kotlin.Double import kotlin.Int import kotlin.String import kotlin.jvm.JvmName +import com.netflix.graphql.dgs.codegen.cases.dataClassWithDeeplyNestedComplexField.expected.Generated as ExpectedGenerated +import jakarta.`annotation`.Generated as AnnotationGenerated +@AnnotationGenerated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) +@ExpectedGenerated @JsonTypeInfo(use = JsonTypeInfo.Id.NONE) @JsonDeserialize(builder = Engine.Builder::class) public class Engine( @@ -43,6 +47,8 @@ public class Engine( public val performance: Performance? get() = __performance.invoke() + @AnnotationGenerated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) + @ExpectedGenerated public companion object { private val typeDefault: () -> String? = { throw IllegalStateException("Field `type` was not requested") } @@ -57,6 +63,8 @@ public class Engine( { throw IllegalStateException("Field `performance` was not requested") } } + @AnnotationGenerated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) + @ExpectedGenerated @JsonPOJOBuilder @JsonIgnoreProperties("__typename") public class Builder { diff --git a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithDeeplyNestedComplexField/expected/types/Performance.kt b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithDeeplyNestedComplexField/expected/types/Performance.kt index 45ee173af..3084c39c2 100644 --- a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithDeeplyNestedComplexField/expected/types/Performance.kt +++ b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithDeeplyNestedComplexField/expected/types/Performance.kt @@ -8,7 +8,11 @@ import com.fasterxml.jackson.databind.`annotation`.JsonPOJOBuilder import java.lang.IllegalStateException import kotlin.Double import kotlin.jvm.JvmName +import com.netflix.graphql.dgs.codegen.cases.dataClassWithDeeplyNestedComplexField.expected.Generated as ExpectedGenerated +import jakarta.`annotation`.Generated as AnnotationGenerated +@AnnotationGenerated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) +@ExpectedGenerated @JsonTypeInfo(use = JsonTypeInfo.Id.NONE) @JsonDeserialize(builder = Performance.Builder::class) public class Performance( @@ -27,6 +31,8 @@ public class Performance( public val quarterMile: Double? get() = __quarterMile.invoke() + @AnnotationGenerated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) + @ExpectedGenerated public companion object { private val zeroToSixtyDefault: () -> Double? = { throw IllegalStateException("Field `zeroToSixty` was not requested") } @@ -35,6 +41,8 @@ public class Performance( { throw IllegalStateException("Field `quarterMile` was not requested") } } + @AnnotationGenerated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) + @ExpectedGenerated @JsonPOJOBuilder @JsonIgnoreProperties("__typename") public class Builder { diff --git a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithDeeplyNestedComplexField/expected/types/Query.kt b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithDeeplyNestedComplexField/expected/types/Query.kt index 4833681d2..9c8a7d5d3 100644 --- a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithDeeplyNestedComplexField/expected/types/Query.kt +++ b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithDeeplyNestedComplexField/expected/types/Query.kt @@ -8,7 +8,11 @@ import com.fasterxml.jackson.databind.`annotation`.JsonPOJOBuilder import java.lang.IllegalStateException import kotlin.collections.List import kotlin.jvm.JvmName +import com.netflix.graphql.dgs.codegen.cases.dataClassWithDeeplyNestedComplexField.expected.Generated as ExpectedGenerated +import jakarta.`annotation`.Generated as AnnotationGenerated +@AnnotationGenerated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) +@ExpectedGenerated @JsonTypeInfo(use = JsonTypeInfo.Id.NONE) @JsonDeserialize(builder = Query.Builder::class) public class Query( @@ -20,11 +24,15 @@ public class Query( public val cars: List? get() = __cars.invoke() + @AnnotationGenerated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) + @ExpectedGenerated public companion object { private val carsDefault: () -> List? = { throw IllegalStateException("Field `cars` was not requested") } } + @AnnotationGenerated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) + @ExpectedGenerated @JsonPOJOBuilder @JsonIgnoreProperties("__typename") public class Builder { diff --git a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithExtendedInterface/expected/DgsClient.kt b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithExtendedInterface/expected/DgsClient.kt index d949b46c2..b564d6db7 100644 --- a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithExtendedInterface/expected/DgsClient.kt +++ b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithExtendedInterface/expected/DgsClient.kt @@ -6,6 +6,8 @@ import com.netflix.graphql.dgs.codegen.cases.dataClassWithExtendedInterface.expe import graphql.language.OperationDefinition import kotlin.String +@jakarta.`annotation`.Generated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) +@Generated public object DgsClient { public fun buildQuery(inputValueSerializer: InputValueSerializerInterface? = null, _projection: QueryProjection.() -> QueryProjection): String = diff --git a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithExtendedInterface/expected/DgsConstants.kt b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithExtendedInterface/expected/DgsConstants.kt index 447d9c152..1acd572af 100644 --- a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithExtendedInterface/expected/DgsConstants.kt +++ b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithExtendedInterface/expected/DgsConstants.kt @@ -2,15 +2,21 @@ package com.netflix.graphql.dgs.codegen.cases.dataClassWithExtendedInterface.exp import kotlin.String +@jakarta.`annotation`.Generated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) +@Generated public object DgsConstants { public const val QUERY_TYPE: String = "Query" + @jakarta.`annotation`.Generated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) + @Generated public object QUERY { public const val TYPE_NAME: String = "Query" public const val People: String = "people" } + @jakarta.`annotation`.Generated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) + @Generated public object PERSON { public const val TYPE_NAME: String = "Person" diff --git a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithExtendedInterface/expected/Generated.kt b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithExtendedInterface/expected/Generated.kt new file mode 100644 index 000000000..53dbdc903 --- /dev/null +++ b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithExtendedInterface/expected/Generated.kt @@ -0,0 +1,7 @@ +package com.netflix.graphql.dgs.codegen.cases.dataClassWithExtendedInterface.expected + +import kotlin.`annotation`.AnnotationRetention +import kotlin.`annotation`.Retention + +@Retention(value = AnnotationRetention.BINARY) +public annotation class Generated diff --git a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithExtendedInterface/expected/client/PersonProjection.kt b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithExtendedInterface/expected/client/PersonProjection.kt index 85aa6c033..d6256e321 100644 --- a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithExtendedInterface/expected/client/PersonProjection.kt +++ b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithExtendedInterface/expected/client/PersonProjection.kt @@ -2,7 +2,11 @@ package com.netflix.graphql.dgs.codegen.cases.dataClassWithExtendedInterface.exp import com.netflix.graphql.dgs.client.codegen.InputValueSerializerInterface import com.netflix.graphql.dgs.codegen.GraphQLProjection +import com.netflix.graphql.dgs.codegen.cases.dataClassWithExtendedInterface.expected.Generated as ExpectedGenerated +import jakarta.`annotation`.Generated as AnnotationGenerated +@AnnotationGenerated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) +@ExpectedGenerated public class PersonProjection( inputValueSerializer: InputValueSerializerInterface? = null, ) : GraphQLProjection(inputValueSerializer) { diff --git a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithExtendedInterface/expected/client/QueryProjection.kt b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithExtendedInterface/expected/client/QueryProjection.kt index 39e5eca4d..46089afe0 100644 --- a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithExtendedInterface/expected/client/QueryProjection.kt +++ b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithExtendedInterface/expected/client/QueryProjection.kt @@ -3,7 +3,11 @@ package com.netflix.graphql.dgs.codegen.cases.dataClassWithExtendedInterface.exp import com.netflix.graphql.dgs.client.codegen.InputValueSerializerInterface import com.netflix.graphql.dgs.codegen.GraphQLProjection import kotlin.String +import com.netflix.graphql.dgs.codegen.cases.dataClassWithExtendedInterface.expected.Generated as ExpectedGenerated +import jakarta.`annotation`.Generated as AnnotationGenerated +@AnnotationGenerated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) +@ExpectedGenerated public class QueryProjection( inputValueSerializer: InputValueSerializerInterface? = null, ) : GraphQLProjection(inputValueSerializer) { diff --git a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithExtendedInterface/expected/types/Person.kt b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithExtendedInterface/expected/types/Person.kt index 113449f84..a832b5968 100644 --- a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithExtendedInterface/expected/types/Person.kt +++ b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithExtendedInterface/expected/types/Person.kt @@ -5,7 +5,11 @@ import kotlin.Int import kotlin.String import kotlin.Suppress import kotlin.jvm.JvmName +import com.netflix.graphql.dgs.codegen.cases.dataClassWithExtendedInterface.expected.Generated as ExpectedGenerated +import jakarta.`annotation`.Generated as AnnotationGenerated +@AnnotationGenerated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) +@ExpectedGenerated @JsonTypeInfo( use = JsonTypeInfo.Id.NAME, include = JsonTypeInfo.As.PROPERTY, diff --git a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithExtendedInterface/expected/types/Query.kt b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithExtendedInterface/expected/types/Query.kt index 1fe70b7b0..0135abb26 100644 --- a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithExtendedInterface/expected/types/Query.kt +++ b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithExtendedInterface/expected/types/Query.kt @@ -8,7 +8,11 @@ import com.fasterxml.jackson.databind.`annotation`.JsonPOJOBuilder import java.lang.IllegalStateException import kotlin.collections.List import kotlin.jvm.JvmName +import com.netflix.graphql.dgs.codegen.cases.dataClassWithExtendedInterface.expected.Generated as ExpectedGenerated +import jakarta.`annotation`.Generated as AnnotationGenerated +@AnnotationGenerated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) +@ExpectedGenerated @JsonTypeInfo(use = JsonTypeInfo.Id.NONE) @JsonDeserialize(builder = Query.Builder::class) public class Query( @@ -20,11 +24,15 @@ public class Query( public val people: List? get() = __people.invoke() + @AnnotationGenerated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) + @ExpectedGenerated public companion object { private val peopleDefault: () -> List? = { throw IllegalStateException("Field `people` was not requested") } } + @AnnotationGenerated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) + @ExpectedGenerated @JsonPOJOBuilder @JsonIgnoreProperties("__typename") public class Builder { diff --git a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithExtendedInterfaceInheritance/expected/DgsClient.kt b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithExtendedInterfaceInheritance/expected/DgsClient.kt index acac7cc3a..dbfe8672e 100644 --- a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithExtendedInterfaceInheritance/expected/DgsClient.kt +++ b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithExtendedInterfaceInheritance/expected/DgsClient.kt @@ -6,6 +6,8 @@ import com.netflix.graphql.dgs.codegen.cases.dataClassWithExtendedInterfaceInher import graphql.language.OperationDefinition import kotlin.String +@jakarta.`annotation`.Generated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) +@Generated public object DgsClient { public fun buildQuery(inputValueSerializer: InputValueSerializerInterface? = null, _projection: QueryProjection.() -> QueryProjection): String = diff --git a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithExtendedInterfaceInheritance/expected/DgsConstants.kt b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithExtendedInterfaceInheritance/expected/DgsConstants.kt index 3a27abae5..ec715ee26 100644 --- a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithExtendedInterfaceInheritance/expected/DgsConstants.kt +++ b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithExtendedInterfaceInheritance/expected/DgsConstants.kt @@ -2,15 +2,21 @@ package com.netflix.graphql.dgs.codegen.cases.dataClassWithExtendedInterfaceInhe import kotlin.String +@jakarta.`annotation`.Generated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) +@Generated public object DgsConstants { public const val QUERY_TYPE: String = "Query" + @jakarta.`annotation`.Generated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) + @Generated public object QUERY { public const val TYPE_NAME: String = "Query" public const val People: String = "people" } + @jakarta.`annotation`.Generated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) + @Generated public object EMPLOYEE { public const val TYPE_NAME: String = "Employee" @@ -23,6 +29,8 @@ public object DgsConstants { public const val Age: String = "age" } + @jakarta.`annotation`.Generated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) + @Generated public object PERSON { public const val TYPE_NAME: String = "Person" diff --git a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithExtendedInterfaceInheritance/expected/Generated.kt b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithExtendedInterfaceInheritance/expected/Generated.kt new file mode 100644 index 000000000..7c6ef18f2 --- /dev/null +++ b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithExtendedInterfaceInheritance/expected/Generated.kt @@ -0,0 +1,7 @@ +package com.netflix.graphql.dgs.codegen.cases.dataClassWithExtendedInterfaceInheritance.expected + +import kotlin.`annotation`.AnnotationRetention +import kotlin.`annotation`.Retention + +@Retention(value = AnnotationRetention.BINARY) +public annotation class Generated diff --git a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithExtendedInterfaceInheritance/expected/client/EmployeeProjection.kt b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithExtendedInterfaceInheritance/expected/client/EmployeeProjection.kt index ac66bb3ac..43bb4acdf 100644 --- a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithExtendedInterfaceInheritance/expected/client/EmployeeProjection.kt +++ b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithExtendedInterfaceInheritance/expected/client/EmployeeProjection.kt @@ -2,7 +2,11 @@ package com.netflix.graphql.dgs.codegen.cases.dataClassWithExtendedInterfaceInhe import com.netflix.graphql.dgs.client.codegen.InputValueSerializerInterface import com.netflix.graphql.dgs.codegen.GraphQLProjection +import com.netflix.graphql.dgs.codegen.cases.dataClassWithExtendedInterfaceInheritance.expected.Generated as ExpectedGenerated +import jakarta.`annotation`.Generated as AnnotationGenerated +@AnnotationGenerated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) +@ExpectedGenerated public class EmployeeProjection( inputValueSerializer: InputValueSerializerInterface? = null, ) : GraphQLProjection(inputValueSerializer) { diff --git a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithExtendedInterfaceInheritance/expected/client/PersonProjection.kt b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithExtendedInterfaceInheritance/expected/client/PersonProjection.kt index a497aeb6c..91cc61ca8 100644 --- a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithExtendedInterfaceInheritance/expected/client/PersonProjection.kt +++ b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithExtendedInterfaceInheritance/expected/client/PersonProjection.kt @@ -2,7 +2,11 @@ package com.netflix.graphql.dgs.codegen.cases.dataClassWithExtendedInterfaceInhe import com.netflix.graphql.dgs.client.codegen.InputValueSerializerInterface import com.netflix.graphql.dgs.codegen.GraphQLProjection +import com.netflix.graphql.dgs.codegen.cases.dataClassWithExtendedInterfaceInheritance.expected.Generated as ExpectedGenerated +import jakarta.`annotation`.Generated as AnnotationGenerated +@AnnotationGenerated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) +@ExpectedGenerated public class PersonProjection( inputValueSerializer: InputValueSerializerInterface? = null, ) : GraphQLProjection(inputValueSerializer) { diff --git a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithExtendedInterfaceInheritance/expected/client/QueryProjection.kt b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithExtendedInterfaceInheritance/expected/client/QueryProjection.kt index 4f99697ba..f0506cc62 100644 --- a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithExtendedInterfaceInheritance/expected/client/QueryProjection.kt +++ b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithExtendedInterfaceInheritance/expected/client/QueryProjection.kt @@ -3,7 +3,11 @@ package com.netflix.graphql.dgs.codegen.cases.dataClassWithExtendedInterfaceInhe import com.netflix.graphql.dgs.client.codegen.InputValueSerializerInterface import com.netflix.graphql.dgs.codegen.GraphQLProjection import kotlin.String +import com.netflix.graphql.dgs.codegen.cases.dataClassWithExtendedInterfaceInheritance.expected.Generated as ExpectedGenerated +import jakarta.`annotation`.Generated as AnnotationGenerated +@AnnotationGenerated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) +@ExpectedGenerated public class QueryProjection( inputValueSerializer: InputValueSerializerInterface? = null, ) : GraphQLProjection(inputValueSerializer) { diff --git a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithExtendedInterfaceInheritance/expected/types/Employee.kt b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithExtendedInterfaceInheritance/expected/types/Employee.kt index 6696e70c8..bd57b0465 100644 --- a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithExtendedInterfaceInheritance/expected/types/Employee.kt +++ b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithExtendedInterfaceInheritance/expected/types/Employee.kt @@ -10,7 +10,11 @@ import kotlin.Int import kotlin.String import kotlin.Suppress import kotlin.jvm.JvmName +import com.netflix.graphql.dgs.codegen.cases.dataClassWithExtendedInterfaceInheritance.expected.Generated as ExpectedGenerated +import jakarta.`annotation`.Generated as AnnotationGenerated +@AnnotationGenerated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) +@ExpectedGenerated @JsonTypeInfo(use = JsonTypeInfo.Id.NONE) @JsonDeserialize(builder = Employee.Builder::class) public class Employee( @@ -46,6 +50,8 @@ public class Employee( override val age: Int get() = __age.invoke() + @AnnotationGenerated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) + @ExpectedGenerated public companion object { private val firstnameDefault: () -> String = { throw IllegalStateException("Field `firstname` was not requested") } @@ -60,6 +66,8 @@ public class Employee( { throw IllegalStateException("Field `age` was not requested") } } + @AnnotationGenerated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) + @ExpectedGenerated @JsonPOJOBuilder @JsonIgnoreProperties("__typename") public class Builder { diff --git a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithExtendedInterfaceInheritance/expected/types/Person.kt b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithExtendedInterfaceInheritance/expected/types/Person.kt index 157302a88..935c71c4d 100644 --- a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithExtendedInterfaceInheritance/expected/types/Person.kt +++ b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithExtendedInterfaceInheritance/expected/types/Person.kt @@ -6,7 +6,11 @@ import kotlin.Int import kotlin.String import kotlin.Suppress import kotlin.jvm.JvmName +import com.netflix.graphql.dgs.codegen.cases.dataClassWithExtendedInterfaceInheritance.expected.Generated as ExpectedGenerated +import jakarta.`annotation`.Generated as AnnotationGenerated +@AnnotationGenerated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) +@ExpectedGenerated @JsonTypeInfo( use = JsonTypeInfo.Id.NAME, include = JsonTypeInfo.As.PROPERTY, diff --git a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithExtendedInterfaceInheritance/expected/types/Query.kt b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithExtendedInterfaceInheritance/expected/types/Query.kt index 13ef33bcc..c9f653da0 100644 --- a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithExtendedInterfaceInheritance/expected/types/Query.kt +++ b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithExtendedInterfaceInheritance/expected/types/Query.kt @@ -8,7 +8,11 @@ import com.fasterxml.jackson.databind.`annotation`.JsonPOJOBuilder import java.lang.IllegalStateException import kotlin.collections.List import kotlin.jvm.JvmName +import com.netflix.graphql.dgs.codegen.cases.dataClassWithExtendedInterfaceInheritance.expected.Generated as ExpectedGenerated +import jakarta.`annotation`.Generated as AnnotationGenerated +@AnnotationGenerated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) +@ExpectedGenerated @JsonTypeInfo(use = JsonTypeInfo.Id.NONE) @JsonDeserialize(builder = Query.Builder::class) public class Query( @@ -20,11 +24,15 @@ public class Query( public val people: List? get() = __people.invoke() + @AnnotationGenerated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) + @ExpectedGenerated public companion object { private val peopleDefault: () -> List? = { throw IllegalStateException("Field `people` was not requested") } } + @AnnotationGenerated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) + @ExpectedGenerated @JsonPOJOBuilder @JsonIgnoreProperties("__typename") public class Builder { diff --git a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithInterface/expected/DgsClient.kt b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithInterface/expected/DgsClient.kt index 686bcb7ab..61d178051 100644 --- a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithInterface/expected/DgsClient.kt +++ b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithInterface/expected/DgsClient.kt @@ -6,6 +6,8 @@ import com.netflix.graphql.dgs.codegen.cases.dataClassWithInterface.expected.cli import graphql.language.OperationDefinition import kotlin.String +@jakarta.`annotation`.Generated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) +@Generated public object DgsClient { public fun buildQuery(inputValueSerializer: InputValueSerializerInterface? = null, _projection: QueryProjection.() -> QueryProjection): String = diff --git a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithInterface/expected/DgsConstants.kt b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithInterface/expected/DgsConstants.kt index d28ba953f..134305172 100644 --- a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithInterface/expected/DgsConstants.kt +++ b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithInterface/expected/DgsConstants.kt @@ -2,15 +2,21 @@ package com.netflix.graphql.dgs.codegen.cases.dataClassWithInterface.expected import kotlin.String +@jakarta.`annotation`.Generated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) +@Generated public object DgsConstants { public const val QUERY_TYPE: String = "Query" + @jakarta.`annotation`.Generated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) + @Generated public object QUERY { public const val TYPE_NAME: String = "Query" public const val People: String = "people" } + @jakarta.`annotation`.Generated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) + @Generated public object EMPLOYEE { public const val TYPE_NAME: String = "Employee" @@ -21,6 +27,8 @@ public object DgsConstants { public const val Company: String = "company" } + @jakarta.`annotation`.Generated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) + @Generated public object PERSON { public const val TYPE_NAME: String = "Person" diff --git a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithInterface/expected/Generated.kt b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithInterface/expected/Generated.kt new file mode 100644 index 000000000..3ba296396 --- /dev/null +++ b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithInterface/expected/Generated.kt @@ -0,0 +1,7 @@ +package com.netflix.graphql.dgs.codegen.cases.dataClassWithInterface.expected + +import kotlin.`annotation`.AnnotationRetention +import kotlin.`annotation`.Retention + +@Retention(value = AnnotationRetention.BINARY) +public annotation class Generated diff --git a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithInterface/expected/client/EmployeeProjection.kt b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithInterface/expected/client/EmployeeProjection.kt index 9ce80615c..be3c9b56b 100644 --- a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithInterface/expected/client/EmployeeProjection.kt +++ b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithInterface/expected/client/EmployeeProjection.kt @@ -2,7 +2,11 @@ package com.netflix.graphql.dgs.codegen.cases.dataClassWithInterface.expected.cl import com.netflix.graphql.dgs.client.codegen.InputValueSerializerInterface import com.netflix.graphql.dgs.codegen.GraphQLProjection +import com.netflix.graphql.dgs.codegen.cases.dataClassWithInterface.expected.Generated as ExpectedGenerated +import jakarta.`annotation`.Generated as AnnotationGenerated +@AnnotationGenerated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) +@ExpectedGenerated public class EmployeeProjection( inputValueSerializer: InputValueSerializerInterface? = null, ) : GraphQLProjection(inputValueSerializer) { diff --git a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithInterface/expected/client/PersonProjection.kt b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithInterface/expected/client/PersonProjection.kt index 2529bf41b..f69eae149 100644 --- a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithInterface/expected/client/PersonProjection.kt +++ b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithInterface/expected/client/PersonProjection.kt @@ -2,7 +2,11 @@ package com.netflix.graphql.dgs.codegen.cases.dataClassWithInterface.expected.cl import com.netflix.graphql.dgs.client.codegen.InputValueSerializerInterface import com.netflix.graphql.dgs.codegen.GraphQLProjection +import com.netflix.graphql.dgs.codegen.cases.dataClassWithInterface.expected.Generated as ExpectedGenerated +import jakarta.`annotation`.Generated as AnnotationGenerated +@AnnotationGenerated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) +@ExpectedGenerated public class PersonProjection( inputValueSerializer: InputValueSerializerInterface? = null, ) : GraphQLProjection(inputValueSerializer) { diff --git a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithInterface/expected/client/QueryProjection.kt b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithInterface/expected/client/QueryProjection.kt index af8df4fed..b3e7f4cd3 100644 --- a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithInterface/expected/client/QueryProjection.kt +++ b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithInterface/expected/client/QueryProjection.kt @@ -3,7 +3,11 @@ package com.netflix.graphql.dgs.codegen.cases.dataClassWithInterface.expected.cl import com.netflix.graphql.dgs.client.codegen.InputValueSerializerInterface import com.netflix.graphql.dgs.codegen.GraphQLProjection import kotlin.String +import com.netflix.graphql.dgs.codegen.cases.dataClassWithInterface.expected.Generated as ExpectedGenerated +import jakarta.`annotation`.Generated as AnnotationGenerated +@AnnotationGenerated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) +@ExpectedGenerated public class QueryProjection( inputValueSerializer: InputValueSerializerInterface? = null, ) : GraphQLProjection(inputValueSerializer) { diff --git a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithInterface/expected/types/Employee.kt b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithInterface/expected/types/Employee.kt index 7dbddb9b3..79db2abbb 100644 --- a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithInterface/expected/types/Employee.kt +++ b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithInterface/expected/types/Employee.kt @@ -9,7 +9,11 @@ import java.lang.IllegalStateException import kotlin.String import kotlin.Suppress import kotlin.jvm.JvmName +import com.netflix.graphql.dgs.codegen.cases.dataClassWithInterface.expected.Generated as ExpectedGenerated +import jakarta.`annotation`.Generated as AnnotationGenerated +@AnnotationGenerated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) +@ExpectedGenerated @JsonTypeInfo(use = JsonTypeInfo.Id.NONE) @JsonDeserialize(builder = Employee.Builder::class) public class Employee( @@ -37,6 +41,8 @@ public class Employee( public val company: String? get() = __company.invoke() + @AnnotationGenerated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) + @ExpectedGenerated public companion object { private val firstnameDefault: () -> String? = { throw IllegalStateException("Field `firstname` was not requested") } @@ -48,6 +54,8 @@ public class Employee( { throw IllegalStateException("Field `company` was not requested") } } + @AnnotationGenerated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) + @ExpectedGenerated @JsonPOJOBuilder @JsonIgnoreProperties("__typename") public class Builder { diff --git a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithInterface/expected/types/Person.kt b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithInterface/expected/types/Person.kt index 5c165998a..4d50400ec 100644 --- a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithInterface/expected/types/Person.kt +++ b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithInterface/expected/types/Person.kt @@ -5,7 +5,11 @@ import com.fasterxml.jackson.`annotation`.JsonTypeInfo import kotlin.String import kotlin.Suppress import kotlin.jvm.JvmName +import com.netflix.graphql.dgs.codegen.cases.dataClassWithInterface.expected.Generated as ExpectedGenerated +import jakarta.`annotation`.Generated as AnnotationGenerated +@AnnotationGenerated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) +@ExpectedGenerated @JsonTypeInfo( use = JsonTypeInfo.Id.NAME, include = JsonTypeInfo.As.PROPERTY, diff --git a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithInterface/expected/types/Query.kt b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithInterface/expected/types/Query.kt index dba982a87..5b8a2b412 100644 --- a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithInterface/expected/types/Query.kt +++ b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithInterface/expected/types/Query.kt @@ -8,7 +8,11 @@ import com.fasterxml.jackson.databind.`annotation`.JsonPOJOBuilder import java.lang.IllegalStateException import kotlin.collections.List import kotlin.jvm.JvmName +import com.netflix.graphql.dgs.codegen.cases.dataClassWithInterface.expected.Generated as ExpectedGenerated +import jakarta.`annotation`.Generated as AnnotationGenerated +@AnnotationGenerated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) +@ExpectedGenerated @JsonTypeInfo(use = JsonTypeInfo.Id.NONE) @JsonDeserialize(builder = Query.Builder::class) public class Query( @@ -20,11 +24,15 @@ public class Query( public val people: List? get() = __people.invoke() + @AnnotationGenerated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) + @ExpectedGenerated public companion object { private val peopleDefault: () -> List? = { throw IllegalStateException("Field `people` was not requested") } } + @AnnotationGenerated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) + @ExpectedGenerated @JsonPOJOBuilder @JsonIgnoreProperties("__typename") public class Builder { diff --git a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithInterfaceInheritance/expected/DgsClient.kt b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithInterfaceInheritance/expected/DgsClient.kt index 5cd02ccfd..888911e04 100644 --- a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithInterfaceInheritance/expected/DgsClient.kt +++ b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithInterfaceInheritance/expected/DgsClient.kt @@ -6,6 +6,8 @@ import com.netflix.graphql.dgs.codegen.cases.dataClassWithInterfaceInheritance.e import graphql.language.OperationDefinition import kotlin.String +@jakarta.`annotation`.Generated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) +@Generated public object DgsClient { public fun buildQuery(inputValueSerializer: InputValueSerializerInterface? = null, _projection: QueryProjection.() -> QueryProjection): String = diff --git a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithInterfaceInheritance/expected/DgsConstants.kt b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithInterfaceInheritance/expected/DgsConstants.kt index d3f0d776f..65a6af4fa 100644 --- a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithInterfaceInheritance/expected/DgsConstants.kt +++ b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithInterfaceInheritance/expected/DgsConstants.kt @@ -2,15 +2,21 @@ package com.netflix.graphql.dgs.codegen.cases.dataClassWithInterfaceInheritance. import kotlin.String +@jakarta.`annotation`.Generated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) +@Generated public object DgsConstants { public const val QUERY_TYPE: String = "Query" + @jakarta.`annotation`.Generated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) + @Generated public object QUERY { public const val TYPE_NAME: String = "Query" public const val People: String = "people" } + @jakarta.`annotation`.Generated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) + @Generated public object TALENT { public const val TYPE_NAME: String = "Talent" @@ -23,6 +29,8 @@ public object DgsConstants { public const val ImdbProfile: String = "imdbProfile" } + @jakarta.`annotation`.Generated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) + @Generated public object PERSON { public const val TYPE_NAME: String = "Person" @@ -31,6 +39,8 @@ public object DgsConstants { public const val Lastname: String = "lastname" } + @jakarta.`annotation`.Generated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) + @Generated public object EMPLOYEE { public const val TYPE_NAME: String = "Employee" diff --git a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithInterfaceInheritance/expected/Generated.kt b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithInterfaceInheritance/expected/Generated.kt new file mode 100644 index 000000000..7f0adb226 --- /dev/null +++ b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithInterfaceInheritance/expected/Generated.kt @@ -0,0 +1,7 @@ +package com.netflix.graphql.dgs.codegen.cases.dataClassWithInterfaceInheritance.expected + +import kotlin.`annotation`.AnnotationRetention +import kotlin.`annotation`.Retention + +@Retention(value = AnnotationRetention.BINARY) +public annotation class Generated diff --git a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithInterfaceInheritance/expected/client/EmployeeProjection.kt b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithInterfaceInheritance/expected/client/EmployeeProjection.kt index dc67040d8..29796ca0f 100644 --- a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithInterfaceInheritance/expected/client/EmployeeProjection.kt +++ b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithInterfaceInheritance/expected/client/EmployeeProjection.kt @@ -2,7 +2,11 @@ package com.netflix.graphql.dgs.codegen.cases.dataClassWithInterfaceInheritance. import com.netflix.graphql.dgs.client.codegen.InputValueSerializerInterface import com.netflix.graphql.dgs.codegen.GraphQLProjection +import com.netflix.graphql.dgs.codegen.cases.dataClassWithInterfaceInheritance.expected.Generated as ExpectedGenerated +import jakarta.`annotation`.Generated as AnnotationGenerated +@AnnotationGenerated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) +@ExpectedGenerated public class EmployeeProjection( inputValueSerializer: InputValueSerializerInterface? = null, ) : GraphQLProjection(inputValueSerializer) { diff --git a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithInterfaceInheritance/expected/client/PersonProjection.kt b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithInterfaceInheritance/expected/client/PersonProjection.kt index 4f32dcae4..cb38e6ea3 100644 --- a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithInterfaceInheritance/expected/client/PersonProjection.kt +++ b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithInterfaceInheritance/expected/client/PersonProjection.kt @@ -2,7 +2,11 @@ package com.netflix.graphql.dgs.codegen.cases.dataClassWithInterfaceInheritance. import com.netflix.graphql.dgs.client.codegen.InputValueSerializerInterface import com.netflix.graphql.dgs.codegen.GraphQLProjection +import com.netflix.graphql.dgs.codegen.cases.dataClassWithInterfaceInheritance.expected.Generated as ExpectedGenerated +import jakarta.`annotation`.Generated as AnnotationGenerated +@AnnotationGenerated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) +@ExpectedGenerated public class PersonProjection( inputValueSerializer: InputValueSerializerInterface? = null, ) : GraphQLProjection(inputValueSerializer) { diff --git a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithInterfaceInheritance/expected/client/QueryProjection.kt b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithInterfaceInheritance/expected/client/QueryProjection.kt index b2dec68dd..6da121e70 100644 --- a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithInterfaceInheritance/expected/client/QueryProjection.kt +++ b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithInterfaceInheritance/expected/client/QueryProjection.kt @@ -3,7 +3,11 @@ package com.netflix.graphql.dgs.codegen.cases.dataClassWithInterfaceInheritance. import com.netflix.graphql.dgs.client.codegen.InputValueSerializerInterface import com.netflix.graphql.dgs.codegen.GraphQLProjection import kotlin.String +import com.netflix.graphql.dgs.codegen.cases.dataClassWithInterfaceInheritance.expected.Generated as ExpectedGenerated +import jakarta.`annotation`.Generated as AnnotationGenerated +@AnnotationGenerated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) +@ExpectedGenerated public class QueryProjection( inputValueSerializer: InputValueSerializerInterface? = null, ) : GraphQLProjection(inputValueSerializer) { diff --git a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithInterfaceInheritance/expected/client/TalentProjection.kt b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithInterfaceInheritance/expected/client/TalentProjection.kt index a72938e85..b34982840 100644 --- a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithInterfaceInheritance/expected/client/TalentProjection.kt +++ b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithInterfaceInheritance/expected/client/TalentProjection.kt @@ -2,7 +2,11 @@ package com.netflix.graphql.dgs.codegen.cases.dataClassWithInterfaceInheritance. import com.netflix.graphql.dgs.client.codegen.InputValueSerializerInterface import com.netflix.graphql.dgs.codegen.GraphQLProjection +import com.netflix.graphql.dgs.codegen.cases.dataClassWithInterfaceInheritance.expected.Generated as ExpectedGenerated +import jakarta.`annotation`.Generated as AnnotationGenerated +@AnnotationGenerated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) +@ExpectedGenerated public class TalentProjection( inputValueSerializer: InputValueSerializerInterface? = null, ) : GraphQLProjection(inputValueSerializer) { diff --git a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithInterfaceInheritance/expected/types/Employee.kt b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithInterfaceInheritance/expected/types/Employee.kt index ff83ea205..68791b165 100644 --- a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithInterfaceInheritance/expected/types/Employee.kt +++ b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithInterfaceInheritance/expected/types/Employee.kt @@ -5,7 +5,11 @@ import com.fasterxml.jackson.`annotation`.JsonTypeInfo import kotlin.String import kotlin.Suppress import kotlin.jvm.JvmName +import com.netflix.graphql.dgs.codegen.cases.dataClassWithInterfaceInheritance.expected.Generated as ExpectedGenerated +import jakarta.`annotation`.Generated as AnnotationGenerated +@AnnotationGenerated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) +@ExpectedGenerated @JsonTypeInfo( use = JsonTypeInfo.Id.NAME, include = JsonTypeInfo.As.PROPERTY, diff --git a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithInterfaceInheritance/expected/types/Person.kt b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithInterfaceInheritance/expected/types/Person.kt index 838bf60ee..80c66db58 100644 --- a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithInterfaceInheritance/expected/types/Person.kt +++ b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithInterfaceInheritance/expected/types/Person.kt @@ -4,7 +4,11 @@ import com.fasterxml.jackson.`annotation`.JsonTypeInfo import kotlin.String import kotlin.Suppress import kotlin.jvm.JvmName +import com.netflix.graphql.dgs.codegen.cases.dataClassWithInterfaceInheritance.expected.Generated as ExpectedGenerated +import jakarta.`annotation`.Generated as AnnotationGenerated +@AnnotationGenerated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) +@ExpectedGenerated @JsonTypeInfo( use = JsonTypeInfo.Id.NAME, include = JsonTypeInfo.As.PROPERTY, diff --git a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithInterfaceInheritance/expected/types/Query.kt b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithInterfaceInheritance/expected/types/Query.kt index d02923873..104166885 100644 --- a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithInterfaceInheritance/expected/types/Query.kt +++ b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithInterfaceInheritance/expected/types/Query.kt @@ -8,7 +8,11 @@ import com.fasterxml.jackson.databind.`annotation`.JsonPOJOBuilder import java.lang.IllegalStateException import kotlin.collections.List import kotlin.jvm.JvmName +import com.netflix.graphql.dgs.codegen.cases.dataClassWithInterfaceInheritance.expected.Generated as ExpectedGenerated +import jakarta.`annotation`.Generated as AnnotationGenerated +@AnnotationGenerated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) +@ExpectedGenerated @JsonTypeInfo(use = JsonTypeInfo.Id.NONE) @JsonDeserialize(builder = Query.Builder::class) public class Query( @@ -20,11 +24,15 @@ public class Query( public val people: List? get() = __people.invoke() + @AnnotationGenerated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) + @ExpectedGenerated public companion object { private val peopleDefault: () -> List? = { throw IllegalStateException("Field `people` was not requested") } } + @AnnotationGenerated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) + @ExpectedGenerated @JsonPOJOBuilder @JsonIgnoreProperties("__typename") public class Builder { diff --git a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithInterfaceInheritance/expected/types/Talent.kt b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithInterfaceInheritance/expected/types/Talent.kt index e734d08e9..0e2d41da4 100644 --- a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithInterfaceInheritance/expected/types/Talent.kt +++ b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithInterfaceInheritance/expected/types/Talent.kt @@ -9,7 +9,11 @@ import java.lang.IllegalStateException import kotlin.String import kotlin.Suppress import kotlin.jvm.JvmName +import com.netflix.graphql.dgs.codegen.cases.dataClassWithInterfaceInheritance.expected.Generated as ExpectedGenerated +import jakarta.`annotation`.Generated as AnnotationGenerated +@AnnotationGenerated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) +@ExpectedGenerated @JsonTypeInfo(use = JsonTypeInfo.Id.NONE) @JsonDeserialize(builder = Talent.Builder::class) public class Talent( @@ -45,6 +49,8 @@ public class Talent( public val imdbProfile: String? get() = __imdbProfile.invoke() + @AnnotationGenerated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) + @ExpectedGenerated public companion object { private val firstnameDefault: () -> String = { throw IllegalStateException("Field `firstname` was not requested") } @@ -59,6 +65,8 @@ public class Talent( { throw IllegalStateException("Field `imdbProfile` was not requested") } } + @AnnotationGenerated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) + @ExpectedGenerated @JsonPOJOBuilder @JsonIgnoreProperties("__typename") public class Builder { diff --git a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithListProperties/expected/DgsClient.kt b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithListProperties/expected/DgsClient.kt index 13636d2b0..23d261a07 100644 --- a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithListProperties/expected/DgsClient.kt +++ b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithListProperties/expected/DgsClient.kt @@ -6,6 +6,8 @@ import com.netflix.graphql.dgs.codegen.cases.dataClassWithListProperties.expecte import graphql.language.OperationDefinition import kotlin.String +@jakarta.`annotation`.Generated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) +@Generated public object DgsClient { public fun buildQuery(inputValueSerializer: InputValueSerializerInterface? = null, _projection: QueryProjection.() -> QueryProjection): String = diff --git a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithListProperties/expected/DgsConstants.kt b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithListProperties/expected/DgsConstants.kt index e96be4092..f742421ba 100644 --- a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithListProperties/expected/DgsConstants.kt +++ b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithListProperties/expected/DgsConstants.kt @@ -2,15 +2,21 @@ package com.netflix.graphql.dgs.codegen.cases.dataClassWithListProperties.expect import kotlin.String +@jakarta.`annotation`.Generated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) +@Generated public object DgsConstants { public const val QUERY_TYPE: String = "Query" + @jakarta.`annotation`.Generated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) + @Generated public object QUERY { public const val TYPE_NAME: String = "Query" public const val People: String = "people" } + @jakarta.`annotation`.Generated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) + @Generated public object PERSON { public const val TYPE_NAME: String = "Person" diff --git a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithListProperties/expected/Generated.kt b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithListProperties/expected/Generated.kt new file mode 100644 index 000000000..efde6faf2 --- /dev/null +++ b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithListProperties/expected/Generated.kt @@ -0,0 +1,7 @@ +package com.netflix.graphql.dgs.codegen.cases.dataClassWithListProperties.expected + +import kotlin.`annotation`.AnnotationRetention +import kotlin.`annotation`.Retention + +@Retention(value = AnnotationRetention.BINARY) +public annotation class Generated diff --git a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithListProperties/expected/client/PersonProjection.kt b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithListProperties/expected/client/PersonProjection.kt index 7b330e8d6..0fe300262 100644 --- a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithListProperties/expected/client/PersonProjection.kt +++ b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithListProperties/expected/client/PersonProjection.kt @@ -2,7 +2,11 @@ package com.netflix.graphql.dgs.codegen.cases.dataClassWithListProperties.expect import com.netflix.graphql.dgs.client.codegen.InputValueSerializerInterface import com.netflix.graphql.dgs.codegen.GraphQLProjection +import com.netflix.graphql.dgs.codegen.cases.dataClassWithListProperties.expected.Generated as ExpectedGenerated +import jakarta.`annotation`.Generated as AnnotationGenerated +@AnnotationGenerated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) +@ExpectedGenerated public class PersonProjection( inputValueSerializer: InputValueSerializerInterface? = null, ) : GraphQLProjection(inputValueSerializer) { diff --git a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithListProperties/expected/client/QueryProjection.kt b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithListProperties/expected/client/QueryProjection.kt index 94c556c08..ecae96309 100644 --- a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithListProperties/expected/client/QueryProjection.kt +++ b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithListProperties/expected/client/QueryProjection.kt @@ -3,7 +3,11 @@ package com.netflix.graphql.dgs.codegen.cases.dataClassWithListProperties.expect import com.netflix.graphql.dgs.client.codegen.InputValueSerializerInterface import com.netflix.graphql.dgs.codegen.GraphQLProjection import kotlin.String +import com.netflix.graphql.dgs.codegen.cases.dataClassWithListProperties.expected.Generated as ExpectedGenerated +import jakarta.`annotation`.Generated as AnnotationGenerated +@AnnotationGenerated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) +@ExpectedGenerated public class QueryProjection( inputValueSerializer: InputValueSerializerInterface? = null, ) : GraphQLProjection(inputValueSerializer) { diff --git a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithListProperties/expected/types/Person.kt b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithListProperties/expected/types/Person.kt index 42e7e8004..4add956e8 100644 --- a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithListProperties/expected/types/Person.kt +++ b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithListProperties/expected/types/Person.kt @@ -9,7 +9,11 @@ import java.lang.IllegalStateException import kotlin.String import kotlin.collections.List import kotlin.jvm.JvmName +import com.netflix.graphql.dgs.codegen.cases.dataClassWithListProperties.expected.Generated as ExpectedGenerated +import jakarta.`annotation`.Generated as AnnotationGenerated +@AnnotationGenerated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) +@ExpectedGenerated @JsonTypeInfo(use = JsonTypeInfo.Id.NONE) @JsonDeserialize(builder = Person.Builder::class) public class Person( @@ -28,6 +32,8 @@ public class Person( public val email: List? get() = __email.invoke() + @AnnotationGenerated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) + @ExpectedGenerated public companion object { private val nameDefault: () -> String? = { throw IllegalStateException("Field `name` was not requested") } @@ -36,6 +42,8 @@ public class Person( { throw IllegalStateException("Field `email` was not requested") } } + @AnnotationGenerated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) + @ExpectedGenerated @JsonPOJOBuilder @JsonIgnoreProperties("__typename") public class Builder { diff --git a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithListProperties/expected/types/Query.kt b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithListProperties/expected/types/Query.kt index 686240a86..e29369d6a 100644 --- a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithListProperties/expected/types/Query.kt +++ b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithListProperties/expected/types/Query.kt @@ -8,7 +8,11 @@ import com.fasterxml.jackson.databind.`annotation`.JsonPOJOBuilder import java.lang.IllegalStateException import kotlin.collections.List import kotlin.jvm.JvmName +import com.netflix.graphql.dgs.codegen.cases.dataClassWithListProperties.expected.Generated as ExpectedGenerated +import jakarta.`annotation`.Generated as AnnotationGenerated +@AnnotationGenerated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) +@ExpectedGenerated @JsonTypeInfo(use = JsonTypeInfo.Id.NONE) @JsonDeserialize(builder = Query.Builder::class) public class Query( @@ -20,11 +24,15 @@ public class Query( public val people: List? get() = __people.invoke() + @AnnotationGenerated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) + @ExpectedGenerated public companion object { private val peopleDefault: () -> List? = { throw IllegalStateException("Field `people` was not requested") } } + @AnnotationGenerated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) + @ExpectedGenerated @JsonPOJOBuilder @JsonIgnoreProperties("__typename") public class Builder { diff --git a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithMappedInterfaces/expected/DgsClient.kt b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithMappedInterfaces/expected/DgsClient.kt index 7b5876263..81a63df6c 100644 --- a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithMappedInterfaces/expected/DgsClient.kt +++ b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithMappedInterfaces/expected/DgsClient.kt @@ -6,6 +6,8 @@ import com.netflix.graphql.dgs.codegen.cases.dataClassWithMappedInterfaces.expec import graphql.language.OperationDefinition import kotlin.String +@jakarta.`annotation`.Generated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) +@Generated public object DgsClient { public fun buildQuery(inputValueSerializer: InputValueSerializerInterface? = null, _projection: QueryProjection.() -> QueryProjection): String = diff --git a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithMappedInterfaces/expected/DgsConstants.kt b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithMappedInterfaces/expected/DgsConstants.kt index 1b97c1f34..b363788bf 100644 --- a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithMappedInterfaces/expected/DgsConstants.kt +++ b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithMappedInterfaces/expected/DgsConstants.kt @@ -2,27 +2,37 @@ package com.netflix.graphql.dgs.codegen.cases.dataClassWithMappedInterfaces.expe import kotlin.String +@jakarta.`annotation`.Generated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) +@Generated public object DgsConstants { public const val QUERY_TYPE: String = "Query" + @jakarta.`annotation`.Generated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) + @Generated public object QUERY { public const val TYPE_NAME: String = "Query" public const val Products: String = "products" } + @jakarta.`annotation`.Generated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) + @Generated public object PRODUCT { public const val TYPE_NAME: String = "Product" public const val Id: String = "id" } + @jakarta.`annotation`.Generated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) + @Generated public object NODE { public const val TYPE_NAME: String = "Node" public const val Id: String = "id" } + @jakarta.`annotation`.Generated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) + @Generated public object ENTITY { public const val TYPE_NAME: String = "Entity" diff --git a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithMappedInterfaces/expected/Generated.kt b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithMappedInterfaces/expected/Generated.kt new file mode 100644 index 000000000..1ecfb1c31 --- /dev/null +++ b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithMappedInterfaces/expected/Generated.kt @@ -0,0 +1,7 @@ +package com.netflix.graphql.dgs.codegen.cases.dataClassWithMappedInterfaces.expected + +import kotlin.`annotation`.AnnotationRetention +import kotlin.`annotation`.Retention + +@Retention(value = AnnotationRetention.BINARY) +public annotation class Generated diff --git a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithMappedInterfaces/expected/client/EntityProjection.kt b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithMappedInterfaces/expected/client/EntityProjection.kt index f76958e8c..6c06a67f7 100644 --- a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithMappedInterfaces/expected/client/EntityProjection.kt +++ b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithMappedInterfaces/expected/client/EntityProjection.kt @@ -2,7 +2,11 @@ package com.netflix.graphql.dgs.codegen.cases.dataClassWithMappedInterfaces.expe import com.netflix.graphql.dgs.client.codegen.InputValueSerializerInterface import com.netflix.graphql.dgs.codegen.GraphQLProjection +import com.netflix.graphql.dgs.codegen.cases.dataClassWithMappedInterfaces.expected.Generated as ExpectedGenerated +import jakarta.`annotation`.Generated as AnnotationGenerated +@AnnotationGenerated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) +@ExpectedGenerated public class EntityProjection( inputValueSerializer: InputValueSerializerInterface? = null, ) : GraphQLProjection(inputValueSerializer) { diff --git a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithMappedInterfaces/expected/client/NodeProjection.kt b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithMappedInterfaces/expected/client/NodeProjection.kt index 896b2fcc7..1c44d796f 100644 --- a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithMappedInterfaces/expected/client/NodeProjection.kt +++ b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithMappedInterfaces/expected/client/NodeProjection.kt @@ -2,7 +2,11 @@ package com.netflix.graphql.dgs.codegen.cases.dataClassWithMappedInterfaces.expe import com.netflix.graphql.dgs.client.codegen.InputValueSerializerInterface import com.netflix.graphql.dgs.codegen.GraphQLProjection +import com.netflix.graphql.dgs.codegen.cases.dataClassWithMappedInterfaces.expected.Generated as ExpectedGenerated +import jakarta.`annotation`.Generated as AnnotationGenerated +@AnnotationGenerated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) +@ExpectedGenerated public class NodeProjection( inputValueSerializer: InputValueSerializerInterface? = null, ) : GraphQLProjection(inputValueSerializer) { diff --git a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithMappedInterfaces/expected/client/ProductProjection.kt b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithMappedInterfaces/expected/client/ProductProjection.kt index 3b7237588..154a7cb94 100644 --- a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithMappedInterfaces/expected/client/ProductProjection.kt +++ b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithMappedInterfaces/expected/client/ProductProjection.kt @@ -2,7 +2,11 @@ package com.netflix.graphql.dgs.codegen.cases.dataClassWithMappedInterfaces.expe import com.netflix.graphql.dgs.client.codegen.InputValueSerializerInterface import com.netflix.graphql.dgs.codegen.GraphQLProjection +import com.netflix.graphql.dgs.codegen.cases.dataClassWithMappedInterfaces.expected.Generated as ExpectedGenerated +import jakarta.`annotation`.Generated as AnnotationGenerated +@AnnotationGenerated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) +@ExpectedGenerated public class ProductProjection( inputValueSerializer: InputValueSerializerInterface? = null, ) : GraphQLProjection(inputValueSerializer) { diff --git a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithMappedInterfaces/expected/client/QueryProjection.kt b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithMappedInterfaces/expected/client/QueryProjection.kt index 2fe3581d1..6bb04fbc8 100644 --- a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithMappedInterfaces/expected/client/QueryProjection.kt +++ b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithMappedInterfaces/expected/client/QueryProjection.kt @@ -3,7 +3,11 @@ package com.netflix.graphql.dgs.codegen.cases.dataClassWithMappedInterfaces.expe import com.netflix.graphql.dgs.client.codegen.InputValueSerializerInterface import com.netflix.graphql.dgs.codegen.GraphQLProjection import kotlin.String +import com.netflix.graphql.dgs.codegen.cases.dataClassWithMappedInterfaces.expected.Generated as ExpectedGenerated +import jakarta.`annotation`.Generated as AnnotationGenerated +@AnnotationGenerated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) +@ExpectedGenerated public class QueryProjection( inputValueSerializer: InputValueSerializerInterface? = null, ) : GraphQLProjection(inputValueSerializer) { diff --git a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithMappedInterfaces/expected/types/Entity.kt b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithMappedInterfaces/expected/types/Entity.kt index 21395800a..b4ea40a5d 100644 --- a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithMappedInterfaces/expected/types/Entity.kt +++ b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithMappedInterfaces/expected/types/Entity.kt @@ -6,7 +6,11 @@ import com.netflix.graphql.dgs.codegen.fixtures.Node import kotlin.String import kotlin.Suppress import kotlin.jvm.JvmName +import com.netflix.graphql.dgs.codegen.cases.dataClassWithMappedInterfaces.expected.Generated as ExpectedGenerated +import jakarta.`annotation`.Generated as AnnotationGenerated +@AnnotationGenerated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) +@ExpectedGenerated @JsonTypeInfo( use = JsonTypeInfo.Id.NAME, include = JsonTypeInfo.As.PROPERTY, diff --git a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithMappedInterfaces/expected/types/Product.kt b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithMappedInterfaces/expected/types/Product.kt index fd0de5806..bf226b175 100644 --- a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithMappedInterfaces/expected/types/Product.kt +++ b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithMappedInterfaces/expected/types/Product.kt @@ -10,7 +10,11 @@ import java.lang.IllegalStateException import kotlin.String import kotlin.Suppress import kotlin.jvm.JvmName +import com.netflix.graphql.dgs.codegen.cases.dataClassWithMappedInterfaces.expected.Generated as ExpectedGenerated +import jakarta.`annotation`.Generated as AnnotationGenerated +@AnnotationGenerated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) +@ExpectedGenerated @JsonTypeInfo(use = JsonTypeInfo.Id.NONE) @JsonDeserialize(builder = Product.Builder::class) public class Product( @@ -24,11 +28,15 @@ public class Product( override val id: String get() = __id.invoke() + @AnnotationGenerated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) + @ExpectedGenerated public companion object { private val idDefault: () -> String = { throw IllegalStateException("Field `id` was not requested") } } + @AnnotationGenerated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) + @ExpectedGenerated @JsonPOJOBuilder @JsonIgnoreProperties("__typename") public class Builder { diff --git a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithMappedInterfaces/expected/types/Query.kt b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithMappedInterfaces/expected/types/Query.kt index c912a9e19..e96b09c9a 100644 --- a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithMappedInterfaces/expected/types/Query.kt +++ b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithMappedInterfaces/expected/types/Query.kt @@ -8,7 +8,11 @@ import com.fasterxml.jackson.databind.`annotation`.JsonPOJOBuilder import java.lang.IllegalStateException import kotlin.collections.List import kotlin.jvm.JvmName +import com.netflix.graphql.dgs.codegen.cases.dataClassWithMappedInterfaces.expected.Generated as ExpectedGenerated +import jakarta.`annotation`.Generated as AnnotationGenerated +@AnnotationGenerated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) +@ExpectedGenerated @JsonTypeInfo(use = JsonTypeInfo.Id.NONE) @JsonDeserialize(builder = Query.Builder::class) public class Query( @@ -20,11 +24,15 @@ public class Query( public val products: List? get() = __products.invoke() + @AnnotationGenerated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) + @ExpectedGenerated public companion object { private val productsDefault: () -> List? = { throw IllegalStateException("Field `products` was not requested") } } + @AnnotationGenerated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) + @ExpectedGenerated @JsonPOJOBuilder @JsonIgnoreProperties("__typename") public class Builder { diff --git a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithMappedTypes/expected/DgsClient.kt b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithMappedTypes/expected/DgsClient.kt index f3fcfac68..b543d2d20 100644 --- a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithMappedTypes/expected/DgsClient.kt +++ b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithMappedTypes/expected/DgsClient.kt @@ -6,6 +6,8 @@ import com.netflix.graphql.dgs.codegen.cases.dataClassWithMappedTypes.expected.c import graphql.language.OperationDefinition import kotlin.String +@jakarta.`annotation`.Generated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) +@Generated public object DgsClient { public fun buildQuery(inputValueSerializer: InputValueSerializerInterface? = null, _projection: QueryProjection.() -> QueryProjection): String = diff --git a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithMappedTypes/expected/DgsConstants.kt b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithMappedTypes/expected/DgsConstants.kt index 54f7d67e2..f15ae89a7 100644 --- a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithMappedTypes/expected/DgsConstants.kt +++ b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithMappedTypes/expected/DgsConstants.kt @@ -2,9 +2,13 @@ package com.netflix.graphql.dgs.codegen.cases.dataClassWithMappedTypes.expected import kotlin.String +@jakarta.`annotation`.Generated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) +@Generated public object DgsConstants { public const val QUERY_TYPE: String = "Query" + @jakarta.`annotation`.Generated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) + @Generated public object QUERY { public const val TYPE_NAME: String = "Query" @@ -13,6 +17,8 @@ public object DgsConstants { public const val EntityConnection: String = "entityConnection" } + @jakarta.`annotation`.Generated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) + @Generated public object ENTITY { public const val TYPE_NAME: String = "Entity" @@ -21,6 +27,8 @@ public object DgsConstants { public const val DateTime: String = "dateTime" } + @jakarta.`annotation`.Generated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) + @Generated public object ENTITYCONNECTION { public const val TYPE_NAME: String = "EntityConnection" @@ -29,6 +37,8 @@ public object DgsConstants { public const val Edges: String = "edges" } + @jakarta.`annotation`.Generated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) + @Generated public object ENTITYEDGE { public const val TYPE_NAME: String = "EntityEdge" @@ -37,6 +47,8 @@ public object DgsConstants { public const val Node: String = "node" } + @jakarta.`annotation`.Generated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) + @Generated public object PAGEINFO { public const val TYPE_NAME: String = "PageInfo" diff --git a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithMappedTypes/expected/Generated.kt b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithMappedTypes/expected/Generated.kt new file mode 100644 index 000000000..403060603 --- /dev/null +++ b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithMappedTypes/expected/Generated.kt @@ -0,0 +1,7 @@ +package com.netflix.graphql.dgs.codegen.cases.dataClassWithMappedTypes.expected + +import kotlin.`annotation`.AnnotationRetention +import kotlin.`annotation`.Retention + +@Retention(value = AnnotationRetention.BINARY) +public annotation class Generated diff --git a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithMappedTypes/expected/client/EntityConnectionProjection.kt b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithMappedTypes/expected/client/EntityConnectionProjection.kt index 77ba0aacc..80714acec 100644 --- a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithMappedTypes/expected/client/EntityConnectionProjection.kt +++ b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithMappedTypes/expected/client/EntityConnectionProjection.kt @@ -3,7 +3,11 @@ package com.netflix.graphql.dgs.codegen.cases.dataClassWithMappedTypes.expected. import com.netflix.graphql.dgs.client.codegen.InputValueSerializerInterface import com.netflix.graphql.dgs.codegen.GraphQLProjection import kotlin.String +import com.netflix.graphql.dgs.codegen.cases.dataClassWithMappedTypes.expected.Generated as ExpectedGenerated +import jakarta.`annotation`.Generated as AnnotationGenerated +@AnnotationGenerated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) +@ExpectedGenerated public class EntityConnectionProjection( inputValueSerializer: InputValueSerializerInterface? = null, ) : GraphQLProjection(inputValueSerializer) { diff --git a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithMappedTypes/expected/client/EntityEdgeProjection.kt b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithMappedTypes/expected/client/EntityEdgeProjection.kt index bcedfad22..b24ad86ae 100644 --- a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithMappedTypes/expected/client/EntityEdgeProjection.kt +++ b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithMappedTypes/expected/client/EntityEdgeProjection.kt @@ -3,7 +3,11 @@ package com.netflix.graphql.dgs.codegen.cases.dataClassWithMappedTypes.expected. import com.netflix.graphql.dgs.client.codegen.InputValueSerializerInterface import com.netflix.graphql.dgs.codegen.GraphQLProjection import kotlin.String +import com.netflix.graphql.dgs.codegen.cases.dataClassWithMappedTypes.expected.Generated as ExpectedGenerated +import jakarta.`annotation`.Generated as AnnotationGenerated +@AnnotationGenerated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) +@ExpectedGenerated public class EntityEdgeProjection( inputValueSerializer: InputValueSerializerInterface? = null, ) : GraphQLProjection(inputValueSerializer) { diff --git a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithMappedTypes/expected/client/EntityProjection.kt b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithMappedTypes/expected/client/EntityProjection.kt index 19b0dc01e..af96d86c2 100644 --- a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithMappedTypes/expected/client/EntityProjection.kt +++ b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithMappedTypes/expected/client/EntityProjection.kt @@ -2,7 +2,11 @@ package com.netflix.graphql.dgs.codegen.cases.dataClassWithMappedTypes.expected. import com.netflix.graphql.dgs.client.codegen.InputValueSerializerInterface import com.netflix.graphql.dgs.codegen.GraphQLProjection +import com.netflix.graphql.dgs.codegen.cases.dataClassWithMappedTypes.expected.Generated as ExpectedGenerated +import jakarta.`annotation`.Generated as AnnotationGenerated +@AnnotationGenerated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) +@ExpectedGenerated public class EntityProjection( inputValueSerializer: InputValueSerializerInterface? = null, ) : GraphQLProjection(inputValueSerializer) { diff --git a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithMappedTypes/expected/client/PageInfoProjection.kt b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithMappedTypes/expected/client/PageInfoProjection.kt index 8a41ac8f5..0082812e5 100644 --- a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithMappedTypes/expected/client/PageInfoProjection.kt +++ b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithMappedTypes/expected/client/PageInfoProjection.kt @@ -2,7 +2,11 @@ package com.netflix.graphql.dgs.codegen.cases.dataClassWithMappedTypes.expected. import com.netflix.graphql.dgs.client.codegen.InputValueSerializerInterface import com.netflix.graphql.dgs.codegen.GraphQLProjection +import com.netflix.graphql.dgs.codegen.cases.dataClassWithMappedTypes.expected.Generated as ExpectedGenerated +import jakarta.`annotation`.Generated as AnnotationGenerated +@AnnotationGenerated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) +@ExpectedGenerated public class PageInfoProjection( inputValueSerializer: InputValueSerializerInterface? = null, ) : GraphQLProjection(inputValueSerializer) { diff --git a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithMappedTypes/expected/client/QueryProjection.kt b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithMappedTypes/expected/client/QueryProjection.kt index 789d1d023..05b438577 100644 --- a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithMappedTypes/expected/client/QueryProjection.kt +++ b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithMappedTypes/expected/client/QueryProjection.kt @@ -3,7 +3,11 @@ package com.netflix.graphql.dgs.codegen.cases.dataClassWithMappedTypes.expected. import com.netflix.graphql.dgs.client.codegen.InputValueSerializerInterface import com.netflix.graphql.dgs.codegen.GraphQLProjection import kotlin.String +import com.netflix.graphql.dgs.codegen.cases.dataClassWithMappedTypes.expected.Generated as ExpectedGenerated +import jakarta.`annotation`.Generated as AnnotationGenerated +@AnnotationGenerated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) +@ExpectedGenerated public class QueryProjection( inputValueSerializer: InputValueSerializerInterface? = null, ) : GraphQLProjection(inputValueSerializer) { diff --git a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithMappedTypes/expected/types/Entity.kt b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithMappedTypes/expected/types/Entity.kt index 7a0dd05a3..f77f37255 100644 --- a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithMappedTypes/expected/types/Entity.kt +++ b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithMappedTypes/expected/types/Entity.kt @@ -9,7 +9,11 @@ import java.lang.IllegalStateException import java.time.OffsetDateTime import kotlin.Long import kotlin.jvm.JvmName +import com.netflix.graphql.dgs.codegen.cases.dataClassWithMappedTypes.expected.Generated as ExpectedGenerated +import jakarta.`annotation`.Generated as AnnotationGenerated +@AnnotationGenerated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) +@ExpectedGenerated @JsonTypeInfo(use = JsonTypeInfo.Id.NONE) @JsonDeserialize(builder = Entity.Builder::class) public class Entity( @@ -28,6 +32,8 @@ public class Entity( public val dateTime: OffsetDateTime? get() = __dateTime.invoke() + @AnnotationGenerated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) + @ExpectedGenerated public companion object { private val longDefault: () -> Long? = { throw IllegalStateException("Field `long` was not requested") } @@ -36,6 +42,8 @@ public class Entity( { throw IllegalStateException("Field `dateTime` was not requested") } } + @AnnotationGenerated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) + @ExpectedGenerated @JsonPOJOBuilder @JsonIgnoreProperties("__typename") public class Builder { diff --git a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithMappedTypes/expected/types/EntityEdge.kt b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithMappedTypes/expected/types/EntityEdge.kt index a0e3620a6..0992eed02 100644 --- a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithMappedTypes/expected/types/EntityEdge.kt +++ b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithMappedTypes/expected/types/EntityEdge.kt @@ -8,7 +8,11 @@ import com.fasterxml.jackson.databind.`annotation`.JsonPOJOBuilder import java.lang.IllegalStateException import kotlin.String import kotlin.jvm.JvmName +import com.netflix.graphql.dgs.codegen.cases.dataClassWithMappedTypes.expected.Generated as ExpectedGenerated +import jakarta.`annotation`.Generated as AnnotationGenerated +@AnnotationGenerated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) +@ExpectedGenerated @JsonTypeInfo(use = JsonTypeInfo.Id.NONE) @JsonDeserialize(builder = EntityEdge.Builder::class) public class EntityEdge( @@ -27,6 +31,8 @@ public class EntityEdge( public val node: Entity? get() = __node.invoke() + @AnnotationGenerated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) + @ExpectedGenerated public companion object { private val cursorDefault: () -> String = { throw IllegalStateException("Field `cursor` was not requested") } @@ -35,6 +41,8 @@ public class EntityEdge( { throw IllegalStateException("Field `node` was not requested") } } + @AnnotationGenerated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) + @ExpectedGenerated @JsonPOJOBuilder @JsonIgnoreProperties("__typename") public class Builder { diff --git a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithMappedTypes/expected/types/Query.kt b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithMappedTypes/expected/types/Query.kt index e7e726bda..65c8965bf 100644 --- a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithMappedTypes/expected/types/Query.kt +++ b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithMappedTypes/expected/types/Query.kt @@ -9,7 +9,11 @@ import graphql.relay.SimpleListConnection import java.lang.IllegalStateException import kotlin.collections.List import kotlin.jvm.JvmName +import com.netflix.graphql.dgs.codegen.cases.dataClassWithMappedTypes.expected.Generated as ExpectedGenerated +import jakarta.`annotation`.Generated as AnnotationGenerated +@AnnotationGenerated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) +@ExpectedGenerated @JsonTypeInfo(use = JsonTypeInfo.Id.NONE) @JsonDeserialize(builder = Query.Builder::class) public class Query( @@ -28,6 +32,8 @@ public class Query( public val entityConnection: SimpleListConnection? get() = __entityConnection.invoke() + @AnnotationGenerated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) + @ExpectedGenerated public companion object { private val entityDefault: () -> List? = { throw IllegalStateException("Field `entity` was not requested") } @@ -36,6 +42,8 @@ public class Query( { throw IllegalStateException("Field `entityConnection` was not requested") } } + @AnnotationGenerated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) + @ExpectedGenerated @JsonPOJOBuilder @JsonIgnoreProperties("__typename") public class Builder { diff --git a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithNonNullableAndInterface/expected/DgsClient.kt b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithNonNullableAndInterface/expected/DgsClient.kt index 11d0abf8d..4855d7589 100644 --- a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithNonNullableAndInterface/expected/DgsClient.kt +++ b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithNonNullableAndInterface/expected/DgsClient.kt @@ -6,6 +6,8 @@ import com.netflix.graphql.dgs.codegen.cases.dataClassWithNonNullableAndInterfac import graphql.language.OperationDefinition import kotlin.String +@jakarta.`annotation`.Generated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) +@Generated public object DgsClient { public fun buildQuery(inputValueSerializer: InputValueSerializerInterface? = null, _projection: QueryProjection.() -> QueryProjection): String = diff --git a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithNonNullableAndInterface/expected/DgsConstants.kt b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithNonNullableAndInterface/expected/DgsConstants.kt index 0a68713f2..ac9318510 100644 --- a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithNonNullableAndInterface/expected/DgsConstants.kt +++ b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithNonNullableAndInterface/expected/DgsConstants.kt @@ -2,15 +2,21 @@ package com.netflix.graphql.dgs.codegen.cases.dataClassWithNonNullableAndInterfa import kotlin.String +@jakarta.`annotation`.Generated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) +@Generated public object DgsConstants { public const val QUERY_TYPE: String = "Query" + @jakarta.`annotation`.Generated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) + @Generated public object QUERY { public const val TYPE_NAME: String = "Query" public const val People: String = "people" } + @jakarta.`annotation`.Generated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) + @Generated public object EMPLOYEE { public const val TYPE_NAME: String = "Employee" @@ -21,6 +27,8 @@ public object DgsConstants { public const val Company: String = "company" } + @jakarta.`annotation`.Generated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) + @Generated public object PERSON { public const val TYPE_NAME: String = "Person" diff --git a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithNonNullableAndInterface/expected/Generated.kt b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithNonNullableAndInterface/expected/Generated.kt new file mode 100644 index 000000000..08ec653d7 --- /dev/null +++ b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithNonNullableAndInterface/expected/Generated.kt @@ -0,0 +1,7 @@ +package com.netflix.graphql.dgs.codegen.cases.dataClassWithNonNullableAndInterface.expected + +import kotlin.`annotation`.AnnotationRetention +import kotlin.`annotation`.Retention + +@Retention(value = AnnotationRetention.BINARY) +public annotation class Generated diff --git a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithNonNullableAndInterface/expected/client/EmployeeProjection.kt b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithNonNullableAndInterface/expected/client/EmployeeProjection.kt index c67c3d847..ae69e8a79 100644 --- a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithNonNullableAndInterface/expected/client/EmployeeProjection.kt +++ b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithNonNullableAndInterface/expected/client/EmployeeProjection.kt @@ -2,7 +2,11 @@ package com.netflix.graphql.dgs.codegen.cases.dataClassWithNonNullableAndInterfa import com.netflix.graphql.dgs.client.codegen.InputValueSerializerInterface import com.netflix.graphql.dgs.codegen.GraphQLProjection +import com.netflix.graphql.dgs.codegen.cases.dataClassWithNonNullableAndInterface.expected.Generated as ExpectedGenerated +import jakarta.`annotation`.Generated as AnnotationGenerated +@AnnotationGenerated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) +@ExpectedGenerated public class EmployeeProjection( inputValueSerializer: InputValueSerializerInterface? = null, ) : GraphQLProjection(inputValueSerializer) { diff --git a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithNonNullableAndInterface/expected/client/PersonProjection.kt b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithNonNullableAndInterface/expected/client/PersonProjection.kt index 66d88af97..1d7a20563 100644 --- a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithNonNullableAndInterface/expected/client/PersonProjection.kt +++ b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithNonNullableAndInterface/expected/client/PersonProjection.kt @@ -2,7 +2,11 @@ package com.netflix.graphql.dgs.codegen.cases.dataClassWithNonNullableAndInterfa import com.netflix.graphql.dgs.client.codegen.InputValueSerializerInterface import com.netflix.graphql.dgs.codegen.GraphQLProjection +import com.netflix.graphql.dgs.codegen.cases.dataClassWithNonNullableAndInterface.expected.Generated as ExpectedGenerated +import jakarta.`annotation`.Generated as AnnotationGenerated +@AnnotationGenerated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) +@ExpectedGenerated public class PersonProjection( inputValueSerializer: InputValueSerializerInterface? = null, ) : GraphQLProjection(inputValueSerializer) { diff --git a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithNonNullableAndInterface/expected/client/QueryProjection.kt b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithNonNullableAndInterface/expected/client/QueryProjection.kt index b53a88b19..6368f625d 100644 --- a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithNonNullableAndInterface/expected/client/QueryProjection.kt +++ b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithNonNullableAndInterface/expected/client/QueryProjection.kt @@ -3,7 +3,11 @@ package com.netflix.graphql.dgs.codegen.cases.dataClassWithNonNullableAndInterfa import com.netflix.graphql.dgs.client.codegen.InputValueSerializerInterface import com.netflix.graphql.dgs.codegen.GraphQLProjection import kotlin.String +import com.netflix.graphql.dgs.codegen.cases.dataClassWithNonNullableAndInterface.expected.Generated as ExpectedGenerated +import jakarta.`annotation`.Generated as AnnotationGenerated +@AnnotationGenerated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) +@ExpectedGenerated public class QueryProjection( inputValueSerializer: InputValueSerializerInterface? = null, ) : GraphQLProjection(inputValueSerializer) { diff --git a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithNonNullableAndInterface/expected/types/Employee.kt b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithNonNullableAndInterface/expected/types/Employee.kt index b9f267245..fb684a1dc 100644 --- a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithNonNullableAndInterface/expected/types/Employee.kt +++ b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithNonNullableAndInterface/expected/types/Employee.kt @@ -9,7 +9,11 @@ import java.lang.IllegalStateException import kotlin.String import kotlin.Suppress import kotlin.jvm.JvmName +import com.netflix.graphql.dgs.codegen.cases.dataClassWithNonNullableAndInterface.expected.Generated as ExpectedGenerated +import jakarta.`annotation`.Generated as AnnotationGenerated +@AnnotationGenerated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) +@ExpectedGenerated @JsonTypeInfo(use = JsonTypeInfo.Id.NONE) @JsonDeserialize(builder = Employee.Builder::class) public class Employee( @@ -38,6 +42,8 @@ public class Employee( override val company: String? get() = __company.invoke() + @AnnotationGenerated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) + @ExpectedGenerated public companion object { private val firstnameDefault: () -> String = { throw IllegalStateException("Field `firstname` was not requested") } @@ -49,6 +55,8 @@ public class Employee( { throw IllegalStateException("Field `company` was not requested") } } + @AnnotationGenerated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) + @ExpectedGenerated @JsonPOJOBuilder @JsonIgnoreProperties("__typename") public class Builder { diff --git a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithNonNullableAndInterface/expected/types/Person.kt b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithNonNullableAndInterface/expected/types/Person.kt index 20902a8b7..fd02e21c3 100644 --- a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithNonNullableAndInterface/expected/types/Person.kt +++ b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithNonNullableAndInterface/expected/types/Person.kt @@ -5,7 +5,11 @@ import com.fasterxml.jackson.`annotation`.JsonTypeInfo import kotlin.String import kotlin.Suppress import kotlin.jvm.JvmName +import com.netflix.graphql.dgs.codegen.cases.dataClassWithNonNullableAndInterface.expected.Generated as ExpectedGenerated +import jakarta.`annotation`.Generated as AnnotationGenerated +@AnnotationGenerated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) +@ExpectedGenerated @JsonTypeInfo( use = JsonTypeInfo.Id.NAME, include = JsonTypeInfo.As.PROPERTY, diff --git a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithNonNullableAndInterface/expected/types/Query.kt b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithNonNullableAndInterface/expected/types/Query.kt index afaad8450..37e1d7fb6 100644 --- a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithNonNullableAndInterface/expected/types/Query.kt +++ b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithNonNullableAndInterface/expected/types/Query.kt @@ -8,7 +8,11 @@ import com.fasterxml.jackson.databind.`annotation`.JsonPOJOBuilder import java.lang.IllegalStateException import kotlin.collections.List import kotlin.jvm.JvmName +import com.netflix.graphql.dgs.codegen.cases.dataClassWithNonNullableAndInterface.expected.Generated as ExpectedGenerated +import jakarta.`annotation`.Generated as AnnotationGenerated +@AnnotationGenerated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) +@ExpectedGenerated @JsonTypeInfo(use = JsonTypeInfo.Id.NONE) @JsonDeserialize(builder = Query.Builder::class) public class Query( @@ -20,11 +24,15 @@ public class Query( public val people: List? get() = __people.invoke() + @AnnotationGenerated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) + @ExpectedGenerated public companion object { private val peopleDefault: () -> List? = { throw IllegalStateException("Field `people` was not requested") } } + @AnnotationGenerated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) + @ExpectedGenerated @JsonPOJOBuilder @JsonIgnoreProperties("__typename") public class Builder { diff --git a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithNonNullableComplexType/expected/DgsClient.kt b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithNonNullableComplexType/expected/DgsClient.kt index 6fc60a10c..4b856b5fe 100644 --- a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithNonNullableComplexType/expected/DgsClient.kt +++ b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithNonNullableComplexType/expected/DgsClient.kt @@ -1,3 +1,5 @@ package com.netflix.graphql.dgs.codegen.cases.dataClassWithNonNullableComplexType.expected +@jakarta.`annotation`.Generated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) +@Generated public object DgsClient diff --git a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithNonNullableComplexType/expected/DgsConstants.kt b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithNonNullableComplexType/expected/DgsConstants.kt index bef5ce142..7c5cec36e 100644 --- a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithNonNullableComplexType/expected/DgsConstants.kt +++ b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithNonNullableComplexType/expected/DgsConstants.kt @@ -2,13 +2,19 @@ package com.netflix.graphql.dgs.codegen.cases.dataClassWithNonNullableComplexTyp import kotlin.String +@jakarta.`annotation`.Generated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) +@Generated public object DgsConstants { + @jakarta.`annotation`.Generated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) + @Generated public object MYTYPE { public const val TYPE_NAME: String = "MyType" public const val Other: String = "other" } + @jakarta.`annotation`.Generated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) + @Generated public object OTHERTYPE { public const val TYPE_NAME: String = "OtherType" diff --git a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithNonNullableComplexType/expected/Generated.kt b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithNonNullableComplexType/expected/Generated.kt new file mode 100644 index 000000000..b04940df0 --- /dev/null +++ b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithNonNullableComplexType/expected/Generated.kt @@ -0,0 +1,7 @@ +package com.netflix.graphql.dgs.codegen.cases.dataClassWithNonNullableComplexType.expected + +import kotlin.`annotation`.AnnotationRetention +import kotlin.`annotation`.Retention + +@Retention(value = AnnotationRetention.BINARY) +public annotation class Generated diff --git a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithNonNullableComplexType/expected/client/MyTypeProjection.kt b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithNonNullableComplexType/expected/client/MyTypeProjection.kt index a5d9473b4..05efab057 100644 --- a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithNonNullableComplexType/expected/client/MyTypeProjection.kt +++ b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithNonNullableComplexType/expected/client/MyTypeProjection.kt @@ -3,7 +3,11 @@ package com.netflix.graphql.dgs.codegen.cases.dataClassWithNonNullableComplexTyp import com.netflix.graphql.dgs.client.codegen.InputValueSerializerInterface import com.netflix.graphql.dgs.codegen.GraphQLProjection import kotlin.String +import com.netflix.graphql.dgs.codegen.cases.dataClassWithNonNullableComplexType.expected.Generated as ExpectedGenerated +import jakarta.`annotation`.Generated as AnnotationGenerated +@AnnotationGenerated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) +@ExpectedGenerated public class MyTypeProjection( inputValueSerializer: InputValueSerializerInterface? = null, ) : GraphQLProjection(inputValueSerializer) { diff --git a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithNonNullableComplexType/expected/client/OtherTypeProjection.kt b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithNonNullableComplexType/expected/client/OtherTypeProjection.kt index ceb5fc99a..56836fcd5 100644 --- a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithNonNullableComplexType/expected/client/OtherTypeProjection.kt +++ b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithNonNullableComplexType/expected/client/OtherTypeProjection.kt @@ -2,7 +2,11 @@ package com.netflix.graphql.dgs.codegen.cases.dataClassWithNonNullableComplexTyp import com.netflix.graphql.dgs.client.codegen.InputValueSerializerInterface import com.netflix.graphql.dgs.codegen.GraphQLProjection +import com.netflix.graphql.dgs.codegen.cases.dataClassWithNonNullableComplexType.expected.Generated as ExpectedGenerated +import jakarta.`annotation`.Generated as AnnotationGenerated +@AnnotationGenerated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) +@ExpectedGenerated public class OtherTypeProjection( inputValueSerializer: InputValueSerializerInterface? = null, ) : GraphQLProjection(inputValueSerializer) { diff --git a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithNonNullableComplexType/expected/types/MyType.kt b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithNonNullableComplexType/expected/types/MyType.kt index 75a89bc92..6bbb94ce3 100644 --- a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithNonNullableComplexType/expected/types/MyType.kt +++ b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithNonNullableComplexType/expected/types/MyType.kt @@ -7,7 +7,11 @@ import com.fasterxml.jackson.databind.`annotation`.JsonDeserialize import com.fasterxml.jackson.databind.`annotation`.JsonPOJOBuilder import java.lang.IllegalStateException import kotlin.jvm.JvmName +import com.netflix.graphql.dgs.codegen.cases.dataClassWithNonNullableComplexType.expected.Generated as ExpectedGenerated +import jakarta.`annotation`.Generated as AnnotationGenerated +@AnnotationGenerated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) +@ExpectedGenerated @JsonTypeInfo(use = JsonTypeInfo.Id.NONE) @JsonDeserialize(builder = MyType.Builder::class) public class MyType( @@ -19,11 +23,15 @@ public class MyType( public val other: OtherType get() = __other.invoke() + @AnnotationGenerated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) + @ExpectedGenerated public companion object { private val otherDefault: () -> OtherType = { throw IllegalStateException("Field `other` was not requested") } } + @AnnotationGenerated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) + @ExpectedGenerated @JsonPOJOBuilder @JsonIgnoreProperties("__typename") public class Builder { diff --git a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithNonNullableComplexType/expected/types/OtherType.kt b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithNonNullableComplexType/expected/types/OtherType.kt index 48cd62864..f6ddd2e07 100644 --- a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithNonNullableComplexType/expected/types/OtherType.kt +++ b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithNonNullableComplexType/expected/types/OtherType.kt @@ -8,7 +8,11 @@ import com.fasterxml.jackson.databind.`annotation`.JsonPOJOBuilder import java.lang.IllegalStateException import kotlin.String import kotlin.jvm.JvmName +import com.netflix.graphql.dgs.codegen.cases.dataClassWithNonNullableComplexType.expected.Generated as ExpectedGenerated +import jakarta.`annotation`.Generated as AnnotationGenerated +@AnnotationGenerated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) +@ExpectedGenerated @JsonTypeInfo(use = JsonTypeInfo.Id.NONE) @JsonDeserialize(builder = OtherType.Builder::class) public class OtherType( @@ -20,11 +24,15 @@ public class OtherType( public val name: String get() = __name.invoke() + @AnnotationGenerated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) + @ExpectedGenerated public companion object { private val nameDefault: () -> String = { throw IllegalStateException("Field `name` was not requested") } } + @AnnotationGenerated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) + @ExpectedGenerated @JsonPOJOBuilder @JsonIgnoreProperties("__typename") public class Builder { diff --git a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithNonNullableListOfNullableValues/expected/DgsClient.kt b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithNonNullableListOfNullableValues/expected/DgsClient.kt index b2a8baf51..fafd53bfa 100644 --- a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithNonNullableListOfNullableValues/expected/DgsClient.kt +++ b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithNonNullableListOfNullableValues/expected/DgsClient.kt @@ -6,6 +6,8 @@ import com.netflix.graphql.dgs.codegen.cases.dataClassWithNonNullableListOfNulla import graphql.language.OperationDefinition import kotlin.String +@jakarta.`annotation`.Generated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) +@Generated public object DgsClient { public fun buildQuery(inputValueSerializer: InputValueSerializerInterface? = null, _projection: QueryProjection.() -> QueryProjection): String = diff --git a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithNonNullableListOfNullableValues/expected/DgsConstants.kt b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithNonNullableListOfNullableValues/expected/DgsConstants.kt index 41a5c3e4b..192fa89da 100644 --- a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithNonNullableListOfNullableValues/expected/DgsConstants.kt +++ b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithNonNullableListOfNullableValues/expected/DgsConstants.kt @@ -2,15 +2,21 @@ package com.netflix.graphql.dgs.codegen.cases.dataClassWithNonNullableListOfNull import kotlin.String +@jakarta.`annotation`.Generated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) +@Generated public object DgsConstants { public const val QUERY_TYPE: String = "Query" + @jakarta.`annotation`.Generated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) + @Generated public object QUERY { public const val TYPE_NAME: String = "Query" public const val People: String = "people" } + @jakarta.`annotation`.Generated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) + @Generated public object PERSON { public const val TYPE_NAME: String = "Person" diff --git a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithNonNullableListOfNullableValues/expected/Generated.kt b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithNonNullableListOfNullableValues/expected/Generated.kt new file mode 100644 index 000000000..bf020c861 --- /dev/null +++ b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithNonNullableListOfNullableValues/expected/Generated.kt @@ -0,0 +1,7 @@ +package com.netflix.graphql.dgs.codegen.cases.dataClassWithNonNullableListOfNullableValues.expected + +import kotlin.`annotation`.AnnotationRetention +import kotlin.`annotation`.Retention + +@Retention(value = AnnotationRetention.BINARY) +public annotation class Generated diff --git a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithNonNullableListOfNullableValues/expected/client/PersonProjection.kt b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithNonNullableListOfNullableValues/expected/client/PersonProjection.kt index 3165511af..06dc59d11 100644 --- a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithNonNullableListOfNullableValues/expected/client/PersonProjection.kt +++ b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithNonNullableListOfNullableValues/expected/client/PersonProjection.kt @@ -2,7 +2,11 @@ package com.netflix.graphql.dgs.codegen.cases.dataClassWithNonNullableListOfNull import com.netflix.graphql.dgs.client.codegen.InputValueSerializerInterface import com.netflix.graphql.dgs.codegen.GraphQLProjection +import com.netflix.graphql.dgs.codegen.cases.dataClassWithNonNullableListOfNullableValues.expected.Generated as ExpectedGenerated +import jakarta.`annotation`.Generated as AnnotationGenerated +@AnnotationGenerated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) +@ExpectedGenerated public class PersonProjection( inputValueSerializer: InputValueSerializerInterface? = null, ) : GraphQLProjection(inputValueSerializer) { diff --git a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithNonNullableListOfNullableValues/expected/client/QueryProjection.kt b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithNonNullableListOfNullableValues/expected/client/QueryProjection.kt index 6db6bfc60..1ad68a75d 100644 --- a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithNonNullableListOfNullableValues/expected/client/QueryProjection.kt +++ b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithNonNullableListOfNullableValues/expected/client/QueryProjection.kt @@ -3,7 +3,11 @@ package com.netflix.graphql.dgs.codegen.cases.dataClassWithNonNullableListOfNull import com.netflix.graphql.dgs.client.codegen.InputValueSerializerInterface import com.netflix.graphql.dgs.codegen.GraphQLProjection import kotlin.String +import com.netflix.graphql.dgs.codegen.cases.dataClassWithNonNullableListOfNullableValues.expected.Generated as ExpectedGenerated +import jakarta.`annotation`.Generated as AnnotationGenerated +@AnnotationGenerated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) +@ExpectedGenerated public class QueryProjection( inputValueSerializer: InputValueSerializerInterface? = null, ) : GraphQLProjection(inputValueSerializer) { diff --git a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithNonNullableListOfNullableValues/expected/types/Person.kt b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithNonNullableListOfNullableValues/expected/types/Person.kt index dd3e13995..03884e07c 100644 --- a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithNonNullableListOfNullableValues/expected/types/Person.kt +++ b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithNonNullableListOfNullableValues/expected/types/Person.kt @@ -9,7 +9,11 @@ import java.lang.IllegalStateException import kotlin.String import kotlin.collections.List import kotlin.jvm.JvmName +import com.netflix.graphql.dgs.codegen.cases.dataClassWithNonNullableListOfNullableValues.expected.Generated as ExpectedGenerated +import jakarta.`annotation`.Generated as AnnotationGenerated +@AnnotationGenerated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) +@ExpectedGenerated @JsonTypeInfo(use = JsonTypeInfo.Id.NONE) @JsonDeserialize(builder = Person.Builder::class) public class Person( @@ -28,6 +32,8 @@ public class Person( public val email: List get() = __email.invoke() + @AnnotationGenerated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) + @ExpectedGenerated public companion object { private val nameDefault: () -> String = { throw IllegalStateException("Field `name` was not requested") } @@ -36,6 +42,8 @@ public class Person( { throw IllegalStateException("Field `email` was not requested") } } + @AnnotationGenerated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) + @ExpectedGenerated @JsonPOJOBuilder @JsonIgnoreProperties("__typename") public class Builder { diff --git a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithNonNullableListOfNullableValues/expected/types/Query.kt b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithNonNullableListOfNullableValues/expected/types/Query.kt index 581c0266c..b3ac655ff 100644 --- a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithNonNullableListOfNullableValues/expected/types/Query.kt +++ b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithNonNullableListOfNullableValues/expected/types/Query.kt @@ -8,7 +8,11 @@ import com.fasterxml.jackson.databind.`annotation`.JsonPOJOBuilder import java.lang.IllegalStateException import kotlin.collections.List import kotlin.jvm.JvmName +import com.netflix.graphql.dgs.codegen.cases.dataClassWithNonNullableListOfNullableValues.expected.Generated as ExpectedGenerated +import jakarta.`annotation`.Generated as AnnotationGenerated +@AnnotationGenerated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) +@ExpectedGenerated @JsonTypeInfo(use = JsonTypeInfo.Id.NONE) @JsonDeserialize(builder = Query.Builder::class) public class Query( @@ -20,11 +24,15 @@ public class Query( public val people: List? get() = __people.invoke() + @AnnotationGenerated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) + @ExpectedGenerated public companion object { private val peopleDefault: () -> List? = { throw IllegalStateException("Field `people` was not requested") } } + @AnnotationGenerated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) + @ExpectedGenerated @JsonPOJOBuilder @JsonIgnoreProperties("__typename") public class Builder { diff --git a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithNonNullablePrimitive/expected/DgsClient.kt b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithNonNullablePrimitive/expected/DgsClient.kt index 7fe29414f..5aa763ef9 100644 --- a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithNonNullablePrimitive/expected/DgsClient.kt +++ b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithNonNullablePrimitive/expected/DgsClient.kt @@ -1,3 +1,5 @@ package com.netflix.graphql.dgs.codegen.cases.dataClassWithNonNullablePrimitive.expected +@jakarta.`annotation`.Generated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) +@Generated public object DgsClient diff --git a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithNonNullablePrimitive/expected/DgsConstants.kt b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithNonNullablePrimitive/expected/DgsConstants.kt index a17b7e5b4..eb5e5beff 100644 --- a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithNonNullablePrimitive/expected/DgsConstants.kt +++ b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithNonNullablePrimitive/expected/DgsConstants.kt @@ -2,7 +2,11 @@ package com.netflix.graphql.dgs.codegen.cases.dataClassWithNonNullablePrimitive. import kotlin.String +@jakarta.`annotation`.Generated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) +@Generated public object DgsConstants { + @jakarta.`annotation`.Generated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) + @Generated public object MYTYPE { public const val TYPE_NAME: String = "MyType" diff --git a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithNonNullablePrimitive/expected/Generated.kt b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithNonNullablePrimitive/expected/Generated.kt new file mode 100644 index 000000000..b728f07a4 --- /dev/null +++ b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithNonNullablePrimitive/expected/Generated.kt @@ -0,0 +1,7 @@ +package com.netflix.graphql.dgs.codegen.cases.dataClassWithNonNullablePrimitive.expected + +import kotlin.`annotation`.AnnotationRetention +import kotlin.`annotation`.Retention + +@Retention(value = AnnotationRetention.BINARY) +public annotation class Generated diff --git a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithNonNullablePrimitive/expected/client/MyTypeProjection.kt b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithNonNullablePrimitive/expected/client/MyTypeProjection.kt index ebb2499ea..089df5501 100644 --- a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithNonNullablePrimitive/expected/client/MyTypeProjection.kt +++ b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithNonNullablePrimitive/expected/client/MyTypeProjection.kt @@ -2,7 +2,11 @@ package com.netflix.graphql.dgs.codegen.cases.dataClassWithNonNullablePrimitive. import com.netflix.graphql.dgs.client.codegen.InputValueSerializerInterface import com.netflix.graphql.dgs.codegen.GraphQLProjection +import com.netflix.graphql.dgs.codegen.cases.dataClassWithNonNullablePrimitive.expected.Generated as ExpectedGenerated +import jakarta.`annotation`.Generated as AnnotationGenerated +@AnnotationGenerated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) +@ExpectedGenerated public class MyTypeProjection( inputValueSerializer: InputValueSerializerInterface? = null, ) : GraphQLProjection(inputValueSerializer) { diff --git a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithNonNullablePrimitive/expected/types/MyType.kt b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithNonNullablePrimitive/expected/types/MyType.kt index 908d637a8..40fb6bfab 100644 --- a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithNonNullablePrimitive/expected/types/MyType.kt +++ b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithNonNullablePrimitive/expected/types/MyType.kt @@ -10,7 +10,11 @@ import kotlin.Boolean import kotlin.Double import kotlin.Int import kotlin.jvm.JvmName +import com.netflix.graphql.dgs.codegen.cases.dataClassWithNonNullablePrimitive.expected.Generated as ExpectedGenerated +import jakarta.`annotation`.Generated as AnnotationGenerated +@AnnotationGenerated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) +@ExpectedGenerated @JsonTypeInfo(use = JsonTypeInfo.Id.NONE) @JsonDeserialize(builder = MyType.Builder::class) public class MyType( @@ -36,6 +40,8 @@ public class MyType( public val floaty: Double get() = __floaty.invoke() + @AnnotationGenerated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) + @ExpectedGenerated public companion object { private val countDefault: () -> Int = { throw IllegalStateException("Field `count` was not requested") } @@ -47,6 +53,8 @@ public class MyType( { throw IllegalStateException("Field `floaty` was not requested") } } + @AnnotationGenerated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) + @ExpectedGenerated @JsonPOJOBuilder @JsonIgnoreProperties("__typename") public class Builder { diff --git a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithNonNullablePrimitiveInList/expected/DgsClient.kt b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithNonNullablePrimitiveInList/expected/DgsClient.kt index c94006a12..f165face8 100644 --- a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithNonNullablePrimitiveInList/expected/DgsClient.kt +++ b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithNonNullablePrimitiveInList/expected/DgsClient.kt @@ -1,3 +1,5 @@ package com.netflix.graphql.dgs.codegen.cases.dataClassWithNonNullablePrimitiveInList.expected +@jakarta.`annotation`.Generated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) +@Generated public object DgsClient diff --git a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithNonNullablePrimitiveInList/expected/DgsConstants.kt b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithNonNullablePrimitiveInList/expected/DgsConstants.kt index 2e069615e..272bad39c 100644 --- a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithNonNullablePrimitiveInList/expected/DgsConstants.kt +++ b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithNonNullablePrimitiveInList/expected/DgsConstants.kt @@ -2,7 +2,11 @@ package com.netflix.graphql.dgs.codegen.cases.dataClassWithNonNullablePrimitiveI import kotlin.String +@jakarta.`annotation`.Generated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) +@Generated public object DgsConstants { + @jakarta.`annotation`.Generated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) + @Generated public object MYTYPE { public const val TYPE_NAME: String = "MyType" diff --git a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithNonNullablePrimitiveInList/expected/Generated.kt b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithNonNullablePrimitiveInList/expected/Generated.kt new file mode 100644 index 000000000..171b8e497 --- /dev/null +++ b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithNonNullablePrimitiveInList/expected/Generated.kt @@ -0,0 +1,7 @@ +package com.netflix.graphql.dgs.codegen.cases.dataClassWithNonNullablePrimitiveInList.expected + +import kotlin.`annotation`.AnnotationRetention +import kotlin.`annotation`.Retention + +@Retention(value = AnnotationRetention.BINARY) +public annotation class Generated diff --git a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithNonNullablePrimitiveInList/expected/client/MyTypeProjection.kt b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithNonNullablePrimitiveInList/expected/client/MyTypeProjection.kt index 4e07f4bae..f0e11f43c 100644 --- a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithNonNullablePrimitiveInList/expected/client/MyTypeProjection.kt +++ b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithNonNullablePrimitiveInList/expected/client/MyTypeProjection.kt @@ -2,7 +2,11 @@ package com.netflix.graphql.dgs.codegen.cases.dataClassWithNonNullablePrimitiveI import com.netflix.graphql.dgs.client.codegen.InputValueSerializerInterface import com.netflix.graphql.dgs.codegen.GraphQLProjection +import com.netflix.graphql.dgs.codegen.cases.dataClassWithNonNullablePrimitiveInList.expected.Generated as ExpectedGenerated +import jakarta.`annotation`.Generated as AnnotationGenerated +@AnnotationGenerated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) +@ExpectedGenerated public class MyTypeProjection( inputValueSerializer: InputValueSerializerInterface? = null, ) : GraphQLProjection(inputValueSerializer) { diff --git a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithNonNullablePrimitiveInList/expected/types/MyType.kt b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithNonNullablePrimitiveInList/expected/types/MyType.kt index 6c71edd29..309c16a74 100644 --- a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithNonNullablePrimitiveInList/expected/types/MyType.kt +++ b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithNonNullablePrimitiveInList/expected/types/MyType.kt @@ -11,7 +11,11 @@ import kotlin.Double import kotlin.Int import kotlin.collections.List import kotlin.jvm.JvmName +import com.netflix.graphql.dgs.codegen.cases.dataClassWithNonNullablePrimitiveInList.expected.Generated as ExpectedGenerated +import jakarta.`annotation`.Generated as AnnotationGenerated +@AnnotationGenerated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) +@ExpectedGenerated @JsonTypeInfo(use = JsonTypeInfo.Id.NONE) @JsonDeserialize(builder = MyType.Builder::class) public class MyType( @@ -37,6 +41,8 @@ public class MyType( public val floaty: List? get() = __floaty.invoke() + @AnnotationGenerated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) + @ExpectedGenerated public companion object { private val countDefault: () -> List? = { throw IllegalStateException("Field `count` was not requested") } @@ -48,6 +54,8 @@ public class MyType( { throw IllegalStateException("Field `floaty` was not requested") } } + @AnnotationGenerated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) + @ExpectedGenerated @JsonPOJOBuilder @JsonIgnoreProperties("__typename") public class Builder { diff --git a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithNonNullableProperties/expected/DgsClient.kt b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithNonNullableProperties/expected/DgsClient.kt index 72d692cf9..0e4b59b83 100644 --- a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithNonNullableProperties/expected/DgsClient.kt +++ b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithNonNullableProperties/expected/DgsClient.kt @@ -6,6 +6,8 @@ import com.netflix.graphql.dgs.codegen.cases.dataClassWithNonNullableProperties. import graphql.language.OperationDefinition import kotlin.String +@jakarta.`annotation`.Generated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) +@Generated public object DgsClient { public fun buildQuery(inputValueSerializer: InputValueSerializerInterface? = null, _projection: QueryProjection.() -> QueryProjection): String = diff --git a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithNonNullableProperties/expected/DgsConstants.kt b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithNonNullableProperties/expected/DgsConstants.kt index 0f46156c4..259b3095c 100644 --- a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithNonNullableProperties/expected/DgsConstants.kt +++ b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithNonNullableProperties/expected/DgsConstants.kt @@ -2,15 +2,21 @@ package com.netflix.graphql.dgs.codegen.cases.dataClassWithNonNullableProperties import kotlin.String +@jakarta.`annotation`.Generated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) +@Generated public object DgsConstants { public const val QUERY_TYPE: String = "Query" + @jakarta.`annotation`.Generated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) + @Generated public object QUERY { public const val TYPE_NAME: String = "Query" public const val People: String = "people" } + @jakarta.`annotation`.Generated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) + @Generated public object PERSON { public const val TYPE_NAME: String = "Person" diff --git a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithNonNullableProperties/expected/Generated.kt b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithNonNullableProperties/expected/Generated.kt new file mode 100644 index 000000000..554427be0 --- /dev/null +++ b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithNonNullableProperties/expected/Generated.kt @@ -0,0 +1,7 @@ +package com.netflix.graphql.dgs.codegen.cases.dataClassWithNonNullableProperties.expected + +import kotlin.`annotation`.AnnotationRetention +import kotlin.`annotation`.Retention + +@Retention(value = AnnotationRetention.BINARY) +public annotation class Generated diff --git a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithNonNullableProperties/expected/client/PersonProjection.kt b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithNonNullableProperties/expected/client/PersonProjection.kt index aded34ec7..efc210598 100644 --- a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithNonNullableProperties/expected/client/PersonProjection.kt +++ b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithNonNullableProperties/expected/client/PersonProjection.kt @@ -2,7 +2,11 @@ package com.netflix.graphql.dgs.codegen.cases.dataClassWithNonNullableProperties import com.netflix.graphql.dgs.client.codegen.InputValueSerializerInterface import com.netflix.graphql.dgs.codegen.GraphQLProjection +import com.netflix.graphql.dgs.codegen.cases.dataClassWithNonNullableProperties.expected.Generated as ExpectedGenerated +import jakarta.`annotation`.Generated as AnnotationGenerated +@AnnotationGenerated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) +@ExpectedGenerated public class PersonProjection( inputValueSerializer: InputValueSerializerInterface? = null, ) : GraphQLProjection(inputValueSerializer) { diff --git a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithNonNullableProperties/expected/client/QueryProjection.kt b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithNonNullableProperties/expected/client/QueryProjection.kt index 1e85991f5..668e32d6c 100644 --- a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithNonNullableProperties/expected/client/QueryProjection.kt +++ b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithNonNullableProperties/expected/client/QueryProjection.kt @@ -3,7 +3,11 @@ package com.netflix.graphql.dgs.codegen.cases.dataClassWithNonNullableProperties import com.netflix.graphql.dgs.client.codegen.InputValueSerializerInterface import com.netflix.graphql.dgs.codegen.GraphQLProjection import kotlin.String +import com.netflix.graphql.dgs.codegen.cases.dataClassWithNonNullableProperties.expected.Generated as ExpectedGenerated +import jakarta.`annotation`.Generated as AnnotationGenerated +@AnnotationGenerated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) +@ExpectedGenerated public class QueryProjection( inputValueSerializer: InputValueSerializerInterface? = null, ) : GraphQLProjection(inputValueSerializer) { diff --git a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithNonNullableProperties/expected/types/Person.kt b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithNonNullableProperties/expected/types/Person.kt index faa2bc98f..873f48aeb 100644 --- a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithNonNullableProperties/expected/types/Person.kt +++ b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithNonNullableProperties/expected/types/Person.kt @@ -9,7 +9,11 @@ import java.lang.IllegalStateException import kotlin.String import kotlin.collections.List import kotlin.jvm.JvmName +import com.netflix.graphql.dgs.codegen.cases.dataClassWithNonNullableProperties.expected.Generated as ExpectedGenerated +import jakarta.`annotation`.Generated as AnnotationGenerated +@AnnotationGenerated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) +@ExpectedGenerated @JsonTypeInfo(use = JsonTypeInfo.Id.NONE) @JsonDeserialize(builder = Person.Builder::class) public class Person( @@ -28,6 +32,8 @@ public class Person( public val email: List get() = __email.invoke() + @AnnotationGenerated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) + @ExpectedGenerated public companion object { private val nameDefault: () -> String = { throw IllegalStateException("Field `name` was not requested") } @@ -36,6 +42,8 @@ public class Person( { throw IllegalStateException("Field `email` was not requested") } } + @AnnotationGenerated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) + @ExpectedGenerated @JsonPOJOBuilder @JsonIgnoreProperties("__typename") public class Builder { diff --git a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithNonNullableProperties/expected/types/Query.kt b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithNonNullableProperties/expected/types/Query.kt index 2d53d046d..68fc0a4b6 100644 --- a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithNonNullableProperties/expected/types/Query.kt +++ b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithNonNullableProperties/expected/types/Query.kt @@ -8,7 +8,11 @@ import com.fasterxml.jackson.databind.`annotation`.JsonPOJOBuilder import java.lang.IllegalStateException import kotlin.collections.List import kotlin.jvm.JvmName +import com.netflix.graphql.dgs.codegen.cases.dataClassWithNonNullableProperties.expected.Generated as ExpectedGenerated +import jakarta.`annotation`.Generated as AnnotationGenerated +@AnnotationGenerated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) +@ExpectedGenerated @JsonTypeInfo(use = JsonTypeInfo.Id.NONE) @JsonDeserialize(builder = Query.Builder::class) public class Query( @@ -20,11 +24,15 @@ public class Query( public val people: List? get() = __people.invoke() + @AnnotationGenerated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) + @ExpectedGenerated public companion object { private val peopleDefault: () -> List? = { throw IllegalStateException("Field `people` was not requested") } } + @AnnotationGenerated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) + @ExpectedGenerated @JsonPOJOBuilder @JsonIgnoreProperties("__typename") public class Builder { diff --git a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithNullablePrimitive/expected/DgsClient.kt b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithNullablePrimitive/expected/DgsClient.kt index a988d29f3..97fdf67bb 100644 --- a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithNullablePrimitive/expected/DgsClient.kt +++ b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithNullablePrimitive/expected/DgsClient.kt @@ -1,3 +1,5 @@ package com.netflix.graphql.dgs.codegen.cases.dataClassWithNullablePrimitive.expected +@jakarta.`annotation`.Generated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) +@Generated public object DgsClient diff --git a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithNullablePrimitive/expected/DgsConstants.kt b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithNullablePrimitive/expected/DgsConstants.kt index a84490f00..118c55471 100644 --- a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithNullablePrimitive/expected/DgsConstants.kt +++ b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithNullablePrimitive/expected/DgsConstants.kt @@ -2,7 +2,11 @@ package com.netflix.graphql.dgs.codegen.cases.dataClassWithNullablePrimitive.exp import kotlin.String +@jakarta.`annotation`.Generated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) +@Generated public object DgsConstants { + @jakarta.`annotation`.Generated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) + @Generated public object MYTYPE { public const val TYPE_NAME: String = "MyType" diff --git a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithNullablePrimitive/expected/Generated.kt b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithNullablePrimitive/expected/Generated.kt new file mode 100644 index 000000000..93c5dd280 --- /dev/null +++ b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithNullablePrimitive/expected/Generated.kt @@ -0,0 +1,7 @@ +package com.netflix.graphql.dgs.codegen.cases.dataClassWithNullablePrimitive.expected + +import kotlin.`annotation`.AnnotationRetention +import kotlin.`annotation`.Retention + +@Retention(value = AnnotationRetention.BINARY) +public annotation class Generated diff --git a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithNullablePrimitive/expected/client/MyTypeProjection.kt b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithNullablePrimitive/expected/client/MyTypeProjection.kt index b8c2625fa..a450934ec 100644 --- a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithNullablePrimitive/expected/client/MyTypeProjection.kt +++ b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithNullablePrimitive/expected/client/MyTypeProjection.kt @@ -2,7 +2,11 @@ package com.netflix.graphql.dgs.codegen.cases.dataClassWithNullablePrimitive.exp import com.netflix.graphql.dgs.client.codegen.InputValueSerializerInterface import com.netflix.graphql.dgs.codegen.GraphQLProjection +import com.netflix.graphql.dgs.codegen.cases.dataClassWithNullablePrimitive.expected.Generated as ExpectedGenerated +import jakarta.`annotation`.Generated as AnnotationGenerated +@AnnotationGenerated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) +@ExpectedGenerated public class MyTypeProjection( inputValueSerializer: InputValueSerializerInterface? = null, ) : GraphQLProjection(inputValueSerializer) { diff --git a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithNullablePrimitive/expected/types/MyType.kt b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithNullablePrimitive/expected/types/MyType.kt index b54bca148..538a5dcca 100644 --- a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithNullablePrimitive/expected/types/MyType.kt +++ b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithNullablePrimitive/expected/types/MyType.kt @@ -10,7 +10,11 @@ import kotlin.Boolean import kotlin.Double import kotlin.Int import kotlin.jvm.JvmName +import com.netflix.graphql.dgs.codegen.cases.dataClassWithNullablePrimitive.expected.Generated as ExpectedGenerated +import jakarta.`annotation`.Generated as AnnotationGenerated +@AnnotationGenerated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) +@ExpectedGenerated @JsonTypeInfo(use = JsonTypeInfo.Id.NONE) @JsonDeserialize(builder = MyType.Builder::class) public class MyType( @@ -36,6 +40,8 @@ public class MyType( public val floaty: Double? get() = __floaty.invoke() + @AnnotationGenerated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) + @ExpectedGenerated public companion object { private val countDefault: () -> Int? = { throw IllegalStateException("Field `count` was not requested") } @@ -47,6 +53,8 @@ public class MyType( { throw IllegalStateException("Field `floaty` was not requested") } } + @AnnotationGenerated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) + @ExpectedGenerated @JsonPOJOBuilder @JsonIgnoreProperties("__typename") public class Builder { diff --git a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithRecursiveField/expected/DgsClient.kt b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithRecursiveField/expected/DgsClient.kt index 49f11c732..d2604516d 100644 --- a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithRecursiveField/expected/DgsClient.kt +++ b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithRecursiveField/expected/DgsClient.kt @@ -6,6 +6,8 @@ import com.netflix.graphql.dgs.codegen.cases.dataClassWithRecursiveField.expecte import graphql.language.OperationDefinition import kotlin.String +@jakarta.`annotation`.Generated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) +@Generated public object DgsClient { public fun buildQuery(inputValueSerializer: InputValueSerializerInterface? = null, _projection: QueryProjection.() -> QueryProjection): String = diff --git a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithRecursiveField/expected/DgsConstants.kt b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithRecursiveField/expected/DgsConstants.kt index 70ab9f82d..7b9d1914d 100644 --- a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithRecursiveField/expected/DgsConstants.kt +++ b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithRecursiveField/expected/DgsConstants.kt @@ -2,15 +2,21 @@ package com.netflix.graphql.dgs.codegen.cases.dataClassWithRecursiveField.expect import kotlin.String +@jakarta.`annotation`.Generated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) +@Generated public object DgsConstants { public const val QUERY_TYPE: String = "Query" + @jakarta.`annotation`.Generated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) + @Generated public object QUERY { public const val TYPE_NAME: String = "Query" public const val People: String = "people" } + @jakarta.`annotation`.Generated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) + @Generated public object PERSON { public const val TYPE_NAME: String = "Person" diff --git a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithRecursiveField/expected/Generated.kt b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithRecursiveField/expected/Generated.kt new file mode 100644 index 000000000..df4751f3a --- /dev/null +++ b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithRecursiveField/expected/Generated.kt @@ -0,0 +1,7 @@ +package com.netflix.graphql.dgs.codegen.cases.dataClassWithRecursiveField.expected + +import kotlin.`annotation`.AnnotationRetention +import kotlin.`annotation`.Retention + +@Retention(value = AnnotationRetention.BINARY) +public annotation class Generated diff --git a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithRecursiveField/expected/client/PersonProjection.kt b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithRecursiveField/expected/client/PersonProjection.kt index 07a41033a..7182b0bcf 100644 --- a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithRecursiveField/expected/client/PersonProjection.kt +++ b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithRecursiveField/expected/client/PersonProjection.kt @@ -3,7 +3,11 @@ package com.netflix.graphql.dgs.codegen.cases.dataClassWithRecursiveField.expect import com.netflix.graphql.dgs.client.codegen.InputValueSerializerInterface import com.netflix.graphql.dgs.codegen.GraphQLProjection import kotlin.String +import com.netflix.graphql.dgs.codegen.cases.dataClassWithRecursiveField.expected.Generated as ExpectedGenerated +import jakarta.`annotation`.Generated as AnnotationGenerated +@AnnotationGenerated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) +@ExpectedGenerated public class PersonProjection( inputValueSerializer: InputValueSerializerInterface? = null, ) : GraphQLProjection(inputValueSerializer) { diff --git a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithRecursiveField/expected/client/QueryProjection.kt b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithRecursiveField/expected/client/QueryProjection.kt index 6bc9c817f..ce116cf38 100644 --- a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithRecursiveField/expected/client/QueryProjection.kt +++ b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithRecursiveField/expected/client/QueryProjection.kt @@ -3,7 +3,11 @@ package com.netflix.graphql.dgs.codegen.cases.dataClassWithRecursiveField.expect import com.netflix.graphql.dgs.client.codegen.InputValueSerializerInterface import com.netflix.graphql.dgs.codegen.GraphQLProjection import kotlin.String +import com.netflix.graphql.dgs.codegen.cases.dataClassWithRecursiveField.expected.Generated as ExpectedGenerated +import jakarta.`annotation`.Generated as AnnotationGenerated +@AnnotationGenerated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) +@ExpectedGenerated public class QueryProjection( inputValueSerializer: InputValueSerializerInterface? = null, ) : GraphQLProjection(inputValueSerializer) { diff --git a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithRecursiveField/expected/types/Person.kt b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithRecursiveField/expected/types/Person.kt index d82d73359..5715d0951 100644 --- a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithRecursiveField/expected/types/Person.kt +++ b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithRecursiveField/expected/types/Person.kt @@ -9,7 +9,11 @@ import java.lang.IllegalStateException import kotlin.String import kotlin.collections.List import kotlin.jvm.JvmName +import com.netflix.graphql.dgs.codegen.cases.dataClassWithRecursiveField.expected.Generated as ExpectedGenerated +import jakarta.`annotation`.Generated as AnnotationGenerated +@AnnotationGenerated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) +@ExpectedGenerated @JsonTypeInfo(use = JsonTypeInfo.Id.NONE) @JsonDeserialize(builder = Person.Builder::class) public class Person( @@ -35,6 +39,8 @@ public class Person( public val friends: List? get() = __friends.invoke() + @AnnotationGenerated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) + @ExpectedGenerated public companion object { private val firstnameDefault: () -> String? = { throw IllegalStateException("Field `firstname` was not requested") } @@ -46,6 +52,8 @@ public class Person( { throw IllegalStateException("Field `friends` was not requested") } } + @AnnotationGenerated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) + @ExpectedGenerated @JsonPOJOBuilder @JsonIgnoreProperties("__typename") public class Builder { diff --git a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithRecursiveField/expected/types/Query.kt b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithRecursiveField/expected/types/Query.kt index 8e483b636..5e814152f 100644 --- a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithRecursiveField/expected/types/Query.kt +++ b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithRecursiveField/expected/types/Query.kt @@ -8,7 +8,11 @@ import com.fasterxml.jackson.databind.`annotation`.JsonPOJOBuilder import java.lang.IllegalStateException import kotlin.collections.List import kotlin.jvm.JvmName +import com.netflix.graphql.dgs.codegen.cases.dataClassWithRecursiveField.expected.Generated as ExpectedGenerated +import jakarta.`annotation`.Generated as AnnotationGenerated +@AnnotationGenerated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) +@ExpectedGenerated @JsonTypeInfo(use = JsonTypeInfo.Id.NONE) @JsonDeserialize(builder = Query.Builder::class) public class Query( @@ -20,11 +24,15 @@ public class Query( public val people: List? get() = __people.invoke() + @AnnotationGenerated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) + @ExpectedGenerated public companion object { private val peopleDefault: () -> List? = { throw IllegalStateException("Field `people` was not requested") } } + @AnnotationGenerated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) + @ExpectedGenerated @JsonPOJOBuilder @JsonIgnoreProperties("__typename") public class Builder { diff --git a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithReservedWord/expected/DgsClient.kt b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithReservedWord/expected/DgsClient.kt index 8fc603c7b..4f1846926 100644 --- a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithReservedWord/expected/DgsClient.kt +++ b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithReservedWord/expected/DgsClient.kt @@ -6,6 +6,8 @@ import com.netflix.graphql.dgs.codegen.cases.dataClassWithReservedWord.expected. import graphql.language.OperationDefinition import kotlin.String +@jakarta.`annotation`.Generated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) +@Generated public object DgsClient { public fun buildQuery(inputValueSerializer: InputValueSerializerInterface? = null, _projection: QueryProjection.() -> QueryProjection): String = diff --git a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithReservedWord/expected/DgsConstants.kt b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithReservedWord/expected/DgsConstants.kt index 728f53f2e..c893ade14 100644 --- a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithReservedWord/expected/DgsConstants.kt +++ b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithReservedWord/expected/DgsConstants.kt @@ -2,21 +2,29 @@ package com.netflix.graphql.dgs.codegen.cases.dataClassWithReservedWord.expected import kotlin.String +@jakarta.`annotation`.Generated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) +@Generated public object DgsConstants { public const val QUERY_TYPE: String = "Query" + @jakarta.`annotation`.Generated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) + @Generated public object SAMPLETYPE { public const val TYPE_NAME: String = "SampleType" public const val Return: String = "return" } + @jakarta.`annotation`.Generated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) + @Generated public object QUERY { public const val TYPE_NAME: String = "Query" public const val People: String = "people" } + @jakarta.`annotation`.Generated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) + @Generated public object PERSON { public const val TYPE_NAME: String = "Person" @@ -24,6 +32,8 @@ public object DgsConstants { public const val Interface: String = "interface" + @jakarta.`annotation`.Generated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) + @Generated public object INFO_INPUT_ARGUMENT { public const val Package: String = "package" } diff --git a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithReservedWord/expected/Generated.kt b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithReservedWord/expected/Generated.kt new file mode 100644 index 000000000..8193efb7b --- /dev/null +++ b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithReservedWord/expected/Generated.kt @@ -0,0 +1,7 @@ +package com.netflix.graphql.dgs.codegen.cases.dataClassWithReservedWord.expected + +import kotlin.`annotation`.AnnotationRetention +import kotlin.`annotation`.Retention + +@Retention(value = AnnotationRetention.BINARY) +public annotation class Generated diff --git a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithReservedWord/expected/client/PersonProjection.kt b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithReservedWord/expected/client/PersonProjection.kt index 698d5005f..7281eef4d 100644 --- a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithReservedWord/expected/client/PersonProjection.kt +++ b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithReservedWord/expected/client/PersonProjection.kt @@ -3,7 +3,11 @@ package com.netflix.graphql.dgs.codegen.cases.dataClassWithReservedWord.expected import com.netflix.graphql.dgs.client.codegen.InputValueSerializerInterface import com.netflix.graphql.dgs.codegen.GraphQLProjection import kotlin.String +import com.netflix.graphql.dgs.codegen.cases.dataClassWithReservedWord.expected.Generated as ExpectedGenerated +import jakarta.`annotation`.Generated as AnnotationGenerated +@AnnotationGenerated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) +@ExpectedGenerated public class PersonProjection( inputValueSerializer: InputValueSerializerInterface? = null, ) : GraphQLProjection(inputValueSerializer) { diff --git a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithReservedWord/expected/client/QueryProjection.kt b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithReservedWord/expected/client/QueryProjection.kt index c19ffa3fe..3adda4cd8 100644 --- a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithReservedWord/expected/client/QueryProjection.kt +++ b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithReservedWord/expected/client/QueryProjection.kt @@ -3,7 +3,11 @@ package com.netflix.graphql.dgs.codegen.cases.dataClassWithReservedWord.expected import com.netflix.graphql.dgs.client.codegen.InputValueSerializerInterface import com.netflix.graphql.dgs.codegen.GraphQLProjection import kotlin.String +import com.netflix.graphql.dgs.codegen.cases.dataClassWithReservedWord.expected.Generated as ExpectedGenerated +import jakarta.`annotation`.Generated as AnnotationGenerated +@AnnotationGenerated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) +@ExpectedGenerated public class QueryProjection( inputValueSerializer: InputValueSerializerInterface? = null, ) : GraphQLProjection(inputValueSerializer) { diff --git a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithReservedWord/expected/client/SampleTypeProjection.kt b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithReservedWord/expected/client/SampleTypeProjection.kt index 0bef9b0cd..50fe1a8ce 100644 --- a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithReservedWord/expected/client/SampleTypeProjection.kt +++ b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithReservedWord/expected/client/SampleTypeProjection.kt @@ -2,7 +2,11 @@ package com.netflix.graphql.dgs.codegen.cases.dataClassWithReservedWord.expected import com.netflix.graphql.dgs.client.codegen.InputValueSerializerInterface import com.netflix.graphql.dgs.codegen.GraphQLProjection +import com.netflix.graphql.dgs.codegen.cases.dataClassWithReservedWord.expected.Generated as ExpectedGenerated +import jakarta.`annotation`.Generated as AnnotationGenerated +@AnnotationGenerated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) +@ExpectedGenerated public class SampleTypeProjection( inputValueSerializer: InputValueSerializerInterface? = null, ) : GraphQLProjection(inputValueSerializer) { diff --git a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithReservedWord/expected/types/Person.kt b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithReservedWord/expected/types/Person.kt index 18cf8ba60..e35ff4625 100644 --- a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithReservedWord/expected/types/Person.kt +++ b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithReservedWord/expected/types/Person.kt @@ -8,7 +8,11 @@ import com.fasterxml.jackson.databind.`annotation`.JsonPOJOBuilder import java.lang.IllegalStateException import kotlin.String import kotlin.jvm.JvmName +import com.netflix.graphql.dgs.codegen.cases.dataClassWithReservedWord.expected.Generated as ExpectedGenerated +import jakarta.`annotation`.Generated as AnnotationGenerated +@AnnotationGenerated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) +@ExpectedGenerated @JsonTypeInfo(use = JsonTypeInfo.Id.NONE) @JsonDeserialize(builder = Person.Builder::class) public class Person( @@ -27,6 +31,8 @@ public class Person( public val `interface`: String? get() = __interface.invoke() + @AnnotationGenerated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) + @ExpectedGenerated public companion object { private val infoDefault: () -> String? = { throw IllegalStateException("Field `info` was not requested") } @@ -35,6 +41,8 @@ public class Person( { throw IllegalStateException("Field `interface` was not requested") } } + @AnnotationGenerated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) + @ExpectedGenerated @JsonPOJOBuilder @JsonIgnoreProperties("__typename") public class Builder { diff --git a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithReservedWord/expected/types/Query.kt b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithReservedWord/expected/types/Query.kt index 8f9385423..4ccf9f20f 100644 --- a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithReservedWord/expected/types/Query.kt +++ b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithReservedWord/expected/types/Query.kt @@ -8,7 +8,11 @@ import com.fasterxml.jackson.databind.`annotation`.JsonPOJOBuilder import java.lang.IllegalStateException import kotlin.collections.List import kotlin.jvm.JvmName +import com.netflix.graphql.dgs.codegen.cases.dataClassWithReservedWord.expected.Generated as ExpectedGenerated +import jakarta.`annotation`.Generated as AnnotationGenerated +@AnnotationGenerated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) +@ExpectedGenerated @JsonTypeInfo(use = JsonTypeInfo.Id.NONE) @JsonDeserialize(builder = Query.Builder::class) public class Query( @@ -20,11 +24,15 @@ public class Query( public val people: List? get() = __people.invoke() + @AnnotationGenerated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) + @ExpectedGenerated public companion object { private val peopleDefault: () -> List? = { throw IllegalStateException("Field `people` was not requested") } } + @AnnotationGenerated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) + @ExpectedGenerated @JsonPOJOBuilder @JsonIgnoreProperties("__typename") public class Builder { diff --git a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithReservedWord/expected/types/SampleType.kt b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithReservedWord/expected/types/SampleType.kt index 9fd155355..decf8ffcf 100644 --- a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithReservedWord/expected/types/SampleType.kt +++ b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithReservedWord/expected/types/SampleType.kt @@ -8,7 +8,11 @@ import com.fasterxml.jackson.databind.`annotation`.JsonPOJOBuilder import java.lang.IllegalStateException import kotlin.String import kotlin.jvm.JvmName +import com.netflix.graphql.dgs.codegen.cases.dataClassWithReservedWord.expected.Generated as ExpectedGenerated +import jakarta.`annotation`.Generated as AnnotationGenerated +@AnnotationGenerated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) +@ExpectedGenerated @JsonTypeInfo(use = JsonTypeInfo.Id.NONE) @JsonDeserialize(builder = SampleType.Builder::class) public class SampleType( @@ -20,11 +24,15 @@ public class SampleType( public val `return`: String get() = __return.invoke() + @AnnotationGenerated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) + @ExpectedGenerated public companion object { private val returnDefault: () -> String = { throw IllegalStateException("Field `return` was not requested") } } + @AnnotationGenerated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) + @ExpectedGenerated @JsonPOJOBuilder @JsonIgnoreProperties("__typename") public class Builder { diff --git a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithStringProperties/expected/DgsClient.kt b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithStringProperties/expected/DgsClient.kt index da44d909d..0f2e14ed2 100644 --- a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithStringProperties/expected/DgsClient.kt +++ b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithStringProperties/expected/DgsClient.kt @@ -6,6 +6,8 @@ import com.netflix.graphql.dgs.codegen.cases.dataClassWithStringProperties.expec import graphql.language.OperationDefinition import kotlin.String +@jakarta.`annotation`.Generated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) +@Generated public object DgsClient { public fun buildQuery(inputValueSerializer: InputValueSerializerInterface? = null, _projection: QueryProjection.() -> QueryProjection): String = diff --git a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithStringProperties/expected/DgsConstants.kt b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithStringProperties/expected/DgsConstants.kt index 3432bf577..1cc9de635 100644 --- a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithStringProperties/expected/DgsConstants.kt +++ b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithStringProperties/expected/DgsConstants.kt @@ -2,15 +2,21 @@ package com.netflix.graphql.dgs.codegen.cases.dataClassWithStringProperties.expe import kotlin.String +@jakarta.`annotation`.Generated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) +@Generated public object DgsConstants { public const val QUERY_TYPE: String = "Query" + @jakarta.`annotation`.Generated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) + @Generated public object QUERY { public const val TYPE_NAME: String = "Query" public const val People: String = "people" } + @jakarta.`annotation`.Generated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) + @Generated public object PERSON { public const val TYPE_NAME: String = "Person" diff --git a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithStringProperties/expected/Generated.kt b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithStringProperties/expected/Generated.kt new file mode 100644 index 000000000..abf552f8c --- /dev/null +++ b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithStringProperties/expected/Generated.kt @@ -0,0 +1,7 @@ +package com.netflix.graphql.dgs.codegen.cases.dataClassWithStringProperties.expected + +import kotlin.`annotation`.AnnotationRetention +import kotlin.`annotation`.Retention + +@Retention(value = AnnotationRetention.BINARY) +public annotation class Generated diff --git a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithStringProperties/expected/client/PersonProjection.kt b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithStringProperties/expected/client/PersonProjection.kt index 302af44e7..4d0b6d7c9 100644 --- a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithStringProperties/expected/client/PersonProjection.kt +++ b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithStringProperties/expected/client/PersonProjection.kt @@ -2,7 +2,11 @@ package com.netflix.graphql.dgs.codegen.cases.dataClassWithStringProperties.expe import com.netflix.graphql.dgs.client.codegen.InputValueSerializerInterface import com.netflix.graphql.dgs.codegen.GraphQLProjection +import com.netflix.graphql.dgs.codegen.cases.dataClassWithStringProperties.expected.Generated as ExpectedGenerated +import jakarta.`annotation`.Generated as AnnotationGenerated +@AnnotationGenerated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) +@ExpectedGenerated public class PersonProjection( inputValueSerializer: InputValueSerializerInterface? = null, ) : GraphQLProjection(inputValueSerializer) { diff --git a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithStringProperties/expected/client/QueryProjection.kt b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithStringProperties/expected/client/QueryProjection.kt index 8fb93136d..f1ca4ca34 100644 --- a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithStringProperties/expected/client/QueryProjection.kt +++ b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithStringProperties/expected/client/QueryProjection.kt @@ -3,7 +3,11 @@ package com.netflix.graphql.dgs.codegen.cases.dataClassWithStringProperties.expe import com.netflix.graphql.dgs.client.codegen.InputValueSerializerInterface import com.netflix.graphql.dgs.codegen.GraphQLProjection import kotlin.String +import com.netflix.graphql.dgs.codegen.cases.dataClassWithStringProperties.expected.Generated as ExpectedGenerated +import jakarta.`annotation`.Generated as AnnotationGenerated +@AnnotationGenerated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) +@ExpectedGenerated public class QueryProjection( inputValueSerializer: InputValueSerializerInterface? = null, ) : GraphQLProjection(inputValueSerializer) { diff --git a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithStringProperties/expected/types/Person.kt b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithStringProperties/expected/types/Person.kt index 9a4adc154..05f6b721a 100644 --- a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithStringProperties/expected/types/Person.kt +++ b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithStringProperties/expected/types/Person.kt @@ -8,7 +8,11 @@ import com.fasterxml.jackson.databind.`annotation`.JsonPOJOBuilder import java.lang.IllegalStateException import kotlin.String import kotlin.jvm.JvmName +import com.netflix.graphql.dgs.codegen.cases.dataClassWithStringProperties.expected.Generated as ExpectedGenerated +import jakarta.`annotation`.Generated as AnnotationGenerated +@AnnotationGenerated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) +@ExpectedGenerated @JsonTypeInfo(use = JsonTypeInfo.Id.NONE) @JsonDeserialize(builder = Person.Builder::class) public class Person( @@ -27,6 +31,8 @@ public class Person( public val lastname: String? get() = __lastname.invoke() + @AnnotationGenerated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) + @ExpectedGenerated public companion object { private val firstnameDefault: () -> String? = { throw IllegalStateException("Field `firstname` was not requested") } @@ -35,6 +41,8 @@ public class Person( { throw IllegalStateException("Field `lastname` was not requested") } } + @AnnotationGenerated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) + @ExpectedGenerated @JsonPOJOBuilder @JsonIgnoreProperties("__typename") public class Builder { diff --git a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithStringProperties/expected/types/Query.kt b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithStringProperties/expected/types/Query.kt index e83a398c7..17ef0d3ea 100644 --- a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithStringProperties/expected/types/Query.kt +++ b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithStringProperties/expected/types/Query.kt @@ -8,7 +8,11 @@ import com.fasterxml.jackson.databind.`annotation`.JsonPOJOBuilder import java.lang.IllegalStateException import kotlin.collections.List import kotlin.jvm.JvmName +import com.netflix.graphql.dgs.codegen.cases.dataClassWithStringProperties.expected.Generated as ExpectedGenerated +import jakarta.`annotation`.Generated as AnnotationGenerated +@AnnotationGenerated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) +@ExpectedGenerated @JsonTypeInfo(use = JsonTypeInfo.Id.NONE) @JsonDeserialize(builder = Query.Builder::class) public class Query( @@ -20,11 +24,15 @@ public class Query( public val people: List? get() = __people.invoke() + @AnnotationGenerated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) + @ExpectedGenerated public companion object { private val peopleDefault: () -> List? = { throw IllegalStateException("Field `people` was not requested") } } + @AnnotationGenerated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) + @ExpectedGenerated @JsonPOJOBuilder @JsonIgnoreProperties("__typename") public class Builder { diff --git a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/enum/expected/DgsClient.kt b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/enum/expected/DgsClient.kt index eb2b666d3..da56d639e 100644 --- a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/enum/expected/DgsClient.kt +++ b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/enum/expected/DgsClient.kt @@ -6,6 +6,8 @@ import com.netflix.graphql.dgs.codegen.cases.`enum`.expected.client.QueryProject import graphql.language.OperationDefinition import kotlin.String +@jakarta.`annotation`.Generated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) +@Generated public object DgsClient { public fun buildQuery(inputValueSerializer: InputValueSerializerInterface? = null, _projection: QueryProjection.() -> QueryProjection): String = diff --git a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/enum/expected/DgsConstants.kt b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/enum/expected/DgsConstants.kt index d586c45f9..11dfaa75f 100644 --- a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/enum/expected/DgsConstants.kt +++ b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/enum/expected/DgsConstants.kt @@ -2,9 +2,13 @@ package com.netflix.graphql.dgs.codegen.cases.`enum`.expected import kotlin.String +@jakarta.`annotation`.Generated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) +@Generated public object DgsConstants { public const val QUERY_TYPE: String = "Query" + @jakarta.`annotation`.Generated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) + @Generated public object QUERY { public const val TYPE_NAME: String = "Query" diff --git a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/enum/expected/Generated.kt b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/enum/expected/Generated.kt new file mode 100644 index 000000000..f90638d46 --- /dev/null +++ b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/enum/expected/Generated.kt @@ -0,0 +1,7 @@ +package com.netflix.graphql.dgs.codegen.cases.`enum`.expected + +import kotlin.`annotation`.AnnotationRetention +import kotlin.`annotation`.Retention + +@Retention(value = AnnotationRetention.BINARY) +public annotation class Generated diff --git a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/enum/expected/client/QueryProjection.kt b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/enum/expected/client/QueryProjection.kt index c8bd9caa8..387ba6517 100644 --- a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/enum/expected/client/QueryProjection.kt +++ b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/enum/expected/client/QueryProjection.kt @@ -2,7 +2,11 @@ package com.netflix.graphql.dgs.codegen.cases.`enum`.expected.client import com.netflix.graphql.dgs.client.codegen.InputValueSerializerInterface import com.netflix.graphql.dgs.codegen.GraphQLProjection +import com.netflix.graphql.dgs.codegen.cases.`enum`.expected.Generated as ExpectedGenerated +import jakarta.`annotation`.Generated as AnnotationGenerated +@AnnotationGenerated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) +@ExpectedGenerated public class QueryProjection( inputValueSerializer: InputValueSerializerInterface? = null, ) : GraphQLProjection(inputValueSerializer) { diff --git a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/enum/expected/types/EmployeeTypes.kt b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/enum/expected/types/EmployeeTypes.kt index dd96f9cea..d547fe304 100644 --- a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/enum/expected/types/EmployeeTypes.kt +++ b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/enum/expected/types/EmployeeTypes.kt @@ -1,10 +1,23 @@ package com.netflix.graphql.dgs.codegen.cases.`enum`.expected.types +import com.netflix.graphql.dgs.codegen.cases.`enum`.expected.Generated as ExpectedGenerated +import jakarta.`annotation`.Generated as AnnotationGenerated + +@AnnotationGenerated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) +@ExpectedGenerated public enum class EmployeeTypes { + @AnnotationGenerated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) + @ExpectedGenerated ENGINEER, + @AnnotationGenerated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) + @ExpectedGenerated MANAGER, + @AnnotationGenerated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) + @ExpectedGenerated DIRECTOR, ; + @AnnotationGenerated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) + @ExpectedGenerated public companion object } diff --git a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/enum/expected/types/Query.kt b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/enum/expected/types/Query.kt index 52988050b..3b32c1e85 100644 --- a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/enum/expected/types/Query.kt +++ b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/enum/expected/types/Query.kt @@ -8,7 +8,11 @@ import com.fasterxml.jackson.databind.`annotation`.JsonPOJOBuilder import java.lang.IllegalStateException import kotlin.collections.List import kotlin.jvm.JvmName +import com.netflix.graphql.dgs.codegen.cases.`enum`.expected.Generated as ExpectedGenerated +import jakarta.`annotation`.Generated as AnnotationGenerated +@AnnotationGenerated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) +@ExpectedGenerated @JsonTypeInfo(use = JsonTypeInfo.Id.NONE) @JsonDeserialize(builder = Query.Builder::class) public class Query( @@ -20,11 +24,15 @@ public class Query( public val types: List? get() = __types.invoke() + @AnnotationGenerated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) + @ExpectedGenerated public companion object { private val typesDefault: () -> List? = { throw IllegalStateException("Field `types` was not requested") } } + @AnnotationGenerated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) + @ExpectedGenerated @JsonPOJOBuilder @JsonIgnoreProperties("__typename") public class Builder { diff --git a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/enumDocs/expected/DgsClient.kt b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/enumDocs/expected/DgsClient.kt index 2491bb85d..15ddd436b 100644 --- a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/enumDocs/expected/DgsClient.kt +++ b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/enumDocs/expected/DgsClient.kt @@ -1,3 +1,5 @@ package com.netflix.graphql.dgs.codegen.cases.enumDocs.expected +@jakarta.`annotation`.Generated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) +@Generated public object DgsClient diff --git a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/enumDocs/expected/DgsConstants.kt b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/enumDocs/expected/DgsConstants.kt index 42540e0e5..c76d29c36 100644 --- a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/enumDocs/expected/DgsConstants.kt +++ b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/enumDocs/expected/DgsConstants.kt @@ -1,3 +1,5 @@ package com.netflix.graphql.dgs.codegen.cases.enumDocs.expected +@jakarta.`annotation`.Generated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) +@Generated public object DgsConstants diff --git a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/enumDocs/expected/Generated.kt b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/enumDocs/expected/Generated.kt new file mode 100644 index 000000000..4b31c33c8 --- /dev/null +++ b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/enumDocs/expected/Generated.kt @@ -0,0 +1,7 @@ +package com.netflix.graphql.dgs.codegen.cases.enumDocs.expected + +import kotlin.`annotation`.AnnotationRetention +import kotlin.`annotation`.Retention + +@Retention(value = AnnotationRetention.BINARY) +public annotation class Generated diff --git a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/enumDocs/expected/types/Color.kt b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/enumDocs/expected/types/Color.kt index d0659fffc..a290d2cd1 100644 --- a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/enumDocs/expected/types/Color.kt +++ b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/enumDocs/expected/types/Color.kt @@ -1,13 +1,26 @@ package com.netflix.graphql.dgs.codegen.cases.enumDocs.expected.types +import com.netflix.graphql.dgs.codegen.cases.enumDocs.expected.Generated as ExpectedGenerated +import jakarta.`annotation`.Generated as AnnotationGenerated + /** * Some options */ +@AnnotationGenerated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) +@ExpectedGenerated public enum class Color { + @AnnotationGenerated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) + @ExpectedGenerated red, + @AnnotationGenerated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) + @ExpectedGenerated white, + @AnnotationGenerated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) + @ExpectedGenerated blue, ; + @AnnotationGenerated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) + @ExpectedGenerated public companion object } diff --git a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/enumWithExtendedType/expected/DgsClient.kt b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/enumWithExtendedType/expected/DgsClient.kt index eb943aa14..5c78d9ca3 100644 --- a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/enumWithExtendedType/expected/DgsClient.kt +++ b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/enumWithExtendedType/expected/DgsClient.kt @@ -6,6 +6,8 @@ import com.netflix.graphql.dgs.codegen.cases.enumWithExtendedType.expected.clien import graphql.language.OperationDefinition import kotlin.String +@jakarta.`annotation`.Generated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) +@Generated public object DgsClient { public fun buildQuery(inputValueSerializer: InputValueSerializerInterface? = null, _projection: QueryProjection.() -> QueryProjection): String = diff --git a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/enumWithExtendedType/expected/DgsConstants.kt b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/enumWithExtendedType/expected/DgsConstants.kt index f81c45d80..67290df1e 100644 --- a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/enumWithExtendedType/expected/DgsConstants.kt +++ b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/enumWithExtendedType/expected/DgsConstants.kt @@ -2,9 +2,13 @@ package com.netflix.graphql.dgs.codegen.cases.enumWithExtendedType.expected import kotlin.String +@jakarta.`annotation`.Generated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) +@Generated public object DgsConstants { public const val QUERY_TYPE: String = "Query" + @jakarta.`annotation`.Generated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) + @Generated public object QUERY { public const val TYPE_NAME: String = "Query" diff --git a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/enumWithExtendedType/expected/Generated.kt b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/enumWithExtendedType/expected/Generated.kt new file mode 100644 index 000000000..d669d6b70 --- /dev/null +++ b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/enumWithExtendedType/expected/Generated.kt @@ -0,0 +1,7 @@ +package com.netflix.graphql.dgs.codegen.cases.enumWithExtendedType.expected + +import kotlin.`annotation`.AnnotationRetention +import kotlin.`annotation`.Retention + +@Retention(value = AnnotationRetention.BINARY) +public annotation class Generated diff --git a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/enumWithExtendedType/expected/client/QueryProjection.kt b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/enumWithExtendedType/expected/client/QueryProjection.kt index 6e53aa528..f55421133 100644 --- a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/enumWithExtendedType/expected/client/QueryProjection.kt +++ b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/enumWithExtendedType/expected/client/QueryProjection.kt @@ -2,7 +2,11 @@ package com.netflix.graphql.dgs.codegen.cases.enumWithExtendedType.expected.clie import com.netflix.graphql.dgs.client.codegen.InputValueSerializerInterface import com.netflix.graphql.dgs.codegen.GraphQLProjection +import com.netflix.graphql.dgs.codegen.cases.enumWithExtendedType.expected.Generated as ExpectedGenerated +import jakarta.`annotation`.Generated as AnnotationGenerated +@AnnotationGenerated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) +@ExpectedGenerated public class QueryProjection( inputValueSerializer: InputValueSerializerInterface? = null, ) : GraphQLProjection(inputValueSerializer) { diff --git a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/enumWithExtendedType/expected/types/EmployeeTypes.kt b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/enumWithExtendedType/expected/types/EmployeeTypes.kt index a35b0b946..52764f431 100644 --- a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/enumWithExtendedType/expected/types/EmployeeTypes.kt +++ b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/enumWithExtendedType/expected/types/EmployeeTypes.kt @@ -1,11 +1,26 @@ package com.netflix.graphql.dgs.codegen.cases.enumWithExtendedType.expected.types +import com.netflix.graphql.dgs.codegen.cases.enumWithExtendedType.expected.Generated as ExpectedGenerated +import jakarta.`annotation`.Generated as AnnotationGenerated + +@AnnotationGenerated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) +@ExpectedGenerated public enum class EmployeeTypes { + @AnnotationGenerated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) + @ExpectedGenerated ENGINEER, + @AnnotationGenerated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) + @ExpectedGenerated MANAGER, + @AnnotationGenerated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) + @ExpectedGenerated DIRECTOR, + @AnnotationGenerated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) + @ExpectedGenerated QA, ; + @AnnotationGenerated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) + @ExpectedGenerated public companion object } diff --git a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/enumWithExtendedType/expected/types/Query.kt b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/enumWithExtendedType/expected/types/Query.kt index 645cfda99..149d36d9b 100644 --- a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/enumWithExtendedType/expected/types/Query.kt +++ b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/enumWithExtendedType/expected/types/Query.kt @@ -8,7 +8,11 @@ import com.fasterxml.jackson.databind.`annotation`.JsonPOJOBuilder import java.lang.IllegalStateException import kotlin.collections.List import kotlin.jvm.JvmName +import com.netflix.graphql.dgs.codegen.cases.enumWithExtendedType.expected.Generated as ExpectedGenerated +import jakarta.`annotation`.Generated as AnnotationGenerated +@AnnotationGenerated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) +@ExpectedGenerated @JsonTypeInfo(use = JsonTypeInfo.Id.NONE) @JsonDeserialize(builder = Query.Builder::class) public class Query( @@ -20,11 +24,15 @@ public class Query( public val types: List? get() = __types.invoke() + @AnnotationGenerated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) + @ExpectedGenerated public companion object { private val typesDefault: () -> List? = { throw IllegalStateException("Field `types` was not requested") } } + @AnnotationGenerated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) + @ExpectedGenerated @JsonPOJOBuilder @JsonIgnoreProperties("__typename") public class Builder { diff --git a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/extendedDataClassWithInterface/expected/DgsClient.kt b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/extendedDataClassWithInterface/expected/DgsClient.kt index c65780024..eae204b7e 100644 --- a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/extendedDataClassWithInterface/expected/DgsClient.kt +++ b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/extendedDataClassWithInterface/expected/DgsClient.kt @@ -1,3 +1,5 @@ package com.netflix.graphql.dgs.codegen.cases.extendedDataClassWithInterface.expected +@jakarta.`annotation`.Generated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) +@Generated public object DgsClient diff --git a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/extendedDataClassWithInterface/expected/DgsConstants.kt b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/extendedDataClassWithInterface/expected/DgsConstants.kt index 82012cc35..bf91a747b 100644 --- a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/extendedDataClassWithInterface/expected/DgsConstants.kt +++ b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/extendedDataClassWithInterface/expected/DgsConstants.kt @@ -2,7 +2,11 @@ package com.netflix.graphql.dgs.codegen.cases.extendedDataClassWithInterface.exp import kotlin.String +@jakarta.`annotation`.Generated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) +@Generated public object DgsConstants { + @jakarta.`annotation`.Generated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) + @Generated public object EXAMPLE { public const val TYPE_NAME: String = "Example" @@ -11,12 +15,16 @@ public object DgsConstants { public const val Age: String = "age" } + @jakarta.`annotation`.Generated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) + @Generated public object A { public const val TYPE_NAME: String = "A" public const val Name: String = "name" } + @jakarta.`annotation`.Generated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) + @Generated public object B { public const val TYPE_NAME: String = "B" diff --git a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/extendedDataClassWithInterface/expected/Generated.kt b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/extendedDataClassWithInterface/expected/Generated.kt new file mode 100644 index 000000000..f2c8abb93 --- /dev/null +++ b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/extendedDataClassWithInterface/expected/Generated.kt @@ -0,0 +1,7 @@ +package com.netflix.graphql.dgs.codegen.cases.extendedDataClassWithInterface.expected + +import kotlin.`annotation`.AnnotationRetention +import kotlin.`annotation`.Retention + +@Retention(value = AnnotationRetention.BINARY) +public annotation class Generated diff --git a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/extendedDataClassWithInterface/expected/client/AProjection.kt b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/extendedDataClassWithInterface/expected/client/AProjection.kt index e7fc8e12b..74ec7f3e7 100644 --- a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/extendedDataClassWithInterface/expected/client/AProjection.kt +++ b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/extendedDataClassWithInterface/expected/client/AProjection.kt @@ -2,7 +2,11 @@ package com.netflix.graphql.dgs.codegen.cases.extendedDataClassWithInterface.exp import com.netflix.graphql.dgs.client.codegen.InputValueSerializerInterface import com.netflix.graphql.dgs.codegen.GraphQLProjection +import com.netflix.graphql.dgs.codegen.cases.extendedDataClassWithInterface.expected.Generated as ExpectedGenerated +import jakarta.`annotation`.Generated as AnnotationGenerated +@AnnotationGenerated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) +@ExpectedGenerated public class AProjection( inputValueSerializer: InputValueSerializerInterface? = null, ) : GraphQLProjection(inputValueSerializer) { diff --git a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/extendedDataClassWithInterface/expected/client/BProjection.kt b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/extendedDataClassWithInterface/expected/client/BProjection.kt index a4eb6237b..7b5fdda77 100644 --- a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/extendedDataClassWithInterface/expected/client/BProjection.kt +++ b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/extendedDataClassWithInterface/expected/client/BProjection.kt @@ -2,7 +2,11 @@ package com.netflix.graphql.dgs.codegen.cases.extendedDataClassWithInterface.exp import com.netflix.graphql.dgs.client.codegen.InputValueSerializerInterface import com.netflix.graphql.dgs.codegen.GraphQLProjection +import com.netflix.graphql.dgs.codegen.cases.extendedDataClassWithInterface.expected.Generated as ExpectedGenerated +import jakarta.`annotation`.Generated as AnnotationGenerated +@AnnotationGenerated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) +@ExpectedGenerated public class BProjection( inputValueSerializer: InputValueSerializerInterface? = null, ) : GraphQLProjection(inputValueSerializer) { diff --git a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/extendedDataClassWithInterface/expected/client/ExampleProjection.kt b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/extendedDataClassWithInterface/expected/client/ExampleProjection.kt index 2b66d6449..4ef142dc5 100644 --- a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/extendedDataClassWithInterface/expected/client/ExampleProjection.kt +++ b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/extendedDataClassWithInterface/expected/client/ExampleProjection.kt @@ -2,7 +2,11 @@ package com.netflix.graphql.dgs.codegen.cases.extendedDataClassWithInterface.exp import com.netflix.graphql.dgs.client.codegen.InputValueSerializerInterface import com.netflix.graphql.dgs.codegen.GraphQLProjection +import com.netflix.graphql.dgs.codegen.cases.extendedDataClassWithInterface.expected.Generated as ExpectedGenerated +import jakarta.`annotation`.Generated as AnnotationGenerated +@AnnotationGenerated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) +@ExpectedGenerated public class ExampleProjection( inputValueSerializer: InputValueSerializerInterface? = null, ) : GraphQLProjection(inputValueSerializer) { diff --git a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/extendedDataClassWithInterface/expected/types/A.kt b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/extendedDataClassWithInterface/expected/types/A.kt index d395f2123..4a385b80d 100644 --- a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/extendedDataClassWithInterface/expected/types/A.kt +++ b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/extendedDataClassWithInterface/expected/types/A.kt @@ -5,7 +5,11 @@ import com.fasterxml.jackson.`annotation`.JsonTypeInfo import kotlin.String import kotlin.Suppress import kotlin.jvm.JvmName +import com.netflix.graphql.dgs.codegen.cases.extendedDataClassWithInterface.expected.Generated as ExpectedGenerated +import jakarta.`annotation`.Generated as AnnotationGenerated +@AnnotationGenerated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) +@ExpectedGenerated @JsonTypeInfo( use = JsonTypeInfo.Id.NAME, include = JsonTypeInfo.As.PROPERTY, diff --git a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/extendedDataClassWithInterface/expected/types/B.kt b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/extendedDataClassWithInterface/expected/types/B.kt index 670d01987..8a2ede791 100644 --- a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/extendedDataClassWithInterface/expected/types/B.kt +++ b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/extendedDataClassWithInterface/expected/types/B.kt @@ -5,7 +5,11 @@ import com.fasterxml.jackson.`annotation`.JsonTypeInfo import kotlin.Int import kotlin.Suppress import kotlin.jvm.JvmName +import com.netflix.graphql.dgs.codegen.cases.extendedDataClassWithInterface.expected.Generated as ExpectedGenerated +import jakarta.`annotation`.Generated as AnnotationGenerated +@AnnotationGenerated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) +@ExpectedGenerated @JsonTypeInfo( use = JsonTypeInfo.Id.NAME, include = JsonTypeInfo.As.PROPERTY, diff --git a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/extendedDataClassWithInterface/expected/types/Example.kt b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/extendedDataClassWithInterface/expected/types/Example.kt index 4965ca5ee..f0e2c1897 100644 --- a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/extendedDataClassWithInterface/expected/types/Example.kt +++ b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/extendedDataClassWithInterface/expected/types/Example.kt @@ -10,7 +10,11 @@ import kotlin.Int import kotlin.String import kotlin.Suppress import kotlin.jvm.JvmName +import com.netflix.graphql.dgs.codegen.cases.extendedDataClassWithInterface.expected.Generated as ExpectedGenerated +import jakarta.`annotation`.Generated as AnnotationGenerated +@AnnotationGenerated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) +@ExpectedGenerated @JsonTypeInfo(use = JsonTypeInfo.Id.NONE) @JsonDeserialize(builder = Example.Builder::class) public class Example( @@ -32,6 +36,8 @@ public class Example( override val age: Int? get() = __age.invoke() + @AnnotationGenerated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) + @ExpectedGenerated public companion object { private val nameDefault: () -> String? = { throw IllegalStateException("Field `name` was not requested") } @@ -40,6 +46,8 @@ public class Example( { throw IllegalStateException("Field `age` was not requested") } } + @AnnotationGenerated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) + @ExpectedGenerated @JsonPOJOBuilder @JsonIgnoreProperties("__typename") public class Builder { diff --git a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/input/expected/DgsClient.kt b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/input/expected/DgsClient.kt index 8c6ab293c..cbb0d780c 100644 --- a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/input/expected/DgsClient.kt +++ b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/input/expected/DgsClient.kt @@ -6,6 +6,8 @@ import com.netflix.graphql.dgs.codegen.cases.input.expected.client.QueryProjecti import graphql.language.OperationDefinition import kotlin.String +@jakarta.`annotation`.Generated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) +@Generated public object DgsClient { public fun buildQuery(inputValueSerializer: InputValueSerializerInterface? = null, _projection: QueryProjection.() -> QueryProjection): String = diff --git a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/input/expected/DgsConstants.kt b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/input/expected/DgsConstants.kt index 49c9e45dd..407e3d61d 100644 --- a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/input/expected/DgsConstants.kt +++ b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/input/expected/DgsConstants.kt @@ -2,19 +2,27 @@ package com.netflix.graphql.dgs.codegen.cases.input.expected import kotlin.String +@jakarta.`annotation`.Generated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) +@Generated public object DgsConstants { public const val QUERY_TYPE: String = "Query" + @jakarta.`annotation`.Generated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) + @Generated public object QUERY { public const val TYPE_NAME: String = "Query" public const val Movies: String = "movies" + @jakarta.`annotation`.Generated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) + @Generated public object MOVIES_INPUT_ARGUMENT { public const val Filter: String = "filter" } } + @jakarta.`annotation`.Generated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) + @Generated public object MOVIEFILTER { public const val TYPE_NAME: String = "MovieFilter" diff --git a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/input/expected/Generated.kt b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/input/expected/Generated.kt new file mode 100644 index 000000000..a70ec4fcf --- /dev/null +++ b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/input/expected/Generated.kt @@ -0,0 +1,7 @@ +package com.netflix.graphql.dgs.codegen.cases.input.expected + +import kotlin.`annotation`.AnnotationRetention +import kotlin.`annotation`.Retention + +@Retention(value = AnnotationRetention.BINARY) +public annotation class Generated diff --git a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/input/expected/client/QueryProjection.kt b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/input/expected/client/QueryProjection.kt index 839f29af5..bdbe88070 100644 --- a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/input/expected/client/QueryProjection.kt +++ b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/input/expected/client/QueryProjection.kt @@ -3,7 +3,11 @@ package com.netflix.graphql.dgs.codegen.cases.input.expected.client import com.netflix.graphql.dgs.client.codegen.InputValueSerializerInterface import com.netflix.graphql.dgs.codegen.GraphQLProjection import com.netflix.graphql.dgs.codegen.cases.input.expected.types.MovieFilter +import com.netflix.graphql.dgs.codegen.cases.input.expected.Generated as ExpectedGenerated +import jakarta.`annotation`.Generated as AnnotationGenerated +@AnnotationGenerated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) +@ExpectedGenerated public class QueryProjection( inputValueSerializer: InputValueSerializerInterface? = null, ) : GraphQLProjection(inputValueSerializer) { diff --git a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/input/expected/types/MovieFilter.kt b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/input/expected/types/MovieFilter.kt index 40d8099ab..a77b6bafb 100644 --- a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/input/expected/types/MovieFilter.kt +++ b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/input/expected/types/MovieFilter.kt @@ -6,7 +6,11 @@ import kotlin.Any import kotlin.Pair import kotlin.String import kotlin.collections.List +import com.netflix.graphql.dgs.codegen.cases.input.expected.Generated as ExpectedGenerated +import jakarta.`annotation`.Generated as AnnotationGenerated +@AnnotationGenerated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) +@ExpectedGenerated public data class MovieFilter( @JsonProperty("genre") public val genre: String? = default("genre", null), diff --git a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/input/expected/types/Query.kt b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/input/expected/types/Query.kt index e3e6d75f1..602ab4bb9 100644 --- a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/input/expected/types/Query.kt +++ b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/input/expected/types/Query.kt @@ -9,7 +9,11 @@ import java.lang.IllegalStateException import kotlin.String import kotlin.collections.List import kotlin.jvm.JvmName +import com.netflix.graphql.dgs.codegen.cases.input.expected.Generated as ExpectedGenerated +import jakarta.`annotation`.Generated as AnnotationGenerated +@AnnotationGenerated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) +@ExpectedGenerated @JsonTypeInfo(use = JsonTypeInfo.Id.NONE) @JsonDeserialize(builder = Query.Builder::class) public class Query( @@ -21,11 +25,15 @@ public class Query( public val movies: List? get() = __movies.invoke() + @AnnotationGenerated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) + @ExpectedGenerated public companion object { private val moviesDefault: () -> List? = { throw IllegalStateException("Field `movies` was not requested") } } + @AnnotationGenerated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) + @ExpectedGenerated @JsonPOJOBuilder @JsonIgnoreProperties("__typename") public class Builder { diff --git a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/inputWithDefaultBigDecimal/expected/DgsClient.kt b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/inputWithDefaultBigDecimal/expected/DgsClient.kt index bbfcd581d..c8c10a4a4 100644 --- a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/inputWithDefaultBigDecimal/expected/DgsClient.kt +++ b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/inputWithDefaultBigDecimal/expected/DgsClient.kt @@ -6,6 +6,8 @@ import com.netflix.graphql.dgs.codegen.cases.inputWithDefaultBigDecimal.expected import graphql.language.OperationDefinition import kotlin.String +@jakarta.`annotation`.Generated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) +@Generated public object DgsClient { public fun buildQuery(inputValueSerializer: InputValueSerializerInterface? = null, _projection: QueryProjection.() -> QueryProjection): String = diff --git a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/inputWithDefaultBigDecimal/expected/DgsConstants.kt b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/inputWithDefaultBigDecimal/expected/DgsConstants.kt index 8eee31265..a2b8475b3 100644 --- a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/inputWithDefaultBigDecimal/expected/DgsConstants.kt +++ b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/inputWithDefaultBigDecimal/expected/DgsConstants.kt @@ -2,19 +2,27 @@ package com.netflix.graphql.dgs.codegen.cases.inputWithDefaultBigDecimal.expecte import kotlin.String +@jakarta.`annotation`.Generated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) +@Generated public object DgsConstants { public const val QUERY_TYPE: String = "Query" + @jakarta.`annotation`.Generated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) + @Generated public object QUERY { public const val TYPE_NAME: String = "Query" public const val Orders: String = "orders" + @jakarta.`annotation`.Generated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) + @Generated public object ORDERS_INPUT_ARGUMENT { public const val Filter: String = "filter" } } + @jakarta.`annotation`.Generated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) + @Generated public object ORDERFILTER { public const val TYPE_NAME: String = "OrderFilter" diff --git a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/inputWithDefaultBigDecimal/expected/Generated.kt b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/inputWithDefaultBigDecimal/expected/Generated.kt new file mode 100644 index 000000000..9cab8ba8b --- /dev/null +++ b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/inputWithDefaultBigDecimal/expected/Generated.kt @@ -0,0 +1,7 @@ +package com.netflix.graphql.dgs.codegen.cases.inputWithDefaultBigDecimal.expected + +import kotlin.`annotation`.AnnotationRetention +import kotlin.`annotation`.Retention + +@Retention(value = AnnotationRetention.BINARY) +public annotation class Generated diff --git a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/inputWithDefaultBigDecimal/expected/client/QueryProjection.kt b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/inputWithDefaultBigDecimal/expected/client/QueryProjection.kt index 87b31cdb3..3714583d1 100644 --- a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/inputWithDefaultBigDecimal/expected/client/QueryProjection.kt +++ b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/inputWithDefaultBigDecimal/expected/client/QueryProjection.kt @@ -3,7 +3,11 @@ package com.netflix.graphql.dgs.codegen.cases.inputWithDefaultBigDecimal.expecte import com.netflix.graphql.dgs.client.codegen.InputValueSerializerInterface import com.netflix.graphql.dgs.codegen.GraphQLProjection import com.netflix.graphql.dgs.codegen.cases.inputWithDefaultBigDecimal.expected.types.OrderFilter +import com.netflix.graphql.dgs.codegen.cases.inputWithDefaultBigDecimal.expected.Generated as ExpectedGenerated +import jakarta.`annotation`.Generated as AnnotationGenerated +@AnnotationGenerated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) +@ExpectedGenerated public class QueryProjection( inputValueSerializer: InputValueSerializerInterface? = null, ) : GraphQLProjection(inputValueSerializer) { diff --git a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/inputWithDefaultBigDecimal/expected/types/OrderFilter.kt b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/inputWithDefaultBigDecimal/expected/types/OrderFilter.kt index 2355c61e3..9b2a0defc 100644 --- a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/inputWithDefaultBigDecimal/expected/types/OrderFilter.kt +++ b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/inputWithDefaultBigDecimal/expected/types/OrderFilter.kt @@ -7,7 +7,11 @@ import kotlin.Any import kotlin.Pair import kotlin.String import kotlin.collections.List +import com.netflix.graphql.dgs.codegen.cases.inputWithDefaultBigDecimal.expected.Generated as ExpectedGenerated +import jakarta.`annotation`.Generated as AnnotationGenerated +@AnnotationGenerated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) +@ExpectedGenerated public data class OrderFilter( @JsonProperty("min") public val min: BigDecimal = default("min", java.math.BigDecimal("1.1")), diff --git a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/inputWithDefaultBigDecimal/expected/types/Query.kt b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/inputWithDefaultBigDecimal/expected/types/Query.kt index 93c13ba14..0b94d4236 100644 --- a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/inputWithDefaultBigDecimal/expected/types/Query.kt +++ b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/inputWithDefaultBigDecimal/expected/types/Query.kt @@ -8,7 +8,11 @@ import com.fasterxml.jackson.databind.`annotation`.JsonPOJOBuilder import java.lang.IllegalStateException import kotlin.String import kotlin.jvm.JvmName +import com.netflix.graphql.dgs.codegen.cases.inputWithDefaultBigDecimal.expected.Generated as ExpectedGenerated +import jakarta.`annotation`.Generated as AnnotationGenerated +@AnnotationGenerated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) +@ExpectedGenerated @JsonTypeInfo(use = JsonTypeInfo.Id.NONE) @JsonDeserialize(builder = Query.Builder::class) public class Query( @@ -20,11 +24,15 @@ public class Query( public val orders: String? get() = __orders.invoke() + @AnnotationGenerated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) + @ExpectedGenerated public companion object { private val ordersDefault: () -> String? = { throw IllegalStateException("Field `orders` was not requested") } } + @AnnotationGenerated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) + @ExpectedGenerated @JsonPOJOBuilder @JsonIgnoreProperties("__typename") public class Builder { diff --git a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/inputWithDefaultCurrency/expected/DgsClient.kt b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/inputWithDefaultCurrency/expected/DgsClient.kt index 5ef20981f..e0adf8d72 100644 --- a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/inputWithDefaultCurrency/expected/DgsClient.kt +++ b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/inputWithDefaultCurrency/expected/DgsClient.kt @@ -6,6 +6,8 @@ import com.netflix.graphql.dgs.codegen.cases.inputWithDefaultCurrency.expected.c import graphql.language.OperationDefinition import kotlin.String +@jakarta.`annotation`.Generated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) +@Generated public object DgsClient { public fun buildQuery(inputValueSerializer: InputValueSerializerInterface? = null, _projection: QueryProjection.() -> QueryProjection): String = diff --git a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/inputWithDefaultCurrency/expected/DgsConstants.kt b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/inputWithDefaultCurrency/expected/DgsConstants.kt index c6d8c6ea0..c8a734d4d 100644 --- a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/inputWithDefaultCurrency/expected/DgsConstants.kt +++ b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/inputWithDefaultCurrency/expected/DgsConstants.kt @@ -2,19 +2,27 @@ package com.netflix.graphql.dgs.codegen.cases.inputWithDefaultCurrency.expected import kotlin.String +@jakarta.`annotation`.Generated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) +@Generated public object DgsConstants { public const val QUERY_TYPE: String = "Query" + @jakarta.`annotation`.Generated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) + @Generated public object QUERY { public const val TYPE_NAME: String = "Query" public const val Orders: String = "orders" + @jakarta.`annotation`.Generated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) + @Generated public object ORDERS_INPUT_ARGUMENT { public const val Filter: String = "filter" } } + @jakarta.`annotation`.Generated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) + @Generated public object ORDERFILTER { public const val TYPE_NAME: String = "OrderFilter" diff --git a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/inputWithDefaultCurrency/expected/Generated.kt b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/inputWithDefaultCurrency/expected/Generated.kt new file mode 100644 index 000000000..dd6c3c29b --- /dev/null +++ b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/inputWithDefaultCurrency/expected/Generated.kt @@ -0,0 +1,7 @@ +package com.netflix.graphql.dgs.codegen.cases.inputWithDefaultCurrency.expected + +import kotlin.`annotation`.AnnotationRetention +import kotlin.`annotation`.Retention + +@Retention(value = AnnotationRetention.BINARY) +public annotation class Generated diff --git a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/inputWithDefaultCurrency/expected/client/QueryProjection.kt b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/inputWithDefaultCurrency/expected/client/QueryProjection.kt index 7decd133b..c4d3143a8 100644 --- a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/inputWithDefaultCurrency/expected/client/QueryProjection.kt +++ b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/inputWithDefaultCurrency/expected/client/QueryProjection.kt @@ -3,7 +3,11 @@ package com.netflix.graphql.dgs.codegen.cases.inputWithDefaultCurrency.expected. import com.netflix.graphql.dgs.client.codegen.InputValueSerializerInterface import com.netflix.graphql.dgs.codegen.GraphQLProjection import com.netflix.graphql.dgs.codegen.cases.inputWithDefaultCurrency.expected.types.OrderFilter +import com.netflix.graphql.dgs.codegen.cases.inputWithDefaultCurrency.expected.Generated as ExpectedGenerated +import jakarta.`annotation`.Generated as AnnotationGenerated +@AnnotationGenerated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) +@ExpectedGenerated public class QueryProjection( inputValueSerializer: InputValueSerializerInterface? = null, ) : GraphQLProjection(inputValueSerializer) { diff --git a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/inputWithDefaultCurrency/expected/types/OrderFilter.kt b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/inputWithDefaultCurrency/expected/types/OrderFilter.kt index 0e92509ab..f56778e1f 100644 --- a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/inputWithDefaultCurrency/expected/types/OrderFilter.kt +++ b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/inputWithDefaultCurrency/expected/types/OrderFilter.kt @@ -7,7 +7,11 @@ import kotlin.Any import kotlin.Pair import kotlin.String import kotlin.collections.List +import com.netflix.graphql.dgs.codegen.cases.inputWithDefaultCurrency.expected.Generated as ExpectedGenerated +import jakarta.`annotation`.Generated as AnnotationGenerated +@AnnotationGenerated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) +@ExpectedGenerated public data class OrderFilter( @JsonProperty("value") public val `value`: Currency = default("value", diff --git a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/inputWithDefaultCurrency/expected/types/Query.kt b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/inputWithDefaultCurrency/expected/types/Query.kt index e8d0167ff..9f3fdcb7a 100644 --- a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/inputWithDefaultCurrency/expected/types/Query.kt +++ b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/inputWithDefaultCurrency/expected/types/Query.kt @@ -8,7 +8,11 @@ import com.fasterxml.jackson.databind.`annotation`.JsonPOJOBuilder import java.lang.IllegalStateException import kotlin.String import kotlin.jvm.JvmName +import com.netflix.graphql.dgs.codegen.cases.inputWithDefaultCurrency.expected.Generated as ExpectedGenerated +import jakarta.`annotation`.Generated as AnnotationGenerated +@AnnotationGenerated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) +@ExpectedGenerated @JsonTypeInfo(use = JsonTypeInfo.Id.NONE) @JsonDeserialize(builder = Query.Builder::class) public class Query( @@ -20,11 +24,15 @@ public class Query( public val orders: String? get() = __orders.invoke() + @AnnotationGenerated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) + @ExpectedGenerated public companion object { private val ordersDefault: () -> String? = { throw IllegalStateException("Field `orders` was not requested") } } + @AnnotationGenerated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) + @ExpectedGenerated @JsonPOJOBuilder @JsonIgnoreProperties("__typename") public class Builder { diff --git a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/inputWithDefaultEnumValueForArray/expected/DgsClient.kt b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/inputWithDefaultEnumValueForArray/expected/DgsClient.kt index 715724b8b..2b30074b0 100644 --- a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/inputWithDefaultEnumValueForArray/expected/DgsClient.kt +++ b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/inputWithDefaultEnumValueForArray/expected/DgsClient.kt @@ -1,3 +1,5 @@ package com.netflix.graphql.dgs.codegen.cases.inputWithDefaultEnumValueForArray.expected +@jakarta.`annotation`.Generated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) +@Generated public object DgsClient diff --git a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/inputWithDefaultEnumValueForArray/expected/DgsConstants.kt b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/inputWithDefaultEnumValueForArray/expected/DgsConstants.kt index 45fc24cd2..34c13def6 100644 --- a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/inputWithDefaultEnumValueForArray/expected/DgsConstants.kt +++ b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/inputWithDefaultEnumValueForArray/expected/DgsConstants.kt @@ -2,7 +2,11 @@ package com.netflix.graphql.dgs.codegen.cases.inputWithDefaultEnumValueForArray. import kotlin.String +@jakarta.`annotation`.Generated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) +@Generated public object DgsConstants { + @jakarta.`annotation`.Generated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) + @Generated public object SOMETYPE { public const val TYPE_NAME: String = "SomeType" diff --git a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/inputWithDefaultEnumValueForArray/expected/Generated.kt b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/inputWithDefaultEnumValueForArray/expected/Generated.kt new file mode 100644 index 000000000..ecc1dd1f7 --- /dev/null +++ b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/inputWithDefaultEnumValueForArray/expected/Generated.kt @@ -0,0 +1,7 @@ +package com.netflix.graphql.dgs.codegen.cases.inputWithDefaultEnumValueForArray.expected + +import kotlin.`annotation`.AnnotationRetention +import kotlin.`annotation`.Retention + +@Retention(value = AnnotationRetention.BINARY) +public annotation class Generated diff --git a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/inputWithDefaultEnumValueForArray/expected/types/Color.kt b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/inputWithDefaultEnumValueForArray/expected/types/Color.kt index 81dd3e940..e5a217712 100644 --- a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/inputWithDefaultEnumValueForArray/expected/types/Color.kt +++ b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/inputWithDefaultEnumValueForArray/expected/types/Color.kt @@ -1,9 +1,20 @@ package com.netflix.graphql.dgs.codegen.cases.inputWithDefaultEnumValueForArray.expected.types +import com.netflix.graphql.dgs.codegen.cases.inputWithDefaultEnumValueForArray.expected.Generated as ExpectedGenerated +import jakarta.`annotation`.Generated as AnnotationGenerated + +@AnnotationGenerated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) +@ExpectedGenerated public enum class Color { + @AnnotationGenerated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) + @ExpectedGenerated red, + @AnnotationGenerated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) + @ExpectedGenerated blue, ; + @AnnotationGenerated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) + @ExpectedGenerated public companion object } diff --git a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/inputWithDefaultEnumValueForArray/expected/types/SomeType.kt b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/inputWithDefaultEnumValueForArray/expected/types/SomeType.kt index 3e87030e1..f8e5c774e 100644 --- a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/inputWithDefaultEnumValueForArray/expected/types/SomeType.kt +++ b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/inputWithDefaultEnumValueForArray/expected/types/SomeType.kt @@ -6,7 +6,11 @@ import kotlin.Any import kotlin.Pair import kotlin.String import kotlin.collections.List +import com.netflix.graphql.dgs.codegen.cases.inputWithDefaultEnumValueForArray.expected.Generated as ExpectedGenerated +import jakarta.`annotation`.Generated as AnnotationGenerated +@AnnotationGenerated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) +@ExpectedGenerated public data class SomeType( @JsonProperty("colors") public val colors: List? = default?>("colors", diff --git a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/inputWithDefaultIntValueForArray/expected/DgsClient.kt b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/inputWithDefaultIntValueForArray/expected/DgsClient.kt index aa722e5fd..54ac1ee9d 100644 --- a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/inputWithDefaultIntValueForArray/expected/DgsClient.kt +++ b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/inputWithDefaultIntValueForArray/expected/DgsClient.kt @@ -1,3 +1,5 @@ package com.netflix.graphql.dgs.codegen.cases.inputWithDefaultIntValueForArray.expected +@jakarta.`annotation`.Generated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) +@Generated public object DgsClient diff --git a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/inputWithDefaultIntValueForArray/expected/DgsConstants.kt b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/inputWithDefaultIntValueForArray/expected/DgsConstants.kt index 6e8cda303..913ac36d0 100644 --- a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/inputWithDefaultIntValueForArray/expected/DgsConstants.kt +++ b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/inputWithDefaultIntValueForArray/expected/DgsConstants.kt @@ -2,7 +2,11 @@ package com.netflix.graphql.dgs.codegen.cases.inputWithDefaultIntValueForArray.e import kotlin.String +@jakarta.`annotation`.Generated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) +@Generated public object DgsConstants { + @jakarta.`annotation`.Generated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) + @Generated public object SOMETYPE { public const val TYPE_NAME: String = "SomeType" diff --git a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/inputWithDefaultIntValueForArray/expected/Generated.kt b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/inputWithDefaultIntValueForArray/expected/Generated.kt new file mode 100644 index 000000000..cdeeaa1f5 --- /dev/null +++ b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/inputWithDefaultIntValueForArray/expected/Generated.kt @@ -0,0 +1,7 @@ +package com.netflix.graphql.dgs.codegen.cases.inputWithDefaultIntValueForArray.expected + +import kotlin.`annotation`.AnnotationRetention +import kotlin.`annotation`.Retention + +@Retention(value = AnnotationRetention.BINARY) +public annotation class Generated diff --git a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/inputWithDefaultIntValueForArray/expected/types/SomeType.kt b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/inputWithDefaultIntValueForArray/expected/types/SomeType.kt index d7ce650b3..d2b7fa45e 100644 --- a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/inputWithDefaultIntValueForArray/expected/types/SomeType.kt +++ b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/inputWithDefaultIntValueForArray/expected/types/SomeType.kt @@ -7,7 +7,11 @@ import kotlin.Int import kotlin.Pair import kotlin.String import kotlin.collections.List +import com.netflix.graphql.dgs.codegen.cases.inputWithDefaultIntValueForArray.expected.Generated as ExpectedGenerated +import jakarta.`annotation`.Generated as AnnotationGenerated +@AnnotationGenerated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) +@ExpectedGenerated public data class SomeType( @JsonProperty("numbers") public val numbers: List? = default?>("numbers", listOf(1, 2, 3)), diff --git a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/inputWithDefaultStringValueForArray/expected/DgsClient.kt b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/inputWithDefaultStringValueForArray/expected/DgsClient.kt index 918478833..9588564cf 100644 --- a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/inputWithDefaultStringValueForArray/expected/DgsClient.kt +++ b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/inputWithDefaultStringValueForArray/expected/DgsClient.kt @@ -1,3 +1,5 @@ package com.netflix.graphql.dgs.codegen.cases.inputWithDefaultStringValueForArray.expected +@jakarta.`annotation`.Generated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) +@Generated public object DgsClient diff --git a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/inputWithDefaultStringValueForArray/expected/DgsConstants.kt b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/inputWithDefaultStringValueForArray/expected/DgsConstants.kt index 08962f3ed..a4f209518 100644 --- a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/inputWithDefaultStringValueForArray/expected/DgsConstants.kt +++ b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/inputWithDefaultStringValueForArray/expected/DgsConstants.kt @@ -2,7 +2,11 @@ package com.netflix.graphql.dgs.codegen.cases.inputWithDefaultStringValueForArra import kotlin.String +@jakarta.`annotation`.Generated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) +@Generated public object DgsConstants { + @jakarta.`annotation`.Generated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) + @Generated public object SOMETYPE { public const val TYPE_NAME: String = "SomeType" diff --git a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/inputWithDefaultStringValueForArray/expected/Generated.kt b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/inputWithDefaultStringValueForArray/expected/Generated.kt new file mode 100644 index 000000000..5e86d656d --- /dev/null +++ b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/inputWithDefaultStringValueForArray/expected/Generated.kt @@ -0,0 +1,7 @@ +package com.netflix.graphql.dgs.codegen.cases.inputWithDefaultStringValueForArray.expected + +import kotlin.`annotation`.AnnotationRetention +import kotlin.`annotation`.Retention + +@Retention(value = AnnotationRetention.BINARY) +public annotation class Generated diff --git a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/inputWithDefaultStringValueForArray/expected/types/SomeType.kt b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/inputWithDefaultStringValueForArray/expected/types/SomeType.kt index 14d230c34..72b1ce123 100644 --- a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/inputWithDefaultStringValueForArray/expected/types/SomeType.kt +++ b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/inputWithDefaultStringValueForArray/expected/types/SomeType.kt @@ -6,7 +6,11 @@ import kotlin.Any import kotlin.Pair import kotlin.String import kotlin.collections.List +import com.netflix.graphql.dgs.codegen.cases.inputWithDefaultStringValueForArray.expected.Generated as ExpectedGenerated +import jakarta.`annotation`.Generated as AnnotationGenerated +@AnnotationGenerated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) +@ExpectedGenerated public data class SomeType( @JsonProperty("names") public val names: List? = default?>("names", listOf("A", "B")), diff --git a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/inputWithDefaultValueForArray/expected/DgsClient.kt b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/inputWithDefaultValueForArray/expected/DgsClient.kt index 251592d79..49605aeb8 100644 --- a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/inputWithDefaultValueForArray/expected/DgsClient.kt +++ b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/inputWithDefaultValueForArray/expected/DgsClient.kt @@ -1,3 +1,5 @@ package com.netflix.graphql.dgs.codegen.cases.inputWithDefaultValueForArray.expected +@jakarta.`annotation`.Generated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) +@Generated public object DgsClient diff --git a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/inputWithDefaultValueForArray/expected/DgsConstants.kt b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/inputWithDefaultValueForArray/expected/DgsConstants.kt index ff5c9c0e6..7f01038db 100644 --- a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/inputWithDefaultValueForArray/expected/DgsConstants.kt +++ b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/inputWithDefaultValueForArray/expected/DgsConstants.kt @@ -2,7 +2,11 @@ package com.netflix.graphql.dgs.codegen.cases.inputWithDefaultValueForArray.expe import kotlin.String +@jakarta.`annotation`.Generated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) +@Generated public object DgsConstants { + @jakarta.`annotation`.Generated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) + @Generated public object SOMETYPE { public const val TYPE_NAME: String = "SomeType" diff --git a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/inputWithDefaultValueForArray/expected/Generated.kt b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/inputWithDefaultValueForArray/expected/Generated.kt new file mode 100644 index 000000000..8b64ed712 --- /dev/null +++ b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/inputWithDefaultValueForArray/expected/Generated.kt @@ -0,0 +1,7 @@ +package com.netflix.graphql.dgs.codegen.cases.inputWithDefaultValueForArray.expected + +import kotlin.`annotation`.AnnotationRetention +import kotlin.`annotation`.Retention + +@Retention(value = AnnotationRetention.BINARY) +public annotation class Generated diff --git a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/inputWithDefaultValueForArray/expected/types/SomeType.kt b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/inputWithDefaultValueForArray/expected/types/SomeType.kt index acd9a9fe7..3f7a99741 100644 --- a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/inputWithDefaultValueForArray/expected/types/SomeType.kt +++ b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/inputWithDefaultValueForArray/expected/types/SomeType.kt @@ -6,7 +6,11 @@ import kotlin.Any import kotlin.Pair import kotlin.String import kotlin.collections.List +import com.netflix.graphql.dgs.codegen.cases.inputWithDefaultValueForArray.expected.Generated as ExpectedGenerated +import jakarta.`annotation`.Generated as AnnotationGenerated +@AnnotationGenerated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) +@ExpectedGenerated public data class SomeType( @JsonProperty("names") public val names: List? = default?>("names", emptyList()), diff --git a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/inputWithDefaultValueForEnum/expected/DgsClient.kt b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/inputWithDefaultValueForEnum/expected/DgsClient.kt index 2ff77d39d..4efd11b38 100644 --- a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/inputWithDefaultValueForEnum/expected/DgsClient.kt +++ b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/inputWithDefaultValueForEnum/expected/DgsClient.kt @@ -1,3 +1,5 @@ package com.netflix.graphql.dgs.codegen.cases.inputWithDefaultValueForEnum.expected +@jakarta.`annotation`.Generated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) +@Generated public object DgsClient diff --git a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/inputWithDefaultValueForEnum/expected/DgsConstants.kt b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/inputWithDefaultValueForEnum/expected/DgsConstants.kt index f1d1aae18..9f48fb48d 100644 --- a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/inputWithDefaultValueForEnum/expected/DgsConstants.kt +++ b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/inputWithDefaultValueForEnum/expected/DgsConstants.kt @@ -2,7 +2,11 @@ package com.netflix.graphql.dgs.codegen.cases.inputWithDefaultValueForEnum.expec import kotlin.String +@jakarta.`annotation`.Generated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) +@Generated public object DgsConstants { + @jakarta.`annotation`.Generated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) + @Generated public object COLORFILTER { public const val TYPE_NAME: String = "ColorFilter" diff --git a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/inputWithDefaultValueForEnum/expected/Generated.kt b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/inputWithDefaultValueForEnum/expected/Generated.kt new file mode 100644 index 000000000..4c77005bf --- /dev/null +++ b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/inputWithDefaultValueForEnum/expected/Generated.kt @@ -0,0 +1,7 @@ +package com.netflix.graphql.dgs.codegen.cases.inputWithDefaultValueForEnum.expected + +import kotlin.`annotation`.AnnotationRetention +import kotlin.`annotation`.Retention + +@Retention(value = AnnotationRetention.BINARY) +public annotation class Generated diff --git a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/inputWithDefaultValueForEnum/expected/types/Color.kt b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/inputWithDefaultValueForEnum/expected/types/Color.kt index 54a69ccb4..f2cbabfa2 100644 --- a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/inputWithDefaultValueForEnum/expected/types/Color.kt +++ b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/inputWithDefaultValueForEnum/expected/types/Color.kt @@ -1,8 +1,17 @@ package com.netflix.graphql.dgs.codegen.cases.inputWithDefaultValueForEnum.expected.types +import com.netflix.graphql.dgs.codegen.cases.inputWithDefaultValueForEnum.expected.Generated as ExpectedGenerated +import jakarta.`annotation`.Generated as AnnotationGenerated + +@AnnotationGenerated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) +@ExpectedGenerated public enum class Color { + @AnnotationGenerated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) + @ExpectedGenerated red, ; + @AnnotationGenerated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) + @ExpectedGenerated public companion object } diff --git a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/inputWithDefaultValueForEnum/expected/types/ColorFilter.kt b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/inputWithDefaultValueForEnum/expected/types/ColorFilter.kt index 9d45ac230..413a612c8 100644 --- a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/inputWithDefaultValueForEnum/expected/types/ColorFilter.kt +++ b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/inputWithDefaultValueForEnum/expected/types/ColorFilter.kt @@ -6,7 +6,11 @@ import kotlin.Any import kotlin.Pair import kotlin.String import kotlin.collections.List +import com.netflix.graphql.dgs.codegen.cases.inputWithDefaultValueForEnum.expected.Generated as ExpectedGenerated +import jakarta.`annotation`.Generated as AnnotationGenerated +@AnnotationGenerated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) +@ExpectedGenerated public data class ColorFilter( @JsonProperty("color") public val color: Color? = default("color", diff --git a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/inputWithDefaultValueForNonNullableFields/expected/DgsClient.kt b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/inputWithDefaultValueForNonNullableFields/expected/DgsClient.kt index c1a62ed72..bb3f945b2 100644 --- a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/inputWithDefaultValueForNonNullableFields/expected/DgsClient.kt +++ b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/inputWithDefaultValueForNonNullableFields/expected/DgsClient.kt @@ -1,3 +1,5 @@ package com.netflix.graphql.dgs.codegen.cases.inputWithDefaultValueForNonNullableFields.expected +@jakarta.`annotation`.Generated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) +@Generated public object DgsClient diff --git a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/inputWithDefaultValueForNonNullableFields/expected/DgsConstants.kt b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/inputWithDefaultValueForNonNullableFields/expected/DgsConstants.kt index 8e9b0224b..1b92e7859 100644 --- a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/inputWithDefaultValueForNonNullableFields/expected/DgsConstants.kt +++ b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/inputWithDefaultValueForNonNullableFields/expected/DgsConstants.kt @@ -2,7 +2,11 @@ package com.netflix.graphql.dgs.codegen.cases.inputWithDefaultValueForNonNullabl import kotlin.String +@jakarta.`annotation`.Generated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) +@Generated public object DgsConstants { + @jakarta.`annotation`.Generated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) + @Generated public object PERSON { public const val TYPE_NAME: String = "Person" @@ -17,6 +21,8 @@ public object DgsConstants { public const val IsHappy: String = "isHappy" } + @jakarta.`annotation`.Generated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) + @Generated public object CAR { public const val TYPE_NAME: String = "Car" diff --git a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/inputWithDefaultValueForNonNullableFields/expected/Generated.kt b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/inputWithDefaultValueForNonNullableFields/expected/Generated.kt new file mode 100644 index 000000000..a47199ef6 --- /dev/null +++ b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/inputWithDefaultValueForNonNullableFields/expected/Generated.kt @@ -0,0 +1,7 @@ +package com.netflix.graphql.dgs.codegen.cases.inputWithDefaultValueForNonNullableFields.expected + +import kotlin.`annotation`.AnnotationRetention +import kotlin.`annotation`.Retention + +@Retention(value = AnnotationRetention.BINARY) +public annotation class Generated diff --git a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/inputWithDefaultValueForNonNullableFields/expected/types/Car.kt b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/inputWithDefaultValueForNonNullableFields/expected/types/Car.kt index 20ebbe688..bc1784e7d 100644 --- a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/inputWithDefaultValueForNonNullableFields/expected/types/Car.kt +++ b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/inputWithDefaultValueForNonNullableFields/expected/types/Car.kt @@ -6,7 +6,11 @@ import kotlin.Any import kotlin.Pair import kotlin.String import kotlin.collections.List +import com.netflix.graphql.dgs.codegen.cases.inputWithDefaultValueForNonNullableFields.expected.Generated as ExpectedGenerated +import jakarta.`annotation`.Generated as AnnotationGenerated +@AnnotationGenerated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) +@ExpectedGenerated public data class Car( @JsonProperty("brand") public val brand: String = default("brand", "BMW"), diff --git a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/inputWithDefaultValueForNonNullableFields/expected/types/Hobby.kt b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/inputWithDefaultValueForNonNullableFields/expected/types/Hobby.kt index 7ff266b61..76d82fe78 100644 --- a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/inputWithDefaultValueForNonNullableFields/expected/types/Hobby.kt +++ b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/inputWithDefaultValueForNonNullableFields/expected/types/Hobby.kt @@ -1,9 +1,20 @@ package com.netflix.graphql.dgs.codegen.cases.inputWithDefaultValueForNonNullableFields.expected.types +import com.netflix.graphql.dgs.codegen.cases.inputWithDefaultValueForNonNullableFields.expected.Generated as ExpectedGenerated +import jakarta.`annotation`.Generated as AnnotationGenerated + +@AnnotationGenerated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) +@ExpectedGenerated public enum class Hobby { + @AnnotationGenerated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) + @ExpectedGenerated Football, + @AnnotationGenerated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) + @ExpectedGenerated Hokey, ; + @AnnotationGenerated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) + @ExpectedGenerated public companion object } diff --git a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/inputWithDefaultValueForNonNullableFields/expected/types/Person.kt b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/inputWithDefaultValueForNonNullableFields/expected/types/Person.kt index 505f66437..adcdd66f9 100644 --- a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/inputWithDefaultValueForNonNullableFields/expected/types/Person.kt +++ b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/inputWithDefaultValueForNonNullableFields/expected/types/Person.kt @@ -8,7 +8,11 @@ import kotlin.Int import kotlin.Pair import kotlin.String import kotlin.collections.List +import com.netflix.graphql.dgs.codegen.cases.inputWithDefaultValueForNonNullableFields.expected.Generated as ExpectedGenerated +import jakarta.`annotation`.Generated as AnnotationGenerated +@AnnotationGenerated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) +@ExpectedGenerated public data class Person( @JsonProperty("name") public val name: String = default("name", "Damian"), diff --git a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/inputWithDefaultValueForObject/expected/DgsClient.kt b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/inputWithDefaultValueForObject/expected/DgsClient.kt index af3c37684..e39f3e983 100644 --- a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/inputWithDefaultValueForObject/expected/DgsClient.kt +++ b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/inputWithDefaultValueForObject/expected/DgsClient.kt @@ -1,3 +1,5 @@ package com.netflix.graphql.dgs.codegen.cases.inputWithDefaultValueForObject.expected +@jakarta.`annotation`.Generated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) +@Generated public object DgsClient diff --git a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/inputWithDefaultValueForObject/expected/DgsConstants.kt b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/inputWithDefaultValueForObject/expected/DgsConstants.kt index 8ecb9f125..39c55e3d2 100644 --- a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/inputWithDefaultValueForObject/expected/DgsConstants.kt +++ b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/inputWithDefaultValueForObject/expected/DgsConstants.kt @@ -2,7 +2,11 @@ package com.netflix.graphql.dgs.codegen.cases.inputWithDefaultValueForObject.exp import kotlin.String +@jakarta.`annotation`.Generated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) +@Generated public object DgsConstants { + @jakarta.`annotation`.Generated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) + @Generated public object PERSON { public const val TYPE_NAME: String = "Person" @@ -13,12 +17,16 @@ public object DgsConstants { public const val Car: String = "car" } + @jakarta.`annotation`.Generated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) + @Generated public object CAR { public const val TYPE_NAME: String = "Car" public const val Brand: String = "brand" } + @jakarta.`annotation`.Generated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) + @Generated public object MOVIEFILTER { public const val TYPE_NAME: String = "MovieFilter" diff --git a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/inputWithDefaultValueForObject/expected/Generated.kt b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/inputWithDefaultValueForObject/expected/Generated.kt new file mode 100644 index 000000000..764ac748f --- /dev/null +++ b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/inputWithDefaultValueForObject/expected/Generated.kt @@ -0,0 +1,7 @@ +package com.netflix.graphql.dgs.codegen.cases.inputWithDefaultValueForObject.expected + +import kotlin.`annotation`.AnnotationRetention +import kotlin.`annotation`.Retention + +@Retention(value = AnnotationRetention.BINARY) +public annotation class Generated diff --git a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/inputWithDefaultValueForObject/expected/types/Car.kt b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/inputWithDefaultValueForObject/expected/types/Car.kt index f48435c8b..f7534e69c 100644 --- a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/inputWithDefaultValueForObject/expected/types/Car.kt +++ b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/inputWithDefaultValueForObject/expected/types/Car.kt @@ -6,7 +6,11 @@ import kotlin.Any import kotlin.Pair import kotlin.String import kotlin.collections.List +import com.netflix.graphql.dgs.codegen.cases.inputWithDefaultValueForObject.expected.Generated as ExpectedGenerated +import jakarta.`annotation`.Generated as AnnotationGenerated +@AnnotationGenerated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) +@ExpectedGenerated public data class Car( @JsonProperty("brand") public val brand: String = default("brand", "BMW"), diff --git a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/inputWithDefaultValueForObject/expected/types/MovieFilter.kt b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/inputWithDefaultValueForObject/expected/types/MovieFilter.kt index d764c94a1..fd17cd222 100644 --- a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/inputWithDefaultValueForObject/expected/types/MovieFilter.kt +++ b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/inputWithDefaultValueForObject/expected/types/MovieFilter.kt @@ -6,7 +6,11 @@ import kotlin.Any import kotlin.Pair import kotlin.String import kotlin.collections.List +import com.netflix.graphql.dgs.codegen.cases.inputWithDefaultValueForObject.expected.Generated as ExpectedGenerated +import jakarta.`annotation`.Generated as AnnotationGenerated +@AnnotationGenerated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) +@ExpectedGenerated public data class MovieFilter( @JsonProperty("director") public val director: Person? = default("director", diff --git a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/inputWithDefaultValueForObject/expected/types/Person.kt b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/inputWithDefaultValueForObject/expected/types/Person.kt index d09368d28..29da76442 100644 --- a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/inputWithDefaultValueForObject/expected/types/Person.kt +++ b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/inputWithDefaultValueForObject/expected/types/Person.kt @@ -7,7 +7,11 @@ import kotlin.Int import kotlin.Pair import kotlin.String import kotlin.collections.List +import com.netflix.graphql.dgs.codegen.cases.inputWithDefaultValueForObject.expected.Generated as ExpectedGenerated +import jakarta.`annotation`.Generated as AnnotationGenerated +@AnnotationGenerated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) +@ExpectedGenerated public data class Person( @JsonProperty("name") public val name: String? = default("name", "John"), diff --git a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/inputWithExtendedType/expected/DgsClient.kt b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/inputWithExtendedType/expected/DgsClient.kt index 19f56f2f0..c31e73898 100644 --- a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/inputWithExtendedType/expected/DgsClient.kt +++ b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/inputWithExtendedType/expected/DgsClient.kt @@ -6,6 +6,8 @@ import com.netflix.graphql.dgs.codegen.cases.inputWithExtendedType.expected.clie import graphql.language.OperationDefinition import kotlin.String +@jakarta.`annotation`.Generated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) +@Generated public object DgsClient { public fun buildQuery(inputValueSerializer: InputValueSerializerInterface? = null, _projection: QueryProjection.() -> QueryProjection): String = diff --git a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/inputWithExtendedType/expected/DgsConstants.kt b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/inputWithExtendedType/expected/DgsConstants.kt index fe33d1fdc..c025a0132 100644 --- a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/inputWithExtendedType/expected/DgsConstants.kt +++ b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/inputWithExtendedType/expected/DgsConstants.kt @@ -2,19 +2,27 @@ package com.netflix.graphql.dgs.codegen.cases.inputWithExtendedType.expected import kotlin.String +@jakarta.`annotation`.Generated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) +@Generated public object DgsConstants { public const val QUERY_TYPE: String = "Query" + @jakarta.`annotation`.Generated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) + @Generated public object QUERY { public const val TYPE_NAME: String = "Query" public const val Movies: String = "movies" + @jakarta.`annotation`.Generated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) + @Generated public object MOVIES_INPUT_ARGUMENT { public const val Filter: String = "filter" } } + @jakarta.`annotation`.Generated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) + @Generated public object MOVIEFILTER { public const val TYPE_NAME: String = "MovieFilter" diff --git a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/inputWithExtendedType/expected/Generated.kt b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/inputWithExtendedType/expected/Generated.kt new file mode 100644 index 000000000..47c94f08e --- /dev/null +++ b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/inputWithExtendedType/expected/Generated.kt @@ -0,0 +1,7 @@ +package com.netflix.graphql.dgs.codegen.cases.inputWithExtendedType.expected + +import kotlin.`annotation`.AnnotationRetention +import kotlin.`annotation`.Retention + +@Retention(value = AnnotationRetention.BINARY) +public annotation class Generated diff --git a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/inputWithExtendedType/expected/client/QueryProjection.kt b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/inputWithExtendedType/expected/client/QueryProjection.kt index 2c8098346..c1ede3ef7 100644 --- a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/inputWithExtendedType/expected/client/QueryProjection.kt +++ b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/inputWithExtendedType/expected/client/QueryProjection.kt @@ -3,7 +3,11 @@ package com.netflix.graphql.dgs.codegen.cases.inputWithExtendedType.expected.cli import com.netflix.graphql.dgs.client.codegen.InputValueSerializerInterface import com.netflix.graphql.dgs.codegen.GraphQLProjection import com.netflix.graphql.dgs.codegen.cases.inputWithExtendedType.expected.types.MovieFilter +import com.netflix.graphql.dgs.codegen.cases.inputWithExtendedType.expected.Generated as ExpectedGenerated +import jakarta.`annotation`.Generated as AnnotationGenerated +@AnnotationGenerated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) +@ExpectedGenerated public class QueryProjection( inputValueSerializer: InputValueSerializerInterface? = null, ) : GraphQLProjection(inputValueSerializer) { diff --git a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/inputWithExtendedType/expected/types/MovieFilter.kt b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/inputWithExtendedType/expected/types/MovieFilter.kt index effc22817..6125b4c5f 100644 --- a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/inputWithExtendedType/expected/types/MovieFilter.kt +++ b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/inputWithExtendedType/expected/types/MovieFilter.kt @@ -7,7 +7,11 @@ import kotlin.Int import kotlin.Pair import kotlin.String import kotlin.collections.List +import com.netflix.graphql.dgs.codegen.cases.inputWithExtendedType.expected.Generated as ExpectedGenerated +import jakarta.`annotation`.Generated as AnnotationGenerated +@AnnotationGenerated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) +@ExpectedGenerated public data class MovieFilter( @JsonProperty("genre") public val genre: String? = default("genre", null), diff --git a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/inputWithExtendedType/expected/types/Query.kt b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/inputWithExtendedType/expected/types/Query.kt index db2065e88..339cf5e73 100644 --- a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/inputWithExtendedType/expected/types/Query.kt +++ b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/inputWithExtendedType/expected/types/Query.kt @@ -9,7 +9,11 @@ import java.lang.IllegalStateException import kotlin.String import kotlin.collections.List import kotlin.jvm.JvmName +import com.netflix.graphql.dgs.codegen.cases.inputWithExtendedType.expected.Generated as ExpectedGenerated +import jakarta.`annotation`.Generated as AnnotationGenerated +@AnnotationGenerated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) +@ExpectedGenerated @JsonTypeInfo(use = JsonTypeInfo.Id.NONE) @JsonDeserialize(builder = Query.Builder::class) public class Query( @@ -21,11 +25,15 @@ public class Query( public val movies: List? get() = __movies.invoke() + @AnnotationGenerated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) + @ExpectedGenerated public companion object { private val moviesDefault: () -> List? = { throw IllegalStateException("Field `movies` was not requested") } } + @AnnotationGenerated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) + @ExpectedGenerated @JsonPOJOBuilder @JsonIgnoreProperties("__typename") public class Builder { diff --git a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/inputWithReservedWord/expected/DgsClient.kt b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/inputWithReservedWord/expected/DgsClient.kt index 0de7b32e5..fdda10e4b 100644 --- a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/inputWithReservedWord/expected/DgsClient.kt +++ b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/inputWithReservedWord/expected/DgsClient.kt @@ -1,3 +1,5 @@ package com.netflix.graphql.dgs.codegen.cases.inputWithReservedWord.expected +@jakarta.`annotation`.Generated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) +@Generated public object DgsClient diff --git a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/inputWithReservedWord/expected/DgsConstants.kt b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/inputWithReservedWord/expected/DgsConstants.kt index fa70b8882..4732cc047 100644 --- a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/inputWithReservedWord/expected/DgsConstants.kt +++ b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/inputWithReservedWord/expected/DgsConstants.kt @@ -2,7 +2,11 @@ package com.netflix.graphql.dgs.codegen.cases.inputWithReservedWord.expected import kotlin.String +@jakarta.`annotation`.Generated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) +@Generated public object DgsConstants { + @jakarta.`annotation`.Generated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) + @Generated public object SAMPLEINPUT { public const val TYPE_NAME: String = "SampleInput" diff --git a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/inputWithReservedWord/expected/Generated.kt b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/inputWithReservedWord/expected/Generated.kt new file mode 100644 index 000000000..7a3642e2f --- /dev/null +++ b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/inputWithReservedWord/expected/Generated.kt @@ -0,0 +1,7 @@ +package com.netflix.graphql.dgs.codegen.cases.inputWithReservedWord.expected + +import kotlin.`annotation`.AnnotationRetention +import kotlin.`annotation`.Retention + +@Retention(value = AnnotationRetention.BINARY) +public annotation class Generated diff --git a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/inputWithReservedWord/expected/types/SampleInput.kt b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/inputWithReservedWord/expected/types/SampleInput.kt index 971eaa0fc..029668a4c 100644 --- a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/inputWithReservedWord/expected/types/SampleInput.kt +++ b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/inputWithReservedWord/expected/types/SampleInput.kt @@ -6,7 +6,11 @@ import kotlin.Any import kotlin.Pair import kotlin.String import kotlin.collections.List +import com.netflix.graphql.dgs.codegen.cases.inputWithReservedWord.expected.Generated as ExpectedGenerated +import jakarta.`annotation`.Generated as AnnotationGenerated +@AnnotationGenerated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) +@ExpectedGenerated public data class SampleInput( @JsonProperty("return") public val `return`: String, diff --git a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/interfaceClassWithInterfaceFields/expected/DgsClient.kt b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/interfaceClassWithInterfaceFields/expected/DgsClient.kt index b095ffd4c..cc69195ad 100644 --- a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/interfaceClassWithInterfaceFields/expected/DgsClient.kt +++ b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/interfaceClassWithInterfaceFields/expected/DgsClient.kt @@ -1,3 +1,5 @@ package com.netflix.graphql.dgs.codegen.cases.interfaceClassWithInterfaceFields.expected +@jakarta.`annotation`.Generated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) +@Generated public object DgsClient diff --git a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/interfaceClassWithInterfaceFields/expected/DgsConstants.kt b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/interfaceClassWithInterfaceFields/expected/DgsConstants.kt index 446e7b3fb..9528b606b 100644 --- a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/interfaceClassWithInterfaceFields/expected/DgsConstants.kt +++ b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/interfaceClassWithInterfaceFields/expected/DgsConstants.kt @@ -2,7 +2,11 @@ package com.netflix.graphql.dgs.codegen.cases.interfaceClassWithInterfaceFields. import kotlin.String +@jakarta.`annotation`.Generated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) +@Generated public object DgsConstants { + @jakarta.`annotation`.Generated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) + @Generated public object DOG { public const val TYPE_NAME: String = "Dog" @@ -19,6 +23,8 @@ public object DgsConstants { public const val Parents: String = "parents" } + @jakarta.`annotation`.Generated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) + @Generated public object BIRD { public const val TYPE_NAME: String = "Bird" @@ -35,6 +41,8 @@ public object DgsConstants { public const val Parents: String = "parents" } + @jakarta.`annotation`.Generated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) + @Generated public object PET { public const val TYPE_NAME: String = "Pet" diff --git a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/interfaceClassWithInterfaceFields/expected/Generated.kt b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/interfaceClassWithInterfaceFields/expected/Generated.kt new file mode 100644 index 000000000..8b1ffa89b --- /dev/null +++ b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/interfaceClassWithInterfaceFields/expected/Generated.kt @@ -0,0 +1,7 @@ +package com.netflix.graphql.dgs.codegen.cases.interfaceClassWithInterfaceFields.expected + +import kotlin.`annotation`.AnnotationRetention +import kotlin.`annotation`.Retention + +@Retention(value = AnnotationRetention.BINARY) +public annotation class Generated diff --git a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/interfaceClassWithInterfaceFields/expected/client/BirdProjection.kt b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/interfaceClassWithInterfaceFields/expected/client/BirdProjection.kt index 1a8ca612f..1897640d3 100644 --- a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/interfaceClassWithInterfaceFields/expected/client/BirdProjection.kt +++ b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/interfaceClassWithInterfaceFields/expected/client/BirdProjection.kt @@ -3,7 +3,11 @@ package com.netflix.graphql.dgs.codegen.cases.interfaceClassWithInterfaceFields. import com.netflix.graphql.dgs.client.codegen.InputValueSerializerInterface import com.netflix.graphql.dgs.codegen.GraphQLProjection import kotlin.String +import com.netflix.graphql.dgs.codegen.cases.interfaceClassWithInterfaceFields.expected.Generated as ExpectedGenerated +import jakarta.`annotation`.Generated as AnnotationGenerated +@AnnotationGenerated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) +@ExpectedGenerated public class BirdProjection( inputValueSerializer: InputValueSerializerInterface? = null, ) : GraphQLProjection(inputValueSerializer) { diff --git a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/interfaceClassWithInterfaceFields/expected/client/DogProjection.kt b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/interfaceClassWithInterfaceFields/expected/client/DogProjection.kt index 209cce175..5e744a765 100644 --- a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/interfaceClassWithInterfaceFields/expected/client/DogProjection.kt +++ b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/interfaceClassWithInterfaceFields/expected/client/DogProjection.kt @@ -3,7 +3,11 @@ package com.netflix.graphql.dgs.codegen.cases.interfaceClassWithInterfaceFields. import com.netflix.graphql.dgs.client.codegen.InputValueSerializerInterface import com.netflix.graphql.dgs.codegen.GraphQLProjection import kotlin.String +import com.netflix.graphql.dgs.codegen.cases.interfaceClassWithInterfaceFields.expected.Generated as ExpectedGenerated +import jakarta.`annotation`.Generated as AnnotationGenerated +@AnnotationGenerated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) +@ExpectedGenerated public class DogProjection( inputValueSerializer: InputValueSerializerInterface? = null, ) : GraphQLProjection(inputValueSerializer) { diff --git a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/interfaceClassWithInterfaceFields/expected/client/PetProjection.kt b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/interfaceClassWithInterfaceFields/expected/client/PetProjection.kt index 0563bdb4c..132234e7a 100644 --- a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/interfaceClassWithInterfaceFields/expected/client/PetProjection.kt +++ b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/interfaceClassWithInterfaceFields/expected/client/PetProjection.kt @@ -3,7 +3,11 @@ package com.netflix.graphql.dgs.codegen.cases.interfaceClassWithInterfaceFields. import com.netflix.graphql.dgs.client.codegen.InputValueSerializerInterface import com.netflix.graphql.dgs.codegen.GraphQLProjection import kotlin.String +import com.netflix.graphql.dgs.codegen.cases.interfaceClassWithInterfaceFields.expected.Generated as ExpectedGenerated +import jakarta.`annotation`.Generated as AnnotationGenerated +@AnnotationGenerated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) +@ExpectedGenerated public class PetProjection( inputValueSerializer: InputValueSerializerInterface? = null, ) : GraphQLProjection(inputValueSerializer) { diff --git a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/interfaceClassWithInterfaceFields/expected/types/Bird.kt b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/interfaceClassWithInterfaceFields/expected/types/Bird.kt index f81708ed3..e0d904022 100644 --- a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/interfaceClassWithInterfaceFields/expected/types/Bird.kt +++ b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/interfaceClassWithInterfaceFields/expected/types/Bird.kt @@ -10,7 +10,11 @@ import kotlin.String import kotlin.Suppress import kotlin.collections.List import kotlin.jvm.JvmName +import com.netflix.graphql.dgs.codegen.cases.interfaceClassWithInterfaceFields.expected.Generated as ExpectedGenerated +import jakarta.`annotation`.Generated as AnnotationGenerated +@AnnotationGenerated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) +@ExpectedGenerated @JsonTypeInfo(use = JsonTypeInfo.Id.NONE) @JsonDeserialize(builder = Bird.Builder::class) public class Bird( @@ -63,6 +67,8 @@ public class Bird( override val parents: List? get() = __parents.invoke() + @AnnotationGenerated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) + @ExpectedGenerated public companion object { private val idDefault: () -> String = { throw IllegalStateException("Field `id` was not requested") } @@ -83,6 +89,8 @@ public class Bird( { throw IllegalStateException("Field `parents` was not requested") } } + @AnnotationGenerated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) + @ExpectedGenerated @JsonPOJOBuilder @JsonIgnoreProperties("__typename") public class Builder { diff --git a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/interfaceClassWithInterfaceFields/expected/types/Dog.kt b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/interfaceClassWithInterfaceFields/expected/types/Dog.kt index 65a7e974e..065af7528 100644 --- a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/interfaceClassWithInterfaceFields/expected/types/Dog.kt +++ b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/interfaceClassWithInterfaceFields/expected/types/Dog.kt @@ -10,7 +10,11 @@ import kotlin.String import kotlin.Suppress import kotlin.collections.List import kotlin.jvm.JvmName +import com.netflix.graphql.dgs.codegen.cases.interfaceClassWithInterfaceFields.expected.Generated as ExpectedGenerated +import jakarta.`annotation`.Generated as AnnotationGenerated +@AnnotationGenerated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) +@ExpectedGenerated @JsonTypeInfo(use = JsonTypeInfo.Id.NONE) @JsonDeserialize(builder = Dog.Builder::class) public class Dog( @@ -63,6 +67,8 @@ public class Dog( override val parents: List? get() = __parents.invoke() + @AnnotationGenerated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) + @ExpectedGenerated public companion object { private val idDefault: () -> String = { throw IllegalStateException("Field `id` was not requested") } @@ -83,6 +89,8 @@ public class Dog( { throw IllegalStateException("Field `parents` was not requested") } } + @AnnotationGenerated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) + @ExpectedGenerated @JsonPOJOBuilder @JsonIgnoreProperties("__typename") public class Builder { diff --git a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/interfaceClassWithInterfaceFields/expected/types/Pet.kt b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/interfaceClassWithInterfaceFields/expected/types/Pet.kt index 178fefcca..0e8fb316c 100644 --- a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/interfaceClassWithInterfaceFields/expected/types/Pet.kt +++ b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/interfaceClassWithInterfaceFields/expected/types/Pet.kt @@ -6,7 +6,11 @@ import kotlin.String import kotlin.Suppress import kotlin.collections.List import kotlin.jvm.JvmName +import com.netflix.graphql.dgs.codegen.cases.interfaceClassWithInterfaceFields.expected.Generated as ExpectedGenerated +import jakarta.`annotation`.Generated as AnnotationGenerated +@AnnotationGenerated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) +@ExpectedGenerated @JsonTypeInfo( use = JsonTypeInfo.Id.NAME, include = JsonTypeInfo.As.PROPERTY, diff --git a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/interfaceClassWithInterfaceFieldsOfDifferentType/expected/DgsClient.kt b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/interfaceClassWithInterfaceFieldsOfDifferentType/expected/DgsClient.kt index a405144d6..2b6152d67 100644 --- a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/interfaceClassWithInterfaceFieldsOfDifferentType/expected/DgsClient.kt +++ b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/interfaceClassWithInterfaceFieldsOfDifferentType/expected/DgsClient.kt @@ -1,3 +1,5 @@ package com.netflix.graphql.dgs.codegen.cases.interfaceClassWithInterfaceFieldsOfDifferentType.expected +@jakarta.`annotation`.Generated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) +@Generated public object DgsClient diff --git a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/interfaceClassWithInterfaceFieldsOfDifferentType/expected/DgsConstants.kt b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/interfaceClassWithInterfaceFieldsOfDifferentType/expected/DgsConstants.kt index 57deafc0c..ad0aa6a07 100644 --- a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/interfaceClassWithInterfaceFieldsOfDifferentType/expected/DgsConstants.kt +++ b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/interfaceClassWithInterfaceFieldsOfDifferentType/expected/DgsConstants.kt @@ -2,7 +2,11 @@ package com.netflix.graphql.dgs.codegen.cases.interfaceClassWithInterfaceFieldsO import kotlin.String +@jakarta.`annotation`.Generated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) +@Generated public object DgsConstants { + @jakarta.`annotation`.Generated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) + @Generated public object VEGETARIAN { public const val TYPE_NAME: String = "Vegetarian" @@ -11,6 +15,8 @@ public object DgsConstants { public const val Vegetables: String = "vegetables" } + @jakarta.`annotation`.Generated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) + @Generated public object DOG { public const val TYPE_NAME: String = "Dog" @@ -19,6 +25,8 @@ public object DgsConstants { public const val Diet: String = "diet" } + @jakarta.`annotation`.Generated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) + @Generated public object PET { public const val TYPE_NAME: String = "Pet" @@ -27,6 +35,8 @@ public object DgsConstants { public const val Diet: String = "diet" } + @jakarta.`annotation`.Generated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) + @Generated public object DIET { public const val TYPE_NAME: String = "Diet" diff --git a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/interfaceClassWithInterfaceFieldsOfDifferentType/expected/Generated.kt b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/interfaceClassWithInterfaceFieldsOfDifferentType/expected/Generated.kt new file mode 100644 index 000000000..8204f268f --- /dev/null +++ b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/interfaceClassWithInterfaceFieldsOfDifferentType/expected/Generated.kt @@ -0,0 +1,7 @@ +package com.netflix.graphql.dgs.codegen.cases.interfaceClassWithInterfaceFieldsOfDifferentType.expected + +import kotlin.`annotation`.AnnotationRetention +import kotlin.`annotation`.Retention + +@Retention(value = AnnotationRetention.BINARY) +public annotation class Generated diff --git a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/interfaceClassWithInterfaceFieldsOfDifferentType/expected/client/DietProjection.kt b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/interfaceClassWithInterfaceFieldsOfDifferentType/expected/client/DietProjection.kt index 0bf773e59..5afcb1c19 100644 --- a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/interfaceClassWithInterfaceFieldsOfDifferentType/expected/client/DietProjection.kt +++ b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/interfaceClassWithInterfaceFieldsOfDifferentType/expected/client/DietProjection.kt @@ -2,7 +2,11 @@ package com.netflix.graphql.dgs.codegen.cases.interfaceClassWithInterfaceFieldsO import com.netflix.graphql.dgs.client.codegen.InputValueSerializerInterface import com.netflix.graphql.dgs.codegen.GraphQLProjection +import com.netflix.graphql.dgs.codegen.cases.interfaceClassWithInterfaceFieldsOfDifferentType.expected.Generated as ExpectedGenerated +import jakarta.`annotation`.Generated as AnnotationGenerated +@AnnotationGenerated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) +@ExpectedGenerated public class DietProjection( inputValueSerializer: InputValueSerializerInterface? = null, ) : GraphQLProjection(inputValueSerializer) { diff --git a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/interfaceClassWithInterfaceFieldsOfDifferentType/expected/client/DogProjection.kt b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/interfaceClassWithInterfaceFieldsOfDifferentType/expected/client/DogProjection.kt index 637f33ab8..a25331a04 100644 --- a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/interfaceClassWithInterfaceFieldsOfDifferentType/expected/client/DogProjection.kt +++ b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/interfaceClassWithInterfaceFieldsOfDifferentType/expected/client/DogProjection.kt @@ -3,7 +3,11 @@ package com.netflix.graphql.dgs.codegen.cases.interfaceClassWithInterfaceFieldsO import com.netflix.graphql.dgs.client.codegen.InputValueSerializerInterface import com.netflix.graphql.dgs.codegen.GraphQLProjection import kotlin.String +import com.netflix.graphql.dgs.codegen.cases.interfaceClassWithInterfaceFieldsOfDifferentType.expected.Generated as ExpectedGenerated +import jakarta.`annotation`.Generated as AnnotationGenerated +@AnnotationGenerated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) +@ExpectedGenerated public class DogProjection( inputValueSerializer: InputValueSerializerInterface? = null, ) : GraphQLProjection(inputValueSerializer) { diff --git a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/interfaceClassWithInterfaceFieldsOfDifferentType/expected/client/PetProjection.kt b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/interfaceClassWithInterfaceFieldsOfDifferentType/expected/client/PetProjection.kt index 53625ba2a..6477cb648 100644 --- a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/interfaceClassWithInterfaceFieldsOfDifferentType/expected/client/PetProjection.kt +++ b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/interfaceClassWithInterfaceFieldsOfDifferentType/expected/client/PetProjection.kt @@ -3,7 +3,11 @@ package com.netflix.graphql.dgs.codegen.cases.interfaceClassWithInterfaceFieldsO import com.netflix.graphql.dgs.client.codegen.InputValueSerializerInterface import com.netflix.graphql.dgs.codegen.GraphQLProjection import kotlin.String +import com.netflix.graphql.dgs.codegen.cases.interfaceClassWithInterfaceFieldsOfDifferentType.expected.Generated as ExpectedGenerated +import jakarta.`annotation`.Generated as AnnotationGenerated +@AnnotationGenerated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) +@ExpectedGenerated public class PetProjection( inputValueSerializer: InputValueSerializerInterface? = null, ) : GraphQLProjection(inputValueSerializer) { diff --git a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/interfaceClassWithInterfaceFieldsOfDifferentType/expected/client/VegetarianProjection.kt b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/interfaceClassWithInterfaceFieldsOfDifferentType/expected/client/VegetarianProjection.kt index 40d997809..6328cb7cf 100644 --- a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/interfaceClassWithInterfaceFieldsOfDifferentType/expected/client/VegetarianProjection.kt +++ b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/interfaceClassWithInterfaceFieldsOfDifferentType/expected/client/VegetarianProjection.kt @@ -2,7 +2,11 @@ package com.netflix.graphql.dgs.codegen.cases.interfaceClassWithInterfaceFieldsO import com.netflix.graphql.dgs.client.codegen.InputValueSerializerInterface import com.netflix.graphql.dgs.codegen.GraphQLProjection +import com.netflix.graphql.dgs.codegen.cases.interfaceClassWithInterfaceFieldsOfDifferentType.expected.Generated as ExpectedGenerated +import jakarta.`annotation`.Generated as AnnotationGenerated +@AnnotationGenerated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) +@ExpectedGenerated public class VegetarianProjection( inputValueSerializer: InputValueSerializerInterface? = null, ) : GraphQLProjection(inputValueSerializer) { diff --git a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/interfaceClassWithInterfaceFieldsOfDifferentType/expected/types/Diet.kt b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/interfaceClassWithInterfaceFieldsOfDifferentType/expected/types/Diet.kt index 969a5e5d3..932397f28 100644 --- a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/interfaceClassWithInterfaceFieldsOfDifferentType/expected/types/Diet.kt +++ b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/interfaceClassWithInterfaceFieldsOfDifferentType/expected/types/Diet.kt @@ -5,7 +5,11 @@ import com.fasterxml.jackson.`annotation`.JsonTypeInfo import kotlin.String import kotlin.Suppress import kotlin.jvm.JvmName +import com.netflix.graphql.dgs.codegen.cases.interfaceClassWithInterfaceFieldsOfDifferentType.expected.Generated as ExpectedGenerated +import jakarta.`annotation`.Generated as AnnotationGenerated +@AnnotationGenerated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) +@ExpectedGenerated @JsonTypeInfo( use = JsonTypeInfo.Id.NAME, include = JsonTypeInfo.As.PROPERTY, diff --git a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/interfaceClassWithInterfaceFieldsOfDifferentType/expected/types/Dog.kt b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/interfaceClassWithInterfaceFieldsOfDifferentType/expected/types/Dog.kt index 3830f43cb..8b59f5ea6 100644 --- a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/interfaceClassWithInterfaceFieldsOfDifferentType/expected/types/Dog.kt +++ b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/interfaceClassWithInterfaceFieldsOfDifferentType/expected/types/Dog.kt @@ -9,7 +9,11 @@ import java.lang.IllegalStateException import kotlin.String import kotlin.Suppress import kotlin.jvm.JvmName +import com.netflix.graphql.dgs.codegen.cases.interfaceClassWithInterfaceFieldsOfDifferentType.expected.Generated as ExpectedGenerated +import jakarta.`annotation`.Generated as AnnotationGenerated +@AnnotationGenerated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) +@ExpectedGenerated @JsonTypeInfo(use = JsonTypeInfo.Id.NONE) @JsonDeserialize(builder = Dog.Builder::class) public class Dog( @@ -30,6 +34,8 @@ public class Dog( override val diet: Vegetarian? get() = __diet.invoke() + @AnnotationGenerated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) + @ExpectedGenerated public companion object { private val nameDefault: () -> String? = { throw IllegalStateException("Field `name` was not requested") } @@ -38,6 +44,8 @@ public class Dog( { throw IllegalStateException("Field `diet` was not requested") } } + @AnnotationGenerated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) + @ExpectedGenerated @JsonPOJOBuilder @JsonIgnoreProperties("__typename") public class Builder { diff --git a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/interfaceClassWithInterfaceFieldsOfDifferentType/expected/types/Pet.kt b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/interfaceClassWithInterfaceFieldsOfDifferentType/expected/types/Pet.kt index 567bad193..6dbbac298 100644 --- a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/interfaceClassWithInterfaceFieldsOfDifferentType/expected/types/Pet.kt +++ b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/interfaceClassWithInterfaceFieldsOfDifferentType/expected/types/Pet.kt @@ -5,7 +5,11 @@ import com.fasterxml.jackson.`annotation`.JsonTypeInfo import kotlin.String import kotlin.Suppress import kotlin.jvm.JvmName +import com.netflix.graphql.dgs.codegen.cases.interfaceClassWithInterfaceFieldsOfDifferentType.expected.Generated as ExpectedGenerated +import jakarta.`annotation`.Generated as AnnotationGenerated +@AnnotationGenerated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) +@ExpectedGenerated @JsonTypeInfo( use = JsonTypeInfo.Id.NAME, include = JsonTypeInfo.As.PROPERTY, diff --git a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/interfaceClassWithInterfaceFieldsOfDifferentType/expected/types/Vegetarian.kt b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/interfaceClassWithInterfaceFieldsOfDifferentType/expected/types/Vegetarian.kt index 6ca7e0553..4459a0e29 100644 --- a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/interfaceClassWithInterfaceFieldsOfDifferentType/expected/types/Vegetarian.kt +++ b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/interfaceClassWithInterfaceFieldsOfDifferentType/expected/types/Vegetarian.kt @@ -10,7 +10,11 @@ import kotlin.String import kotlin.Suppress import kotlin.collections.List import kotlin.jvm.JvmName +import com.netflix.graphql.dgs.codegen.cases.interfaceClassWithInterfaceFieldsOfDifferentType.expected.Generated as ExpectedGenerated +import jakarta.`annotation`.Generated as AnnotationGenerated +@AnnotationGenerated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) +@ExpectedGenerated @JsonTypeInfo(use = JsonTypeInfo.Id.NONE) @JsonDeserialize(builder = Vegetarian.Builder::class) public class Vegetarian( @@ -30,6 +34,8 @@ public class Vegetarian( public val vegetables: List? get() = __vegetables.invoke() + @AnnotationGenerated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) + @ExpectedGenerated public companion object { private val caloriesDefault: () -> String? = { throw IllegalStateException("Field `calories` was not requested") } @@ -38,6 +44,8 @@ public class Vegetarian( { throw IllegalStateException("Field `vegetables` was not requested") } } + @AnnotationGenerated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) + @ExpectedGenerated @JsonPOJOBuilder @JsonIgnoreProperties("__typename") public class Builder { diff --git a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/interfaceClassWithNonNullableFields/expected/DgsClient.kt b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/interfaceClassWithNonNullableFields/expected/DgsClient.kt index 980e4bba8..41acc4e79 100644 --- a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/interfaceClassWithNonNullableFields/expected/DgsClient.kt +++ b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/interfaceClassWithNonNullableFields/expected/DgsClient.kt @@ -6,6 +6,8 @@ import com.netflix.graphql.dgs.codegen.cases.interfaceClassWithNonNullableFields import graphql.language.OperationDefinition import kotlin.String +@jakarta.`annotation`.Generated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) +@Generated public object DgsClient { public fun buildQuery(inputValueSerializer: InputValueSerializerInterface? = null, _projection: QueryProjection.() -> QueryProjection): String = diff --git a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/interfaceClassWithNonNullableFields/expected/DgsConstants.kt b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/interfaceClassWithNonNullableFields/expected/DgsConstants.kt index 7d2d372d0..17ec98895 100644 --- a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/interfaceClassWithNonNullableFields/expected/DgsConstants.kt +++ b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/interfaceClassWithNonNullableFields/expected/DgsConstants.kt @@ -2,15 +2,21 @@ package com.netflix.graphql.dgs.codegen.cases.interfaceClassWithNonNullableField import kotlin.String +@jakarta.`annotation`.Generated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) +@Generated public object DgsConstants { public const val QUERY_TYPE: String = "Query" + @jakarta.`annotation`.Generated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) + @Generated public object QUERY { public const val TYPE_NAME: String = "Query" public const val People: String = "people" } + @jakarta.`annotation`.Generated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) + @Generated public object EMPLOYEE { public const val TYPE_NAME: String = "Employee" @@ -21,6 +27,8 @@ public object DgsConstants { public const val Company: String = "company" } + @jakarta.`annotation`.Generated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) + @Generated public object PERSON { public const val TYPE_NAME: String = "Person" diff --git a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/interfaceClassWithNonNullableFields/expected/Generated.kt b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/interfaceClassWithNonNullableFields/expected/Generated.kt new file mode 100644 index 000000000..078b1eff7 --- /dev/null +++ b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/interfaceClassWithNonNullableFields/expected/Generated.kt @@ -0,0 +1,7 @@ +package com.netflix.graphql.dgs.codegen.cases.interfaceClassWithNonNullableFields.expected + +import kotlin.`annotation`.AnnotationRetention +import kotlin.`annotation`.Retention + +@Retention(value = AnnotationRetention.BINARY) +public annotation class Generated diff --git a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/interfaceClassWithNonNullableFields/expected/client/EmployeeProjection.kt b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/interfaceClassWithNonNullableFields/expected/client/EmployeeProjection.kt index 17050a084..49b214b11 100644 --- a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/interfaceClassWithNonNullableFields/expected/client/EmployeeProjection.kt +++ b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/interfaceClassWithNonNullableFields/expected/client/EmployeeProjection.kt @@ -2,7 +2,11 @@ package com.netflix.graphql.dgs.codegen.cases.interfaceClassWithNonNullableField import com.netflix.graphql.dgs.client.codegen.InputValueSerializerInterface import com.netflix.graphql.dgs.codegen.GraphQLProjection +import com.netflix.graphql.dgs.codegen.cases.interfaceClassWithNonNullableFields.expected.Generated as ExpectedGenerated +import jakarta.`annotation`.Generated as AnnotationGenerated +@AnnotationGenerated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) +@ExpectedGenerated public class EmployeeProjection( inputValueSerializer: InputValueSerializerInterface? = null, ) : GraphQLProjection(inputValueSerializer) { diff --git a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/interfaceClassWithNonNullableFields/expected/client/PersonProjection.kt b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/interfaceClassWithNonNullableFields/expected/client/PersonProjection.kt index b918c94df..55434c8ea 100644 --- a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/interfaceClassWithNonNullableFields/expected/client/PersonProjection.kt +++ b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/interfaceClassWithNonNullableFields/expected/client/PersonProjection.kt @@ -2,7 +2,11 @@ package com.netflix.graphql.dgs.codegen.cases.interfaceClassWithNonNullableField import com.netflix.graphql.dgs.client.codegen.InputValueSerializerInterface import com.netflix.graphql.dgs.codegen.GraphQLProjection +import com.netflix.graphql.dgs.codegen.cases.interfaceClassWithNonNullableFields.expected.Generated as ExpectedGenerated +import jakarta.`annotation`.Generated as AnnotationGenerated +@AnnotationGenerated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) +@ExpectedGenerated public class PersonProjection( inputValueSerializer: InputValueSerializerInterface? = null, ) : GraphQLProjection(inputValueSerializer) { diff --git a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/interfaceClassWithNonNullableFields/expected/client/QueryProjection.kt b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/interfaceClassWithNonNullableFields/expected/client/QueryProjection.kt index 2589235f5..b9ab47c23 100644 --- a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/interfaceClassWithNonNullableFields/expected/client/QueryProjection.kt +++ b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/interfaceClassWithNonNullableFields/expected/client/QueryProjection.kt @@ -3,7 +3,11 @@ package com.netflix.graphql.dgs.codegen.cases.interfaceClassWithNonNullableField import com.netflix.graphql.dgs.client.codegen.InputValueSerializerInterface import com.netflix.graphql.dgs.codegen.GraphQLProjection import kotlin.String +import com.netflix.graphql.dgs.codegen.cases.interfaceClassWithNonNullableFields.expected.Generated as ExpectedGenerated +import jakarta.`annotation`.Generated as AnnotationGenerated +@AnnotationGenerated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) +@ExpectedGenerated public class QueryProjection( inputValueSerializer: InputValueSerializerInterface? = null, ) : GraphQLProjection(inputValueSerializer) { diff --git a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/interfaceClassWithNonNullableFields/expected/types/Employee.kt b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/interfaceClassWithNonNullableFields/expected/types/Employee.kt index 1c58168e3..e848b08d1 100644 --- a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/interfaceClassWithNonNullableFields/expected/types/Employee.kt +++ b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/interfaceClassWithNonNullableFields/expected/types/Employee.kt @@ -9,7 +9,11 @@ import java.lang.IllegalStateException import kotlin.String import kotlin.Suppress import kotlin.jvm.JvmName +import com.netflix.graphql.dgs.codegen.cases.interfaceClassWithNonNullableFields.expected.Generated as ExpectedGenerated +import jakarta.`annotation`.Generated as AnnotationGenerated +@AnnotationGenerated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) +@ExpectedGenerated @JsonTypeInfo(use = JsonTypeInfo.Id.NONE) @JsonDeserialize(builder = Employee.Builder::class) public class Employee( @@ -37,6 +41,8 @@ public class Employee( public val company: String? get() = __company.invoke() + @AnnotationGenerated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) + @ExpectedGenerated public companion object { private val firstnameDefault: () -> String = { throw IllegalStateException("Field `firstname` was not requested") } @@ -48,6 +54,8 @@ public class Employee( { throw IllegalStateException("Field `company` was not requested") } } + @AnnotationGenerated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) + @ExpectedGenerated @JsonPOJOBuilder @JsonIgnoreProperties("__typename") public class Builder { diff --git a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/interfaceClassWithNonNullableFields/expected/types/Person.kt b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/interfaceClassWithNonNullableFields/expected/types/Person.kt index d897d964c..fc5e2744a 100644 --- a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/interfaceClassWithNonNullableFields/expected/types/Person.kt +++ b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/interfaceClassWithNonNullableFields/expected/types/Person.kt @@ -5,7 +5,11 @@ import com.fasterxml.jackson.`annotation`.JsonTypeInfo import kotlin.String import kotlin.Suppress import kotlin.jvm.JvmName +import com.netflix.graphql.dgs.codegen.cases.interfaceClassWithNonNullableFields.expected.Generated as ExpectedGenerated +import jakarta.`annotation`.Generated as AnnotationGenerated +@AnnotationGenerated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) +@ExpectedGenerated @JsonTypeInfo( use = JsonTypeInfo.Id.NAME, include = JsonTypeInfo.As.PROPERTY, diff --git a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/interfaceClassWithNonNullableFields/expected/types/Query.kt b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/interfaceClassWithNonNullableFields/expected/types/Query.kt index c974265c5..c4e964c78 100644 --- a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/interfaceClassWithNonNullableFields/expected/types/Query.kt +++ b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/interfaceClassWithNonNullableFields/expected/types/Query.kt @@ -8,7 +8,11 @@ import com.fasterxml.jackson.databind.`annotation`.JsonPOJOBuilder import java.lang.IllegalStateException import kotlin.collections.List import kotlin.jvm.JvmName +import com.netflix.graphql.dgs.codegen.cases.interfaceClassWithNonNullableFields.expected.Generated as ExpectedGenerated +import jakarta.`annotation`.Generated as AnnotationGenerated +@AnnotationGenerated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) +@ExpectedGenerated @JsonTypeInfo(use = JsonTypeInfo.Id.NONE) @JsonDeserialize(builder = Query.Builder::class) public class Query( @@ -20,11 +24,15 @@ public class Query( public val people: List? get() = __people.invoke() + @AnnotationGenerated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) + @ExpectedGenerated public companion object { private val peopleDefault: () -> List? = { throw IllegalStateException("Field `people` was not requested") } } + @AnnotationGenerated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) + @ExpectedGenerated @JsonPOJOBuilder @JsonIgnoreProperties("__typename") public class Builder { diff --git a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/interfaceDocs/expected/DgsClient.kt b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/interfaceDocs/expected/DgsClient.kt index fae63c392..4ce9c1457 100644 --- a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/interfaceDocs/expected/DgsClient.kt +++ b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/interfaceDocs/expected/DgsClient.kt @@ -1,3 +1,5 @@ package com.netflix.graphql.dgs.codegen.cases.interfaceDocs.expected +@jakarta.`annotation`.Generated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) +@Generated public object DgsClient diff --git a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/interfaceDocs/expected/DgsConstants.kt b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/interfaceDocs/expected/DgsConstants.kt index b9161d2d0..8174490fc 100644 --- a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/interfaceDocs/expected/DgsConstants.kt +++ b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/interfaceDocs/expected/DgsConstants.kt @@ -2,7 +2,11 @@ package com.netflix.graphql.dgs.codegen.cases.interfaceDocs.expected import kotlin.String +@jakarta.`annotation`.Generated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) +@Generated public object DgsConstants { + @jakarta.`annotation`.Generated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) + @Generated public object TITLED { public const val TYPE_NAME: String = "Titled" diff --git a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/interfaceDocs/expected/Generated.kt b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/interfaceDocs/expected/Generated.kt new file mode 100644 index 000000000..1ccd5b164 --- /dev/null +++ b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/interfaceDocs/expected/Generated.kt @@ -0,0 +1,7 @@ +package com.netflix.graphql.dgs.codegen.cases.interfaceDocs.expected + +import kotlin.`annotation`.AnnotationRetention +import kotlin.`annotation`.Retention + +@Retention(value = AnnotationRetention.BINARY) +public annotation class Generated diff --git a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/interfaceDocs/expected/client/TitledProjection.kt b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/interfaceDocs/expected/client/TitledProjection.kt index dffc6bc79..51c25f3b6 100644 --- a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/interfaceDocs/expected/client/TitledProjection.kt +++ b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/interfaceDocs/expected/client/TitledProjection.kt @@ -2,7 +2,11 @@ package com.netflix.graphql.dgs.codegen.cases.interfaceDocs.expected.client import com.netflix.graphql.dgs.client.codegen.InputValueSerializerInterface import com.netflix.graphql.dgs.codegen.GraphQLProjection +import com.netflix.graphql.dgs.codegen.cases.interfaceDocs.expected.Generated as ExpectedGenerated +import jakarta.`annotation`.Generated as AnnotationGenerated +@AnnotationGenerated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) +@ExpectedGenerated public class TitledProjection( inputValueSerializer: InputValueSerializerInterface? = null, ) : GraphQLProjection(inputValueSerializer) { diff --git a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/interfaceDocs/expected/types/Titled.kt b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/interfaceDocs/expected/types/Titled.kt index 2b7cea2f0..c3f097c05 100644 --- a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/interfaceDocs/expected/types/Titled.kt +++ b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/interfaceDocs/expected/types/Titled.kt @@ -4,10 +4,14 @@ import com.fasterxml.jackson.`annotation`.JsonTypeInfo import kotlin.String import kotlin.Suppress import kotlin.jvm.JvmName +import com.netflix.graphql.dgs.codegen.cases.interfaceDocs.expected.Generated as ExpectedGenerated +import jakarta.`annotation`.Generated as AnnotationGenerated /** * Anything with a title! */ +@AnnotationGenerated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) +@ExpectedGenerated @JsonTypeInfo( use = JsonTypeInfo.Id.NAME, include = JsonTypeInfo.As.PROPERTY, diff --git a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/interfaceFieldsDocs/expected/DgsClient.kt b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/interfaceFieldsDocs/expected/DgsClient.kt index 0cb09c09d..344ed9f1f 100644 --- a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/interfaceFieldsDocs/expected/DgsClient.kt +++ b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/interfaceFieldsDocs/expected/DgsClient.kt @@ -1,3 +1,5 @@ package com.netflix.graphql.dgs.codegen.cases.interfaceFieldsDocs.expected +@jakarta.`annotation`.Generated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) +@Generated public object DgsClient diff --git a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/interfaceFieldsDocs/expected/DgsConstants.kt b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/interfaceFieldsDocs/expected/DgsConstants.kt index 9a263822e..773471a66 100644 --- a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/interfaceFieldsDocs/expected/DgsConstants.kt +++ b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/interfaceFieldsDocs/expected/DgsConstants.kt @@ -2,7 +2,11 @@ package com.netflix.graphql.dgs.codegen.cases.interfaceFieldsDocs.expected import kotlin.String +@jakarta.`annotation`.Generated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) +@Generated public object DgsConstants { + @jakarta.`annotation`.Generated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) + @Generated public object TITLED { public const val TYPE_NAME: String = "Titled" diff --git a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/interfaceFieldsDocs/expected/Generated.kt b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/interfaceFieldsDocs/expected/Generated.kt new file mode 100644 index 000000000..b9221d907 --- /dev/null +++ b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/interfaceFieldsDocs/expected/Generated.kt @@ -0,0 +1,7 @@ +package com.netflix.graphql.dgs.codegen.cases.interfaceFieldsDocs.expected + +import kotlin.`annotation`.AnnotationRetention +import kotlin.`annotation`.Retention + +@Retention(value = AnnotationRetention.BINARY) +public annotation class Generated diff --git a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/interfaceFieldsDocs/expected/client/TitledProjection.kt b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/interfaceFieldsDocs/expected/client/TitledProjection.kt index c8012532b..223937f60 100644 --- a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/interfaceFieldsDocs/expected/client/TitledProjection.kt +++ b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/interfaceFieldsDocs/expected/client/TitledProjection.kt @@ -2,7 +2,11 @@ package com.netflix.graphql.dgs.codegen.cases.interfaceFieldsDocs.expected.clien import com.netflix.graphql.dgs.client.codegen.InputValueSerializerInterface import com.netflix.graphql.dgs.codegen.GraphQLProjection +import com.netflix.graphql.dgs.codegen.cases.interfaceFieldsDocs.expected.Generated as ExpectedGenerated +import jakarta.`annotation`.Generated as AnnotationGenerated +@AnnotationGenerated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) +@ExpectedGenerated public class TitledProjection( inputValueSerializer: InputValueSerializerInterface? = null, ) : GraphQLProjection(inputValueSerializer) { diff --git a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/interfaceFieldsDocs/expected/types/Titled.kt b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/interfaceFieldsDocs/expected/types/Titled.kt index 77392d68b..2c6341eee 100644 --- a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/interfaceFieldsDocs/expected/types/Titled.kt +++ b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/interfaceFieldsDocs/expected/types/Titled.kt @@ -4,7 +4,11 @@ import com.fasterxml.jackson.`annotation`.JsonTypeInfo import kotlin.String import kotlin.Suppress import kotlin.jvm.JvmName +import com.netflix.graphql.dgs.codegen.cases.interfaceFieldsDocs.expected.Generated as ExpectedGenerated +import jakarta.`annotation`.Generated as AnnotationGenerated +@AnnotationGenerated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) +@ExpectedGenerated @JsonTypeInfo( use = JsonTypeInfo.Id.NAME, include = JsonTypeInfo.As.PROPERTY, diff --git a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/interfaceWithInterfaceInheritance/expected/DgsClient.kt b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/interfaceWithInterfaceInheritance/expected/DgsClient.kt index a6a4b3118..39d5c4305 100644 --- a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/interfaceWithInterfaceInheritance/expected/DgsClient.kt +++ b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/interfaceWithInterfaceInheritance/expected/DgsClient.kt @@ -6,6 +6,8 @@ import com.netflix.graphql.dgs.codegen.cases.interfaceWithInterfaceInheritance.e import graphql.language.OperationDefinition import kotlin.String +@jakarta.`annotation`.Generated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) +@Generated public object DgsClient { public fun buildQuery(inputValueSerializer: InputValueSerializerInterface? = null, _projection: QueryProjection.() -> QueryProjection): String = diff --git a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/interfaceWithInterfaceInheritance/expected/DgsConstants.kt b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/interfaceWithInterfaceInheritance/expected/DgsConstants.kt index f3f71371b..a89f62a93 100644 --- a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/interfaceWithInterfaceInheritance/expected/DgsConstants.kt +++ b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/interfaceWithInterfaceInheritance/expected/DgsConstants.kt @@ -2,27 +2,37 @@ package com.netflix.graphql.dgs.codegen.cases.interfaceWithInterfaceInheritance. import kotlin.String +@jakarta.`annotation`.Generated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) +@Generated public object DgsConstants { public const val QUERY_TYPE: String = "Query" + @jakarta.`annotation`.Generated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) + @Generated public object QUERY { public const val TYPE_NAME: String = "Query" public const val Fruits: String = "fruits" } + @jakarta.`annotation`.Generated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) + @Generated public object SEED { public const val TYPE_NAME: String = "Seed" public const val Name: String = "name" } + @jakarta.`annotation`.Generated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) + @Generated public object FRUIT { public const val TYPE_NAME: String = "Fruit" public const val Seeds: String = "seeds" } + @jakarta.`annotation`.Generated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) + @Generated public object STONEFRUIT { public const val TYPE_NAME: String = "StoneFruit" diff --git a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/interfaceWithInterfaceInheritance/expected/Generated.kt b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/interfaceWithInterfaceInheritance/expected/Generated.kt new file mode 100644 index 000000000..f17102a2d --- /dev/null +++ b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/interfaceWithInterfaceInheritance/expected/Generated.kt @@ -0,0 +1,7 @@ +package com.netflix.graphql.dgs.codegen.cases.interfaceWithInterfaceInheritance.expected + +import kotlin.`annotation`.AnnotationRetention +import kotlin.`annotation`.Retention + +@Retention(value = AnnotationRetention.BINARY) +public annotation class Generated diff --git a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/interfaceWithInterfaceInheritance/expected/client/FruitProjection.kt b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/interfaceWithInterfaceInheritance/expected/client/FruitProjection.kt index 9b9201b66..566195644 100644 --- a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/interfaceWithInterfaceInheritance/expected/client/FruitProjection.kt +++ b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/interfaceWithInterfaceInheritance/expected/client/FruitProjection.kt @@ -3,7 +3,11 @@ package com.netflix.graphql.dgs.codegen.cases.interfaceWithInterfaceInheritance. import com.netflix.graphql.dgs.client.codegen.InputValueSerializerInterface import com.netflix.graphql.dgs.codegen.GraphQLProjection import kotlin.String +import com.netflix.graphql.dgs.codegen.cases.interfaceWithInterfaceInheritance.expected.Generated as ExpectedGenerated +import jakarta.`annotation`.Generated as AnnotationGenerated +@AnnotationGenerated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) +@ExpectedGenerated public class FruitProjection( inputValueSerializer: InputValueSerializerInterface? = null, ) : GraphQLProjection(inputValueSerializer) { diff --git a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/interfaceWithInterfaceInheritance/expected/client/QueryProjection.kt b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/interfaceWithInterfaceInheritance/expected/client/QueryProjection.kt index 102203ef0..2a1c75072 100644 --- a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/interfaceWithInterfaceInheritance/expected/client/QueryProjection.kt +++ b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/interfaceWithInterfaceInheritance/expected/client/QueryProjection.kt @@ -3,7 +3,11 @@ package com.netflix.graphql.dgs.codegen.cases.interfaceWithInterfaceInheritance. import com.netflix.graphql.dgs.client.codegen.InputValueSerializerInterface import com.netflix.graphql.dgs.codegen.GraphQLProjection import kotlin.String +import com.netflix.graphql.dgs.codegen.cases.interfaceWithInterfaceInheritance.expected.Generated as ExpectedGenerated +import jakarta.`annotation`.Generated as AnnotationGenerated +@AnnotationGenerated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) +@ExpectedGenerated public class QueryProjection( inputValueSerializer: InputValueSerializerInterface? = null, ) : GraphQLProjection(inputValueSerializer) { diff --git a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/interfaceWithInterfaceInheritance/expected/client/SeedProjection.kt b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/interfaceWithInterfaceInheritance/expected/client/SeedProjection.kt index b037ff455..cb5b417e0 100644 --- a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/interfaceWithInterfaceInheritance/expected/client/SeedProjection.kt +++ b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/interfaceWithInterfaceInheritance/expected/client/SeedProjection.kt @@ -2,7 +2,11 @@ package com.netflix.graphql.dgs.codegen.cases.interfaceWithInterfaceInheritance. import com.netflix.graphql.dgs.client.codegen.InputValueSerializerInterface import com.netflix.graphql.dgs.codegen.GraphQLProjection +import com.netflix.graphql.dgs.codegen.cases.interfaceWithInterfaceInheritance.expected.Generated as ExpectedGenerated +import jakarta.`annotation`.Generated as AnnotationGenerated +@AnnotationGenerated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) +@ExpectedGenerated public class SeedProjection( inputValueSerializer: InputValueSerializerInterface? = null, ) : GraphQLProjection(inputValueSerializer) { diff --git a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/interfaceWithInterfaceInheritance/expected/client/StoneFruitProjection.kt b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/interfaceWithInterfaceInheritance/expected/client/StoneFruitProjection.kt index 68b786b68..d7c07b9db 100644 --- a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/interfaceWithInterfaceInheritance/expected/client/StoneFruitProjection.kt +++ b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/interfaceWithInterfaceInheritance/expected/client/StoneFruitProjection.kt @@ -3,7 +3,11 @@ package com.netflix.graphql.dgs.codegen.cases.interfaceWithInterfaceInheritance. import com.netflix.graphql.dgs.client.codegen.InputValueSerializerInterface import com.netflix.graphql.dgs.codegen.GraphQLProjection import kotlin.String +import com.netflix.graphql.dgs.codegen.cases.interfaceWithInterfaceInheritance.expected.Generated as ExpectedGenerated +import jakarta.`annotation`.Generated as AnnotationGenerated +@AnnotationGenerated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) +@ExpectedGenerated public class StoneFruitProjection( inputValueSerializer: InputValueSerializerInterface? = null, ) : GraphQLProjection(inputValueSerializer) { diff --git a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/interfaceWithInterfaceInheritance/expected/types/Fruit.kt b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/interfaceWithInterfaceInheritance/expected/types/Fruit.kt index b3d9cec4a..8e0184beb 100644 --- a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/interfaceWithInterfaceInheritance/expected/types/Fruit.kt +++ b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/interfaceWithInterfaceInheritance/expected/types/Fruit.kt @@ -4,7 +4,11 @@ import com.fasterxml.jackson.`annotation`.JsonTypeInfo import kotlin.Suppress import kotlin.collections.List import kotlin.jvm.JvmName +import com.netflix.graphql.dgs.codegen.cases.interfaceWithInterfaceInheritance.expected.Generated as ExpectedGenerated +import jakarta.`annotation`.Generated as AnnotationGenerated +@AnnotationGenerated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) +@ExpectedGenerated @JsonTypeInfo( use = JsonTypeInfo.Id.NAME, include = JsonTypeInfo.As.PROPERTY, diff --git a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/interfaceWithInterfaceInheritance/expected/types/Query.kt b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/interfaceWithInterfaceInheritance/expected/types/Query.kt index 0ac2f70ae..de0be9d57 100644 --- a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/interfaceWithInterfaceInheritance/expected/types/Query.kt +++ b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/interfaceWithInterfaceInheritance/expected/types/Query.kt @@ -8,7 +8,11 @@ import com.fasterxml.jackson.databind.`annotation`.JsonPOJOBuilder import java.lang.IllegalStateException import kotlin.collections.List import kotlin.jvm.JvmName +import com.netflix.graphql.dgs.codegen.cases.interfaceWithInterfaceInheritance.expected.Generated as ExpectedGenerated +import jakarta.`annotation`.Generated as AnnotationGenerated +@AnnotationGenerated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) +@ExpectedGenerated @JsonTypeInfo(use = JsonTypeInfo.Id.NONE) @JsonDeserialize(builder = Query.Builder::class) public class Query( @@ -20,11 +24,15 @@ public class Query( public val fruits: List? get() = __fruits.invoke() + @AnnotationGenerated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) + @ExpectedGenerated public companion object { private val fruitsDefault: () -> List? = { throw IllegalStateException("Field `fruits` was not requested") } } + @AnnotationGenerated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) + @ExpectedGenerated @JsonPOJOBuilder @JsonIgnoreProperties("__typename") public class Builder { diff --git a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/interfaceWithInterfaceInheritance/expected/types/Seed.kt b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/interfaceWithInterfaceInheritance/expected/types/Seed.kt index 59c8904a8..9dea64cd4 100644 --- a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/interfaceWithInterfaceInheritance/expected/types/Seed.kt +++ b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/interfaceWithInterfaceInheritance/expected/types/Seed.kt @@ -8,7 +8,11 @@ import com.fasterxml.jackson.databind.`annotation`.JsonPOJOBuilder import java.lang.IllegalStateException import kotlin.String import kotlin.jvm.JvmName +import com.netflix.graphql.dgs.codegen.cases.interfaceWithInterfaceInheritance.expected.Generated as ExpectedGenerated +import jakarta.`annotation`.Generated as AnnotationGenerated +@AnnotationGenerated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) +@ExpectedGenerated @JsonTypeInfo(use = JsonTypeInfo.Id.NONE) @JsonDeserialize(builder = Seed.Builder::class) public class Seed( @@ -20,11 +24,15 @@ public class Seed( public val name: String? get() = __name.invoke() + @AnnotationGenerated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) + @ExpectedGenerated public companion object { private val nameDefault: () -> String? = { throw IllegalStateException("Field `name` was not requested") } } + @AnnotationGenerated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) + @ExpectedGenerated @JsonPOJOBuilder @JsonIgnoreProperties("__typename") public class Builder { diff --git a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/interfaceWithInterfaceInheritance/expected/types/StoneFruit.kt b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/interfaceWithInterfaceInheritance/expected/types/StoneFruit.kt index c4141bea4..056be5cfa 100644 --- a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/interfaceWithInterfaceInheritance/expected/types/StoneFruit.kt +++ b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/interfaceWithInterfaceInheritance/expected/types/StoneFruit.kt @@ -5,7 +5,11 @@ import kotlin.Boolean import kotlin.Suppress import kotlin.collections.List import kotlin.jvm.JvmName +import com.netflix.graphql.dgs.codegen.cases.interfaceWithInterfaceInheritance.expected.Generated as ExpectedGenerated +import jakarta.`annotation`.Generated as AnnotationGenerated +@AnnotationGenerated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) +@ExpectedGenerated @JsonTypeInfo( use = JsonTypeInfo.Id.NAME, include = JsonTypeInfo.As.PROPERTY, diff --git a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/interfaceWithUnderscoreFields/expected/DgsClient.kt b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/interfaceWithUnderscoreFields/expected/DgsClient.kt index 95979d83e..0280ff01a 100644 --- a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/interfaceWithUnderscoreFields/expected/DgsClient.kt +++ b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/interfaceWithUnderscoreFields/expected/DgsClient.kt @@ -6,6 +6,8 @@ import com.netflix.graphql.dgs.codegen.cases.interfaceWithUnderscoreFields.expec import graphql.language.OperationDefinition import kotlin.String +@jakarta.`annotation`.Generated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) +@Generated public object DgsClient { public fun buildQuery(inputValueSerializer: InputValueSerializerInterface? = null, _projection: QueryProjection.() -> QueryProjection): String = diff --git a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/interfaceWithUnderscoreFields/expected/DgsConstants.kt b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/interfaceWithUnderscoreFields/expected/DgsConstants.kt index 960640425..f2fa37bf8 100644 --- a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/interfaceWithUnderscoreFields/expected/DgsConstants.kt +++ b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/interfaceWithUnderscoreFields/expected/DgsConstants.kt @@ -2,15 +2,21 @@ package com.netflix.graphql.dgs.codegen.cases.interfaceWithUnderscoreFields.expe import kotlin.String +@jakarta.`annotation`.Generated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) +@Generated public object DgsConstants { public const val QUERY_TYPE: String = "Query" + @jakarta.`annotation`.Generated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) + @Generated public object QUERY { public const val TYPE_NAME: String = "Query" public const val Is: String = "is" } + @jakarta.`annotation`.Generated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) + @Generated public object T { public const val TYPE_NAME: String = "T" @@ -19,6 +25,8 @@ public object DgsConstants { public const val Id: String = "id" } + @jakarta.`annotation`.Generated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) + @Generated public object I { public const val TYPE_NAME: String = "I" diff --git a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/interfaceWithUnderscoreFields/expected/Generated.kt b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/interfaceWithUnderscoreFields/expected/Generated.kt new file mode 100644 index 000000000..05d728d85 --- /dev/null +++ b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/interfaceWithUnderscoreFields/expected/Generated.kt @@ -0,0 +1,7 @@ +package com.netflix.graphql.dgs.codegen.cases.interfaceWithUnderscoreFields.expected + +import kotlin.`annotation`.AnnotationRetention +import kotlin.`annotation`.Retention + +@Retention(value = AnnotationRetention.BINARY) +public annotation class Generated diff --git a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/interfaceWithUnderscoreFields/expected/client/IProjection.kt b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/interfaceWithUnderscoreFields/expected/client/IProjection.kt index 96585c3c8..be86b5c90 100644 --- a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/interfaceWithUnderscoreFields/expected/client/IProjection.kt +++ b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/interfaceWithUnderscoreFields/expected/client/IProjection.kt @@ -2,7 +2,11 @@ package com.netflix.graphql.dgs.codegen.cases.interfaceWithUnderscoreFields.expe import com.netflix.graphql.dgs.client.codegen.InputValueSerializerInterface import com.netflix.graphql.dgs.codegen.GraphQLProjection +import com.netflix.graphql.dgs.codegen.cases.interfaceWithUnderscoreFields.expected.Generated as ExpectedGenerated +import jakarta.`annotation`.Generated as AnnotationGenerated +@AnnotationGenerated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) +@ExpectedGenerated public class IProjection( inputValueSerializer: InputValueSerializerInterface? = null, ) : GraphQLProjection(inputValueSerializer) { diff --git a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/interfaceWithUnderscoreFields/expected/client/QueryProjection.kt b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/interfaceWithUnderscoreFields/expected/client/QueryProjection.kt index 1d5e52431..b6853990f 100644 --- a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/interfaceWithUnderscoreFields/expected/client/QueryProjection.kt +++ b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/interfaceWithUnderscoreFields/expected/client/QueryProjection.kt @@ -3,7 +3,11 @@ package com.netflix.graphql.dgs.codegen.cases.interfaceWithUnderscoreFields.expe import com.netflix.graphql.dgs.client.codegen.InputValueSerializerInterface import com.netflix.graphql.dgs.codegen.GraphQLProjection import kotlin.String +import com.netflix.graphql.dgs.codegen.cases.interfaceWithUnderscoreFields.expected.Generated as ExpectedGenerated +import jakarta.`annotation`.Generated as AnnotationGenerated +@AnnotationGenerated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) +@ExpectedGenerated public class QueryProjection( inputValueSerializer: InputValueSerializerInterface? = null, ) : GraphQLProjection(inputValueSerializer) { diff --git a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/interfaceWithUnderscoreFields/expected/client/TProjection.kt b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/interfaceWithUnderscoreFields/expected/client/TProjection.kt index fb1d2a260..fc1e91083 100644 --- a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/interfaceWithUnderscoreFields/expected/client/TProjection.kt +++ b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/interfaceWithUnderscoreFields/expected/client/TProjection.kt @@ -2,7 +2,11 @@ package com.netflix.graphql.dgs.codegen.cases.interfaceWithUnderscoreFields.expe import com.netflix.graphql.dgs.client.codegen.InputValueSerializerInterface import com.netflix.graphql.dgs.codegen.GraphQLProjection +import com.netflix.graphql.dgs.codegen.cases.interfaceWithUnderscoreFields.expected.Generated as ExpectedGenerated +import jakarta.`annotation`.Generated as AnnotationGenerated +@AnnotationGenerated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) +@ExpectedGenerated public class TProjection( inputValueSerializer: InputValueSerializerInterface? = null, ) : GraphQLProjection(inputValueSerializer) { diff --git a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/interfaceWithUnderscoreFields/expected/types/I.kt b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/interfaceWithUnderscoreFields/expected/types/I.kt index 684afd187..1f20cde76 100644 --- a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/interfaceWithUnderscoreFields/expected/types/I.kt +++ b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/interfaceWithUnderscoreFields/expected/types/I.kt @@ -5,7 +5,11 @@ import com.fasterxml.jackson.`annotation`.JsonTypeInfo import kotlin.String import kotlin.Suppress import kotlin.jvm.JvmName +import com.netflix.graphql.dgs.codegen.cases.interfaceWithUnderscoreFields.expected.Generated as ExpectedGenerated +import jakarta.`annotation`.Generated as AnnotationGenerated +@AnnotationGenerated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) +@ExpectedGenerated @JsonTypeInfo( use = JsonTypeInfo.Id.NAME, include = JsonTypeInfo.As.PROPERTY, diff --git a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/interfaceWithUnderscoreFields/expected/types/Query.kt b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/interfaceWithUnderscoreFields/expected/types/Query.kt index 1782c52d1..7c49aa907 100644 --- a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/interfaceWithUnderscoreFields/expected/types/Query.kt +++ b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/interfaceWithUnderscoreFields/expected/types/Query.kt @@ -8,7 +8,11 @@ import com.fasterxml.jackson.databind.`annotation`.JsonPOJOBuilder import java.lang.IllegalStateException import kotlin.collections.List import kotlin.jvm.JvmName +import com.netflix.graphql.dgs.codegen.cases.interfaceWithUnderscoreFields.expected.Generated as ExpectedGenerated +import jakarta.`annotation`.Generated as AnnotationGenerated +@AnnotationGenerated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) +@ExpectedGenerated @JsonTypeInfo(use = JsonTypeInfo.Id.NONE) @JsonDeserialize(builder = Query.Builder::class) public class Query( @@ -20,11 +24,15 @@ public class Query( public val `is`: List? get() = __is.invoke() + @AnnotationGenerated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) + @ExpectedGenerated public companion object { private val isDefault: () -> List? = { throw IllegalStateException("Field `is` was not requested") } } + @AnnotationGenerated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) + @ExpectedGenerated @JsonPOJOBuilder @JsonIgnoreProperties("__typename") public class Builder { diff --git a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/interfaceWithUnderscoreFields/expected/types/T.kt b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/interfaceWithUnderscoreFields/expected/types/T.kt index d67a28971..cc077c508 100644 --- a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/interfaceWithUnderscoreFields/expected/types/T.kt +++ b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/interfaceWithUnderscoreFields/expected/types/T.kt @@ -9,7 +9,11 @@ import java.lang.IllegalStateException import kotlin.String import kotlin.Suppress import kotlin.jvm.JvmName +import com.netflix.graphql.dgs.codegen.cases.interfaceWithUnderscoreFields.expected.Generated as ExpectedGenerated +import jakarta.`annotation`.Generated as AnnotationGenerated +@AnnotationGenerated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) +@ExpectedGenerated @JsonTypeInfo(use = JsonTypeInfo.Id.NONE) @JsonDeserialize(builder = T.Builder::class) public class T( @@ -29,6 +33,8 @@ public class T( public val id: String? get() = __id.invoke() + @AnnotationGenerated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) + @ExpectedGenerated public companion object { private val _idDefault: () -> String? = { throw IllegalStateException("Field `_id` was not requested") } @@ -37,6 +43,8 @@ public class T( { throw IllegalStateException("Field `id` was not requested") } } + @AnnotationGenerated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) + @ExpectedGenerated @JsonPOJOBuilder @JsonIgnoreProperties("__typename") public class Builder { diff --git a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/projectionWithEnum/expected/DgsClient.kt b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/projectionWithEnum/expected/DgsClient.kt index b338d636f..adbd9ead3 100644 --- a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/projectionWithEnum/expected/DgsClient.kt +++ b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/projectionWithEnum/expected/DgsClient.kt @@ -6,6 +6,8 @@ import com.netflix.graphql.dgs.codegen.cases.projectionWithEnum.expected.client. import graphql.language.OperationDefinition import kotlin.String +@jakarta.`annotation`.Generated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) +@Generated public object DgsClient { public fun buildQuery(inputValueSerializer: InputValueSerializerInterface? = null, _projection: QueryProjection.() -> QueryProjection): String = diff --git a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/projectionWithEnum/expected/DgsConstants.kt b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/projectionWithEnum/expected/DgsConstants.kt index 13f93803f..5ca78b489 100644 --- a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/projectionWithEnum/expected/DgsConstants.kt +++ b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/projectionWithEnum/expected/DgsConstants.kt @@ -2,9 +2,13 @@ package com.netflix.graphql.dgs.codegen.cases.projectionWithEnum.expected import kotlin.String +@jakarta.`annotation`.Generated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) +@Generated public object DgsConstants { public const val QUERY_TYPE: String = "Query" + @jakarta.`annotation`.Generated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) + @Generated public object QUERY { public const val TYPE_NAME: String = "Query" diff --git a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/projectionWithEnum/expected/Generated.kt b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/projectionWithEnum/expected/Generated.kt new file mode 100644 index 000000000..286de5394 --- /dev/null +++ b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/projectionWithEnum/expected/Generated.kt @@ -0,0 +1,7 @@ +package com.netflix.graphql.dgs.codegen.cases.projectionWithEnum.expected + +import kotlin.`annotation`.AnnotationRetention +import kotlin.`annotation`.Retention + +@Retention(value = AnnotationRetention.BINARY) +public annotation class Generated diff --git a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/projectionWithEnum/expected/client/QueryProjection.kt b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/projectionWithEnum/expected/client/QueryProjection.kt index 1d8f7606e..5f66db1b2 100644 --- a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/projectionWithEnum/expected/client/QueryProjection.kt +++ b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/projectionWithEnum/expected/client/QueryProjection.kt @@ -2,7 +2,11 @@ package com.netflix.graphql.dgs.codegen.cases.projectionWithEnum.expected.client import com.netflix.graphql.dgs.client.codegen.InputValueSerializerInterface import com.netflix.graphql.dgs.codegen.GraphQLProjection +import com.netflix.graphql.dgs.codegen.cases.projectionWithEnum.expected.Generated as ExpectedGenerated +import jakarta.`annotation`.Generated as AnnotationGenerated +@AnnotationGenerated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) +@ExpectedGenerated public class QueryProjection( inputValueSerializer: InputValueSerializerInterface? = null, ) : GraphQLProjection(inputValueSerializer) { diff --git a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/projectionWithEnum/expected/types/E.kt b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/projectionWithEnum/expected/types/E.kt index 7b7d27d36..15323a506 100644 --- a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/projectionWithEnum/expected/types/E.kt +++ b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/projectionWithEnum/expected/types/E.kt @@ -1,8 +1,17 @@ package com.netflix.graphql.dgs.codegen.cases.projectionWithEnum.expected.types +import com.netflix.graphql.dgs.codegen.cases.projectionWithEnum.expected.Generated as ExpectedGenerated +import jakarta.`annotation`.Generated as AnnotationGenerated + +@AnnotationGenerated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) +@ExpectedGenerated public enum class E { + @AnnotationGenerated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) + @ExpectedGenerated V, ; + @AnnotationGenerated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) + @ExpectedGenerated public companion object } diff --git a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/projectionWithEnum/expected/types/Query.kt b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/projectionWithEnum/expected/types/Query.kt index 6379548ec..247de179b 100644 --- a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/projectionWithEnum/expected/types/Query.kt +++ b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/projectionWithEnum/expected/types/Query.kt @@ -8,7 +8,11 @@ import com.fasterxml.jackson.databind.`annotation`.JsonPOJOBuilder import java.lang.IllegalStateException import kotlin.collections.List import kotlin.jvm.JvmName +import com.netflix.graphql.dgs.codegen.cases.projectionWithEnum.expected.Generated as ExpectedGenerated +import jakarta.`annotation`.Generated as AnnotationGenerated +@AnnotationGenerated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) +@ExpectedGenerated @JsonTypeInfo(use = JsonTypeInfo.Id.NONE) @JsonDeserialize(builder = Query.Builder::class) public class Query( @@ -27,6 +31,8 @@ public class Query( public val es: List? get() = __es.invoke() + @AnnotationGenerated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) + @ExpectedGenerated public companion object { private val eDefault: () -> E? = { throw IllegalStateException("Field `e` was not requested") } @@ -35,6 +41,8 @@ public class Query( { throw IllegalStateException("Field `es` was not requested") } } + @AnnotationGenerated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) + @ExpectedGenerated @JsonPOJOBuilder @JsonIgnoreProperties("__typename") public class Builder { diff --git a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/projectionWithNestedInputs/expected/DgsClient.kt b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/projectionWithNestedInputs/expected/DgsClient.kt index 0b36a5b73..3c2754a2a 100644 --- a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/projectionWithNestedInputs/expected/DgsClient.kt +++ b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/projectionWithNestedInputs/expected/DgsClient.kt @@ -6,6 +6,8 @@ import com.netflix.graphql.dgs.codegen.cases.projectionWithNestedInputs.expected import graphql.language.OperationDefinition import kotlin.String +@jakarta.`annotation`.Generated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) +@Generated public object DgsClient { public fun buildQuery(inputValueSerializer: InputValueSerializerInterface? = null, _projection: QueryProjection.() -> QueryProjection): String = diff --git a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/projectionWithNestedInputs/expected/DgsConstants.kt b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/projectionWithNestedInputs/expected/DgsConstants.kt index 1f964d375..1d4ca08c5 100644 --- a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/projectionWithNestedInputs/expected/DgsConstants.kt +++ b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/projectionWithNestedInputs/expected/DgsConstants.kt @@ -2,9 +2,13 @@ package com.netflix.graphql.dgs.codegen.cases.projectionWithNestedInputs.expecte import kotlin.String +@jakarta.`annotation`.Generated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) +@Generated public object DgsConstants { public const val QUERY_TYPE: String = "Query" + @jakarta.`annotation`.Generated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) + @Generated public object QUERY { public const val TYPE_NAME: String = "Query" @@ -12,12 +16,16 @@ public object DgsConstants { public const val Q2: String = "q2" + @jakarta.`annotation`.Generated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) + @Generated public object Q1_INPUT_ARGUMENT { public const val Arg1: String = "arg1" public const val Arg2: String = "arg2" } + @jakarta.`annotation`.Generated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) + @Generated public object Q2_INPUT_ARGUMENT { public const val Arg1: String = "arg1" @@ -25,6 +33,8 @@ public object DgsConstants { } } + @jakarta.`annotation`.Generated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) + @Generated public object I1 { public const val TYPE_NAME: String = "I1" @@ -33,6 +43,8 @@ public object DgsConstants { public const val Arg2: String = "arg2" } + @jakarta.`annotation`.Generated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) + @Generated public object I2 { public const val TYPE_NAME: String = "I2" diff --git a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/projectionWithNestedInputs/expected/Generated.kt b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/projectionWithNestedInputs/expected/Generated.kt new file mode 100644 index 000000000..196c0ebcf --- /dev/null +++ b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/projectionWithNestedInputs/expected/Generated.kt @@ -0,0 +1,7 @@ +package com.netflix.graphql.dgs.codegen.cases.projectionWithNestedInputs.expected + +import kotlin.`annotation`.AnnotationRetention +import kotlin.`annotation`.Retention + +@Retention(value = AnnotationRetention.BINARY) +public annotation class Generated diff --git a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/projectionWithNestedInputs/expected/client/QueryProjection.kt b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/projectionWithNestedInputs/expected/client/QueryProjection.kt index afcaeae66..e64d95a15 100644 --- a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/projectionWithNestedInputs/expected/client/QueryProjection.kt +++ b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/projectionWithNestedInputs/expected/client/QueryProjection.kt @@ -5,7 +5,11 @@ import com.netflix.graphql.dgs.codegen.GraphQLProjection import com.netflix.graphql.dgs.codegen.cases.projectionWithNestedInputs.expected.types.I1 import com.netflix.graphql.dgs.codegen.cases.projectionWithNestedInputs.expected.types.I2 import kotlin.String +import com.netflix.graphql.dgs.codegen.cases.projectionWithNestedInputs.expected.Generated as ExpectedGenerated +import jakarta.`annotation`.Generated as AnnotationGenerated +@AnnotationGenerated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) +@ExpectedGenerated public class QueryProjection( inputValueSerializer: InputValueSerializerInterface? = null, ) : GraphQLProjection(inputValueSerializer) { diff --git a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/projectionWithNestedInputs/expected/types/I1.kt b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/projectionWithNestedInputs/expected/types/I1.kt index bbd778aa6..ebb700a14 100644 --- a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/projectionWithNestedInputs/expected/types/I1.kt +++ b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/projectionWithNestedInputs/expected/types/I1.kt @@ -6,7 +6,11 @@ import kotlin.Any import kotlin.Pair import kotlin.String import kotlin.collections.List +import com.netflix.graphql.dgs.codegen.cases.projectionWithNestedInputs.expected.Generated as ExpectedGenerated +import jakarta.`annotation`.Generated as AnnotationGenerated +@AnnotationGenerated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) +@ExpectedGenerated public data class I1( @JsonProperty("arg1") public val arg1: I1? = default("arg1", null), diff --git a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/projectionWithNestedInputs/expected/types/I2.kt b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/projectionWithNestedInputs/expected/types/I2.kt index a7ad40060..2c992f7b0 100644 --- a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/projectionWithNestedInputs/expected/types/I2.kt +++ b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/projectionWithNestedInputs/expected/types/I2.kt @@ -6,7 +6,11 @@ import kotlin.Any import kotlin.Pair import kotlin.String import kotlin.collections.List +import com.netflix.graphql.dgs.codegen.cases.projectionWithNestedInputs.expected.Generated as ExpectedGenerated +import jakarta.`annotation`.Generated as AnnotationGenerated +@AnnotationGenerated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) +@ExpectedGenerated public data class I2( @JsonProperty("arg1") public val arg1: String? = default("arg1", null), diff --git a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/projectionWithNestedInputs/expected/types/Query.kt b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/projectionWithNestedInputs/expected/types/Query.kt index 46a01c25b..e6a9c8756 100644 --- a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/projectionWithNestedInputs/expected/types/Query.kt +++ b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/projectionWithNestedInputs/expected/types/Query.kt @@ -8,7 +8,11 @@ import com.fasterxml.jackson.databind.`annotation`.JsonPOJOBuilder import java.lang.IllegalStateException import kotlin.String import kotlin.jvm.JvmName +import com.netflix.graphql.dgs.codegen.cases.projectionWithNestedInputs.expected.Generated as ExpectedGenerated +import jakarta.`annotation`.Generated as AnnotationGenerated +@AnnotationGenerated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) +@ExpectedGenerated @JsonTypeInfo(use = JsonTypeInfo.Id.NONE) @JsonDeserialize(builder = Query.Builder::class) public class Query( @@ -27,6 +31,8 @@ public class Query( public val q2: String? get() = __q2.invoke() + @AnnotationGenerated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) + @ExpectedGenerated public companion object { private val q1Default: () -> String? = { throw IllegalStateException("Field `q1` was not requested") } @@ -35,6 +41,8 @@ public class Query( { throw IllegalStateException("Field `q2` was not requested") } } + @AnnotationGenerated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) + @ExpectedGenerated @JsonPOJOBuilder @JsonIgnoreProperties("__typename") public class Builder { diff --git a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/projectionWithPrimitiveAndArgs/expected/DgsClient.kt b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/projectionWithPrimitiveAndArgs/expected/DgsClient.kt index 8b26ff585..d71bb2a78 100644 --- a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/projectionWithPrimitiveAndArgs/expected/DgsClient.kt +++ b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/projectionWithPrimitiveAndArgs/expected/DgsClient.kt @@ -6,6 +6,8 @@ import com.netflix.graphql.dgs.codegen.cases.projectionWithPrimitiveAndArgs.expe import graphql.language.OperationDefinition import kotlin.String +@jakarta.`annotation`.Generated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) +@Generated public object DgsClient { public fun buildQuery(inputValueSerializer: InputValueSerializerInterface? = null, _projection: QueryProjection.() -> QueryProjection): String = diff --git a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/projectionWithPrimitiveAndArgs/expected/DgsConstants.kt b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/projectionWithPrimitiveAndArgs/expected/DgsConstants.kt index 62ca4ec57..98569872c 100644 --- a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/projectionWithPrimitiveAndArgs/expected/DgsConstants.kt +++ b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/projectionWithPrimitiveAndArgs/expected/DgsConstants.kt @@ -2,14 +2,20 @@ package com.netflix.graphql.dgs.codegen.cases.projectionWithPrimitiveAndArgs.exp import kotlin.String +@jakarta.`annotation`.Generated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) +@Generated public object DgsConstants { public const val QUERY_TYPE: String = "Query" + @jakarta.`annotation`.Generated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) + @Generated public object QUERY { public const val TYPE_NAME: String = "Query" public const val String: String = "string" + @jakarta.`annotation`.Generated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) + @Generated public object STRING_INPUT_ARGUMENT { public const val A1: String = "a1" @@ -19,6 +25,8 @@ public object DgsConstants { } } + @jakarta.`annotation`.Generated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) + @Generated public object I { public const val TYPE_NAME: String = "I" diff --git a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/projectionWithPrimitiveAndArgs/expected/Generated.kt b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/projectionWithPrimitiveAndArgs/expected/Generated.kt new file mode 100644 index 000000000..3d9455bd5 --- /dev/null +++ b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/projectionWithPrimitiveAndArgs/expected/Generated.kt @@ -0,0 +1,7 @@ +package com.netflix.graphql.dgs.codegen.cases.projectionWithPrimitiveAndArgs.expected + +import kotlin.`annotation`.AnnotationRetention +import kotlin.`annotation`.Retention + +@Retention(value = AnnotationRetention.BINARY) +public annotation class Generated diff --git a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/projectionWithPrimitiveAndArgs/expected/client/QueryProjection.kt b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/projectionWithPrimitiveAndArgs/expected/client/QueryProjection.kt index b39034f8a..c05ac0c13 100644 --- a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/projectionWithPrimitiveAndArgs/expected/client/QueryProjection.kt +++ b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/projectionWithPrimitiveAndArgs/expected/client/QueryProjection.kt @@ -4,7 +4,11 @@ import com.netflix.graphql.dgs.client.codegen.InputValueSerializerInterface import com.netflix.graphql.dgs.codegen.GraphQLProjection import com.netflix.graphql.dgs.codegen.cases.projectionWithPrimitiveAndArgs.expected.types.I import kotlin.String +import com.netflix.graphql.dgs.codegen.cases.projectionWithPrimitiveAndArgs.expected.Generated as ExpectedGenerated +import jakarta.`annotation`.Generated as AnnotationGenerated +@AnnotationGenerated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) +@ExpectedGenerated public class QueryProjection( inputValueSerializer: InputValueSerializerInterface? = null, ) : GraphQLProjection(inputValueSerializer) { diff --git a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/projectionWithPrimitiveAndArgs/expected/types/I.kt b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/projectionWithPrimitiveAndArgs/expected/types/I.kt index ba312d96c..d2abe705a 100644 --- a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/projectionWithPrimitiveAndArgs/expected/types/I.kt +++ b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/projectionWithPrimitiveAndArgs/expected/types/I.kt @@ -6,7 +6,11 @@ import kotlin.Any import kotlin.Pair import kotlin.String import kotlin.collections.List +import com.netflix.graphql.dgs.codegen.cases.projectionWithPrimitiveAndArgs.expected.Generated as ExpectedGenerated +import jakarta.`annotation`.Generated as AnnotationGenerated +@AnnotationGenerated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) +@ExpectedGenerated public data class I( @JsonProperty("arg") public val arg: String? = default("arg", null), diff --git a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/projectionWithPrimitiveAndArgs/expected/types/Query.kt b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/projectionWithPrimitiveAndArgs/expected/types/Query.kt index 93c4f515c..a0e2607b6 100644 --- a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/projectionWithPrimitiveAndArgs/expected/types/Query.kt +++ b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/projectionWithPrimitiveAndArgs/expected/types/Query.kt @@ -8,7 +8,11 @@ import com.fasterxml.jackson.databind.`annotation`.JsonPOJOBuilder import java.lang.IllegalStateException import kotlin.String import kotlin.jvm.JvmName +import com.netflix.graphql.dgs.codegen.cases.projectionWithPrimitiveAndArgs.expected.Generated as ExpectedGenerated +import jakarta.`annotation`.Generated as AnnotationGenerated +@AnnotationGenerated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) +@ExpectedGenerated @JsonTypeInfo(use = JsonTypeInfo.Id.NONE) @JsonDeserialize(builder = Query.Builder::class) public class Query( @@ -20,11 +24,15 @@ public class Query( public val string: String? get() = __string.invoke() + @AnnotationGenerated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) + @ExpectedGenerated public companion object { private val stringDefault: () -> String? = { throw IllegalStateException("Field `string` was not requested") } } + @AnnotationGenerated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) + @ExpectedGenerated @JsonPOJOBuilder @JsonIgnoreProperties("__typename") public class Builder { diff --git a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/projectionWithPrimitives/expected/DgsClient.kt b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/projectionWithPrimitives/expected/DgsClient.kt index ed57667de..fb0579155 100644 --- a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/projectionWithPrimitives/expected/DgsClient.kt +++ b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/projectionWithPrimitives/expected/DgsClient.kt @@ -6,6 +6,8 @@ import com.netflix.graphql.dgs.codegen.cases.projectionWithPrimitives.expected.c import graphql.language.OperationDefinition import kotlin.String +@jakarta.`annotation`.Generated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) +@Generated public object DgsClient { public fun buildQuery(inputValueSerializer: InputValueSerializerInterface? = null, _projection: QueryProjection.() -> QueryProjection): String = diff --git a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/projectionWithPrimitives/expected/DgsConstants.kt b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/projectionWithPrimitives/expected/DgsConstants.kt index 261ed06ad..318d57ed3 100644 --- a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/projectionWithPrimitives/expected/DgsConstants.kt +++ b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/projectionWithPrimitives/expected/DgsConstants.kt @@ -2,9 +2,13 @@ package com.netflix.graphql.dgs.codegen.cases.projectionWithPrimitives.expected import kotlin.String +@jakarta.`annotation`.Generated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) +@Generated public object DgsConstants { public const val QUERY_TYPE: String = "Query" + @jakarta.`annotation`.Generated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) + @Generated public object QUERY { public const val TYPE_NAME: String = "Query" diff --git a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/projectionWithPrimitives/expected/Generated.kt b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/projectionWithPrimitives/expected/Generated.kt new file mode 100644 index 000000000..1ced427ef --- /dev/null +++ b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/projectionWithPrimitives/expected/Generated.kt @@ -0,0 +1,7 @@ +package com.netflix.graphql.dgs.codegen.cases.projectionWithPrimitives.expected + +import kotlin.`annotation`.AnnotationRetention +import kotlin.`annotation`.Retention + +@Retention(value = AnnotationRetention.BINARY) +public annotation class Generated diff --git a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/projectionWithPrimitives/expected/client/QueryProjection.kt b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/projectionWithPrimitives/expected/client/QueryProjection.kt index 858b26451..8d6c18cf3 100644 --- a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/projectionWithPrimitives/expected/client/QueryProjection.kt +++ b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/projectionWithPrimitives/expected/client/QueryProjection.kt @@ -2,7 +2,11 @@ package com.netflix.graphql.dgs.codegen.cases.projectionWithPrimitives.expected. import com.netflix.graphql.dgs.client.codegen.InputValueSerializerInterface import com.netflix.graphql.dgs.codegen.GraphQLProjection +import com.netflix.graphql.dgs.codegen.cases.projectionWithPrimitives.expected.Generated as ExpectedGenerated +import jakarta.`annotation`.Generated as AnnotationGenerated +@AnnotationGenerated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) +@ExpectedGenerated public class QueryProjection( inputValueSerializer: InputValueSerializerInterface? = null, ) : GraphQLProjection(inputValueSerializer) { diff --git a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/projectionWithPrimitives/expected/types/Query.kt b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/projectionWithPrimitives/expected/types/Query.kt index e2baf0e49..5b00d5964 100644 --- a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/projectionWithPrimitives/expected/types/Query.kt +++ b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/projectionWithPrimitives/expected/types/Query.kt @@ -9,7 +9,11 @@ import java.lang.IllegalStateException import kotlin.String import kotlin.collections.List import kotlin.jvm.JvmName +import com.netflix.graphql.dgs.codegen.cases.projectionWithPrimitives.expected.Generated as ExpectedGenerated +import jakarta.`annotation`.Generated as AnnotationGenerated +@AnnotationGenerated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) +@ExpectedGenerated @JsonTypeInfo(use = JsonTypeInfo.Id.NONE) @JsonDeserialize(builder = Query.Builder::class) public class Query( @@ -28,6 +32,8 @@ public class Query( public val strings: List? get() = __strings.invoke() + @AnnotationGenerated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) + @ExpectedGenerated public companion object { private val stringDefault: () -> String? = { throw IllegalStateException("Field `string` was not requested") } @@ -36,6 +42,8 @@ public class Query( { throw IllegalStateException("Field `strings` was not requested") } } + @AnnotationGenerated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) + @ExpectedGenerated @JsonPOJOBuilder @JsonIgnoreProperties("__typename") public class Builder { diff --git a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/projectionWithType/expected/DgsClient.kt b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/projectionWithType/expected/DgsClient.kt index 876761a7a..6e015da13 100644 --- a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/projectionWithType/expected/DgsClient.kt +++ b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/projectionWithType/expected/DgsClient.kt @@ -6,6 +6,8 @@ import com.netflix.graphql.dgs.codegen.cases.projectionWithType.expected.client. import graphql.language.OperationDefinition import kotlin.String +@jakarta.`annotation`.Generated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) +@Generated public object DgsClient { public fun buildQuery(inputValueSerializer: InputValueSerializerInterface? = null, _projection: QueryProjection.() -> QueryProjection): String = diff --git a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/projectionWithType/expected/DgsConstants.kt b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/projectionWithType/expected/DgsConstants.kt index 1d0deb6a0..24bd18b36 100644 --- a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/projectionWithType/expected/DgsConstants.kt +++ b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/projectionWithType/expected/DgsConstants.kt @@ -2,9 +2,13 @@ package com.netflix.graphql.dgs.codegen.cases.projectionWithType.expected import kotlin.String +@jakarta.`annotation`.Generated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) +@Generated public object DgsConstants { public const val QUERY_TYPE: String = "Query" + @jakarta.`annotation`.Generated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) + @Generated public object QUERY { public const val TYPE_NAME: String = "Query" @@ -13,6 +17,8 @@ public object DgsConstants { public const val People: String = "people" } + @jakarta.`annotation`.Generated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) + @Generated public object EMPLOYEE { public const val TYPE_NAME: String = "Employee" @@ -21,6 +27,8 @@ public object DgsConstants { public const val Company: String = "company" } + @jakarta.`annotation`.Generated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) + @Generated public object PERSON { public const val TYPE_NAME: String = "Person" diff --git a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/projectionWithType/expected/Generated.kt b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/projectionWithType/expected/Generated.kt new file mode 100644 index 000000000..c87a066c4 --- /dev/null +++ b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/projectionWithType/expected/Generated.kt @@ -0,0 +1,7 @@ +package com.netflix.graphql.dgs.codegen.cases.projectionWithType.expected + +import kotlin.`annotation`.AnnotationRetention +import kotlin.`annotation`.Retention + +@Retention(value = AnnotationRetention.BINARY) +public annotation class Generated diff --git a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/projectionWithType/expected/client/EmployeeProjection.kt b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/projectionWithType/expected/client/EmployeeProjection.kt index ac1381d4e..ba488a3c4 100644 --- a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/projectionWithType/expected/client/EmployeeProjection.kt +++ b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/projectionWithType/expected/client/EmployeeProjection.kt @@ -2,7 +2,11 @@ package com.netflix.graphql.dgs.codegen.cases.projectionWithType.expected.client import com.netflix.graphql.dgs.client.codegen.InputValueSerializerInterface import com.netflix.graphql.dgs.codegen.GraphQLProjection +import com.netflix.graphql.dgs.codegen.cases.projectionWithType.expected.Generated as ExpectedGenerated +import jakarta.`annotation`.Generated as AnnotationGenerated +@AnnotationGenerated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) +@ExpectedGenerated public class EmployeeProjection( inputValueSerializer: InputValueSerializerInterface? = null, ) : GraphQLProjection(inputValueSerializer) { diff --git a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/projectionWithType/expected/client/PersonProjection.kt b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/projectionWithType/expected/client/PersonProjection.kt index f2434dfd4..7e9e78ccb 100644 --- a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/projectionWithType/expected/client/PersonProjection.kt +++ b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/projectionWithType/expected/client/PersonProjection.kt @@ -2,7 +2,11 @@ package com.netflix.graphql.dgs.codegen.cases.projectionWithType.expected.client import com.netflix.graphql.dgs.client.codegen.InputValueSerializerInterface import com.netflix.graphql.dgs.codegen.GraphQLProjection +import com.netflix.graphql.dgs.codegen.cases.projectionWithType.expected.Generated as ExpectedGenerated +import jakarta.`annotation`.Generated as AnnotationGenerated +@AnnotationGenerated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) +@ExpectedGenerated public class PersonProjection( inputValueSerializer: InputValueSerializerInterface? = null, ) : GraphQLProjection(inputValueSerializer) { diff --git a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/projectionWithType/expected/client/QueryProjection.kt b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/projectionWithType/expected/client/QueryProjection.kt index e1101afae..b586126d4 100644 --- a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/projectionWithType/expected/client/QueryProjection.kt +++ b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/projectionWithType/expected/client/QueryProjection.kt @@ -3,7 +3,11 @@ package com.netflix.graphql.dgs.codegen.cases.projectionWithType.expected.client import com.netflix.graphql.dgs.client.codegen.InputValueSerializerInterface import com.netflix.graphql.dgs.codegen.GraphQLProjection import kotlin.String +import com.netflix.graphql.dgs.codegen.cases.projectionWithType.expected.Generated as ExpectedGenerated +import jakarta.`annotation`.Generated as AnnotationGenerated +@AnnotationGenerated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) +@ExpectedGenerated public class QueryProjection( inputValueSerializer: InputValueSerializerInterface? = null, ) : GraphQLProjection(inputValueSerializer) { diff --git a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/projectionWithType/expected/types/Employee.kt b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/projectionWithType/expected/types/Employee.kt index 3f9b1f0a4..1f3df9815 100644 --- a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/projectionWithType/expected/types/Employee.kt +++ b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/projectionWithType/expected/types/Employee.kt @@ -9,7 +9,11 @@ import java.lang.IllegalStateException import kotlin.String import kotlin.Suppress import kotlin.jvm.JvmName +import com.netflix.graphql.dgs.codegen.cases.projectionWithType.expected.Generated as ExpectedGenerated +import jakarta.`annotation`.Generated as AnnotationGenerated +@AnnotationGenerated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) +@ExpectedGenerated @JsonTypeInfo(use = JsonTypeInfo.Id.NONE) @JsonDeserialize(builder = Employee.Builder::class) public class Employee( @@ -29,6 +33,8 @@ public class Employee( public val company: String? get() = __company.invoke() + @AnnotationGenerated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) + @ExpectedGenerated public companion object { private val firstnameDefault: () -> String? = { throw IllegalStateException("Field `firstname` was not requested") } @@ -37,6 +43,8 @@ public class Employee( { throw IllegalStateException("Field `company` was not requested") } } + @AnnotationGenerated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) + @ExpectedGenerated @JsonPOJOBuilder @JsonIgnoreProperties("__typename") public class Builder { diff --git a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/projectionWithType/expected/types/Person.kt b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/projectionWithType/expected/types/Person.kt index 55768fa21..1901b8da7 100644 --- a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/projectionWithType/expected/types/Person.kt +++ b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/projectionWithType/expected/types/Person.kt @@ -5,7 +5,11 @@ import com.fasterxml.jackson.`annotation`.JsonTypeInfo import kotlin.String import kotlin.Suppress import kotlin.jvm.JvmName +import com.netflix.graphql.dgs.codegen.cases.projectionWithType.expected.Generated as ExpectedGenerated +import jakarta.`annotation`.Generated as AnnotationGenerated +@AnnotationGenerated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) +@ExpectedGenerated @JsonTypeInfo( use = JsonTypeInfo.Id.NAME, include = JsonTypeInfo.As.PROPERTY, diff --git a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/projectionWithType/expected/types/Query.kt b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/projectionWithType/expected/types/Query.kt index 72fd25238..abe4e128f 100644 --- a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/projectionWithType/expected/types/Query.kt +++ b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/projectionWithType/expected/types/Query.kt @@ -8,7 +8,11 @@ import com.fasterxml.jackson.databind.`annotation`.JsonPOJOBuilder import java.lang.IllegalStateException import kotlin.collections.List import kotlin.jvm.JvmName +import com.netflix.graphql.dgs.codegen.cases.projectionWithType.expected.Generated as ExpectedGenerated +import jakarta.`annotation`.Generated as AnnotationGenerated +@AnnotationGenerated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) +@ExpectedGenerated @JsonTypeInfo(use = JsonTypeInfo.Id.NONE) @JsonDeserialize(builder = Query.Builder::class) public class Query( @@ -27,6 +31,8 @@ public class Query( public val people: List? get() = __people.invoke() + @AnnotationGenerated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) + @ExpectedGenerated public companion object { private val personDefault: () -> Person? = { throw IllegalStateException("Field `person` was not requested") } @@ -35,6 +41,8 @@ public class Query( { throw IllegalStateException("Field `people` was not requested") } } + @AnnotationGenerated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) + @ExpectedGenerated @JsonPOJOBuilder @JsonIgnoreProperties("__typename") public class Builder { diff --git a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/projectionWithTypeAndArgs/expected/DgsClient.kt b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/projectionWithTypeAndArgs/expected/DgsClient.kt index 3358ba35b..90d78e931 100644 --- a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/projectionWithTypeAndArgs/expected/DgsClient.kt +++ b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/projectionWithTypeAndArgs/expected/DgsClient.kt @@ -6,6 +6,8 @@ import com.netflix.graphql.dgs.codegen.cases.projectionWithTypeAndArgs.expected. import graphql.language.OperationDefinition import kotlin.String +@jakarta.`annotation`.Generated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) +@Generated public object DgsClient { public fun buildQuery(inputValueSerializer: InputValueSerializerInterface? = null, _projection: QueryProjection.() -> QueryProjection): String = diff --git a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/projectionWithTypeAndArgs/expected/DgsConstants.kt b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/projectionWithTypeAndArgs/expected/DgsConstants.kt index 77a4e6764..ea41413b6 100644 --- a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/projectionWithTypeAndArgs/expected/DgsConstants.kt +++ b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/projectionWithTypeAndArgs/expected/DgsConstants.kt @@ -2,14 +2,20 @@ package com.netflix.graphql.dgs.codegen.cases.projectionWithTypeAndArgs.expected import kotlin.String +@jakarta.`annotation`.Generated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) +@Generated public object DgsConstants { public const val QUERY_TYPE: String = "Query" + @jakarta.`annotation`.Generated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) + @Generated public object QUERY { public const val TYPE_NAME: String = "Query" public const val Person: String = "person" + @jakarta.`annotation`.Generated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) + @Generated public object PERSON_INPUT_ARGUMENT { public const val A1: String = "a1" @@ -19,6 +25,8 @@ public object DgsConstants { } } + @jakarta.`annotation`.Generated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) + @Generated public object EMPLOYEE { public const val TYPE_NAME: String = "Employee" @@ -27,12 +35,16 @@ public object DgsConstants { public const val Company: String = "company" } + @jakarta.`annotation`.Generated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) + @Generated public object I { public const val TYPE_NAME: String = "I" public const val Arg: String = "arg" } + @jakarta.`annotation`.Generated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) + @Generated public object PERSON { public const val TYPE_NAME: String = "Person" diff --git a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/projectionWithTypeAndArgs/expected/Generated.kt b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/projectionWithTypeAndArgs/expected/Generated.kt new file mode 100644 index 000000000..079203d1f --- /dev/null +++ b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/projectionWithTypeAndArgs/expected/Generated.kt @@ -0,0 +1,7 @@ +package com.netflix.graphql.dgs.codegen.cases.projectionWithTypeAndArgs.expected + +import kotlin.`annotation`.AnnotationRetention +import kotlin.`annotation`.Retention + +@Retention(value = AnnotationRetention.BINARY) +public annotation class Generated diff --git a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/projectionWithTypeAndArgs/expected/client/EmployeeProjection.kt b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/projectionWithTypeAndArgs/expected/client/EmployeeProjection.kt index 29312d55c..c2bc185db 100644 --- a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/projectionWithTypeAndArgs/expected/client/EmployeeProjection.kt +++ b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/projectionWithTypeAndArgs/expected/client/EmployeeProjection.kt @@ -2,7 +2,11 @@ package com.netflix.graphql.dgs.codegen.cases.projectionWithTypeAndArgs.expected import com.netflix.graphql.dgs.client.codegen.InputValueSerializerInterface import com.netflix.graphql.dgs.codegen.GraphQLProjection +import com.netflix.graphql.dgs.codegen.cases.projectionWithTypeAndArgs.expected.Generated as ExpectedGenerated +import jakarta.`annotation`.Generated as AnnotationGenerated +@AnnotationGenerated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) +@ExpectedGenerated public class EmployeeProjection( inputValueSerializer: InputValueSerializerInterface? = null, ) : GraphQLProjection(inputValueSerializer) { diff --git a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/projectionWithTypeAndArgs/expected/client/PersonProjection.kt b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/projectionWithTypeAndArgs/expected/client/PersonProjection.kt index 37e02e25c..1c4fa3482 100644 --- a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/projectionWithTypeAndArgs/expected/client/PersonProjection.kt +++ b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/projectionWithTypeAndArgs/expected/client/PersonProjection.kt @@ -2,7 +2,11 @@ package com.netflix.graphql.dgs.codegen.cases.projectionWithTypeAndArgs.expected import com.netflix.graphql.dgs.client.codegen.InputValueSerializerInterface import com.netflix.graphql.dgs.codegen.GraphQLProjection +import com.netflix.graphql.dgs.codegen.cases.projectionWithTypeAndArgs.expected.Generated as ExpectedGenerated +import jakarta.`annotation`.Generated as AnnotationGenerated +@AnnotationGenerated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) +@ExpectedGenerated public class PersonProjection( inputValueSerializer: InputValueSerializerInterface? = null, ) : GraphQLProjection(inputValueSerializer) { diff --git a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/projectionWithTypeAndArgs/expected/client/QueryProjection.kt b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/projectionWithTypeAndArgs/expected/client/QueryProjection.kt index b4952f8d2..317582d4d 100644 --- a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/projectionWithTypeAndArgs/expected/client/QueryProjection.kt +++ b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/projectionWithTypeAndArgs/expected/client/QueryProjection.kt @@ -4,7 +4,11 @@ import com.netflix.graphql.dgs.client.codegen.InputValueSerializerInterface import com.netflix.graphql.dgs.codegen.GraphQLProjection import com.netflix.graphql.dgs.codegen.cases.projectionWithTypeAndArgs.expected.types.I import kotlin.String +import com.netflix.graphql.dgs.codegen.cases.projectionWithTypeAndArgs.expected.Generated as ExpectedGenerated +import jakarta.`annotation`.Generated as AnnotationGenerated +@AnnotationGenerated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) +@ExpectedGenerated public class QueryProjection( inputValueSerializer: InputValueSerializerInterface? = null, ) : GraphQLProjection(inputValueSerializer) { diff --git a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/projectionWithTypeAndArgs/expected/types/Employee.kt b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/projectionWithTypeAndArgs/expected/types/Employee.kt index 38ceb1a22..e7be8a40a 100644 --- a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/projectionWithTypeAndArgs/expected/types/Employee.kt +++ b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/projectionWithTypeAndArgs/expected/types/Employee.kt @@ -9,7 +9,11 @@ import java.lang.IllegalStateException import kotlin.String import kotlin.Suppress import kotlin.jvm.JvmName +import com.netflix.graphql.dgs.codegen.cases.projectionWithTypeAndArgs.expected.Generated as ExpectedGenerated +import jakarta.`annotation`.Generated as AnnotationGenerated +@AnnotationGenerated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) +@ExpectedGenerated @JsonTypeInfo(use = JsonTypeInfo.Id.NONE) @JsonDeserialize(builder = Employee.Builder::class) public class Employee( @@ -29,6 +33,8 @@ public class Employee( public val company: String? get() = __company.invoke() + @AnnotationGenerated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) + @ExpectedGenerated public companion object { private val firstnameDefault: () -> String? = { throw IllegalStateException("Field `firstname` was not requested") } @@ -37,6 +43,8 @@ public class Employee( { throw IllegalStateException("Field `company` was not requested") } } + @AnnotationGenerated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) + @ExpectedGenerated @JsonPOJOBuilder @JsonIgnoreProperties("__typename") public class Builder { diff --git a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/projectionWithTypeAndArgs/expected/types/I.kt b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/projectionWithTypeAndArgs/expected/types/I.kt index cb3269b07..e47b286bb 100644 --- a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/projectionWithTypeAndArgs/expected/types/I.kt +++ b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/projectionWithTypeAndArgs/expected/types/I.kt @@ -6,7 +6,11 @@ import kotlin.Any import kotlin.Pair import kotlin.String import kotlin.collections.List +import com.netflix.graphql.dgs.codegen.cases.projectionWithTypeAndArgs.expected.Generated as ExpectedGenerated +import jakarta.`annotation`.Generated as AnnotationGenerated +@AnnotationGenerated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) +@ExpectedGenerated public data class I( @JsonProperty("arg") public val arg: String? = default("arg", null), diff --git a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/projectionWithTypeAndArgs/expected/types/Person.kt b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/projectionWithTypeAndArgs/expected/types/Person.kt index 2c2021ae6..df3ac7800 100644 --- a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/projectionWithTypeAndArgs/expected/types/Person.kt +++ b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/projectionWithTypeAndArgs/expected/types/Person.kt @@ -5,7 +5,11 @@ import com.fasterxml.jackson.`annotation`.JsonTypeInfo import kotlin.String import kotlin.Suppress import kotlin.jvm.JvmName +import com.netflix.graphql.dgs.codegen.cases.projectionWithTypeAndArgs.expected.Generated as ExpectedGenerated +import jakarta.`annotation`.Generated as AnnotationGenerated +@AnnotationGenerated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) +@ExpectedGenerated @JsonTypeInfo( use = JsonTypeInfo.Id.NAME, include = JsonTypeInfo.As.PROPERTY, diff --git a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/projectionWithTypeAndArgs/expected/types/Query.kt b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/projectionWithTypeAndArgs/expected/types/Query.kt index c9dc7e836..0bb6d6e93 100644 --- a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/projectionWithTypeAndArgs/expected/types/Query.kt +++ b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/projectionWithTypeAndArgs/expected/types/Query.kt @@ -7,7 +7,11 @@ import com.fasterxml.jackson.databind.`annotation`.JsonDeserialize import com.fasterxml.jackson.databind.`annotation`.JsonPOJOBuilder import java.lang.IllegalStateException import kotlin.jvm.JvmName +import com.netflix.graphql.dgs.codegen.cases.projectionWithTypeAndArgs.expected.Generated as ExpectedGenerated +import jakarta.`annotation`.Generated as AnnotationGenerated +@AnnotationGenerated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) +@ExpectedGenerated @JsonTypeInfo(use = JsonTypeInfo.Id.NONE) @JsonDeserialize(builder = Query.Builder::class) public class Query( @@ -19,11 +23,15 @@ public class Query( public val person: Person? get() = __person.invoke() + @AnnotationGenerated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) + @ExpectedGenerated public companion object { private val personDefault: () -> Person? = { throw IllegalStateException("Field `person` was not requested") } } + @AnnotationGenerated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) + @ExpectedGenerated @JsonPOJOBuilder @JsonIgnoreProperties("__typename") public class Builder { diff --git a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/projectionWithUnion/expected/DgsClient.kt b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/projectionWithUnion/expected/DgsClient.kt index 64f303987..ee45ce22d 100644 --- a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/projectionWithUnion/expected/DgsClient.kt +++ b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/projectionWithUnion/expected/DgsClient.kt @@ -6,6 +6,8 @@ import com.netflix.graphql.dgs.codegen.cases.projectionWithUnion.expected.client import graphql.language.OperationDefinition import kotlin.String +@jakarta.`annotation`.Generated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) +@Generated public object DgsClient { public fun buildQuery(inputValueSerializer: InputValueSerializerInterface? = null, _projection: QueryProjection.() -> QueryProjection): String = diff --git a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/projectionWithUnion/expected/DgsConstants.kt b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/projectionWithUnion/expected/DgsConstants.kt index caa105ece..58121e719 100644 --- a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/projectionWithUnion/expected/DgsConstants.kt +++ b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/projectionWithUnion/expected/DgsConstants.kt @@ -2,9 +2,13 @@ package com.netflix.graphql.dgs.codegen.cases.projectionWithUnion.expected import kotlin.String +@jakarta.`annotation`.Generated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) +@Generated public object DgsConstants { public const val QUERY_TYPE: String = "Query" + @jakarta.`annotation`.Generated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) + @Generated public object QUERY { public const val TYPE_NAME: String = "Query" @@ -13,6 +17,8 @@ public object DgsConstants { public const val Us: String = "us" } + @jakarta.`annotation`.Generated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) + @Generated public object EMPLOYEE { public const val TYPE_NAME: String = "Employee" @@ -21,12 +27,16 @@ public object DgsConstants { public const val Company: String = "company" } + @jakarta.`annotation`.Generated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) + @Generated public object PERSON { public const val TYPE_NAME: String = "Person" public const val Firstname: String = "firstname" } + @jakarta.`annotation`.Generated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) + @Generated public object U { public const val TYPE_NAME: String = "U" } diff --git a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/projectionWithUnion/expected/Generated.kt b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/projectionWithUnion/expected/Generated.kt new file mode 100644 index 000000000..87c5b18d6 --- /dev/null +++ b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/projectionWithUnion/expected/Generated.kt @@ -0,0 +1,7 @@ +package com.netflix.graphql.dgs.codegen.cases.projectionWithUnion.expected + +import kotlin.`annotation`.AnnotationRetention +import kotlin.`annotation`.Retention + +@Retention(value = AnnotationRetention.BINARY) +public annotation class Generated diff --git a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/projectionWithUnion/expected/client/EmployeeProjection.kt b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/projectionWithUnion/expected/client/EmployeeProjection.kt index e73bda737..537a6d87d 100644 --- a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/projectionWithUnion/expected/client/EmployeeProjection.kt +++ b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/projectionWithUnion/expected/client/EmployeeProjection.kt @@ -2,7 +2,11 @@ package com.netflix.graphql.dgs.codegen.cases.projectionWithUnion.expected.clien import com.netflix.graphql.dgs.client.codegen.InputValueSerializerInterface import com.netflix.graphql.dgs.codegen.GraphQLProjection +import com.netflix.graphql.dgs.codegen.cases.projectionWithUnion.expected.Generated as ExpectedGenerated +import jakarta.`annotation`.Generated as AnnotationGenerated +@AnnotationGenerated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) +@ExpectedGenerated public class EmployeeProjection( inputValueSerializer: InputValueSerializerInterface? = null, ) : GraphQLProjection(inputValueSerializer) { diff --git a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/projectionWithUnion/expected/client/PersonProjection.kt b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/projectionWithUnion/expected/client/PersonProjection.kt index fb73afa29..16585588f 100644 --- a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/projectionWithUnion/expected/client/PersonProjection.kt +++ b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/projectionWithUnion/expected/client/PersonProjection.kt @@ -2,7 +2,11 @@ package com.netflix.graphql.dgs.codegen.cases.projectionWithUnion.expected.clien import com.netflix.graphql.dgs.client.codegen.InputValueSerializerInterface import com.netflix.graphql.dgs.codegen.GraphQLProjection +import com.netflix.graphql.dgs.codegen.cases.projectionWithUnion.expected.Generated as ExpectedGenerated +import jakarta.`annotation`.Generated as AnnotationGenerated +@AnnotationGenerated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) +@ExpectedGenerated public class PersonProjection( inputValueSerializer: InputValueSerializerInterface? = null, ) : GraphQLProjection(inputValueSerializer) { diff --git a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/projectionWithUnion/expected/client/QueryProjection.kt b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/projectionWithUnion/expected/client/QueryProjection.kt index 563b68d05..a90314ff2 100644 --- a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/projectionWithUnion/expected/client/QueryProjection.kt +++ b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/projectionWithUnion/expected/client/QueryProjection.kt @@ -3,7 +3,11 @@ package com.netflix.graphql.dgs.codegen.cases.projectionWithUnion.expected.clien import com.netflix.graphql.dgs.client.codegen.InputValueSerializerInterface import com.netflix.graphql.dgs.codegen.GraphQLProjection import kotlin.String +import com.netflix.graphql.dgs.codegen.cases.projectionWithUnion.expected.Generated as ExpectedGenerated +import jakarta.`annotation`.Generated as AnnotationGenerated +@AnnotationGenerated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) +@ExpectedGenerated public class QueryProjection( inputValueSerializer: InputValueSerializerInterface? = null, ) : GraphQLProjection(inputValueSerializer) { diff --git a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/projectionWithUnion/expected/client/UProjection.kt b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/projectionWithUnion/expected/client/UProjection.kt index 4ec5862ec..02b933aa7 100644 --- a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/projectionWithUnion/expected/client/UProjection.kt +++ b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/projectionWithUnion/expected/client/UProjection.kt @@ -2,7 +2,11 @@ package com.netflix.graphql.dgs.codegen.cases.projectionWithUnion.expected.clien import com.netflix.graphql.dgs.client.codegen.InputValueSerializerInterface import com.netflix.graphql.dgs.codegen.GraphQLProjection +import com.netflix.graphql.dgs.codegen.cases.projectionWithUnion.expected.Generated as ExpectedGenerated +import jakarta.`annotation`.Generated as AnnotationGenerated +@AnnotationGenerated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) +@ExpectedGenerated public class UProjection( inputValueSerializer: InputValueSerializerInterface? = null, ) : GraphQLProjection(inputValueSerializer) { diff --git a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/projectionWithUnion/expected/types/Employee.kt b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/projectionWithUnion/expected/types/Employee.kt index b5fd669ba..46f36204d 100644 --- a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/projectionWithUnion/expected/types/Employee.kt +++ b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/projectionWithUnion/expected/types/Employee.kt @@ -9,7 +9,11 @@ import java.lang.IllegalStateException import kotlin.String import kotlin.Suppress import kotlin.jvm.JvmName +import com.netflix.graphql.dgs.codegen.cases.projectionWithUnion.expected.Generated as ExpectedGenerated +import jakarta.`annotation`.Generated as AnnotationGenerated +@AnnotationGenerated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) +@ExpectedGenerated @JsonTypeInfo(use = JsonTypeInfo.Id.NONE) @JsonDeserialize(builder = Employee.Builder::class) public class Employee( @@ -30,6 +34,8 @@ public class Employee( public val company: String? get() = __company.invoke() + @AnnotationGenerated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) + @ExpectedGenerated public companion object { private val firstnameDefault: () -> String? = { throw IllegalStateException("Field `firstname` was not requested") } @@ -38,6 +44,8 @@ public class Employee( { throw IllegalStateException("Field `company` was not requested") } } + @AnnotationGenerated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) + @ExpectedGenerated @JsonPOJOBuilder @JsonIgnoreProperties("__typename") public class Builder { diff --git a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/projectionWithUnion/expected/types/Person.kt b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/projectionWithUnion/expected/types/Person.kt index 7916d280f..13099dfc6 100644 --- a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/projectionWithUnion/expected/types/Person.kt +++ b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/projectionWithUnion/expected/types/Person.kt @@ -5,7 +5,11 @@ import com.fasterxml.jackson.`annotation`.JsonTypeInfo import kotlin.String import kotlin.Suppress import kotlin.jvm.JvmName +import com.netflix.graphql.dgs.codegen.cases.projectionWithUnion.expected.Generated as ExpectedGenerated +import jakarta.`annotation`.Generated as AnnotationGenerated +@AnnotationGenerated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) +@ExpectedGenerated @JsonTypeInfo( use = JsonTypeInfo.Id.NAME, include = JsonTypeInfo.As.PROPERTY, diff --git a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/projectionWithUnion/expected/types/Query.kt b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/projectionWithUnion/expected/types/Query.kt index fe07e2f18..6b3acf737 100644 --- a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/projectionWithUnion/expected/types/Query.kt +++ b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/projectionWithUnion/expected/types/Query.kt @@ -8,7 +8,11 @@ import com.fasterxml.jackson.databind.`annotation`.JsonPOJOBuilder import java.lang.IllegalStateException import kotlin.collections.List import kotlin.jvm.JvmName +import com.netflix.graphql.dgs.codegen.cases.projectionWithUnion.expected.Generated as ExpectedGenerated +import jakarta.`annotation`.Generated as AnnotationGenerated +@AnnotationGenerated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) +@ExpectedGenerated @JsonTypeInfo(use = JsonTypeInfo.Id.NONE) @JsonDeserialize(builder = Query.Builder::class) public class Query( @@ -27,6 +31,8 @@ public class Query( public val us: List? get() = __us.invoke() + @AnnotationGenerated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) + @ExpectedGenerated public companion object { private val uDefault: () -> U? = { throw IllegalStateException("Field `u` was not requested") } @@ -35,6 +41,8 @@ public class Query( { throw IllegalStateException("Field `us` was not requested") } } + @AnnotationGenerated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) + @ExpectedGenerated @JsonPOJOBuilder @JsonIgnoreProperties("__typename") public class Builder { diff --git a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/projectionWithUnion/expected/types/U.kt b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/projectionWithUnion/expected/types/U.kt index f79295ca9..e56d455c8 100644 --- a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/projectionWithUnion/expected/types/U.kt +++ b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/projectionWithUnion/expected/types/U.kt @@ -2,7 +2,11 @@ package com.netflix.graphql.dgs.codegen.cases.projectionWithUnion.expected.types import com.fasterxml.jackson.`annotation`.JsonSubTypes import com.fasterxml.jackson.`annotation`.JsonTypeInfo +import com.netflix.graphql.dgs.codegen.cases.projectionWithUnion.expected.Generated as ExpectedGenerated +import jakarta.`annotation`.Generated as AnnotationGenerated +@AnnotationGenerated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) +@ExpectedGenerated @JsonTypeInfo( use = JsonTypeInfo.Id.NAME, include = JsonTypeInfo.As.PROPERTY, diff --git a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/skipCodegenOnFields/expected/DgsClient.kt b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/skipCodegenOnFields/expected/DgsClient.kt index b91960826..274052c24 100644 --- a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/skipCodegenOnFields/expected/DgsClient.kt +++ b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/skipCodegenOnFields/expected/DgsClient.kt @@ -1,3 +1,5 @@ package com.netflix.graphql.dgs.codegen.cases.skipCodegenOnFields.expected +@jakarta.`annotation`.Generated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) +@Generated public object DgsClient diff --git a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/skipCodegenOnFields/expected/DgsConstants.kt b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/skipCodegenOnFields/expected/DgsConstants.kt index 9a0f7a082..419a9cd5b 100644 --- a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/skipCodegenOnFields/expected/DgsConstants.kt +++ b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/skipCodegenOnFields/expected/DgsConstants.kt @@ -2,7 +2,11 @@ package com.netflix.graphql.dgs.codegen.cases.skipCodegenOnFields.expected import kotlin.String +@jakarta.`annotation`.Generated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) +@Generated public object DgsConstants { + @jakarta.`annotation`.Generated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) + @Generated public object PERSON { public const val TYPE_NAME: String = "Person" diff --git a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/skipCodegenOnFields/expected/Generated.kt b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/skipCodegenOnFields/expected/Generated.kt new file mode 100644 index 000000000..b14cd1c97 --- /dev/null +++ b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/skipCodegenOnFields/expected/Generated.kt @@ -0,0 +1,7 @@ +package com.netflix.graphql.dgs.codegen.cases.skipCodegenOnFields.expected + +import kotlin.`annotation`.AnnotationRetention +import kotlin.`annotation`.Retention + +@Retention(value = AnnotationRetention.BINARY) +public annotation class Generated diff --git a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/skipCodegenOnFields/expected/client/PersonProjection.kt b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/skipCodegenOnFields/expected/client/PersonProjection.kt index b6f2e7b5e..46fbdd0a1 100644 --- a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/skipCodegenOnFields/expected/client/PersonProjection.kt +++ b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/skipCodegenOnFields/expected/client/PersonProjection.kt @@ -2,7 +2,11 @@ package com.netflix.graphql.dgs.codegen.cases.skipCodegenOnFields.expected.clien import com.netflix.graphql.dgs.client.codegen.InputValueSerializerInterface import com.netflix.graphql.dgs.codegen.GraphQLProjection +import com.netflix.graphql.dgs.codegen.cases.skipCodegenOnFields.expected.Generated as ExpectedGenerated +import jakarta.`annotation`.Generated as AnnotationGenerated +@AnnotationGenerated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) +@ExpectedGenerated public class PersonProjection( inputValueSerializer: InputValueSerializerInterface? = null, ) : GraphQLProjection(inputValueSerializer) { diff --git a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/skipCodegenOnFields/expected/types/Person.kt b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/skipCodegenOnFields/expected/types/Person.kt index 9a51a0907..5c0ff348e 100644 --- a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/skipCodegenOnFields/expected/types/Person.kt +++ b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/skipCodegenOnFields/expected/types/Person.kt @@ -8,7 +8,11 @@ import com.fasterxml.jackson.databind.`annotation`.JsonPOJOBuilder import java.lang.IllegalStateException import kotlin.String import kotlin.jvm.JvmName +import com.netflix.graphql.dgs.codegen.cases.skipCodegenOnFields.expected.Generated as ExpectedGenerated +import jakarta.`annotation`.Generated as AnnotationGenerated +@AnnotationGenerated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) +@ExpectedGenerated @JsonTypeInfo(use = JsonTypeInfo.Id.NONE) @JsonDeserialize(builder = Person.Builder::class) public class Person( @@ -20,11 +24,15 @@ public class Person( public val name: String? get() = __name.invoke() + @AnnotationGenerated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) + @ExpectedGenerated public companion object { private val nameDefault: () -> String? = { throw IllegalStateException("Field `name` was not requested") } } + @AnnotationGenerated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) + @ExpectedGenerated @JsonPOJOBuilder @JsonIgnoreProperties("__typename") public class Builder { diff --git a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/skipCodegenOnInterfaceFields/expected/DgsClient.kt b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/skipCodegenOnInterfaceFields/expected/DgsClient.kt index bba0805f2..15b17d231 100644 --- a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/skipCodegenOnInterfaceFields/expected/DgsClient.kt +++ b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/skipCodegenOnInterfaceFields/expected/DgsClient.kt @@ -1,3 +1,5 @@ package com.netflix.graphql.dgs.codegen.cases.skipCodegenOnInterfaceFields.expected +@jakarta.`annotation`.Generated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) +@Generated public object DgsClient diff --git a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/skipCodegenOnInterfaceFields/expected/DgsConstants.kt b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/skipCodegenOnInterfaceFields/expected/DgsConstants.kt index a96e78225..a9a44d8ef 100644 --- a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/skipCodegenOnInterfaceFields/expected/DgsConstants.kt +++ b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/skipCodegenOnInterfaceFields/expected/DgsConstants.kt @@ -2,7 +2,11 @@ package com.netflix.graphql.dgs.codegen.cases.skipCodegenOnInterfaceFields.expec import kotlin.String +@jakarta.`annotation`.Generated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) +@Generated public object DgsConstants { + @jakarta.`annotation`.Generated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) + @Generated public object PERSON { public const val TYPE_NAME: String = "Person" diff --git a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/skipCodegenOnInterfaceFields/expected/Generated.kt b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/skipCodegenOnInterfaceFields/expected/Generated.kt new file mode 100644 index 000000000..b7c40ea6b --- /dev/null +++ b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/skipCodegenOnInterfaceFields/expected/Generated.kt @@ -0,0 +1,7 @@ +package com.netflix.graphql.dgs.codegen.cases.skipCodegenOnInterfaceFields.expected + +import kotlin.`annotation`.AnnotationRetention +import kotlin.`annotation`.Retention + +@Retention(value = AnnotationRetention.BINARY) +public annotation class Generated diff --git a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/skipCodegenOnInterfaceFields/expected/client/PersonProjection.kt b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/skipCodegenOnInterfaceFields/expected/client/PersonProjection.kt index 3ce7dce05..2a935fdd5 100644 --- a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/skipCodegenOnInterfaceFields/expected/client/PersonProjection.kt +++ b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/skipCodegenOnInterfaceFields/expected/client/PersonProjection.kt @@ -2,7 +2,11 @@ package com.netflix.graphql.dgs.codegen.cases.skipCodegenOnInterfaceFields.expec import com.netflix.graphql.dgs.client.codegen.InputValueSerializerInterface import com.netflix.graphql.dgs.codegen.GraphQLProjection +import com.netflix.graphql.dgs.codegen.cases.skipCodegenOnInterfaceFields.expected.Generated as ExpectedGenerated +import jakarta.`annotation`.Generated as AnnotationGenerated +@AnnotationGenerated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) +@ExpectedGenerated public class PersonProjection( inputValueSerializer: InputValueSerializerInterface? = null, ) : GraphQLProjection(inputValueSerializer) { diff --git a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/skipCodegenOnInterfaceFields/expected/types/Person.kt b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/skipCodegenOnInterfaceFields/expected/types/Person.kt index 695196bb8..16d51e1cd 100644 --- a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/skipCodegenOnInterfaceFields/expected/types/Person.kt +++ b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/skipCodegenOnInterfaceFields/expected/types/Person.kt @@ -4,7 +4,11 @@ import com.fasterxml.jackson.`annotation`.JsonTypeInfo import kotlin.String import kotlin.Suppress import kotlin.jvm.JvmName +import com.netflix.graphql.dgs.codegen.cases.skipCodegenOnInterfaceFields.expected.Generated as ExpectedGenerated +import jakarta.`annotation`.Generated as AnnotationGenerated +@AnnotationGenerated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) +@ExpectedGenerated @JsonTypeInfo( use = JsonTypeInfo.Id.NAME, include = JsonTypeInfo.As.PROPERTY, diff --git a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/skipCodegenOnTypes/expected/DgsClient.kt b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/skipCodegenOnTypes/expected/DgsClient.kt index 1e53d1212..9bc4c699b 100644 --- a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/skipCodegenOnTypes/expected/DgsClient.kt +++ b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/skipCodegenOnTypes/expected/DgsClient.kt @@ -1,3 +1,5 @@ package com.netflix.graphql.dgs.codegen.cases.skipCodegenOnTypes.expected +@jakarta.`annotation`.Generated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) +@Generated public object DgsClient diff --git a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/skipCodegenOnTypes/expected/DgsConstants.kt b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/skipCodegenOnTypes/expected/DgsConstants.kt index 729ebe5f0..2281400cf 100644 --- a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/skipCodegenOnTypes/expected/DgsConstants.kt +++ b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/skipCodegenOnTypes/expected/DgsConstants.kt @@ -2,13 +2,19 @@ package com.netflix.graphql.dgs.codegen.cases.skipCodegenOnTypes.expected import kotlin.String +@jakarta.`annotation`.Generated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) +@Generated public object DgsConstants { + @jakarta.`annotation`.Generated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) + @Generated public object PERSON { public const val TYPE_NAME: String = "Person" public const val Name: String = "name" } + @jakarta.`annotation`.Generated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) + @Generated public object CAR { public const val TYPE_NAME: String = "Car" diff --git a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/skipCodegenOnTypes/expected/Generated.kt b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/skipCodegenOnTypes/expected/Generated.kt new file mode 100644 index 000000000..6b2f1dc50 --- /dev/null +++ b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/skipCodegenOnTypes/expected/Generated.kt @@ -0,0 +1,7 @@ +package com.netflix.graphql.dgs.codegen.cases.skipCodegenOnTypes.expected + +import kotlin.`annotation`.AnnotationRetention +import kotlin.`annotation`.Retention + +@Retention(value = AnnotationRetention.BINARY) +public annotation class Generated diff --git a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/skipCodegenOnTypes/expected/client/PersonProjection.kt b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/skipCodegenOnTypes/expected/client/PersonProjection.kt index ba4b70d8b..45d6a85df 100644 --- a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/skipCodegenOnTypes/expected/client/PersonProjection.kt +++ b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/skipCodegenOnTypes/expected/client/PersonProjection.kt @@ -2,7 +2,11 @@ package com.netflix.graphql.dgs.codegen.cases.skipCodegenOnTypes.expected.client import com.netflix.graphql.dgs.client.codegen.InputValueSerializerInterface import com.netflix.graphql.dgs.codegen.GraphQLProjection +import com.netflix.graphql.dgs.codegen.cases.skipCodegenOnTypes.expected.Generated as ExpectedGenerated +import jakarta.`annotation`.Generated as AnnotationGenerated +@AnnotationGenerated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) +@ExpectedGenerated public class PersonProjection( inputValueSerializer: InputValueSerializerInterface? = null, ) : GraphQLProjection(inputValueSerializer) { diff --git a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/skipCodegenOnTypes/expected/types/Person.kt b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/skipCodegenOnTypes/expected/types/Person.kt index 554a9dfc1..156a4430b 100644 --- a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/skipCodegenOnTypes/expected/types/Person.kt +++ b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/skipCodegenOnTypes/expected/types/Person.kt @@ -8,7 +8,11 @@ import com.fasterxml.jackson.databind.`annotation`.JsonPOJOBuilder import java.lang.IllegalStateException import kotlin.String import kotlin.jvm.JvmName +import com.netflix.graphql.dgs.codegen.cases.skipCodegenOnTypes.expected.Generated as ExpectedGenerated +import jakarta.`annotation`.Generated as AnnotationGenerated +@AnnotationGenerated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) +@ExpectedGenerated @JsonTypeInfo(use = JsonTypeInfo.Id.NONE) @JsonDeserialize(builder = Person.Builder::class) public class Person( @@ -20,11 +24,15 @@ public class Person( public val name: String? get() = __name.invoke() + @AnnotationGenerated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) + @ExpectedGenerated public companion object { private val nameDefault: () -> String? = { throw IllegalStateException("Field `name` was not requested") } } + @AnnotationGenerated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) + @ExpectedGenerated @JsonPOJOBuilder @JsonIgnoreProperties("__typename") public class Builder { diff --git a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/union/expected/DgsClient.kt b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/union/expected/DgsClient.kt index 352f6a4b0..5d8bc544b 100644 --- a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/union/expected/DgsClient.kt +++ b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/union/expected/DgsClient.kt @@ -6,6 +6,8 @@ import com.netflix.graphql.dgs.codegen.cases.union.expected.client.QueryProjecti import graphql.language.OperationDefinition import kotlin.String +@jakarta.`annotation`.Generated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) +@Generated public object DgsClient { public fun buildQuery(inputValueSerializer: InputValueSerializerInterface? = null, _projection: QueryProjection.() -> QueryProjection): String = diff --git a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/union/expected/DgsConstants.kt b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/union/expected/DgsConstants.kt index 6d6e8d0ae..ef99f1e5d 100644 --- a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/union/expected/DgsConstants.kt +++ b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/union/expected/DgsConstants.kt @@ -2,27 +2,37 @@ package com.netflix.graphql.dgs.codegen.cases.union.expected import kotlin.String +@jakarta.`annotation`.Generated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) +@Generated public object DgsConstants { public const val QUERY_TYPE: String = "Query" + @jakarta.`annotation`.Generated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) + @Generated public object QUERY { public const val TYPE_NAME: String = "Query" public const val Search: String = "search" } + @jakarta.`annotation`.Generated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) + @Generated public object MOVIE { public const val TYPE_NAME: String = "Movie" public const val Title: String = "title" } + @jakarta.`annotation`.Generated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) + @Generated public object ACTOR { public const val TYPE_NAME: String = "Actor" public const val Name: String = "name" } + @jakarta.`annotation`.Generated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) + @Generated public object SEARCHRESULT { public const val TYPE_NAME: String = "SearchResult" } diff --git a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/union/expected/Generated.kt b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/union/expected/Generated.kt new file mode 100644 index 000000000..c5560cc60 --- /dev/null +++ b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/union/expected/Generated.kt @@ -0,0 +1,7 @@ +package com.netflix.graphql.dgs.codegen.cases.union.expected + +import kotlin.`annotation`.AnnotationRetention +import kotlin.`annotation`.Retention + +@Retention(value = AnnotationRetention.BINARY) +public annotation class Generated diff --git a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/union/expected/client/ActorProjection.kt b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/union/expected/client/ActorProjection.kt index b8e6d3599..b0ef4f37f 100644 --- a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/union/expected/client/ActorProjection.kt +++ b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/union/expected/client/ActorProjection.kt @@ -2,7 +2,11 @@ package com.netflix.graphql.dgs.codegen.cases.union.expected.client import com.netflix.graphql.dgs.client.codegen.InputValueSerializerInterface import com.netflix.graphql.dgs.codegen.GraphQLProjection +import com.netflix.graphql.dgs.codegen.cases.union.expected.Generated as ExpectedGenerated +import jakarta.`annotation`.Generated as AnnotationGenerated +@AnnotationGenerated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) +@ExpectedGenerated public class ActorProjection( inputValueSerializer: InputValueSerializerInterface? = null, ) : GraphQLProjection(inputValueSerializer) { diff --git a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/union/expected/client/MovieProjection.kt b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/union/expected/client/MovieProjection.kt index c4cecfc7f..f824e11a4 100644 --- a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/union/expected/client/MovieProjection.kt +++ b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/union/expected/client/MovieProjection.kt @@ -2,7 +2,11 @@ package com.netflix.graphql.dgs.codegen.cases.union.expected.client import com.netflix.graphql.dgs.client.codegen.InputValueSerializerInterface import com.netflix.graphql.dgs.codegen.GraphQLProjection +import com.netflix.graphql.dgs.codegen.cases.union.expected.Generated as ExpectedGenerated +import jakarta.`annotation`.Generated as AnnotationGenerated +@AnnotationGenerated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) +@ExpectedGenerated public class MovieProjection( inputValueSerializer: InputValueSerializerInterface? = null, ) : GraphQLProjection(inputValueSerializer) { diff --git a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/union/expected/client/QueryProjection.kt b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/union/expected/client/QueryProjection.kt index 852f9b315..5d6e090d4 100644 --- a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/union/expected/client/QueryProjection.kt +++ b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/union/expected/client/QueryProjection.kt @@ -3,7 +3,11 @@ package com.netflix.graphql.dgs.codegen.cases.union.expected.client import com.netflix.graphql.dgs.client.codegen.InputValueSerializerInterface import com.netflix.graphql.dgs.codegen.GraphQLProjection import kotlin.String +import com.netflix.graphql.dgs.codegen.cases.union.expected.Generated as ExpectedGenerated +import jakarta.`annotation`.Generated as AnnotationGenerated +@AnnotationGenerated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) +@ExpectedGenerated public class QueryProjection( inputValueSerializer: InputValueSerializerInterface? = null, ) : GraphQLProjection(inputValueSerializer) { diff --git a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/union/expected/client/SearchResultProjection.kt b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/union/expected/client/SearchResultProjection.kt index 151529c5b..7ada06828 100644 --- a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/union/expected/client/SearchResultProjection.kt +++ b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/union/expected/client/SearchResultProjection.kt @@ -2,7 +2,11 @@ package com.netflix.graphql.dgs.codegen.cases.union.expected.client import com.netflix.graphql.dgs.client.codegen.InputValueSerializerInterface import com.netflix.graphql.dgs.codegen.GraphQLProjection +import com.netflix.graphql.dgs.codegen.cases.union.expected.Generated as ExpectedGenerated +import jakarta.`annotation`.Generated as AnnotationGenerated +@AnnotationGenerated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) +@ExpectedGenerated public class SearchResultProjection( inputValueSerializer: InputValueSerializerInterface? = null, ) : GraphQLProjection(inputValueSerializer) { diff --git a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/union/expected/types/Actor.kt b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/union/expected/types/Actor.kt index 1b03eea54..9c268f634 100644 --- a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/union/expected/types/Actor.kt +++ b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/union/expected/types/Actor.kt @@ -8,7 +8,11 @@ import com.fasterxml.jackson.databind.`annotation`.JsonPOJOBuilder import java.lang.IllegalStateException import kotlin.String import kotlin.jvm.JvmName +import com.netflix.graphql.dgs.codegen.cases.union.expected.Generated as ExpectedGenerated +import jakarta.`annotation`.Generated as AnnotationGenerated +@AnnotationGenerated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) +@ExpectedGenerated @JsonTypeInfo(use = JsonTypeInfo.Id.NONE) @JsonDeserialize(builder = Actor.Builder::class) public class Actor( @@ -20,11 +24,15 @@ public class Actor( public val name: String? get() = __name.invoke() + @AnnotationGenerated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) + @ExpectedGenerated public companion object { private val nameDefault: () -> String? = { throw IllegalStateException("Field `name` was not requested") } } + @AnnotationGenerated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) + @ExpectedGenerated @JsonPOJOBuilder @JsonIgnoreProperties("__typename") public class Builder { diff --git a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/union/expected/types/Movie.kt b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/union/expected/types/Movie.kt index 9cd78c2a0..1c80f6f7d 100644 --- a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/union/expected/types/Movie.kt +++ b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/union/expected/types/Movie.kt @@ -8,7 +8,11 @@ import com.fasterxml.jackson.databind.`annotation`.JsonPOJOBuilder import java.lang.IllegalStateException import kotlin.String import kotlin.jvm.JvmName +import com.netflix.graphql.dgs.codegen.cases.union.expected.Generated as ExpectedGenerated +import jakarta.`annotation`.Generated as AnnotationGenerated +@AnnotationGenerated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) +@ExpectedGenerated @JsonTypeInfo(use = JsonTypeInfo.Id.NONE) @JsonDeserialize(builder = Movie.Builder::class) public class Movie( @@ -20,11 +24,15 @@ public class Movie( public val title: String? get() = __title.invoke() + @AnnotationGenerated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) + @ExpectedGenerated public companion object { private val titleDefault: () -> String? = { throw IllegalStateException("Field `title` was not requested") } } + @AnnotationGenerated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) + @ExpectedGenerated @JsonPOJOBuilder @JsonIgnoreProperties("__typename") public class Builder { diff --git a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/union/expected/types/Query.kt b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/union/expected/types/Query.kt index fe72c795c..3e5f90938 100644 --- a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/union/expected/types/Query.kt +++ b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/union/expected/types/Query.kt @@ -8,7 +8,11 @@ import com.fasterxml.jackson.databind.`annotation`.JsonPOJOBuilder import java.lang.IllegalStateException import kotlin.collections.List import kotlin.jvm.JvmName +import com.netflix.graphql.dgs.codegen.cases.union.expected.Generated as ExpectedGenerated +import jakarta.`annotation`.Generated as AnnotationGenerated +@AnnotationGenerated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) +@ExpectedGenerated @JsonTypeInfo(use = JsonTypeInfo.Id.NONE) @JsonDeserialize(builder = Query.Builder::class) public class Query( @@ -20,11 +24,15 @@ public class Query( public val search: List? get() = __search.invoke() + @AnnotationGenerated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) + @ExpectedGenerated public companion object { private val searchDefault: () -> List? = { throw IllegalStateException("Field `search` was not requested") } } + @AnnotationGenerated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) + @ExpectedGenerated @JsonPOJOBuilder @JsonIgnoreProperties("__typename") public class Builder { diff --git a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/union/expected/types/SearchResult.kt b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/union/expected/types/SearchResult.kt index 615a4836c..dcc90e6f6 100644 --- a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/union/expected/types/SearchResult.kt +++ b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/union/expected/types/SearchResult.kt @@ -2,7 +2,11 @@ package com.netflix.graphql.dgs.codegen.cases.union.expected.types import com.fasterxml.jackson.`annotation`.JsonSubTypes import com.fasterxml.jackson.`annotation`.JsonTypeInfo +import com.netflix.graphql.dgs.codegen.cases.union.expected.Generated as ExpectedGenerated +import jakarta.`annotation`.Generated as AnnotationGenerated +@AnnotationGenerated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) +@ExpectedGenerated @JsonTypeInfo( use = JsonTypeInfo.Id.NAME, include = JsonTypeInfo.As.PROPERTY, diff --git a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/unionTypesWithoutInterfaceCanDeserialize/expected/DgsClient.kt b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/unionTypesWithoutInterfaceCanDeserialize/expected/DgsClient.kt index 3327495e0..e1256f43b 100644 --- a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/unionTypesWithoutInterfaceCanDeserialize/expected/DgsClient.kt +++ b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/unionTypesWithoutInterfaceCanDeserialize/expected/DgsClient.kt @@ -6,6 +6,8 @@ import com.netflix.graphql.dgs.codegen.cases.unionTypesWithoutInterfaceCanDeseri import graphql.language.OperationDefinition import kotlin.String +@jakarta.`annotation`.Generated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) +@Generated public object DgsClient { public fun buildQuery(inputValueSerializer: InputValueSerializerInterface? = null, _projection: QueryProjection.() -> QueryProjection): String = diff --git a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/unionTypesWithoutInterfaceCanDeserialize/expected/DgsConstants.kt b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/unionTypesWithoutInterfaceCanDeserialize/expected/DgsConstants.kt index 77865861e..f1888f945 100644 --- a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/unionTypesWithoutInterfaceCanDeserialize/expected/DgsConstants.kt +++ b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/unionTypesWithoutInterfaceCanDeserialize/expected/DgsConstants.kt @@ -2,19 +2,27 @@ package com.netflix.graphql.dgs.codegen.cases.unionTypesWithoutInterfaceCanDeser import kotlin.String +@jakarta.`annotation`.Generated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) +@Generated public object DgsConstants { public const val QUERY_TYPE: String = "Query" + @jakarta.`annotation`.Generated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) + @Generated public object QUERY { public const val TYPE_NAME: String = "Query" public const val Search: String = "search" + @jakarta.`annotation`.Generated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) + @Generated public object SEARCH_INPUT_ARGUMENT { public const val Text: String = "text" } } + @jakarta.`annotation`.Generated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) + @Generated public object HUMAN { public const val TYPE_NAME: String = "Human" @@ -25,6 +33,8 @@ public object DgsConstants { public const val TotalCredits: String = "totalCredits" } + @jakarta.`annotation`.Generated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) + @Generated public object DROID { public const val TYPE_NAME: String = "Droid" @@ -35,12 +45,16 @@ public object DgsConstants { public const val PrimaryFunction: String = "primaryFunction" } + @jakarta.`annotation`.Generated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) + @Generated public object SEARCHRESULTPAGE { public const val TYPE_NAME: String = "SearchResultPage" public const val Items: String = "items" } + @jakarta.`annotation`.Generated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) + @Generated public object SEARCHRESULT { public const val TYPE_NAME: String = "SearchResult" } diff --git a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/unionTypesWithoutInterfaceCanDeserialize/expected/Generated.kt b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/unionTypesWithoutInterfaceCanDeserialize/expected/Generated.kt new file mode 100644 index 000000000..57f2fd7b4 --- /dev/null +++ b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/unionTypesWithoutInterfaceCanDeserialize/expected/Generated.kt @@ -0,0 +1,7 @@ +package com.netflix.graphql.dgs.codegen.cases.unionTypesWithoutInterfaceCanDeserialize.expected + +import kotlin.`annotation`.AnnotationRetention +import kotlin.`annotation`.Retention + +@Retention(value = AnnotationRetention.BINARY) +public annotation class Generated diff --git a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/unionTypesWithoutInterfaceCanDeserialize/expected/client/DroidProjection.kt b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/unionTypesWithoutInterfaceCanDeserialize/expected/client/DroidProjection.kt index 5478ffaa8..55efff7fd 100644 --- a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/unionTypesWithoutInterfaceCanDeserialize/expected/client/DroidProjection.kt +++ b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/unionTypesWithoutInterfaceCanDeserialize/expected/client/DroidProjection.kt @@ -2,7 +2,11 @@ package com.netflix.graphql.dgs.codegen.cases.unionTypesWithoutInterfaceCanDeser import com.netflix.graphql.dgs.client.codegen.InputValueSerializerInterface import com.netflix.graphql.dgs.codegen.GraphQLProjection +import com.netflix.graphql.dgs.codegen.cases.unionTypesWithoutInterfaceCanDeserialize.expected.Generated as ExpectedGenerated +import jakarta.`annotation`.Generated as AnnotationGenerated +@AnnotationGenerated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) +@ExpectedGenerated public class DroidProjection( inputValueSerializer: InputValueSerializerInterface? = null, ) : GraphQLProjection(inputValueSerializer) { diff --git a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/unionTypesWithoutInterfaceCanDeserialize/expected/client/HumanProjection.kt b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/unionTypesWithoutInterfaceCanDeserialize/expected/client/HumanProjection.kt index 0c2d5e7c3..bfdf4b998 100644 --- a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/unionTypesWithoutInterfaceCanDeserialize/expected/client/HumanProjection.kt +++ b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/unionTypesWithoutInterfaceCanDeserialize/expected/client/HumanProjection.kt @@ -2,7 +2,11 @@ package com.netflix.graphql.dgs.codegen.cases.unionTypesWithoutInterfaceCanDeser import com.netflix.graphql.dgs.client.codegen.InputValueSerializerInterface import com.netflix.graphql.dgs.codegen.GraphQLProjection +import com.netflix.graphql.dgs.codegen.cases.unionTypesWithoutInterfaceCanDeserialize.expected.Generated as ExpectedGenerated +import jakarta.`annotation`.Generated as AnnotationGenerated +@AnnotationGenerated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) +@ExpectedGenerated public class HumanProjection( inputValueSerializer: InputValueSerializerInterface? = null, ) : GraphQLProjection(inputValueSerializer) { diff --git a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/unionTypesWithoutInterfaceCanDeserialize/expected/client/QueryProjection.kt b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/unionTypesWithoutInterfaceCanDeserialize/expected/client/QueryProjection.kt index ff4443ad5..ad3d80067 100644 --- a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/unionTypesWithoutInterfaceCanDeserialize/expected/client/QueryProjection.kt +++ b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/unionTypesWithoutInterfaceCanDeserialize/expected/client/QueryProjection.kt @@ -3,7 +3,11 @@ package com.netflix.graphql.dgs.codegen.cases.unionTypesWithoutInterfaceCanDeser import com.netflix.graphql.dgs.client.codegen.InputValueSerializerInterface import com.netflix.graphql.dgs.codegen.GraphQLProjection import kotlin.String +import com.netflix.graphql.dgs.codegen.cases.unionTypesWithoutInterfaceCanDeserialize.expected.Generated as ExpectedGenerated +import jakarta.`annotation`.Generated as AnnotationGenerated +@AnnotationGenerated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) +@ExpectedGenerated public class QueryProjection( inputValueSerializer: InputValueSerializerInterface? = null, ) : GraphQLProjection(inputValueSerializer) { diff --git a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/unionTypesWithoutInterfaceCanDeserialize/expected/client/SearchResultPageProjection.kt b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/unionTypesWithoutInterfaceCanDeserialize/expected/client/SearchResultPageProjection.kt index 67b566586..d400fcf17 100644 --- a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/unionTypesWithoutInterfaceCanDeserialize/expected/client/SearchResultPageProjection.kt +++ b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/unionTypesWithoutInterfaceCanDeserialize/expected/client/SearchResultPageProjection.kt @@ -3,7 +3,11 @@ package com.netflix.graphql.dgs.codegen.cases.unionTypesWithoutInterfaceCanDeser import com.netflix.graphql.dgs.client.codegen.InputValueSerializerInterface import com.netflix.graphql.dgs.codegen.GraphQLProjection import kotlin.String +import com.netflix.graphql.dgs.codegen.cases.unionTypesWithoutInterfaceCanDeserialize.expected.Generated as ExpectedGenerated +import jakarta.`annotation`.Generated as AnnotationGenerated +@AnnotationGenerated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) +@ExpectedGenerated public class SearchResultPageProjection( inputValueSerializer: InputValueSerializerInterface? = null, ) : GraphQLProjection(inputValueSerializer) { diff --git a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/unionTypesWithoutInterfaceCanDeserialize/expected/client/SearchResultProjection.kt b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/unionTypesWithoutInterfaceCanDeserialize/expected/client/SearchResultProjection.kt index a861c8f5c..85b516a68 100644 --- a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/unionTypesWithoutInterfaceCanDeserialize/expected/client/SearchResultProjection.kt +++ b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/unionTypesWithoutInterfaceCanDeserialize/expected/client/SearchResultProjection.kt @@ -2,7 +2,11 @@ package com.netflix.graphql.dgs.codegen.cases.unionTypesWithoutInterfaceCanDeser import com.netflix.graphql.dgs.client.codegen.InputValueSerializerInterface import com.netflix.graphql.dgs.codegen.GraphQLProjection +import com.netflix.graphql.dgs.codegen.cases.unionTypesWithoutInterfaceCanDeserialize.expected.Generated as ExpectedGenerated +import jakarta.`annotation`.Generated as AnnotationGenerated +@AnnotationGenerated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) +@ExpectedGenerated public class SearchResultProjection( inputValueSerializer: InputValueSerializerInterface? = null, ) : GraphQLProjection(inputValueSerializer) { diff --git a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/unionTypesWithoutInterfaceCanDeserialize/expected/types/Droid.kt b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/unionTypesWithoutInterfaceCanDeserialize/expected/types/Droid.kt index 3c03561ec..ae03c30d3 100644 --- a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/unionTypesWithoutInterfaceCanDeserialize/expected/types/Droid.kt +++ b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/unionTypesWithoutInterfaceCanDeserialize/expected/types/Droid.kt @@ -8,7 +8,11 @@ import com.fasterxml.jackson.databind.`annotation`.JsonPOJOBuilder import java.lang.IllegalStateException import kotlin.String import kotlin.jvm.JvmName +import com.netflix.graphql.dgs.codegen.cases.unionTypesWithoutInterfaceCanDeserialize.expected.Generated as ExpectedGenerated +import jakarta.`annotation`.Generated as AnnotationGenerated +@AnnotationGenerated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) +@ExpectedGenerated @JsonTypeInfo(use = JsonTypeInfo.Id.NONE) @JsonDeserialize(builder = Droid.Builder::class) public class Droid( @@ -34,6 +38,8 @@ public class Droid( public val primaryFunction: String? get() = __primaryFunction.invoke() + @AnnotationGenerated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) + @ExpectedGenerated public companion object { private val idDefault: () -> String = { throw IllegalStateException("Field `id` was not requested") } @@ -45,6 +51,8 @@ public class Droid( { throw IllegalStateException("Field `primaryFunction` was not requested") } } + @AnnotationGenerated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) + @ExpectedGenerated @JsonPOJOBuilder @JsonIgnoreProperties("__typename") public class Builder { diff --git a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/unionTypesWithoutInterfaceCanDeserialize/expected/types/Human.kt b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/unionTypesWithoutInterfaceCanDeserialize/expected/types/Human.kt index 3c0bca1a2..1b0fb0652 100644 --- a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/unionTypesWithoutInterfaceCanDeserialize/expected/types/Human.kt +++ b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/unionTypesWithoutInterfaceCanDeserialize/expected/types/Human.kt @@ -9,7 +9,11 @@ import java.lang.IllegalStateException import kotlin.Int import kotlin.String import kotlin.jvm.JvmName +import com.netflix.graphql.dgs.codegen.cases.unionTypesWithoutInterfaceCanDeserialize.expected.Generated as ExpectedGenerated +import jakarta.`annotation`.Generated as AnnotationGenerated +@AnnotationGenerated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) +@ExpectedGenerated @JsonTypeInfo(use = JsonTypeInfo.Id.NONE) @JsonDeserialize(builder = Human.Builder::class) public class Human( @@ -35,6 +39,8 @@ public class Human( public val totalCredits: Int? get() = __totalCredits.invoke() + @AnnotationGenerated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) + @ExpectedGenerated public companion object { private val idDefault: () -> String = { throw IllegalStateException("Field `id` was not requested") } @@ -46,6 +52,8 @@ public class Human( { throw IllegalStateException("Field `totalCredits` was not requested") } } + @AnnotationGenerated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) + @ExpectedGenerated @JsonPOJOBuilder @JsonIgnoreProperties("__typename") public class Builder { diff --git a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/unionTypesWithoutInterfaceCanDeserialize/expected/types/Query.kt b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/unionTypesWithoutInterfaceCanDeserialize/expected/types/Query.kt index 9f17a81da..7d361fc7f 100644 --- a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/unionTypesWithoutInterfaceCanDeserialize/expected/types/Query.kt +++ b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/unionTypesWithoutInterfaceCanDeserialize/expected/types/Query.kt @@ -7,7 +7,11 @@ import com.fasterxml.jackson.databind.`annotation`.JsonDeserialize import com.fasterxml.jackson.databind.`annotation`.JsonPOJOBuilder import java.lang.IllegalStateException import kotlin.jvm.JvmName +import com.netflix.graphql.dgs.codegen.cases.unionTypesWithoutInterfaceCanDeserialize.expected.Generated as ExpectedGenerated +import jakarta.`annotation`.Generated as AnnotationGenerated +@AnnotationGenerated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) +@ExpectedGenerated @JsonTypeInfo(use = JsonTypeInfo.Id.NONE) @JsonDeserialize(builder = Query.Builder::class) public class Query( @@ -19,11 +23,15 @@ public class Query( public val search: SearchResultPage? get() = __search.invoke() + @AnnotationGenerated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) + @ExpectedGenerated public companion object { private val searchDefault: () -> SearchResultPage? = { throw IllegalStateException("Field `search` was not requested") } } + @AnnotationGenerated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) + @ExpectedGenerated @JsonPOJOBuilder @JsonIgnoreProperties("__typename") public class Builder { diff --git a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/unionTypesWithoutInterfaceCanDeserialize/expected/types/SearchResult.kt b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/unionTypesWithoutInterfaceCanDeserialize/expected/types/SearchResult.kt index 84de34236..803c8c0ec 100644 --- a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/unionTypesWithoutInterfaceCanDeserialize/expected/types/SearchResult.kt +++ b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/unionTypesWithoutInterfaceCanDeserialize/expected/types/SearchResult.kt @@ -2,7 +2,11 @@ package com.netflix.graphql.dgs.codegen.cases.unionTypesWithoutInterfaceCanDeser import com.fasterxml.jackson.`annotation`.JsonSubTypes import com.fasterxml.jackson.`annotation`.JsonTypeInfo +import com.netflix.graphql.dgs.codegen.cases.unionTypesWithoutInterfaceCanDeserialize.expected.Generated as ExpectedGenerated +import jakarta.`annotation`.Generated as AnnotationGenerated +@AnnotationGenerated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) +@ExpectedGenerated @JsonTypeInfo( use = JsonTypeInfo.Id.NAME, include = JsonTypeInfo.As.PROPERTY, diff --git a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/unionTypesWithoutInterfaceCanDeserialize/expected/types/SearchResultPage.kt b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/unionTypesWithoutInterfaceCanDeserialize/expected/types/SearchResultPage.kt index ecba1f512..34c9a4d98 100644 --- a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/unionTypesWithoutInterfaceCanDeserialize/expected/types/SearchResultPage.kt +++ b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/unionTypesWithoutInterfaceCanDeserialize/expected/types/SearchResultPage.kt @@ -8,7 +8,11 @@ import com.fasterxml.jackson.databind.`annotation`.JsonPOJOBuilder import java.lang.IllegalStateException import kotlin.collections.List import kotlin.jvm.JvmName +import com.netflix.graphql.dgs.codegen.cases.unionTypesWithoutInterfaceCanDeserialize.expected.Generated as ExpectedGenerated +import jakarta.`annotation`.Generated as AnnotationGenerated +@AnnotationGenerated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) +@ExpectedGenerated @JsonTypeInfo(use = JsonTypeInfo.Id.NONE) @JsonDeserialize(builder = SearchResultPage.Builder::class) public class SearchResultPage( @@ -20,11 +24,15 @@ public class SearchResultPage( public val items: List? get() = __items.invoke() + @AnnotationGenerated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) + @ExpectedGenerated public companion object { private val itemsDefault: () -> List? = { throw IllegalStateException("Field `items` was not requested") } } + @AnnotationGenerated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) + @ExpectedGenerated @JsonPOJOBuilder @JsonIgnoreProperties("__typename") public class Builder { diff --git a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/unionWithExtendedType/expected/DgsClient.kt b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/unionWithExtendedType/expected/DgsClient.kt index 2cf6592dc..8af5f4f38 100644 --- a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/unionWithExtendedType/expected/DgsClient.kt +++ b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/unionWithExtendedType/expected/DgsClient.kt @@ -6,6 +6,8 @@ import com.netflix.graphql.dgs.codegen.cases.unionWithExtendedType.expected.clie import graphql.language.OperationDefinition import kotlin.String +@jakarta.`annotation`.Generated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) +@Generated public object DgsClient { public fun buildQuery(inputValueSerializer: InputValueSerializerInterface? = null, _projection: QueryProjection.() -> QueryProjection): String = diff --git a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/unionWithExtendedType/expected/DgsConstants.kt b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/unionWithExtendedType/expected/DgsConstants.kt index e205c9083..111384486 100644 --- a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/unionWithExtendedType/expected/DgsConstants.kt +++ b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/unionWithExtendedType/expected/DgsConstants.kt @@ -2,33 +2,45 @@ package com.netflix.graphql.dgs.codegen.cases.unionWithExtendedType.expected import kotlin.String +@jakarta.`annotation`.Generated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) +@Generated public object DgsConstants { public const val QUERY_TYPE: String = "Query" + @jakarta.`annotation`.Generated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) + @Generated public object QUERY { public const val TYPE_NAME: String = "Query" public const val Search: String = "search" } + @jakarta.`annotation`.Generated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) + @Generated public object MOVIE { public const val TYPE_NAME: String = "Movie" public const val Title: String = "title" } + @jakarta.`annotation`.Generated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) + @Generated public object ACTOR { public const val TYPE_NAME: String = "Actor" public const val Name: String = "name" } + @jakarta.`annotation`.Generated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) + @Generated public object RATING { public const val TYPE_NAME: String = "Rating" public const val Stars: String = "stars" } + @jakarta.`annotation`.Generated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) + @Generated public object SEARCHRESULT { public const val TYPE_NAME: String = "SearchResult" } diff --git a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/unionWithExtendedType/expected/Generated.kt b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/unionWithExtendedType/expected/Generated.kt new file mode 100644 index 000000000..4159e8a7b --- /dev/null +++ b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/unionWithExtendedType/expected/Generated.kt @@ -0,0 +1,7 @@ +package com.netflix.graphql.dgs.codegen.cases.unionWithExtendedType.expected + +import kotlin.`annotation`.AnnotationRetention +import kotlin.`annotation`.Retention + +@Retention(value = AnnotationRetention.BINARY) +public annotation class Generated diff --git a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/unionWithExtendedType/expected/client/ActorProjection.kt b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/unionWithExtendedType/expected/client/ActorProjection.kt index 5ecacaf93..fdc5d8126 100644 --- a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/unionWithExtendedType/expected/client/ActorProjection.kt +++ b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/unionWithExtendedType/expected/client/ActorProjection.kt @@ -2,7 +2,11 @@ package com.netflix.graphql.dgs.codegen.cases.unionWithExtendedType.expected.cli import com.netflix.graphql.dgs.client.codegen.InputValueSerializerInterface import com.netflix.graphql.dgs.codegen.GraphQLProjection +import com.netflix.graphql.dgs.codegen.cases.unionWithExtendedType.expected.Generated as ExpectedGenerated +import jakarta.`annotation`.Generated as AnnotationGenerated +@AnnotationGenerated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) +@ExpectedGenerated public class ActorProjection( inputValueSerializer: InputValueSerializerInterface? = null, ) : GraphQLProjection(inputValueSerializer) { diff --git a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/unionWithExtendedType/expected/client/MovieProjection.kt b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/unionWithExtendedType/expected/client/MovieProjection.kt index f7c698880..1183fb03d 100644 --- a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/unionWithExtendedType/expected/client/MovieProjection.kt +++ b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/unionWithExtendedType/expected/client/MovieProjection.kt @@ -2,7 +2,11 @@ package com.netflix.graphql.dgs.codegen.cases.unionWithExtendedType.expected.cli import com.netflix.graphql.dgs.client.codegen.InputValueSerializerInterface import com.netflix.graphql.dgs.codegen.GraphQLProjection +import com.netflix.graphql.dgs.codegen.cases.unionWithExtendedType.expected.Generated as ExpectedGenerated +import jakarta.`annotation`.Generated as AnnotationGenerated +@AnnotationGenerated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) +@ExpectedGenerated public class MovieProjection( inputValueSerializer: InputValueSerializerInterface? = null, ) : GraphQLProjection(inputValueSerializer) { diff --git a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/unionWithExtendedType/expected/client/QueryProjection.kt b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/unionWithExtendedType/expected/client/QueryProjection.kt index fc7118c58..693d56913 100644 --- a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/unionWithExtendedType/expected/client/QueryProjection.kt +++ b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/unionWithExtendedType/expected/client/QueryProjection.kt @@ -3,7 +3,11 @@ package com.netflix.graphql.dgs.codegen.cases.unionWithExtendedType.expected.cli import com.netflix.graphql.dgs.client.codegen.InputValueSerializerInterface import com.netflix.graphql.dgs.codegen.GraphQLProjection import kotlin.String +import com.netflix.graphql.dgs.codegen.cases.unionWithExtendedType.expected.Generated as ExpectedGenerated +import jakarta.`annotation`.Generated as AnnotationGenerated +@AnnotationGenerated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) +@ExpectedGenerated public class QueryProjection( inputValueSerializer: InputValueSerializerInterface? = null, ) : GraphQLProjection(inputValueSerializer) { diff --git a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/unionWithExtendedType/expected/client/RatingProjection.kt b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/unionWithExtendedType/expected/client/RatingProjection.kt index c1d73c175..114f4c06c 100644 --- a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/unionWithExtendedType/expected/client/RatingProjection.kt +++ b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/unionWithExtendedType/expected/client/RatingProjection.kt @@ -2,7 +2,11 @@ package com.netflix.graphql.dgs.codegen.cases.unionWithExtendedType.expected.cli import com.netflix.graphql.dgs.client.codegen.InputValueSerializerInterface import com.netflix.graphql.dgs.codegen.GraphQLProjection +import com.netflix.graphql.dgs.codegen.cases.unionWithExtendedType.expected.Generated as ExpectedGenerated +import jakarta.`annotation`.Generated as AnnotationGenerated +@AnnotationGenerated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) +@ExpectedGenerated public class RatingProjection( inputValueSerializer: InputValueSerializerInterface? = null, ) : GraphQLProjection(inputValueSerializer) { diff --git a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/unionWithExtendedType/expected/client/SearchResultProjection.kt b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/unionWithExtendedType/expected/client/SearchResultProjection.kt index eba2a85b7..5b045b990 100644 --- a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/unionWithExtendedType/expected/client/SearchResultProjection.kt +++ b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/unionWithExtendedType/expected/client/SearchResultProjection.kt @@ -2,7 +2,11 @@ package com.netflix.graphql.dgs.codegen.cases.unionWithExtendedType.expected.cli import com.netflix.graphql.dgs.client.codegen.InputValueSerializerInterface import com.netflix.graphql.dgs.codegen.GraphQLProjection +import com.netflix.graphql.dgs.codegen.cases.unionWithExtendedType.expected.Generated as ExpectedGenerated +import jakarta.`annotation`.Generated as AnnotationGenerated +@AnnotationGenerated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) +@ExpectedGenerated public class SearchResultProjection( inputValueSerializer: InputValueSerializerInterface? = null, ) : GraphQLProjection(inputValueSerializer) { diff --git a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/unionWithExtendedType/expected/types/Actor.kt b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/unionWithExtendedType/expected/types/Actor.kt index 2451e4af4..f549afbbd 100644 --- a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/unionWithExtendedType/expected/types/Actor.kt +++ b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/unionWithExtendedType/expected/types/Actor.kt @@ -8,7 +8,11 @@ import com.fasterxml.jackson.databind.`annotation`.JsonPOJOBuilder import java.lang.IllegalStateException import kotlin.String import kotlin.jvm.JvmName +import com.netflix.graphql.dgs.codegen.cases.unionWithExtendedType.expected.Generated as ExpectedGenerated +import jakarta.`annotation`.Generated as AnnotationGenerated +@AnnotationGenerated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) +@ExpectedGenerated @JsonTypeInfo(use = JsonTypeInfo.Id.NONE) @JsonDeserialize(builder = Actor.Builder::class) public class Actor( @@ -20,11 +24,15 @@ public class Actor( public val name: String? get() = __name.invoke() + @AnnotationGenerated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) + @ExpectedGenerated public companion object { private val nameDefault: () -> String? = { throw IllegalStateException("Field `name` was not requested") } } + @AnnotationGenerated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) + @ExpectedGenerated @JsonPOJOBuilder @JsonIgnoreProperties("__typename") public class Builder { diff --git a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/unionWithExtendedType/expected/types/Movie.kt b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/unionWithExtendedType/expected/types/Movie.kt index 820c95667..c9d342ee3 100644 --- a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/unionWithExtendedType/expected/types/Movie.kt +++ b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/unionWithExtendedType/expected/types/Movie.kt @@ -8,7 +8,11 @@ import com.fasterxml.jackson.databind.`annotation`.JsonPOJOBuilder import java.lang.IllegalStateException import kotlin.String import kotlin.jvm.JvmName +import com.netflix.graphql.dgs.codegen.cases.unionWithExtendedType.expected.Generated as ExpectedGenerated +import jakarta.`annotation`.Generated as AnnotationGenerated +@AnnotationGenerated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) +@ExpectedGenerated @JsonTypeInfo(use = JsonTypeInfo.Id.NONE) @JsonDeserialize(builder = Movie.Builder::class) public class Movie( @@ -20,11 +24,15 @@ public class Movie( public val title: String? get() = __title.invoke() + @AnnotationGenerated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) + @ExpectedGenerated public companion object { private val titleDefault: () -> String? = { throw IllegalStateException("Field `title` was not requested") } } + @AnnotationGenerated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) + @ExpectedGenerated @JsonPOJOBuilder @JsonIgnoreProperties("__typename") public class Builder { diff --git a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/unionWithExtendedType/expected/types/Query.kt b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/unionWithExtendedType/expected/types/Query.kt index 1053eb5ce..54125a817 100644 --- a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/unionWithExtendedType/expected/types/Query.kt +++ b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/unionWithExtendedType/expected/types/Query.kt @@ -8,7 +8,11 @@ import com.fasterxml.jackson.databind.`annotation`.JsonPOJOBuilder import java.lang.IllegalStateException import kotlin.collections.List import kotlin.jvm.JvmName +import com.netflix.graphql.dgs.codegen.cases.unionWithExtendedType.expected.Generated as ExpectedGenerated +import jakarta.`annotation`.Generated as AnnotationGenerated +@AnnotationGenerated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) +@ExpectedGenerated @JsonTypeInfo(use = JsonTypeInfo.Id.NONE) @JsonDeserialize(builder = Query.Builder::class) public class Query( @@ -20,11 +24,15 @@ public class Query( public val search: List? get() = __search.invoke() + @AnnotationGenerated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) + @ExpectedGenerated public companion object { private val searchDefault: () -> List? = { throw IllegalStateException("Field `search` was not requested") } } + @AnnotationGenerated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) + @ExpectedGenerated @JsonPOJOBuilder @JsonIgnoreProperties("__typename") public class Builder { diff --git a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/unionWithExtendedType/expected/types/Rating.kt b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/unionWithExtendedType/expected/types/Rating.kt index 1b9f601c0..0442002fa 100644 --- a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/unionWithExtendedType/expected/types/Rating.kt +++ b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/unionWithExtendedType/expected/types/Rating.kt @@ -8,7 +8,11 @@ import com.fasterxml.jackson.databind.`annotation`.JsonPOJOBuilder import java.lang.IllegalStateException import kotlin.Int import kotlin.jvm.JvmName +import com.netflix.graphql.dgs.codegen.cases.unionWithExtendedType.expected.Generated as ExpectedGenerated +import jakarta.`annotation`.Generated as AnnotationGenerated +@AnnotationGenerated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) +@ExpectedGenerated @JsonTypeInfo(use = JsonTypeInfo.Id.NONE) @JsonDeserialize(builder = Rating.Builder::class) public class Rating( @@ -20,11 +24,15 @@ public class Rating( public val stars: Int? get() = __stars.invoke() + @AnnotationGenerated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) + @ExpectedGenerated public companion object { private val starsDefault: () -> Int? = { throw IllegalStateException("Field `stars` was not requested") } } + @AnnotationGenerated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) + @ExpectedGenerated @JsonPOJOBuilder @JsonIgnoreProperties("__typename") public class Builder { diff --git a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/unionWithExtendedType/expected/types/SearchResult.kt b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/unionWithExtendedType/expected/types/SearchResult.kt index c985525bb..9dd4fc42a 100644 --- a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/unionWithExtendedType/expected/types/SearchResult.kt +++ b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/unionWithExtendedType/expected/types/SearchResult.kt @@ -2,7 +2,11 @@ package com.netflix.graphql.dgs.codegen.cases.unionWithExtendedType.expected.typ import com.fasterxml.jackson.`annotation`.JsonSubTypes import com.fasterxml.jackson.`annotation`.JsonTypeInfo +import com.netflix.graphql.dgs.codegen.cases.unionWithExtendedType.expected.Generated as ExpectedGenerated +import jakarta.`annotation`.Generated as AnnotationGenerated +@AnnotationGenerated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) +@ExpectedGenerated @JsonTypeInfo( use = JsonTypeInfo.Id.NAME, include = JsonTypeInfo.As.PROPERTY, diff --git a/graphql-dgs-codegen-core/src/main/kotlin/com/netflix/graphql/dgs/codegen/CodeGen.kt b/graphql-dgs-codegen-core/src/main/kotlin/com/netflix/graphql/dgs/codegen/CodeGen.kt index 9a28512b4..e9eaffeb8 100644 --- a/graphql-dgs-codegen-core/src/main/kotlin/com/netflix/graphql/dgs/codegen/CodeGen.kt +++ b/graphql-dgs-codegen-core/src/main/kotlin/com/netflix/graphql/dgs/codegen/CodeGen.kt @@ -577,8 +577,8 @@ class CodeGenConfig( var generateCustomAnnotations: Boolean = false, var javaGenerateAllConstructor: Boolean = true, var implementSerializable: Boolean = false, - var addGeneratedAnnotation: Boolean = false, - var disableDatesInGeneratedAnnotation: Boolean = false, + var addGeneratedAnnotation: Boolean = true, + var disableDatesInGeneratedAnnotation: Boolean = true, var addDeprecatedAnnotation: Boolean = false, var trackInputFieldSet: Boolean = false, var generateJSpecifyAnnotations: Boolean = false, diff --git a/graphql-dgs-codegen-core/src/test/kotlin/com/netflix/graphql/dgs/codegen/CodeGenTest.kt b/graphql-dgs-codegen-core/src/test/kotlin/com/netflix/graphql/dgs/codegen/CodeGenTest.kt index 039637670..02ee7ef16 100644 --- a/graphql-dgs-codegen-core/src/test/kotlin/com/netflix/graphql/dgs/codegen/CodeGenTest.kt +++ b/graphql-dgs-codegen-core/src/test/kotlin/com/netflix/graphql/dgs/codegen/CodeGenTest.kt @@ -125,13 +125,14 @@ class CodeGenTest { } """.trimIndent() - val (dataTypes) = + val codeGenResult = CodeGen( CodeGenConfig( schemas = setOf(schema), packageName = BASE_PACKAGE_NAME, ), ).generate() + val (dataTypes) = codeGenResult assertThat(dataTypes.size).isEqualTo(1) val typeSpec = dataTypes[0].typeSpec() @@ -142,7 +143,7 @@ class CodeGenTest { assertThat(typeSpec.fieldSpecs()).extracting("name").contains("firstname", "lastname") assertThat(typeSpec.methodSpecs()).flatExtracting("parameters").extracting("name").contains("firstname", "lastname") dataTypes[0].writeTo(System.out) - assertCompilesJava(dataTypes) + assertCompilesJava(codeGenResult) } @Test @@ -455,7 +456,7 @@ class CodeGenTest { ?: Assertions.fail("Unable to find Movie data type") assertThat(movieType.typeSpec().annotations()).matches(hasJspecifyNullMarkedAnnotation()) - assertCompilesJava(codeGenResult.javaDataTypes + codeGenResult.javaInterfaces) + assertCompilesJava(codeGenResult) } private fun hasJspecifyNullMarkedAnnotation(): (List) -> Boolean = hasJspecifyAnnotation("NullMarked") @@ -498,7 +499,8 @@ class CodeGenTest { javaGenerateAllConstructor = false, ) - val (dataTypes) = CodeGen(codeGenConfig).generate() + val codeGenResult = CodeGen(codeGenConfig).generate() + val (dataTypes) = codeGenResult assertThat(dataTypes).hasSize(1) val personType = dataTypes[0].typeSpec() @@ -509,7 +511,7 @@ class CodeGenTest { assertThat(constructors).hasSize(1) assertThat(constructors[0].parameters()).isEmpty() - assertCompilesJava(dataTypes) + assertCompilesJava(codeGenResult) } @Test @@ -526,20 +528,21 @@ class CodeGenTest { } """.trimIndent() - val (dataTypes) = + val codeGenResult = CodeGen( CodeGenConfig( schemas = setOf(schema), packageName = BASE_PACKAGE_NAME, ), ).generate() + val (dataTypes) = codeGenResult assertThat(dataTypes.size).isEqualTo(1) assertThat(dataTypes[0].typeSpec().name()).isEqualTo("Person") val toString = assertThat(dataTypes[0].typeSpec().methodSpecs()).filteredOn("name", "toString") toString.extracting("code").allMatch { "return \"Person{" in it.toString() } - assertCompilesJava(dataTypes) + assertCompilesJava(codeGenResult) } @Test @@ -556,19 +559,20 @@ class CodeGenTest { } """.trimIndent() - val (dataTypes) = + val codeGenResult = CodeGen( CodeGenConfig( schemas = setOf(schema), packageName = BASE_PACKAGE_NAME, ), ).generate() + val (dataTypes) = codeGenResult assertThat(dataTypes.size).isEqualTo(1) assertThat(dataTypes[0].typeSpec().name()).isEqualTo("Person") assertThat(dataTypes[0].typeSpec().methodSpecs()).extracting("name").contains("equals") - assertCompilesJava(dataTypes) + assertCompilesJava(codeGenResult) } @Test @@ -583,18 +587,19 @@ class CodeGenTest { } """.trimIndent() - val (dataTypes) = + val codeGenResult = CodeGen( CodeGenConfig( schemas = setOf(schema), packageName = BASE_PACKAGE_NAME, ), ).generate() + val (dataTypes) = codeGenResult assertThat(dataTypes.size).isEqualTo(1) assertThat(dataTypes[0].typeSpec().name()).isEqualTo("Person") - assertCompilesJava(dataTypes) + assertCompilesJava(codeGenResult) } @Test @@ -611,13 +616,14 @@ class CodeGenTest { } """.trimIndent() - val (dataTypes) = + val codeGenResult = CodeGen( CodeGenConfig( schemas = setOf(schema), packageName = BASE_PACKAGE_NAME, ), ).generate() + val (dataTypes) = codeGenResult assertThat(dataTypes.size).isEqualTo(1) assertThat(dataTypes[0].typeSpec().name()).isEqualTo("Person") @@ -627,7 +633,7 @@ class CodeGenTest { assertThat(builderType.methodSpecs()).extracting("name").contains("firstname", "lastname", "build") assertThat(builderType.methodSpecs()).filteredOn("name", "firstname").extracting("returnType.simpleName").contains("Builder") assertThat(builderType.methodSpecs()).filteredOn("name", "build").extracting("returnType.simpleName").contains("Person") - assertCompilesJava(dataTypes) + assertCompilesJava(codeGenResult) } @Test @@ -644,19 +650,20 @@ class CodeGenTest { } """.trimIndent() - val (dataTypes) = + val codeGenResult = CodeGen( CodeGenConfig( schemas = setOf(schema), packageName = BASE_PACKAGE_NAME, ), ).generate() + val (dataTypes) = codeGenResult assertThat(dataTypes.size).isEqualTo(1) assertThat(dataTypes[0].typeSpec().name()).isEqualTo("Person") assertThat(dataTypes[0].typeSpec().methodSpecs()).extracting("name").contains("hashCode") - assertCompilesJava(dataTypes) + assertCompilesJava(codeGenResult) } @Test @@ -673,19 +680,20 @@ class CodeGenTest { } """.trimIndent() - val (dataTypes) = + val codeGenResult = CodeGen( CodeGenConfig( schemas = setOf(schema), packageName = "com.mypackage", ), ).generate() + val (dataTypes) = codeGenResult assertThat(dataTypes.size).isEqualTo(1) assertThat(dataTypes[0].typeSpec().name()).isEqualTo("Person") assertThat(dataTypes[0].packageName()).isEqualTo("com.mypackage.types") - assertCompilesJava(dataTypes) + assertCompilesJava(codeGenResult) } @Test @@ -702,13 +710,14 @@ class CodeGenTest { } """.trimIndent() - val (dataTypes) = + val codeGenResult = CodeGen( CodeGenConfig( schemas = setOf(schema), packageName = BASE_PACKAGE_NAME, ), ).generate() + val (dataTypes) = codeGenResult assertThat(dataTypes.size).isEqualTo(1) assertThat(dataTypes[0].typeSpec().name()).isEqualTo("Person") @@ -718,7 +727,7 @@ class CodeGenTest { type.extracting("rawType.canonicalName").contains("java.util.List") type.flatExtracting("typeArguments").extracting("canonicalName").contains("java.lang.String") - assertCompilesJava(dataTypes) + assertCompilesJava(codeGenResult) } @Test @@ -735,13 +744,14 @@ class CodeGenTest { } """.trimIndent() - val (dataTypes) = + val codeGenResult = CodeGen( CodeGenConfig( schemas = setOf(schema), packageName = BASE_PACKAGE_NAME, ), ).generate() + val (dataTypes) = codeGenResult assertThat(dataTypes.size).isEqualTo(1) assertThat(dataTypes[0].typeSpec().name()).isEqualTo("Person") @@ -751,7 +761,7 @@ class CodeGenTest { type.extracting("rawType.canonicalName").contains("java.util.List") type.flatExtracting("typeArguments").extracting("canonicalName").contains("java.lang.String") - assertCompilesJava(dataTypes) + assertCompilesJava(codeGenResult) } @Test @@ -774,13 +784,14 @@ class CodeGenTest { } """.trimIndent() - val (dataTypes, interfaces) = + val codeGenResult = CodeGen( CodeGenConfig( schemas = setOf(schema), packageName = BASE_PACKAGE_NAME, ), ).generate() + val (dataTypes, interfaces) = codeGenResult assertThat(dataTypes.size).isEqualTo(1) val employee = dataTypes.single().typeSpec() @@ -789,18 +800,21 @@ class CodeGenTest { assertThat(employee.fieldSpecs().size).isEqualTo(3) assertThat(employee.fieldSpecs()).extracting("name").contains("firstname", "lastname", "company") - val annotation = employee.annotations().single() - assertThat(annotation).isEqualTo(disableJsonTypeInfoAnnotation()) + val annotations = employee.annotations() + assertThat(annotations).contains(disableJsonTypeInfoAnnotation()) - val person = interfaces[0] + val person = interfaces.find { it.typeSpec().name() == "Person" } assertThat(person.toString()).isEqualTo( """ |package com.netflix.graphql.dgs.codegen.tests.generated.types; | |import com.fasterxml.jackson.annotation.JsonSubTypes; |import com.fasterxml.jackson.annotation.JsonTypeInfo; + |import jakarta.annotation.Generated; |import java.lang.String; | + |@Generated("com.netflix.graphql.dgs.codegen.CodeGen") + |@com.netflix.graphql.dgs.codegen.tests.generated.Generated |@JsonTypeInfo( | use = JsonTypeInfo.Id.NAME, | include = JsonTypeInfo.As.PROPERTY, @@ -820,7 +834,7 @@ class CodeGenTest { """.trimMargin(), ) - assertCompilesJava(dataTypes + interfaces) + assertCompilesJava(codeGenResult) } @Test @@ -842,7 +856,7 @@ class CodeGenTest { } """.trimIndent() - val (dataTypes, interfaces) = + val codeGenResult = CodeGen( CodeGenConfig( schemas = setOf(schema), @@ -850,6 +864,7 @@ class CodeGenTest { generateIsGetterForPrimitiveBooleanFields = true, ), ).generate() + val (dataTypes, interfaces) = codeGenResult assertThat(dataTypes.size).isEqualTo(1) val employee = dataTypes.single().typeSpec() @@ -858,18 +873,21 @@ class CodeGenTest { assertThat(employee.fieldSpecs().size).isEqualTo(2) assertThat(employee.fieldSpecs()).extracting("name").contains("enabled", "boxedEnabled") - val annotation = employee.annotations().single() - assertThat(annotation).isEqualTo(disableJsonTypeInfoAnnotation()) + val annotations = employee.annotations() + assertThat(annotations).contains(disableJsonTypeInfoAnnotation()) - val person = interfaces[0] + val person = interfaces.find { it.typeSpec().name() == "FeatureToggle" } assertThat(person.toString()).isEqualTo( """ |package com.netflix.graphql.dgs.codegen.tests.generated.types; | |import com.fasterxml.jackson.annotation.JsonSubTypes; |import com.fasterxml.jackson.annotation.JsonTypeInfo; + |import jakarta.annotation.Generated; |import java.lang.Boolean; | + |@Generated("com.netflix.graphql.dgs.codegen.CodeGen") + |@com.netflix.graphql.dgs.codegen.tests.generated.Generated |@JsonTypeInfo( | use = JsonTypeInfo.Id.NAME, | include = JsonTypeInfo.As.PROPERTY, @@ -889,7 +907,7 @@ class CodeGenTest { """.trimMargin(), ) - assertCompilesJava(dataTypes + interfaces) + assertCompilesJava(codeGenResult) } @Test @@ -932,13 +950,14 @@ class CodeGenTest { |} """.trimMargin() - val (dataTypes, interfaces) = + val codeGenResult = CodeGen( CodeGenConfig( schemas = setOf(schema), packageName = BASE_PACKAGE_NAME, ), ).generate() + val (dataTypes, interfaces) = codeGenResult assertThat(interfaces[0].toString()).isEqualTo( """ @@ -946,9 +965,12 @@ class CodeGenTest { | |import com.fasterxml.jackson.annotation.JsonSubTypes; |import com.fasterxml.jackson.annotation.JsonTypeInfo; + |import jakarta.annotation.Generated; |import java.lang.String; |import java.util.List; | + |@Generated("com.netflix.graphql.dgs.codegen.CodeGen") + |@com.netflix.graphql.dgs.codegen.tests.generated.Generated |@JsonTypeInfo( | use = JsonTypeInfo.Id.NAME, | include = JsonTypeInfo.As.PROPERTY, @@ -979,7 +1001,7 @@ class CodeGenTest { """.trimMargin(), ) - assertCompilesJava(dataTypes + interfaces) + assertCompilesJava(codeGenResult) } @Test @@ -1006,13 +1028,14 @@ class CodeGenTest { |} """.trimMargin() - val (dataTypes, interfaces) = + val codeGenResult = CodeGen( CodeGenConfig( schemas = setOf(schema), packageName = BASE_PACKAGE_NAME, ), ).generate() + val (dataTypes, interfaces) = codeGenResult assertThat(interfaces[0].toString()).isEqualTo( """ @@ -1020,8 +1043,11 @@ class CodeGenTest { | |import com.fasterxml.jackson.annotation.JsonSubTypes; |import com.fasterxml.jackson.annotation.JsonTypeInfo; + |import jakarta.annotation.Generated; |import java.lang.String; | + |@Generated("com.netflix.graphql.dgs.codegen.CodeGen") + |@com.netflix.graphql.dgs.codegen.tests.generated.Generated |@JsonTypeInfo( | use = JsonTypeInfo.Id.NAME, | include = JsonTypeInfo.As.PROPERTY, @@ -1039,7 +1065,7 @@ class CodeGenTest { """.trimMargin(), ) - assertCompilesJava(dataTypes + interfaces) + assertCompilesJava(codeGenResult) } @Test @@ -1062,13 +1088,14 @@ class CodeGenTest { } """.trimIndent() - val (dataTypes, interfaces) = + val codeGenResult = CodeGen( CodeGenConfig( schemas = setOf(schema), packageName = BASE_PACKAGE_NAME, ), ).generate() + val (dataTypes, interfaces) = codeGenResult assertThat(dataTypes.size).isEqualTo(1) val employee = dataTypes.single().typeSpec() @@ -1077,18 +1104,21 @@ class CodeGenTest { assertThat(employee.fieldSpecs().size).isEqualTo(3) assertThat(employee.fieldSpecs()).extracting("name").contains("firstname", "lastname", "company") - val annotation = employee.annotations().single() - assertThat(annotation).isEqualTo(disableJsonTypeInfoAnnotation()) + val annotations = employee.annotations() + assertThat(annotations).contains(disableJsonTypeInfoAnnotation()) - val person = interfaces[0] + val person = interfaces.find { it.typeSpec().name() == "Person" } assertThat(person.toString()).isEqualTo( """ |package com.netflix.graphql.dgs.codegen.tests.generated.types; | |import com.fasterxml.jackson.annotation.JsonSubTypes; |import com.fasterxml.jackson.annotation.JsonTypeInfo; + |import jakarta.annotation.Generated; |import java.lang.String; | + |@Generated("com.netflix.graphql.dgs.codegen.CodeGen") + |@com.netflix.graphql.dgs.codegen.tests.generated.Generated |@JsonTypeInfo( | use = JsonTypeInfo.Id.NAME, | include = JsonTypeInfo.As.PROPERTY, @@ -1108,7 +1138,7 @@ class CodeGenTest { """.trimMargin(), ) - assertCompilesJava(dataTypes + interfaces) + assertCompilesJava(codeGenResult) } @Test @@ -1127,13 +1157,14 @@ class CodeGenTest { """.trimIndent() - val (dataTypes) = + val codeGenResult = CodeGen( CodeGenConfig( schemas = setOf(schema), packageName = BASE_PACKAGE_NAME, ), ).generate() + val (dataTypes) = codeGenResult // Check data class assertThat(dataTypes.size).isEqualTo(1) @@ -1149,7 +1180,7 @@ class CodeGenTest { .extracting("type", ParameterizedTypeName::class.java) .contains(parameterizedType) - assertCompilesJava(dataTypes) + assertCompilesJava(codeGenResult) } @Test @@ -1179,13 +1210,14 @@ class CodeGenTest { } """.trimIndent() - val (dataTypes) = + val codeGenResult = CodeGen( CodeGenConfig( schemas = setOf(schema), packageName = BASE_PACKAGE_NAME, ), ).generate() + val (dataTypes) = codeGenResult assertThat(dataTypes).extracting("typeSpec.name").contains("Car", "Engine", "Performance") assertThat(dataTypes) @@ -1196,7 +1228,7 @@ class CodeGenTest { .extracting("type.simpleName") .containsExactly("Performance") - assertCompilesJava(dataTypes) + assertCompilesJava(codeGenResult) } @Test @@ -1213,7 +1245,7 @@ class CodeGenTest { } """.trimIndent() - val (dataTypes) = + val codeGenResult = CodeGen( CodeGenConfig( schemas = setOf(schema), @@ -1221,11 +1253,12 @@ class CodeGenTest { javaGenerateAllConstructor = false, ), ).generate() + val (dataTypes) = codeGenResult assertThat(dataTypes[0].typeSpec().methodSpecs()) .filteredOn { it.name().equals("") && it.parameters().isNotEmpty() } .hasSize(0) - assertCompilesJava(dataTypes) + assertCompilesJava(codeGenResult) } @Test @@ -1242,18 +1275,19 @@ class CodeGenTest { } """.trimIndent() - val (dataTypes) = + val codeGenResult = CodeGen( CodeGenConfig( schemas = setOf(schema), packageName = BASE_PACKAGE_NAME, ), ).generate() + val (dataTypes) = codeGenResult assertThat(dataTypes[0].typeSpec().methodSpecs()) .filteredOn { it.name().equals("") && it.parameters().isNotEmpty() } .hasSize(1) - assertCompilesJava(dataTypes) + assertCompilesJava(codeGenResult) } @Test @@ -1290,7 +1324,7 @@ class CodeGenTest { ).isEqualTo(3) assertThat(codeGenResult.javaEnumTypes[0].typeSpec().enumConstants()).containsKeys("ENGINEER", "MANAGER", "DIRECTOR") - assertCompilesJava(codeGenResult.javaEnumTypes) + assertCompilesJava(codeGenResult) } @Test @@ -1322,7 +1356,7 @@ class CodeGenTest { assertThat(codeGenResult.javaEnumTypes[0].typeSpec().name()).isEqualTo("EmployeeTypes") assertThat(codeGenResult.javaEnumTypes[0].typeSpec().enumConstants()).containsOnlyKeys("_default", "_root", "_new", "name") - assertCompilesJava(codeGenResult.javaEnumTypes) + assertCompilesJava(codeGenResult) } @Test @@ -1382,8 +1416,11 @@ class CodeGenTest { """ package com.netflix.graphql.dgs.codegen.tests.generated.types; + import jakarta.annotation.Generated; import java.lang.Deprecated; + @Generated("com.netflix.graphql.dgs.codegen.CodeGen") + @com.netflix.graphql.dgs.codegen.tests.generated.Generated public enum EmployeeTypes { /** * chatGPT does the engineering now @@ -1399,7 +1436,7 @@ class CodeGenTest { """.trimIndent(), ) - assertCompilesJava(codeGenResult.javaEnumTypes) + assertCompilesJava(codeGenResult) } @Test @@ -1426,6 +1463,10 @@ class CodeGenTest { """ |package com.netflix.graphql.dgs.codegen.tests.generated.types; | + |import jakarta.annotation.Generated; + | + |@Generated("com.netflix.graphql.dgs.codegen.CodeGen") + |@com.netflix.graphql.dgs.codegen.tests.generated.Generated |public enum SomeEnum { | @ValidName | ENUM_VALUE @@ -1474,7 +1515,7 @@ class CodeGenTest { ).isEqualTo(4) assertThat(codeGenResult.javaEnumTypes[0].typeSpec().enumConstants()).containsKeys("ENGINEER", "MANAGER", "DIRECTOR", "QA") - assertCompilesJava(codeGenResult.javaEnumTypes) + assertCompilesJava(codeGenResult) } @Test @@ -1504,7 +1545,7 @@ class CodeGenTest { assertThat(dataFetchers.size).isEqualTo(1) assertThat(dataFetchers[0].typeSpec().name()).isEqualTo("PeopleDatafetcher") assertThat(dataFetchers[0].packageName()).isEqualTo(DATA_FETCHER_PACKAGE_NAME) - assertCompilesJava(dataFetchers + dataTypes) + assertCompilesJava(codeGenResult) } class MappedTypesTestCases : ArgumentsProvider { @@ -1559,7 +1600,7 @@ class CodeGenTest { mappedTypeAsString: String, expected: String, ) { - val (dataTypes) = + val codeGenResult = CodeGen( CodeGenConfig( schemas = setOf(schema), @@ -1567,6 +1608,7 @@ class CodeGenTest { typeMapping = mapOf("JSON" to mappedTypeAsString), ), ).generate() + val (dataTypes) = codeGenResult assertThat(dataTypes.size).isEqualTo(1) assertThat(dataTypes[0].typeSpec().name()).isEqualTo("Person") assertThat(dataTypes[0].packageName()).isEqualTo(TYPES_PACKAGE_NAME) @@ -1588,7 +1630,7 @@ class CodeGenTest { .type() .toString(), ).isEqualTo(expected) - assertCompilesJava(dataTypes) + assertCompilesJava(codeGenResult) } } @@ -1720,16 +1762,19 @@ class CodeGenTest { ).generate() val interfaces = codeGenResult.javaInterfaces - assertThat(interfaces.size).isEqualTo(1) + assertThat(interfaces.size).isEqualTo(2) assertThat(interfaces[0].toString()).isEqualTo( """ |package com.netflix.graphql.dgs.codegen.tests.generated.types; | |import com.fasterxml.jackson.annotation.JsonSubTypes; |import com.fasterxml.jackson.annotation.JsonTypeInfo; + |import jakarta.annotation.Generated; |import java.lang.String; |import mypackage.Cat; | + |@Generated("com.netflix.graphql.dgs.codegen.CodeGen") + |@com.netflix.graphql.dgs.codegen.tests.generated.Generated |@JsonTypeInfo( | use = JsonTypeInfo.Id.NAME, | include = JsonTypeInfo.As.PROPERTY, @@ -1791,8 +1836,6 @@ class CodeGenTest { .type() .toString(), ).isEqualTo("mypackage.SomethingWithAName") - - assertThat(javaInterfaces).isEmpty() } @Test @@ -1837,8 +1880,6 @@ class CodeGenTest { .toString(), ).isEqualTo("mypackage.SomethingWithAName") assertThat((dataTypes[1].typeSpec().superinterfaces()[0].toString())).contains("mypackage.SomethingWithAName") - - assertThat(javaInterfaces).isEmpty() } @Test @@ -1875,7 +1916,6 @@ class CodeGenTest { ).generate() assertThat(dataTypes).isEmpty() - assertThat(javaInterfaces).isEmpty() } @Test @@ -1910,7 +1950,7 @@ class CodeGenTest { ).generate() assertThat(dataTypes).hasSize(1) - assertThat(javaInterfaces).hasSize(1) + assertThat(javaInterfaces).hasSize(2) assertThat(dataTypes[0].typeSpec().name()).isEqualTo("Movie") } @@ -1985,13 +2025,14 @@ class CodeGenTest { } """.trimIndent() - val (dataTypes) = + val codeGenResult = CodeGen( CodeGenConfig( schemas = setOf(schema), packageName = BASE_PACKAGE_NAME, ), ).generate() + val (dataTypes) = codeGenResult assertThat(dataTypes.size).isEqualTo(1) assertThat(dataTypes[0].typeSpec().name()).isEqualTo("MovieFilter") @@ -2000,7 +2041,7 @@ class CodeGenTest { assertThat(dataTypes[0].typeSpec().fieldSpecs().size).isEqualTo(1) assertThat(dataTypes[0].typeSpec().fieldSpecs()).extracting("name").contains("genre") - assertCompilesJava(dataTypes) + assertCompilesJava(codeGenResult) } @ParameterizedTest @@ -2017,10 +2058,11 @@ class CodeGenTest { } """.trimIndent() - val (dataTypes, _, enumTypes) = + val codeGenResult = CodeGen( CodeGenConfig(schemas = setOf(schema), packageName = BASE_PACKAGE_NAME, trackInputFieldSet = trackInputFieldSet), ).generate() + val (dataTypes, _, enumTypes) = codeGenResult assertThat(dataTypes).hasSize(1) val data = dataTypes[0] @@ -2042,7 +2084,7 @@ class CodeGenTest { assertThat(colorField.initializer().toString()).isEqualTo("$TYPES_PACKAGE_NAME.Color.red") } - assertCompilesJava(enumTypes + dataTypes) + assertCompilesJava(codeGenResult) } @Test @@ -2067,9 +2109,10 @@ class CodeGenTest { } """.trimIndent() - val (dataTypes, _, enumTypes) = CodeGen(CodeGenConfig(schemas = setOf(schema), packageName = BASE_PACKAGE_NAME)).generate() + val codeGenResult = CodeGen(CodeGenConfig(schemas = setOf(schema), packageName = BASE_PACKAGE_NAME)).generate() + val (dataTypes, _, enumTypes) = codeGenResult - assertCompilesJava(enumTypes + dataTypes) + assertCompilesJava(codeGenResult) } @Test @@ -2081,7 +2124,8 @@ class CodeGenTest { } """.trimIndent() - val (dataTypes) = CodeGen(CodeGenConfig(schemas = setOf(schema), packageName = BASE_PACKAGE_NAME)).generate() + val codeGenResult = CodeGen(CodeGenConfig(schemas = setOf(schema), packageName = BASE_PACKAGE_NAME)).generate() + val (dataTypes) = codeGenResult assertThat(dataTypes).hasSize(1) val data = dataTypes[0] @@ -2097,7 +2141,7 @@ class CodeGenTest { assertThat(colorField.name()).isEqualTo("names") assertThat(colorField.initializer().toString()).isEqualTo("java.util.Collections.emptyList()") - assertCompilesJava(dataTypes) + assertCompilesJava(codeGenResult) } @Test @@ -2109,7 +2153,8 @@ class CodeGenTest { } """.trimIndent() - val (dataTypes) = CodeGen(CodeGenConfig(schemas = setOf(schema), packageName = BASE_PACKAGE_NAME)).generate() + val codeGenResult = CodeGen(CodeGenConfig(schemas = setOf(schema), packageName = BASE_PACKAGE_NAME)).generate() + val (dataTypes) = codeGenResult assertThat(dataTypes).hasSize(1) val data = dataTypes[0] @@ -2125,7 +2170,7 @@ class CodeGenTest { assertThat(colorField.name()).isEqualTo("names") assertThat(colorField.initializer().toString()).isEqualTo("""java.util.Arrays.asList("A", "B")""") - assertCompilesJava(dataTypes) + assertCompilesJava(codeGenResult) } @Test @@ -2137,7 +2182,8 @@ class CodeGenTest { } """.trimIndent() - val (dataTypes) = CodeGen(CodeGenConfig(schemas = setOf(schema), packageName = BASE_PACKAGE_NAME)).generate() + val codeGenResult = CodeGen(CodeGenConfig(schemas = setOf(schema), packageName = BASE_PACKAGE_NAME)).generate() + val (dataTypes) = codeGenResult assertThat(dataTypes).hasSize(1) val data = dataTypes[0] @@ -2153,7 +2199,7 @@ class CodeGenTest { assertThat(colorField.name()).isEqualTo("numbers") assertThat(colorField.initializer().toString()).isEqualTo("""java.util.Arrays.asList(1, 2, 3)""") - assertCompilesJava(dataTypes) + assertCompilesJava(codeGenResult) } @Test @@ -2170,7 +2216,8 @@ class CodeGenTest { } """.trimIndent() - val (dataTypes, _, enumTypes) = CodeGen(CodeGenConfig(schemas = setOf(schema), packageName = BASE_PACKAGE_NAME)).generate() + val codeGenResult = CodeGen(CodeGenConfig(schemas = setOf(schema), packageName = BASE_PACKAGE_NAME)).generate() + val (dataTypes, _, enumTypes) = codeGenResult assertThat(dataTypes).hasSize(1) val data = dataTypes[0] @@ -2186,7 +2233,7 @@ class CodeGenTest { assertThat(colorField.name()).isEqualTo("colors") assertThat(colorField.initializer().toString()).isEqualTo("""java.util.Arrays.asList($TYPES_PACKAGE_NAME.Color.red)""") - assertCompilesJava(dataTypes + enumTypes) + assertCompilesJava(codeGenResult) } @Test @@ -2206,13 +2253,14 @@ class CodeGenTest { } """.trimIndent() - val (dataTypes) = + val codeGenResult = CodeGen( CodeGenConfig( schemas = setOf(schema), packageName = BASE_PACKAGE_NAME, ), ).generate() + val (dataTypes) = codeGenResult assertThat(dataTypes.size).isEqualTo(1) assertThat(dataTypes[0].typeSpec().name()).isEqualTo("MovieFilter") @@ -2220,7 +2268,7 @@ class CodeGenTest { assertThat(dataTypes[0].typeSpec().fieldSpecs().size).isEqualTo(2) assertThat(dataTypes[0].typeSpec().fieldSpecs()).extracting("name").contains("genre", "releaseYear") - assertCompilesJava(dataTypes) + assertCompilesJava(codeGenResult) } @Test @@ -2237,13 +2285,14 @@ class CodeGenTest { } """.trimIndent() - val (dataTypes) = + val codeGenResult = CodeGen( CodeGenConfig( schemas = setOf(schema), packageName = BASE_PACKAGE_NAME, ), ).generate() + val (dataTypes) = codeGenResult assertThat(dataTypes[0].typeSpec().methodSpecs()).extracting("name").contains("toString") val expectedString = """return "Person{firstname='" + firstname + "', lastname='" + lastname + "'}";""" @@ -2256,7 +2305,7 @@ class CodeGenTest { .toString() .trimIndent() assertThat(generatedString).isEqualTo(expectedString) - assertCompilesJava(dataTypes) + assertCompilesJava(codeGenResult) } @Test @@ -2275,13 +2324,14 @@ class CodeGenTest { directive @sensitive on FIELD_DEFINITION """.trimIndent() - val (dataTypes) = + val codeGenResult = CodeGen( CodeGenConfig( schemas = setOf(schema), packageName = BASE_PACKAGE_NAME, ), ).generate() + val (dataTypes) = codeGenResult assertThat(dataTypes[0].typeSpec().methodSpecs()).extracting("name").contains("toString") val expectedString = """return "Person{firstname='" + firstname + "', lastname='" + lastname + "', password='*****'}";""" @@ -2294,7 +2344,7 @@ class CodeGenTest { .toString() .trimIndent() assertThat(generatedString).isEqualTo(expectedString) - assertCompilesJava(dataTypes) + assertCompilesJava(codeGenResult) } @Test @@ -2310,13 +2360,14 @@ class CodeGenTest { directive @sensitive on INPUT_FIELD_DEFINITION """.trimIndent() - val (dataTypes) = + val codeGenResult = CodeGen( CodeGenConfig( schemas = setOf(schema), packageName = BASE_PACKAGE_NAME, ), ).generate() + val (dataTypes) = codeGenResult assertThat(dataTypes[0].typeSpec().methodSpecs()).extracting("name").contains("toString") val expectedString = """return "PersonFilter{email='*****'}";""" @@ -2329,7 +2380,7 @@ class CodeGenTest { .toString() .trimIndent() assertThat(generatedString).isEqualTo(expectedString) - assertCompilesJava(dataTypes) + assertCompilesJava(codeGenResult) } @ParameterizedTest(name = "{index} => Snake Case? {0}; expected names {1}") @@ -2726,7 +2777,10 @@ class CodeGenTest { | |import com.fasterxml.jackson.annotation.JsonSubTypes; |import com.fasterxml.jackson.annotation.JsonTypeInfo; + |import jakarta.annotation.Generated; | + |@Generated("com.netflix.graphql.dgs.codegen.CodeGen") + |@com.netflix.graphql.dgs.codegen.tests.generated.Generated |@JsonTypeInfo( | use = JsonTypeInfo.Id.NAME, | include = JsonTypeInfo.As.PROPERTY, @@ -2743,7 +2797,7 @@ class CodeGenTest { """.trimMargin(), ) - assertCompilesJava(result.javaDataTypes + result.javaInterfaces) + assertCompilesJava(result) } @Test @@ -2825,7 +2879,7 @@ class CodeGenTest { .containsExactly("ShowType", "SourceType") assertThat(codeGenResult.clientProjections).isEmpty() - assertCompilesJava(codeGenResult.javaDataTypes + codeGenResult.javaEnumTypes) + assertCompilesJava(codeGenResult) } @Test @@ -2908,7 +2962,7 @@ class CodeGenTest { .containsExactly("ShouldNotInclude", "ShowType", "SourceType") assertThat(codeGenResult.clientProjections).isEmpty() - assertCompilesJava(codeGenResult.javaDataTypes + codeGenResult.javaEnumTypes + codeGenResult.javaInterfaces) + assertCompilesJava(codeGenResult) } @Test @@ -2987,16 +3041,17 @@ class CodeGenTest { } """.trimIndent() - val (dataTypes) = + val codeGenResult = CodeGen( CodeGenConfig(schemas = setOf(schema), packageName = BASE_PACKAGE_NAME, subPackageNameTypes = "mytypes"), ).generate() + val (dataTypes) = codeGenResult assertThat(dataTypes.size).isEqualTo(1) val typeSpec = dataTypes[0].typeSpec() assertThat(typeSpec.name()).isEqualTo("Person") assertThat(dataTypes[0].packageName()).isEqualTo("$BASE_PACKAGE_NAME.mytypes") - assertCompilesJava(dataTypes) + assertCompilesJava(codeGenResult) } @Test @@ -3027,13 +3082,14 @@ class CodeGenTest { """.trimIndent() - val (dataTypes, interfaces) = + val codeGenResult = CodeGen( CodeGenConfig( schemas = setOf(schema), packageName = BASE_PACKAGE_NAME, ), ).generate() + val (dataTypes, interfaces) = codeGenResult assertThat(dataTypes.size).isEqualTo(1) val talent = dataTypes.single().typeSpec() @@ -3044,18 +3100,21 @@ class CodeGenTest { .extracting("name") .contains("firstname", "lastname", "company", "imdbProfile") - val annotation = talent.annotations().single() - assertThat(annotation).isEqualTo(disableJsonTypeInfoAnnotation()) + val annotations = talent.annotations() + assertThat(annotations).contains(disableJsonTypeInfoAnnotation()) - assertThat(interfaces).hasSize(2) + assertThat(interfaces).hasSize(3) val person = interfaces[0] assertThat(person.toString()).isEqualTo( """ |package com.netflix.graphql.dgs.codegen.tests.generated.types; | + |import jakarta.annotation.Generated; |import java.lang.String; | + |@Generated("com.netflix.graphql.dgs.codegen.CodeGen") + |@com.netflix.graphql.dgs.codegen.tests.generated.Generated |public interface Person { | String getFirstname(); | @@ -3076,8 +3135,11 @@ class CodeGenTest { | |import com.fasterxml.jackson.annotation.JsonSubTypes; |import com.fasterxml.jackson.annotation.JsonTypeInfo; + |import jakarta.annotation.Generated; |import java.lang.String; | + |@Generated("com.netflix.graphql.dgs.codegen.CodeGen") + |@com.netflix.graphql.dgs.codegen.tests.generated.Generated |@JsonTypeInfo( | use = JsonTypeInfo.Id.NAME, | include = JsonTypeInfo.As.PROPERTY, @@ -3106,11 +3168,14 @@ class CodeGenTest { |package com.netflix.graphql.dgs.codegen.tests.generated.types; | |import com.fasterxml.jackson.annotation.JsonTypeInfo; + |import jakarta.annotation.Generated; |import java.lang.Object; |import java.lang.Override; |import java.lang.String; |import java.util.Objects; | + |@Generated("com.netflix.graphql.dgs.codegen.CodeGen") + |@com.netflix.graphql.dgs.codegen.tests.generated.Generated |@JsonTypeInfo( | use = JsonTypeInfo.Id.NONE |) @@ -3190,6 +3255,8 @@ class CodeGenTest { | return new Builder(); | } | + | @Generated("com.netflix.graphql.dgs.codegen.CodeGen") + | @com.netflix.graphql.dgs.codegen.tests.generated.Generated | public static class Builder { | private String firstname; | @@ -3233,7 +3300,7 @@ class CodeGenTest { """.trimMargin(), ) - assertCompilesJava(dataTypes + interfaces) + assertCompilesJava(codeGenResult) } @Test @@ -3267,24 +3334,28 @@ class CodeGenTest { } """.trimIndent() - val (dataTypes, interfaces) = + val codeGenResult = CodeGen( CodeGenConfig( schemas = setOf(schema), packageName = BASE_PACKAGE_NAME, ), ).generate() + val (dataTypes, interfaces) = codeGenResult - assertThat(interfaces).hasSize(2) + assertThat(interfaces).hasSize(3) val person = interfaces.find { it.typeSpec().name() == "Person" }!! assertThat(person.toString()).isEqualTo( """ |package com.netflix.graphql.dgs.codegen.tests.generated.types; | + |import jakarta.annotation.Generated; |import java.lang.Integer; |import java.lang.String; | + |@Generated("com.netflix.graphql.dgs.codegen.CodeGen") + |@com.netflix.graphql.dgs.codegen.tests.generated.Generated |public interface Person { | String getName(); | @@ -3305,9 +3376,12 @@ class CodeGenTest { | |import com.fasterxml.jackson.annotation.JsonSubTypes; |import com.fasterxml.jackson.annotation.JsonTypeInfo; + |import jakarta.annotation.Generated; |import java.lang.Integer; |import java.lang.String; | + |@Generated("com.netflix.graphql.dgs.codegen.CodeGen") + |@com.netflix.graphql.dgs.codegen.tests.generated.Generated |@JsonTypeInfo( | use = JsonTypeInfo.Id.NAME, | include = JsonTypeInfo.As.PROPERTY, @@ -3332,7 +3406,7 @@ class CodeGenTest { """.trimMargin(), ) - assertCompilesJava(dataTypes + interfaces) + assertCompilesJava(codeGenResult) } @Test @@ -3361,7 +3435,7 @@ class CodeGenTest { } """.trimIndent() - val (dataTypes, interfaces) = + val codeGenResult = CodeGen( CodeGenConfig( schemas = setOf(schema), @@ -3369,18 +3443,22 @@ class CodeGenTest { generateInterfaceMethodsForInterfaceFields = true, ), ).generate() + val (dataTypes, interfaces) = codeGenResult - assertThat(interfaces).hasSize(2) + assertThat(interfaces).hasSize(3) val person = interfaces.find { it.typeSpec().name() == "Person" }!! assertThat(person.toString()).isEqualTo( """ |package com.netflix.graphql.dgs.codegen.tests.generated.types; | + |import jakarta.annotation.Generated; |import java.lang.Integer; |import java.lang.String; |import java.util.List; | + |@Generated("com.netflix.graphql.dgs.codegen.CodeGen") + |@com.netflix.graphql.dgs.codegen.tests.generated.Generated |public interface Person { | String getName(); | @@ -3409,10 +3487,13 @@ class CodeGenTest { | |import com.fasterxml.jackson.annotation.JsonSubTypes; |import com.fasterxml.jackson.annotation.JsonTypeInfo; + |import jakarta.annotation.Generated; |import java.lang.Integer; |import java.lang.String; |import java.util.List; | + |@Generated("com.netflix.graphql.dgs.codegen.CodeGen") + |@com.netflix.graphql.dgs.codegen.tests.generated.Generated |@JsonTypeInfo( | use = JsonTypeInfo.Id.NAME, | include = JsonTypeInfo.As.PROPERTY, @@ -3440,7 +3521,7 @@ class CodeGenTest { """.trimMargin(), ) - assertCompilesJava(dataTypes + interfaces) + assertCompilesJava(codeGenResult) } @Test @@ -3458,7 +3539,7 @@ class CodeGenTest { """.trimIndent() - val (dataTypes, interfaces) = + val codeGenResult = CodeGen( CodeGenConfig( schemas = setOf(schema), @@ -3466,16 +3547,20 @@ class CodeGenTest { generateInterfaceSetters = false, ), ).generate() + val (dataTypes, interfaces) = codeGenResult - assertThat(interfaces).hasSize(1) + assertThat(interfaces).hasSize(2) - val person = interfaces[0] + val person = interfaces.find { it.typeSpec().name() == "Person" } assertThat(person.toString()).isEqualTo( """ |package com.netflix.graphql.dgs.codegen.tests.generated.types; | + |import jakarta.annotation.Generated; |import java.lang.String; | + |@Generated("com.netflix.graphql.dgs.codegen.CodeGen") + |@com.netflix.graphql.dgs.codegen.tests.generated.Generated |public interface Person { | String getFirstname(); | @@ -3484,7 +3569,7 @@ class CodeGenTest { | """.trimMargin(), ) - assertCompilesJava(dataTypes + interfaces) + assertCompilesJava(codeGenResult) } @Test @@ -3513,9 +3598,10 @@ class CodeGenTest { ), ).generate() - assertThat(result.javaInterfaces).hasSize(1) - assertThat(result.javaInterfaces[0].typeSpec().methodSpecs()).hasSize(6) - assertThat(result.javaInterfaces[0].typeSpec().methodSpecs()) + assertThat(result.javaInterfaces).hasSize(2) + val person = result.javaInterfaces.single { it.typeSpec().name() == "Person" } + assertThat(person.typeSpec().methodSpecs()).hasSize(6) + assertThat(person.typeSpec().methodSpecs()) .extracting("name") .containsExactly("getFirstname", "setFirstname", "getLastname", "setLastname", "getAge", "setAge") } @@ -3539,7 +3625,7 @@ class CodeGenTest { CodeGen( CodeGenConfig(schemas = setOf(schema), packageName = BASE_PACKAGE_NAME, generateClientApi = true, typeMapping = mapOf()), ).generate() - assertCompilesJava(codeGenResult.javaFiles) + assertCompilesJava(codeGenResult) } @Test @@ -3577,7 +3663,7 @@ class CodeGenTest { assertThat(iapple.typeSpec().name()).isEqualTo("IApple") assertThat(iapple.typeSpec().fieldSpecs()).isEmpty() - assertCompilesJava(dataTypes + interfaces) + assertCompilesJava(result) } @Test @@ -3612,18 +3698,21 @@ class CodeGenTest { val dataTypes = result.javaDataTypes val iFruit = interfaces[2] - assertThat(iFruit.typeSpec().annotations().size).isEqualTo(2) - assertThat( - iFruit.typeSpec().annotations()[0].toString(), - ).isEqualTo( + val jsonTypeInfo = + iFruit.typeSpec().annotations().single { + (it.type() as ClassName).canonicalName() == "com.fasterxml.jackson.annotation.JsonTypeInfo" + } + assertThat(jsonTypeInfo.toString()).isEqualTo( "@com.fasterxml.jackson.annotation.JsonTypeInfo(use = com.fasterxml.jackson.annotation.JsonTypeInfo.Id.NAME, include = com.fasterxml.jackson.annotation.JsonTypeInfo.As.PROPERTY, property = \"__typename\")", ) - assertThat( - iFruit.typeSpec().annotations()[1].toString(), - ).isEqualTo( + val jsonSubTypes = + iFruit.typeSpec().annotations().single { + (it.type() as ClassName).canonicalName() == "com.fasterxml.jackson.annotation.JsonSubTypes" + } + assertThat(jsonSubTypes.toString()).isEqualTo( "@com.fasterxml.jackson.annotation.JsonSubTypes(@com.fasterxml.jackson.annotation.JsonSubTypes.Type(value = com.netflix.graphql.dgs.codegen.tests.generated.types.Apple.class, name = \"Apple\"))", ) - assertCompilesJava(dataTypes + interfaces) + assertCompilesJava(result) } @Test @@ -3661,7 +3750,7 @@ class CodeGenTest { assertThat(itruthy.typeSpec().fieldSpecs()).isEmpty() assertThat(itruthy.typeSpec().methodSpecs()[0].name()).isEqualTo("isTruth") - assertCompilesJava(dataTypes + interfaces) + assertCompilesJava(result) } @Test @@ -3679,7 +3768,7 @@ class CodeGenTest { } """.trimIndent() - val (dataTypes, interfaces) = + val codeGenResult = CodeGen( CodeGenConfig( schemas = setOf(schema), @@ -3687,17 +3776,22 @@ class CodeGenTest { generateInterfaceSetters = false, ), ).generate() + val (dataTypes, interfaces) = codeGenResult - assertThat(interfaces).hasSize(1) + assertThat(interfaces).hasSize(2) + val petInterface = interfaces.find { it.typeSpec().name() == "Pet" } - assertThat(interfaces[0].toString()).isEqualTo( + assertThat(petInterface.toString()).isEqualTo( """ |package com.netflix.graphql.dgs.codegen.tests.generated.types; | |import com.fasterxml.jackson.annotation.JsonSubTypes; |import com.fasterxml.jackson.annotation.JsonTypeInfo; + |import jakarta.annotation.Generated; |import java.lang.String; | + |@Generated("com.netflix.graphql.dgs.codegen.CodeGen") + |@com.netflix.graphql.dgs.codegen.tests.generated.Generated |@JsonTypeInfo( | use = JsonTypeInfo.Id.NAME, | include = JsonTypeInfo.As.PROPERTY, @@ -3711,7 +3805,7 @@ class CodeGenTest { |} | """.trimMargin(), - assertCompilesJava(dataTypes + interfaces), + assertCompilesJava(codeGenResult), ) } @@ -3765,7 +3859,7 @@ class CodeGenTest { assertThat(category.typeSpec().methodSpecs()[2].name()).isEqualTo("getFruit") assertThat(category.typeSpec().methodSpecs()[3].name()).isEqualTo("setFruit") - assertCompilesJava(dataTypes + interfaces) + assertCompilesJava(result) } @Test @@ -3831,7 +3925,7 @@ class CodeGenTest { assertThat(category.typeSpec().methodSpecs()[2].name()).isEqualTo("getFruit") assertThat(category.typeSpec().methodSpecs()[3].name()).isEqualTo("setFruit") - assertCompilesJava(dataTypes + interfaces) + assertCompilesJava(result) } @Test @@ -3855,7 +3949,7 @@ class CodeGenTest { |} """.trimMargin() - val (dataTypes, interfaces) = + val codeGenResult = CodeGen( CodeGenConfig( schemas = setOf(schema), @@ -3863,6 +3957,7 @@ class CodeGenTest { generateInterfaceMethodsForInterfaceFields = true, ), ).generate() + val (dataTypes, interfaces) = codeGenResult assertThat(interfaces[0].toString()).isEqualTo( """ @@ -3870,9 +3965,12 @@ class CodeGenTest { | |import com.fasterxml.jackson.annotation.JsonSubTypes; |import com.fasterxml.jackson.annotation.JsonTypeInfo; + |import jakarta.annotation.Generated; |import java.lang.String; |import java.util.List; | + |@Generated("com.netflix.graphql.dgs.codegen.CodeGen") + |@com.netflix.graphql.dgs.codegen.tests.generated.Generated |@JsonTypeInfo( | use = JsonTypeInfo.Id.NAME, | include = JsonTypeInfo.As.PROPERTY, @@ -3895,7 +3993,7 @@ class CodeGenTest { """.trimMargin(), ) - assertCompilesJava(dataTypes + interfaces) + assertCompilesJava(codeGenResult) } @Test @@ -3924,7 +4022,7 @@ class CodeGenTest { } """.trimIndent() - val (dataTypes, interfaces) = + val codeGenResult = CodeGen( CodeGenConfig( schemas = setOf(schema), @@ -3933,18 +4031,22 @@ class CodeGenTest { generateInterfaceSetters = false, ), ).generate() + val (dataTypes, interfaces) = codeGenResult - assertThat(interfaces).hasSize(2) + assertThat(interfaces).hasSize(3) val person = interfaces.find { it.typeSpec().name() == "Person" }!! assertThat(person.toString()).isEqualTo( """ |package com.netflix.graphql.dgs.codegen.tests.generated.types; | + |import jakarta.annotation.Generated; |import java.lang.Integer; |import java.lang.String; |import java.util.List; | + |@Generated("com.netflix.graphql.dgs.codegen.CodeGen") + |@com.netflix.graphql.dgs.codegen.tests.generated.Generated |public interface Person { | String getName(); | @@ -3965,10 +4067,13 @@ class CodeGenTest { | |import com.fasterxml.jackson.annotation.JsonSubTypes; |import com.fasterxml.jackson.annotation.JsonTypeInfo; + |import jakarta.annotation.Generated; |import java.lang.Integer; |import java.lang.String; |import java.util.List; | + |@Generated("com.netflix.graphql.dgs.codegen.CodeGen") + |@com.netflix.graphql.dgs.codegen.tests.generated.Generated |@JsonTypeInfo( | use = JsonTypeInfo.Id.NAME, | include = JsonTypeInfo.As.PROPERTY, @@ -3988,7 +4093,7 @@ class CodeGenTest { """.trimMargin(), ) - assertCompilesJava(dataTypes + interfaces) + assertCompilesJava(codeGenResult) } @Test @@ -4046,7 +4151,7 @@ class CodeGenTest { assertThat((basket.typeSpec().methodSpecs()[0].returnType() as ClassName).simpleName()).isEqualTo("Fruit") assertThat(basket.typeSpec().methodSpecs()).extracting("name").contains("getFruit") - assertCompilesJava(dataTypes + interfaces) + assertCompilesJava(result) } @Test @@ -4072,21 +4177,22 @@ class CodeGenTest { """.trimIndent() - val (dataTypes, interfaces) = + val codeGenResult = CodeGen( CodeGenConfig( schemas = setOf(schema), packageName = BASE_PACKAGE_NAME, ), ).generate() + val (dataTypes, interfaces) = codeGenResult assertThat(dataTypes).hasSize(1) - assertThat(interfaces).hasSize(2) + assertThat(interfaces).hasSize(3) assertThat(interfaces[1].typeSpec().superinterfaces()).hasSize(1) assertThat((interfaces[1].typeSpec().superinterfaces()[0] as ClassName).simpleName()).isEqualTo("Fruit") - assertCompilesJava(dataTypes + interfaces) + assertCompilesJava(codeGenResult) } @Test @@ -4119,7 +4225,7 @@ class CodeGenTest { val interfaces = result.javaInterfaces val dataTypes = result.javaDataTypes - assertThat(interfaces).hasSize(3) + assertThat(interfaces).hasSize(4) val team = interfaces[0] assertThat(team.typeSpec().name()).isEqualTo("ITeam") @@ -4143,7 +4249,7 @@ class CodeGenTest { ).contains("int") assertThat(standing.typeSpec().methodSpecs()[2].returnType()).extracting("simpleName").isEqualTo("ITeam") - assertCompilesJava(dataTypes + interfaces) + assertCompilesJava(result) } @ParameterizedTest @@ -4209,7 +4315,7 @@ class CodeGenTest { val interfaces = result.javaInterfaces val dataTypes = result.javaDataTypes - assertThat(interfaces).hasSize(4) // IMovie, IMoviePage, IGenre, IRating + assertThat(interfaces).hasSize(5) // IMovie, IMoviePage, IGenre, IRating, Generated assertThat(dataTypes).hasSize(5) // Movie, MoviePage, Genre, Rating, MovieFilter val iMovie = interfaces[0] @@ -4304,7 +4410,7 @@ class CodeGenTest { assertThat(movieFilter.typeSpec().fieldSpecs()[4].type()).extracting("simpleName").isEqualTo("Rating") } - assertCompilesJava(dataTypes + interfaces + result.javaEnumTypes) + assertCompilesJava(result) } @Test @@ -4379,7 +4485,7 @@ class CodeGenTest { val interfaces = result.javaInterfaces val dataTypes = result.javaDataTypes - assertThat(interfaces).hasSize(6) // IMovie, IMoviePage, IGenre, IActionGenre, IComedyGenre, IRating + assertThat(interfaces).hasSize(7) // IMovie, IMoviePage, IGenre, IActionGenre, IComedyGenre, IRating, Generated assertThat(dataTypes).hasSize(0) val iMovie = interfaces[0] @@ -4420,7 +4526,7 @@ class CodeGenTest { assertThat(iGenre.typeSpec().name()).isEqualTo("Genre") assertThat(iGenre.typeSpec().methodSpecs()).extracting("name").containsExactly("getName", "setName") - assertCompilesJava(dataTypes + interfaces + result.javaEnumTypes) + assertCompilesJava(result) } @Test @@ -4468,7 +4574,7 @@ class CodeGenTest { val interfaces = result.javaInterfaces val dataTypes = result.javaDataTypes - assertThat(interfaces).hasSize(5) // IHuman, IDroid, ISearchResultPage, SearchResult, Character + assertThat(interfaces).hasSize(6) // IHuman, IDroid, ISearchResultPage, SearchResult, Character, Generated assertThat(dataTypes).hasSize(3) // Human, Droid, SearchResultPage assertThat(interfaces[0].typeSpec().name()).isEqualTo("IHuman") @@ -4506,7 +4612,7 @@ class CodeGenTest { assertThat(parameterizedTypeName.rawType()).extracting("simpleName").isEqualTo("List") assertThat(parameterizedTypeName.typeArguments()[0]).extracting("simpleName").isEqualTo("SearchResult") - assertCompilesJava(dataTypes + interfaces + result.javaEnumTypes) + assertCompilesJava(result) } @Test @@ -4820,6 +4926,7 @@ It takes a title and such. packageName = BASE_PACKAGE_NAME, language = Language.JAVA, addGeneratedAnnotation = true, + disableDatesInGeneratedAnnotation = false, generateClientApi = true, ), ).generate() @@ -4912,15 +5019,19 @@ It takes a title and such. val person = dataTypes.single().typeSpec() assertThat(person.name()).isEqualTo("Person") assertThat(person.javadoc().toString()).isEqualTo("This is going bye bye") - assertThat(person.annotations()).hasSize(1) - assertThat(((person.annotations()[0] as AnnotationSpec).type() as ClassName).simpleName()).isEqualTo("Deprecated") - assertThat(((person.annotations()[0] as AnnotationSpec).type() as ClassName).canonicalName()).isEqualTo("java.lang.Deprecated") + val personDeprecated = + person.annotations().single { + (it.type() as ClassName).canonicalName() == "java.lang.Deprecated" + } + assertThat((personDeprecated.type() as ClassName).simpleName()).isEqualTo("Deprecated") val fields = person.fieldSpecs() assertThat(fields).hasSize(1) assertThat(fields[0].javadoc().toString()).isEqualTo("@deprecated This field is no longer available. Replaced by firstName") - assertThat(fields[0].annotations()).hasSize(1) - assertThat(((fields[0].annotations()[0] as AnnotationSpec).type() as ClassName).simpleName()).isEqualTo("Deprecated") - assertThat(((fields[0].annotations()[0] as AnnotationSpec).type() as ClassName).canonicalName()).isEqualTo("java.lang.Deprecated") + val fieldDeprecated = + fields[0].annotations().single { + (it.type() as ClassName).canonicalName() == "java.lang.Deprecated" + } + assertThat((fieldDeprecated.type() as ClassName).simpleName()).isEqualTo("Deprecated") } @Test @@ -4946,23 +5057,22 @@ It takes a title and such. assertThat(dataTypes.size).isEqualTo(1) val person = dataTypes.single().typeSpec() assertThat(person.name()).isEqualTo("Person") - assertThat(person.annotations()).hasSize(1) - assertThat(((person.annotations()[0] as AnnotationSpec).type() as ClassName).simpleName()).isEqualTo("ValidPerson") - assertThat( - ((person.annotations()[0] as AnnotationSpec).type() as ClassName).canonicalName(), - ).isEqualTo("com.test.validator.ValidPerson") - assertThat((person.annotations()[0] as AnnotationSpec).members()).hasSize(2) - assertThat((person.annotations()[0] as AnnotationSpec).members()["maxLimit"]).isEqualTo(listOf(CodeBlock.of("\$L", 10))) - assertThat( - (person.annotations()[0] as AnnotationSpec).members()["types"], - ).isEqualTo(listOf(CodeBlock.of("{\$L}", "\"husband\", \"wife\""))) + val validPerson = + person.annotations().single { + (it.type() as ClassName).canonicalName() == "com.test.validator.ValidPerson" + } + assertThat((validPerson.type() as ClassName).simpleName()).isEqualTo("ValidPerson") + assertThat(validPerson.members()).hasSize(2) + assertThat(validPerson.members()["maxLimit"]).isEqualTo(listOf(CodeBlock.of("\$L", 10))) + assertThat(validPerson.members()["types"]) + .isEqualTo(listOf(CodeBlock.of("{\$L}", "\"husband\", \"wife\""))) val fields = person.fieldSpecs() assertThat(fields).hasSize(1) - assertThat(fields[0].annotations()).hasSize(1) - assertThat(((fields[0].annotations()[0] as AnnotationSpec).type() as ClassName).simpleName()).isEqualTo("ValidName") - assertThat( - ((fields[0].annotations()[0] as AnnotationSpec).type() as ClassName).canonicalName(), - ).isEqualTo("com.test.validator.ValidName") + val validName = + fields[0].annotations().single { + (it.type() as ClassName).canonicalName() == "com.test.validator.ValidName" + } + assertThat((validName.type() as ClassName).simpleName()).isEqualTo("ValidName") } @Test @@ -4988,23 +5098,22 @@ It takes a title and such. assertThat(dataTypes.size).isEqualTo(1) val person = dataTypes.single().typeSpec() assertThat(person.name()).isEqualTo("Person") - assertThat(person.annotations()).hasSize(1) - assertThat(((person.annotations()[0] as AnnotationSpec).type() as ClassName).simpleName()).isEqualTo("ValidPerson") - assertThat( - ((person.annotations()[0] as AnnotationSpec).type() as ClassName).canonicalName(), - ).isEqualTo("com.test.validator.ValidPerson") - assertThat((person.annotations()[0] as AnnotationSpec).members()).hasSize(2) - assertThat((person.annotations()[0] as AnnotationSpec).members()["maxLimit"]).isEqualTo(listOf(CodeBlock.of("\$L", 10))) - assertThat( - (person.annotations()[0] as AnnotationSpec).members()["types"], - ).isEqualTo(listOf(CodeBlock.of("{\$L}", "\"husband\", \"wife\""))) + val validPerson = + person.annotations().single { + (it.type() as ClassName).canonicalName() == "com.test.validator.ValidPerson" + } + assertThat((validPerson.type() as ClassName).simpleName()).isEqualTo("ValidPerson") + assertThat(validPerson.members()).hasSize(2) + assertThat(validPerson.members()["maxLimit"]).isEqualTo(listOf(CodeBlock.of("\$L", 10))) + assertThat(validPerson.members()["types"]) + .isEqualTo(listOf(CodeBlock.of("{\$L}", "\"husband\", \"wife\""))) val fields = person.fieldSpecs() assertThat(fields).hasSize(1) - assertThat(fields[0].annotations()).hasSize(1) - assertThat(((fields[0].annotations()[0] as AnnotationSpec).type() as ClassName).simpleName()).isEqualTo("ValidName") - assertThat( - ((fields[0].annotations()[0] as AnnotationSpec).type() as ClassName).canonicalName(), - ).isEqualTo("com.test.validator.ValidName") + val validName = + fields[0].annotations().single { + (it.type() as ClassName).canonicalName() == "com.test.validator.ValidName" + } + assertThat((validName.type() as ClassName).simpleName()).isEqualTo("ValidName") } @Test @@ -5030,14 +5139,15 @@ It takes a title and such. assertThat(dataTypes.size).isEqualTo(1) val person = dataTypes.single().typeSpec() assertThat(person.name()).isEqualTo("Person") - assertThat(person.annotations()).hasSize(1) - assertThat(((person.annotations()[0] as AnnotationSpec).type() as ClassName).simpleName()).isEqualTo("ValidPerson") - assertThat(((person.annotations()[0] as AnnotationSpec).type() as ClassName).canonicalName()).isEqualTo("com.validator.ValidPerson") - assertThat((person.annotations()[0] as AnnotationSpec).members()).hasSize(2) - assertThat((person.annotations()[0] as AnnotationSpec).members()["maxLimit"]).isEqualTo(listOf(CodeBlock.of("\$L", 10))) - assertThat( - (person.annotations()[0] as AnnotationSpec).members()["types"], - ).isEqualTo(listOf(CodeBlock.of("{\$L}", "\"husband\", \"wife\""))) + val validPerson = + person.annotations().single { + (it.type() as ClassName).canonicalName() == "com.validator.ValidPerson" + } + assertThat((validPerson.type() as ClassName).simpleName()).isEqualTo("ValidPerson") + assertThat(validPerson.members()).hasSize(2) + assertThat(validPerson.members()["maxLimit"]).isEqualTo(listOf(CodeBlock.of("\$L", 10))) + assertThat(validPerson.members()["types"]) + .isEqualTo(listOf(CodeBlock.of("{\$L}", "\"husband\", \"wife\""))) val fields = person.fieldSpecs() assertThat(fields).hasSize(1) assertThat(fields[0].annotations()).hasSize(1) @@ -5090,23 +5200,22 @@ It takes a title and such. assertThat(dataTypes.size).isEqualTo(1) val person = dataTypes.single().typeSpec() assertThat(person.name()).isEqualTo("Person") - assertThat(person.annotations()).hasSize(1) - assertThat(((person.annotations()[0] as AnnotationSpec).type() as ClassName).simpleName()).isEqualTo("ValidPerson") - assertThat( - ((person.annotations()[0] as AnnotationSpec).type() as ClassName).canonicalName(), - ).isEqualTo("com.test.validator.ValidPerson") - assertThat((person.annotations()[0] as AnnotationSpec).members()).hasSize(2) - assertThat((person.annotations()[0] as AnnotationSpec).members()["maxLimit"]).isEqualTo(listOf(CodeBlock.of("\$L", 10))) - assertThat( - (person.annotations()[0] as AnnotationSpec).members()["types"], - ).isEqualTo(listOf(CodeBlock.of("{\$L}", "\"husband\", \"wife\""))) + val validPerson = + person.annotations().single { + (it.type() as ClassName).canonicalName() == "com.test.validator.ValidPerson" + } + assertThat((validPerson.type() as ClassName).simpleName()).isEqualTo("ValidPerson") + assertThat(validPerson.members()).hasSize(2) + assertThat(validPerson.members()["maxLimit"]).isEqualTo(listOf(CodeBlock.of("\$L", 10))) + assertThat(validPerson.members()["types"]) + .isEqualTo(listOf(CodeBlock.of("{\$L}", "\"husband\", \"wife\""))) val fields = person.fieldSpecs() assertThat(fields).hasSize(1) - assertThat(fields[0].annotations()).hasSize(1) - assertThat(((fields[0].annotations()[0] as AnnotationSpec).type() as ClassName).simpleName()).isEqualTo("ValidName") - assertThat( - ((fields[0].annotations()[0] as AnnotationSpec).type() as ClassName).canonicalName(), - ).isEqualTo("com.test.anotherValidator.ValidName") + val validName = + fields[0].annotations().single { + (it.type() as ClassName).canonicalName() == "com.test.anotherValidator.ValidName" + } + assertThat((validName.type() as ClassName).simpleName()).isEqualTo("ValidName") } @Test @@ -5132,16 +5241,15 @@ It takes a title and such. assertThat(dataTypes.size).isEqualTo(1) val person = dataTypes.single().typeSpec() assertThat(person.name()).isEqualTo("Person") - assertThat(person.annotations()).hasSize(1) - assertThat(((person.annotations()[0] as AnnotationSpec).type() as ClassName).simpleName()).isEqualTo("ValidPerson") - assertThat( - ((person.annotations()[0] as AnnotationSpec).type() as ClassName).canonicalName(), - ).isEqualTo("com.test.validator.ValidPerson") - assertThat((person.annotations()[0] as AnnotationSpec).members()).hasSize(2) - assertThat((person.annotations()[0] as AnnotationSpec).members()["maxLimit"]).isEqualTo(listOf(CodeBlock.of("\$L", 10))) - assertThat( - (person.annotations()[0] as AnnotationSpec).members()["types"], - ).isEqualTo(listOf(CodeBlock.of("{\$L}", "\"husband\", \"wife\""))) + val validPerson = + person.annotations().single { + (it.type() as ClassName).canonicalName() == "com.test.validator.ValidPerson" + } + assertThat((validPerson.type() as ClassName).simpleName()).isEqualTo("ValidPerson") + assertThat(validPerson.members()).hasSize(2) + assertThat(validPerson.members()["maxLimit"]).isEqualTo(listOf(CodeBlock.of("\$L", 10))) + assertThat(validPerson.members()["types"]) + .isEqualTo(listOf(CodeBlock.of("{\$L}", "\"husband\", \"wife\""))) val fields = person.fieldSpecs() assertThat(fields).hasSize(1) assertThat(fields[0].annotations()).hasSize(1) @@ -5174,22 +5282,21 @@ It takes a title and such. assertThat(dataTypes.size).isEqualTo(1) val person = dataTypes.single().typeSpec() assertThat(person.name()).isEqualTo("Person") - assertThat(person.annotations()).hasSize(1) - assertThat(((person.annotations()[0] as AnnotationSpec).type() as ClassName).simpleName()).isEqualTo("ValidPerson") - assertThat( - ((person.annotations()[0] as AnnotationSpec).type() as ClassName).canonicalName(), - ).isEqualTo("com.test.validator.ValidPerson") - assertThat((person.annotations()[0] as AnnotationSpec).members()).hasSize(1) - assertThat( - (person.annotations()[0] as AnnotationSpec).members()["groups"], - ).isEqualTo(listOf(CodeBlock.of("\$L", "com.test.validator.groups.BasicValidation.class"))) + val validPerson = + person.annotations().single { + (it.type() as ClassName).canonicalName() == "com.test.validator.ValidPerson" + } + assertThat((validPerson.type() as ClassName).simpleName()).isEqualTo("ValidPerson") + assertThat(validPerson.members()).hasSize(1) + assertThat(validPerson.members()["groups"]) + .isEqualTo(listOf(CodeBlock.of("\$L", "com.test.validator.groups.BasicValidation.class"))) val fields = person.fieldSpecs() assertThat(fields).hasSize(1) - assertThat(fields[0].annotations()).hasSize(1) - assertThat(((fields[0].annotations()[0] as AnnotationSpec).type() as ClassName).simpleName()).isEqualTo("ValidName") - assertThat( - ((fields[0].annotations()[0] as AnnotationSpec).type() as ClassName).canonicalName(), - ).isEqualTo("com.test.anotherValidator.ValidName") + val validName = + fields[0].annotations().single { + (it.type() as ClassName).canonicalName() == "com.test.anotherValidator.ValidName" + } + assertThat((validName.type() as ClassName).simpleName()).isEqualTo("ValidName") } @Test @@ -5214,22 +5321,21 @@ It takes a title and such. assertThat(dataTypes.size).isEqualTo(1) val person = dataTypes.single().typeSpec() assertThat(person.name()).isEqualTo("Person") - assertThat(person.annotations()).hasSize(1) - assertThat(((person.annotations()[0] as AnnotationSpec).type() as ClassName).simpleName()).isEqualTo("ValidPerson") - assertThat( - ((person.annotations()[0] as AnnotationSpec).type() as ClassName).canonicalName(), - ).isEqualTo("com.test.validator.ValidPerson") - assertThat((person.annotations()[0] as AnnotationSpec).members()).hasSize(1) - assertThat( - (person.annotations()[0] as AnnotationSpec).members()["groups"], - ).isEqualTo(listOf(CodeBlock.of("\$S", "BasicValidation.class"))) // treat as string when no mapping is provided + val validPerson = + person.annotations().single { + (it.type() as ClassName).canonicalName() == "com.test.validator.ValidPerson" + } + assertThat((validPerson.type() as ClassName).simpleName()).isEqualTo("ValidPerson") + assertThat(validPerson.members()).hasSize(1) + assertThat(validPerson.members()["groups"]) + .isEqualTo(listOf(CodeBlock.of("\$S", "BasicValidation.class"))) // treat as string when no mapping is provided val fields = person.fieldSpecs() assertThat(fields).hasSize(1) - assertThat(fields[0].annotations()).hasSize(1) - assertThat(((fields[0].annotations()[0] as AnnotationSpec).type() as ClassName).simpleName()).isEqualTo("ValidName") - assertThat( - ((fields[0].annotations()[0] as AnnotationSpec).type() as ClassName).canonicalName(), - ).isEqualTo("com.test.anotherValidator.ValidName") + val validName = + fields[0].annotations().single { + (it.type() as ClassName).canonicalName() == "com.test.anotherValidator.ValidName" + } + assertThat((validName.type() as ClassName).simpleName()).isEqualTo("ValidName") } @Test @@ -5262,26 +5368,24 @@ It takes a title and such. assertThat(dataTypes.size).isEqualTo(1) val person = dataTypes.single().typeSpec() assertThat(person.name()).isEqualTo("Person") - assertThat(person.annotations()).hasSize(1) - assertThat(((person.annotations()[0] as AnnotationSpec).type() as ClassName).simpleName()).isEqualTo("ValidPerson") - assertThat( - ((person.annotations()[0] as AnnotationSpec).type() as ClassName).canonicalName(), - ).isEqualTo("com.test.validator.ValidPerson") - assertThat((person.annotations()[0] as AnnotationSpec).members()).hasSize(1) - assertThat( - (person.annotations()[0] as AnnotationSpec).members()["groups"], - ).isEqualTo( + val validPerson = + person.annotations().single { + (it.type() as ClassName).canonicalName() == "com.test.validator.ValidPerson" + } + assertThat((validPerson.type() as ClassName).simpleName()).isEqualTo("ValidPerson") + assertThat(validPerson.members()).hasSize(1) + assertThat(validPerson.members()["groups"]).isEqualTo( listOf( CodeBlock.of("{\$L}", "com.test.validator.groups.BasicValidation.class, com.test.validator.groups.AdvanceValidation.class"), ), ) val fields = person.fieldSpecs() assertThat(fields).hasSize(1) - assertThat(fields[0].annotations()).hasSize(1) - assertThat(((fields[0].annotations()[0] as AnnotationSpec).type() as ClassName).simpleName()).isEqualTo("ValidName") - assertThat( - ((fields[0].annotations()[0] as AnnotationSpec).type() as ClassName).canonicalName(), - ).isEqualTo("com.test.anotherValidator.ValidName") + val validName = + fields[0].annotations().single { + (it.type() as ClassName).canonicalName() == "com.test.anotherValidator.ValidName" + } + assertThat((validName.type() as ClassName).simpleName()).isEqualTo("ValidName") } @Test @@ -5320,35 +5424,31 @@ It takes a title and such. assertThat(dataTypes.size).isEqualTo(1) val person = dataTypes.single().typeSpec() assertThat(person.name()).isEqualTo("Person") - assertThat(person.annotations()).hasSize(1) - assertThat(((person.annotations()[0] as AnnotationSpec).type() as ClassName).simpleName()).isEqualTo("ValidPerson") - assertThat( - ((person.annotations()[0] as AnnotationSpec).type() as ClassName).canonicalName(), - ).isEqualTo("com.test.validator.ValidPerson") - assertThat((person.annotations()[0] as AnnotationSpec).members()).hasSize(1) - assertThat( - (person.annotations()[0] as AnnotationSpec).members()["groups"], - ).isEqualTo( + val validPerson = + person.annotations().single { + (it.type() as ClassName).canonicalName() == "com.test.validator.ValidPerson" + } + assertThat((validPerson.type() as ClassName).simpleName()).isEqualTo("ValidPerson") + assertThat(validPerson.members()).hasSize(1) + assertThat(validPerson.members()["groups"]).isEqualTo( listOf( CodeBlock.of("{\$L}", "com.test.validator.groups.BasicValidation.class, com.test.validator.groups.AdvanceValidation.class"), ), ) val fields = person.fieldSpecs() assertThat(fields).hasSize(2) - assertThat(fields[0].annotations()).hasSize(1) - assertThat(((fields[0].annotations()[0] as AnnotationSpec).type() as ClassName).simpleName()).isEqualTo("ValidName") - assertThat( - ((fields[0].annotations()[0] as AnnotationSpec).type() as ClassName).canonicalName(), - ).isEqualTo("com.test.anotherValidator.ValidName") + val validName = + fields[0].annotations().single { + (it.type() as ClassName).canonicalName() == "com.test.anotherValidator.ValidName" + } + assertThat((validName.type() as ClassName).simpleName()).isEqualTo("ValidName") - assertThat(fields[1].annotations()).hasSize(1) - assertThat(((fields[1].annotations()[0] as AnnotationSpec).type() as ClassName).simpleName()).isEqualTo("ValidDateOfBirth") - assertThat( - ((fields[1].annotations()[0] as AnnotationSpec).type() as ClassName).canonicalName(), - ).isEqualTo("com.test.validator.dob.ValidDateOfBirth") - assertThat( - (fields[1].annotations()[0] as AnnotationSpec).members()["levels"], - ).isEqualTo( + val validDob = + fields[1].annotations().single { + (it.type() as ClassName).canonicalName() == "com.test.validator.dob.ValidDateOfBirth" + } + assertThat((validDob.type() as ClassName).simpleName()).isEqualTo("ValidDateOfBirth") + assertThat(validDob.members()["levels"]).isEqualTo( listOf( CodeBlock.of( "{\$L}", @@ -5381,21 +5481,21 @@ It takes a title and such. assertThat(dataTypes.size).isEqualTo(1) val person = dataTypes.single().typeSpec() assertThat(person.name()).isEqualTo("Person") - assertThat(person.annotations()).hasSize(1) - assertThat(((person.annotations()[0] as AnnotationSpec).type() as ClassName).simpleName()).isEqualTo("ValidPerson") - assertThat( - ((person.annotations()[0] as AnnotationSpec).type() as ClassName).canonicalName(), - ).isEqualTo("com.test.validator.ValidPerson") - assertThat((person.annotations()[0] as AnnotationSpec).members()).hasSize(1) - assertThat((person.annotations()[0] as AnnotationSpec).members()["sexType"]) + val validPerson = + person.annotations().single { + (it.type() as ClassName).canonicalName() == "com.test.validator.ValidPerson" + } + assertThat((validPerson.type() as ClassName).simpleName()).isEqualTo("ValidPerson") + assertThat(validPerson.members()).hasSize(1) + assertThat(validPerson.members()["sexType"]) .isEqualTo(listOf(CodeBlock.of("\$L", "com.enums.MALE"))) val fields = person.fieldSpecs() assertThat(fields).hasSize(1) - assertThat(fields[0].annotations()).hasSize(1) - assertThat(((fields[0].annotations()[0] as AnnotationSpec).type() as ClassName).simpleName()).isEqualTo("ValidName") - assertThat( - ((fields[0].annotations()[0] as AnnotationSpec).type() as ClassName).canonicalName(), - ).isEqualTo("com.test.anotherValidator.ValidName") + val validName = + fields[0].annotations().single { + (it.type() as ClassName).canonicalName() == "com.test.anotherValidator.ValidName" + } + assertThat((validName.type() as ClassName).simpleName()).isEqualTo("ValidName") } @Test @@ -5421,15 +5521,14 @@ It takes a title and such. assertThat(dataTypes.size).isEqualTo(1) val person = dataTypes.single().typeSpec() assertThat(person.name()).isEqualTo("Person") - assertThat(person.annotations()).hasSize(1) - assertThat(((person.annotations()[0] as AnnotationSpec).type() as ClassName).simpleName()).isEqualTo("ValidPerson") - assertThat( - ((person.annotations()[0] as AnnotationSpec).type() as ClassName).canonicalName(), - ).isEqualTo("com.test.validator.ValidPerson") - assertThat((person.annotations()[0] as AnnotationSpec).members()).hasSize(1) - assertThat( - (person.annotations()[0] as AnnotationSpec).members()["types"], - ).isEqualTo(listOf(CodeBlock.of("{\$L}", "com.enums.HUSBAND, com.enums.WIFE"))) + val validPerson = + person.annotations().single { + (it.type() as ClassName).canonicalName() == "com.test.validator.ValidPerson" + } + assertThat((validPerson.type() as ClassName).simpleName()).isEqualTo("ValidPerson") + assertThat(validPerson.members()).hasSize(1) + assertThat(validPerson.members()["types"]) + .isEqualTo(listOf(CodeBlock.of("{\$L}", "com.enums.HUSBAND, com.enums.WIFE"))) val fields = person.fieldSpecs() assertThat(fields).hasSize(1) assertThat(fields[0].annotations()).hasSize(1) @@ -5462,15 +5561,14 @@ It takes a title and such. assertThat(dataTypes.size).isEqualTo(1) val person = dataTypes.single().typeSpec() assertThat(person.name()).isEqualTo("Person") - assertThat(person.annotations()).hasSize(1) - assertThat(((person.annotations()[0] as AnnotationSpec).type() as ClassName).simpleName()).isEqualTo("ValidPerson") - assertThat( - ((person.annotations()[0] as AnnotationSpec).type() as ClassName).canonicalName(), - ).isEqualTo("com.test.validator.ValidPerson") - assertThat((person.annotations()[0] as AnnotationSpec).members()).hasSize(1) - assertThat( - (person.annotations()[0] as AnnotationSpec).members()["types"], - ).isEqualTo(listOf(CodeBlock.of("{\$L}", "com.enums.HUSBAND, com.enums.WIFE"))) + val validPerson = + person.annotations().single { + (it.type() as ClassName).canonicalName() == "com.test.validator.ValidPerson" + } + assertThat((validPerson.type() as ClassName).simpleName()).isEqualTo("ValidPerson") + assertThat(validPerson.members()).hasSize(1) + assertThat(validPerson.members()["types"]) + .isEqualTo(listOf(CodeBlock.of("{\$L}", "com.enums.HUSBAND, com.enums.WIFE"))) val fields = person.fieldSpecs() assertThat(fields).hasSize(1) assertThat(fields[0].annotations()).hasSize(1) @@ -5503,26 +5601,26 @@ It takes a title and such. assertThat(dataTypes.size).isEqualTo(1) val person = dataTypes.single().typeSpec() assertThat(person.name()).isEqualTo("Person") - assertThat(person.annotations()).hasSize(1) - assertThat(((person.annotations()[0] as AnnotationSpec).type() as ClassName).simpleName()).isEqualTo("ValidPerson") - assertThat( - ((person.annotations()[0] as AnnotationSpec).type() as ClassName).canonicalName(), - ).isEqualTo("com.test.validator.ValidPerson") - assertThat((person.annotations()[0] as AnnotationSpec).members()).hasSize(1) - assertThat( - (person.annotations()[0] as AnnotationSpec).members()["types"], - ).isEqualTo(listOf(CodeBlock.of("{\$L}", "com.enums.HUSBAND, com.enums.WIFE"))) + val validPerson = + person.annotations().single { + (it.type() as ClassName).canonicalName() == "com.test.validator.ValidPerson" + } + assertThat((validPerson.type() as ClassName).simpleName()).isEqualTo("ValidPerson") + assertThat(validPerson.members()).hasSize(1) + assertThat(validPerson.members()["types"]) + .isEqualTo(listOf(CodeBlock.of("{\$L}", "com.enums.HUSBAND, com.enums.WIFE"))) val fields = person.fieldSpecs() assertThat(fields).hasSize(1) - assertThat(fields[0].annotations()).hasSize(2) - assertThat(((fields[0].annotations()[0] as AnnotationSpec).type() as ClassName).simpleName()).isEqualTo("ValidName") - assertThat( - ((fields[0].annotations()[0] as AnnotationSpec).type() as ClassName).canonicalName(), - ).isEqualTo("com.test.anotherValidator.ValidName") - assertThat(((fields[0].annotations()[1] as AnnotationSpec).type() as ClassName).simpleName()).isEqualTo("NullValue") - assertThat( - ((fields[0].annotations()[1] as AnnotationSpec).type() as ClassName).canonicalName(), - ).isEqualTo("com.test.nullValidator.NullValue") + val validName = + fields[0].annotations().single { + (it.type() as ClassName).canonicalName() == "com.test.anotherValidator.ValidName" + } + assertThat((validName.type() as ClassName).simpleName()).isEqualTo("ValidName") + val nullValue = + fields[0].annotations().single { + (it.type() as ClassName).canonicalName() == "com.test.nullValidator.NullValue" + } + assertThat((nullValue.type() as ClassName).simpleName()).isEqualTo("NullValue") } @Test @@ -5593,15 +5691,20 @@ It takes a title and such. assertThat(dataTypes.size).isEqualTo(1) val person = dataTypes.single().typeSpec() assertThat(person.name()).isEqualTo("Person") - assertThat(person.annotations()).hasSize(1) - assertThat(((person.annotations()[0] as AnnotationSpec).type() as ClassName).simpleName()).isEqualTo("Deprecated") - assertThat(((person.annotations()[0] as AnnotationSpec).type() as ClassName).canonicalName()).isEqualTo("java.lang.Deprecated") + val personDeprecated = + person.annotations().single { + (it.type() as ClassName).canonicalName() == "java.lang.Deprecated" + } + assertThat((personDeprecated.type() as ClassName).simpleName()).isEqualTo("Deprecated") assertThat(person.javadoc().toString()).isEqualTo("Deprecated in the GraphQL schema.") + val fields = person.fieldSpecs() assertThat(fields).hasSize(1) - assertThat(fields[0].annotations()).hasSize(1) - assertThat(((fields[0].annotations()[0] as AnnotationSpec).type() as ClassName).simpleName()).isEqualTo("Deprecated") - assertThat(((fields[0].annotations()[0] as AnnotationSpec).type() as ClassName).canonicalName()).isEqualTo("java.lang.Deprecated") + val fieldDeprecated = + fields[0].annotations().single { + (it.type() as ClassName).canonicalName() == "java.lang.Deprecated" + } + assertThat((fieldDeprecated.type() as ClassName).simpleName()).isEqualTo("Deprecated") assertThat(fields[0].javadoc().toString()).isEqualTo("Deprecated in the GraphQL schema.") } @@ -5629,9 +5732,11 @@ It takes a title and such. assertThat(dataTypes.size).isEqualTo(1) val person = dataTypes.single().typeSpec() assertThat(person.name()).isEqualTo("Person") - assertThat(person.annotations()).hasSize(1) - assertThat(((person.annotations()[0] as AnnotationSpec).type() as ClassName).simpleName()).isEqualTo("Deprecated") - assertThat(((person.annotations()[0] as AnnotationSpec).type() as ClassName).canonicalName()).isEqualTo("java.lang.Deprecated") + val deprecated = + person.annotations().single { + (it.type() as ClassName).canonicalName() == "java.lang.Deprecated" + } + assertThat((deprecated.type() as ClassName).simpleName()).isEqualTo("Deprecated") val fields = person.fieldSpecs() assertThat(fields).hasSize(1) assertThat(fields[0].annotations()).hasSize(0) @@ -5661,7 +5766,11 @@ It takes a title and such. assertThat(dataTypes.size).isEqualTo(1) val person = dataTypes.single().typeSpec() assertThat(person.name()).isEqualTo("Person") - assertThat(person.annotations()).hasSize(2) + assertThat( + person.annotations().filterNot { + (it.type() as ClassName).simpleName() == "Generated" + }, + ).hasSize(2) val fields = person.fieldSpecs() assertThat(fields).hasSize(1) assertThat(fields[0].annotations()).hasSize(1) @@ -5695,18 +5804,23 @@ It takes a title and such. assertThat(dataTypes.size).isEqualTo(1) val person = dataTypes.single().typeSpec() assertThat(person.name()).isEqualTo("Person") - assertThat(person.annotations()).hasSize(2) + assertThat( + person.annotations().filterNot { + (it.type() as ClassName).simpleName() == "Generated" + }, + ).hasSize(2) val fields = person.fieldSpecs() assertThat(fields).hasSize(1) - assertThat(fields[0].annotations()).hasSize(2) - assertThat(((fields[0].annotations()[0] as AnnotationSpec).type() as ClassName).simpleName()).isEqualTo("ValidName") - assertThat( - ((fields[0].annotations()[0] as AnnotationSpec).type() as ClassName).canonicalName(), - ).isEqualTo("com.test.anotherValidator.ValidName") - assertThat(((fields[0].annotations()[1] as AnnotationSpec).type() as ClassName).simpleName()).isEqualTo("NullValue") - assertThat( - ((fields[0].annotations()[1] as AnnotationSpec).type() as ClassName).canonicalName(), - ).isEqualTo("com.test.nullValidator.NullValue") + val validName = + fields[0].annotations().single { + (it.type() as ClassName).canonicalName() == "com.test.anotherValidator.ValidName" + } + assertThat((validName.type() as ClassName).simpleName()).isEqualTo("ValidName") + val nullValue = + fields[0].annotations().single { + (it.type() as ClassName).canonicalName() == "com.test.nullValidator.NullValue" + } + assertThat((nullValue.type() as ClassName).simpleName()).isEqualTo("NullValue") val methods = person.methodSpecs() assertThat((methods[0] as MethodSpec).name()).isEqualTo("getName") assertThat(methods[0].annotations()).hasSize(0) @@ -5736,7 +5850,11 @@ It takes a title and such. assertThat(dataTypes.size).isEqualTo(1) val person = dataTypes.single().typeSpec() assertThat(person.name()).isEqualTo("Person") - assertThat(person.annotations()).hasSize(2) + assertThat( + person.annotations().filterNot { + (it.type() as ClassName).simpleName() == "Generated" + }, + ).hasSize(2) val fields = person.fieldSpecs() assertThat(fields).hasSize(1) assertThat(fields[0].annotations()).hasSize(1) @@ -5772,7 +5890,11 @@ It takes a title and such. assertThat(dataTypes.size).isEqualTo(1) val person = dataTypes.single().typeSpec() assertThat(person.name()).isEqualTo("Person") - assertThat(person.annotations()).hasSize(2) + assertThat( + person.annotations().filterNot { + (it.type() as ClassName).simpleName() == "Generated" + }, + ).hasSize(2) val fields = person.fieldSpecs() assertThat(fields).hasSize(1) assertThat(fields[0].annotations()).hasSize(1) @@ -5810,7 +5932,11 @@ It takes a title and such. assertThat(dataTypes.size).isEqualTo(1) val person = dataTypes.single().typeSpec() assertThat(person.name()).isEqualTo("Person") - assertThat(person.annotations()).hasSize(2) + assertThat( + person.annotations().filterNot { + (it.type() as ClassName).simpleName() == "Generated" + }, + ).hasSize(2) val fields = person.fieldSpecs() assertThat(fields).hasSize(1) assertThat(fields[0].annotations()).hasSize(1) @@ -5823,7 +5949,11 @@ It takes a title and such. assertThat(methods[3].annotations()).hasSize(0) val parameters = (methods[3] as MethodSpec).parameters() assertThat(parameters).hasSize(1) - assertThat(((parameters[0].annotations()[0] as AnnotationSpec).type() as ClassName).simpleName()).isEqualTo("ValidName") + val validName = + parameters[0].annotations().single { + (it.type() as ClassName).canonicalName() == "com.test.anotherValidator.ValidName" + } + assertThat((validName.type() as ClassName).simpleName()).isEqualTo("ValidName") } @Test @@ -6091,7 +6221,7 @@ It takes a title and such. .initializer() .toString(), ).isEqualTo("java.util.Locale.forLanguageTag(\"en-US\")") - assertCompilesJava(dataTypes) + assertCompilesJava(codeGenResult) } @Test @@ -6130,7 +6260,7 @@ It takes a title and such. } """.trimIndent() - val dataTypes = + val codeGenResult = CodeGen( CodeGenConfig( schemas = setOf(schema), @@ -6141,8 +6271,9 @@ It takes a title and such. ), trackInputFieldSet = trackInputFieldSet, ), - ).generate().javaDataTypes + ).generate() + val dataTypes = codeGenResult.javaDataTypes assertThat(dataTypes).hasSize(1) val data = dataTypes[0] @@ -6174,7 +6305,7 @@ It takes a title and such. assertThat(uriField.initializer().toString()).isEqualTo("java.net.URI.create(\"https://someurl.com\")") } - assertCompilesJava(dataTypes) + assertCompilesJava(codeGenResult) } @Test @@ -6186,7 +6317,7 @@ It takes a title and such. } """.trimIndent() - val dataTypes = + val codeGenResult = CodeGen( CodeGenConfig( schemas = setOf(schema), @@ -6196,7 +6327,8 @@ It takes a title and such. "Uri" to "java.lang.String", ), ), - ).generate().javaDataTypes + ).generate() + val dataTypes = codeGenResult.javaDataTypes assertThat(dataTypes).hasSize(1) @@ -6214,7 +6346,7 @@ It takes a title and such. assertThat(uriField!!.type().toString()).isEqualTo("java.lang.String") assertThat(uriField.initializer().toString()).isEqualTo("\"https://someurl.com\"") - assertCompilesJava(dataTypes) + assertCompilesJava(codeGenResult) } @Test @@ -6257,14 +6389,15 @@ It takes a title and such. } """.trimIndent() - val dataTypes = + val codeGenResult = CodeGen( CodeGenConfig( schemas = setOf(schema), packageName = BASE_PACKAGE_NAME, trackInputFieldSet = trackInputFieldSet, ), - ).generate().javaDataTypes + ).generate() + val dataTypes = codeGenResult.javaDataTypes assertThat(dataTypes).hasSize(2) @@ -6285,7 +6418,7 @@ It takes a title and such. assertThat(colorField.initializer().toString()).isEqualTo("""new $TYPES_PACKAGE_NAME.Person()""") } - assertCompilesJava(dataTypes) + assertCompilesJava(codeGenResult) } @Test @@ -6306,13 +6439,14 @@ It takes a title and such. } """.trimIndent() - val dataTypes = + val codeGenResult = CodeGen( CodeGenConfig( schemas = setOf(schema), packageName = BASE_PACKAGE_NAME, ), - ).generate().javaDataTypes + ).generate() + val dataTypes = codeGenResult.javaDataTypes assertThat(dataTypes).hasSize(3) @@ -6332,7 +6466,7 @@ It takes a title and such. """{{setName("Harrison");setCar(new com.netflix.graphql.dgs.codegen.tests.generated.types.Car(){{setBrand("Ford");}})""" + ";}}", ) - assertCompilesJava(dataTypes) + assertCompilesJava(codeGenResult) } @Test @@ -6349,13 +6483,14 @@ It takes a title and such. } """.trimIndent() - val dataTypes = + val codeGenResult = CodeGen( CodeGenConfig( schemas = setOf(schema), packageName = BASE_PACKAGE_NAME, ), - ).generate().javaDataTypes + ).generate() + val dataTypes = codeGenResult.javaDataTypes assertThat(dataTypes).hasSize(2) @@ -6376,7 +6511,7 @@ It takes a title and such. "new com.netflix.graphql.dgs.codegen.tests.generated.types.Movie(){{setName(\"Matrix\");setYear(1999);}}" + ")", ) - assertCompilesJava(dataTypes) + assertCompilesJava(codeGenResult) } @Test @@ -6492,7 +6627,7 @@ It takes a title and such. .initializer() .toString(), ).isEqualTo("new java.math.BigDecimal(3.14E+19)") - assertCompilesJava(dataTypes) + assertCompilesJava(codeGenResult) } @Test @@ -6660,7 +6795,7 @@ It takes a title and such. val dataTypes = codeGenResult.javaDataTypes assertThat(dataFetchers).isEmpty() assertThat(dataTypes.size).isEqualTo(2) - assertCompilesJava(dataTypes) + assertCompilesJava(codeGenResult) val ageFieldSpec = dataTypes[0].typeSpec().fieldSpecs()[2] assertThat(ageFieldSpec.name()).isEqualTo("age") assertThat(ageFieldSpec.type().toString()).isEqualTo("java.lang.Long") @@ -6695,7 +6830,7 @@ It takes a title and such. val dataTypes = codeGenResult.javaDataTypes assertThat(dataFetchers).isEmpty() assertThat(dataTypes.size).isEqualTo(1) - assertCompilesJava(dataTypes) + assertCompilesJava(codeGenResult) val minFieldSpec = dataTypes[0].typeSpec().fieldSpecs()[0] assertThat(minFieldSpec.type().toString()).isEqualTo("double") assertThat(minFieldSpec.initializer().toString()).isEqualTo("0.0") @@ -6831,10 +6966,11 @@ It takes a title and such. } """.trimIndent() - val (dataTypes) = + val codeGenResult = CodeGen( CodeGenConfig(schemas = setOf(schema), packageName = BASE_PACKAGE_NAME, trackInputFieldSet = true), ).generate() + val (dataTypes) = codeGenResult assertThat(dataTypes).hasSize(1) val data = dataTypes[0] @@ -6890,7 +7026,7 @@ It takes a title and such. .trimIndent(), ).isEqualTo("return requiredString;") - assertCompilesJava(dataTypes) + assertCompilesJava(codeGenResult) } @Test @@ -6922,7 +7058,7 @@ It takes a title and such. .initializer() .toString(), ).isEqualTo("java.util.Currency.getInstance(\"USD\")") - assertCompilesJava(dataTypes) + assertCompilesJava(codeGenResult) } @Test @@ -7008,13 +7144,14 @@ It takes a title and such. } """.trimIndent() - val (dataTypes) = + val codeGenResult = CodeGen( CodeGenConfig( schemas = setOf(schema), packageName = BASE_PACKAGE_NAME, ), ).generate() + val (dataTypes) = codeGenResult assertThat(dataTypes.size).isEqualTo(1) val typeSpec = dataTypes[0].typeSpec() @@ -7025,7 +7162,7 @@ It takes a title and such. assertThat(typeSpec.fieldSpecs()).extracting("name").contains("firstname", "lastname") assertThat(typeSpec.methodSpecs()).flatExtracting("parameters").extracting("name").contains("firstname", "lastname") dataTypes[0].writeTo(System.out) - assertCompilesJava(dataTypes) + assertCompilesJava(codeGenResult) } @Test @@ -7042,13 +7179,14 @@ It takes a title and such. } """.trimIndent() - val (dataTypes) = + val codeGenResult = CodeGen( CodeGenConfig( schemas = setOf(schema), packageName = BASE_PACKAGE_NAME, ), ).generate() + val (dataTypes) = codeGenResult assertThat(dataTypes.size).isEqualTo(1) val typeSpec = dataTypes[0].typeSpec() @@ -7059,7 +7197,7 @@ It takes a title and such. assertThat(typeSpec.fieldSpecs()).extracting("name").contains("firstname", "lastname") assertThat(typeSpec.methodSpecs()).flatExtracting("parameters").extracting("name").contains("firstname", "lastname") dataTypes[0].writeTo(System.out) - assertCompilesJava(dataTypes) + assertCompilesJava(codeGenResult) } @Test diff --git a/graphql-dgs-codegen-core/src/test/kotlin/com/netflix/graphql/dgs/codegen/Kotlin2CodeGenTest.kt b/graphql-dgs-codegen-core/src/test/kotlin/com/netflix/graphql/dgs/codegen/Kotlin2CodeGenTest.kt index 9b20f0efc..8a9806736 100644 --- a/graphql-dgs-codegen-core/src/test/kotlin/com/netflix/graphql/dgs/codegen/Kotlin2CodeGenTest.kt +++ b/graphql-dgs-codegen-core/src/test/kotlin/com/netflix/graphql/dgs/codegen/Kotlin2CodeGenTest.kt @@ -86,18 +86,26 @@ class Kotlin2CodeGenTest { |package com.netflix.graphql.dgs.codegen.tests.generated.enums | |import kotlin.Deprecated + |import com.netflix.graphql.dgs.codegen.tests.generated.Generated as GeneratedGenerated + |import jakarta.`annotation`.Generated as AnnotationGenerated | + |@AnnotationGenerated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) + |@GeneratedGenerated |public enum class TownJobTypes { + | @AnnotationGenerated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) + | @GeneratedGenerated | @Deprecated(message = "town switched to electric lights") | LAMPLIGHTER, | ; | + | @AnnotationGenerated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) + | @GeneratedGenerated | public companion object |} | """.trimMargin(), ) - assertCompilesKotlin(result.kotlinEnumTypes) + assertCompilesKotlin(result) } @Test @@ -126,18 +134,25 @@ class Kotlin2CodeGenTest { """ |package com.netflix.graphql.dgs.codegen.tests.generated.enums | + |import com.netflix.graphql.dgs.codegen.tests.generated.Generated as GeneratedGenerated + |import jakarta.`annotation`.Generated as AnnotationGenerated + | + |@AnnotationGenerated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) + |@GeneratedGenerated |public enum class MyEnum { | A, | B, | C, | ; | + | @AnnotationGenerated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) + | @GeneratedGenerated | public companion object |} | """.trimMargin(), ) - assertCompilesKotlin(result.kotlinEnumTypes) + assertCompilesKotlin(result) } } diff --git a/graphql-dgs-codegen-core/src/test/kotlin/com/netflix/graphql/dgs/codegen/KotlinCodeGenTest.kt b/graphql-dgs-codegen-core/src/test/kotlin/com/netflix/graphql/dgs/codegen/KotlinCodeGenTest.kt index cf7659ce9..3088cf846 100644 --- a/graphql-dgs-codegen-core/src/test/kotlin/com/netflix/graphql/dgs/codegen/KotlinCodeGenTest.kt +++ b/graphql-dgs-codegen-core/src/test/kotlin/com/netflix/graphql/dgs/codegen/KotlinCodeGenTest.kt @@ -53,14 +53,15 @@ class KotlinCodeGenTest { } """.trimIndent() - val dataTypes = + val codeGenResult = CodeGen( CodeGenConfig( schemas = setOf(schema), packageName = BASE_PACKAGE_NAME, language = Language.KOTLIN, ), - ).generate().kotlinDataTypes + ).generate() + val dataTypes = codeGenResult.kotlinDataTypes assertThat(dataTypes.size).isEqualTo(1) assertThat(dataTypes[0].name).isEqualTo("Person") @@ -71,7 +72,7 @@ class KotlinCodeGenTest { assertThat(type.propertySpecs.size).isEqualTo(2) assertThat(type.propertySpecs).extracting("name").contains("firstname", "lastname") - assertCompilesKotlin(dataTypes) + assertCompilesKotlin(codeGenResult) } @Test @@ -105,14 +106,15 @@ class KotlinCodeGenTest { zipOut.closeEntry() } - val dataTypes = + val codeGenResult = CodeGen( CodeGenConfig( schemaJarFilesFromDependencies = listOf(zipFilePath.toFile()), packageName = BASE_PACKAGE_NAME, language = Language.KOTLIN, ), - ).generate().kotlinDataTypes + ).generate() + val dataTypes = codeGenResult.kotlinDataTypes assertThat(dataTypes.size).isEqualTo(1) assertThat(dataTypes[0].name).isEqualTo("Person") @@ -123,7 +125,7 @@ class KotlinCodeGenTest { assertThat(type.propertySpecs.size).isEqualTo(2) assertThat(type.propertySpecs).extracting("name").contains("firstname", "lastname") - assertCompilesKotlin(dataTypes) + assertCompilesKotlin(codeGenResult) } @Test @@ -137,14 +139,15 @@ class KotlinCodeGenTest { } """.trimIndent() - val dataTypes = + val codeGenResult = CodeGen( CodeGenConfig( schemas = setOf(schema), packageName = BASE_PACKAGE_NAME, language = Language.KOTLIN, ), - ).generate().kotlinDataTypes + ).generate() + val dataTypes = codeGenResult.kotlinDataTypes val type = dataTypes[0].members[0] as TypeSpec @@ -161,7 +164,7 @@ class KotlinCodeGenTest { assertThat(param.defaultValue.toString()).isEqualTo("null") } - assertCompilesKotlin(dataTypes) + assertCompilesKotlin(codeGenResult) } @Test @@ -175,14 +178,15 @@ class KotlinCodeGenTest { } """.trimIndent() - val dataTypes = + val codeGenResult = CodeGen( CodeGenConfig( schemas = setOf(schema), packageName = BASE_PACKAGE_NAME, language = Language.KOTLIN, ), - ).generate().kotlinDataTypes + ).generate() + val dataTypes = codeGenResult.kotlinDataTypes val type = dataTypes[0].members[0] as TypeSpec @@ -194,7 +198,7 @@ class KotlinCodeGenTest { assertThat(type.primaryConstructor!!.parameters[1].defaultValue).isNull() assertThat(type.primaryConstructor!!.parameters[2].defaultValue).isNull() - assertCompilesKotlin(dataTypes) + assertCompilesKotlin(codeGenResult) } @Test @@ -257,7 +261,7 @@ class KotlinCodeGenTest { } """.trimIndent() - val dataTypes = + val codeGenResult = CodeGen( CodeGenConfig( schemas = setOf(schema), @@ -265,7 +269,8 @@ class KotlinCodeGenTest { language = Language.KOTLIN, kotlinAllFieldsOptional = true, ), - ).generate().kotlinDataTypes + ).generate() + val dataTypes = codeGenResult.kotlinDataTypes val type = dataTypes[0].members[0] as TypeSpec val (countProperty, truthProperty, floatyProperty) = type.propertySpecs @@ -273,7 +278,7 @@ class KotlinCodeGenTest { assertThat(truthProperty.type).isEqualTo(Boolean::class.asTypeName().copy(nullable = true)) assertThat(floatyProperty.type).isEqualTo(Double::class.asTypeName().copy(nullable = true)) - assertCompilesKotlin(dataTypes) + assertCompilesKotlin(codeGenResult) } @Test @@ -289,14 +294,15 @@ class KotlinCodeGenTest { } """.trimIndent() - val dataTypes = + val codeGenResult = CodeGen( CodeGenConfig( schemas = setOf(schema), packageName = BASE_PACKAGE_NAME, language = Language.KOTLIN, ), - ).generate().kotlinDataTypes + ).generate() + val dataTypes = codeGenResult.kotlinDataTypes val type = dataTypes[0].members[0] as TypeSpec @@ -305,7 +311,7 @@ class KotlinCodeGenTest { assertThat(type.primaryConstructor!!.parameters[0].defaultValue).isNull() - assertCompilesKotlin(dataTypes) + assertCompilesKotlin(codeGenResult) } @Test @@ -321,7 +327,7 @@ class KotlinCodeGenTest { } """.trimIndent() - val dataTypes = + val codeGenResult = CodeGen( CodeGenConfig( schemas = setOf(schema), @@ -329,7 +335,8 @@ class KotlinCodeGenTest { language = Language.KOTLIN, kotlinAllFieldsOptional = true, ), - ).generate().kotlinDataTypes + ).generate() + val dataTypes = codeGenResult.kotlinDataTypes val type = dataTypes[0].members[0] as TypeSpec @@ -338,7 +345,7 @@ class KotlinCodeGenTest { assertThat(type.primaryConstructor!!.parameters[0].defaultValue).isNotNull - assertCompilesKotlin(dataTypes) + assertCompilesKotlin(codeGenResult) } @Test @@ -371,7 +378,7 @@ class KotlinCodeGenTest { val interfaceType = interfaceTypes[0].members[0] as TypeSpec assertThat(interfaceType.propertySpecs[0].type.isNullable).isTrue - assertCompilesKotlin(dataTypes + interfaceTypes) + assertCompilesKotlin(result) } @Test @@ -399,7 +406,7 @@ class KotlinCodeGenTest { assertThat(type.propertySpecs[0].type.isNullable).isFalse // id: ID! assertThat(type.propertySpecs[1].type.isNullable).isTrue // name: String - assertCompilesKotlin(dataTypes) + assertCompilesKotlin(result) } @Test @@ -428,7 +435,7 @@ class KotlinCodeGenTest { val interfaceTypes = result.kotlinInterfaces assertThat(dataTypes.size).isEqualTo(0) - assertThat(interfaceTypes.size).isEqualTo(0) + assertThat(interfaceTypes.size).isEqualTo(1) } @Test @@ -443,14 +450,15 @@ class KotlinCodeGenTest { } """.trimIndent() - val dataTypes = + val codeGenResult = CodeGen( CodeGenConfig( schemas = setOf(schema), packageName = BASE_PACKAGE_NAME, language = Language.KOTLIN, ), - ).generate().kotlinDataTypes + ).generate() + val dataTypes = codeGenResult.kotlinDataTypes assertThat(dataTypes.size).isEqualTo(1) val type = dataTypes[0].members[0] as TypeSpec assertThat(type.name).isEqualTo("Person") @@ -458,7 +466,7 @@ class KotlinCodeGenTest { assertThat(companion.isCompanion).isTrue assertThat(companion.name).isNull() - assertCompilesKotlin(dataTypes) + assertCompilesKotlin(codeGenResult) } @Test @@ -475,20 +483,21 @@ class KotlinCodeGenTest { } """.trimIndent() - val dataTypes = + val codeGenResult = CodeGen( CodeGenConfig( schemas = setOf(schema), packageName = "com.mypackage", language = Language.KOTLIN, ), - ).generate().kotlinDataTypes + ).generate() + val dataTypes = codeGenResult.kotlinDataTypes assertThat(dataTypes.size).isEqualTo(1) assertThat(dataTypes[0].name).isEqualTo("Person") assertThat(dataTypes[0].packageName).isEqualTo("com.mypackage.types") - assertCompilesKotlin(dataTypes) + assertCompilesKotlin(codeGenResult) } @Test @@ -505,14 +514,15 @@ class KotlinCodeGenTest { } """.trimIndent() - val dataTypes = + val codeGenResult = CodeGen( CodeGenConfig( schemas = setOf(schema), packageName = BASE_PACKAGE_NAME, language = Language.KOTLIN, ), - ).generate().kotlinDataTypes + ).generate() + val dataTypes = codeGenResult.kotlinDataTypes val type = dataTypes[0].members[0] as TypeSpec assertThat(dataTypes.size).isEqualTo(1) @@ -528,7 +538,7 @@ class KotlinCodeGenTest { LIST.parameterizedBy(STRING.copy(nullable = true)).copy(nullable = true), ) - assertCompilesKotlin(dataTypes) + assertCompilesKotlin(codeGenResult) } @Test @@ -545,14 +555,15 @@ class KotlinCodeGenTest { } """.trimIndent() - val dataTypes = + val codeGenResult = CodeGen( CodeGenConfig( schemas = setOf(schema), packageName = BASE_PACKAGE_NAME, language = Language.KOTLIN, ), - ).generate().kotlinDataTypes + ).generate() + val dataTypes = codeGenResult.kotlinDataTypes val type = dataTypes[0].members[0] as TypeSpec assertThat(dataTypes.size).isEqualTo(1) @@ -563,7 +574,7 @@ class KotlinCodeGenTest { assertThat(nameProperty.type).isEqualTo(STRING) assertThat(emailProperty.type).isEqualTo(LIST.parameterizedBy(STRING)) - assertCompilesKotlin(dataTypes) + assertCompilesKotlin(codeGenResult) } @Test @@ -580,14 +591,15 @@ class KotlinCodeGenTest { } """.trimIndent() - val dataTypes = + val codeGenResult = CodeGen( CodeGenConfig( schemas = setOf(schema), packageName = BASE_PACKAGE_NAME, language = Language.KOTLIN, ), - ).generate().kotlinDataTypes + ).generate() + val dataTypes = codeGenResult.kotlinDataTypes val type = dataTypes[0].members[0] as TypeSpec assertThat(dataTypes.size).isEqualTo(1) @@ -599,7 +611,7 @@ class KotlinCodeGenTest { assertThat(nameProperty.type).isEqualTo(STRING) assertThat(emailProperty.type).isEqualTo(LIST.parameterizedBy(STRING.copy(nullable = true))) - assertCompilesKotlin(dataTypes) + assertCompilesKotlin(codeGenResult) } @Test @@ -657,7 +669,7 @@ class KotlinCodeGenTest { assertThat(type.superinterfaces.keys).contains(ClassName.bestGuess("com.netflix.graphql.dgs.codegen.tests.generated.types.Person")) // Check interface - assertThat(interfaces.size).isEqualTo(1) + assertThat(interfaces.size).isEqualTo(2) val interfaceType = interfaces[0].members[0] as TypeSpec assertThat(FileSpec.get("$BASE_PACKAGE_NAME.types", interfaceType).toString()).isEqualTo( @@ -667,7 +679,11 @@ class KotlinCodeGenTest { |import com.fasterxml.jackson.`annotation`.JsonSubTypes |import com.fasterxml.jackson.`annotation`.JsonTypeInfo |import kotlin.String + |import com.netflix.graphql.dgs.codegen.tests.generated.Generated as GeneratedGenerated + |import jakarta.`annotation`.Generated as AnnotationGenerated | + |@AnnotationGenerated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) + |@GeneratedGenerated |@JsonTypeInfo( | use = JsonTypeInfo.Id.NAME, | include = JsonTypeInfo.As.PROPERTY, @@ -681,6 +697,8 @@ class KotlinCodeGenTest { | | public val lastname: String? | + | @AnnotationGenerated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) + | @GeneratedGenerated | public companion object |} | @@ -694,7 +712,11 @@ class KotlinCodeGenTest { |import com.fasterxml.jackson.`annotation`.JsonProperty |import com.fasterxml.jackson.`annotation`.JsonTypeInfo |import kotlin.String + |import com.netflix.graphql.dgs.codegen.tests.generated.Generated as GeneratedGenerated + |import jakarta.`annotation`.Generated as AnnotationGenerated | + |@AnnotationGenerated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) + |@GeneratedGenerated |@JsonTypeInfo(use = JsonTypeInfo.Id.NONE) |public data class Employee( | @JsonProperty("firstname") @@ -704,13 +726,15 @@ class KotlinCodeGenTest { | @JsonProperty("company") | public val company: String? = null, |) : Person { + | @AnnotationGenerated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) + | @GeneratedGenerated | public companion object |} | """.trimMargin(), ) - assertCompilesKotlin(dataTypes + interfaces) + assertCompilesKotlin(codeGenResult) } @Test @@ -731,22 +755,23 @@ class KotlinCodeGenTest { } """.trimIndent() - val interfaces = + val codeGenResult = CodeGen( CodeGenConfig( schemas = setOf(schema), packageName = BASE_PACKAGE_NAME, language = Language.KOTLIN, ), - ).generate().kotlinInterfaces + ).generate() + val interfaces = codeGenResult.kotlinInterfaces - assertThat(interfaces.size).isEqualTo(1) + assertThat(interfaces.size).isEqualTo(2) - val interfaceType = interfaces[0].members[0] as TypeSpec + val interfaceType = interfaces.single { it.name == "Person" }.members[0] as TypeSpec assertThat(interfaceType.propertySpecs.size).isEqualTo(3) assertThat(interfaceType.propertySpecs).extracting("name").containsExactly("firstname", "lastname", "age") - assertCompilesKotlin(interfaces) + assertCompilesKotlin(codeGenResult) } @Test @@ -825,7 +850,7 @@ class KotlinCodeGenTest { ).isTrue // Check interface - assertThat(interfaces.size).isEqualTo(1) + assertThat(interfaces.size).isEqualTo(2) val interfaceType = interfaces[0].members[0] as TypeSpec assertThat(interfaceType.name).isEqualTo("Person") assertThat(interfaceType.propertySpecs.size).isEqualTo(3) @@ -852,14 +877,15 @@ class KotlinCodeGenTest { """.trimIndent() - val dataTypes = + val codeGenResult = CodeGen( CodeGenConfig( schemas = setOf(schema), packageName = BASE_PACKAGE_NAME, language = Language.KOTLIN, ), - ).generate().kotlinDataTypes + ).generate() + val dataTypes = codeGenResult.kotlinDataTypes val type = dataTypes[0].members[0] as TypeSpec // Check data class @@ -876,7 +902,7 @@ class KotlinCodeGenTest { val friendsType = LIST.parameterizedBy(personClass.copy(nullable = true)).copy(nullable = true) assertThat(friends.type).isEqualTo(friendsType) - assertCompilesKotlin(dataTypes) + assertCompilesKotlin(codeGenResult) } @Test @@ -906,14 +932,15 @@ class KotlinCodeGenTest { } """.trimIndent() - val dataTypes = + val codeGenResult = CodeGen( CodeGenConfig( schemas = setOf(schema), packageName = BASE_PACKAGE_NAME, language = Language.KOTLIN, ), - ).generate().kotlinDataTypes + ).generate() + val dataTypes = codeGenResult.kotlinDataTypes assertThat(dataTypes).flatExtracting("members").extracting("name").contains("Car", "Engine", "Performance") val nestedType = dataTypes[1].members[0] as TypeSpec @@ -923,7 +950,7 @@ class KotlinCodeGenTest { .extracting("type.simpleName") .containsExactly("Performance") - assertCompilesKotlin(dataTypes) + assertCompilesKotlin(codeGenResult) } @Test @@ -940,7 +967,7 @@ class KotlinCodeGenTest { } """.trimIndent() - val result = + val codeGenResult = CodeGen( CodeGenConfig( schemas = setOf(schema), @@ -948,7 +975,8 @@ class KotlinCodeGenTest { language = Language.KOTLIN, javaGenerateAllConstructor = false, ), - ).generate().kotlinDataTypes + ).generate() + val result = codeGenResult.kotlinDataTypes val type = result[0].members[0] as TypeSpec assertThat(type.propertySpecs) .hasSize(2) @@ -980,7 +1008,7 @@ class KotlinCodeGenTest { }, Index.atIndex(1), ) - assertCompilesKotlin(result) + assertCompilesKotlin(codeGenResult) } @Test @@ -1050,7 +1078,7 @@ class KotlinCodeGenTest { assertThat(type.enumConstants).containsKeys("ENGINEER", "MANAGER", "DIRECTOR") assertThat(type.typeSpecs[0].isCompanion).isTrue - assertCompilesKotlin(result.kotlinDataTypes + result.kotlinEnumTypes) + assertCompilesKotlin(result) } @Test @@ -1084,7 +1112,7 @@ class KotlinCodeGenTest { assertThat(type.enumConstants).containsOnlyKeys("_default", "_root", "_new", "_name") assertThat(type.typeSpecs[0].isCompanion).isTrue - assertCompilesKotlin(result.kotlinDataTypes + result.kotlinEnumTypes) + assertCompilesKotlin(result) } @Nested @@ -1114,18 +1142,24 @@ class KotlinCodeGenTest { |package com.netflix.graphql.dgs.codegen.tests.generated.enums | |import kotlin.Deprecated + |import com.netflix.graphql.dgs.codegen.tests.generated.Generated as GeneratedGenerated + |import jakarta.`annotation`.Generated as AnnotationGenerated | + |@AnnotationGenerated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) + |@GeneratedGenerated |public enum class TownJobTypes { | @Deprecated(message = "town switched to electric lights") | LAMPLIGHTER, | ; | + | @AnnotationGenerated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) + | @GeneratedGenerated | public companion object |} | """.trimMargin(), ) - assertCompilesKotlin(result.kotlinEnumTypes) + assertCompilesKotlin(result) } @Test @@ -1153,12 +1187,18 @@ class KotlinCodeGenTest { |package com.netflix.graphql.dgs.codegen.tests.generated.enums | |import ValidName + |import com.netflix.graphql.dgs.codegen.tests.generated.Generated as GeneratedGenerated + |import jakarta.`annotation`.Generated as AnnotationGenerated | + |@AnnotationGenerated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) + |@GeneratedGenerated |public enum class SomeEnum { | @ValidName | ENUM_VALUE, | ; | + | @AnnotationGenerated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) + | @GeneratedGenerated | public companion object |} | @@ -1186,14 +1226,15 @@ class KotlinCodeGenTest { } """.trimIndent() - val enumTypes = + val codeGenResult = CodeGen( CodeGenConfig( schemas = setOf(schema), packageName = BASE_PACKAGE_NAME, language = Language.KOTLIN, ), - ).generate().kotlinEnumTypes + ).generate() + val enumTypes = codeGenResult.kotlinEnumTypes val type = enumTypes[0].members[0] as TypeSpec // Check generated enum type @@ -1201,7 +1242,7 @@ class KotlinCodeGenTest { assertThat(type.enumConstants.size).isEqualTo(4) assertThat(type.enumConstants).containsKeys("ENGINEER", "MANAGER", "DIRECTOR", "QA") - assertCompilesKotlin(enumTypes) + assertCompilesKotlin(codeGenResult) } @Test @@ -1223,7 +1264,7 @@ class KotlinCodeGenTest { } """.trimIndent() - val dataTypes = + val codeGenResult = CodeGen( CodeGenConfig( schemas = setOf(schema), @@ -1231,7 +1272,8 @@ class KotlinCodeGenTest { language = Language.KOTLIN, typeMapping = mapOf("Person" to "mypackage.Person"), ), - ).generate().kotlinDataTypes + ).generate() + val dataTypes = codeGenResult.kotlinDataTypes assertThat(dataTypes.size).isEqualTo(1) assertThat((dataTypes[0].members[0] as TypeSpec).propertySpecs[0].type.toString()).isEqualTo("mypackage.Person?") @@ -1266,7 +1308,7 @@ class KotlinCodeGenTest { ).generate() val interfaces = codeGenResult.kotlinInterfaces - assertThat(interfaces.size).isEqualTo(1) + assertThat(interfaces.size).isEqualTo(2) assertThat(interfaces[0].toString()).isEqualTo( """ |package com.netflix.graphql.dgs.codegen.tests.generated.types @@ -1275,7 +1317,11 @@ class KotlinCodeGenTest { |import com.fasterxml.jackson.`annotation`.JsonTypeInfo |import kotlin.String |import mypackage.Cat + |import com.netflix.graphql.dgs.codegen.tests.generated.Generated as GeneratedGenerated + |import jakarta.`annotation`.Generated as AnnotationGenerated | + |@AnnotationGenerated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) + |@GeneratedGenerated |@JsonTypeInfo( | use = JsonTypeInfo.Id.NAME, | include = JsonTypeInfo.As.PROPERTY, @@ -1288,6 +1334,8 @@ class KotlinCodeGenTest { |public interface Pet { | public val name: String | + | @AnnotationGenerated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) + | @GeneratedGenerated | public companion object |} | @@ -1322,7 +1370,7 @@ class KotlinCodeGenTest { ).generate() val interfaces = codeGenResult.kotlinInterfaces - assertThat(interfaces.size).isEqualTo(1) + assertThat(interfaces.size).isEqualTo(2) assertThat(interfaces[0].toString()).isEqualTo( """ |package com.netflix.graphql.dgs.codegen.tests.generated.types @@ -1330,7 +1378,11 @@ class KotlinCodeGenTest { |import com.fasterxml.jackson.`annotation`.JsonSubTypes |import com.fasterxml.jackson.`annotation`.JsonTypeInfo |import mypackage.Cat + |import com.netflix.graphql.dgs.codegen.tests.generated.Generated as GeneratedGenerated + |import jakarta.`annotation`.Generated as AnnotationGenerated | + |@AnnotationGenerated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) + |@GeneratedGenerated |@JsonTypeInfo( | use = JsonTypeInfo.Id.NAME, | include = JsonTypeInfo.As.PROPERTY, @@ -1341,6 +1393,8 @@ class KotlinCodeGenTest { | JsonSubTypes.Type(value = Dog::class, name = "Dog") |]) |public interface Pet { + | @AnnotationGenerated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) + | @GeneratedGenerated | public companion object |} | @@ -1440,7 +1494,7 @@ class KotlinCodeGenTest { expected, ) - assertCompilesKotlin(dataTypes) + assertCompilesKotlin(generated) } } @@ -1517,7 +1571,7 @@ class KotlinCodeGenTest { assertThat(dataTypes.size).isEqualTo(1) assertThat((dataTypes[0].members[0] as TypeSpec).propertySpecs[0].type.toString()).isEqualTo("mypackage.SomethingWithAName?") - assertThat(interfaces).isEmpty() + assertThat(interfaces).extracting("name").containsExactly("Generated") } @Test @@ -1565,8 +1619,6 @@ class KotlinCodeGenTest { .toList()[0] .toString(), ).isEqualTo("mypackage.SomethingWithAName") - - assertThat(interfaces).isEmpty() } @Test @@ -1607,7 +1659,7 @@ class KotlinCodeGenTest { val interfaces = result.kotlinInterfaces assertThat(dataTypes).isEmpty() - assertThat(interfaces).isEmpty() + assertThat(interfaces).extracting("name").containsExactly("Generated") } @Test @@ -1638,7 +1690,7 @@ class KotlinCodeGenTest { ).generate() assertThat(result.kotlinDataTypes).isEmpty() - assertThat(result.kotlinInterfaces).isEmpty() + assertThat(result.kotlinInterfaces).extracting("name").containsExactly("Generated") } @Test @@ -1676,7 +1728,7 @@ class KotlinCodeGenTest { val interfaces = result.kotlinInterfaces assertThat(dataTypes).hasSize(1) - assertThat(interfaces).hasSize(1) + assertThat(interfaces).hasSize(2) assertThat((dataTypes[0].members[0] as TypeSpec).name).isEqualTo("Movie") } @@ -1693,14 +1745,15 @@ class KotlinCodeGenTest { } """.trimIndent() - val dataTypes = + val codeGenResult = CodeGen( CodeGenConfig( schemas = setOf(schema), packageName = BASE_PACKAGE_NAME, language = Language.KOTLIN, ), - ).generate().kotlinDataTypes + ).generate() + val dataTypes = codeGenResult.kotlinDataTypes val type = dataTypes[0].members[0] as TypeSpec assertThat(type.name).isEqualTo("MovieFilter") @@ -1709,7 +1762,7 @@ class KotlinCodeGenTest { assertThat(type.propertySpecs.size).isEqualTo(1) assertThat(type.propertySpecs).extracting("name").contains("genre") - assertCompilesKotlin(dataTypes) + assertCompilesKotlin(codeGenResult) } @Test @@ -1756,7 +1809,7 @@ class KotlinCodeGenTest { assertThat(colorParam.defaultValue).isNotNull assertThat(colorParam.defaultValue.toString()).isEqualTo("$TYPES_PACKAGE_NAME.Color.red") - assertCompilesKotlin(dataTypes.plus(enums)) + assertCompilesKotlin(codeGenResult) } @Test @@ -1768,14 +1821,15 @@ class KotlinCodeGenTest { } """.trimIndent() - val dataTypes = + val codeGenResult = CodeGen( CodeGenConfig( schemas = setOf(schema), packageName = BASE_PACKAGE_NAME, language = Language.KOTLIN, ), - ).generate().kotlinDataTypes + ).generate() + val dataTypes = codeGenResult.kotlinDataTypes assertThat(dataTypes).hasSize(1) val data = dataTypes[0] @@ -1797,7 +1851,7 @@ class KotlinCodeGenTest { assertThat(colorParam.defaultValue).isNotNull assertThat(colorParam.defaultValue.toString()).isEqualTo("emptyList()") - assertCompilesKotlin(dataTypes) + assertCompilesKotlin(codeGenResult) } @Test @@ -1809,14 +1863,15 @@ class KotlinCodeGenTest { } """.trimIndent() - val dataTypes = + val codeGenResult = CodeGen( CodeGenConfig( schemas = setOf(schema), packageName = BASE_PACKAGE_NAME, language = Language.KOTLIN, ), - ).generate().kotlinDataTypes + ).generate() + val dataTypes = codeGenResult.kotlinDataTypes assertThat(dataTypes).hasSize(1) val data = dataTypes[0] @@ -1838,7 +1893,7 @@ class KotlinCodeGenTest { assertThat(colorParam.defaultValue).isNotNull assertThat(colorParam.defaultValue.toString()).isEqualTo("""listOf("DGS")""") - assertCompilesKotlin(dataTypes) + assertCompilesKotlin(codeGenResult) } @Test @@ -1850,14 +1905,15 @@ class KotlinCodeGenTest { } """.trimIndent() - val dataTypes = + val codeGenResult = CodeGen( CodeGenConfig( schemas = setOf(schema), packageName = BASE_PACKAGE_NAME, language = Language.KOTLIN, ), - ).generate().kotlinDataTypes + ).generate() + val dataTypes = codeGenResult.kotlinDataTypes assertThat(dataTypes).hasSize(1) val data = dataTypes[0] @@ -1879,7 +1935,7 @@ class KotlinCodeGenTest { assertThat(colorParam.defaultValue).isNotNull assertThat(colorParam.defaultValue.toString()).isEqualTo("""listOf("DGS")""") - assertCompilesKotlin(dataTypes) + assertCompilesKotlin(codeGenResult) } @Test @@ -1891,14 +1947,15 @@ class KotlinCodeGenTest { } """.trimIndent() - val dataTypes = + val codeGenResult = CodeGen( CodeGenConfig( schemas = setOf(schema), packageName = BASE_PACKAGE_NAME, language = Language.KOTLIN, ), - ).generate().kotlinDataTypes + ).generate() + val dataTypes = codeGenResult.kotlinDataTypes assertThat(dataTypes).hasSize(1) val data = dataTypes[0] @@ -1920,7 +1977,7 @@ class KotlinCodeGenTest { assertThat(colorParam.defaultValue).isNotNull assertThat(colorParam.defaultValue.toString()).isEqualTo("""listOf(1, 2, 3)""") - assertCompilesKotlin(dataTypes) + assertCompilesKotlin(codeGenResult) } @Test @@ -1972,7 +2029,7 @@ class KotlinCodeGenTest { colorParam.defaultValue.toString(), ).isEqualTo("""listOf(com.netflix.graphql.dgs.codegen.tests.generated.types.Color.red)""") - assertCompilesKotlin(dataTypes.plus(enums)) + assertCompilesKotlin(codeGenResult) } @Test @@ -1984,14 +2041,15 @@ class KotlinCodeGenTest { } """.trimIndent() - val dataTypes = + val codeGenResult = CodeGen( CodeGenConfig( schemas = setOf(schema), packageName = BASE_PACKAGE_NAME, language = Language.KOTLIN, ), - ).generate().kotlinDataTypes + ).generate() + val dataTypes = codeGenResult.kotlinDataTypes assertThat(dataTypes).hasSize(1) val data = dataTypes[0] @@ -2012,7 +2070,7 @@ class KotlinCodeGenTest { assertThat(colorParam.defaultValue).isNotNull assertThat(colorParam.defaultValue.toString()).isEqualTo("""listOf(true)""") - assertCompilesKotlin(dataTypes) + assertCompilesKotlin(codeGenResult) } @Test @@ -2048,7 +2106,7 @@ class KotlinCodeGenTest { assertThat(type.propertySpecs.size).isEqualTo(2) assertThat(type.propertySpecs).extracting("name").contains("genre", "releaseYear") - assertCompilesKotlin(dataTypes) + assertCompilesKotlin(codeGenResult) } @Test @@ -2101,7 +2159,7 @@ class KotlinCodeGenTest { assertThat(typeSpec1.propertySpecs.size).isEqualTo(1) assertThat(typeSpec1.propertySpecs[0].name).isEqualTo("public") - assertCompilesKotlin(codeGenResult.kotlinDataTypes) + assertCompilesKotlin(codeGenResult) } @ParameterizedTest(name = "{index} => Snake Case? {0}; expected names {1}") @@ -2144,7 +2202,7 @@ class KotlinCodeGenTest { .containsExactly("TYPE_NAME", "Firstname", "Lastname", "Metadata") assertThat(type.typeSpecs[2].propertySpecs).extracting("name").containsExactly("TYPE_NAME", "Data") - assertCompilesKotlin(result.kotlinDataTypes + result.kotlinConstants) + assertCompilesKotlin(result) } companion object { @@ -2199,7 +2257,7 @@ class KotlinCodeGenTest { assertThat(type.typeSpecs).extracting("name").containsExactly("QUERY", "PERSON", "PERSONFILTER") assertThat(type.typeSpecs[2].propertySpecs).extracting("name").containsExactly("TYPE_NAME", "Email") - assertCompilesKotlin(result.kotlinDataTypes + result.kotlinConstants) + assertCompilesKotlin(result) } @Test @@ -2238,7 +2296,7 @@ class KotlinCodeGenTest { .extracting("name") .containsExactly("TYPE_NAME", "Email", "BirthYear") - assertCompilesKotlin(result.kotlinDataTypes + result.kotlinConstants) + assertCompilesKotlin(result) } @Test @@ -2273,7 +2331,7 @@ class KotlinCodeGenTest { .extracting("name") .containsExactly("TYPE_NAME", "Firstname", "Lastname", "Email") - assertCompilesKotlin(result.kotlinDataTypes + result.kotlinConstants) + assertCompilesKotlin(result) } @Test @@ -2303,7 +2361,7 @@ class KotlinCodeGenTest { .extracting("name") .containsExactly("TYPE_NAME", "Q1", "Q2") - assertCompilesKotlin(result.kotlinDataTypes + result.kotlinConstants) + assertCompilesKotlin(result) } @Test @@ -2333,7 +2391,7 @@ class KotlinCodeGenTest { .extracting("name") .containsExactly("TYPE_NAME", "Q1", "Q2") - assertCompilesKotlin(result.kotlinDataTypes + result.kotlinConstants) + assertCompilesKotlin(result) } @Test @@ -2369,14 +2427,14 @@ class KotlinCodeGenTest { val interfaces = codeGenResult.kotlinInterfaces assertThat(dataTypes).extracting("name").containsExactly("Movie", "Actor") - assertThat(interfaces).extracting("name").containsExactly("SearchResult") + assertThat(interfaces).extracting("name").containsExactlyInAnyOrder("SearchResult", "Generated") val typeSpec = dataTypes[0].members[0] as TypeSpec assertThat( typeSpec.superinterfaces.keys, ).contains(ClassName.bestGuess("com.netflix.graphql.dgs.codegen.tests.generated.types.SearchResult")) - assertCompilesKotlin(dataTypes + interfaces) + assertCompilesKotlin(codeGenResult) } @Test @@ -2414,15 +2472,19 @@ class KotlinCodeGenTest { ).generate() val interfaces = codeGenResult.kotlinInterfaces - assertThat(interfaces.size).isEqualTo(1) + assertThat(interfaces.size).isEqualTo(2) - assertThat(interfaces[0].toString()).isEqualTo( + assertThat(interfaces.single { it.name == "SearchResult" }.toString()).isEqualTo( """ |package com.netflix.graphql.dgs.codegen.tests.generated.types | |import com.fasterxml.jackson.`annotation`.JsonSubTypes |import com.fasterxml.jackson.`annotation`.JsonTypeInfo + |import com.netflix.graphql.dgs.codegen.tests.generated.Generated as GeneratedGenerated + |import jakarta.`annotation`.Generated as AnnotationGenerated | + |@AnnotationGenerated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) + |@GeneratedGenerated |@JsonTypeInfo( | use = JsonTypeInfo.Id.NAME, | include = JsonTypeInfo.As.PROPERTY, @@ -2434,6 +2496,8 @@ class KotlinCodeGenTest { | JsonSubTypes.Type(value = Rating::class, name = "Rating") |]) |public interface SearchResult { + | @AnnotationGenerated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) + | @GeneratedGenerated | public companion object |} | @@ -2477,7 +2541,7 @@ class KotlinCodeGenTest { } """.trimIndent() - val dataTypes = + val codeGenResult = CodeGen( CodeGenConfig( schemas = setOf(schema), @@ -2485,13 +2549,17 @@ class KotlinCodeGenTest { language = Language.KOTLIN, addDeprecatedAnnotation = true, ), - ).generate().kotlinDataTypes + ).generate() + val dataTypes = codeGenResult.kotlinDataTypes assertThat(dataTypes).hasSize(1) assertThat(dataTypes[0].name).isEqualTo("Person") - val annotationSpec = (dataTypes[0].members[0] as TypeSpec).annotations[0] - assertThat((annotationSpec.typeName as ClassName).canonicalName).isEqualTo("kotlin.Deprecated") + val annotationSpec = + (dataTypes[0].members[0] as TypeSpec).annotations.single { + (it.typeName as ClassName).canonicalName == + "kotlin.Deprecated" + } assertThat(annotationSpec.members).hasSize(1) assertThat(annotationSpec.members[0]) .extracting("formatParts", "args") @@ -2527,7 +2595,7 @@ class KotlinCodeGenTest { } """.trimIndent() - val dataTypes = + val codeGenResult = CodeGen( CodeGenConfig( schemas = setOf(schema), @@ -2535,13 +2603,17 @@ class KotlinCodeGenTest { language = Language.KOTLIN, generateCustomAnnotations = true, ), - ).generate().kotlinDataTypes + ).generate() + val dataTypes = codeGenResult.kotlinDataTypes assertThat(dataTypes).hasSize(1) assertThat(dataTypes[0].name).isEqualTo("Person") - val annotationSpec = (dataTypes[0].members[0] as TypeSpec).annotations[0] - assertThat((annotationSpec.typeName as ClassName).canonicalName).isEqualTo("ValidPerson") + val annotationSpec = + (dataTypes[0].members[0] as TypeSpec).annotations.single { + (it.typeName as ClassName).canonicalName == + "ValidPerson" + } assertThat(annotationSpec.members).hasSize(2) assertThat( annotationSpec.members[0], @@ -2572,7 +2644,7 @@ class KotlinCodeGenTest { } """.trimIndent() - val dataTypes = + val codeGenResult = CodeGen( CodeGenConfig( schemas = setOf(schema), @@ -2580,13 +2652,17 @@ class KotlinCodeGenTest { language = Language.KOTLIN, generateCustomAnnotations = true, ), - ).generate().kotlinDataTypes + ).generate() + val dataTypes = codeGenResult.kotlinDataTypes assertThat(dataTypes).hasSize(1) assertThat(dataTypes[0].name).isEqualTo("Person") - val annotationSpec = (dataTypes[0].members[0] as TypeSpec).annotations[0] - assertThat((annotationSpec.typeName as ClassName).canonicalName).isEqualTo("ValidPerson") + val annotationSpec = + (dataTypes[0].members[0] as TypeSpec).annotations.single { + (it.typeName as ClassName).canonicalName == + "ValidPerson" + } assertThat(annotationSpec.members).hasSize(2) assertThat( annotationSpec.members[0], @@ -2617,7 +2693,7 @@ class KotlinCodeGenTest { } """.trimIndent() - val dataTypes = + val codeGenResult = CodeGen( CodeGenConfig( schemas = setOf(schema), @@ -2625,13 +2701,17 @@ class KotlinCodeGenTest { language = Language.KOTLIN, generateCustomAnnotations = true, ), - ).generate().kotlinDataTypes + ).generate() + val dataTypes = codeGenResult.kotlinDataTypes assertThat(dataTypes).hasSize(1) assertThat(dataTypes[0].name).isEqualTo("Person") - val annotationSpec = (dataTypes[0].members[0] as TypeSpec).annotations[0] - assertThat((annotationSpec.typeName as ClassName).canonicalName).isEqualTo("com.validator.ValidPerson") + val annotationSpec = + (dataTypes[0].members[0] as TypeSpec).annotations.single { + (it.typeName as ClassName).canonicalName == + "com.validator.ValidPerson" + } assertThat(annotationSpec.members).hasSize(2) assertThat( annotationSpec.members[0], @@ -2683,7 +2763,7 @@ class KotlinCodeGenTest { } """.trimIndent() - val dataTypes = + val codeGenResult = CodeGen( CodeGenConfig( schemas = setOf(schema), @@ -2692,13 +2772,17 @@ class KotlinCodeGenTest { includeImports = mapOf("validator" to "com.test.validator"), generateCustomAnnotations = true, ), - ).generate().kotlinDataTypes + ).generate() + val dataTypes = codeGenResult.kotlinDataTypes assertThat(dataTypes).hasSize(1) assertThat(dataTypes[0].name).isEqualTo("Person") - val annotationSpec = (dataTypes[0].members[0] as TypeSpec).annotations[0] - assertThat((annotationSpec.typeName as ClassName).canonicalName).isEqualTo("com.test.validator.ValidPerson") + val annotationSpec = + (dataTypes[0].members[0] as TypeSpec).annotations.single { + (it.typeName as ClassName).canonicalName == + "com.test.validator.ValidPerson" + } assertThat(annotationSpec.members).hasSize(2) assertThat( annotationSpec.members[0], @@ -2729,7 +2813,7 @@ class KotlinCodeGenTest { } """.trimIndent() - val dataTypes = + val codeGenResult = CodeGen( CodeGenConfig( schemas = setOf(schema), @@ -2738,13 +2822,17 @@ class KotlinCodeGenTest { includeImports = mapOf("validator" to "com.test.validator"), generateCustomAnnotations = true, ), - ).generate().kotlinDataTypes + ).generate() + val dataTypes = codeGenResult.kotlinDataTypes assertThat(dataTypes).hasSize(1) assertThat(dataTypes[0].name).isEqualTo("Person") - val annotationSpec = (dataTypes[0].members[0] as TypeSpec).annotations[0] - assertThat((annotationSpec.typeName as ClassName).canonicalName).isEqualTo("com.test.validator.ValidPerson") + val annotationSpec = + (dataTypes[0].members[0] as TypeSpec).annotations.single { + (it.typeName as ClassName).canonicalName == + "com.test.validator.ValidPerson" + } assertThat(annotationSpec.members).hasSize(2) assertThat( annotationSpec.members[0], @@ -2786,23 +2874,27 @@ class KotlinCodeGenTest { generateCustomAnnotations = true, ), ) - val dataTypes = codeGen.generate().kotlinDataTypes + val codeGenResult = codeGen.generate() + val dataTypes = codeGenResult.kotlinDataTypes assertThat(dataTypes).hasSize(1) assertThat(dataTypes[0].name).isEqualTo("Person") - val annotationSpec = (dataTypes[0].members[0] as TypeSpec).annotations[0] - assertThat((annotationSpec.typeName as ClassName).canonicalName).isEqualTo("com.test.validator.ValidPerson") + val annotationSpec = + (dataTypes[0].members[0] as TypeSpec).annotations.single { + (it.typeName as ClassName).canonicalName == "com.test.validator.ValidPerson" + } assertThat(annotationSpec.members[0]).extracting("args").asInstanceOf(InstanceOfAssertFactories.LIST).hasSize(1) assertThat(annotationSpec.members[0]).extracting("args").asString().contains("com.test.validator.groups.BasicValidation") val parameterSpec = (((dataTypes[0].members)[0] as TypeSpec).primaryConstructor as FunSpec).parameters[0] assertThat(parameterSpec.name).isEqualTo("name") assertThat(parameterSpec.annotations).hasSize(2) - assertThat( - (parameterSpec.annotations[0].typeName as ClassName).canonicalName, - ).isEqualTo("com.fasterxml.jackson.annotation.JsonProperty") - assertThat((parameterSpec.annotations[1].typeName as ClassName).canonicalName).isEqualTo("com.test.anotherValidator.ValidName") + assertThat(parameterSpec.annotations.map { (it.typeName as ClassName).canonicalName }) + .containsExactlyInAnyOrder( + "com.fasterxml.jackson.annotation.JsonProperty", + "com.test.anotherValidator.ValidName", + ) } @Test @@ -2824,13 +2916,16 @@ class KotlinCodeGenTest { generateCustomAnnotations = true, ), ) - val dataTypes = codeGen.generate().kotlinDataTypes + val codeGenResult = codeGen.generate() + val dataTypes = codeGenResult.kotlinDataTypes assertThat(dataTypes).hasSize(1) assertThat(dataTypes[0].name).isEqualTo("Person") - val annotationSpec = (dataTypes[0].members[0] as TypeSpec).annotations[0] - assertThat((annotationSpec.typeName as ClassName).canonicalName).isEqualTo("com.test.validator.ValidPerson") + val annotationSpec = + (dataTypes[0].members[0] as TypeSpec).annotations.single { + (it.typeName as ClassName).canonicalName == "com.test.validator.ValidPerson" + } assertThat(annotationSpec.members[0]).extracting("args").asInstanceOf(InstanceOfAssertFactories.LIST).hasSize(1) assertThat(annotationSpec.members[0]) .extracting("args") @@ -2840,10 +2935,11 @@ class KotlinCodeGenTest { val parameterSpec = (((dataTypes[0].members)[0] as TypeSpec).primaryConstructor as FunSpec).parameters[0] assertThat(parameterSpec.name).isEqualTo("name") assertThat(parameterSpec.annotations).hasSize(2) - assertThat( - (parameterSpec.annotations[0].typeName as ClassName).canonicalName, - ).isEqualTo("com.fasterxml.jackson.annotation.JsonProperty") - assertThat((parameterSpec.annotations[1].typeName as ClassName).canonicalName).isEqualTo("com.test.anotherValidator.ValidName") + assertThat(parameterSpec.annotations.map { (it.typeName as ClassName).canonicalName }) + .containsExactlyInAnyOrder( + "com.fasterxml.jackson.annotation.JsonProperty", + "com.test.anotherValidator.ValidName", + ) } @Test @@ -2873,13 +2969,17 @@ class KotlinCodeGenTest { generateCustomAnnotations = true, ), ) - val dataTypes = codeGen.generate().kotlinDataTypes + val codeGenResult = codeGen.generate() + val dataTypes = codeGenResult.kotlinDataTypes assertThat(dataTypes).hasSize(1) assertThat(dataTypes[0].name).isEqualTo("Person") - val annotationSpec = (dataTypes[0].members[0] as TypeSpec).annotations[0] - assertThat((annotationSpec.typeName as ClassName).canonicalName).isEqualTo("com.test.validator.ValidPerson") + val annotationSpec = + (dataTypes[0].members[0] as TypeSpec).annotations.single { + (it.typeName as ClassName).canonicalName == + "com.test.validator.ValidPerson" + } assertThat(annotationSpec.members[0]).extracting("args").asInstanceOf(InstanceOfAssertFactories.LIST).hasSize(1) assertThat( annotationSpec.members[0], @@ -2927,37 +3027,44 @@ class KotlinCodeGenTest { generateCustomAnnotations = true, ), ) - val dataTypes = codeGen.generate().kotlinDataTypes + val codeGenResult = codeGen.generate() + val dataTypes = codeGenResult.kotlinDataTypes assertThat(dataTypes).hasSize(1) assertThat(dataTypes[0].name).isEqualTo("Person") - val annotationSpec = (dataTypes[0].members[0] as TypeSpec).annotations[0] - assertThat((annotationSpec.typeName as ClassName).canonicalName).isEqualTo("com.test.validator.ValidPerson") + val annotationSpec = + (dataTypes[0].members[0] as TypeSpec).annotations.single { + (it.typeName as ClassName).canonicalName == "com.test.validator.ValidPerson" + } assertThat(annotationSpec.members[0]).extracting("args").asInstanceOf(InstanceOfAssertFactories.LIST).hasSize(1) - assertThat( - annotationSpec.members[0], - ).extracting("args").asString().contains("com.test.validator.groups.BasicValidation", "com.test.validator.groups.AdvanceValidation") + assertThat(annotationSpec.members[0]) + .extracting("args") + .asString() + .contains("com.test.validator.groups.BasicValidation", "com.test.validator.groups.AdvanceValidation") val parameterSpec = (((dataTypes[0].members)[0] as TypeSpec).primaryConstructor as FunSpec).parameters[0] assertThat(parameterSpec.name).isEqualTo("name") assertThat(parameterSpec.annotations).hasSize(2) - assertThat( - (parameterSpec.annotations[0].typeName as ClassName).canonicalName, - ).isEqualTo("com.fasterxml.jackson.annotation.JsonProperty") - assertThat((parameterSpec.annotations[1].typeName as ClassName).canonicalName).isEqualTo("com.test.anotherValidator.ValidName") + assertThat(parameterSpec.annotations.map { (it.typeName as ClassName).canonicalName }) + .containsExactlyInAnyOrder( + "com.fasterxml.jackson.annotation.JsonProperty", + "com.test.anotherValidator.ValidName", + ) val parameterSpec2 = (((dataTypes[0].members)[0] as TypeSpec).primaryConstructor as FunSpec).parameters[1] - val annotationSpec2 = (((dataTypes[0].members)[0] as TypeSpec).primaryConstructor as FunSpec).parameters[1].annotations[1] - assertThat( - (parameterSpec2.annotations[0].typeName as ClassName).canonicalName, - ).isEqualTo("com.fasterxml.jackson.annotation.JsonProperty") - assertThat((parameterSpec2.annotations[1].typeName as ClassName).canonicalName).isEqualTo("com.test.validator.dob.ValidDateOfBirth") - assertThat( - annotationSpec2.members[0], - ).extracting( - "args", - ).asString() + assertThat(parameterSpec2.annotations.map { (it.typeName as ClassName).canonicalName }) + .containsExactlyInAnyOrder( + "com.fasterxml.jackson.annotation.JsonProperty", + "com.test.validator.dob.ValidDateOfBirth", + ) + val annotationSpec2 = + parameterSpec2.annotations.single { + (it.typeName as ClassName).canonicalName == "com.test.validator.dob.ValidDateOfBirth" + } + assertThat(annotationSpec2.members[0]) + .extracting("args") + .asString() .contains("com.test.validator.dob.levels.PreliminaryValidation", "com.test.validator.dob.levels.SecondaryValidation") } @@ -2970,7 +3077,7 @@ class KotlinCodeGenTest { } """.trimIndent() - val dataTypes = + val codeGenResult = CodeGen( CodeGenConfig( schemas = setOf(schema), @@ -2983,13 +3090,17 @@ class KotlinCodeGenTest { ), generateCustomAnnotations = true, ), - ).generate().kotlinDataTypes + ).generate() + val dataTypes = codeGenResult.kotlinDataTypes assertThat(dataTypes).hasSize(1) assertThat(dataTypes[0].name).isEqualTo("Person") - val annotationSpec = (dataTypes[0].members[0] as TypeSpec).annotations[0] - assertThat((annotationSpec.typeName as ClassName).canonicalName).isEqualTo("com.test.validator.ValidPerson") + val annotationSpec = + (dataTypes[0].members[0] as TypeSpec).annotations.single { + (it.typeName as ClassName).canonicalName == + "com.test.validator.ValidPerson" + } assertThat(annotationSpec.members[0]).extracting("args").asInstanceOf(InstanceOfAssertFactories.LIST).hasSize(1) assertThat(annotationSpec.members[0]).extracting("args").asString().contains("com.enums.MALE") @@ -3011,7 +3122,7 @@ class KotlinCodeGenTest { } """.trimIndent() - val dataTypes = + val codeGenResult = CodeGen( CodeGenConfig( schemas = setOf(schema), @@ -3024,13 +3135,17 @@ class KotlinCodeGenTest { ), generateCustomAnnotations = true, ), - ).generate().kotlinDataTypes + ).generate() + val dataTypes = codeGenResult.kotlinDataTypes assertThat(dataTypes).hasSize(1) assertThat(dataTypes[0].name).isEqualTo("Person") - val annotationSpec = (dataTypes[0].members[0] as TypeSpec).annotations[0] - assertThat((annotationSpec.typeName as ClassName).canonicalName).isEqualTo("com.test.validator.ValidPerson") + val annotationSpec = + (dataTypes[0].members[0] as TypeSpec).annotations.single { + (it.typeName as ClassName).canonicalName == + "com.test.validator.ValidPerson" + } assertThat(annotationSpec.members[0]).extracting("args").asInstanceOf(InstanceOfAssertFactories.LIST).hasSize(1) assertThat(annotationSpec.members[0]).extracting("args").asString().contains("com.enums.HUSBAND", "com.enums.WIFE") @@ -3053,7 +3168,7 @@ class KotlinCodeGenTest { } """.trimIndent() - val dataTypes = + val codeGenResult = CodeGen( CodeGenConfig( schemas = setOf(schema), @@ -3067,13 +3182,17 @@ class KotlinCodeGenTest { ), generateCustomAnnotations = true, ), - ).generate().kotlinDataTypes + ).generate() + val dataTypes = codeGenResult.kotlinDataTypes assertThat(dataTypes).hasSize(1) assertThat(dataTypes[0].name).isEqualTo("Person") - val annotationSpec = (dataTypes[0].members[0] as TypeSpec).annotations[0] - assertThat((annotationSpec.typeName as ClassName).canonicalName).isEqualTo("com.test.validator.ValidPerson") + val annotationSpec = + (dataTypes[0].members[0] as TypeSpec).annotations.single { + (it.typeName as ClassName).canonicalName == + "com.test.validator.ValidPerson" + } assertThat(annotationSpec.members[0]).extracting("args").asInstanceOf(InstanceOfAssertFactories.LIST).hasSize(1) assertThat(annotationSpec.members[0]).extracting("args").asString().contains("com.enums.HUSBAND", "com.enums.WIFE") @@ -3105,7 +3224,7 @@ class KotlinCodeGenTest { } """.trimIndent() - val dataTypes = + val codeGenResult = CodeGen( CodeGenConfig( schemas = setOf(schema), @@ -3118,13 +3237,17 @@ class KotlinCodeGenTest { ), generateCustomAnnotations = true, ), - ).generate().kotlinDataTypes + ).generate() + val dataTypes = codeGenResult.kotlinDataTypes assertThat(dataTypes).hasSize(1) assertThat(dataTypes[0].name).isEqualTo("Person") - val annotationSpec = (dataTypes[0].members[0] as TypeSpec).annotations[0] - assertThat((annotationSpec.typeName as ClassName).canonicalName).isEqualTo("com.test.validator.ValidPerson") + val annotationSpec = + (dataTypes[0].members[0] as TypeSpec).annotations.single { + (it.typeName as ClassName).canonicalName == + "com.test.validator.ValidPerson" + } assertThat(annotationSpec.members[0]).extracting("args").asInstanceOf(InstanceOfAssertFactories.LIST).hasSize(1) assertThat(annotationSpec.members[0]).extracting("args").asString().contains("com.enums.HUSBAND", "com.enums.WIFE") @@ -3146,7 +3269,7 @@ class KotlinCodeGenTest { } """.trimIndent() - val dataTypes = + val codeGenResult = CodeGen( CodeGenConfig( schemas = setOf(schema), @@ -3159,13 +3282,17 @@ class KotlinCodeGenTest { ), generateCustomAnnotations = true, ), - ).generate().kotlinDataTypes + ).generate() + val dataTypes = codeGenResult.kotlinDataTypes assertThat(dataTypes).hasSize(1) assertThat(dataTypes[0].name).isEqualTo("Person") - val annotationSpec = (dataTypes[0].members[0] as TypeSpec).annotations[0] - assertThat((annotationSpec.typeName as ClassName).canonicalName).isEqualTo("com.test.validator.ValidPerson") + val annotationSpec = + (dataTypes[0].members[0] as TypeSpec).annotations.single { + (it.typeName as ClassName).canonicalName == + "com.test.validator.ValidPerson" + } assertThat(annotationSpec.members[0]).extracting("args").asInstanceOf(InstanceOfAssertFactories.LIST).hasSize(1) assertThat(annotationSpec.members[0]).extracting("args").asString().contains("com.enums.HUSBAND", "com.enums.WIFE") @@ -3188,7 +3315,7 @@ class KotlinCodeGenTest { } """.trimIndent() - val dataTypes = + val codeGenResult = CodeGen( CodeGenConfig( schemas = setOf(schema), @@ -3201,13 +3328,17 @@ class KotlinCodeGenTest { ), generateCustomAnnotations = true, ), - ).generate().kotlinDataTypes + ).generate() + val dataTypes = codeGenResult.kotlinDataTypes assertThat(dataTypes).hasSize(1) assertThat(dataTypes[0].name).isEqualTo("Person") - val annotationSpec = (dataTypes[0].members[0] as TypeSpec).annotations[0] - assertThat((annotationSpec.typeName as ClassName).canonicalName).isEqualTo("com.test.validator.ValidPerson") + val annotationSpec = + (dataTypes[0].members[0] as TypeSpec).annotations.single { + (it.typeName as ClassName).canonicalName == + "com.test.validator.ValidPerson" + } assertThat(annotationSpec.members[0]).extracting("args").asInstanceOf(InstanceOfAssertFactories.LIST).hasSize(1) assertThat(annotationSpec.members[0]).extracting("args").asString().contains("com.enums.HUSBAND", "com.enums.WIFE") @@ -3301,7 +3432,7 @@ class KotlinCodeGenTest { } """.trimIndent() - val dataTypes = + val codeGenResult = CodeGen( CodeGenConfig( schemas = setOf(schema), @@ -3309,17 +3440,19 @@ class KotlinCodeGenTest { language = Language.KOTLIN, addDeprecatedAnnotation = true, ), - ).generate().kotlinDataTypes + ).generate() + val dataTypes = codeGenResult.kotlinDataTypes assertThat(dataTypes).hasSize(1) assertThat(dataTypes[0].name).isEqualTo("Person") - val annotationSpec = (dataTypes[0].members[0] as TypeSpec).annotations[0] - assertThat((annotationSpec.typeName as ClassName).canonicalName).isEqualTo("kotlin.Deprecated") + val annotationSpec = + (dataTypes[0].members[0] as TypeSpec).annotations.single { + (it.typeName as ClassName).canonicalName == "kotlin.Deprecated" + } assertThat(annotationSpec.members).hasSize(1) - assertThat( - annotationSpec.members[0], - ).extracting("formatParts", "args") + assertThat(annotationSpec.members[0]) + .extracting("formatParts", "args") .asInstanceOf(InstanceOfAssertFactories.LIST) .contains(listOf("message = ", "%S"), listOf("Deprecated in the GraphQL schema.")) @@ -3348,19 +3481,20 @@ class KotlinCodeGenTest { } """.trimIndent() - val dataTypes = + val codeGenResult = CodeGen( CodeGenConfig( schemas = setOf(schema), packageName = BASE_PACKAGE_NAME, language = Language.KOTLIN, ), - ).generate().kotlinDataTypes + ).generate() + val dataTypes = codeGenResult.kotlinDataTypes assertThat(dataTypes).extracting("name").containsExactly("Person") val type = dataTypes[0].members[0] as TypeSpec assertThat(type.propertySpecs).extracting("name").containsExactly("name") - assertCompilesKotlin(dataTypes) + assertCompilesKotlin(codeGenResult) } @Test @@ -3373,19 +3507,21 @@ class KotlinCodeGenTest { } """.trimIndent() - val dataTypes = + val codeGenResult = CodeGen( CodeGenConfig( schemas = setOf(schema), packageName = BASE_PACKAGE_NAME, language = Language.KOTLIN, ), - ).generate().kotlinInterfaces - assertThat(dataTypes).extracting("name").containsExactly("Person") - val type = dataTypes[0].members[0] as TypeSpec + ).generate() + val dataTypes = codeGenResult.kotlinInterfaces + assertThat(dataTypes).extracting("name").containsExactlyInAnyOrder("Person", "Generated") + val personFile = dataTypes.single { it.name == "Person" } + val type = personFile.members[0] as TypeSpec assertThat(type.propertySpecs).extracting("name").containsExactly("name") - assertCompilesKotlin(dataTypes) + assertCompilesKotlin(codeGenResult) } @Test @@ -3398,7 +3534,7 @@ class KotlinCodeGenTest { } """.trimIndent() - val dataTypes = + val codeGenResult = CodeGen( CodeGenConfig( schemas = setOf(schema), @@ -3406,13 +3542,14 @@ class KotlinCodeGenTest { subPackageNameTypes = "mytypes", language = Language.KOTLIN, ), - ).generate().kotlinDataTypes + ).generate() + val dataTypes = codeGenResult.kotlinDataTypes assertThat(dataTypes.size).isEqualTo(1) assertThat(dataTypes[0].name).isEqualTo("Person") assertThat(dataTypes[0].packageName).isEqualTo("$BASE_PACKAGE_NAME.mytypes") - assertCompilesKotlin(dataTypes) + assertCompilesKotlin(codeGenResult) } @Test @@ -3477,8 +3614,8 @@ class KotlinCodeGenTest { assertThat(resultPage.propertySpecs).extracting("name").contains("items") assertThat(resultPage.superinterfaces.keys).isEmpty() - assertThat(interfaces.size).isEqualTo(1) - val searchResult = interfaces[0].members[0] as TypeSpec + assertThat(interfaces.size).isEqualTo(2) + val searchResult = interfaces.single { it.name == "SearchResult" }.members[0] as TypeSpec assertThat(FileSpec.get("$BASE_PACKAGE_NAME.types", searchResult).toString()).contains( """ |@JsonTypeInfo( @@ -3535,9 +3672,9 @@ class KotlinCodeGenTest { val interfaces = codeGenResult.kotlinInterfaces assertThat(dataTypes).hasSize(1) - assertThat(interfaces).hasSize(2) + assertThat(interfaces).hasSize(3) - val stoneFruitInterface = (interfaces[1].members[0] as TypeSpec) + val stoneFruitInterface = (interfaces.single { it.name == "StoneFruit" }.members[0] as TypeSpec) assertThat(stoneFruitInterface.superinterfaces).hasSize(1) assertThat( ( @@ -3547,7 +3684,7 @@ class KotlinCodeGenTest { ).simpleName, ).isEqualTo("Fruit") - assertCompilesKotlin(dataTypes + interfaces) + assertCompilesKotlin(codeGenResult) } @Test @@ -3614,27 +3751,33 @@ class KotlinCodeGenTest { ClassName .bestGuess("com.netflix.graphql.dgs.codegen.tests.generated.types.Employee"), ) - assertThat(interfaces).hasSize(2) + assertThat(interfaces).hasSize(3) - val personInterfaceType = interfaces[0].members[0] as TypeSpec + val personInterfaceType = interfaces.single { it.name == "Person" }.members[0] as TypeSpec assertThat(FileSpec.get("$BASE_PACKAGE_NAME.types", personInterfaceType).toString()).isEqualTo( """ |package com.netflix.graphql.dgs.codegen.tests.generated.types | |import kotlin.String + |import com.netflix.graphql.dgs.codegen.tests.generated.Generated as GeneratedGenerated + |import jakarta.`annotation`.Generated as AnnotationGenerated | + |@AnnotationGenerated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) + |@GeneratedGenerated |public interface Person { | public val firstname: String? | | public val lastname: String? | + | @AnnotationGenerated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) + | @GeneratedGenerated | public companion object |} | """.trimMargin(), ) - val employeeInterfaceType = interfaces[1].members[0] as TypeSpec + val employeeInterfaceType = interfaces.single { it.name == "Employee" }.members[0] as TypeSpec assertThat(FileSpec.get("$BASE_PACKAGE_NAME.types", employeeInterfaceType).toString()).isEqualTo( """ |package com.netflix.graphql.dgs.codegen.tests.generated.types @@ -3642,7 +3785,11 @@ class KotlinCodeGenTest { |import com.fasterxml.jackson.`annotation`.JsonSubTypes |import com.fasterxml.jackson.`annotation`.JsonTypeInfo |import kotlin.String + |import com.netflix.graphql.dgs.codegen.tests.generated.Generated as GeneratedGenerated + |import jakarta.`annotation`.Generated as AnnotationGenerated | + |@AnnotationGenerated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) + |@GeneratedGenerated |@JsonTypeInfo( | use = JsonTypeInfo.Id.NAME, | include = JsonTypeInfo.As.PROPERTY, @@ -3658,6 +3805,8 @@ class KotlinCodeGenTest { | | public val company: String? | + | @AnnotationGenerated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) + | @GeneratedGenerated | public companion object |} | @@ -3671,7 +3820,11 @@ class KotlinCodeGenTest { |import com.fasterxml.jackson.`annotation`.JsonProperty |import com.fasterxml.jackson.`annotation`.JsonTypeInfo |import kotlin.String + |import com.netflix.graphql.dgs.codegen.tests.generated.Generated as GeneratedGenerated + |import jakarta.`annotation`.Generated as AnnotationGenerated | + |@AnnotationGenerated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) + |@GeneratedGenerated |@JsonTypeInfo(use = JsonTypeInfo.Id.NONE) |public data class Talent( | @JsonProperty("firstname") @@ -3683,6 +3836,8 @@ class KotlinCodeGenTest { | @JsonProperty("imdbProfile") | public val imdbProfile: String? = null, |) : Employee { + | @AnnotationGenerated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) + | @GeneratedGenerated | public companion object |} | @@ -3735,7 +3890,7 @@ class KotlinCodeGenTest { ).generate() val interfaces = codeGenResult.kotlinInterfaces - assertThat(interfaces[0].toString()).isEqualTo( + assertThat(interfaces.single { it.name == "Pet" }.toString()).isEqualTo( """ |package com.netflix.graphql.dgs.codegen.tests.generated.types | @@ -3743,7 +3898,11 @@ class KotlinCodeGenTest { |import com.fasterxml.jackson.`annotation`.JsonTypeInfo |import kotlin.String |import kotlin.collections.List + |import com.netflix.graphql.dgs.codegen.tests.generated.Generated as GeneratedGenerated + |import jakarta.`annotation`.Generated as AnnotationGenerated | + |@AnnotationGenerated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) + |@GeneratedGenerated |@JsonTypeInfo( | use = JsonTypeInfo.Id.NAME, | include = JsonTypeInfo.As.PROPERTY, @@ -3766,6 +3925,8 @@ class KotlinCodeGenTest { | | public val parents: List? | + | @AnnotationGenerated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) + | @GeneratedGenerated | public companion object |} | @@ -3811,14 +3972,18 @@ class KotlinCodeGenTest { ).generate() val interfaces = codeGenResult.kotlinInterfaces - assertThat(interfaces[0].toString()).isEqualTo( + assertThat(interfaces.single { it.name == "Pet" }.toString()).isEqualTo( """ |package com.netflix.graphql.dgs.codegen.tests.generated.types | |import com.fasterxml.jackson.`annotation`.JsonSubTypes |import com.fasterxml.jackson.`annotation`.JsonTypeInfo |import kotlin.String + |import com.netflix.graphql.dgs.codegen.tests.generated.Generated as GeneratedGenerated + |import jakarta.`annotation`.Generated as AnnotationGenerated | + |@AnnotationGenerated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) + |@GeneratedGenerated |@JsonTypeInfo( | use = JsonTypeInfo.Id.NAME, | include = JsonTypeInfo.As.PROPERTY, @@ -3832,6 +3997,8 @@ class KotlinCodeGenTest { | | public val diet: Diet? | + | @AnnotationGenerated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) + | @GeneratedGenerated | public companion object |} | @@ -3866,14 +4033,15 @@ class KotlinCodeGenTest { } """.trimIndent() - val dataTypes = + val codeGenResult = CodeGen( CodeGenConfig( schemas = setOf(schema), packageName = BASE_PACKAGE_NAME, language = Language.KOTLIN, ), - ).generate().kotlinDataTypes + ).generate() + val dataTypes = codeGenResult.kotlinDataTypes val type = dataTypes[0].members[0] as TypeSpec val inputType = dataTypes[1].members[0] as TypeSpec @@ -3893,7 +4061,7 @@ It takes a title and such. """.trim(), ) - assertCompilesKotlin(dataTypes) + assertCompilesKotlin(codeGenResult) } @Test @@ -3920,14 +4088,15 @@ It takes a title and such. """.trimIndent() - val dataTypes = + val generatedResult = CodeGen( CodeGenConfig( schemas = setOf(schema), packageName = BASE_PACKAGE_NAME, language = Language.KOTLIN, ), - ).generate().kotlinDataTypes + ).generate() + val dataTypes = generatedResult.kotlinDataTypes val type = dataTypes[0].members[0] as TypeSpec val inputType = dataTypes[1].members[0] as TypeSpec @@ -3944,7 +4113,7 @@ It takes a title and such. """.trimIndent(), ) - assertCompilesKotlin(dataTypes) + assertCompilesKotlin(generatedResult) } @Test @@ -3959,14 +4128,15 @@ It takes a title and such. } """.trimIndent() - val interfaces = + val generatedResult = CodeGen( CodeGenConfig( schemas = setOf(schema), packageName = BASE_PACKAGE_NAME, language = Language.KOTLIN, ), - ).generate().kotlinInterfaces + ).generate() + val interfaces = generatedResult.kotlinInterfaces val type = interfaces[0].members[0] as TypeSpec @@ -3976,7 +4146,7 @@ It takes a title and such. """.trimIndent(), ) - assertCompilesKotlin(interfaces) + assertCompilesKotlin(generatedResult) } @Test @@ -3991,14 +4161,15 @@ It takes a title and such. } """.trimIndent() - val interfaces = + val generatedResult = CodeGen( CodeGenConfig( schemas = setOf(schema), packageName = BASE_PACKAGE_NAME, language = Language.KOTLIN, ), - ).generate().kotlinInterfaces + ).generate() + val interfaces = generatedResult.kotlinInterfaces val type = interfaces[0].members[0] as TypeSpec @@ -4008,7 +4179,7 @@ It takes a title and such. """.trimIndent(), ) - assertCompilesKotlin(interfaces) + assertCompilesKotlin(generatedResult) } @Test @@ -4056,9 +4227,9 @@ It takes a title and such. val interfaces = codeGenResult.kotlinInterfaces - assertThat(interfaces.size).isEqualTo(1) + assertThat(interfaces.size).isEqualTo(2) - val interfaceTypeSpec = interfaces[0].members[0] as TypeSpec + val interfaceTypeSpec = interfaces.single { it.name == "HasDefaultField" }.members[0] as TypeSpec assertThat(interfaceTypeSpec.propertySpecs.size).isEqualTo(3) assertThat(interfaceTypeSpec.propertySpecs[0].name).isEqualTo("default") @@ -4125,14 +4296,15 @@ It takes a title and such. } """.trimIndent() - val enums = + val generatedResult = CodeGen( CodeGenConfig( schemas = setOf(schema), packageName = BASE_PACKAGE_NAME, language = Language.KOTLIN, ), - ).generate().kotlinEnumTypes + ).generate() + val enums = generatedResult.kotlinEnumTypes val type = enums[0].members[0] as TypeSpec @@ -4147,7 +4319,7 @@ It takes a title and such. """.trimIndent(), ) - assertCompilesKotlin(enums) + assertCompilesKotlin(generatedResult) } @Test @@ -4167,14 +4339,15 @@ It takes a title and such. } """.trimIndent() - val enums = + val generatedResult = CodeGen( CodeGenConfig( schemas = setOf(schema), packageName = BASE_PACKAGE_NAME, language = Language.KOTLIN, ), - ).generate().kotlinEnumTypes + ).generate() + val enums = generatedResult.kotlinEnumTypes val type = enums[0].members[0] as TypeSpec @@ -4190,7 +4363,7 @@ It takes a title and such. """.trimIndent(), ) - assertCompilesKotlin(enums) + assertCompilesKotlin(generatedResult) } @Test @@ -4233,6 +4406,7 @@ It takes a title and such. packageName = BASE_PACKAGE_NAME, language = Language.KOTLIN, generateClientApi = true, + addGeneratedAnnotation = false, // javac harness can't resolve Kotlin-emitted @Generated referenced by Java client API ), ).generate() @@ -4288,6 +4462,7 @@ It takes a title and such. packageName = BASE_PACKAGE_NAME, language = Language.KOTLIN, addGeneratedAnnotation = true, + disableDatesInGeneratedAnnotation = false, generateClientApi = true, ), ).generate() @@ -4387,10 +4562,12 @@ It takes a title and such. assertThat(codeGenResult.kotlinDataTypes.size).isEqualTo(1) val person = codeGenResult.kotlinDataTypes.single() assertThat(person.name).isEqualTo("Person") - assertThat((person.members[0] as TypeSpec).annotations).hasSize(1) - val deprecatedAnnotationSpec = ((person.members[0] as TypeSpec).annotations)[0] + val deprecatedAnnotationSpec = + (person.members[0] as TypeSpec).annotations.single { + (it.typeName as ClassName).canonicalName == + "kotlin.Deprecated" + } assertThat((deprecatedAnnotationSpec.typeName as ClassName).simpleNames[0]).isEqualTo("Deprecated") - assertThat(deprecatedAnnotationSpec.canonicalName()).isEqualTo("kotlin.Deprecated") val fields = ((person.members[0]) as TypeSpec).propertySpecs assertThat(fields).hasSize(1) assertThat(fields[0].annotations).hasSize(0) @@ -4468,7 +4645,7 @@ It takes a title and such. .defaultValue .toString(), ).isEqualTo("Locale.forLanguageTag(\"en-US\")") - assertCompilesKotlin(dataTypes) + assertCompilesKotlin(codeGenResult) } @Test @@ -4511,14 +4688,15 @@ It takes a title and such. } """.trimIndent() - val dataTypes = + val generatedResult = CodeGen( CodeGenConfig( schemas = setOf(schema), packageName = BASE_PACKAGE_NAME, language = Language.KOTLIN, ), - ).generate().kotlinDataTypes + ).generate() + val dataTypes = generatedResult.kotlinDataTypes assertThat(dataTypes).hasSize(2) @@ -4541,7 +4719,7 @@ It takes a title and such. assertThat(colorParam.defaultValue).isNotNull assertThat(colorParam.defaultValue.toString()).isEqualTo("$TYPES_PACKAGE_NAME.Person()") - assertCompilesKotlin(dataTypes) + assertCompilesKotlin(generatedResult) } @Test @@ -4562,14 +4740,15 @@ It takes a title and such. } """.trimIndent() - val dataTypes = + val generatedResult = CodeGen( CodeGenConfig( schemas = setOf(schema), packageName = BASE_PACKAGE_NAME, language = Language.KOTLIN, ), - ).generate().kotlinDataTypes + ).generate() + val dataTypes = generatedResult.kotlinDataTypes assertThat(dataTypes).hasSize(3) @@ -4594,7 +4773,7 @@ It takes a title and such. colorParam.defaultValue.toString(), ).isEqualTo("$TYPES_PACKAGE_NAME.Person(name = \"Harrison\", car = $TYPES_PACKAGE_NAME.Car(brand = \"Ford\"))") - assertCompilesKotlin(dataTypes) + assertCompilesKotlin(generatedResult) } @Test @@ -4611,14 +4790,15 @@ It takes a title and such. } """.trimIndent() - val dataTypes = + val generatedResult = CodeGen( CodeGenConfig( schemas = setOf(schema), packageName = BASE_PACKAGE_NAME, language = Language.KOTLIN, ), - ).generate().kotlinDataTypes + ).generate() + val dataTypes = generatedResult.kotlinDataTypes assertThat(dataTypes).hasSize(2) val data = dataTypes[0] @@ -4642,7 +4822,7 @@ It takes a title and such. colorParam.defaultValue.toString(), ).isEqualTo("""listOf($TYPES_PACKAGE_NAME.Movie(name = "Braveheart"), $TYPES_PACKAGE_NAME.Movie(name = "Matrix", year = 1_999))""") - assertCompilesKotlin(dataTypes) + assertCompilesKotlin(generatedResult) } @Test @@ -4659,7 +4839,7 @@ It takes a title and such. } """.trimIndent() - val dataTypes = + val generatedResult = CodeGen( CodeGenConfig( schemas = setOf(schema), @@ -4667,7 +4847,8 @@ It takes a title and such. language = Language.KOTLIN, typeMapping = mapOf("Movie" to "mypackage.Film"), ), - ).generate().kotlinDataTypes + ).generate() + val dataTypes = generatedResult.kotlinDataTypes assertThat(dataTypes).hasSize(1) val data = dataTypes[0] @@ -4706,7 +4887,7 @@ It takes a title and such. } """.trimIndent() - val dataTypes = + val generatedResult = CodeGen( CodeGenConfig( schemas = setOf(schema), @@ -4714,7 +4895,8 @@ It takes a title and such. language = Language.KOTLIN, typeMapping = mapOf("Person" to "mypackage.Human"), ), - ).generate().kotlinDataTypes + ).generate() + val dataTypes = generatedResult.kotlinDataTypes assertThat(dataTypes).hasSize(1) @@ -4811,7 +4993,7 @@ It takes a title and such. .defaultValue .toString(), ).isEqualTo("java.math.BigDecimal(3.14E+19)") - assertCompilesKotlin(dataTypes) + assertCompilesKotlin(codeGenResult) } @Test @@ -4906,7 +5088,7 @@ It takes a title and such. .defaultValue .toString(), ).isEqualTo("java.util.Currency.getInstance(\"USD\")") - assertCompilesKotlin(dataTypes) + assertCompilesKotlin(codeGenResult) } @Test @@ -4963,7 +5145,7 @@ It takes a title and such. val dataTypes = codeGenResult.kotlinDataTypes assertThat(dataFetchers).isEmpty() assertThat(dataTypes.size).isEqualTo(2) - assertCompilesKotlin(dataTypes) + assertCompilesKotlin(codeGenResult) val ageField = dataTypes[0] .typeSpecs[0] @@ -5018,7 +5200,7 @@ It takes a title and such. val dataTypes = codeGenResult.kotlinDataTypes assertThat(dataFetchers).isEmpty() assertThat(dataTypes.size).isEqualTo(1) - assertCompilesKotlin(dataTypes) + assertCompilesKotlin(codeGenResult) val minField = dataTypes[0] .typeSpecs[0] @@ -5055,14 +5237,15 @@ It takes a title and such. } """.trimIndent() - val dataTypes = + val generatedResult = CodeGen( CodeGenConfig( schemas = setOf(schema), packageName = BASE_PACKAGE_NAME, language = Language.KOTLIN, ), - ).generate().kotlinDataTypes + ).generate() + val dataTypes = generatedResult.kotlinDataTypes assertThat(dataTypes.size).isEqualTo(1) assertThat(dataTypes[0].name).isEqualTo("person") @@ -5073,7 +5256,7 @@ It takes a title and such. assertThat(type.propertySpecs.size).isEqualTo(2) assertThat(type.propertySpecs).extracting("name").contains("firstname", "lastname") - assertCompilesKotlin(dataTypes) + assertCompilesKotlin(generatedResult) } @Test @@ -5090,14 +5273,15 @@ It takes a title and such. } """.trimIndent() - val dataTypes = + val generatedResult = CodeGen( CodeGenConfig( schemas = setOf(schema), packageName = BASE_PACKAGE_NAME, language = Language.KOTLIN, ), - ).generate().kotlinDataTypes + ).generate() + val dataTypes = generatedResult.kotlinDataTypes assertThat(dataTypes.size).isEqualTo(1) assertThat(dataTypes[0].name).isEqualTo("_person") @@ -5108,6 +5292,6 @@ It takes a title and such. assertThat(type.propertySpecs.size).isEqualTo(2) assertThat(type.propertySpecs).extracting("name").contains("firstname", "lastname") - assertCompilesKotlin(dataTypes) + assertCompilesKotlin(generatedResult) } } diff --git a/graphql-dgs-codegen-core/src/test/kotlin/com/netflix/graphql/dgs/codegen/clientapi/ClientApiGenFragmentTest.kt b/graphql-dgs-codegen-core/src/test/kotlin/com/netflix/graphql/dgs/codegen/clientapi/ClientApiGenFragmentTest.kt index e4168de85..8046dbc22 100644 --- a/graphql-dgs-codegen-core/src/test/kotlin/com/netflix/graphql/dgs/codegen/clientapi/ClientApiGenFragmentTest.kt +++ b/graphql-dgs-codegen-core/src/test/kotlin/com/netflix/graphql/dgs/codegen/clientapi/ClientApiGenFragmentTest.kt @@ -308,7 +308,10 @@ class ClientApiGenFragmentTest { | |import com.fasterxml.jackson.annotation.JsonSubTypes; |import com.fasterxml.jackson.annotation.JsonTypeInfo; + |import jakarta.annotation.Generated; | + |@Generated("com.netflix.graphql.dgs.codegen.CodeGen") + |@com.netflix.graphql.dgs.codegen.tests.generated.Generated |@JsonTypeInfo( | use = JsonTypeInfo.Id.NAME, | include = JsonTypeInfo.As.PROPERTY, diff --git a/graphql-dgs-codegen-core/src/test/kotlin/com/netflix/graphql/dgs/codegen/clientapi/ClientApiGenMutationTest.kt b/graphql-dgs-codegen-core/src/test/kotlin/com/netflix/graphql/dgs/codegen/clientapi/ClientApiGenMutationTest.kt index acea4c243..3106d3cc2 100644 --- a/graphql-dgs-codegen-core/src/test/kotlin/com/netflix/graphql/dgs/codegen/clientapi/ClientApiGenMutationTest.kt +++ b/graphql-dgs-codegen-core/src/test/kotlin/com/netflix/graphql/dgs/codegen/clientapi/ClientApiGenMutationTest.kt @@ -52,7 +52,7 @@ class ClientApiGenMutationTest { assertThat(codeGenResult.javaQueryTypes.size).isEqualTo(1) assertThat(codeGenResult.javaQueryTypes[0].typeSpec().name()).isEqualTo("UpdateMovieGraphQLQuery") - assertCompilesJava(codeGenResult.clientProjections + codeGenResult.javaQueryTypes) + assertCompilesJava(codeGenResult) } @Test @@ -87,9 +87,7 @@ class ClientApiGenMutationTest { assertThat(codeGenResult.javaQueryTypes.size).isEqualTo(1) assertThat(codeGenResult.javaQueryTypes[0].typeSpec().name()).isEqualTo("UpdateMovieGraphQLQuery") - assertCompilesJava( - codeGenResult.clientProjections + codeGenResult.javaQueryTypes + codeGenResult.javaDataTypes, - ) + assertCompilesJava(codeGenResult) } @Test @@ -135,9 +133,7 @@ class ClientApiGenMutationTest { .toString(), ).isEqualTo("Some movie description") - assertCompilesJava( - codeGenResult.clientProjections + codeGenResult.javaQueryTypes + codeGenResult.javaDataTypes, - ) + assertCompilesJava(codeGenResult) } @Test @@ -192,9 +188,7 @@ class ClientApiGenMutationTest { """.trimMargin() assert(initMethod.contains(expected)) - assertCompilesJava( - codeGenResult.clientProjections + codeGenResult.javaQueryTypes + codeGenResult.javaDataTypes, - ) + assertCompilesJava(codeGenResult) } @Test @@ -230,9 +224,7 @@ class ClientApiGenMutationTest { .contains("super(\"mutation\", queryName);\ngetInput().put(\"movieId\", movieId);"), ) - assertCompilesJava( - codeGenResult.clientProjections + codeGenResult.javaQueryTypes + codeGenResult.javaDataTypes, - ) + assertCompilesJava(codeGenResult) } @Test @@ -310,7 +302,7 @@ class ClientApiGenMutationTest { .extracting("name") .containsExactly("ShowsProjectionRoot", "BooleanProjection") - assertCompilesJava(codeGenResult.clientProjections + codeGenResult.javaDataTypes + codeGenResult.javaEnumTypes) + assertCompilesJava(codeGenResult) } @Test diff --git a/graphql-dgs-codegen-core/src/test/kotlin/com/netflix/graphql/dgs/codegen/clientapi/ClientApiGenProjectionTest.kt b/graphql-dgs-codegen-core/src/test/kotlin/com/netflix/graphql/dgs/codegen/clientapi/ClientApiGenProjectionTest.kt index da238fe14..24e7c4a15 100644 --- a/graphql-dgs-codegen-core/src/test/kotlin/com/netflix/graphql/dgs/codegen/clientapi/ClientApiGenProjectionTest.kt +++ b/graphql-dgs-codegen-core/src/test/kotlin/com/netflix/graphql/dgs/codegen/clientapi/ClientApiGenProjectionTest.kt @@ -54,7 +54,7 @@ class ClientApiGenProjectionTest { assertThat(codeGenResult.clientProjections.size).isEqualTo(1) assertThat(codeGenResult.clientProjections[0].typeSpec().name()).isEqualTo("PeopleProjectionRoot") - assertCompilesJava(codeGenResult.clientProjections) + assertCompilesJava(codeGenResult) } @Test @@ -86,7 +86,7 @@ class ClientApiGenProjectionTest { assertThat(codeGenResult.clientProjections[0].typeSpec().methodSpecs()).extracting("name").contains("friends") assertThat(codeGenResult.clientProjections[1].typeSpec().methodSpecs()).extracting("name").contains("name") - assertCompilesJava(codeGenResult.clientProjections + codeGenResult.javaQueryTypes) + assertCompilesJava(codeGenResult) } @Test @@ -128,10 +128,7 @@ class ClientApiGenProjectionTest { assertThat(codeGenResult.clientProjections[2].typeSpec().name()).isEqualTo("DetailsProjection") assertThat(codeGenResult.clientProjections[3].typeSpec().name()).isEqualTo("ShowProjection") - assertCompilesJava( - codeGenResult.clientProjections + codeGenResult.javaQueryTypes + codeGenResult.javaEnumTypes + codeGenResult.javaDataTypes + - codeGenResult.javaInterfaces, - ) + assertCompilesJava(codeGenResult) } @Test @@ -176,10 +173,7 @@ class ClientApiGenProjectionTest { assertThat(codeGenResult.clientProjections[3].typeSpec().name()).isEqualTo("RelatedProjection") assertThat(codeGenResult.clientProjections[4].typeSpec().name()).isEqualTo("VideoProjection") - assertCompilesJava( - codeGenResult.clientProjections + codeGenResult.javaQueryTypes + codeGenResult.javaEnumTypes + codeGenResult.javaDataTypes + - codeGenResult.javaInterfaces, - ) + assertCompilesJava(codeGenResult) } @Test @@ -207,7 +201,7 @@ class ClientApiGenProjectionTest { assertThat(codeGenResult.clientProjections[0].typeSpec().name()).isEqualTo("PersonsProjectionRoot") assertThat(codeGenResult.clientProjections[1].typeSpec().name()).isEqualTo("FriendsProjectionRoot") - assertCompilesJava(codeGenResult.clientProjections + codeGenResult.javaQueryTypes) + assertCompilesJava(codeGenResult) } @Test @@ -241,7 +235,7 @@ class ClientApiGenProjectionTest { assertThat(codeGenResult.clientProjections[1].typeSpec().name()).isEqualTo("DetailsProjection") assertThat(codeGenResult.clientProjections[2].typeSpec().name()).isEqualTo("DetailsProjectionRoot") - assertCompilesJava(codeGenResult.clientProjections + codeGenResult.javaQueryTypes) + assertCompilesJava(codeGenResult) } @Test @@ -255,7 +249,6 @@ class ClientApiGenProjectionTest { type Movie { title: String actors: [Actor] - type: MovieType } type Actor { @@ -278,7 +271,7 @@ class ClientApiGenProjectionTest { assertThat(codeGenResult.clientProjections[0].typeSpec().name()).isEqualTo("MoviesProjectionRoot") assertThat(codeGenResult.clientProjections[1].typeSpec().name()).isEqualTo("ActorProjection") - assertCompilesJava(codeGenResult.clientProjections + codeGenResult.javaQueryTypes) + assertCompilesJava(codeGenResult) } @Test @@ -317,7 +310,7 @@ class ClientApiGenProjectionTest { assertThat(codeGenResult.clientProjections[1].typeSpec().name()).isEqualTo("MovieProjection") assertThat(codeGenResult.clientProjections[2].typeSpec().name()).isEqualTo("GenreProjection") - assertCompilesJava(codeGenResult.clientProjections + codeGenResult.javaQueryTypes) + assertCompilesJava(codeGenResult) } @Test @@ -356,7 +349,7 @@ class ClientApiGenProjectionTest { assertThat(codeGenResult.clientProjections[1].typeSpec().name()).isEqualTo("ActorProjection") assertThat(codeGenResult.clientProjections[2].typeSpec().name()).isEqualTo("MovieProjection") - assertCompilesJava(codeGenResult.clientProjections + codeGenResult.javaQueryTypes) + assertCompilesJava(codeGenResult) } @Test @@ -531,7 +524,7 @@ class ClientApiGenProjectionTest { assertThat(codeGenResult.clientProjections[4].typeSpec().name()).isEqualTo("AgentProjection") assertThat(codeGenResult.clientProjections[5].typeSpec().name()).isEqualTo("AddressProjection") - assertCompilesJava(codeGenResult.clientProjections + codeGenResult.javaQueryTypes) + assertCompilesJava(codeGenResult) } @Test @@ -577,10 +570,7 @@ class ClientApiGenProjectionTest { assertThat(codeGenResult.clientProjections[1].typeSpec().methodSpecs()).extracting("name").contains("shows") assertThat(codeGenResult.clientProjections[1].typeSpec().methodSpecs()).extracting("name").contains("name") - assertCompilesJava( - codeGenResult.clientProjections + codeGenResult.javaQueryTypes + codeGenResult.javaEnumTypes + codeGenResult.javaDataTypes + - codeGenResult.javaInterfaces, - ) + assertCompilesJava(codeGenResult) } @Test @@ -687,7 +677,7 @@ class ClientApiGenProjectionTest { .extracting("name") .contains("__", "_root", "_parent", "_import", "_short") - assertCompilesJava(codeGenResult.clientProjections) + assertCompilesJava(codeGenResult) } @Test @@ -969,7 +959,7 @@ class ClientApiGenProjectionTest { assertThat(permissionsMethod.parameters()[0].name()).isEqualTo("filter") assertThat(permissionsMethod.parameters()[0].type().toString()).isEqualTo("java.util.List") - assertCompilesJava(codeGenResult.clientProjections + codeGenResult.javaQueryTypes) + assertCompilesJava(codeGenResult) } @Test @@ -1008,6 +998,6 @@ class ClientApiGenProjectionTest { .extracting("name") .contains("q1", "q2") - assertCompilesJava(codeGenResult.clientProjections + codeGenResult.javaQueryTypes) + assertCompilesJava(codeGenResult.clientProjections + codeGenResult.javaQueryTypes + codeGenResult.javaInterfaces) } } diff --git a/graphql-dgs-codegen-core/src/test/kotlin/com/netflix/graphql/dgs/codegen/clientapi/ClientApiGenQueryTest.kt b/graphql-dgs-codegen-core/src/test/kotlin/com/netflix/graphql/dgs/codegen/clientapi/ClientApiGenQueryTest.kt index 9c79ad00d..e48e5bc94 100644 --- a/graphql-dgs-codegen-core/src/test/kotlin/com/netflix/graphql/dgs/codegen/clientapi/ClientApiGenQueryTest.kt +++ b/graphql-dgs-codegen-core/src/test/kotlin/com/netflix/graphql/dgs/codegen/clientapi/ClientApiGenQueryTest.kt @@ -58,7 +58,7 @@ class ClientApiGenQueryTest { (it.parameters().find { param -> param.name() == "queryName" } != null) } - assertCompilesJava(codeGenResult.clientProjections + codeGenResult.javaQueryTypes) + assertCompilesJava(codeGenResult) } @Test @@ -100,7 +100,7 @@ class ClientApiGenQueryTest { """.trimIndent(), ) - assertCompilesJava(codeGenResult.clientProjections + codeGenResult.javaQueryTypes) + assertCompilesJava(codeGenResult) } @Test @@ -242,7 +242,7 @@ class ClientApiGenQueryTest { "VideoProjection", ) - assertCompilesJava(codeGenResult.clientProjections + codeGenResult.javaDataTypes + codeGenResult.javaEnumTypes) + assertCompilesJava(codeGenResult) } @Test @@ -279,7 +279,7 @@ class ClientApiGenQueryTest { assertThat(codeGenResult.javaDataTypes[0].typeSpec().name()).isEqualTo("MovieQuery") assertThat(codeGenResult.javaDataTypes[1].typeSpec().name()).isEqualTo("BooleanQuery") - assertCompilesJava(codeGenResult.javaDataTypes) + assertCompilesJava(codeGenResult) } @Test @@ -313,7 +313,7 @@ class ClientApiGenQueryTest { .name(), ).isEqualTo("lastname") - assertCompilesJava(codeGenResult.clientProjections + codeGenResult.javaQueryTypes) + assertCompilesJava(codeGenResult) } @Test @@ -352,9 +352,7 @@ class ClientApiGenQueryTest { .name(), ).isEqualTo("index") - assertCompilesJava( - codeGenResult.clientProjections + codeGenResult.javaQueryTypes + codeGenResult.javaEnumTypes, - ) + assertCompilesJava(codeGenResult) } @Test @@ -394,9 +392,7 @@ class ClientApiGenQueryTest { .name(), ).isEqualTo("index") - assertCompilesJava( - codeGenResult.clientProjections + codeGenResult.javaQueryTypes + codeGenResult.javaEnumTypes + codeGenResult.javaDataTypes, - ) + assertCompilesJava(codeGenResult) } @Test @@ -457,9 +453,7 @@ class ClientApiGenQueryTest { assertThat(codeGenResult.javaQueryTypes.size).isEqualTo(1) assertThat(codeGenResult.javaQueryTypes[0].typeSpec().name()).isEqualTo("PersonsGraphQLQuery") - assertCompilesJava( - codeGenResult.clientProjections + codeGenResult.javaQueryTypes + codeGenResult.javaEnumTypes + codeGenResult.javaDataTypes, - ) + assertCompilesJava(codeGenResult) } @Test @@ -520,10 +514,7 @@ class ClientApiGenQueryTest { .name(), ).isEqualTo("episodes") - assertCompilesJava( - codeGenResult.clientProjections + codeGenResult.javaQueryTypes + codeGenResult.javaEnumTypes + codeGenResult.javaDataTypes + - codeGenResult.javaInterfaces, - ) + assertCompilesJava(codeGenResult) } @Test @@ -560,7 +551,7 @@ class ClientApiGenQueryTest { assertThat(codeGenResult.javaQueryTypes.size).isEqualTo(1) assertThat(codeGenResult.javaQueryTypes[0].typeSpec().name()).isEqualTo("QueryRootGraphQLQuery") - assertThat(codeGenResult.javaInterfaces.size).isEqualTo(1) + assertThat(codeGenResult.javaInterfaces.size).isEqualTo(2) assertThat(codeGenResult.javaInterfaces[0].typeSpec().name()).isEqualTo("HasDefaultField") assertThat(codeGenResult.javaDataTypes.size).isEqualTo(1) @@ -589,10 +580,7 @@ class ClientApiGenQueryTest { .name(), ).isEqualTo("_public") - assertCompilesJava( - codeGenResult.clientProjections + codeGenResult.javaQueryTypes + codeGenResult.javaEnumTypes + codeGenResult.javaDataTypes + - codeGenResult.javaInterfaces, - ) + assertCompilesJava(codeGenResult) } @Test @@ -994,7 +982,7 @@ class ClientApiGenQueryTest { .toString(), ).isEqualTo("") - assertCompilesJava(codeGenResult.javaDataTypes) + assertCompilesJava(codeGenResult) } @Test @@ -1036,6 +1024,7 @@ class ClientApiGenQueryTest { schemas = setOf(schema), packageName = BASE_PACKAGE_NAME, generateClientApi = true, + addGeneratedAnnotation = false, ), ).generate() @@ -1098,6 +1087,6 @@ class ClientApiGenQueryTest { assertThat(typeSpec.methodSpecs()[2].name()).isEqualTo("getClassField") assertThat(typeSpec.methodSpecs()[3].name()).isEqualTo("setClassField") - assertCompilesJava(codeGenResult.javaDataTypes + codeGenResult.javaInterfaces) + assertCompilesJava(codeGenResult) } } diff --git a/graphql-dgs-codegen-core/src/test/kotlin/com/netflix/graphql/dgs/codegen/clientapi/ClientApiGenSubscriptionTest.kt b/graphql-dgs-codegen-core/src/test/kotlin/com/netflix/graphql/dgs/codegen/clientapi/ClientApiGenSubscriptionTest.kt index b4279bdcf..6b6828377 100644 --- a/graphql-dgs-codegen-core/src/test/kotlin/com/netflix/graphql/dgs/codegen/clientapi/ClientApiGenSubscriptionTest.kt +++ b/graphql-dgs-codegen-core/src/test/kotlin/com/netflix/graphql/dgs/codegen/clientapi/ClientApiGenSubscriptionTest.kt @@ -52,7 +52,7 @@ class ClientApiGenSubscriptionTest { assertThat(codeGenResult.javaQueryTypes.size).isEqualTo(1) assertThat(codeGenResult.javaQueryTypes[0].typeSpec().name()).isEqualTo("MovieGraphQLQuery") - assertCompilesJava(codeGenResult.clientProjections + codeGenResult.javaQueryTypes) + assertCompilesJava(codeGenResult) } @Test @@ -87,9 +87,7 @@ class ClientApiGenSubscriptionTest { assertThat(codeGenResult.javaQueryTypes.size).isEqualTo(1) assertThat(codeGenResult.javaQueryTypes[0].typeSpec().name()).isEqualTo("MovieGraphQLQuery") - assertCompilesJava( - codeGenResult.clientProjections + codeGenResult.javaQueryTypes + codeGenResult.javaDataTypes, - ) + assertCompilesJava(codeGenResult) } @Test diff --git a/graphql-dgs-codegen-gradle/src/main/kotlin/com/netflix/graphql/dgs/codegen/gradle/GenerateJavaTask.kt b/graphql-dgs-codegen-gradle/src/main/kotlin/com/netflix/graphql/dgs/codegen/gradle/GenerateJavaTask.kt index 8a863814f..6da7e5c26 100644 --- a/graphql-dgs-codegen-gradle/src/main/kotlin/com/netflix/graphql/dgs/codegen/gradle/GenerateJavaTask.kt +++ b/graphql-dgs-codegen-gradle/src/main/kotlin/com/netflix/graphql/dgs/codegen/gradle/GenerateJavaTask.kt @@ -138,10 +138,10 @@ open class GenerateJavaTask var snakeCaseConstantNames = false @Input - var addGeneratedAnnotation = false + var addGeneratedAnnotation = true @Input - var disableDatesInGeneratedAnnotation = false + var disableDatesInGeneratedAnnotation = true @Input var addDeprecatedAnnotation = false diff --git a/graphql-dgs-codegen-gradle/src/test/resources/test-project-no-schema-files/build.gradle b/graphql-dgs-codegen-gradle/src/test/resources/test-project-no-schema-files/build.gradle index 11b42e633..db59451d2 100644 --- a/graphql-dgs-codegen-gradle/src/test/resources/test-project-no-schema-files/build.gradle +++ b/graphql-dgs-codegen-gradle/src/test/resources/test-project-no-schema-files/build.gradle @@ -26,6 +26,15 @@ configurations { CodeGenConfiguration.exclude group: "com.netflix.graphql.dgs.codegen", module: "graphql-dgs-codegen-core" } +repositories { + mavenCentral() +} + +dependencies { + // Required to resolve @jakarta.annotation.Generated emitted when addGeneratedAnnotation is true + implementation 'jakarta.annotation:jakarta.annotation-api:2.1.1' +} + generateJava { schemaPaths = ["${projectDir}/src/main/resources/schema"] packageName = 'com.netflix.testproject.graphql' diff --git a/graphql-dgs-codegen-gradle/src/test/resources/test-project-no-schema-files/build_with_default_dir.gradle b/graphql-dgs-codegen-gradle/src/test/resources/test-project-no-schema-files/build_with_default_dir.gradle index a9c9a6196..c8f19106b 100644 --- a/graphql-dgs-codegen-gradle/src/test/resources/test-project-no-schema-files/build_with_default_dir.gradle +++ b/graphql-dgs-codegen-gradle/src/test/resources/test-project-no-schema-files/build_with_default_dir.gradle @@ -26,6 +26,15 @@ configurations { CodeGenConfiguration.exclude group: "com.netflix.graphql.dgs.codegen", module: "graphql-dgs-codegen-core" } +repositories { + mavenCentral() +} + +dependencies { + // Required to resolve @jakarta.annotation.Generated emitted when addGeneratedAnnotation is true + implementation 'jakarta.annotation:jakarta.annotation-api:2.1.1' +} + generateJava { schemaPaths = ["${projectDir}/src/main/resources/schema"] packageName = 'com.netflix.testproject.graphql' diff --git a/graphql-dgs-codegen-gradle/src/test/resources/test-project/build.gradle b/graphql-dgs-codegen-gradle/src/test/resources/test-project/build.gradle index fe412e2a8..940de6078 100644 --- a/graphql-dgs-codegen-gradle/src/test/resources/test-project/build.gradle +++ b/graphql-dgs-codegen-gradle/src/test/resources/test-project/build.gradle @@ -26,6 +26,15 @@ configurations { CodeGenConfiguration.exclude group: "com.netflix.graphql.dgs.codegen", module: "graphql-dgs-codegen-core" } +repositories { + mavenCentral() +} + +dependencies { + // Required to resolve @jakarta.annotation.Generated emitted when addGeneratedAnnotation is true + implementation 'jakarta.annotation:jakarta.annotation-api:2.1.1' +} + generateJava { schemaPaths = ["${projectDir}/src/main/resources/schema"] packageName = 'com.netflix.testproject.graphql' diff --git a/graphql-dgs-codegen-gradle/src/test/resources/test-project/build_with_default_dir.gradle b/graphql-dgs-codegen-gradle/src/test/resources/test-project/build_with_default_dir.gradle index a9c9a6196..82de2d352 100644 --- a/graphql-dgs-codegen-gradle/src/test/resources/test-project/build_with_default_dir.gradle +++ b/graphql-dgs-codegen-gradle/src/test/resources/test-project/build_with_default_dir.gradle @@ -21,6 +21,14 @@ plugins { id 'com.netflix.dgs.codegen' } +repositories { + mavenCentral() +} + +dependencies { + implementation 'jakarta.annotation:jakarta.annotation-api:2.1.1' +} + configurations { // injected by Gradle Runner through test configuration, see CodegenGradlePluginTest CodeGenConfiguration.exclude group: "com.netflix.graphql.dgs.codegen", module: "graphql-dgs-codegen-core" From 5c68390f42bda984aa4e506975561167dcf2ae11 Mon Sep 17 00:00:00 2001 From: Jiho Lee Date: Wed, 22 Apr 2026 17:38:49 -0700 Subject: [PATCH 2/7] Add tests verifying generated flag false --- .../graphql/dgs/codegen/CodeGenTest.kt | 53 ++++++++++++++++ .../graphql/dgs/codegen/KotlinCodeGenTest.kt | 60 +++++++++++++++++++ 2 files changed, 113 insertions(+) diff --git a/graphql-dgs-codegen-core/src/test/kotlin/com/netflix/graphql/dgs/codegen/CodeGenTest.kt b/graphql-dgs-codegen-core/src/test/kotlin/com/netflix/graphql/dgs/codegen/CodeGenTest.kt index 02ee7ef16..83ea48d06 100644 --- a/graphql-dgs-codegen-core/src/test/kotlin/com/netflix/graphql/dgs/codegen/CodeGenTest.kt +++ b/graphql-dgs-codegen-core/src/test/kotlin/com/netflix/graphql/dgs/codegen/CodeGenTest.kt @@ -19,6 +19,7 @@ package com.netflix.graphql.dgs.codegen import com.netflix.graphql.dgs.codegen.generators.java.disableJsonTypeInfoAnnotation +import com.netflix.graphql.dgs.codegen.generators.shared.generatedAnnotationClassName import com.palantir.javapoet.AnnotationSpec import com.palantir.javapoet.ClassName import com.palantir.javapoet.CodeBlock @@ -4994,6 +4995,58 @@ It takes a title and such. assertCompilesJava(codeGenResult) } + @Test + fun generateSourceWithoutGeneratedAnnotation() { + val schema = + """ + type Query { + employees(filter:EmployeeFilterInput) : [Person] + } + + interface Person { + firstname: String + lastname: String + } + + type Employee implements Person { + firstname: String + lastname: String + company: String + } + enum EmployeeTypes { + ENGINEER + MANAGER + DIRECTOR + } + + input EmployeeFilterInput { + rank: String + } + """.trimIndent() + + val codeGenResult = + CodeGen( + CodeGenConfig( + schemas = setOf(schema), + packageName = BASE_PACKAGE_NAME, + language = Language.JAVA, + addGeneratedAnnotation = false, + generateClientApi = true, + ), + ).generate() + + assertThat(codeGenResult.javaSources()) + .noneMatch { it.typeSpec().name() == "Generated" && it.typeSpec().kind() == TypeSpec.Kind.ANNOTATION } + + codeGenResult.javaSources().forEach { file -> + assertThat(file.typeSpec().annotations().map { it.canonicalName() }) + .`as`("no @Generated annotation on %s", file.typeSpec()) + .doesNotContain("$BASE_PACKAGE_NAME.Generated", generatedAnnotationClassName) + } + + assertCompilesJava(codeGenResult) + } + @Test fun deprecateAnnotation() { val schema = diff --git a/graphql-dgs-codegen-core/src/test/kotlin/com/netflix/graphql/dgs/codegen/KotlinCodeGenTest.kt b/graphql-dgs-codegen-core/src/test/kotlin/com/netflix/graphql/dgs/codegen/KotlinCodeGenTest.kt index 3088cf846..5400d8eb2 100644 --- a/graphql-dgs-codegen-core/src/test/kotlin/com/netflix/graphql/dgs/codegen/KotlinCodeGenTest.kt +++ b/graphql-dgs-codegen-core/src/test/kotlin/com/netflix/graphql/dgs/codegen/KotlinCodeGenTest.kt @@ -18,6 +18,7 @@ package com.netflix.graphql.dgs.codegen +import com.netflix.graphql.dgs.codegen.generators.shared.generatedAnnotationClassName import com.squareup.kotlinpoet.* import com.squareup.kotlinpoet.ParameterizedTypeName.Companion.parameterizedBy import org.assertj.core.api.Assertions.assertThat @@ -4536,6 +4537,65 @@ It takes a title and such. assertCompilesKotlin(codeGenResult) } + @Test + fun generateSourceWithoutGeneratedAnnotation() { + val schema = + """ + type Query { + employees(filter:EmployeeFilterInput) : [Person] + } + + interface Person { + firstname: String + lastname: String + } + + type Employee implements Person { + firstname: String + lastname: String + company: String + } + enum EmployeeTypes { + ENGINEER + MANAGER + DIRECTOR + } + + input EmployeeFilterInput { + rank: String + } + """.trimIndent() + + val codeGenResult = + CodeGen( + CodeGenConfig( + schemas = setOf(schema), + packageName = BASE_PACKAGE_NAME, + language = Language.KOTLIN, + addGeneratedAnnotation = false, + generateClientApi = true, + ), + ).generate() + + assertThat(codeGenResult.kotlinSources()).noneMatch { it.name == "Generated" } + assertThat(codeGenResult.javaSources()).noneMatch { it.typeSpec().name() == "Generated" } + + codeGenResult.kotlinSources().forEach { file -> + file.members.filterIsInstance(TypeSpec::class.java).forEach { type -> + assertThat(type.annotations.map { it.canonicalName() }) + .`as`("no @Generated annotation on %s at %s", type, file) + .doesNotContain("$BASE_PACKAGE_NAME.Generated", generatedAnnotationClassName) + } + } + codeGenResult.javaSources().forEach { file -> + assertThat(file.typeSpec().annotations().map { it.canonicalName() }) + .`as`("no @Generated annotation on %s", file.typeSpec()) + .doesNotContain("$BASE_PACKAGE_NAME.Generated", generatedAnnotationClassName) + } + + assertCompilesKotlin(codeGenResult) + } + @Test fun annotateOnTypesWithCustomAnnotationsDisabled() { val schema = From 9202ac44c4f4f674cd53bc49b7b71256898bc8de Mon Sep 17 00:00:00 2001 From: Jiho Lee Date: Fri, 24 Apr 2026 14:48:13 -0700 Subject: [PATCH 3/7] Detect jakarta annotation-api to conditionally emit @Generated --- .../netflix/graphql/dgs/codegen/CodeGen.kt | 1 + .../codegen/generators/java/JavaPoetUtils.kt | 9 +++-- .../generators/kotlin/KotlinPoetUtils.kt | 9 +++-- .../dgs/codegen/gradle/CodegenPlugin.kt | 5 ++- .../dgs/codegen/gradle/GenerateJavaTask.kt | 8 +++++ .../gradle/JakartaAnnotationDetector.kt | 36 +++++++++++++++++++ .../test-project-no-schema-files/build.gradle | 9 ----- .../build_with_default_dir.gradle | 9 ----- 8 files changed, 63 insertions(+), 23 deletions(-) create mode 100644 graphql-dgs-codegen-gradle/src/main/kotlin/com/netflix/graphql/dgs/codegen/gradle/JakartaAnnotationDetector.kt diff --git a/graphql-dgs-codegen-core/src/main/kotlin/com/netflix/graphql/dgs/codegen/CodeGen.kt b/graphql-dgs-codegen-core/src/main/kotlin/com/netflix/graphql/dgs/codegen/CodeGen.kt index e9eaffeb8..f958394fa 100644 --- a/graphql-dgs-codegen-core/src/main/kotlin/com/netflix/graphql/dgs/codegen/CodeGen.kt +++ b/graphql-dgs-codegen-core/src/main/kotlin/com/netflix/graphql/dgs/codegen/CodeGen.kt @@ -579,6 +579,7 @@ class CodeGenConfig( var implementSerializable: Boolean = false, var addGeneratedAnnotation: Boolean = true, var disableDatesInGeneratedAnnotation: Boolean = true, + var hasJakartaAnnotationApi: Boolean = true, var addDeprecatedAnnotation: Boolean = false, var trackInputFieldSet: Boolean = false, var generateJSpecifyAnnotations: Boolean = false, diff --git a/graphql-dgs-codegen-core/src/main/kotlin/com/netflix/graphql/dgs/codegen/generators/java/JavaPoetUtils.kt b/graphql-dgs-codegen-core/src/main/kotlin/com/netflix/graphql/dgs/codegen/generators/java/JavaPoetUtils.kt index 83315bae2..3bc03ea7b 100644 --- a/graphql-dgs-codegen-core/src/main/kotlin/com/netflix/graphql/dgs/codegen/generators/java/JavaPoetUtils.kt +++ b/graphql-dgs-codegen-core/src/main/kotlin/com/netflix/graphql/dgs/codegen/generators/java/JavaPoetUtils.kt @@ -144,13 +144,14 @@ fun String.toTypeName(isGenericParam: Boolean = false): TypeName { private fun generatedAnnotation( packageName: String, generateDate: Boolean, + hasJakartaAnnotationApi: Boolean, ): List { val graphqlGenerated = AnnotationSpec .builder(ClassName.get(packageName, "Generated")) .build() - return if (generatedAnnotationClassName == null) { + return if (!hasJakartaAnnotationApi || generatedAnnotationClassName == null) { listOf(graphqlGenerated) } else { val generatedAnnotation = ClassName.bestGuess(generatedAnnotationClassName) @@ -171,7 +172,11 @@ private fun generatedAnnotation( fun TypeSpec.Builder.addOptionalGeneratedAnnotation(config: CodeGenConfig): TypeSpec.Builder = apply { if (config.addGeneratedAnnotation) { - generatedAnnotation(config.packageName, !config.disableDatesInGeneratedAnnotation).forEach { addAnnotation(it) } + generatedAnnotation( + config.packageName, + !config.disableDatesInGeneratedAnnotation, + config.hasJakartaAnnotationApi, + ).forEach { addAnnotation(it) } } } diff --git a/graphql-dgs-codegen-core/src/main/kotlin/com/netflix/graphql/dgs/codegen/generators/kotlin/KotlinPoetUtils.kt b/graphql-dgs-codegen-core/src/main/kotlin/com/netflix/graphql/dgs/codegen/generators/kotlin/KotlinPoetUtils.kt index 0f285c4f3..6fee509f6 100644 --- a/graphql-dgs-codegen-core/src/main/kotlin/com/netflix/graphql/dgs/codegen/generators/kotlin/KotlinPoetUtils.kt +++ b/graphql-dgs-codegen-core/src/main/kotlin/com/netflix/graphql/dgs/codegen/generators/kotlin/KotlinPoetUtils.kt @@ -187,13 +187,14 @@ fun suppressInapplicableJvmNameAnnotation(): AnnotationSpec = private fun generatedAnnotation( packageName: String, generateDate: Boolean, + hasJakartaAnnotationApi: Boolean, ): List { val graphqlGenerated = AnnotationSpec .builder(ClassName(packageName, "Generated")) .build() - return if (generatedAnnotationClassName == null) { + return if (!hasJakartaAnnotationApi || generatedAnnotationClassName == null) { listOf(graphqlGenerated) } else { val generatedAnnotation = ClassName.bestGuess(generatedAnnotationClassName) @@ -468,7 +469,11 @@ fun TypeSpec.Builder.addEnumConstants(enumSpecs: Iterable): TypeSpec.B fun TypeSpec.Builder.addOptionalGeneratedAnnotation(config: CodeGenConfig): TypeSpec.Builder = apply { if (config.addGeneratedAnnotation) { - generatedAnnotation(config.packageName, !config.disableDatesInGeneratedAnnotation).forEach { + generatedAnnotation( + config.packageName, + !config.disableDatesInGeneratedAnnotation, + config.hasJakartaAnnotationApi, + ).forEach { addAnnotation(it) } } diff --git a/graphql-dgs-codegen-gradle/src/main/kotlin/com/netflix/graphql/dgs/codegen/gradle/CodegenPlugin.kt b/graphql-dgs-codegen-gradle/src/main/kotlin/com/netflix/graphql/dgs/codegen/gradle/CodegenPlugin.kt index 241b5c188..f486c73aa 100644 --- a/graphql-dgs-codegen-gradle/src/main/kotlin/com/netflix/graphql/dgs/codegen/gradle/CodegenPlugin.kt +++ b/graphql-dgs-codegen-gradle/src/main/kotlin/com/netflix/graphql/dgs/codegen/gradle/CodegenPlugin.kt @@ -39,7 +39,10 @@ class CodegenPlugin : Plugin { project.plugins.apply(JavaPlugin::class.java) val generateJavaTaskProvider = project.tasks.register("generateJava", GenerateJavaTask::class.java) - generateJavaTaskProvider.configure { it.group = GRADLE_GROUP } + generateJavaTaskProvider.configure { task -> + task.group = GRADLE_GROUP + task.compileClasspathConfiguration.set(project.configurations.named("compileClasspath")) + } val javaExtension = project.extensions.getByType(JavaPluginExtension::class.java) diff --git a/graphql-dgs-codegen-gradle/src/main/kotlin/com/netflix/graphql/dgs/codegen/gradle/GenerateJavaTask.kt b/graphql-dgs-codegen-gradle/src/main/kotlin/com/netflix/graphql/dgs/codegen/gradle/GenerateJavaTask.kt index 6da7e5c26..1b73af355 100644 --- a/graphql-dgs-codegen-gradle/src/main/kotlin/com/netflix/graphql/dgs/codegen/gradle/GenerateJavaTask.kt +++ b/graphql-dgs-codegen-gradle/src/main/kotlin/com/netflix/graphql/dgs/codegen/gradle/GenerateJavaTask.kt @@ -22,8 +22,10 @@ import com.netflix.graphql.dgs.codegen.CodeGen import com.netflix.graphql.dgs.codegen.CodeGenConfig import com.netflix.graphql.dgs.codegen.Language import org.gradle.api.DefaultTask +import org.gradle.api.artifacts.Configuration import org.gradle.api.file.ConfigurableFileCollection import org.gradle.api.model.ObjectFactory +import org.gradle.api.provider.Property import org.gradle.api.tasks.* import org.jetbrains.kotlin.gradle.plugin.KotlinPluginWrapper import java.io.File @@ -170,6 +172,9 @@ open class GenerateJavaTask project.configurations.findByName("dgsCodegen"), ) + @get:Internal + val compileClasspathConfiguration: Property = objectFactory.property(Configuration::class.java) + @TaskAction fun generate() { val schemaJarFilesFromDependencies = dgsCodegenClasspath.files.toList() @@ -182,6 +187,8 @@ open class GenerateJavaTask logger.info("Processing $it") } + val hasJakartaAnnotationApi = JakartaAnnotationDetector.detect(compileClasspathConfiguration.get()) + val config = CodeGenConfig( schemas = emptySet(), @@ -216,6 +223,7 @@ open class GenerateJavaTask implementSerializable = implementSerializable, addGeneratedAnnotation = addGeneratedAnnotation, disableDatesInGeneratedAnnotation = disableDatesInGeneratedAnnotation, + hasJakartaAnnotationApi = hasJakartaAnnotationApi, addDeprecatedAnnotation = addDeprecatedAnnotation, includeImports = includeImports, includeEnumImports = includeEnumImports, diff --git a/graphql-dgs-codegen-gradle/src/main/kotlin/com/netflix/graphql/dgs/codegen/gradle/JakartaAnnotationDetector.kt b/graphql-dgs-codegen-gradle/src/main/kotlin/com/netflix/graphql/dgs/codegen/gradle/JakartaAnnotationDetector.kt new file mode 100644 index 000000000..4311d67cb --- /dev/null +++ b/graphql-dgs-codegen-gradle/src/main/kotlin/com/netflix/graphql/dgs/codegen/gradle/JakartaAnnotationDetector.kt @@ -0,0 +1,36 @@ +/* + * + * Copyright 2020 Netflix, Inc. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * + */ + +package com.netflix.graphql.dgs.codegen.gradle + +import org.gradle.api.artifacts.Configuration +import org.gradle.api.artifacts.component.ModuleComponentIdentifier + +object JakartaAnnotationDetector { + private const val JAKARTA_ANNOTATION_COORDS = "jakarta.annotation:jakarta.annotation-api" + + fun detect(configuration: Configuration): Boolean = + configuration.incoming + .resolutionResult + .allComponents + .any { comp -> + val id = comp.id + id is ModuleComponentIdentifier && + "${id.group}:${id.module}" == JAKARTA_ANNOTATION_COORDS + } +} diff --git a/graphql-dgs-codegen-gradle/src/test/resources/test-project-no-schema-files/build.gradle b/graphql-dgs-codegen-gradle/src/test/resources/test-project-no-schema-files/build.gradle index db59451d2..11b42e633 100644 --- a/graphql-dgs-codegen-gradle/src/test/resources/test-project-no-schema-files/build.gradle +++ b/graphql-dgs-codegen-gradle/src/test/resources/test-project-no-schema-files/build.gradle @@ -26,15 +26,6 @@ configurations { CodeGenConfiguration.exclude group: "com.netflix.graphql.dgs.codegen", module: "graphql-dgs-codegen-core" } -repositories { - mavenCentral() -} - -dependencies { - // Required to resolve @jakarta.annotation.Generated emitted when addGeneratedAnnotation is true - implementation 'jakarta.annotation:jakarta.annotation-api:2.1.1' -} - generateJava { schemaPaths = ["${projectDir}/src/main/resources/schema"] packageName = 'com.netflix.testproject.graphql' diff --git a/graphql-dgs-codegen-gradle/src/test/resources/test-project-no-schema-files/build_with_default_dir.gradle b/graphql-dgs-codegen-gradle/src/test/resources/test-project-no-schema-files/build_with_default_dir.gradle index c8f19106b..a9c9a6196 100644 --- a/graphql-dgs-codegen-gradle/src/test/resources/test-project-no-schema-files/build_with_default_dir.gradle +++ b/graphql-dgs-codegen-gradle/src/test/resources/test-project-no-schema-files/build_with_default_dir.gradle @@ -26,15 +26,6 @@ configurations { CodeGenConfiguration.exclude group: "com.netflix.graphql.dgs.codegen", module: "graphql-dgs-codegen-core" } -repositories { - mavenCentral() -} - -dependencies { - // Required to resolve @jakarta.annotation.Generated emitted when addGeneratedAnnotation is true - implementation 'jakarta.annotation:jakarta.annotation-api:2.1.1' -} - generateJava { schemaPaths = ["${projectDir}/src/main/resources/schema"] packageName = 'com.netflix.testproject.graphql' From 84be731f013e1241579cd5b2747ff3c6356a3940 Mon Sep 17 00:00:00 2001 From: Jiho Lee Date: Mon, 27 Apr 2026 00:22:58 -0700 Subject: [PATCH 4/7] Detect compileclasspath by name to support user-defined tasks --- .../graphql/dgs/codegen/gradle/GenerateJavaTask.kt | 8 ++++++-- .../dgs/codegen/gradle/JakartaAnnotationDetector.kt | 10 ++++++++-- 2 files changed, 14 insertions(+), 4 deletions(-) diff --git a/graphql-dgs-codegen-gradle/src/main/kotlin/com/netflix/graphql/dgs/codegen/gradle/GenerateJavaTask.kt b/graphql-dgs-codegen-gradle/src/main/kotlin/com/netflix/graphql/dgs/codegen/gradle/GenerateJavaTask.kt index 1b73af355..c4253d076 100644 --- a/graphql-dgs-codegen-gradle/src/main/kotlin/com/netflix/graphql/dgs/codegen/gradle/GenerateJavaTask.kt +++ b/graphql-dgs-codegen-gradle/src/main/kotlin/com/netflix/graphql/dgs/codegen/gradle/GenerateJavaTask.kt @@ -173,7 +173,10 @@ open class GenerateJavaTask ) @get:Internal - val compileClasspathConfiguration: Property = objectFactory.property(Configuration::class.java) + val compileClasspathConfiguration: Property = + objectFactory.property(Configuration::class.java).apply { + project.configurations.findByName("compileClasspath")?.let { convention(it) } + } @TaskAction fun generate() { @@ -187,7 +190,8 @@ open class GenerateJavaTask logger.info("Processing $it") } - val hasJakartaAnnotationApi = JakartaAnnotationDetector.detect(compileClasspathConfiguration.get()) + val hasJakartaAnnotationApi = + compileClasspathConfiguration.orNull?.let { JakartaAnnotationDetector.detect(it) } ?: false val config = CodeGenConfig( diff --git a/graphql-dgs-codegen-gradle/src/main/kotlin/com/netflix/graphql/dgs/codegen/gradle/JakartaAnnotationDetector.kt b/graphql-dgs-codegen-gradle/src/main/kotlin/com/netflix/graphql/dgs/codegen/gradle/JakartaAnnotationDetector.kt index 4311d67cb..ee239e4c4 100644 --- a/graphql-dgs-codegen-gradle/src/main/kotlin/com/netflix/graphql/dgs/codegen/gradle/JakartaAnnotationDetector.kt +++ b/graphql-dgs-codegen-gradle/src/main/kotlin/com/netflix/graphql/dgs/codegen/gradle/JakartaAnnotationDetector.kt @@ -22,7 +22,9 @@ import org.gradle.api.artifacts.Configuration import org.gradle.api.artifacts.component.ModuleComponentIdentifier object JakartaAnnotationDetector { - private const val JAKARTA_ANNOTATION_COORDS = "jakarta.annotation:jakarta.annotation-api" + private const val JAKARTA_ANNOTATION_GROUP = "jakarta.annotation" + private const val JAKARTA_ANNOTATION_MODULE = "jakarta.annotation-api" + private const val JAKARTA_ANNOTATION_MIN_MAJOR = 2 // jakarta.annotation.Generated introduced in 2.0.0 fun detect(configuration: Configuration): Boolean = configuration.incoming @@ -31,6 +33,10 @@ object JakartaAnnotationDetector { .any { comp -> val id = comp.id id is ModuleComponentIdentifier && - "${id.group}:${id.module}" == JAKARTA_ANNOTATION_COORDS + id.group == JAKARTA_ANNOTATION_GROUP && + id.module == JAKARTA_ANNOTATION_MODULE && + majorVersion(id.version) >= JAKARTA_ANNOTATION_MIN_MAJOR } + + private fun majorVersion(version: String): Int = version.takeWhile { it.isDigit() }.toIntOrNull() ?: -1 } From 554df54d6bc2f3ca77888e896c3a7bd2a4a01acd Mon Sep 17 00:00:00 2001 From: Jiho Lee Date: Tue, 28 Apr 2026 10:13:13 -0700 Subject: [PATCH 5/7] Revert jakarta annotation detection changes --- .../netflix/graphql/dgs/codegen/CodeGen.kt | 1 - .../codegen/generators/java/JavaPoetUtils.kt | 9 +--- .../generators/kotlin/KotlinPoetUtils.kt | 9 +--- .../dgs/codegen/gradle/CodegenPlugin.kt | 5 +-- .../dgs/codegen/gradle/GenerateJavaTask.kt | 12 ------ .../gradle/JakartaAnnotationDetector.kt | 42 ------------------- .../test-project-no-schema-files/build.gradle | 9 ++++ .../build_with_default_dir.gradle | 9 ++++ 8 files changed, 23 insertions(+), 73 deletions(-) delete mode 100644 graphql-dgs-codegen-gradle/src/main/kotlin/com/netflix/graphql/dgs/codegen/gradle/JakartaAnnotationDetector.kt diff --git a/graphql-dgs-codegen-core/src/main/kotlin/com/netflix/graphql/dgs/codegen/CodeGen.kt b/graphql-dgs-codegen-core/src/main/kotlin/com/netflix/graphql/dgs/codegen/CodeGen.kt index f958394fa..e9eaffeb8 100644 --- a/graphql-dgs-codegen-core/src/main/kotlin/com/netflix/graphql/dgs/codegen/CodeGen.kt +++ b/graphql-dgs-codegen-core/src/main/kotlin/com/netflix/graphql/dgs/codegen/CodeGen.kt @@ -579,7 +579,6 @@ class CodeGenConfig( var implementSerializable: Boolean = false, var addGeneratedAnnotation: Boolean = true, var disableDatesInGeneratedAnnotation: Boolean = true, - var hasJakartaAnnotationApi: Boolean = true, var addDeprecatedAnnotation: Boolean = false, var trackInputFieldSet: Boolean = false, var generateJSpecifyAnnotations: Boolean = false, diff --git a/graphql-dgs-codegen-core/src/main/kotlin/com/netflix/graphql/dgs/codegen/generators/java/JavaPoetUtils.kt b/graphql-dgs-codegen-core/src/main/kotlin/com/netflix/graphql/dgs/codegen/generators/java/JavaPoetUtils.kt index 3bc03ea7b..83315bae2 100644 --- a/graphql-dgs-codegen-core/src/main/kotlin/com/netflix/graphql/dgs/codegen/generators/java/JavaPoetUtils.kt +++ b/graphql-dgs-codegen-core/src/main/kotlin/com/netflix/graphql/dgs/codegen/generators/java/JavaPoetUtils.kt @@ -144,14 +144,13 @@ fun String.toTypeName(isGenericParam: Boolean = false): TypeName { private fun generatedAnnotation( packageName: String, generateDate: Boolean, - hasJakartaAnnotationApi: Boolean, ): List { val graphqlGenerated = AnnotationSpec .builder(ClassName.get(packageName, "Generated")) .build() - return if (!hasJakartaAnnotationApi || generatedAnnotationClassName == null) { + return if (generatedAnnotationClassName == null) { listOf(graphqlGenerated) } else { val generatedAnnotation = ClassName.bestGuess(generatedAnnotationClassName) @@ -172,11 +171,7 @@ private fun generatedAnnotation( fun TypeSpec.Builder.addOptionalGeneratedAnnotation(config: CodeGenConfig): TypeSpec.Builder = apply { if (config.addGeneratedAnnotation) { - generatedAnnotation( - config.packageName, - !config.disableDatesInGeneratedAnnotation, - config.hasJakartaAnnotationApi, - ).forEach { addAnnotation(it) } + generatedAnnotation(config.packageName, !config.disableDatesInGeneratedAnnotation).forEach { addAnnotation(it) } } } diff --git a/graphql-dgs-codegen-core/src/main/kotlin/com/netflix/graphql/dgs/codegen/generators/kotlin/KotlinPoetUtils.kt b/graphql-dgs-codegen-core/src/main/kotlin/com/netflix/graphql/dgs/codegen/generators/kotlin/KotlinPoetUtils.kt index 6fee509f6..0f285c4f3 100644 --- a/graphql-dgs-codegen-core/src/main/kotlin/com/netflix/graphql/dgs/codegen/generators/kotlin/KotlinPoetUtils.kt +++ b/graphql-dgs-codegen-core/src/main/kotlin/com/netflix/graphql/dgs/codegen/generators/kotlin/KotlinPoetUtils.kt @@ -187,14 +187,13 @@ fun suppressInapplicableJvmNameAnnotation(): AnnotationSpec = private fun generatedAnnotation( packageName: String, generateDate: Boolean, - hasJakartaAnnotationApi: Boolean, ): List { val graphqlGenerated = AnnotationSpec .builder(ClassName(packageName, "Generated")) .build() - return if (!hasJakartaAnnotationApi || generatedAnnotationClassName == null) { + return if (generatedAnnotationClassName == null) { listOf(graphqlGenerated) } else { val generatedAnnotation = ClassName.bestGuess(generatedAnnotationClassName) @@ -469,11 +468,7 @@ fun TypeSpec.Builder.addEnumConstants(enumSpecs: Iterable): TypeSpec.B fun TypeSpec.Builder.addOptionalGeneratedAnnotation(config: CodeGenConfig): TypeSpec.Builder = apply { if (config.addGeneratedAnnotation) { - generatedAnnotation( - config.packageName, - !config.disableDatesInGeneratedAnnotation, - config.hasJakartaAnnotationApi, - ).forEach { + generatedAnnotation(config.packageName, !config.disableDatesInGeneratedAnnotation).forEach { addAnnotation(it) } } diff --git a/graphql-dgs-codegen-gradle/src/main/kotlin/com/netflix/graphql/dgs/codegen/gradle/CodegenPlugin.kt b/graphql-dgs-codegen-gradle/src/main/kotlin/com/netflix/graphql/dgs/codegen/gradle/CodegenPlugin.kt index f486c73aa..241b5c188 100644 --- a/graphql-dgs-codegen-gradle/src/main/kotlin/com/netflix/graphql/dgs/codegen/gradle/CodegenPlugin.kt +++ b/graphql-dgs-codegen-gradle/src/main/kotlin/com/netflix/graphql/dgs/codegen/gradle/CodegenPlugin.kt @@ -39,10 +39,7 @@ class CodegenPlugin : Plugin { project.plugins.apply(JavaPlugin::class.java) val generateJavaTaskProvider = project.tasks.register("generateJava", GenerateJavaTask::class.java) - generateJavaTaskProvider.configure { task -> - task.group = GRADLE_GROUP - task.compileClasspathConfiguration.set(project.configurations.named("compileClasspath")) - } + generateJavaTaskProvider.configure { it.group = GRADLE_GROUP } val javaExtension = project.extensions.getByType(JavaPluginExtension::class.java) diff --git a/graphql-dgs-codegen-gradle/src/main/kotlin/com/netflix/graphql/dgs/codegen/gradle/GenerateJavaTask.kt b/graphql-dgs-codegen-gradle/src/main/kotlin/com/netflix/graphql/dgs/codegen/gradle/GenerateJavaTask.kt index c4253d076..6da7e5c26 100644 --- a/graphql-dgs-codegen-gradle/src/main/kotlin/com/netflix/graphql/dgs/codegen/gradle/GenerateJavaTask.kt +++ b/graphql-dgs-codegen-gradle/src/main/kotlin/com/netflix/graphql/dgs/codegen/gradle/GenerateJavaTask.kt @@ -22,10 +22,8 @@ import com.netflix.graphql.dgs.codegen.CodeGen import com.netflix.graphql.dgs.codegen.CodeGenConfig import com.netflix.graphql.dgs.codegen.Language import org.gradle.api.DefaultTask -import org.gradle.api.artifacts.Configuration import org.gradle.api.file.ConfigurableFileCollection import org.gradle.api.model.ObjectFactory -import org.gradle.api.provider.Property import org.gradle.api.tasks.* import org.jetbrains.kotlin.gradle.plugin.KotlinPluginWrapper import java.io.File @@ -172,12 +170,6 @@ open class GenerateJavaTask project.configurations.findByName("dgsCodegen"), ) - @get:Internal - val compileClasspathConfiguration: Property = - objectFactory.property(Configuration::class.java).apply { - project.configurations.findByName("compileClasspath")?.let { convention(it) } - } - @TaskAction fun generate() { val schemaJarFilesFromDependencies = dgsCodegenClasspath.files.toList() @@ -190,9 +182,6 @@ open class GenerateJavaTask logger.info("Processing $it") } - val hasJakartaAnnotationApi = - compileClasspathConfiguration.orNull?.let { JakartaAnnotationDetector.detect(it) } ?: false - val config = CodeGenConfig( schemas = emptySet(), @@ -227,7 +216,6 @@ open class GenerateJavaTask implementSerializable = implementSerializable, addGeneratedAnnotation = addGeneratedAnnotation, disableDatesInGeneratedAnnotation = disableDatesInGeneratedAnnotation, - hasJakartaAnnotationApi = hasJakartaAnnotationApi, addDeprecatedAnnotation = addDeprecatedAnnotation, includeImports = includeImports, includeEnumImports = includeEnumImports, diff --git a/graphql-dgs-codegen-gradle/src/main/kotlin/com/netflix/graphql/dgs/codegen/gradle/JakartaAnnotationDetector.kt b/graphql-dgs-codegen-gradle/src/main/kotlin/com/netflix/graphql/dgs/codegen/gradle/JakartaAnnotationDetector.kt deleted file mode 100644 index ee239e4c4..000000000 --- a/graphql-dgs-codegen-gradle/src/main/kotlin/com/netflix/graphql/dgs/codegen/gradle/JakartaAnnotationDetector.kt +++ /dev/null @@ -1,42 +0,0 @@ -/* - * - * Copyright 2020 Netflix, Inc. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * - */ - -package com.netflix.graphql.dgs.codegen.gradle - -import org.gradle.api.artifacts.Configuration -import org.gradle.api.artifacts.component.ModuleComponentIdentifier - -object JakartaAnnotationDetector { - private const val JAKARTA_ANNOTATION_GROUP = "jakarta.annotation" - private const val JAKARTA_ANNOTATION_MODULE = "jakarta.annotation-api" - private const val JAKARTA_ANNOTATION_MIN_MAJOR = 2 // jakarta.annotation.Generated introduced in 2.0.0 - - fun detect(configuration: Configuration): Boolean = - configuration.incoming - .resolutionResult - .allComponents - .any { comp -> - val id = comp.id - id is ModuleComponentIdentifier && - id.group == JAKARTA_ANNOTATION_GROUP && - id.module == JAKARTA_ANNOTATION_MODULE && - majorVersion(id.version) >= JAKARTA_ANNOTATION_MIN_MAJOR - } - - private fun majorVersion(version: String): Int = version.takeWhile { it.isDigit() }.toIntOrNull() ?: -1 -} diff --git a/graphql-dgs-codegen-gradle/src/test/resources/test-project-no-schema-files/build.gradle b/graphql-dgs-codegen-gradle/src/test/resources/test-project-no-schema-files/build.gradle index 11b42e633..db59451d2 100644 --- a/graphql-dgs-codegen-gradle/src/test/resources/test-project-no-schema-files/build.gradle +++ b/graphql-dgs-codegen-gradle/src/test/resources/test-project-no-schema-files/build.gradle @@ -26,6 +26,15 @@ configurations { CodeGenConfiguration.exclude group: "com.netflix.graphql.dgs.codegen", module: "graphql-dgs-codegen-core" } +repositories { + mavenCentral() +} + +dependencies { + // Required to resolve @jakarta.annotation.Generated emitted when addGeneratedAnnotation is true + implementation 'jakarta.annotation:jakarta.annotation-api:2.1.1' +} + generateJava { schemaPaths = ["${projectDir}/src/main/resources/schema"] packageName = 'com.netflix.testproject.graphql' diff --git a/graphql-dgs-codegen-gradle/src/test/resources/test-project-no-schema-files/build_with_default_dir.gradle b/graphql-dgs-codegen-gradle/src/test/resources/test-project-no-schema-files/build_with_default_dir.gradle index a9c9a6196..c8f19106b 100644 --- a/graphql-dgs-codegen-gradle/src/test/resources/test-project-no-schema-files/build_with_default_dir.gradle +++ b/graphql-dgs-codegen-gradle/src/test/resources/test-project-no-schema-files/build_with_default_dir.gradle @@ -26,6 +26,15 @@ configurations { CodeGenConfiguration.exclude group: "com.netflix.graphql.dgs.codegen", module: "graphql-dgs-codegen-core" } +repositories { + mavenCentral() +} + +dependencies { + // Required to resolve @jakarta.annotation.Generated emitted when addGeneratedAnnotation is true + implementation 'jakarta.annotation:jakarta.annotation-api:2.1.1' +} + generateJava { schemaPaths = ["${projectDir}/src/main/resources/schema"] packageName = 'com.netflix.testproject.graphql' From ef2fcd91f54bc79ee8cb676ff1e00a4aac030601 Mon Sep 17 00:00:00 2001 From: Jiho Lee Date: Tue, 28 Apr 2026 13:09:39 -0700 Subject: [PATCH 6/7] Add generatedAnnotationType paramter defaulted to DGS Generated annotation type --- .../expected/DgsClient.kt | 1 - .../expected/DgsConstants.kt | 5 - .../expected/client/PersonProjection.kt | 6 +- .../expected/client/QueryProjection.kt | 6 +- .../expected/types/Person.kt | 12 +- .../expected/types/PersonFilter.kt | 6 +- .../expected/types/Query.kt | 12 +- .../expected/DgsClient.kt | 1 - .../expected/DgsConstants.kt | 5 - .../expected/client/PersonProjection.kt | 6 +- .../expected/client/QueryProjection.kt | 6 +- .../expected/types/Person.kt | 12 +- .../expected/types/PersonFilter.kt | 6 +- .../expected/types/Query.kt | 12 +- .../expected/DgsClient.kt | 1 - .../expected/DgsConstants.kt | 3 - .../expected/client/PersonProjection.kt | 6 +- .../expected/client/QueryProjection.kt | 6 +- .../expected/types/Person.kt | 6 +- .../expected/types/Query.kt | 12 +- .../expected/DgsClient.kt | 1 - .../expected/DgsConstants.kt | 3 - .../expected/client/PersonProjection.kt | 6 +- .../expected/client/QueryProjection.kt | 6 +- .../expected/types/Person.kt | 12 +- .../expected/types/Query.kt | 12 +- .../expected/DgsClient.kt | 1 - .../expected/DgsConstants.kt | 3 - .../expected/client/PersonProjection.kt | 6 +- .../expected/client/QueryProjection.kt | 6 +- .../expected/types/Person.kt | 12 +- .../expected/types/Query.kt | 12 +- .../cases/dataClassDocs/expected/DgsClient.kt | 1 - .../dataClassDocs/expected/DgsConstants.kt | 5 - .../expected/client/MovieProjection.kt | 6 +- .../expected/client/QueryProjection.kt | 6 +- .../dataClassDocs/expected/types/Movie.kt | 12 +- .../expected/types/MovieFilter.kt | 6 +- .../dataClassDocs/expected/types/Query.kt | 12 +- .../dataClassFieldDocs/expected/DgsClient.kt | 1 - .../expected/DgsConstants.kt | 5 - .../expected/client/MovieProjection.kt | 6 +- .../expected/client/QueryProjection.kt | 6 +- .../expected/types/Movie.kt | 12 +- .../expected/types/MovieFilter.kt | 6 +- .../expected/types/Query.kt | 12 +- .../expected/DgsClient.kt | 1 - .../expected/DgsConstants.kt | 3 - .../expected/client/PersonProjection.kt | 6 +- .../expected/client/QueryProjection.kt | 6 +- .../expected/types/Person.kt | 12 +- .../expected/types/Query.kt | 12 +- .../expected/DgsClient.kt | 1 - .../expected/DgsConstants.kt | 3 - .../expected/client/QueryProjection.kt | 6 +- .../client/RequiredTestTypeProjection.kt | 6 +- .../expected/types/Query.kt | 12 +- .../expected/types/RequiredTestType.kt | 12 +- .../expected/DgsClient.kt | 1 - .../expected/DgsConstants.kt | 6 - .../client/EntityConnectionProjection.kt | 6 +- .../expected/client/EntityEdgeProjection.kt | 6 +- .../expected/client/EntityProjection.kt | 6 +- .../expected/client/PageInfoProjection.kt | 6 +- .../expected/client/QueryProjection.kt | 6 +- .../expected/types/Entity.kt | 12 +- .../expected/types/EntityConnection.kt | 12 +- .../expected/types/EntityEdge.kt | 12 +- .../expected/types/PageInfo.kt | 12 +- .../expected/types/Query.kt | 12 +- .../expected/DgsClient.kt | 1 - .../expected/DgsConstants.kt | 5 - .../expected/client/CarProjection.kt | 6 +- .../expected/client/EngineProjection.kt | 6 +- .../expected/client/PerformanceProjection.kt | 6 +- .../expected/client/QueryProjection.kt | 6 +- .../expected/types/Car.kt | 12 +- .../expected/types/Engine.kt | 12 +- .../expected/types/Performance.kt | 12 +- .../expected/types/Query.kt | 12 +- .../expected/DgsClient.kt | 1 - .../expected/DgsConstants.kt | 3 - .../expected/client/PersonProjection.kt | 6 +- .../expected/client/QueryProjection.kt | 6 +- .../expected/types/Person.kt | 6 +- .../expected/types/Query.kt | 12 +- .../expected/DgsClient.kt | 1 - .../expected/DgsConstants.kt | 4 - .../expected/client/EmployeeProjection.kt | 6 +- .../expected/client/PersonProjection.kt | 6 +- .../expected/client/QueryProjection.kt | 6 +- .../expected/types/Employee.kt | 12 +- .../expected/types/Person.kt | 6 +- .../expected/types/Query.kt | 12 +- .../expected/DgsClient.kt | 1 - .../expected/DgsConstants.kt | 4 - .../expected/client/EmployeeProjection.kt | 6 +- .../expected/client/PersonProjection.kt | 6 +- .../expected/client/QueryProjection.kt | 6 +- .../expected/types/Employee.kt | 12 +- .../expected/types/Person.kt | 6 +- .../expected/types/Query.kt | 12 +- .../expected/DgsClient.kt | 1 - .../expected/DgsConstants.kt | 5 - .../expected/client/EmployeeProjection.kt | 6 +- .../expected/client/PersonProjection.kt | 6 +- .../expected/client/QueryProjection.kt | 6 +- .../expected/client/TalentProjection.kt | 6 +- .../expected/types/Employee.kt | 6 +- .../expected/types/Person.kt | 6 +- .../expected/types/Query.kt | 12 +- .../expected/types/Talent.kt | 12 +- .../expected/DgsClient.kt | 1 - .../expected/DgsConstants.kt | 3 - .../expected/client/PersonProjection.kt | 6 +- .../expected/client/QueryProjection.kt | 6 +- .../expected/types/Person.kt | 12 +- .../expected/types/Query.kt | 12 +- .../expected/DgsClient.kt | 1 - .../expected/DgsConstants.kt | 5 - .../expected/client/EntityProjection.kt | 6 +- .../expected/client/NodeProjection.kt | 6 +- .../expected/client/ProductProjection.kt | 6 +- .../expected/client/QueryProjection.kt | 6 +- .../expected/types/Entity.kt | 6 +- .../expected/types/Product.kt | 12 +- .../expected/types/Query.kt | 12 +- .../expected/DgsClient.kt | 1 - .../expected/DgsConstants.kt | 6 - .../client/EntityConnectionProjection.kt | 6 +- .../expected/client/EntityEdgeProjection.kt | 6 +- .../expected/client/EntityProjection.kt | 6 +- .../expected/client/PageInfoProjection.kt | 6 +- .../expected/client/QueryProjection.kt | 6 +- .../expected/types/Entity.kt | 12 +- .../expected/types/EntityEdge.kt | 12 +- .../expected/types/Query.kt | 12 +- .../expected/DgsClient.kt | 1 - .../expected/DgsConstants.kt | 4 - .../expected/client/EmployeeProjection.kt | 6 +- .../expected/client/PersonProjection.kt | 6 +- .../expected/client/QueryProjection.kt | 6 +- .../expected/types/Employee.kt | 12 +- .../expected/types/Person.kt | 6 +- .../expected/types/Query.kt | 12 +- .../expected/DgsClient.kt | 1 - .../expected/DgsConstants.kt | 3 - .../expected/client/MyTypeProjection.kt | 6 +- .../expected/client/OtherTypeProjection.kt | 6 +- .../expected/types/MyType.kt | 12 +- .../expected/types/OtherType.kt | 12 +- .../expected/DgsClient.kt | 1 - .../expected/DgsConstants.kt | 3 - .../expected/client/PersonProjection.kt | 6 +- .../expected/client/QueryProjection.kt | 6 +- .../expected/types/Person.kt | 12 +- .../expected/types/Query.kt | 12 +- .../expected/DgsClient.kt | 1 - .../expected/DgsConstants.kt | 2 - .../expected/client/MyTypeProjection.kt | 6 +- .../expected/types/MyType.kt | 12 +- .../expected/DgsClient.kt | 1 - .../expected/DgsConstants.kt | 2 - .../expected/client/MyTypeProjection.kt | 6 +- .../expected/types/MyType.kt | 12 +- .../expected/DgsClient.kt | 1 - .../expected/DgsConstants.kt | 3 - .../expected/client/PersonProjection.kt | 6 +- .../expected/client/QueryProjection.kt | 6 +- .../expected/types/Person.kt | 12 +- .../expected/types/Query.kt | 12 +- .../expected/DgsClient.kt | 1 - .../expected/DgsConstants.kt | 2 - .../expected/client/MyTypeProjection.kt | 6 +- .../expected/types/MyType.kt | 12 +- .../expected/DgsClient.kt | 1 - .../expected/DgsConstants.kt | 3 - .../expected/client/PersonProjection.kt | 6 +- .../expected/client/QueryProjection.kt | 6 +- .../expected/types/Person.kt | 12 +- .../expected/types/Query.kt | 12 +- .../expected/DgsClient.kt | 1 - .../expected/DgsConstants.kt | 5 - .../expected/client/PersonProjection.kt | 6 +- .../expected/client/QueryProjection.kt | 6 +- .../expected/client/SampleTypeProjection.kt | 6 +- .../expected/types/Person.kt | 12 +- .../expected/types/Query.kt | 12 +- .../expected/types/SampleType.kt | 12 +- .../expected/DgsClient.kt | 1 - .../expected/DgsConstants.kt | 3 - .../expected/client/PersonProjection.kt | 6 +- .../expected/client/QueryProjection.kt | 6 +- .../expected/types/Person.kt | 12 +- .../expected/types/Query.kt | 12 +- .../codegen/cases/enum/expected/DgsClient.kt | 1 - .../cases/enum/expected/DgsConstants.kt | 2 - .../enum/expected/client/QueryProjection.kt | 6 +- .../enum/expected/types/EmployeeTypes.kt | 18 +- .../cases/enum/expected/types/Query.kt | 12 +- .../cases/enumDocs/expected/DgsClient.kt | 1 - .../cases/enumDocs/expected/DgsConstants.kt | 1 - .../cases/enumDocs/expected/types/Color.kt | 18 +- .../expected/DgsClient.kt | 1 - .../expected/DgsConstants.kt | 2 - .../expected/client/QueryProjection.kt | 6 +- .../expected/types/EmployeeTypes.kt | 21 +- .../expected/types/Query.kt | 12 +- .../expected/DgsClient.kt | 1 - .../expected/DgsConstants.kt | 4 - .../expected/client/AProjection.kt | 6 +- .../expected/client/BProjection.kt | 6 +- .../expected/client/ExampleProjection.kt | 6 +- .../expected/types/A.kt | 6 +- .../expected/types/B.kt | 6 +- .../expected/types/Example.kt | 12 +- .../codegen/cases/input/expected/DgsClient.kt | 1 - .../cases/input/expected/DgsConstants.kt | 4 - .../input/expected/client/QueryProjection.kt | 6 +- .../cases/input/expected/types/MovieFilter.kt | 6 +- .../cases/input/expected/types/Query.kt | 12 +- .../expected/DgsClient.kt | 1 - .../expected/DgsConstants.kt | 4 - .../expected/client/QueryProjection.kt | 6 +- .../expected/types/OrderFilter.kt | 6 +- .../expected/types/Query.kt | 12 +- .../expected/DgsClient.kt | 1 - .../expected/DgsConstants.kt | 4 - .../expected/client/QueryProjection.kt | 6 +- .../expected/types/OrderFilter.kt | 6 +- .../expected/types/Query.kt | 12 +- .../expected/DgsClient.kt | 1 - .../expected/DgsConstants.kt | 2 - .../expected/types/Color.kt | 15 +- .../expected/types/SomeType.kt | 6 +- .../expected/DgsClient.kt | 1 - .../expected/DgsConstants.kt | 2 - .../expected/types/SomeType.kt | 6 +- .../expected/DgsClient.kt | 1 - .../expected/DgsConstants.kt | 2 - .../expected/types/SomeType.kt | 6 +- .../expected/DgsClient.kt | 1 - .../expected/DgsConstants.kt | 2 - .../expected/types/SomeType.kt | 6 +- .../expected/DgsClient.kt | 1 - .../expected/DgsConstants.kt | 2 - .../expected/types/Color.kt | 12 +- .../expected/types/ColorFilter.kt | 6 +- .../expected/DgsClient.kt | 1 - .../expected/DgsConstants.kt | 3 - .../expected/types/Car.kt | 6 +- .../expected/types/Hobby.kt | 15 +- .../expected/types/Person.kt | 6 +- .../expected/DgsClient.kt | 1 - .../expected/DgsConstants.kt | 4 - .../expected/types/Car.kt | 6 +- .../expected/types/MovieFilter.kt | 6 +- .../expected/types/Person.kt | 6 +- .../expected/DgsClient.kt | 1 - .../expected/DgsConstants.kt | 4 - .../expected/client/QueryProjection.kt | 6 +- .../expected/types/MovieFilter.kt | 6 +- .../expected/types/Query.kt | 12 +- .../expected/DgsClient.kt | 1 - .../expected/DgsConstants.kt | 2 - .../expected/types/SampleInput.kt | 6 +- .../expected/DgsClient.kt | 1 - .../expected/DgsConstants.kt | 4 - .../expected/client/BirdProjection.kt | 6 +- .../expected/client/DogProjection.kt | 6 +- .../expected/client/PetProjection.kt | 6 +- .../expected/types/Bird.kt | 12 +- .../expected/types/Dog.kt | 12 +- .../expected/types/Pet.kt | 6 +- .../expected/DgsClient.kt | 1 - .../expected/DgsConstants.kt | 5 - .../expected/client/DietProjection.kt | 6 +- .../expected/client/DogProjection.kt | 6 +- .../expected/client/PetProjection.kt | 6 +- .../expected/client/VegetarianProjection.kt | 6 +- .../expected/types/Diet.kt | 6 +- .../expected/types/Dog.kt | 12 +- .../expected/types/Pet.kt | 6 +- .../expected/types/Vegetarian.kt | 12 +- .../expected/DgsClient.kt | 1 - .../expected/DgsConstants.kt | 4 - .../expected/client/EmployeeProjection.kt | 6 +- .../expected/client/PersonProjection.kt | 6 +- .../expected/client/QueryProjection.kt | 6 +- .../expected/types/Employee.kt | 12 +- .../expected/types/Person.kt | 6 +- .../expected/types/Query.kt | 12 +- .../cases/interfaceDocs/expected/DgsClient.kt | 1 - .../interfaceDocs/expected/DgsConstants.kt | 2 - .../expected/client/TitledProjection.kt | 6 +- .../interfaceDocs/expected/types/Titled.kt | 6 +- .../interfaceFieldsDocs/expected/DgsClient.kt | 1 - .../expected/DgsConstants.kt | 2 - .../expected/client/TitledProjection.kt | 6 +- .../expected/types/Titled.kt | 6 +- .../expected/DgsClient.kt | 1 - .../expected/DgsConstants.kt | 5 - .../expected/client/FruitProjection.kt | 6 +- .../expected/client/QueryProjection.kt | 6 +- .../expected/client/SeedProjection.kt | 6 +- .../expected/client/StoneFruitProjection.kt | 6 +- .../expected/types/Fruit.kt | 6 +- .../expected/types/Query.kt | 12 +- .../expected/types/Seed.kt | 12 +- .../expected/types/StoneFruit.kt | 6 +- .../expected/DgsClient.kt | 1 - .../expected/DgsConstants.kt | 4 - .../expected/client/IProjection.kt | 6 +- .../expected/client/QueryProjection.kt | 6 +- .../expected/client/TProjection.kt | 6 +- .../expected/types/I.kt | 6 +- .../expected/types/Query.kt | 12 +- .../expected/types/T.kt | 12 +- .../projectionWithEnum/expected/DgsClient.kt | 1 - .../expected/DgsConstants.kt | 2 - .../expected/client/QueryProjection.kt | 6 +- .../projectionWithEnum/expected/types/E.kt | 12 +- .../expected/types/Query.kt | 12 +- .../expected/DgsClient.kt | 1 - .../expected/DgsConstants.kt | 6 - .../expected/client/QueryProjection.kt | 6 +- .../expected/types/I1.kt | 6 +- .../expected/types/I2.kt | 6 +- .../expected/types/Query.kt | 12 +- .../expected/DgsClient.kt | 1 - .../expected/DgsConstants.kt | 4 - .../expected/client/QueryProjection.kt | 6 +- .../expected/types/I.kt | 6 +- .../expected/types/Query.kt | 12 +- .../expected/DgsClient.kt | 1 - .../expected/DgsConstants.kt | 2 - .../expected/client/QueryProjection.kt | 6 +- .../expected/types/Query.kt | 12 +- .../projectionWithType/expected/DgsClient.kt | 1 - .../expected/DgsConstants.kt | 4 - .../expected/client/EmployeeProjection.kt | 6 +- .../expected/client/PersonProjection.kt | 6 +- .../expected/client/QueryProjection.kt | 6 +- .../expected/types/Employee.kt | 12 +- .../expected/types/Person.kt | 6 +- .../expected/types/Query.kt | 12 +- .../expected/DgsClient.kt | 1 - .../expected/DgsConstants.kt | 6 - .../expected/client/EmployeeProjection.kt | 6 +- .../expected/client/PersonProjection.kt | 6 +- .../expected/client/QueryProjection.kt | 6 +- .../expected/types/Employee.kt | 12 +- .../expected/types/I.kt | 6 +- .../expected/types/Person.kt | 6 +- .../expected/types/Query.kt | 12 +- .../projectionWithUnion/expected/DgsClient.kt | 1 - .../expected/DgsConstants.kt | 5 - .../expected/client/EmployeeProjection.kt | 6 +- .../expected/client/PersonProjection.kt | 6 +- .../expected/client/QueryProjection.kt | 6 +- .../expected/client/UProjection.kt | 6 +- .../expected/types/Employee.kt | 12 +- .../expected/types/Person.kt | 6 +- .../expected/types/Query.kt | 12 +- .../projectionWithUnion/expected/types/U.kt | 6 +- .../skipCodegenOnFields/expected/DgsClient.kt | 1 - .../expected/DgsConstants.kt | 2 - .../expected/client/PersonProjection.kt | 6 +- .../expected/types/Person.kt | 12 +- .../expected/DgsClient.kt | 1 - .../expected/DgsConstants.kt | 2 - .../expected/client/PersonProjection.kt | 6 +- .../expected/types/Person.kt | 6 +- .../skipCodegenOnTypes/expected/DgsClient.kt | 1 - .../expected/DgsConstants.kt | 3 - .../expected/client/PersonProjection.kt | 6 +- .../expected/types/Person.kt | 12 +- .../codegen/cases/union/expected/DgsClient.kt | 1 - .../cases/union/expected/DgsConstants.kt | 5 - .../union/expected/client/ActorProjection.kt | 6 +- .../union/expected/client/MovieProjection.kt | 6 +- .../union/expected/client/QueryProjection.kt | 6 +- .../expected/client/SearchResultProjection.kt | 6 +- .../cases/union/expected/types/Actor.kt | 12 +- .../cases/union/expected/types/Movie.kt | 12 +- .../cases/union/expected/types/Query.kt | 12 +- .../union/expected/types/SearchResult.kt | 6 +- .../expected/DgsClient.kt | 1 - .../expected/DgsConstants.kt | 7 - .../expected/client/DroidProjection.kt | 6 +- .../expected/client/HumanProjection.kt | 6 +- .../expected/client/QueryProjection.kt | 6 +- .../client/SearchResultPageProjection.kt | 6 +- .../expected/client/SearchResultProjection.kt | 6 +- .../expected/types/Droid.kt | 12 +- .../expected/types/Human.kt | 12 +- .../expected/types/Query.kt | 12 +- .../expected/types/SearchResult.kt | 6 +- .../expected/types/SearchResultPage.kt | 12 +- .../expected/DgsClient.kt | 1 - .../expected/DgsConstants.kt | 6 - .../expected/client/ActorProjection.kt | 6 +- .../expected/client/MovieProjection.kt | 6 +- .../expected/client/QueryProjection.kt | 6 +- .../expected/client/RatingProjection.kt | 6 +- .../expected/client/SearchResultProjection.kt | 6 +- .../expected/types/Actor.kt | 12 +- .../expected/types/Movie.kt | 12 +- .../expected/types/Query.kt | 12 +- .../expected/types/Rating.kt | 12 +- .../expected/types/SearchResult.kt | 6 +- .../netflix/graphql/dgs/codegen/CodeGen.kt | 6 +- .../codegen/generators/java/JavaPoetUtils.kt | 36 +-- .../generators/kotlin/KotlinPoetUtils.kt | 38 +-- .../generators/shared/SharedTypeUtils.kt | 7 +- .../graphql/dgs/codegen/CodeGenTest.kt | 262 +++++++---------- .../graphql/dgs/codegen/Kotlin2CodeGenTest.kt | 21 +- .../graphql/dgs/codegen/KotlinCodeGenTest.kt | 275 +++++++----------- .../netflix/graphql/dgs/codegen/TestUtils.kt | 89 +++--- .../clientapi/ClientApiGenFragmentTest.kt | 5 +- .../dgs/codegen/gradle/GenerateJavaTask.kt | 5 + 421 files changed, 1099 insertions(+), 2294 deletions(-) diff --git a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/constantsForInputTypes/expected/DgsClient.kt b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/constantsForInputTypes/expected/DgsClient.kt index 628070598..e8b0a9c7b 100644 --- a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/constantsForInputTypes/expected/DgsClient.kt +++ b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/constantsForInputTypes/expected/DgsClient.kt @@ -6,7 +6,6 @@ import com.netflix.graphql.dgs.codegen.cases.constantsForInputTypes.expected.cli import graphql.language.OperationDefinition import kotlin.String -@jakarta.`annotation`.Generated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) @Generated public object DgsClient { public fun buildQuery(inputValueSerializer: InputValueSerializerInterface? = null, diff --git a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/constantsForInputTypes/expected/DgsConstants.kt b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/constantsForInputTypes/expected/DgsConstants.kt index 21fed2b9c..ded141729 100644 --- a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/constantsForInputTypes/expected/DgsConstants.kt +++ b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/constantsForInputTypes/expected/DgsConstants.kt @@ -2,26 +2,22 @@ package com.netflix.graphql.dgs.codegen.cases.constantsForInputTypes.expected import kotlin.String -@jakarta.`annotation`.Generated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) @Generated public object DgsConstants { public const val QUERY_TYPE: String = "Query" - @jakarta.`annotation`.Generated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) @Generated public object QUERY { public const val TYPE_NAME: String = "Query" public const val People: String = "people" - @jakarta.`annotation`.Generated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) @Generated public object PEOPLE_INPUT_ARGUMENT { public const val Filter: String = "filter" } } - @jakarta.`annotation`.Generated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) @Generated public object PERSON { public const val TYPE_NAME: String = "Person" @@ -31,7 +27,6 @@ public object DgsConstants { public const val Lastname: String = "lastname" } - @jakarta.`annotation`.Generated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) @Generated public object PERSONFILTER { public const val TYPE_NAME: String = "PersonFilter" diff --git a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/constantsForInputTypes/expected/client/PersonProjection.kt b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/constantsForInputTypes/expected/client/PersonProjection.kt index 7b5c44d7a..e80430e8f 100644 --- a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/constantsForInputTypes/expected/client/PersonProjection.kt +++ b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/constantsForInputTypes/expected/client/PersonProjection.kt @@ -2,11 +2,9 @@ package com.netflix.graphql.dgs.codegen.cases.constantsForInputTypes.expected.cl import com.netflix.graphql.dgs.client.codegen.InputValueSerializerInterface import com.netflix.graphql.dgs.codegen.GraphQLProjection -import com.netflix.graphql.dgs.codegen.cases.constantsForInputTypes.expected.Generated as ExpectedGenerated -import jakarta.`annotation`.Generated as AnnotationGenerated +import com.netflix.graphql.dgs.codegen.cases.constantsForInputTypes.expected.Generated -@AnnotationGenerated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) -@ExpectedGenerated +@Generated public class PersonProjection( inputValueSerializer: InputValueSerializerInterface? = null, ) : GraphQLProjection(inputValueSerializer) { diff --git a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/constantsForInputTypes/expected/client/QueryProjection.kt b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/constantsForInputTypes/expected/client/QueryProjection.kt index 9aafde108..ad527791f 100644 --- a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/constantsForInputTypes/expected/client/QueryProjection.kt +++ b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/constantsForInputTypes/expected/client/QueryProjection.kt @@ -2,13 +2,11 @@ package com.netflix.graphql.dgs.codegen.cases.constantsForInputTypes.expected.cl import com.netflix.graphql.dgs.client.codegen.InputValueSerializerInterface import com.netflix.graphql.dgs.codegen.GraphQLProjection +import com.netflix.graphql.dgs.codegen.cases.constantsForInputTypes.expected.Generated import com.netflix.graphql.dgs.codegen.cases.constantsForInputTypes.expected.types.PersonFilter import kotlin.String -import com.netflix.graphql.dgs.codegen.cases.constantsForInputTypes.expected.Generated as ExpectedGenerated -import jakarta.`annotation`.Generated as AnnotationGenerated -@AnnotationGenerated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) -@ExpectedGenerated +@Generated public class QueryProjection( inputValueSerializer: InputValueSerializerInterface? = null, ) : GraphQLProjection(inputValueSerializer) { diff --git a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/constantsForInputTypes/expected/types/Person.kt b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/constantsForInputTypes/expected/types/Person.kt index 6d0d4fb30..d1763bac7 100644 --- a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/constantsForInputTypes/expected/types/Person.kt +++ b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/constantsForInputTypes/expected/types/Person.kt @@ -5,14 +5,12 @@ import com.fasterxml.jackson.`annotation`.JsonProperty import com.fasterxml.jackson.`annotation`.JsonTypeInfo import com.fasterxml.jackson.databind.`annotation`.JsonDeserialize import com.fasterxml.jackson.databind.`annotation`.JsonPOJOBuilder +import com.netflix.graphql.dgs.codegen.cases.constantsForInputTypes.expected.Generated import java.lang.IllegalStateException import kotlin.String import kotlin.jvm.JvmName -import com.netflix.graphql.dgs.codegen.cases.constantsForInputTypes.expected.Generated as ExpectedGenerated -import jakarta.`annotation`.Generated as AnnotationGenerated -@AnnotationGenerated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) -@ExpectedGenerated +@Generated @JsonTypeInfo(use = JsonTypeInfo.Id.NONE) @JsonDeserialize(builder = Person.Builder::class) public class Person( @@ -31,8 +29,7 @@ public class Person( public val lastname: String? get() = __lastname.invoke() - @AnnotationGenerated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) - @ExpectedGenerated + @Generated public companion object { private val firstnameDefault: () -> String? = { throw IllegalStateException("Field `firstname` was not requested") } @@ -41,8 +38,7 @@ public class Person( { throw IllegalStateException("Field `lastname` was not requested") } } - @AnnotationGenerated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) - @ExpectedGenerated + @Generated @JsonPOJOBuilder @JsonIgnoreProperties("__typename") public class Builder { diff --git a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/constantsForInputTypes/expected/types/PersonFilter.kt b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/constantsForInputTypes/expected/types/PersonFilter.kt index 2f4cc7e69..cf6cdd4b6 100644 --- a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/constantsForInputTypes/expected/types/PersonFilter.kt +++ b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/constantsForInputTypes/expected/types/PersonFilter.kt @@ -2,15 +2,13 @@ package com.netflix.graphql.dgs.codegen.cases.constantsForInputTypes.expected.ty import com.fasterxml.jackson.`annotation`.JsonProperty import com.netflix.graphql.dgs.codegen.GraphQLInput +import com.netflix.graphql.dgs.codegen.cases.constantsForInputTypes.expected.Generated import kotlin.Any import kotlin.Pair import kotlin.String import kotlin.collections.List -import com.netflix.graphql.dgs.codegen.cases.constantsForInputTypes.expected.Generated as ExpectedGenerated -import jakarta.`annotation`.Generated as AnnotationGenerated -@AnnotationGenerated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) -@ExpectedGenerated +@Generated public data class PersonFilter( @JsonProperty("email") public val email: String? = default("email", null), diff --git a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/constantsForInputTypes/expected/types/Query.kt b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/constantsForInputTypes/expected/types/Query.kt index 07f29fae8..867f3259c 100644 --- a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/constantsForInputTypes/expected/types/Query.kt +++ b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/constantsForInputTypes/expected/types/Query.kt @@ -5,14 +5,12 @@ import com.fasterxml.jackson.`annotation`.JsonProperty import com.fasterxml.jackson.`annotation`.JsonTypeInfo import com.fasterxml.jackson.databind.`annotation`.JsonDeserialize import com.fasterxml.jackson.databind.`annotation`.JsonPOJOBuilder +import com.netflix.graphql.dgs.codegen.cases.constantsForInputTypes.expected.Generated import java.lang.IllegalStateException import kotlin.collections.List import kotlin.jvm.JvmName -import com.netflix.graphql.dgs.codegen.cases.constantsForInputTypes.expected.Generated as ExpectedGenerated -import jakarta.`annotation`.Generated as AnnotationGenerated -@AnnotationGenerated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) -@ExpectedGenerated +@Generated @JsonTypeInfo(use = JsonTypeInfo.Id.NONE) @JsonDeserialize(builder = Query.Builder::class) public class Query( @@ -24,15 +22,13 @@ public class Query( public val people: List? get() = __people.invoke() - @AnnotationGenerated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) - @ExpectedGenerated + @Generated public companion object { private val peopleDefault: () -> List? = { throw IllegalStateException("Field `people` was not requested") } } - @AnnotationGenerated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) - @ExpectedGenerated + @Generated @JsonPOJOBuilder @JsonIgnoreProperties("__typename") public class Builder { diff --git a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/constantsWithExtendedInputTypes/expected/DgsClient.kt b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/constantsWithExtendedInputTypes/expected/DgsClient.kt index ebdc2ae16..77e8a37a2 100644 --- a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/constantsWithExtendedInputTypes/expected/DgsClient.kt +++ b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/constantsWithExtendedInputTypes/expected/DgsClient.kt @@ -6,7 +6,6 @@ import com.netflix.graphql.dgs.codegen.cases.constantsWithExtendedInputTypes.exp import graphql.language.OperationDefinition import kotlin.String -@jakarta.`annotation`.Generated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) @Generated public object DgsClient { public fun buildQuery(inputValueSerializer: InputValueSerializerInterface? = null, diff --git a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/constantsWithExtendedInputTypes/expected/DgsConstants.kt b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/constantsWithExtendedInputTypes/expected/DgsConstants.kt index c12ef5be7..616078660 100644 --- a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/constantsWithExtendedInputTypes/expected/DgsConstants.kt +++ b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/constantsWithExtendedInputTypes/expected/DgsConstants.kt @@ -2,26 +2,22 @@ package com.netflix.graphql.dgs.codegen.cases.constantsWithExtendedInputTypes.ex import kotlin.String -@jakarta.`annotation`.Generated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) @Generated public object DgsConstants { public const val QUERY_TYPE: String = "Query" - @jakarta.`annotation`.Generated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) @Generated public object QUERY { public const val TYPE_NAME: String = "Query" public const val People: String = "people" - @jakarta.`annotation`.Generated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) @Generated public object PEOPLE_INPUT_ARGUMENT { public const val Filter: String = "filter" } } - @jakarta.`annotation`.Generated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) @Generated public object PERSON { public const val TYPE_NAME: String = "Person" @@ -31,7 +27,6 @@ public object DgsConstants { public const val Lastname: String = "lastname" } - @jakarta.`annotation`.Generated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) @Generated public object PERSONFILTER { public const val TYPE_NAME: String = "PersonFilter" diff --git a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/constantsWithExtendedInputTypes/expected/client/PersonProjection.kt b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/constantsWithExtendedInputTypes/expected/client/PersonProjection.kt index 2b79fcf99..c3082eadf 100644 --- a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/constantsWithExtendedInputTypes/expected/client/PersonProjection.kt +++ b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/constantsWithExtendedInputTypes/expected/client/PersonProjection.kt @@ -2,11 +2,9 @@ package com.netflix.graphql.dgs.codegen.cases.constantsWithExtendedInputTypes.ex import com.netflix.graphql.dgs.client.codegen.InputValueSerializerInterface import com.netflix.graphql.dgs.codegen.GraphQLProjection -import com.netflix.graphql.dgs.codegen.cases.constantsWithExtendedInputTypes.expected.Generated as ExpectedGenerated -import jakarta.`annotation`.Generated as AnnotationGenerated +import com.netflix.graphql.dgs.codegen.cases.constantsWithExtendedInputTypes.expected.Generated -@AnnotationGenerated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) -@ExpectedGenerated +@Generated public class PersonProjection( inputValueSerializer: InputValueSerializerInterface? = null, ) : GraphQLProjection(inputValueSerializer) { diff --git a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/constantsWithExtendedInputTypes/expected/client/QueryProjection.kt b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/constantsWithExtendedInputTypes/expected/client/QueryProjection.kt index 0abed196a..2677c6efd 100644 --- a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/constantsWithExtendedInputTypes/expected/client/QueryProjection.kt +++ b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/constantsWithExtendedInputTypes/expected/client/QueryProjection.kt @@ -2,13 +2,11 @@ package com.netflix.graphql.dgs.codegen.cases.constantsWithExtendedInputTypes.ex import com.netflix.graphql.dgs.client.codegen.InputValueSerializerInterface import com.netflix.graphql.dgs.codegen.GraphQLProjection +import com.netflix.graphql.dgs.codegen.cases.constantsWithExtendedInputTypes.expected.Generated import com.netflix.graphql.dgs.codegen.cases.constantsWithExtendedInputTypes.expected.types.PersonFilter import kotlin.String -import com.netflix.graphql.dgs.codegen.cases.constantsWithExtendedInputTypes.expected.Generated as ExpectedGenerated -import jakarta.`annotation`.Generated as AnnotationGenerated -@AnnotationGenerated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) -@ExpectedGenerated +@Generated public class QueryProjection( inputValueSerializer: InputValueSerializerInterface? = null, ) : GraphQLProjection(inputValueSerializer) { diff --git a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/constantsWithExtendedInputTypes/expected/types/Person.kt b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/constantsWithExtendedInputTypes/expected/types/Person.kt index e562ba154..05d1bcbb9 100644 --- a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/constantsWithExtendedInputTypes/expected/types/Person.kt +++ b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/constantsWithExtendedInputTypes/expected/types/Person.kt @@ -5,14 +5,12 @@ import com.fasterxml.jackson.`annotation`.JsonProperty import com.fasterxml.jackson.`annotation`.JsonTypeInfo import com.fasterxml.jackson.databind.`annotation`.JsonDeserialize import com.fasterxml.jackson.databind.`annotation`.JsonPOJOBuilder +import com.netflix.graphql.dgs.codegen.cases.constantsWithExtendedInputTypes.expected.Generated import java.lang.IllegalStateException import kotlin.String import kotlin.jvm.JvmName -import com.netflix.graphql.dgs.codegen.cases.constantsWithExtendedInputTypes.expected.Generated as ExpectedGenerated -import jakarta.`annotation`.Generated as AnnotationGenerated -@AnnotationGenerated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) -@ExpectedGenerated +@Generated @JsonTypeInfo(use = JsonTypeInfo.Id.NONE) @JsonDeserialize(builder = Person.Builder::class) public class Person( @@ -31,8 +29,7 @@ public class Person( public val lastname: String? get() = __lastname.invoke() - @AnnotationGenerated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) - @ExpectedGenerated + @Generated public companion object { private val firstnameDefault: () -> String? = { throw IllegalStateException("Field `firstname` was not requested") } @@ -41,8 +38,7 @@ public class Person( { throw IllegalStateException("Field `lastname` was not requested") } } - @AnnotationGenerated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) - @ExpectedGenerated + @Generated @JsonPOJOBuilder @JsonIgnoreProperties("__typename") public class Builder { diff --git a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/constantsWithExtendedInputTypes/expected/types/PersonFilter.kt b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/constantsWithExtendedInputTypes/expected/types/PersonFilter.kt index 3ee24e0ba..05c1725b8 100644 --- a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/constantsWithExtendedInputTypes/expected/types/PersonFilter.kt +++ b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/constantsWithExtendedInputTypes/expected/types/PersonFilter.kt @@ -2,16 +2,14 @@ package com.netflix.graphql.dgs.codegen.cases.constantsWithExtendedInputTypes.ex import com.fasterxml.jackson.`annotation`.JsonProperty import com.netflix.graphql.dgs.codegen.GraphQLInput +import com.netflix.graphql.dgs.codegen.cases.constantsWithExtendedInputTypes.expected.Generated import kotlin.Any import kotlin.Int import kotlin.Pair import kotlin.String import kotlin.collections.List -import com.netflix.graphql.dgs.codegen.cases.constantsWithExtendedInputTypes.expected.Generated as ExpectedGenerated -import jakarta.`annotation`.Generated as AnnotationGenerated -@AnnotationGenerated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) -@ExpectedGenerated +@Generated public data class PersonFilter( @JsonProperty("email") public val email: String? = default("email", null), diff --git a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/constantsWithExtendedInputTypes/expected/types/Query.kt b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/constantsWithExtendedInputTypes/expected/types/Query.kt index ce4bbe886..74aae4227 100644 --- a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/constantsWithExtendedInputTypes/expected/types/Query.kt +++ b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/constantsWithExtendedInputTypes/expected/types/Query.kt @@ -5,14 +5,12 @@ import com.fasterxml.jackson.`annotation`.JsonProperty import com.fasterxml.jackson.`annotation`.JsonTypeInfo import com.fasterxml.jackson.databind.`annotation`.JsonDeserialize import com.fasterxml.jackson.databind.`annotation`.JsonPOJOBuilder +import com.netflix.graphql.dgs.codegen.cases.constantsWithExtendedInputTypes.expected.Generated import java.lang.IllegalStateException import kotlin.collections.List import kotlin.jvm.JvmName -import com.netflix.graphql.dgs.codegen.cases.constantsWithExtendedInputTypes.expected.Generated as ExpectedGenerated -import jakarta.`annotation`.Generated as AnnotationGenerated -@AnnotationGenerated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) -@ExpectedGenerated +@Generated @JsonTypeInfo(use = JsonTypeInfo.Id.NONE) @JsonDeserialize(builder = Query.Builder::class) public class Query( @@ -24,15 +22,13 @@ public class Query( public val people: List? get() = __people.invoke() - @AnnotationGenerated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) - @ExpectedGenerated + @Generated public companion object { private val peopleDefault: () -> List? = { throw IllegalStateException("Field `people` was not requested") } } - @AnnotationGenerated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) - @ExpectedGenerated + @Generated @JsonPOJOBuilder @JsonIgnoreProperties("__typename") public class Builder { diff --git a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/constantsWithExtendedInterface/expected/DgsClient.kt b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/constantsWithExtendedInterface/expected/DgsClient.kt index 38307a631..99c272f51 100644 --- a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/constantsWithExtendedInterface/expected/DgsClient.kt +++ b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/constantsWithExtendedInterface/expected/DgsClient.kt @@ -6,7 +6,6 @@ import com.netflix.graphql.dgs.codegen.cases.constantsWithExtendedInterface.expe import graphql.language.OperationDefinition import kotlin.String -@jakarta.`annotation`.Generated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) @Generated public object DgsClient { public fun buildQuery(inputValueSerializer: InputValueSerializerInterface? = null, diff --git a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/constantsWithExtendedInterface/expected/DgsConstants.kt b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/constantsWithExtendedInterface/expected/DgsConstants.kt index fcc293860..68bf8bae5 100644 --- a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/constantsWithExtendedInterface/expected/DgsConstants.kt +++ b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/constantsWithExtendedInterface/expected/DgsConstants.kt @@ -2,12 +2,10 @@ package com.netflix.graphql.dgs.codegen.cases.constantsWithExtendedInterface.exp import kotlin.String -@jakarta.`annotation`.Generated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) @Generated public object DgsConstants { public const val QUERY_TYPE: String = "Query" - @jakarta.`annotation`.Generated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) @Generated public object QUERY { public const val TYPE_NAME: String = "Query" @@ -15,7 +13,6 @@ public object DgsConstants { public const val People: String = "people" } - @jakarta.`annotation`.Generated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) @Generated public object PERSON { public const val TYPE_NAME: String = "Person" diff --git a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/constantsWithExtendedInterface/expected/client/PersonProjection.kt b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/constantsWithExtendedInterface/expected/client/PersonProjection.kt index e73d69b34..6cae3b7f3 100644 --- a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/constantsWithExtendedInterface/expected/client/PersonProjection.kt +++ b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/constantsWithExtendedInterface/expected/client/PersonProjection.kt @@ -2,11 +2,9 @@ package com.netflix.graphql.dgs.codegen.cases.constantsWithExtendedInterface.exp import com.netflix.graphql.dgs.client.codegen.InputValueSerializerInterface import com.netflix.graphql.dgs.codegen.GraphQLProjection -import com.netflix.graphql.dgs.codegen.cases.constantsWithExtendedInterface.expected.Generated as ExpectedGenerated -import jakarta.`annotation`.Generated as AnnotationGenerated +import com.netflix.graphql.dgs.codegen.cases.constantsWithExtendedInterface.expected.Generated -@AnnotationGenerated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) -@ExpectedGenerated +@Generated public class PersonProjection( inputValueSerializer: InputValueSerializerInterface? = null, ) : GraphQLProjection(inputValueSerializer) { diff --git a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/constantsWithExtendedInterface/expected/client/QueryProjection.kt b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/constantsWithExtendedInterface/expected/client/QueryProjection.kt index 0365f110c..fe33e0d3b 100644 --- a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/constantsWithExtendedInterface/expected/client/QueryProjection.kt +++ b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/constantsWithExtendedInterface/expected/client/QueryProjection.kt @@ -2,12 +2,10 @@ package com.netflix.graphql.dgs.codegen.cases.constantsWithExtendedInterface.exp import com.netflix.graphql.dgs.client.codegen.InputValueSerializerInterface import com.netflix.graphql.dgs.codegen.GraphQLProjection +import com.netflix.graphql.dgs.codegen.cases.constantsWithExtendedInterface.expected.Generated import kotlin.String -import com.netflix.graphql.dgs.codegen.cases.constantsWithExtendedInterface.expected.Generated as ExpectedGenerated -import jakarta.`annotation`.Generated as AnnotationGenerated -@AnnotationGenerated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) -@ExpectedGenerated +@Generated public class QueryProjection( inputValueSerializer: InputValueSerializerInterface? = null, ) : GraphQLProjection(inputValueSerializer) { diff --git a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/constantsWithExtendedInterface/expected/types/Person.kt b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/constantsWithExtendedInterface/expected/types/Person.kt index 093c2e484..82f8e461b 100644 --- a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/constantsWithExtendedInterface/expected/types/Person.kt +++ b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/constantsWithExtendedInterface/expected/types/Person.kt @@ -1,15 +1,13 @@ package com.netflix.graphql.dgs.codegen.cases.constantsWithExtendedInterface.expected.types import com.fasterxml.jackson.`annotation`.JsonTypeInfo +import com.netflix.graphql.dgs.codegen.cases.constantsWithExtendedInterface.expected.Generated import kotlin.Int import kotlin.String import kotlin.Suppress import kotlin.jvm.JvmName -import com.netflix.graphql.dgs.codegen.cases.constantsWithExtendedInterface.expected.Generated as ExpectedGenerated -import jakarta.`annotation`.Generated as AnnotationGenerated -@AnnotationGenerated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) -@ExpectedGenerated +@Generated @JsonTypeInfo( use = JsonTypeInfo.Id.NAME, include = JsonTypeInfo.As.PROPERTY, diff --git a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/constantsWithExtendedInterface/expected/types/Query.kt b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/constantsWithExtendedInterface/expected/types/Query.kt index 6d3d23633..c24200350 100644 --- a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/constantsWithExtendedInterface/expected/types/Query.kt +++ b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/constantsWithExtendedInterface/expected/types/Query.kt @@ -5,14 +5,12 @@ import com.fasterxml.jackson.`annotation`.JsonProperty import com.fasterxml.jackson.`annotation`.JsonTypeInfo import com.fasterxml.jackson.databind.`annotation`.JsonDeserialize import com.fasterxml.jackson.databind.`annotation`.JsonPOJOBuilder +import com.netflix.graphql.dgs.codegen.cases.constantsWithExtendedInterface.expected.Generated import java.lang.IllegalStateException import kotlin.collections.List import kotlin.jvm.JvmName -import com.netflix.graphql.dgs.codegen.cases.constantsWithExtendedInterface.expected.Generated as ExpectedGenerated -import jakarta.`annotation`.Generated as AnnotationGenerated -@AnnotationGenerated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) -@ExpectedGenerated +@Generated @JsonTypeInfo(use = JsonTypeInfo.Id.NONE) @JsonDeserialize(builder = Query.Builder::class) public class Query( @@ -24,15 +22,13 @@ public class Query( public val people: List? get() = __people.invoke() - @AnnotationGenerated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) - @ExpectedGenerated + @Generated public companion object { private val peopleDefault: () -> List? = { throw IllegalStateException("Field `people` was not requested") } } - @AnnotationGenerated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) - @ExpectedGenerated + @Generated @JsonPOJOBuilder @JsonIgnoreProperties("__typename") public class Builder { diff --git a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/constantsWithExtendedQuery/expected/DgsClient.kt b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/constantsWithExtendedQuery/expected/DgsClient.kt index e1bd72c23..c569346d7 100644 --- a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/constantsWithExtendedQuery/expected/DgsClient.kt +++ b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/constantsWithExtendedQuery/expected/DgsClient.kt @@ -6,7 +6,6 @@ import com.netflix.graphql.dgs.codegen.cases.constantsWithExtendedQuery.expected import graphql.language.OperationDefinition import kotlin.String -@jakarta.`annotation`.Generated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) @Generated public object DgsClient { public fun buildQuery(inputValueSerializer: InputValueSerializerInterface? = null, diff --git a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/constantsWithExtendedQuery/expected/DgsConstants.kt b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/constantsWithExtendedQuery/expected/DgsConstants.kt index 9552986ee..d09083043 100644 --- a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/constantsWithExtendedQuery/expected/DgsConstants.kt +++ b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/constantsWithExtendedQuery/expected/DgsConstants.kt @@ -2,12 +2,10 @@ package com.netflix.graphql.dgs.codegen.cases.constantsWithExtendedQuery.expecte import kotlin.String -@jakarta.`annotation`.Generated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) @Generated public object DgsConstants { public const val QUERY_TYPE: String = "Query" - @jakarta.`annotation`.Generated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) @Generated public object QUERY { public const val TYPE_NAME: String = "Query" @@ -17,7 +15,6 @@ public object DgsConstants { public const val Friends: String = "friends" } - @jakarta.`annotation`.Generated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) @Generated public object PERSON { public const val TYPE_NAME: String = "Person" diff --git a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/constantsWithExtendedQuery/expected/client/PersonProjection.kt b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/constantsWithExtendedQuery/expected/client/PersonProjection.kt index 2ede68aa2..028791d46 100644 --- a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/constantsWithExtendedQuery/expected/client/PersonProjection.kt +++ b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/constantsWithExtendedQuery/expected/client/PersonProjection.kt @@ -2,11 +2,9 @@ package com.netflix.graphql.dgs.codegen.cases.constantsWithExtendedQuery.expecte import com.netflix.graphql.dgs.client.codegen.InputValueSerializerInterface import com.netflix.graphql.dgs.codegen.GraphQLProjection -import com.netflix.graphql.dgs.codegen.cases.constantsWithExtendedQuery.expected.Generated as ExpectedGenerated -import jakarta.`annotation`.Generated as AnnotationGenerated +import com.netflix.graphql.dgs.codegen.cases.constantsWithExtendedQuery.expected.Generated -@AnnotationGenerated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) -@ExpectedGenerated +@Generated public class PersonProjection( inputValueSerializer: InputValueSerializerInterface? = null, ) : GraphQLProjection(inputValueSerializer) { diff --git a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/constantsWithExtendedQuery/expected/client/QueryProjection.kt b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/constantsWithExtendedQuery/expected/client/QueryProjection.kt index fd2ae7fae..6f773a15d 100644 --- a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/constantsWithExtendedQuery/expected/client/QueryProjection.kt +++ b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/constantsWithExtendedQuery/expected/client/QueryProjection.kt @@ -2,12 +2,10 @@ package com.netflix.graphql.dgs.codegen.cases.constantsWithExtendedQuery.expecte import com.netflix.graphql.dgs.client.codegen.InputValueSerializerInterface import com.netflix.graphql.dgs.codegen.GraphQLProjection +import com.netflix.graphql.dgs.codegen.cases.constantsWithExtendedQuery.expected.Generated import kotlin.String -import com.netflix.graphql.dgs.codegen.cases.constantsWithExtendedQuery.expected.Generated as ExpectedGenerated -import jakarta.`annotation`.Generated as AnnotationGenerated -@AnnotationGenerated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) -@ExpectedGenerated +@Generated public class QueryProjection( inputValueSerializer: InputValueSerializerInterface? = null, ) : GraphQLProjection(inputValueSerializer) { diff --git a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/constantsWithExtendedQuery/expected/types/Person.kt b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/constantsWithExtendedQuery/expected/types/Person.kt index 1e7cf3b13..00098ad8b 100644 --- a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/constantsWithExtendedQuery/expected/types/Person.kt +++ b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/constantsWithExtendedQuery/expected/types/Person.kt @@ -5,14 +5,12 @@ import com.fasterxml.jackson.`annotation`.JsonProperty import com.fasterxml.jackson.`annotation`.JsonTypeInfo import com.fasterxml.jackson.databind.`annotation`.JsonDeserialize import com.fasterxml.jackson.databind.`annotation`.JsonPOJOBuilder +import com.netflix.graphql.dgs.codegen.cases.constantsWithExtendedQuery.expected.Generated import java.lang.IllegalStateException import kotlin.String import kotlin.jvm.JvmName -import com.netflix.graphql.dgs.codegen.cases.constantsWithExtendedQuery.expected.Generated as ExpectedGenerated -import jakarta.`annotation`.Generated as AnnotationGenerated -@AnnotationGenerated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) -@ExpectedGenerated +@Generated @JsonTypeInfo(use = JsonTypeInfo.Id.NONE) @JsonDeserialize(builder = Person.Builder::class) public class Person( @@ -31,8 +29,7 @@ public class Person( public val lastname: String? get() = __lastname.invoke() - @AnnotationGenerated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) - @ExpectedGenerated + @Generated public companion object { private val firstnameDefault: () -> String? = { throw IllegalStateException("Field `firstname` was not requested") } @@ -41,8 +38,7 @@ public class Person( { throw IllegalStateException("Field `lastname` was not requested") } } - @AnnotationGenerated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) - @ExpectedGenerated + @Generated @JsonPOJOBuilder @JsonIgnoreProperties("__typename") public class Builder { diff --git a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/constantsWithExtendedQuery/expected/types/Query.kt b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/constantsWithExtendedQuery/expected/types/Query.kt index 299a2b5e5..18106a44b 100644 --- a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/constantsWithExtendedQuery/expected/types/Query.kt +++ b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/constantsWithExtendedQuery/expected/types/Query.kt @@ -5,14 +5,12 @@ import com.fasterxml.jackson.`annotation`.JsonProperty import com.fasterxml.jackson.`annotation`.JsonTypeInfo import com.fasterxml.jackson.databind.`annotation`.JsonDeserialize import com.fasterxml.jackson.databind.`annotation`.JsonPOJOBuilder +import com.netflix.graphql.dgs.codegen.cases.constantsWithExtendedQuery.expected.Generated import java.lang.IllegalStateException import kotlin.collections.List import kotlin.jvm.JvmName -import com.netflix.graphql.dgs.codegen.cases.constantsWithExtendedQuery.expected.Generated as ExpectedGenerated -import jakarta.`annotation`.Generated as AnnotationGenerated -@AnnotationGenerated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) -@ExpectedGenerated +@Generated @JsonTypeInfo(use = JsonTypeInfo.Id.NONE) @JsonDeserialize(builder = Query.Builder::class) public class Query( @@ -31,8 +29,7 @@ public class Query( public val friends: List? get() = __friends.invoke() - @AnnotationGenerated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) - @ExpectedGenerated + @Generated public companion object { private val peopleDefault: () -> List? = { throw IllegalStateException("Field `people` was not requested") } @@ -41,8 +38,7 @@ public class Query( { throw IllegalStateException("Field `friends` was not requested") } } - @AnnotationGenerated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) - @ExpectedGenerated + @Generated @JsonPOJOBuilder @JsonIgnoreProperties("__typename") public class Builder { diff --git a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/constantsWithExtendedTypes/expected/DgsClient.kt b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/constantsWithExtendedTypes/expected/DgsClient.kt index 627838960..b1e7137d7 100644 --- a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/constantsWithExtendedTypes/expected/DgsClient.kt +++ b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/constantsWithExtendedTypes/expected/DgsClient.kt @@ -6,7 +6,6 @@ import com.netflix.graphql.dgs.codegen.cases.constantsWithExtendedTypes.expected import graphql.language.OperationDefinition import kotlin.String -@jakarta.`annotation`.Generated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) @Generated public object DgsClient { public fun buildQuery(inputValueSerializer: InputValueSerializerInterface? = null, diff --git a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/constantsWithExtendedTypes/expected/DgsConstants.kt b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/constantsWithExtendedTypes/expected/DgsConstants.kt index 27dfd608f..f817707ec 100644 --- a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/constantsWithExtendedTypes/expected/DgsConstants.kt +++ b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/constantsWithExtendedTypes/expected/DgsConstants.kt @@ -2,12 +2,10 @@ package com.netflix.graphql.dgs.codegen.cases.constantsWithExtendedTypes.expecte import kotlin.String -@jakarta.`annotation`.Generated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) @Generated public object DgsConstants { public const val QUERY_TYPE: String = "Query" - @jakarta.`annotation`.Generated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) @Generated public object QUERY { public const val TYPE_NAME: String = "Query" @@ -15,7 +13,6 @@ public object DgsConstants { public const val People: String = "people" } - @jakarta.`annotation`.Generated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) @Generated public object PERSON { public const val TYPE_NAME: String = "Person" diff --git a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/constantsWithExtendedTypes/expected/client/PersonProjection.kt b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/constantsWithExtendedTypes/expected/client/PersonProjection.kt index 9b7cbc72a..30f2c9a92 100644 --- a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/constantsWithExtendedTypes/expected/client/PersonProjection.kt +++ b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/constantsWithExtendedTypes/expected/client/PersonProjection.kt @@ -2,11 +2,9 @@ package com.netflix.graphql.dgs.codegen.cases.constantsWithExtendedTypes.expecte import com.netflix.graphql.dgs.client.codegen.InputValueSerializerInterface import com.netflix.graphql.dgs.codegen.GraphQLProjection -import com.netflix.graphql.dgs.codegen.cases.constantsWithExtendedTypes.expected.Generated as ExpectedGenerated -import jakarta.`annotation`.Generated as AnnotationGenerated +import com.netflix.graphql.dgs.codegen.cases.constantsWithExtendedTypes.expected.Generated -@AnnotationGenerated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) -@ExpectedGenerated +@Generated public class PersonProjection( inputValueSerializer: InputValueSerializerInterface? = null, ) : GraphQLProjection(inputValueSerializer) { diff --git a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/constantsWithExtendedTypes/expected/client/QueryProjection.kt b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/constantsWithExtendedTypes/expected/client/QueryProjection.kt index 9487a3167..c69af4a61 100644 --- a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/constantsWithExtendedTypes/expected/client/QueryProjection.kt +++ b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/constantsWithExtendedTypes/expected/client/QueryProjection.kt @@ -2,12 +2,10 @@ package com.netflix.graphql.dgs.codegen.cases.constantsWithExtendedTypes.expecte import com.netflix.graphql.dgs.client.codegen.InputValueSerializerInterface import com.netflix.graphql.dgs.codegen.GraphQLProjection +import com.netflix.graphql.dgs.codegen.cases.constantsWithExtendedTypes.expected.Generated import kotlin.String -import com.netflix.graphql.dgs.codegen.cases.constantsWithExtendedTypes.expected.Generated as ExpectedGenerated -import jakarta.`annotation`.Generated as AnnotationGenerated -@AnnotationGenerated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) -@ExpectedGenerated +@Generated public class QueryProjection( inputValueSerializer: InputValueSerializerInterface? = null, ) : GraphQLProjection(inputValueSerializer) { diff --git a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/constantsWithExtendedTypes/expected/types/Person.kt b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/constantsWithExtendedTypes/expected/types/Person.kt index a0668ecaf..fc0e0103d 100644 --- a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/constantsWithExtendedTypes/expected/types/Person.kt +++ b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/constantsWithExtendedTypes/expected/types/Person.kt @@ -5,14 +5,12 @@ import com.fasterxml.jackson.`annotation`.JsonProperty import com.fasterxml.jackson.`annotation`.JsonTypeInfo import com.fasterxml.jackson.databind.`annotation`.JsonDeserialize import com.fasterxml.jackson.databind.`annotation`.JsonPOJOBuilder +import com.netflix.graphql.dgs.codegen.cases.constantsWithExtendedTypes.expected.Generated import java.lang.IllegalStateException import kotlin.String import kotlin.jvm.JvmName -import com.netflix.graphql.dgs.codegen.cases.constantsWithExtendedTypes.expected.Generated as ExpectedGenerated -import jakarta.`annotation`.Generated as AnnotationGenerated -@AnnotationGenerated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) -@ExpectedGenerated +@Generated @JsonTypeInfo(use = JsonTypeInfo.Id.NONE) @JsonDeserialize(builder = Person.Builder::class) public class Person( @@ -38,8 +36,7 @@ public class Person( public val email: String? get() = __email.invoke() - @AnnotationGenerated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) - @ExpectedGenerated + @Generated public companion object { private val firstnameDefault: () -> String? = { throw IllegalStateException("Field `firstname` was not requested") } @@ -51,8 +48,7 @@ public class Person( { throw IllegalStateException("Field `email` was not requested") } } - @AnnotationGenerated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) - @ExpectedGenerated + @Generated @JsonPOJOBuilder @JsonIgnoreProperties("__typename") public class Builder { diff --git a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/constantsWithExtendedTypes/expected/types/Query.kt b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/constantsWithExtendedTypes/expected/types/Query.kt index 37dae79d9..802d4b6f8 100644 --- a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/constantsWithExtendedTypes/expected/types/Query.kt +++ b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/constantsWithExtendedTypes/expected/types/Query.kt @@ -5,14 +5,12 @@ import com.fasterxml.jackson.`annotation`.JsonProperty import com.fasterxml.jackson.`annotation`.JsonTypeInfo import com.fasterxml.jackson.databind.`annotation`.JsonDeserialize import com.fasterxml.jackson.databind.`annotation`.JsonPOJOBuilder +import com.netflix.graphql.dgs.codegen.cases.constantsWithExtendedTypes.expected.Generated import java.lang.IllegalStateException import kotlin.collections.List import kotlin.jvm.JvmName -import com.netflix.graphql.dgs.codegen.cases.constantsWithExtendedTypes.expected.Generated as ExpectedGenerated -import jakarta.`annotation`.Generated as AnnotationGenerated -@AnnotationGenerated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) -@ExpectedGenerated +@Generated @JsonTypeInfo(use = JsonTypeInfo.Id.NONE) @JsonDeserialize(builder = Query.Builder::class) public class Query( @@ -24,15 +22,13 @@ public class Query( public val people: List? get() = __people.invoke() - @AnnotationGenerated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) - @ExpectedGenerated + @Generated public companion object { private val peopleDefault: () -> List? = { throw IllegalStateException("Field `people` was not requested") } } - @AnnotationGenerated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) - @ExpectedGenerated + @Generated @JsonPOJOBuilder @JsonIgnoreProperties("__typename") public class Builder { diff --git a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassDocs/expected/DgsClient.kt b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassDocs/expected/DgsClient.kt index 7e7f68baa..aabeeb389 100644 --- a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassDocs/expected/DgsClient.kt +++ b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassDocs/expected/DgsClient.kt @@ -6,7 +6,6 @@ import com.netflix.graphql.dgs.codegen.cases.dataClassDocs.expected.client.Query import graphql.language.OperationDefinition import kotlin.String -@jakarta.`annotation`.Generated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) @Generated public object DgsClient { public fun buildQuery(inputValueSerializer: InputValueSerializerInterface? = null, diff --git a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassDocs/expected/DgsConstants.kt b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassDocs/expected/DgsConstants.kt index d5719fef8..f84aa4ef7 100644 --- a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassDocs/expected/DgsConstants.kt +++ b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassDocs/expected/DgsConstants.kt @@ -2,26 +2,22 @@ package com.netflix.graphql.dgs.codegen.cases.dataClassDocs.expected import kotlin.String -@jakarta.`annotation`.Generated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) @Generated public object DgsConstants { public const val QUERY_TYPE: String = "Query" - @jakarta.`annotation`.Generated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) @Generated public object QUERY { public const val TYPE_NAME: String = "Query" public const val Search: String = "search" - @jakarta.`annotation`.Generated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) @Generated public object SEARCH_INPUT_ARGUMENT { public const val MovieFilter: String = "movieFilter" } } - @jakarta.`annotation`.Generated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) @Generated public object MOVIE { public const val TYPE_NAME: String = "Movie" @@ -29,7 +25,6 @@ public object DgsConstants { public const val Title: String = "title" } - @jakarta.`annotation`.Generated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) @Generated public object MOVIEFILTER { public const val TYPE_NAME: String = "MovieFilter" diff --git a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassDocs/expected/client/MovieProjection.kt b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassDocs/expected/client/MovieProjection.kt index 5d78fb38b..0423594e6 100644 --- a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassDocs/expected/client/MovieProjection.kt +++ b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassDocs/expected/client/MovieProjection.kt @@ -2,11 +2,9 @@ package com.netflix.graphql.dgs.codegen.cases.dataClassDocs.expected.client import com.netflix.graphql.dgs.client.codegen.InputValueSerializerInterface import com.netflix.graphql.dgs.codegen.GraphQLProjection -import com.netflix.graphql.dgs.codegen.cases.dataClassDocs.expected.Generated as ExpectedGenerated -import jakarta.`annotation`.Generated as AnnotationGenerated +import com.netflix.graphql.dgs.codegen.cases.dataClassDocs.expected.Generated -@AnnotationGenerated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) -@ExpectedGenerated +@Generated public class MovieProjection( inputValueSerializer: InputValueSerializerInterface? = null, ) : GraphQLProjection(inputValueSerializer) { diff --git a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassDocs/expected/client/QueryProjection.kt b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassDocs/expected/client/QueryProjection.kt index e23d22a57..5735a6e71 100644 --- a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassDocs/expected/client/QueryProjection.kt +++ b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassDocs/expected/client/QueryProjection.kt @@ -2,13 +2,11 @@ package com.netflix.graphql.dgs.codegen.cases.dataClassDocs.expected.client import com.netflix.graphql.dgs.client.codegen.InputValueSerializerInterface import com.netflix.graphql.dgs.codegen.GraphQLProjection +import com.netflix.graphql.dgs.codegen.cases.dataClassDocs.expected.Generated import com.netflix.graphql.dgs.codegen.cases.dataClassDocs.expected.types.MovieFilter import kotlin.String -import com.netflix.graphql.dgs.codegen.cases.dataClassDocs.expected.Generated as ExpectedGenerated -import jakarta.`annotation`.Generated as AnnotationGenerated -@AnnotationGenerated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) -@ExpectedGenerated +@Generated public class QueryProjection( inputValueSerializer: InputValueSerializerInterface? = null, ) : GraphQLProjection(inputValueSerializer) { diff --git a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassDocs/expected/types/Movie.kt b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassDocs/expected/types/Movie.kt index 591ec6346..50ea0d9de 100644 --- a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassDocs/expected/types/Movie.kt +++ b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassDocs/expected/types/Movie.kt @@ -5,18 +5,16 @@ import com.fasterxml.jackson.`annotation`.JsonProperty import com.fasterxml.jackson.`annotation`.JsonTypeInfo import com.fasterxml.jackson.databind.`annotation`.JsonDeserialize import com.fasterxml.jackson.databind.`annotation`.JsonPOJOBuilder +import com.netflix.graphql.dgs.codegen.cases.dataClassDocs.expected.Generated import java.lang.IllegalStateException import kotlin.String import kotlin.jvm.JvmName -import com.netflix.graphql.dgs.codegen.cases.dataClassDocs.expected.Generated as ExpectedGenerated -import jakarta.`annotation`.Generated as AnnotationGenerated /** * Movies are fun to watch. * They also work well as examples in GraphQL. */ -@AnnotationGenerated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) -@ExpectedGenerated +@Generated @JsonTypeInfo(use = JsonTypeInfo.Id.NONE) @JsonDeserialize(builder = Movie.Builder::class) public class Movie( @@ -28,15 +26,13 @@ public class Movie( public val title: String? get() = __title.invoke() - @AnnotationGenerated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) - @ExpectedGenerated + @Generated public companion object { private val titleDefault: () -> String? = { throw IllegalStateException("Field `title` was not requested") } } - @AnnotationGenerated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) - @ExpectedGenerated + @Generated @JsonPOJOBuilder @JsonIgnoreProperties("__typename") public class Builder { diff --git a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassDocs/expected/types/MovieFilter.kt b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassDocs/expected/types/MovieFilter.kt index 4bbd8a681..22c58946c 100644 --- a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassDocs/expected/types/MovieFilter.kt +++ b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassDocs/expected/types/MovieFilter.kt @@ -2,20 +2,18 @@ package com.netflix.graphql.dgs.codegen.cases.dataClassDocs.expected.types import com.fasterxml.jackson.`annotation`.JsonProperty import com.netflix.graphql.dgs.codegen.GraphQLInput +import com.netflix.graphql.dgs.codegen.cases.dataClassDocs.expected.Generated import kotlin.Any import kotlin.Pair import kotlin.String import kotlin.collections.List -import com.netflix.graphql.dgs.codegen.cases.dataClassDocs.expected.Generated as ExpectedGenerated -import jakarta.`annotation`.Generated as AnnotationGenerated /** * Example filter for Movies. * * It takes a title and such. */ -@AnnotationGenerated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) -@ExpectedGenerated +@Generated public data class MovieFilter( @JsonProperty("titleFilter") public val titleFilter: String? = default("titleFilter", null), diff --git a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassDocs/expected/types/Query.kt b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassDocs/expected/types/Query.kt index 8eb997b73..c77209a00 100644 --- a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassDocs/expected/types/Query.kt +++ b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassDocs/expected/types/Query.kt @@ -5,13 +5,11 @@ import com.fasterxml.jackson.`annotation`.JsonProperty import com.fasterxml.jackson.`annotation`.JsonTypeInfo import com.fasterxml.jackson.databind.`annotation`.JsonDeserialize import com.fasterxml.jackson.databind.`annotation`.JsonPOJOBuilder +import com.netflix.graphql.dgs.codegen.cases.dataClassDocs.expected.Generated import java.lang.IllegalStateException import kotlin.jvm.JvmName -import com.netflix.graphql.dgs.codegen.cases.dataClassDocs.expected.Generated as ExpectedGenerated -import jakarta.`annotation`.Generated as AnnotationGenerated -@AnnotationGenerated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) -@ExpectedGenerated +@Generated @JsonTypeInfo(use = JsonTypeInfo.Id.NONE) @JsonDeserialize(builder = Query.Builder::class) public class Query( @@ -23,15 +21,13 @@ public class Query( public val search: Movie? get() = __search.invoke() - @AnnotationGenerated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) - @ExpectedGenerated + @Generated public companion object { private val searchDefault: () -> Movie? = { throw IllegalStateException("Field `search` was not requested") } } - @AnnotationGenerated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) - @ExpectedGenerated + @Generated @JsonPOJOBuilder @JsonIgnoreProperties("__typename") public class Builder { diff --git a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassFieldDocs/expected/DgsClient.kt b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassFieldDocs/expected/DgsClient.kt index 48f11228d..4dc2841a1 100644 --- a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassFieldDocs/expected/DgsClient.kt +++ b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassFieldDocs/expected/DgsClient.kt @@ -6,7 +6,6 @@ import com.netflix.graphql.dgs.codegen.cases.dataClassFieldDocs.expected.client. import graphql.language.OperationDefinition import kotlin.String -@jakarta.`annotation`.Generated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) @Generated public object DgsClient { public fun buildQuery(inputValueSerializer: InputValueSerializerInterface? = null, diff --git a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassFieldDocs/expected/DgsConstants.kt b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassFieldDocs/expected/DgsConstants.kt index 350d7db68..3dccaf6c7 100644 --- a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassFieldDocs/expected/DgsConstants.kt +++ b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassFieldDocs/expected/DgsConstants.kt @@ -2,26 +2,22 @@ package com.netflix.graphql.dgs.codegen.cases.dataClassFieldDocs.expected import kotlin.String -@jakarta.`annotation`.Generated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) @Generated public object DgsConstants { public const val QUERY_TYPE: String = "Query" - @jakarta.`annotation`.Generated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) @Generated public object QUERY { public const val TYPE_NAME: String = "Query" public const val Search: String = "search" - @jakarta.`annotation`.Generated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) @Generated public object SEARCH_INPUT_ARGUMENT { public const val MovieFilter: String = "movieFilter" } } - @jakarta.`annotation`.Generated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) @Generated public object MOVIE { public const val TYPE_NAME: String = "Movie" @@ -29,7 +25,6 @@ public object DgsConstants { public const val Title: String = "title" } - @jakarta.`annotation`.Generated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) @Generated public object MOVIEFILTER { public const val TYPE_NAME: String = "MovieFilter" diff --git a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassFieldDocs/expected/client/MovieProjection.kt b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassFieldDocs/expected/client/MovieProjection.kt index 1eefdc655..a1f0ae563 100644 --- a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassFieldDocs/expected/client/MovieProjection.kt +++ b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassFieldDocs/expected/client/MovieProjection.kt @@ -2,11 +2,9 @@ package com.netflix.graphql.dgs.codegen.cases.dataClassFieldDocs.expected.client import com.netflix.graphql.dgs.client.codegen.InputValueSerializerInterface import com.netflix.graphql.dgs.codegen.GraphQLProjection -import com.netflix.graphql.dgs.codegen.cases.dataClassFieldDocs.expected.Generated as ExpectedGenerated -import jakarta.`annotation`.Generated as AnnotationGenerated +import com.netflix.graphql.dgs.codegen.cases.dataClassFieldDocs.expected.Generated -@AnnotationGenerated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) -@ExpectedGenerated +@Generated public class MovieProjection( inputValueSerializer: InputValueSerializerInterface? = null, ) : GraphQLProjection(inputValueSerializer) { diff --git a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassFieldDocs/expected/client/QueryProjection.kt b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassFieldDocs/expected/client/QueryProjection.kt index 21a89f403..a8710cf2c 100644 --- a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassFieldDocs/expected/client/QueryProjection.kt +++ b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassFieldDocs/expected/client/QueryProjection.kt @@ -2,13 +2,11 @@ package com.netflix.graphql.dgs.codegen.cases.dataClassFieldDocs.expected.client import com.netflix.graphql.dgs.client.codegen.InputValueSerializerInterface import com.netflix.graphql.dgs.codegen.GraphQLProjection +import com.netflix.graphql.dgs.codegen.cases.dataClassFieldDocs.expected.Generated import com.netflix.graphql.dgs.codegen.cases.dataClassFieldDocs.expected.types.MovieFilter import kotlin.String -import com.netflix.graphql.dgs.codegen.cases.dataClassFieldDocs.expected.Generated as ExpectedGenerated -import jakarta.`annotation`.Generated as AnnotationGenerated -@AnnotationGenerated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) -@ExpectedGenerated +@Generated public class QueryProjection( inputValueSerializer: InputValueSerializerInterface? = null, ) : GraphQLProjection(inputValueSerializer) { diff --git a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassFieldDocs/expected/types/Movie.kt b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassFieldDocs/expected/types/Movie.kt index 10064bed7..d54c13c98 100644 --- a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassFieldDocs/expected/types/Movie.kt +++ b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassFieldDocs/expected/types/Movie.kt @@ -5,14 +5,12 @@ import com.fasterxml.jackson.`annotation`.JsonProperty import com.fasterxml.jackson.`annotation`.JsonTypeInfo import com.fasterxml.jackson.databind.`annotation`.JsonDeserialize import com.fasterxml.jackson.databind.`annotation`.JsonPOJOBuilder +import com.netflix.graphql.dgs.codegen.cases.dataClassFieldDocs.expected.Generated import java.lang.IllegalStateException import kotlin.String import kotlin.jvm.JvmName -import com.netflix.graphql.dgs.codegen.cases.dataClassFieldDocs.expected.Generated as ExpectedGenerated -import jakarta.`annotation`.Generated as AnnotationGenerated -@AnnotationGenerated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) -@ExpectedGenerated +@Generated @JsonTypeInfo(use = JsonTypeInfo.Id.NONE) @JsonDeserialize(builder = Movie.Builder::class) public class Movie( @@ -27,15 +25,13 @@ public class Movie( public val title: String? get() = __title.invoke() - @AnnotationGenerated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) - @ExpectedGenerated + @Generated public companion object { private val titleDefault: () -> String? = { throw IllegalStateException("Field `title` was not requested") } } - @AnnotationGenerated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) - @ExpectedGenerated + @Generated @JsonPOJOBuilder @JsonIgnoreProperties("__typename") public class Builder { diff --git a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassFieldDocs/expected/types/MovieFilter.kt b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassFieldDocs/expected/types/MovieFilter.kt index 7637044ed..674d4b058 100644 --- a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassFieldDocs/expected/types/MovieFilter.kt +++ b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassFieldDocs/expected/types/MovieFilter.kt @@ -2,15 +2,13 @@ package com.netflix.graphql.dgs.codegen.cases.dataClassFieldDocs.expected.types import com.fasterxml.jackson.`annotation`.JsonProperty import com.netflix.graphql.dgs.codegen.GraphQLInput +import com.netflix.graphql.dgs.codegen.cases.dataClassFieldDocs.expected.Generated import kotlin.Any import kotlin.Pair import kotlin.String import kotlin.collections.List -import com.netflix.graphql.dgs.codegen.cases.dataClassFieldDocs.expected.Generated as ExpectedGenerated -import jakarta.`annotation`.Generated as AnnotationGenerated -@AnnotationGenerated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) -@ExpectedGenerated +@Generated public data class MovieFilter( @JsonProperty("titleFilter") public val titleFilter: String? = default("titleFilter", null), diff --git a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassFieldDocs/expected/types/Query.kt b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassFieldDocs/expected/types/Query.kt index 8c1f89ccd..e48e0b953 100644 --- a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassFieldDocs/expected/types/Query.kt +++ b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassFieldDocs/expected/types/Query.kt @@ -5,13 +5,11 @@ import com.fasterxml.jackson.`annotation`.JsonProperty import com.fasterxml.jackson.`annotation`.JsonTypeInfo import com.fasterxml.jackson.databind.`annotation`.JsonDeserialize import com.fasterxml.jackson.databind.`annotation`.JsonPOJOBuilder +import com.netflix.graphql.dgs.codegen.cases.dataClassFieldDocs.expected.Generated import java.lang.IllegalStateException import kotlin.jvm.JvmName -import com.netflix.graphql.dgs.codegen.cases.dataClassFieldDocs.expected.Generated as ExpectedGenerated -import jakarta.`annotation`.Generated as AnnotationGenerated -@AnnotationGenerated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) -@ExpectedGenerated +@Generated @JsonTypeInfo(use = JsonTypeInfo.Id.NONE) @JsonDeserialize(builder = Query.Builder::class) public class Query( @@ -23,15 +21,13 @@ public class Query( public val search: Movie? get() = __search.invoke() - @AnnotationGenerated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) - @ExpectedGenerated + @Generated public companion object { private val searchDefault: () -> Movie? = { throw IllegalStateException("Field `search` was not requested") } } - @AnnotationGenerated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) - @ExpectedGenerated + @Generated @JsonPOJOBuilder @JsonIgnoreProperties("__typename") public class Builder { diff --git a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWIthNoFields/expected/DgsClient.kt b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWIthNoFields/expected/DgsClient.kt index 7d5d0702c..5c62a2271 100644 --- a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWIthNoFields/expected/DgsClient.kt +++ b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWIthNoFields/expected/DgsClient.kt @@ -6,7 +6,6 @@ import com.netflix.graphql.dgs.codegen.cases.dataClassWIthNoFields.expected.clie import graphql.language.OperationDefinition import kotlin.String -@jakarta.`annotation`.Generated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) @Generated public object DgsClient { public fun buildQuery(inputValueSerializer: InputValueSerializerInterface? = null, diff --git a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWIthNoFields/expected/DgsConstants.kt b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWIthNoFields/expected/DgsConstants.kt index 0905a1083..8e0a59743 100644 --- a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWIthNoFields/expected/DgsConstants.kt +++ b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWIthNoFields/expected/DgsConstants.kt @@ -2,12 +2,10 @@ package com.netflix.graphql.dgs.codegen.cases.dataClassWIthNoFields.expected import kotlin.String -@jakarta.`annotation`.Generated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) @Generated public object DgsConstants { public const val QUERY_TYPE: String = "Query" - @jakarta.`annotation`.Generated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) @Generated public object QUERY { public const val TYPE_NAME: String = "Query" @@ -15,7 +13,6 @@ public object DgsConstants { public const val Me: String = "me" } - @jakarta.`annotation`.Generated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) @Generated public object PERSON { public const val TYPE_NAME: String = "Person" diff --git a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWIthNoFields/expected/client/PersonProjection.kt b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWIthNoFields/expected/client/PersonProjection.kt index 7eca9b60f..2d0eba92c 100644 --- a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWIthNoFields/expected/client/PersonProjection.kt +++ b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWIthNoFields/expected/client/PersonProjection.kt @@ -2,11 +2,9 @@ package com.netflix.graphql.dgs.codegen.cases.dataClassWIthNoFields.expected.cli import com.netflix.graphql.dgs.client.codegen.InputValueSerializerInterface import com.netflix.graphql.dgs.codegen.GraphQLProjection -import com.netflix.graphql.dgs.codegen.cases.dataClassWIthNoFields.expected.Generated as ExpectedGenerated -import jakarta.`annotation`.Generated as AnnotationGenerated +import com.netflix.graphql.dgs.codegen.cases.dataClassWIthNoFields.expected.Generated -@AnnotationGenerated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) -@ExpectedGenerated +@Generated public class PersonProjection( inputValueSerializer: InputValueSerializerInterface? = null, ) : GraphQLProjection(inputValueSerializer) diff --git a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWIthNoFields/expected/client/QueryProjection.kt b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWIthNoFields/expected/client/QueryProjection.kt index 76c8121eb..e4271218f 100644 --- a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWIthNoFields/expected/client/QueryProjection.kt +++ b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWIthNoFields/expected/client/QueryProjection.kt @@ -2,12 +2,10 @@ package com.netflix.graphql.dgs.codegen.cases.dataClassWIthNoFields.expected.cli import com.netflix.graphql.dgs.client.codegen.InputValueSerializerInterface import com.netflix.graphql.dgs.codegen.GraphQLProjection +import com.netflix.graphql.dgs.codegen.cases.dataClassWIthNoFields.expected.Generated import kotlin.String -import com.netflix.graphql.dgs.codegen.cases.dataClassWIthNoFields.expected.Generated as ExpectedGenerated -import jakarta.`annotation`.Generated as AnnotationGenerated -@AnnotationGenerated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) -@ExpectedGenerated +@Generated public class QueryProjection( inputValueSerializer: InputValueSerializerInterface? = null, ) : GraphQLProjection(inputValueSerializer) { diff --git a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWIthNoFields/expected/types/Person.kt b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWIthNoFields/expected/types/Person.kt index 169e9e881..f8fa100bd 100644 --- a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWIthNoFields/expected/types/Person.kt +++ b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWIthNoFields/expected/types/Person.kt @@ -4,20 +4,16 @@ import com.fasterxml.jackson.`annotation`.JsonIgnoreProperties import com.fasterxml.jackson.`annotation`.JsonTypeInfo import com.fasterxml.jackson.databind.`annotation`.JsonDeserialize import com.fasterxml.jackson.databind.`annotation`.JsonPOJOBuilder -import com.netflix.graphql.dgs.codegen.cases.dataClassWIthNoFields.expected.Generated as ExpectedGenerated -import jakarta.`annotation`.Generated as AnnotationGenerated +import com.netflix.graphql.dgs.codegen.cases.dataClassWIthNoFields.expected.Generated -@AnnotationGenerated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) -@ExpectedGenerated +@Generated @JsonTypeInfo(use = JsonTypeInfo.Id.NONE) @JsonDeserialize(builder = Person.Builder::class) public class Person() { - @AnnotationGenerated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) - @ExpectedGenerated + @Generated public companion object - @AnnotationGenerated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) - @ExpectedGenerated + @Generated @JsonPOJOBuilder @JsonIgnoreProperties("__typename") public class Builder { diff --git a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWIthNoFields/expected/types/Query.kt b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWIthNoFields/expected/types/Query.kt index 209967204..49770de7f 100644 --- a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWIthNoFields/expected/types/Query.kt +++ b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWIthNoFields/expected/types/Query.kt @@ -5,13 +5,11 @@ import com.fasterxml.jackson.`annotation`.JsonProperty import com.fasterxml.jackson.`annotation`.JsonTypeInfo import com.fasterxml.jackson.databind.`annotation`.JsonDeserialize import com.fasterxml.jackson.databind.`annotation`.JsonPOJOBuilder +import com.netflix.graphql.dgs.codegen.cases.dataClassWIthNoFields.expected.Generated import java.lang.IllegalStateException import kotlin.jvm.JvmName -import com.netflix.graphql.dgs.codegen.cases.dataClassWIthNoFields.expected.Generated as ExpectedGenerated -import jakarta.`annotation`.Generated as AnnotationGenerated -@AnnotationGenerated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) -@ExpectedGenerated +@Generated @JsonTypeInfo(use = JsonTypeInfo.Id.NONE) @JsonDeserialize(builder = Query.Builder::class) public class Query( @@ -23,15 +21,13 @@ public class Query( public val me: Person? get() = __me.invoke() - @AnnotationGenerated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) - @ExpectedGenerated + @Generated public companion object { private val meDefault: () -> Person? = { throw IllegalStateException("Field `me` was not requested") } } - @AnnotationGenerated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) - @ExpectedGenerated + @Generated @JsonPOJOBuilder @JsonIgnoreProperties("__typename") public class Builder { diff --git a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithBooleanField/expected/DgsClient.kt b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithBooleanField/expected/DgsClient.kt index 4952ba835..712d1fcaf 100644 --- a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithBooleanField/expected/DgsClient.kt +++ b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithBooleanField/expected/DgsClient.kt @@ -6,7 +6,6 @@ import com.netflix.graphql.dgs.codegen.cases.dataClassWithBooleanField.expected. import graphql.language.OperationDefinition import kotlin.String -@jakarta.`annotation`.Generated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) @Generated public object DgsClient { public fun buildQuery(inputValueSerializer: InputValueSerializerInterface? = null, diff --git a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithBooleanField/expected/DgsConstants.kt b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithBooleanField/expected/DgsConstants.kt index 1b793f2da..a76ad3a2e 100644 --- a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithBooleanField/expected/DgsConstants.kt +++ b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithBooleanField/expected/DgsConstants.kt @@ -2,12 +2,10 @@ package com.netflix.graphql.dgs.codegen.cases.dataClassWithBooleanField.expected import kotlin.String -@jakarta.`annotation`.Generated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) @Generated public object DgsConstants { public const val QUERY_TYPE: String = "Query" - @jakarta.`annotation`.Generated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) @Generated public object QUERY { public const val TYPE_NAME: String = "Query" @@ -15,7 +13,6 @@ public object DgsConstants { public const val Test: String = "test" } - @jakarta.`annotation`.Generated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) @Generated public object REQUIREDTESTTYPE { public const val TYPE_NAME: String = "RequiredTestType" diff --git a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithBooleanField/expected/client/QueryProjection.kt b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithBooleanField/expected/client/QueryProjection.kt index abf861e26..27bb2787f 100644 --- a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithBooleanField/expected/client/QueryProjection.kt +++ b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithBooleanField/expected/client/QueryProjection.kt @@ -2,12 +2,10 @@ package com.netflix.graphql.dgs.codegen.cases.dataClassWithBooleanField.expected import com.netflix.graphql.dgs.client.codegen.InputValueSerializerInterface import com.netflix.graphql.dgs.codegen.GraphQLProjection +import com.netflix.graphql.dgs.codegen.cases.dataClassWithBooleanField.expected.Generated import kotlin.String -import com.netflix.graphql.dgs.codegen.cases.dataClassWithBooleanField.expected.Generated as ExpectedGenerated -import jakarta.`annotation`.Generated as AnnotationGenerated -@AnnotationGenerated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) -@ExpectedGenerated +@Generated public class QueryProjection( inputValueSerializer: InputValueSerializerInterface? = null, ) : GraphQLProjection(inputValueSerializer) { diff --git a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithBooleanField/expected/client/RequiredTestTypeProjection.kt b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithBooleanField/expected/client/RequiredTestTypeProjection.kt index ef2199877..547b94cde 100644 --- a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithBooleanField/expected/client/RequiredTestTypeProjection.kt +++ b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithBooleanField/expected/client/RequiredTestTypeProjection.kt @@ -2,11 +2,9 @@ package com.netflix.graphql.dgs.codegen.cases.dataClassWithBooleanField.expected import com.netflix.graphql.dgs.client.codegen.InputValueSerializerInterface import com.netflix.graphql.dgs.codegen.GraphQLProjection -import com.netflix.graphql.dgs.codegen.cases.dataClassWithBooleanField.expected.Generated as ExpectedGenerated -import jakarta.`annotation`.Generated as AnnotationGenerated +import com.netflix.graphql.dgs.codegen.cases.dataClassWithBooleanField.expected.Generated -@AnnotationGenerated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) -@ExpectedGenerated +@Generated public class RequiredTestTypeProjection( inputValueSerializer: InputValueSerializerInterface? = null, ) : GraphQLProjection(inputValueSerializer) { diff --git a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithBooleanField/expected/types/Query.kt b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithBooleanField/expected/types/Query.kt index da9a6bbf0..ac3c921ba 100644 --- a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithBooleanField/expected/types/Query.kt +++ b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithBooleanField/expected/types/Query.kt @@ -5,13 +5,11 @@ import com.fasterxml.jackson.`annotation`.JsonProperty import com.fasterxml.jackson.`annotation`.JsonTypeInfo import com.fasterxml.jackson.databind.`annotation`.JsonDeserialize import com.fasterxml.jackson.databind.`annotation`.JsonPOJOBuilder +import com.netflix.graphql.dgs.codegen.cases.dataClassWithBooleanField.expected.Generated import java.lang.IllegalStateException import kotlin.jvm.JvmName -import com.netflix.graphql.dgs.codegen.cases.dataClassWithBooleanField.expected.Generated as ExpectedGenerated -import jakarta.`annotation`.Generated as AnnotationGenerated -@AnnotationGenerated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) -@ExpectedGenerated +@Generated @JsonTypeInfo(use = JsonTypeInfo.Id.NONE) @JsonDeserialize(builder = Query.Builder::class) public class Query( @@ -23,15 +21,13 @@ public class Query( public val test: RequiredTestType? get() = __test.invoke() - @AnnotationGenerated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) - @ExpectedGenerated + @Generated public companion object { private val testDefault: () -> RequiredTestType? = { throw IllegalStateException("Field `test` was not requested") } } - @AnnotationGenerated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) - @ExpectedGenerated + @Generated @JsonPOJOBuilder @JsonIgnoreProperties("__typename") public class Builder { diff --git a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithBooleanField/expected/types/RequiredTestType.kt b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithBooleanField/expected/types/RequiredTestType.kt index e618ddd2f..9d5b1e954 100644 --- a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithBooleanField/expected/types/RequiredTestType.kt +++ b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithBooleanField/expected/types/RequiredTestType.kt @@ -5,14 +5,12 @@ import com.fasterxml.jackson.`annotation`.JsonProperty import com.fasterxml.jackson.`annotation`.JsonTypeInfo import com.fasterxml.jackson.databind.`annotation`.JsonDeserialize import com.fasterxml.jackson.databind.`annotation`.JsonPOJOBuilder +import com.netflix.graphql.dgs.codegen.cases.dataClassWithBooleanField.expected.Generated import java.lang.IllegalStateException import kotlin.Boolean import kotlin.jvm.JvmName -import com.netflix.graphql.dgs.codegen.cases.dataClassWithBooleanField.expected.Generated as ExpectedGenerated -import jakarta.`annotation`.Generated as AnnotationGenerated -@AnnotationGenerated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) -@ExpectedGenerated +@Generated @JsonTypeInfo(use = JsonTypeInfo.Id.NONE) @JsonDeserialize(builder = RequiredTestType.Builder::class) public class RequiredTestType( @@ -24,15 +22,13 @@ public class RequiredTestType( public val isRequired: Boolean get() = __isRequired.invoke() - @AnnotationGenerated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) - @ExpectedGenerated + @Generated public companion object { private val isRequiredDefault: () -> Boolean = { throw IllegalStateException("Field `isRequired` was not requested") } } - @AnnotationGenerated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) - @ExpectedGenerated + @Generated @JsonPOJOBuilder @JsonIgnoreProperties("__typename") public class Builder { diff --git a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithDeclaredScalars/expected/DgsClient.kt b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithDeclaredScalars/expected/DgsClient.kt index 70e44a0f9..de66f8638 100644 --- a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithDeclaredScalars/expected/DgsClient.kt +++ b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithDeclaredScalars/expected/DgsClient.kt @@ -6,7 +6,6 @@ import com.netflix.graphql.dgs.codegen.cases.dataClassWithDeclaredScalars.expect import graphql.language.OperationDefinition import kotlin.String -@jakarta.`annotation`.Generated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) @Generated public object DgsClient { public fun buildQuery(inputValueSerializer: InputValueSerializerInterface? = null, diff --git a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithDeclaredScalars/expected/DgsConstants.kt b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithDeclaredScalars/expected/DgsConstants.kt index 2d2c7557b..b55c45bdd 100644 --- a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithDeclaredScalars/expected/DgsConstants.kt +++ b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithDeclaredScalars/expected/DgsConstants.kt @@ -2,12 +2,10 @@ package com.netflix.graphql.dgs.codegen.cases.dataClassWithDeclaredScalars.expec import kotlin.String -@jakarta.`annotation`.Generated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) @Generated public object DgsConstants { public const val QUERY_TYPE: String = "Query" - @jakarta.`annotation`.Generated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) @Generated public object QUERY { public const val TYPE_NAME: String = "Query" @@ -17,7 +15,6 @@ public object DgsConstants { public const val EntityConnection: String = "entityConnection" } - @jakarta.`annotation`.Generated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) @Generated public object ENTITY { public const val TYPE_NAME: String = "Entity" @@ -27,7 +24,6 @@ public object DgsConstants { public const val DateTime: String = "dateTime" } - @jakarta.`annotation`.Generated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) @Generated public object ENTITYCONNECTION { public const val TYPE_NAME: String = "EntityConnection" @@ -37,7 +33,6 @@ public object DgsConstants { public const val Edges: String = "edges" } - @jakarta.`annotation`.Generated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) @Generated public object ENTITYEDGE { public const val TYPE_NAME: String = "EntityEdge" @@ -47,7 +42,6 @@ public object DgsConstants { public const val Node: String = "node" } - @jakarta.`annotation`.Generated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) @Generated public object PAGEINFO { public const val TYPE_NAME: String = "PageInfo" diff --git a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithDeclaredScalars/expected/client/EntityConnectionProjection.kt b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithDeclaredScalars/expected/client/EntityConnectionProjection.kt index e48bfe292..7a6e927b6 100644 --- a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithDeclaredScalars/expected/client/EntityConnectionProjection.kt +++ b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithDeclaredScalars/expected/client/EntityConnectionProjection.kt @@ -2,12 +2,10 @@ package com.netflix.graphql.dgs.codegen.cases.dataClassWithDeclaredScalars.expec import com.netflix.graphql.dgs.client.codegen.InputValueSerializerInterface import com.netflix.graphql.dgs.codegen.GraphQLProjection +import com.netflix.graphql.dgs.codegen.cases.dataClassWithDeclaredScalars.expected.Generated import kotlin.String -import com.netflix.graphql.dgs.codegen.cases.dataClassWithDeclaredScalars.expected.Generated as ExpectedGenerated -import jakarta.`annotation`.Generated as AnnotationGenerated -@AnnotationGenerated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) -@ExpectedGenerated +@Generated public class EntityConnectionProjection( inputValueSerializer: InputValueSerializerInterface? = null, ) : GraphQLProjection(inputValueSerializer) { diff --git a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithDeclaredScalars/expected/client/EntityEdgeProjection.kt b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithDeclaredScalars/expected/client/EntityEdgeProjection.kt index 1ac09d609..895efd63c 100644 --- a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithDeclaredScalars/expected/client/EntityEdgeProjection.kt +++ b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithDeclaredScalars/expected/client/EntityEdgeProjection.kt @@ -2,12 +2,10 @@ package com.netflix.graphql.dgs.codegen.cases.dataClassWithDeclaredScalars.expec import com.netflix.graphql.dgs.client.codegen.InputValueSerializerInterface import com.netflix.graphql.dgs.codegen.GraphQLProjection +import com.netflix.graphql.dgs.codegen.cases.dataClassWithDeclaredScalars.expected.Generated import kotlin.String -import com.netflix.graphql.dgs.codegen.cases.dataClassWithDeclaredScalars.expected.Generated as ExpectedGenerated -import jakarta.`annotation`.Generated as AnnotationGenerated -@AnnotationGenerated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) -@ExpectedGenerated +@Generated public class EntityEdgeProjection( inputValueSerializer: InputValueSerializerInterface? = null, ) : GraphQLProjection(inputValueSerializer) { diff --git a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithDeclaredScalars/expected/client/EntityProjection.kt b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithDeclaredScalars/expected/client/EntityProjection.kt index 180f1b64c..e562f7d29 100644 --- a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithDeclaredScalars/expected/client/EntityProjection.kt +++ b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithDeclaredScalars/expected/client/EntityProjection.kt @@ -2,11 +2,9 @@ package com.netflix.graphql.dgs.codegen.cases.dataClassWithDeclaredScalars.expec import com.netflix.graphql.dgs.client.codegen.InputValueSerializerInterface import com.netflix.graphql.dgs.codegen.GraphQLProjection -import com.netflix.graphql.dgs.codegen.cases.dataClassWithDeclaredScalars.expected.Generated as ExpectedGenerated -import jakarta.`annotation`.Generated as AnnotationGenerated +import com.netflix.graphql.dgs.codegen.cases.dataClassWithDeclaredScalars.expected.Generated -@AnnotationGenerated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) -@ExpectedGenerated +@Generated public class EntityProjection( inputValueSerializer: InputValueSerializerInterface? = null, ) : GraphQLProjection(inputValueSerializer) { diff --git a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithDeclaredScalars/expected/client/PageInfoProjection.kt b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithDeclaredScalars/expected/client/PageInfoProjection.kt index 656099646..d1dce5c76 100644 --- a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithDeclaredScalars/expected/client/PageInfoProjection.kt +++ b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithDeclaredScalars/expected/client/PageInfoProjection.kt @@ -2,11 +2,9 @@ package com.netflix.graphql.dgs.codegen.cases.dataClassWithDeclaredScalars.expec import com.netflix.graphql.dgs.client.codegen.InputValueSerializerInterface import com.netflix.graphql.dgs.codegen.GraphQLProjection -import com.netflix.graphql.dgs.codegen.cases.dataClassWithDeclaredScalars.expected.Generated as ExpectedGenerated -import jakarta.`annotation`.Generated as AnnotationGenerated +import com.netflix.graphql.dgs.codegen.cases.dataClassWithDeclaredScalars.expected.Generated -@AnnotationGenerated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) -@ExpectedGenerated +@Generated public class PageInfoProjection( inputValueSerializer: InputValueSerializerInterface? = null, ) : GraphQLProjection(inputValueSerializer) { diff --git a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithDeclaredScalars/expected/client/QueryProjection.kt b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithDeclaredScalars/expected/client/QueryProjection.kt index 27af047d7..1e798553b 100644 --- a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithDeclaredScalars/expected/client/QueryProjection.kt +++ b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithDeclaredScalars/expected/client/QueryProjection.kt @@ -2,12 +2,10 @@ package com.netflix.graphql.dgs.codegen.cases.dataClassWithDeclaredScalars.expec import com.netflix.graphql.dgs.client.codegen.InputValueSerializerInterface import com.netflix.graphql.dgs.codegen.GraphQLProjection +import com.netflix.graphql.dgs.codegen.cases.dataClassWithDeclaredScalars.expected.Generated import kotlin.String -import com.netflix.graphql.dgs.codegen.cases.dataClassWithDeclaredScalars.expected.Generated as ExpectedGenerated -import jakarta.`annotation`.Generated as AnnotationGenerated -@AnnotationGenerated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) -@ExpectedGenerated +@Generated public class QueryProjection( inputValueSerializer: InputValueSerializerInterface? = null, ) : GraphQLProjection(inputValueSerializer) { diff --git a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithDeclaredScalars/expected/types/Entity.kt b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithDeclaredScalars/expected/types/Entity.kt index b3b1acb41..591f43769 100644 --- a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithDeclaredScalars/expected/types/Entity.kt +++ b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithDeclaredScalars/expected/types/Entity.kt @@ -5,15 +5,13 @@ import com.fasterxml.jackson.`annotation`.JsonProperty import com.fasterxml.jackson.`annotation`.JsonTypeInfo import com.fasterxml.jackson.databind.`annotation`.JsonDeserialize import com.fasterxml.jackson.databind.`annotation`.JsonPOJOBuilder +import com.netflix.graphql.dgs.codegen.cases.dataClassWithDeclaredScalars.expected.Generated import java.lang.IllegalStateException import java.time.OffsetDateTime import kotlin.Long import kotlin.jvm.JvmName -import com.netflix.graphql.dgs.codegen.cases.dataClassWithDeclaredScalars.expected.Generated as ExpectedGenerated -import jakarta.`annotation`.Generated as AnnotationGenerated -@AnnotationGenerated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) -@ExpectedGenerated +@Generated @JsonTypeInfo(use = JsonTypeInfo.Id.NONE) @JsonDeserialize(builder = Entity.Builder::class) public class Entity( @@ -32,8 +30,7 @@ public class Entity( public val dateTime: OffsetDateTime? get() = __dateTime.invoke() - @AnnotationGenerated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) - @ExpectedGenerated + @Generated public companion object { private val longDefault: () -> Long? = { throw IllegalStateException("Field `long` was not requested") } @@ -42,8 +39,7 @@ public class Entity( { throw IllegalStateException("Field `dateTime` was not requested") } } - @AnnotationGenerated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) - @ExpectedGenerated + @Generated @JsonPOJOBuilder @JsonIgnoreProperties("__typename") public class Builder { diff --git a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithDeclaredScalars/expected/types/EntityConnection.kt b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithDeclaredScalars/expected/types/EntityConnection.kt index afb9cd067..3aa2af32c 100644 --- a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithDeclaredScalars/expected/types/EntityConnection.kt +++ b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithDeclaredScalars/expected/types/EntityConnection.kt @@ -5,14 +5,12 @@ import com.fasterxml.jackson.`annotation`.JsonProperty import com.fasterxml.jackson.`annotation`.JsonTypeInfo import com.fasterxml.jackson.databind.`annotation`.JsonDeserialize import com.fasterxml.jackson.databind.`annotation`.JsonPOJOBuilder +import com.netflix.graphql.dgs.codegen.cases.dataClassWithDeclaredScalars.expected.Generated import java.lang.IllegalStateException import kotlin.collections.List import kotlin.jvm.JvmName -import com.netflix.graphql.dgs.codegen.cases.dataClassWithDeclaredScalars.expected.Generated as ExpectedGenerated -import jakarta.`annotation`.Generated as AnnotationGenerated -@AnnotationGenerated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) -@ExpectedGenerated +@Generated @JsonTypeInfo(use = JsonTypeInfo.Id.NONE) @JsonDeserialize(builder = EntityConnection.Builder::class) public class EntityConnection( @@ -31,8 +29,7 @@ public class EntityConnection( public val edges: List? get() = __edges.invoke() - @AnnotationGenerated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) - @ExpectedGenerated + @Generated public companion object { private val pageInfoDefault: () -> PageInfo = { throw IllegalStateException("Field `pageInfo` was not requested") } @@ -41,8 +38,7 @@ public class EntityConnection( { throw IllegalStateException("Field `edges` was not requested") } } - @AnnotationGenerated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) - @ExpectedGenerated + @Generated @JsonPOJOBuilder @JsonIgnoreProperties("__typename") public class Builder { diff --git a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithDeclaredScalars/expected/types/EntityEdge.kt b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithDeclaredScalars/expected/types/EntityEdge.kt index 1905fea87..69760476e 100644 --- a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithDeclaredScalars/expected/types/EntityEdge.kt +++ b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithDeclaredScalars/expected/types/EntityEdge.kt @@ -5,14 +5,12 @@ import com.fasterxml.jackson.`annotation`.JsonProperty import com.fasterxml.jackson.`annotation`.JsonTypeInfo import com.fasterxml.jackson.databind.`annotation`.JsonDeserialize import com.fasterxml.jackson.databind.`annotation`.JsonPOJOBuilder +import com.netflix.graphql.dgs.codegen.cases.dataClassWithDeclaredScalars.expected.Generated import java.lang.IllegalStateException import kotlin.String import kotlin.jvm.JvmName -import com.netflix.graphql.dgs.codegen.cases.dataClassWithDeclaredScalars.expected.Generated as ExpectedGenerated -import jakarta.`annotation`.Generated as AnnotationGenerated -@AnnotationGenerated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) -@ExpectedGenerated +@Generated @JsonTypeInfo(use = JsonTypeInfo.Id.NONE) @JsonDeserialize(builder = EntityEdge.Builder::class) public class EntityEdge( @@ -31,8 +29,7 @@ public class EntityEdge( public val node: Entity? get() = __node.invoke() - @AnnotationGenerated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) - @ExpectedGenerated + @Generated public companion object { private val cursorDefault: () -> String = { throw IllegalStateException("Field `cursor` was not requested") } @@ -41,8 +38,7 @@ public class EntityEdge( { throw IllegalStateException("Field `node` was not requested") } } - @AnnotationGenerated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) - @ExpectedGenerated + @Generated @JsonPOJOBuilder @JsonIgnoreProperties("__typename") public class Builder { diff --git a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithDeclaredScalars/expected/types/PageInfo.kt b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithDeclaredScalars/expected/types/PageInfo.kt index 5a6dfce0e..88d1c7c13 100644 --- a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithDeclaredScalars/expected/types/PageInfo.kt +++ b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithDeclaredScalars/expected/types/PageInfo.kt @@ -5,15 +5,13 @@ import com.fasterxml.jackson.`annotation`.JsonProperty import com.fasterxml.jackson.`annotation`.JsonTypeInfo import com.fasterxml.jackson.databind.`annotation`.JsonDeserialize import com.fasterxml.jackson.databind.`annotation`.JsonPOJOBuilder +import com.netflix.graphql.dgs.codegen.cases.dataClassWithDeclaredScalars.expected.Generated import java.lang.IllegalStateException import kotlin.Boolean import kotlin.String import kotlin.jvm.JvmName -import com.netflix.graphql.dgs.codegen.cases.dataClassWithDeclaredScalars.expected.Generated as ExpectedGenerated -import jakarta.`annotation`.Generated as AnnotationGenerated -@AnnotationGenerated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) -@ExpectedGenerated +@Generated @JsonTypeInfo(use = JsonTypeInfo.Id.NONE) @JsonDeserialize(builder = PageInfo.Builder::class) public class PageInfo( @@ -46,8 +44,7 @@ public class PageInfo( public val hasPreviousPage: Boolean get() = __hasPreviousPage.invoke() - @AnnotationGenerated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) - @ExpectedGenerated + @Generated public companion object { private val startCursorDefault: () -> String? = { throw IllegalStateException("Field `startCursor` was not requested") } @@ -62,8 +59,7 @@ public class PageInfo( { throw IllegalStateException("Field `hasPreviousPage` was not requested") } } - @AnnotationGenerated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) - @ExpectedGenerated + @Generated @JsonPOJOBuilder @JsonIgnoreProperties("__typename") public class Builder { diff --git a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithDeclaredScalars/expected/types/Query.kt b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithDeclaredScalars/expected/types/Query.kt index c8cd6e909..1000c951d 100644 --- a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithDeclaredScalars/expected/types/Query.kt +++ b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithDeclaredScalars/expected/types/Query.kt @@ -5,14 +5,12 @@ import com.fasterxml.jackson.`annotation`.JsonProperty import com.fasterxml.jackson.`annotation`.JsonTypeInfo import com.fasterxml.jackson.databind.`annotation`.JsonDeserialize import com.fasterxml.jackson.databind.`annotation`.JsonPOJOBuilder +import com.netflix.graphql.dgs.codegen.cases.dataClassWithDeclaredScalars.expected.Generated import java.lang.IllegalStateException import kotlin.collections.List import kotlin.jvm.JvmName -import com.netflix.graphql.dgs.codegen.cases.dataClassWithDeclaredScalars.expected.Generated as ExpectedGenerated -import jakarta.`annotation`.Generated as AnnotationGenerated -@AnnotationGenerated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) -@ExpectedGenerated +@Generated @JsonTypeInfo(use = JsonTypeInfo.Id.NONE) @JsonDeserialize(builder = Query.Builder::class) public class Query( @@ -31,8 +29,7 @@ public class Query( public val entityConnection: EntityConnection? get() = __entityConnection.invoke() - @AnnotationGenerated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) - @ExpectedGenerated + @Generated public companion object { private val entityDefault: () -> List? = { throw IllegalStateException("Field `entity` was not requested") } @@ -41,8 +38,7 @@ public class Query( { throw IllegalStateException("Field `entityConnection` was not requested") } } - @AnnotationGenerated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) - @ExpectedGenerated + @Generated @JsonPOJOBuilder @JsonIgnoreProperties("__typename") public class Builder { diff --git a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithDeeplyNestedComplexField/expected/DgsClient.kt b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithDeeplyNestedComplexField/expected/DgsClient.kt index ba703ec32..fa8d5673b 100644 --- a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithDeeplyNestedComplexField/expected/DgsClient.kt +++ b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithDeeplyNestedComplexField/expected/DgsClient.kt @@ -6,7 +6,6 @@ import com.netflix.graphql.dgs.codegen.cases.dataClassWithDeeplyNestedComplexFie import graphql.language.OperationDefinition import kotlin.String -@jakarta.`annotation`.Generated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) @Generated public object DgsClient { public fun buildQuery(inputValueSerializer: InputValueSerializerInterface? = null, diff --git a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithDeeplyNestedComplexField/expected/DgsConstants.kt b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithDeeplyNestedComplexField/expected/DgsConstants.kt index 38d622b59..20d8bed87 100644 --- a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithDeeplyNestedComplexField/expected/DgsConstants.kt +++ b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithDeeplyNestedComplexField/expected/DgsConstants.kt @@ -2,12 +2,10 @@ package com.netflix.graphql.dgs.codegen.cases.dataClassWithDeeplyNestedComplexFi import kotlin.String -@jakarta.`annotation`.Generated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) @Generated public object DgsConstants { public const val QUERY_TYPE: String = "Query" - @jakarta.`annotation`.Generated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) @Generated public object QUERY { public const val TYPE_NAME: String = "Query" @@ -15,7 +13,6 @@ public object DgsConstants { public const val Cars: String = "cars" } - @jakarta.`annotation`.Generated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) @Generated public object CAR { public const val TYPE_NAME: String = "Car" @@ -27,7 +24,6 @@ public object DgsConstants { public const val Engine: String = "engine" } - @jakarta.`annotation`.Generated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) @Generated public object ENGINE { public const val TYPE_NAME: String = "Engine" @@ -41,7 +37,6 @@ public object DgsConstants { public const val Performance: String = "performance" } - @jakarta.`annotation`.Generated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) @Generated public object PERFORMANCE { public const val TYPE_NAME: String = "Performance" diff --git a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithDeeplyNestedComplexField/expected/client/CarProjection.kt b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithDeeplyNestedComplexField/expected/client/CarProjection.kt index d1071ddf6..0fdee45f4 100644 --- a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithDeeplyNestedComplexField/expected/client/CarProjection.kt +++ b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithDeeplyNestedComplexField/expected/client/CarProjection.kt @@ -2,12 +2,10 @@ package com.netflix.graphql.dgs.codegen.cases.dataClassWithDeeplyNestedComplexFi import com.netflix.graphql.dgs.client.codegen.InputValueSerializerInterface import com.netflix.graphql.dgs.codegen.GraphQLProjection +import com.netflix.graphql.dgs.codegen.cases.dataClassWithDeeplyNestedComplexField.expected.Generated import kotlin.String -import com.netflix.graphql.dgs.codegen.cases.dataClassWithDeeplyNestedComplexField.expected.Generated as ExpectedGenerated -import jakarta.`annotation`.Generated as AnnotationGenerated -@AnnotationGenerated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) -@ExpectedGenerated +@Generated public class CarProjection( inputValueSerializer: InputValueSerializerInterface? = null, ) : GraphQLProjection(inputValueSerializer) { diff --git a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithDeeplyNestedComplexField/expected/client/EngineProjection.kt b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithDeeplyNestedComplexField/expected/client/EngineProjection.kt index 3e07117d3..84918d021 100644 --- a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithDeeplyNestedComplexField/expected/client/EngineProjection.kt +++ b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithDeeplyNestedComplexField/expected/client/EngineProjection.kt @@ -2,12 +2,10 @@ package com.netflix.graphql.dgs.codegen.cases.dataClassWithDeeplyNestedComplexFi import com.netflix.graphql.dgs.client.codegen.InputValueSerializerInterface import com.netflix.graphql.dgs.codegen.GraphQLProjection +import com.netflix.graphql.dgs.codegen.cases.dataClassWithDeeplyNestedComplexField.expected.Generated import kotlin.String -import com.netflix.graphql.dgs.codegen.cases.dataClassWithDeeplyNestedComplexField.expected.Generated as ExpectedGenerated -import jakarta.`annotation`.Generated as AnnotationGenerated -@AnnotationGenerated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) -@ExpectedGenerated +@Generated public class EngineProjection( inputValueSerializer: InputValueSerializerInterface? = null, ) : GraphQLProjection(inputValueSerializer) { diff --git a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithDeeplyNestedComplexField/expected/client/PerformanceProjection.kt b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithDeeplyNestedComplexField/expected/client/PerformanceProjection.kt index 4ea646546..391ba526f 100644 --- a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithDeeplyNestedComplexField/expected/client/PerformanceProjection.kt +++ b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithDeeplyNestedComplexField/expected/client/PerformanceProjection.kt @@ -2,11 +2,9 @@ package com.netflix.graphql.dgs.codegen.cases.dataClassWithDeeplyNestedComplexFi import com.netflix.graphql.dgs.client.codegen.InputValueSerializerInterface import com.netflix.graphql.dgs.codegen.GraphQLProjection -import com.netflix.graphql.dgs.codegen.cases.dataClassWithDeeplyNestedComplexField.expected.Generated as ExpectedGenerated -import jakarta.`annotation`.Generated as AnnotationGenerated +import com.netflix.graphql.dgs.codegen.cases.dataClassWithDeeplyNestedComplexField.expected.Generated -@AnnotationGenerated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) -@ExpectedGenerated +@Generated public class PerformanceProjection( inputValueSerializer: InputValueSerializerInterface? = null, ) : GraphQLProjection(inputValueSerializer) { diff --git a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithDeeplyNestedComplexField/expected/client/QueryProjection.kt b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithDeeplyNestedComplexField/expected/client/QueryProjection.kt index cca278728..a193a3319 100644 --- a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithDeeplyNestedComplexField/expected/client/QueryProjection.kt +++ b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithDeeplyNestedComplexField/expected/client/QueryProjection.kt @@ -2,12 +2,10 @@ package com.netflix.graphql.dgs.codegen.cases.dataClassWithDeeplyNestedComplexFi import com.netflix.graphql.dgs.client.codegen.InputValueSerializerInterface import com.netflix.graphql.dgs.codegen.GraphQLProjection +import com.netflix.graphql.dgs.codegen.cases.dataClassWithDeeplyNestedComplexField.expected.Generated import kotlin.String -import com.netflix.graphql.dgs.codegen.cases.dataClassWithDeeplyNestedComplexField.expected.Generated as ExpectedGenerated -import jakarta.`annotation`.Generated as AnnotationGenerated -@AnnotationGenerated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) -@ExpectedGenerated +@Generated public class QueryProjection( inputValueSerializer: InputValueSerializerInterface? = null, ) : GraphQLProjection(inputValueSerializer) { diff --git a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithDeeplyNestedComplexField/expected/types/Car.kt b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithDeeplyNestedComplexField/expected/types/Car.kt index 0f3f9c6d6..d0553d906 100644 --- a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithDeeplyNestedComplexField/expected/types/Car.kt +++ b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithDeeplyNestedComplexField/expected/types/Car.kt @@ -5,14 +5,12 @@ import com.fasterxml.jackson.`annotation`.JsonProperty import com.fasterxml.jackson.`annotation`.JsonTypeInfo import com.fasterxml.jackson.databind.`annotation`.JsonDeserialize import com.fasterxml.jackson.databind.`annotation`.JsonPOJOBuilder +import com.netflix.graphql.dgs.codegen.cases.dataClassWithDeeplyNestedComplexField.expected.Generated import java.lang.IllegalStateException import kotlin.String import kotlin.jvm.JvmName -import com.netflix.graphql.dgs.codegen.cases.dataClassWithDeeplyNestedComplexField.expected.Generated as ExpectedGenerated -import jakarta.`annotation`.Generated as AnnotationGenerated -@AnnotationGenerated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) -@ExpectedGenerated +@Generated @JsonTypeInfo(use = JsonTypeInfo.Id.NONE) @JsonDeserialize(builder = Car.Builder::class) public class Car( @@ -38,8 +36,7 @@ public class Car( public val engine: Engine? get() = __engine.invoke() - @AnnotationGenerated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) - @ExpectedGenerated + @Generated public companion object { private val makeDefault: () -> String? = { throw IllegalStateException("Field `make` was not requested") } @@ -51,8 +48,7 @@ public class Car( { throw IllegalStateException("Field `engine` was not requested") } } - @AnnotationGenerated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) - @ExpectedGenerated + @Generated @JsonPOJOBuilder @JsonIgnoreProperties("__typename") public class Builder { diff --git a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithDeeplyNestedComplexField/expected/types/Engine.kt b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithDeeplyNestedComplexField/expected/types/Engine.kt index 56bb9a24a..dd50e0fb9 100644 --- a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithDeeplyNestedComplexField/expected/types/Engine.kt +++ b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithDeeplyNestedComplexField/expected/types/Engine.kt @@ -5,16 +5,14 @@ import com.fasterxml.jackson.`annotation`.JsonProperty import com.fasterxml.jackson.`annotation`.JsonTypeInfo import com.fasterxml.jackson.databind.`annotation`.JsonDeserialize import com.fasterxml.jackson.databind.`annotation`.JsonPOJOBuilder +import com.netflix.graphql.dgs.codegen.cases.dataClassWithDeeplyNestedComplexField.expected.Generated import java.lang.IllegalStateException import kotlin.Double import kotlin.Int import kotlin.String import kotlin.jvm.JvmName -import com.netflix.graphql.dgs.codegen.cases.dataClassWithDeeplyNestedComplexField.expected.Generated as ExpectedGenerated -import jakarta.`annotation`.Generated as AnnotationGenerated -@AnnotationGenerated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) -@ExpectedGenerated +@Generated @JsonTypeInfo(use = JsonTypeInfo.Id.NONE) @JsonDeserialize(builder = Engine.Builder::class) public class Engine( @@ -47,8 +45,7 @@ public class Engine( public val performance: Performance? get() = __performance.invoke() - @AnnotationGenerated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) - @ExpectedGenerated + @Generated public companion object { private val typeDefault: () -> String? = { throw IllegalStateException("Field `type` was not requested") } @@ -63,8 +60,7 @@ public class Engine( { throw IllegalStateException("Field `performance` was not requested") } } - @AnnotationGenerated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) - @ExpectedGenerated + @Generated @JsonPOJOBuilder @JsonIgnoreProperties("__typename") public class Builder { diff --git a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithDeeplyNestedComplexField/expected/types/Performance.kt b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithDeeplyNestedComplexField/expected/types/Performance.kt index 3084c39c2..c3dafbb53 100644 --- a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithDeeplyNestedComplexField/expected/types/Performance.kt +++ b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithDeeplyNestedComplexField/expected/types/Performance.kt @@ -5,14 +5,12 @@ import com.fasterxml.jackson.`annotation`.JsonProperty import com.fasterxml.jackson.`annotation`.JsonTypeInfo import com.fasterxml.jackson.databind.`annotation`.JsonDeserialize import com.fasterxml.jackson.databind.`annotation`.JsonPOJOBuilder +import com.netflix.graphql.dgs.codegen.cases.dataClassWithDeeplyNestedComplexField.expected.Generated import java.lang.IllegalStateException import kotlin.Double import kotlin.jvm.JvmName -import com.netflix.graphql.dgs.codegen.cases.dataClassWithDeeplyNestedComplexField.expected.Generated as ExpectedGenerated -import jakarta.`annotation`.Generated as AnnotationGenerated -@AnnotationGenerated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) -@ExpectedGenerated +@Generated @JsonTypeInfo(use = JsonTypeInfo.Id.NONE) @JsonDeserialize(builder = Performance.Builder::class) public class Performance( @@ -31,8 +29,7 @@ public class Performance( public val quarterMile: Double? get() = __quarterMile.invoke() - @AnnotationGenerated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) - @ExpectedGenerated + @Generated public companion object { private val zeroToSixtyDefault: () -> Double? = { throw IllegalStateException("Field `zeroToSixty` was not requested") } @@ -41,8 +38,7 @@ public class Performance( { throw IllegalStateException("Field `quarterMile` was not requested") } } - @AnnotationGenerated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) - @ExpectedGenerated + @Generated @JsonPOJOBuilder @JsonIgnoreProperties("__typename") public class Builder { diff --git a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithDeeplyNestedComplexField/expected/types/Query.kt b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithDeeplyNestedComplexField/expected/types/Query.kt index 9c8a7d5d3..c49e48721 100644 --- a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithDeeplyNestedComplexField/expected/types/Query.kt +++ b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithDeeplyNestedComplexField/expected/types/Query.kt @@ -5,14 +5,12 @@ import com.fasterxml.jackson.`annotation`.JsonProperty import com.fasterxml.jackson.`annotation`.JsonTypeInfo import com.fasterxml.jackson.databind.`annotation`.JsonDeserialize import com.fasterxml.jackson.databind.`annotation`.JsonPOJOBuilder +import com.netflix.graphql.dgs.codegen.cases.dataClassWithDeeplyNestedComplexField.expected.Generated import java.lang.IllegalStateException import kotlin.collections.List import kotlin.jvm.JvmName -import com.netflix.graphql.dgs.codegen.cases.dataClassWithDeeplyNestedComplexField.expected.Generated as ExpectedGenerated -import jakarta.`annotation`.Generated as AnnotationGenerated -@AnnotationGenerated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) -@ExpectedGenerated +@Generated @JsonTypeInfo(use = JsonTypeInfo.Id.NONE) @JsonDeserialize(builder = Query.Builder::class) public class Query( @@ -24,15 +22,13 @@ public class Query( public val cars: List? get() = __cars.invoke() - @AnnotationGenerated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) - @ExpectedGenerated + @Generated public companion object { private val carsDefault: () -> List? = { throw IllegalStateException("Field `cars` was not requested") } } - @AnnotationGenerated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) - @ExpectedGenerated + @Generated @JsonPOJOBuilder @JsonIgnoreProperties("__typename") public class Builder { diff --git a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithExtendedInterface/expected/DgsClient.kt b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithExtendedInterface/expected/DgsClient.kt index b564d6db7..a0641d5d7 100644 --- a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithExtendedInterface/expected/DgsClient.kt +++ b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithExtendedInterface/expected/DgsClient.kt @@ -6,7 +6,6 @@ import com.netflix.graphql.dgs.codegen.cases.dataClassWithExtendedInterface.expe import graphql.language.OperationDefinition import kotlin.String -@jakarta.`annotation`.Generated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) @Generated public object DgsClient { public fun buildQuery(inputValueSerializer: InputValueSerializerInterface? = null, diff --git a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithExtendedInterface/expected/DgsConstants.kt b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithExtendedInterface/expected/DgsConstants.kt index 1acd572af..b4111bc58 100644 --- a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithExtendedInterface/expected/DgsConstants.kt +++ b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithExtendedInterface/expected/DgsConstants.kt @@ -2,12 +2,10 @@ package com.netflix.graphql.dgs.codegen.cases.dataClassWithExtendedInterface.exp import kotlin.String -@jakarta.`annotation`.Generated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) @Generated public object DgsConstants { public const val QUERY_TYPE: String = "Query" - @jakarta.`annotation`.Generated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) @Generated public object QUERY { public const val TYPE_NAME: String = "Query" @@ -15,7 +13,6 @@ public object DgsConstants { public const val People: String = "people" } - @jakarta.`annotation`.Generated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) @Generated public object PERSON { public const val TYPE_NAME: String = "Person" diff --git a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithExtendedInterface/expected/client/PersonProjection.kt b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithExtendedInterface/expected/client/PersonProjection.kt index d6256e321..e32a85897 100644 --- a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithExtendedInterface/expected/client/PersonProjection.kt +++ b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithExtendedInterface/expected/client/PersonProjection.kt @@ -2,11 +2,9 @@ package com.netflix.graphql.dgs.codegen.cases.dataClassWithExtendedInterface.exp import com.netflix.graphql.dgs.client.codegen.InputValueSerializerInterface import com.netflix.graphql.dgs.codegen.GraphQLProjection -import com.netflix.graphql.dgs.codegen.cases.dataClassWithExtendedInterface.expected.Generated as ExpectedGenerated -import jakarta.`annotation`.Generated as AnnotationGenerated +import com.netflix.graphql.dgs.codegen.cases.dataClassWithExtendedInterface.expected.Generated -@AnnotationGenerated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) -@ExpectedGenerated +@Generated public class PersonProjection( inputValueSerializer: InputValueSerializerInterface? = null, ) : GraphQLProjection(inputValueSerializer) { diff --git a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithExtendedInterface/expected/client/QueryProjection.kt b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithExtendedInterface/expected/client/QueryProjection.kt index 46089afe0..ee9d32d11 100644 --- a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithExtendedInterface/expected/client/QueryProjection.kt +++ b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithExtendedInterface/expected/client/QueryProjection.kt @@ -2,12 +2,10 @@ package com.netflix.graphql.dgs.codegen.cases.dataClassWithExtendedInterface.exp import com.netflix.graphql.dgs.client.codegen.InputValueSerializerInterface import com.netflix.graphql.dgs.codegen.GraphQLProjection +import com.netflix.graphql.dgs.codegen.cases.dataClassWithExtendedInterface.expected.Generated import kotlin.String -import com.netflix.graphql.dgs.codegen.cases.dataClassWithExtendedInterface.expected.Generated as ExpectedGenerated -import jakarta.`annotation`.Generated as AnnotationGenerated -@AnnotationGenerated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) -@ExpectedGenerated +@Generated public class QueryProjection( inputValueSerializer: InputValueSerializerInterface? = null, ) : GraphQLProjection(inputValueSerializer) { diff --git a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithExtendedInterface/expected/types/Person.kt b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithExtendedInterface/expected/types/Person.kt index a832b5968..1f6d3682a 100644 --- a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithExtendedInterface/expected/types/Person.kt +++ b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithExtendedInterface/expected/types/Person.kt @@ -1,15 +1,13 @@ package com.netflix.graphql.dgs.codegen.cases.dataClassWithExtendedInterface.expected.types import com.fasterxml.jackson.`annotation`.JsonTypeInfo +import com.netflix.graphql.dgs.codegen.cases.dataClassWithExtendedInterface.expected.Generated import kotlin.Int import kotlin.String import kotlin.Suppress import kotlin.jvm.JvmName -import com.netflix.graphql.dgs.codegen.cases.dataClassWithExtendedInterface.expected.Generated as ExpectedGenerated -import jakarta.`annotation`.Generated as AnnotationGenerated -@AnnotationGenerated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) -@ExpectedGenerated +@Generated @JsonTypeInfo( use = JsonTypeInfo.Id.NAME, include = JsonTypeInfo.As.PROPERTY, diff --git a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithExtendedInterface/expected/types/Query.kt b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithExtendedInterface/expected/types/Query.kt index 0135abb26..77fc6a94c 100644 --- a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithExtendedInterface/expected/types/Query.kt +++ b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithExtendedInterface/expected/types/Query.kt @@ -5,14 +5,12 @@ import com.fasterxml.jackson.`annotation`.JsonProperty import com.fasterxml.jackson.`annotation`.JsonTypeInfo import com.fasterxml.jackson.databind.`annotation`.JsonDeserialize import com.fasterxml.jackson.databind.`annotation`.JsonPOJOBuilder +import com.netflix.graphql.dgs.codegen.cases.dataClassWithExtendedInterface.expected.Generated import java.lang.IllegalStateException import kotlin.collections.List import kotlin.jvm.JvmName -import com.netflix.graphql.dgs.codegen.cases.dataClassWithExtendedInterface.expected.Generated as ExpectedGenerated -import jakarta.`annotation`.Generated as AnnotationGenerated -@AnnotationGenerated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) -@ExpectedGenerated +@Generated @JsonTypeInfo(use = JsonTypeInfo.Id.NONE) @JsonDeserialize(builder = Query.Builder::class) public class Query( @@ -24,15 +22,13 @@ public class Query( public val people: List? get() = __people.invoke() - @AnnotationGenerated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) - @ExpectedGenerated + @Generated public companion object { private val peopleDefault: () -> List? = { throw IllegalStateException("Field `people` was not requested") } } - @AnnotationGenerated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) - @ExpectedGenerated + @Generated @JsonPOJOBuilder @JsonIgnoreProperties("__typename") public class Builder { diff --git a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithExtendedInterfaceInheritance/expected/DgsClient.kt b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithExtendedInterfaceInheritance/expected/DgsClient.kt index dbfe8672e..99fe5d16e 100644 --- a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithExtendedInterfaceInheritance/expected/DgsClient.kt +++ b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithExtendedInterfaceInheritance/expected/DgsClient.kt @@ -6,7 +6,6 @@ import com.netflix.graphql.dgs.codegen.cases.dataClassWithExtendedInterfaceInher import graphql.language.OperationDefinition import kotlin.String -@jakarta.`annotation`.Generated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) @Generated public object DgsClient { public fun buildQuery(inputValueSerializer: InputValueSerializerInterface? = null, diff --git a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithExtendedInterfaceInheritance/expected/DgsConstants.kt b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithExtendedInterfaceInheritance/expected/DgsConstants.kt index ec715ee26..af25e0d95 100644 --- a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithExtendedInterfaceInheritance/expected/DgsConstants.kt +++ b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithExtendedInterfaceInheritance/expected/DgsConstants.kt @@ -2,12 +2,10 @@ package com.netflix.graphql.dgs.codegen.cases.dataClassWithExtendedInterfaceInhe import kotlin.String -@jakarta.`annotation`.Generated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) @Generated public object DgsConstants { public const val QUERY_TYPE: String = "Query" - @jakarta.`annotation`.Generated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) @Generated public object QUERY { public const val TYPE_NAME: String = "Query" @@ -15,7 +13,6 @@ public object DgsConstants { public const val People: String = "people" } - @jakarta.`annotation`.Generated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) @Generated public object EMPLOYEE { public const val TYPE_NAME: String = "Employee" @@ -29,7 +26,6 @@ public object DgsConstants { public const val Age: String = "age" } - @jakarta.`annotation`.Generated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) @Generated public object PERSON { public const val TYPE_NAME: String = "Person" diff --git a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithExtendedInterfaceInheritance/expected/client/EmployeeProjection.kt b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithExtendedInterfaceInheritance/expected/client/EmployeeProjection.kt index 43bb4acdf..0130d2a64 100644 --- a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithExtendedInterfaceInheritance/expected/client/EmployeeProjection.kt +++ b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithExtendedInterfaceInheritance/expected/client/EmployeeProjection.kt @@ -2,11 +2,9 @@ package com.netflix.graphql.dgs.codegen.cases.dataClassWithExtendedInterfaceInhe import com.netflix.graphql.dgs.client.codegen.InputValueSerializerInterface import com.netflix.graphql.dgs.codegen.GraphQLProjection -import com.netflix.graphql.dgs.codegen.cases.dataClassWithExtendedInterfaceInheritance.expected.Generated as ExpectedGenerated -import jakarta.`annotation`.Generated as AnnotationGenerated +import com.netflix.graphql.dgs.codegen.cases.dataClassWithExtendedInterfaceInheritance.expected.Generated -@AnnotationGenerated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) -@ExpectedGenerated +@Generated public class EmployeeProjection( inputValueSerializer: InputValueSerializerInterface? = null, ) : GraphQLProjection(inputValueSerializer) { diff --git a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithExtendedInterfaceInheritance/expected/client/PersonProjection.kt b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithExtendedInterfaceInheritance/expected/client/PersonProjection.kt index 91cc61ca8..494d89c8d 100644 --- a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithExtendedInterfaceInheritance/expected/client/PersonProjection.kt +++ b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithExtendedInterfaceInheritance/expected/client/PersonProjection.kt @@ -2,11 +2,9 @@ package com.netflix.graphql.dgs.codegen.cases.dataClassWithExtendedInterfaceInhe import com.netflix.graphql.dgs.client.codegen.InputValueSerializerInterface import com.netflix.graphql.dgs.codegen.GraphQLProjection -import com.netflix.graphql.dgs.codegen.cases.dataClassWithExtendedInterfaceInheritance.expected.Generated as ExpectedGenerated -import jakarta.`annotation`.Generated as AnnotationGenerated +import com.netflix.graphql.dgs.codegen.cases.dataClassWithExtendedInterfaceInheritance.expected.Generated -@AnnotationGenerated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) -@ExpectedGenerated +@Generated public class PersonProjection( inputValueSerializer: InputValueSerializerInterface? = null, ) : GraphQLProjection(inputValueSerializer) { diff --git a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithExtendedInterfaceInheritance/expected/client/QueryProjection.kt b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithExtendedInterfaceInheritance/expected/client/QueryProjection.kt index f0506cc62..93cd35ddb 100644 --- a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithExtendedInterfaceInheritance/expected/client/QueryProjection.kt +++ b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithExtendedInterfaceInheritance/expected/client/QueryProjection.kt @@ -2,12 +2,10 @@ package com.netflix.graphql.dgs.codegen.cases.dataClassWithExtendedInterfaceInhe import com.netflix.graphql.dgs.client.codegen.InputValueSerializerInterface import com.netflix.graphql.dgs.codegen.GraphQLProjection +import com.netflix.graphql.dgs.codegen.cases.dataClassWithExtendedInterfaceInheritance.expected.Generated import kotlin.String -import com.netflix.graphql.dgs.codegen.cases.dataClassWithExtendedInterfaceInheritance.expected.Generated as ExpectedGenerated -import jakarta.`annotation`.Generated as AnnotationGenerated -@AnnotationGenerated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) -@ExpectedGenerated +@Generated public class QueryProjection( inputValueSerializer: InputValueSerializerInterface? = null, ) : GraphQLProjection(inputValueSerializer) { diff --git a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithExtendedInterfaceInheritance/expected/types/Employee.kt b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithExtendedInterfaceInheritance/expected/types/Employee.kt index bd57b0465..93fb8b816 100644 --- a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithExtendedInterfaceInheritance/expected/types/Employee.kt +++ b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithExtendedInterfaceInheritance/expected/types/Employee.kt @@ -5,16 +5,14 @@ import com.fasterxml.jackson.`annotation`.JsonProperty import com.fasterxml.jackson.`annotation`.JsonTypeInfo import com.fasterxml.jackson.databind.`annotation`.JsonDeserialize import com.fasterxml.jackson.databind.`annotation`.JsonPOJOBuilder +import com.netflix.graphql.dgs.codegen.cases.dataClassWithExtendedInterfaceInheritance.expected.Generated import java.lang.IllegalStateException import kotlin.Int import kotlin.String import kotlin.Suppress import kotlin.jvm.JvmName -import com.netflix.graphql.dgs.codegen.cases.dataClassWithExtendedInterfaceInheritance.expected.Generated as ExpectedGenerated -import jakarta.`annotation`.Generated as AnnotationGenerated -@AnnotationGenerated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) -@ExpectedGenerated +@Generated @JsonTypeInfo(use = JsonTypeInfo.Id.NONE) @JsonDeserialize(builder = Employee.Builder::class) public class Employee( @@ -50,8 +48,7 @@ public class Employee( override val age: Int get() = __age.invoke() - @AnnotationGenerated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) - @ExpectedGenerated + @Generated public companion object { private val firstnameDefault: () -> String = { throw IllegalStateException("Field `firstname` was not requested") } @@ -66,8 +63,7 @@ public class Employee( { throw IllegalStateException("Field `age` was not requested") } } - @AnnotationGenerated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) - @ExpectedGenerated + @Generated @JsonPOJOBuilder @JsonIgnoreProperties("__typename") public class Builder { diff --git a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithExtendedInterfaceInheritance/expected/types/Person.kt b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithExtendedInterfaceInheritance/expected/types/Person.kt index 935c71c4d..93cd40695 100644 --- a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithExtendedInterfaceInheritance/expected/types/Person.kt +++ b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithExtendedInterfaceInheritance/expected/types/Person.kt @@ -2,15 +2,13 @@ package com.netflix.graphql.dgs.codegen.cases.dataClassWithExtendedInterfaceInhe import com.fasterxml.jackson.`annotation`.JsonSubTypes import com.fasterxml.jackson.`annotation`.JsonTypeInfo +import com.netflix.graphql.dgs.codegen.cases.dataClassWithExtendedInterfaceInheritance.expected.Generated import kotlin.Int import kotlin.String import kotlin.Suppress import kotlin.jvm.JvmName -import com.netflix.graphql.dgs.codegen.cases.dataClassWithExtendedInterfaceInheritance.expected.Generated as ExpectedGenerated -import jakarta.`annotation`.Generated as AnnotationGenerated -@AnnotationGenerated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) -@ExpectedGenerated +@Generated @JsonTypeInfo( use = JsonTypeInfo.Id.NAME, include = JsonTypeInfo.As.PROPERTY, diff --git a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithExtendedInterfaceInheritance/expected/types/Query.kt b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithExtendedInterfaceInheritance/expected/types/Query.kt index c9f653da0..9d23111bc 100644 --- a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithExtendedInterfaceInheritance/expected/types/Query.kt +++ b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithExtendedInterfaceInheritance/expected/types/Query.kt @@ -5,14 +5,12 @@ import com.fasterxml.jackson.`annotation`.JsonProperty import com.fasterxml.jackson.`annotation`.JsonTypeInfo import com.fasterxml.jackson.databind.`annotation`.JsonDeserialize import com.fasterxml.jackson.databind.`annotation`.JsonPOJOBuilder +import com.netflix.graphql.dgs.codegen.cases.dataClassWithExtendedInterfaceInheritance.expected.Generated import java.lang.IllegalStateException import kotlin.collections.List import kotlin.jvm.JvmName -import com.netflix.graphql.dgs.codegen.cases.dataClassWithExtendedInterfaceInheritance.expected.Generated as ExpectedGenerated -import jakarta.`annotation`.Generated as AnnotationGenerated -@AnnotationGenerated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) -@ExpectedGenerated +@Generated @JsonTypeInfo(use = JsonTypeInfo.Id.NONE) @JsonDeserialize(builder = Query.Builder::class) public class Query( @@ -24,15 +22,13 @@ public class Query( public val people: List? get() = __people.invoke() - @AnnotationGenerated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) - @ExpectedGenerated + @Generated public companion object { private val peopleDefault: () -> List? = { throw IllegalStateException("Field `people` was not requested") } } - @AnnotationGenerated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) - @ExpectedGenerated + @Generated @JsonPOJOBuilder @JsonIgnoreProperties("__typename") public class Builder { diff --git a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithInterface/expected/DgsClient.kt b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithInterface/expected/DgsClient.kt index 61d178051..29405cd33 100644 --- a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithInterface/expected/DgsClient.kt +++ b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithInterface/expected/DgsClient.kt @@ -6,7 +6,6 @@ import com.netflix.graphql.dgs.codegen.cases.dataClassWithInterface.expected.cli import graphql.language.OperationDefinition import kotlin.String -@jakarta.`annotation`.Generated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) @Generated public object DgsClient { public fun buildQuery(inputValueSerializer: InputValueSerializerInterface? = null, diff --git a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithInterface/expected/DgsConstants.kt b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithInterface/expected/DgsConstants.kt index 134305172..4ac2d056b 100644 --- a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithInterface/expected/DgsConstants.kt +++ b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithInterface/expected/DgsConstants.kt @@ -2,12 +2,10 @@ package com.netflix.graphql.dgs.codegen.cases.dataClassWithInterface.expected import kotlin.String -@jakarta.`annotation`.Generated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) @Generated public object DgsConstants { public const val QUERY_TYPE: String = "Query" - @jakarta.`annotation`.Generated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) @Generated public object QUERY { public const val TYPE_NAME: String = "Query" @@ -15,7 +13,6 @@ public object DgsConstants { public const val People: String = "people" } - @jakarta.`annotation`.Generated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) @Generated public object EMPLOYEE { public const val TYPE_NAME: String = "Employee" @@ -27,7 +24,6 @@ public object DgsConstants { public const val Company: String = "company" } - @jakarta.`annotation`.Generated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) @Generated public object PERSON { public const val TYPE_NAME: String = "Person" diff --git a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithInterface/expected/client/EmployeeProjection.kt b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithInterface/expected/client/EmployeeProjection.kt index be3c9b56b..ee6f1e67d 100644 --- a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithInterface/expected/client/EmployeeProjection.kt +++ b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithInterface/expected/client/EmployeeProjection.kt @@ -2,11 +2,9 @@ package com.netflix.graphql.dgs.codegen.cases.dataClassWithInterface.expected.cl import com.netflix.graphql.dgs.client.codegen.InputValueSerializerInterface import com.netflix.graphql.dgs.codegen.GraphQLProjection -import com.netflix.graphql.dgs.codegen.cases.dataClassWithInterface.expected.Generated as ExpectedGenerated -import jakarta.`annotation`.Generated as AnnotationGenerated +import com.netflix.graphql.dgs.codegen.cases.dataClassWithInterface.expected.Generated -@AnnotationGenerated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) -@ExpectedGenerated +@Generated public class EmployeeProjection( inputValueSerializer: InputValueSerializerInterface? = null, ) : GraphQLProjection(inputValueSerializer) { diff --git a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithInterface/expected/client/PersonProjection.kt b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithInterface/expected/client/PersonProjection.kt index f69eae149..833837ccb 100644 --- a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithInterface/expected/client/PersonProjection.kt +++ b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithInterface/expected/client/PersonProjection.kt @@ -2,11 +2,9 @@ package com.netflix.graphql.dgs.codegen.cases.dataClassWithInterface.expected.cl import com.netflix.graphql.dgs.client.codegen.InputValueSerializerInterface import com.netflix.graphql.dgs.codegen.GraphQLProjection -import com.netflix.graphql.dgs.codegen.cases.dataClassWithInterface.expected.Generated as ExpectedGenerated -import jakarta.`annotation`.Generated as AnnotationGenerated +import com.netflix.graphql.dgs.codegen.cases.dataClassWithInterface.expected.Generated -@AnnotationGenerated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) -@ExpectedGenerated +@Generated public class PersonProjection( inputValueSerializer: InputValueSerializerInterface? = null, ) : GraphQLProjection(inputValueSerializer) { diff --git a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithInterface/expected/client/QueryProjection.kt b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithInterface/expected/client/QueryProjection.kt index b3e7f4cd3..1866e0cd2 100644 --- a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithInterface/expected/client/QueryProjection.kt +++ b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithInterface/expected/client/QueryProjection.kt @@ -2,12 +2,10 @@ package com.netflix.graphql.dgs.codegen.cases.dataClassWithInterface.expected.cl import com.netflix.graphql.dgs.client.codegen.InputValueSerializerInterface import com.netflix.graphql.dgs.codegen.GraphQLProjection +import com.netflix.graphql.dgs.codegen.cases.dataClassWithInterface.expected.Generated import kotlin.String -import com.netflix.graphql.dgs.codegen.cases.dataClassWithInterface.expected.Generated as ExpectedGenerated -import jakarta.`annotation`.Generated as AnnotationGenerated -@AnnotationGenerated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) -@ExpectedGenerated +@Generated public class QueryProjection( inputValueSerializer: InputValueSerializerInterface? = null, ) : GraphQLProjection(inputValueSerializer) { diff --git a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithInterface/expected/types/Employee.kt b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithInterface/expected/types/Employee.kt index 79db2abbb..0319fb56f 100644 --- a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithInterface/expected/types/Employee.kt +++ b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithInterface/expected/types/Employee.kt @@ -5,15 +5,13 @@ import com.fasterxml.jackson.`annotation`.JsonProperty import com.fasterxml.jackson.`annotation`.JsonTypeInfo import com.fasterxml.jackson.databind.`annotation`.JsonDeserialize import com.fasterxml.jackson.databind.`annotation`.JsonPOJOBuilder +import com.netflix.graphql.dgs.codegen.cases.dataClassWithInterface.expected.Generated import java.lang.IllegalStateException import kotlin.String import kotlin.Suppress import kotlin.jvm.JvmName -import com.netflix.graphql.dgs.codegen.cases.dataClassWithInterface.expected.Generated as ExpectedGenerated -import jakarta.`annotation`.Generated as AnnotationGenerated -@AnnotationGenerated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) -@ExpectedGenerated +@Generated @JsonTypeInfo(use = JsonTypeInfo.Id.NONE) @JsonDeserialize(builder = Employee.Builder::class) public class Employee( @@ -41,8 +39,7 @@ public class Employee( public val company: String? get() = __company.invoke() - @AnnotationGenerated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) - @ExpectedGenerated + @Generated public companion object { private val firstnameDefault: () -> String? = { throw IllegalStateException("Field `firstname` was not requested") } @@ -54,8 +51,7 @@ public class Employee( { throw IllegalStateException("Field `company` was not requested") } } - @AnnotationGenerated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) - @ExpectedGenerated + @Generated @JsonPOJOBuilder @JsonIgnoreProperties("__typename") public class Builder { diff --git a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithInterface/expected/types/Person.kt b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithInterface/expected/types/Person.kt index 4d50400ec..d00f454d2 100644 --- a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithInterface/expected/types/Person.kt +++ b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithInterface/expected/types/Person.kt @@ -2,14 +2,12 @@ package com.netflix.graphql.dgs.codegen.cases.dataClassWithInterface.expected.ty import com.fasterxml.jackson.`annotation`.JsonSubTypes import com.fasterxml.jackson.`annotation`.JsonTypeInfo +import com.netflix.graphql.dgs.codegen.cases.dataClassWithInterface.expected.Generated import kotlin.String import kotlin.Suppress import kotlin.jvm.JvmName -import com.netflix.graphql.dgs.codegen.cases.dataClassWithInterface.expected.Generated as ExpectedGenerated -import jakarta.`annotation`.Generated as AnnotationGenerated -@AnnotationGenerated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) -@ExpectedGenerated +@Generated @JsonTypeInfo( use = JsonTypeInfo.Id.NAME, include = JsonTypeInfo.As.PROPERTY, diff --git a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithInterface/expected/types/Query.kt b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithInterface/expected/types/Query.kt index 5b8a2b412..77c643782 100644 --- a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithInterface/expected/types/Query.kt +++ b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithInterface/expected/types/Query.kt @@ -5,14 +5,12 @@ import com.fasterxml.jackson.`annotation`.JsonProperty import com.fasterxml.jackson.`annotation`.JsonTypeInfo import com.fasterxml.jackson.databind.`annotation`.JsonDeserialize import com.fasterxml.jackson.databind.`annotation`.JsonPOJOBuilder +import com.netflix.graphql.dgs.codegen.cases.dataClassWithInterface.expected.Generated import java.lang.IllegalStateException import kotlin.collections.List import kotlin.jvm.JvmName -import com.netflix.graphql.dgs.codegen.cases.dataClassWithInterface.expected.Generated as ExpectedGenerated -import jakarta.`annotation`.Generated as AnnotationGenerated -@AnnotationGenerated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) -@ExpectedGenerated +@Generated @JsonTypeInfo(use = JsonTypeInfo.Id.NONE) @JsonDeserialize(builder = Query.Builder::class) public class Query( @@ -24,15 +22,13 @@ public class Query( public val people: List? get() = __people.invoke() - @AnnotationGenerated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) - @ExpectedGenerated + @Generated public companion object { private val peopleDefault: () -> List? = { throw IllegalStateException("Field `people` was not requested") } } - @AnnotationGenerated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) - @ExpectedGenerated + @Generated @JsonPOJOBuilder @JsonIgnoreProperties("__typename") public class Builder { diff --git a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithInterfaceInheritance/expected/DgsClient.kt b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithInterfaceInheritance/expected/DgsClient.kt index 888911e04..1d1096f38 100644 --- a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithInterfaceInheritance/expected/DgsClient.kt +++ b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithInterfaceInheritance/expected/DgsClient.kt @@ -6,7 +6,6 @@ import com.netflix.graphql.dgs.codegen.cases.dataClassWithInterfaceInheritance.e import graphql.language.OperationDefinition import kotlin.String -@jakarta.`annotation`.Generated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) @Generated public object DgsClient { public fun buildQuery(inputValueSerializer: InputValueSerializerInterface? = null, diff --git a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithInterfaceInheritance/expected/DgsConstants.kt b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithInterfaceInheritance/expected/DgsConstants.kt index 65a6af4fa..4a6553e66 100644 --- a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithInterfaceInheritance/expected/DgsConstants.kt +++ b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithInterfaceInheritance/expected/DgsConstants.kt @@ -2,12 +2,10 @@ package com.netflix.graphql.dgs.codegen.cases.dataClassWithInterfaceInheritance. import kotlin.String -@jakarta.`annotation`.Generated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) @Generated public object DgsConstants { public const val QUERY_TYPE: String = "Query" - @jakarta.`annotation`.Generated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) @Generated public object QUERY { public const val TYPE_NAME: String = "Query" @@ -15,7 +13,6 @@ public object DgsConstants { public const val People: String = "people" } - @jakarta.`annotation`.Generated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) @Generated public object TALENT { public const val TYPE_NAME: String = "Talent" @@ -29,7 +26,6 @@ public object DgsConstants { public const val ImdbProfile: String = "imdbProfile" } - @jakarta.`annotation`.Generated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) @Generated public object PERSON { public const val TYPE_NAME: String = "Person" @@ -39,7 +35,6 @@ public object DgsConstants { public const val Lastname: String = "lastname" } - @jakarta.`annotation`.Generated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) @Generated public object EMPLOYEE { public const val TYPE_NAME: String = "Employee" diff --git a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithInterfaceInheritance/expected/client/EmployeeProjection.kt b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithInterfaceInheritance/expected/client/EmployeeProjection.kt index 29796ca0f..6dc4d1872 100644 --- a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithInterfaceInheritance/expected/client/EmployeeProjection.kt +++ b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithInterfaceInheritance/expected/client/EmployeeProjection.kt @@ -2,11 +2,9 @@ package com.netflix.graphql.dgs.codegen.cases.dataClassWithInterfaceInheritance. import com.netflix.graphql.dgs.client.codegen.InputValueSerializerInterface import com.netflix.graphql.dgs.codegen.GraphQLProjection -import com.netflix.graphql.dgs.codegen.cases.dataClassWithInterfaceInheritance.expected.Generated as ExpectedGenerated -import jakarta.`annotation`.Generated as AnnotationGenerated +import com.netflix.graphql.dgs.codegen.cases.dataClassWithInterfaceInheritance.expected.Generated -@AnnotationGenerated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) -@ExpectedGenerated +@Generated public class EmployeeProjection( inputValueSerializer: InputValueSerializerInterface? = null, ) : GraphQLProjection(inputValueSerializer) { diff --git a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithInterfaceInheritance/expected/client/PersonProjection.kt b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithInterfaceInheritance/expected/client/PersonProjection.kt index cb38e6ea3..7aa6e3287 100644 --- a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithInterfaceInheritance/expected/client/PersonProjection.kt +++ b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithInterfaceInheritance/expected/client/PersonProjection.kt @@ -2,11 +2,9 @@ package com.netflix.graphql.dgs.codegen.cases.dataClassWithInterfaceInheritance. import com.netflix.graphql.dgs.client.codegen.InputValueSerializerInterface import com.netflix.graphql.dgs.codegen.GraphQLProjection -import com.netflix.graphql.dgs.codegen.cases.dataClassWithInterfaceInheritance.expected.Generated as ExpectedGenerated -import jakarta.`annotation`.Generated as AnnotationGenerated +import com.netflix.graphql.dgs.codegen.cases.dataClassWithInterfaceInheritance.expected.Generated -@AnnotationGenerated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) -@ExpectedGenerated +@Generated public class PersonProjection( inputValueSerializer: InputValueSerializerInterface? = null, ) : GraphQLProjection(inputValueSerializer) { diff --git a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithInterfaceInheritance/expected/client/QueryProjection.kt b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithInterfaceInheritance/expected/client/QueryProjection.kt index 6da121e70..2e1110ca6 100644 --- a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithInterfaceInheritance/expected/client/QueryProjection.kt +++ b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithInterfaceInheritance/expected/client/QueryProjection.kt @@ -2,12 +2,10 @@ package com.netflix.graphql.dgs.codegen.cases.dataClassWithInterfaceInheritance. import com.netflix.graphql.dgs.client.codegen.InputValueSerializerInterface import com.netflix.graphql.dgs.codegen.GraphQLProjection +import com.netflix.graphql.dgs.codegen.cases.dataClassWithInterfaceInheritance.expected.Generated import kotlin.String -import com.netflix.graphql.dgs.codegen.cases.dataClassWithInterfaceInheritance.expected.Generated as ExpectedGenerated -import jakarta.`annotation`.Generated as AnnotationGenerated -@AnnotationGenerated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) -@ExpectedGenerated +@Generated public class QueryProjection( inputValueSerializer: InputValueSerializerInterface? = null, ) : GraphQLProjection(inputValueSerializer) { diff --git a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithInterfaceInheritance/expected/client/TalentProjection.kt b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithInterfaceInheritance/expected/client/TalentProjection.kt index b34982840..4a90eea0f 100644 --- a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithInterfaceInheritance/expected/client/TalentProjection.kt +++ b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithInterfaceInheritance/expected/client/TalentProjection.kt @@ -2,11 +2,9 @@ package com.netflix.graphql.dgs.codegen.cases.dataClassWithInterfaceInheritance. import com.netflix.graphql.dgs.client.codegen.InputValueSerializerInterface import com.netflix.graphql.dgs.codegen.GraphQLProjection -import com.netflix.graphql.dgs.codegen.cases.dataClassWithInterfaceInheritance.expected.Generated as ExpectedGenerated -import jakarta.`annotation`.Generated as AnnotationGenerated +import com.netflix.graphql.dgs.codegen.cases.dataClassWithInterfaceInheritance.expected.Generated -@AnnotationGenerated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) -@ExpectedGenerated +@Generated public class TalentProjection( inputValueSerializer: InputValueSerializerInterface? = null, ) : GraphQLProjection(inputValueSerializer) { diff --git a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithInterfaceInheritance/expected/types/Employee.kt b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithInterfaceInheritance/expected/types/Employee.kt index 68791b165..0b4796e80 100644 --- a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithInterfaceInheritance/expected/types/Employee.kt +++ b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithInterfaceInheritance/expected/types/Employee.kt @@ -2,14 +2,12 @@ package com.netflix.graphql.dgs.codegen.cases.dataClassWithInterfaceInheritance. import com.fasterxml.jackson.`annotation`.JsonSubTypes import com.fasterxml.jackson.`annotation`.JsonTypeInfo +import com.netflix.graphql.dgs.codegen.cases.dataClassWithInterfaceInheritance.expected.Generated import kotlin.String import kotlin.Suppress import kotlin.jvm.JvmName -import com.netflix.graphql.dgs.codegen.cases.dataClassWithInterfaceInheritance.expected.Generated as ExpectedGenerated -import jakarta.`annotation`.Generated as AnnotationGenerated -@AnnotationGenerated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) -@ExpectedGenerated +@Generated @JsonTypeInfo( use = JsonTypeInfo.Id.NAME, include = JsonTypeInfo.As.PROPERTY, diff --git a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithInterfaceInheritance/expected/types/Person.kt b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithInterfaceInheritance/expected/types/Person.kt index 80c66db58..98d6a20cc 100644 --- a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithInterfaceInheritance/expected/types/Person.kt +++ b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithInterfaceInheritance/expected/types/Person.kt @@ -1,14 +1,12 @@ package com.netflix.graphql.dgs.codegen.cases.dataClassWithInterfaceInheritance.expected.types import com.fasterxml.jackson.`annotation`.JsonTypeInfo +import com.netflix.graphql.dgs.codegen.cases.dataClassWithInterfaceInheritance.expected.Generated import kotlin.String import kotlin.Suppress import kotlin.jvm.JvmName -import com.netflix.graphql.dgs.codegen.cases.dataClassWithInterfaceInheritance.expected.Generated as ExpectedGenerated -import jakarta.`annotation`.Generated as AnnotationGenerated -@AnnotationGenerated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) -@ExpectedGenerated +@Generated @JsonTypeInfo( use = JsonTypeInfo.Id.NAME, include = JsonTypeInfo.As.PROPERTY, diff --git a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithInterfaceInheritance/expected/types/Query.kt b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithInterfaceInheritance/expected/types/Query.kt index 104166885..1166dd79c 100644 --- a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithInterfaceInheritance/expected/types/Query.kt +++ b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithInterfaceInheritance/expected/types/Query.kt @@ -5,14 +5,12 @@ import com.fasterxml.jackson.`annotation`.JsonProperty import com.fasterxml.jackson.`annotation`.JsonTypeInfo import com.fasterxml.jackson.databind.`annotation`.JsonDeserialize import com.fasterxml.jackson.databind.`annotation`.JsonPOJOBuilder +import com.netflix.graphql.dgs.codegen.cases.dataClassWithInterfaceInheritance.expected.Generated import java.lang.IllegalStateException import kotlin.collections.List import kotlin.jvm.JvmName -import com.netflix.graphql.dgs.codegen.cases.dataClassWithInterfaceInheritance.expected.Generated as ExpectedGenerated -import jakarta.`annotation`.Generated as AnnotationGenerated -@AnnotationGenerated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) -@ExpectedGenerated +@Generated @JsonTypeInfo(use = JsonTypeInfo.Id.NONE) @JsonDeserialize(builder = Query.Builder::class) public class Query( @@ -24,15 +22,13 @@ public class Query( public val people: List? get() = __people.invoke() - @AnnotationGenerated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) - @ExpectedGenerated + @Generated public companion object { private val peopleDefault: () -> List? = { throw IllegalStateException("Field `people` was not requested") } } - @AnnotationGenerated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) - @ExpectedGenerated + @Generated @JsonPOJOBuilder @JsonIgnoreProperties("__typename") public class Builder { diff --git a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithInterfaceInheritance/expected/types/Talent.kt b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithInterfaceInheritance/expected/types/Talent.kt index 0e2d41da4..55f9487f1 100644 --- a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithInterfaceInheritance/expected/types/Talent.kt +++ b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithInterfaceInheritance/expected/types/Talent.kt @@ -5,15 +5,13 @@ import com.fasterxml.jackson.`annotation`.JsonProperty import com.fasterxml.jackson.`annotation`.JsonTypeInfo import com.fasterxml.jackson.databind.`annotation`.JsonDeserialize import com.fasterxml.jackson.databind.`annotation`.JsonPOJOBuilder +import com.netflix.graphql.dgs.codegen.cases.dataClassWithInterfaceInheritance.expected.Generated import java.lang.IllegalStateException import kotlin.String import kotlin.Suppress import kotlin.jvm.JvmName -import com.netflix.graphql.dgs.codegen.cases.dataClassWithInterfaceInheritance.expected.Generated as ExpectedGenerated -import jakarta.`annotation`.Generated as AnnotationGenerated -@AnnotationGenerated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) -@ExpectedGenerated +@Generated @JsonTypeInfo(use = JsonTypeInfo.Id.NONE) @JsonDeserialize(builder = Talent.Builder::class) public class Talent( @@ -49,8 +47,7 @@ public class Talent( public val imdbProfile: String? get() = __imdbProfile.invoke() - @AnnotationGenerated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) - @ExpectedGenerated + @Generated public companion object { private val firstnameDefault: () -> String = { throw IllegalStateException("Field `firstname` was not requested") } @@ -65,8 +62,7 @@ public class Talent( { throw IllegalStateException("Field `imdbProfile` was not requested") } } - @AnnotationGenerated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) - @ExpectedGenerated + @Generated @JsonPOJOBuilder @JsonIgnoreProperties("__typename") public class Builder { diff --git a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithListProperties/expected/DgsClient.kt b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithListProperties/expected/DgsClient.kt index 23d261a07..5d39af83e 100644 --- a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithListProperties/expected/DgsClient.kt +++ b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithListProperties/expected/DgsClient.kt @@ -6,7 +6,6 @@ import com.netflix.graphql.dgs.codegen.cases.dataClassWithListProperties.expecte import graphql.language.OperationDefinition import kotlin.String -@jakarta.`annotation`.Generated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) @Generated public object DgsClient { public fun buildQuery(inputValueSerializer: InputValueSerializerInterface? = null, diff --git a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithListProperties/expected/DgsConstants.kt b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithListProperties/expected/DgsConstants.kt index f742421ba..23fcc0b23 100644 --- a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithListProperties/expected/DgsConstants.kt +++ b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithListProperties/expected/DgsConstants.kt @@ -2,12 +2,10 @@ package com.netflix.graphql.dgs.codegen.cases.dataClassWithListProperties.expect import kotlin.String -@jakarta.`annotation`.Generated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) @Generated public object DgsConstants { public const val QUERY_TYPE: String = "Query" - @jakarta.`annotation`.Generated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) @Generated public object QUERY { public const val TYPE_NAME: String = "Query" @@ -15,7 +13,6 @@ public object DgsConstants { public const val People: String = "people" } - @jakarta.`annotation`.Generated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) @Generated public object PERSON { public const val TYPE_NAME: String = "Person" diff --git a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithListProperties/expected/client/PersonProjection.kt b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithListProperties/expected/client/PersonProjection.kt index 0fe300262..1b8e721ca 100644 --- a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithListProperties/expected/client/PersonProjection.kt +++ b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithListProperties/expected/client/PersonProjection.kt @@ -2,11 +2,9 @@ package com.netflix.graphql.dgs.codegen.cases.dataClassWithListProperties.expect import com.netflix.graphql.dgs.client.codegen.InputValueSerializerInterface import com.netflix.graphql.dgs.codegen.GraphQLProjection -import com.netflix.graphql.dgs.codegen.cases.dataClassWithListProperties.expected.Generated as ExpectedGenerated -import jakarta.`annotation`.Generated as AnnotationGenerated +import com.netflix.graphql.dgs.codegen.cases.dataClassWithListProperties.expected.Generated -@AnnotationGenerated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) -@ExpectedGenerated +@Generated public class PersonProjection( inputValueSerializer: InputValueSerializerInterface? = null, ) : GraphQLProjection(inputValueSerializer) { diff --git a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithListProperties/expected/client/QueryProjection.kt b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithListProperties/expected/client/QueryProjection.kt index ecae96309..beb13de51 100644 --- a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithListProperties/expected/client/QueryProjection.kt +++ b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithListProperties/expected/client/QueryProjection.kt @@ -2,12 +2,10 @@ package com.netflix.graphql.dgs.codegen.cases.dataClassWithListProperties.expect import com.netflix.graphql.dgs.client.codegen.InputValueSerializerInterface import com.netflix.graphql.dgs.codegen.GraphQLProjection +import com.netflix.graphql.dgs.codegen.cases.dataClassWithListProperties.expected.Generated import kotlin.String -import com.netflix.graphql.dgs.codegen.cases.dataClassWithListProperties.expected.Generated as ExpectedGenerated -import jakarta.`annotation`.Generated as AnnotationGenerated -@AnnotationGenerated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) -@ExpectedGenerated +@Generated public class QueryProjection( inputValueSerializer: InputValueSerializerInterface? = null, ) : GraphQLProjection(inputValueSerializer) { diff --git a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithListProperties/expected/types/Person.kt b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithListProperties/expected/types/Person.kt index 4add956e8..e2e3e6518 100644 --- a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithListProperties/expected/types/Person.kt +++ b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithListProperties/expected/types/Person.kt @@ -5,15 +5,13 @@ import com.fasterxml.jackson.`annotation`.JsonProperty import com.fasterxml.jackson.`annotation`.JsonTypeInfo import com.fasterxml.jackson.databind.`annotation`.JsonDeserialize import com.fasterxml.jackson.databind.`annotation`.JsonPOJOBuilder +import com.netflix.graphql.dgs.codegen.cases.dataClassWithListProperties.expected.Generated import java.lang.IllegalStateException import kotlin.String import kotlin.collections.List import kotlin.jvm.JvmName -import com.netflix.graphql.dgs.codegen.cases.dataClassWithListProperties.expected.Generated as ExpectedGenerated -import jakarta.`annotation`.Generated as AnnotationGenerated -@AnnotationGenerated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) -@ExpectedGenerated +@Generated @JsonTypeInfo(use = JsonTypeInfo.Id.NONE) @JsonDeserialize(builder = Person.Builder::class) public class Person( @@ -32,8 +30,7 @@ public class Person( public val email: List? get() = __email.invoke() - @AnnotationGenerated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) - @ExpectedGenerated + @Generated public companion object { private val nameDefault: () -> String? = { throw IllegalStateException("Field `name` was not requested") } @@ -42,8 +39,7 @@ public class Person( { throw IllegalStateException("Field `email` was not requested") } } - @AnnotationGenerated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) - @ExpectedGenerated + @Generated @JsonPOJOBuilder @JsonIgnoreProperties("__typename") public class Builder { diff --git a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithListProperties/expected/types/Query.kt b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithListProperties/expected/types/Query.kt index e29369d6a..1eec46af6 100644 --- a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithListProperties/expected/types/Query.kt +++ b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithListProperties/expected/types/Query.kt @@ -5,14 +5,12 @@ import com.fasterxml.jackson.`annotation`.JsonProperty import com.fasterxml.jackson.`annotation`.JsonTypeInfo import com.fasterxml.jackson.databind.`annotation`.JsonDeserialize import com.fasterxml.jackson.databind.`annotation`.JsonPOJOBuilder +import com.netflix.graphql.dgs.codegen.cases.dataClassWithListProperties.expected.Generated import java.lang.IllegalStateException import kotlin.collections.List import kotlin.jvm.JvmName -import com.netflix.graphql.dgs.codegen.cases.dataClassWithListProperties.expected.Generated as ExpectedGenerated -import jakarta.`annotation`.Generated as AnnotationGenerated -@AnnotationGenerated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) -@ExpectedGenerated +@Generated @JsonTypeInfo(use = JsonTypeInfo.Id.NONE) @JsonDeserialize(builder = Query.Builder::class) public class Query( @@ -24,15 +22,13 @@ public class Query( public val people: List? get() = __people.invoke() - @AnnotationGenerated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) - @ExpectedGenerated + @Generated public companion object { private val peopleDefault: () -> List? = { throw IllegalStateException("Field `people` was not requested") } } - @AnnotationGenerated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) - @ExpectedGenerated + @Generated @JsonPOJOBuilder @JsonIgnoreProperties("__typename") public class Builder { diff --git a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithMappedInterfaces/expected/DgsClient.kt b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithMappedInterfaces/expected/DgsClient.kt index 81a63df6c..088352aae 100644 --- a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithMappedInterfaces/expected/DgsClient.kt +++ b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithMappedInterfaces/expected/DgsClient.kt @@ -6,7 +6,6 @@ import com.netflix.graphql.dgs.codegen.cases.dataClassWithMappedInterfaces.expec import graphql.language.OperationDefinition import kotlin.String -@jakarta.`annotation`.Generated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) @Generated public object DgsClient { public fun buildQuery(inputValueSerializer: InputValueSerializerInterface? = null, diff --git a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithMappedInterfaces/expected/DgsConstants.kt b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithMappedInterfaces/expected/DgsConstants.kt index b363788bf..5bb7e3e97 100644 --- a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithMappedInterfaces/expected/DgsConstants.kt +++ b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithMappedInterfaces/expected/DgsConstants.kt @@ -2,12 +2,10 @@ package com.netflix.graphql.dgs.codegen.cases.dataClassWithMappedInterfaces.expe import kotlin.String -@jakarta.`annotation`.Generated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) @Generated public object DgsConstants { public const val QUERY_TYPE: String = "Query" - @jakarta.`annotation`.Generated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) @Generated public object QUERY { public const val TYPE_NAME: String = "Query" @@ -15,7 +13,6 @@ public object DgsConstants { public const val Products: String = "products" } - @jakarta.`annotation`.Generated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) @Generated public object PRODUCT { public const val TYPE_NAME: String = "Product" @@ -23,7 +20,6 @@ public object DgsConstants { public const val Id: String = "id" } - @jakarta.`annotation`.Generated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) @Generated public object NODE { public const val TYPE_NAME: String = "Node" @@ -31,7 +27,6 @@ public object DgsConstants { public const val Id: String = "id" } - @jakarta.`annotation`.Generated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) @Generated public object ENTITY { public const val TYPE_NAME: String = "Entity" diff --git a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithMappedInterfaces/expected/client/EntityProjection.kt b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithMappedInterfaces/expected/client/EntityProjection.kt index 6c06a67f7..c8bf4785c 100644 --- a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithMappedInterfaces/expected/client/EntityProjection.kt +++ b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithMappedInterfaces/expected/client/EntityProjection.kt @@ -2,11 +2,9 @@ package com.netflix.graphql.dgs.codegen.cases.dataClassWithMappedInterfaces.expe import com.netflix.graphql.dgs.client.codegen.InputValueSerializerInterface import com.netflix.graphql.dgs.codegen.GraphQLProjection -import com.netflix.graphql.dgs.codegen.cases.dataClassWithMappedInterfaces.expected.Generated as ExpectedGenerated -import jakarta.`annotation`.Generated as AnnotationGenerated +import com.netflix.graphql.dgs.codegen.cases.dataClassWithMappedInterfaces.expected.Generated -@AnnotationGenerated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) -@ExpectedGenerated +@Generated public class EntityProjection( inputValueSerializer: InputValueSerializerInterface? = null, ) : GraphQLProjection(inputValueSerializer) { diff --git a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithMappedInterfaces/expected/client/NodeProjection.kt b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithMappedInterfaces/expected/client/NodeProjection.kt index 1c44d796f..b26bc172f 100644 --- a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithMappedInterfaces/expected/client/NodeProjection.kt +++ b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithMappedInterfaces/expected/client/NodeProjection.kt @@ -2,11 +2,9 @@ package com.netflix.graphql.dgs.codegen.cases.dataClassWithMappedInterfaces.expe import com.netflix.graphql.dgs.client.codegen.InputValueSerializerInterface import com.netflix.graphql.dgs.codegen.GraphQLProjection -import com.netflix.graphql.dgs.codegen.cases.dataClassWithMappedInterfaces.expected.Generated as ExpectedGenerated -import jakarta.`annotation`.Generated as AnnotationGenerated +import com.netflix.graphql.dgs.codegen.cases.dataClassWithMappedInterfaces.expected.Generated -@AnnotationGenerated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) -@ExpectedGenerated +@Generated public class NodeProjection( inputValueSerializer: InputValueSerializerInterface? = null, ) : GraphQLProjection(inputValueSerializer) { diff --git a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithMappedInterfaces/expected/client/ProductProjection.kt b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithMappedInterfaces/expected/client/ProductProjection.kt index 154a7cb94..e32d21085 100644 --- a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithMappedInterfaces/expected/client/ProductProjection.kt +++ b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithMappedInterfaces/expected/client/ProductProjection.kt @@ -2,11 +2,9 @@ package com.netflix.graphql.dgs.codegen.cases.dataClassWithMappedInterfaces.expe import com.netflix.graphql.dgs.client.codegen.InputValueSerializerInterface import com.netflix.graphql.dgs.codegen.GraphQLProjection -import com.netflix.graphql.dgs.codegen.cases.dataClassWithMappedInterfaces.expected.Generated as ExpectedGenerated -import jakarta.`annotation`.Generated as AnnotationGenerated +import com.netflix.graphql.dgs.codegen.cases.dataClassWithMappedInterfaces.expected.Generated -@AnnotationGenerated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) -@ExpectedGenerated +@Generated public class ProductProjection( inputValueSerializer: InputValueSerializerInterface? = null, ) : GraphQLProjection(inputValueSerializer) { diff --git a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithMappedInterfaces/expected/client/QueryProjection.kt b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithMappedInterfaces/expected/client/QueryProjection.kt index 6bb04fbc8..1c196369e 100644 --- a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithMappedInterfaces/expected/client/QueryProjection.kt +++ b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithMappedInterfaces/expected/client/QueryProjection.kt @@ -2,12 +2,10 @@ package com.netflix.graphql.dgs.codegen.cases.dataClassWithMappedInterfaces.expe import com.netflix.graphql.dgs.client.codegen.InputValueSerializerInterface import com.netflix.graphql.dgs.codegen.GraphQLProjection +import com.netflix.graphql.dgs.codegen.cases.dataClassWithMappedInterfaces.expected.Generated import kotlin.String -import com.netflix.graphql.dgs.codegen.cases.dataClassWithMappedInterfaces.expected.Generated as ExpectedGenerated -import jakarta.`annotation`.Generated as AnnotationGenerated -@AnnotationGenerated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) -@ExpectedGenerated +@Generated public class QueryProjection( inputValueSerializer: InputValueSerializerInterface? = null, ) : GraphQLProjection(inputValueSerializer) { diff --git a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithMappedInterfaces/expected/types/Entity.kt b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithMappedInterfaces/expected/types/Entity.kt index b4ea40a5d..94afc0545 100644 --- a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithMappedInterfaces/expected/types/Entity.kt +++ b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithMappedInterfaces/expected/types/Entity.kt @@ -2,15 +2,13 @@ package com.netflix.graphql.dgs.codegen.cases.dataClassWithMappedInterfaces.expe import com.fasterxml.jackson.`annotation`.JsonSubTypes import com.fasterxml.jackson.`annotation`.JsonTypeInfo +import com.netflix.graphql.dgs.codegen.cases.dataClassWithMappedInterfaces.expected.Generated import com.netflix.graphql.dgs.codegen.fixtures.Node import kotlin.String import kotlin.Suppress import kotlin.jvm.JvmName -import com.netflix.graphql.dgs.codegen.cases.dataClassWithMappedInterfaces.expected.Generated as ExpectedGenerated -import jakarta.`annotation`.Generated as AnnotationGenerated -@AnnotationGenerated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) -@ExpectedGenerated +@Generated @JsonTypeInfo( use = JsonTypeInfo.Id.NAME, include = JsonTypeInfo.As.PROPERTY, diff --git a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithMappedInterfaces/expected/types/Product.kt b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithMappedInterfaces/expected/types/Product.kt index bf226b175..cb3548ad6 100644 --- a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithMappedInterfaces/expected/types/Product.kt +++ b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithMappedInterfaces/expected/types/Product.kt @@ -5,16 +5,14 @@ import com.fasterxml.jackson.`annotation`.JsonProperty import com.fasterxml.jackson.`annotation`.JsonTypeInfo import com.fasterxml.jackson.databind.`annotation`.JsonDeserialize import com.fasterxml.jackson.databind.`annotation`.JsonPOJOBuilder +import com.netflix.graphql.dgs.codegen.cases.dataClassWithMappedInterfaces.expected.Generated import com.netflix.graphql.dgs.codegen.fixtures.Node import java.lang.IllegalStateException import kotlin.String import kotlin.Suppress import kotlin.jvm.JvmName -import com.netflix.graphql.dgs.codegen.cases.dataClassWithMappedInterfaces.expected.Generated as ExpectedGenerated -import jakarta.`annotation`.Generated as AnnotationGenerated -@AnnotationGenerated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) -@ExpectedGenerated +@Generated @JsonTypeInfo(use = JsonTypeInfo.Id.NONE) @JsonDeserialize(builder = Product.Builder::class) public class Product( @@ -28,15 +26,13 @@ public class Product( override val id: String get() = __id.invoke() - @AnnotationGenerated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) - @ExpectedGenerated + @Generated public companion object { private val idDefault: () -> String = { throw IllegalStateException("Field `id` was not requested") } } - @AnnotationGenerated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) - @ExpectedGenerated + @Generated @JsonPOJOBuilder @JsonIgnoreProperties("__typename") public class Builder { diff --git a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithMappedInterfaces/expected/types/Query.kt b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithMappedInterfaces/expected/types/Query.kt index e96b09c9a..d2d426ba8 100644 --- a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithMappedInterfaces/expected/types/Query.kt +++ b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithMappedInterfaces/expected/types/Query.kt @@ -5,14 +5,12 @@ import com.fasterxml.jackson.`annotation`.JsonProperty import com.fasterxml.jackson.`annotation`.JsonTypeInfo import com.fasterxml.jackson.databind.`annotation`.JsonDeserialize import com.fasterxml.jackson.databind.`annotation`.JsonPOJOBuilder +import com.netflix.graphql.dgs.codegen.cases.dataClassWithMappedInterfaces.expected.Generated import java.lang.IllegalStateException import kotlin.collections.List import kotlin.jvm.JvmName -import com.netflix.graphql.dgs.codegen.cases.dataClassWithMappedInterfaces.expected.Generated as ExpectedGenerated -import jakarta.`annotation`.Generated as AnnotationGenerated -@AnnotationGenerated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) -@ExpectedGenerated +@Generated @JsonTypeInfo(use = JsonTypeInfo.Id.NONE) @JsonDeserialize(builder = Query.Builder::class) public class Query( @@ -24,15 +22,13 @@ public class Query( public val products: List? get() = __products.invoke() - @AnnotationGenerated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) - @ExpectedGenerated + @Generated public companion object { private val productsDefault: () -> List? = { throw IllegalStateException("Field `products` was not requested") } } - @AnnotationGenerated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) - @ExpectedGenerated + @Generated @JsonPOJOBuilder @JsonIgnoreProperties("__typename") public class Builder { diff --git a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithMappedTypes/expected/DgsClient.kt b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithMappedTypes/expected/DgsClient.kt index b543d2d20..fc97ddc09 100644 --- a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithMappedTypes/expected/DgsClient.kt +++ b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithMappedTypes/expected/DgsClient.kt @@ -6,7 +6,6 @@ import com.netflix.graphql.dgs.codegen.cases.dataClassWithMappedTypes.expected.c import graphql.language.OperationDefinition import kotlin.String -@jakarta.`annotation`.Generated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) @Generated public object DgsClient { public fun buildQuery(inputValueSerializer: InputValueSerializerInterface? = null, diff --git a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithMappedTypes/expected/DgsConstants.kt b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithMappedTypes/expected/DgsConstants.kt index f15ae89a7..bd69ca1a6 100644 --- a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithMappedTypes/expected/DgsConstants.kt +++ b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithMappedTypes/expected/DgsConstants.kt @@ -2,12 +2,10 @@ package com.netflix.graphql.dgs.codegen.cases.dataClassWithMappedTypes.expected import kotlin.String -@jakarta.`annotation`.Generated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) @Generated public object DgsConstants { public const val QUERY_TYPE: String = "Query" - @jakarta.`annotation`.Generated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) @Generated public object QUERY { public const val TYPE_NAME: String = "Query" @@ -17,7 +15,6 @@ public object DgsConstants { public const val EntityConnection: String = "entityConnection" } - @jakarta.`annotation`.Generated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) @Generated public object ENTITY { public const val TYPE_NAME: String = "Entity" @@ -27,7 +24,6 @@ public object DgsConstants { public const val DateTime: String = "dateTime" } - @jakarta.`annotation`.Generated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) @Generated public object ENTITYCONNECTION { public const val TYPE_NAME: String = "EntityConnection" @@ -37,7 +33,6 @@ public object DgsConstants { public const val Edges: String = "edges" } - @jakarta.`annotation`.Generated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) @Generated public object ENTITYEDGE { public const val TYPE_NAME: String = "EntityEdge" @@ -47,7 +42,6 @@ public object DgsConstants { public const val Node: String = "node" } - @jakarta.`annotation`.Generated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) @Generated public object PAGEINFO { public const val TYPE_NAME: String = "PageInfo" diff --git a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithMappedTypes/expected/client/EntityConnectionProjection.kt b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithMappedTypes/expected/client/EntityConnectionProjection.kt index 80714acec..3bc5f3382 100644 --- a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithMappedTypes/expected/client/EntityConnectionProjection.kt +++ b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithMappedTypes/expected/client/EntityConnectionProjection.kt @@ -2,12 +2,10 @@ package com.netflix.graphql.dgs.codegen.cases.dataClassWithMappedTypes.expected. import com.netflix.graphql.dgs.client.codegen.InputValueSerializerInterface import com.netflix.graphql.dgs.codegen.GraphQLProjection +import com.netflix.graphql.dgs.codegen.cases.dataClassWithMappedTypes.expected.Generated import kotlin.String -import com.netflix.graphql.dgs.codegen.cases.dataClassWithMappedTypes.expected.Generated as ExpectedGenerated -import jakarta.`annotation`.Generated as AnnotationGenerated -@AnnotationGenerated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) -@ExpectedGenerated +@Generated public class EntityConnectionProjection( inputValueSerializer: InputValueSerializerInterface? = null, ) : GraphQLProjection(inputValueSerializer) { diff --git a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithMappedTypes/expected/client/EntityEdgeProjection.kt b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithMappedTypes/expected/client/EntityEdgeProjection.kt index b24ad86ae..f9d95f9b4 100644 --- a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithMappedTypes/expected/client/EntityEdgeProjection.kt +++ b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithMappedTypes/expected/client/EntityEdgeProjection.kt @@ -2,12 +2,10 @@ package com.netflix.graphql.dgs.codegen.cases.dataClassWithMappedTypes.expected. import com.netflix.graphql.dgs.client.codegen.InputValueSerializerInterface import com.netflix.graphql.dgs.codegen.GraphQLProjection +import com.netflix.graphql.dgs.codegen.cases.dataClassWithMappedTypes.expected.Generated import kotlin.String -import com.netflix.graphql.dgs.codegen.cases.dataClassWithMappedTypes.expected.Generated as ExpectedGenerated -import jakarta.`annotation`.Generated as AnnotationGenerated -@AnnotationGenerated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) -@ExpectedGenerated +@Generated public class EntityEdgeProjection( inputValueSerializer: InputValueSerializerInterface? = null, ) : GraphQLProjection(inputValueSerializer) { diff --git a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithMappedTypes/expected/client/EntityProjection.kt b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithMappedTypes/expected/client/EntityProjection.kt index af96d86c2..dcfd3acac 100644 --- a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithMappedTypes/expected/client/EntityProjection.kt +++ b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithMappedTypes/expected/client/EntityProjection.kt @@ -2,11 +2,9 @@ package com.netflix.graphql.dgs.codegen.cases.dataClassWithMappedTypes.expected. import com.netflix.graphql.dgs.client.codegen.InputValueSerializerInterface import com.netflix.graphql.dgs.codegen.GraphQLProjection -import com.netflix.graphql.dgs.codegen.cases.dataClassWithMappedTypes.expected.Generated as ExpectedGenerated -import jakarta.`annotation`.Generated as AnnotationGenerated +import com.netflix.graphql.dgs.codegen.cases.dataClassWithMappedTypes.expected.Generated -@AnnotationGenerated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) -@ExpectedGenerated +@Generated public class EntityProjection( inputValueSerializer: InputValueSerializerInterface? = null, ) : GraphQLProjection(inputValueSerializer) { diff --git a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithMappedTypes/expected/client/PageInfoProjection.kt b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithMappedTypes/expected/client/PageInfoProjection.kt index 0082812e5..3a2a7702b 100644 --- a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithMappedTypes/expected/client/PageInfoProjection.kt +++ b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithMappedTypes/expected/client/PageInfoProjection.kt @@ -2,11 +2,9 @@ package com.netflix.graphql.dgs.codegen.cases.dataClassWithMappedTypes.expected. import com.netflix.graphql.dgs.client.codegen.InputValueSerializerInterface import com.netflix.graphql.dgs.codegen.GraphQLProjection -import com.netflix.graphql.dgs.codegen.cases.dataClassWithMappedTypes.expected.Generated as ExpectedGenerated -import jakarta.`annotation`.Generated as AnnotationGenerated +import com.netflix.graphql.dgs.codegen.cases.dataClassWithMappedTypes.expected.Generated -@AnnotationGenerated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) -@ExpectedGenerated +@Generated public class PageInfoProjection( inputValueSerializer: InputValueSerializerInterface? = null, ) : GraphQLProjection(inputValueSerializer) { diff --git a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithMappedTypes/expected/client/QueryProjection.kt b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithMappedTypes/expected/client/QueryProjection.kt index 05b438577..534f94c02 100644 --- a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithMappedTypes/expected/client/QueryProjection.kt +++ b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithMappedTypes/expected/client/QueryProjection.kt @@ -2,12 +2,10 @@ package com.netflix.graphql.dgs.codegen.cases.dataClassWithMappedTypes.expected. import com.netflix.graphql.dgs.client.codegen.InputValueSerializerInterface import com.netflix.graphql.dgs.codegen.GraphQLProjection +import com.netflix.graphql.dgs.codegen.cases.dataClassWithMappedTypes.expected.Generated import kotlin.String -import com.netflix.graphql.dgs.codegen.cases.dataClassWithMappedTypes.expected.Generated as ExpectedGenerated -import jakarta.`annotation`.Generated as AnnotationGenerated -@AnnotationGenerated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) -@ExpectedGenerated +@Generated public class QueryProjection( inputValueSerializer: InputValueSerializerInterface? = null, ) : GraphQLProjection(inputValueSerializer) { diff --git a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithMappedTypes/expected/types/Entity.kt b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithMappedTypes/expected/types/Entity.kt index f77f37255..c0338b52d 100644 --- a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithMappedTypes/expected/types/Entity.kt +++ b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithMappedTypes/expected/types/Entity.kt @@ -5,15 +5,13 @@ import com.fasterxml.jackson.`annotation`.JsonProperty import com.fasterxml.jackson.`annotation`.JsonTypeInfo import com.fasterxml.jackson.databind.`annotation`.JsonDeserialize import com.fasterxml.jackson.databind.`annotation`.JsonPOJOBuilder +import com.netflix.graphql.dgs.codegen.cases.dataClassWithMappedTypes.expected.Generated import java.lang.IllegalStateException import java.time.OffsetDateTime import kotlin.Long import kotlin.jvm.JvmName -import com.netflix.graphql.dgs.codegen.cases.dataClassWithMappedTypes.expected.Generated as ExpectedGenerated -import jakarta.`annotation`.Generated as AnnotationGenerated -@AnnotationGenerated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) -@ExpectedGenerated +@Generated @JsonTypeInfo(use = JsonTypeInfo.Id.NONE) @JsonDeserialize(builder = Entity.Builder::class) public class Entity( @@ -32,8 +30,7 @@ public class Entity( public val dateTime: OffsetDateTime? get() = __dateTime.invoke() - @AnnotationGenerated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) - @ExpectedGenerated + @Generated public companion object { private val longDefault: () -> Long? = { throw IllegalStateException("Field `long` was not requested") } @@ -42,8 +39,7 @@ public class Entity( { throw IllegalStateException("Field `dateTime` was not requested") } } - @AnnotationGenerated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) - @ExpectedGenerated + @Generated @JsonPOJOBuilder @JsonIgnoreProperties("__typename") public class Builder { diff --git a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithMappedTypes/expected/types/EntityEdge.kt b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithMappedTypes/expected/types/EntityEdge.kt index 0992eed02..364cd5c7a 100644 --- a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithMappedTypes/expected/types/EntityEdge.kt +++ b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithMappedTypes/expected/types/EntityEdge.kt @@ -5,14 +5,12 @@ import com.fasterxml.jackson.`annotation`.JsonProperty import com.fasterxml.jackson.`annotation`.JsonTypeInfo import com.fasterxml.jackson.databind.`annotation`.JsonDeserialize import com.fasterxml.jackson.databind.`annotation`.JsonPOJOBuilder +import com.netflix.graphql.dgs.codegen.cases.dataClassWithMappedTypes.expected.Generated import java.lang.IllegalStateException import kotlin.String import kotlin.jvm.JvmName -import com.netflix.graphql.dgs.codegen.cases.dataClassWithMappedTypes.expected.Generated as ExpectedGenerated -import jakarta.`annotation`.Generated as AnnotationGenerated -@AnnotationGenerated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) -@ExpectedGenerated +@Generated @JsonTypeInfo(use = JsonTypeInfo.Id.NONE) @JsonDeserialize(builder = EntityEdge.Builder::class) public class EntityEdge( @@ -31,8 +29,7 @@ public class EntityEdge( public val node: Entity? get() = __node.invoke() - @AnnotationGenerated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) - @ExpectedGenerated + @Generated public companion object { private val cursorDefault: () -> String = { throw IllegalStateException("Field `cursor` was not requested") } @@ -41,8 +38,7 @@ public class EntityEdge( { throw IllegalStateException("Field `node` was not requested") } } - @AnnotationGenerated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) - @ExpectedGenerated + @Generated @JsonPOJOBuilder @JsonIgnoreProperties("__typename") public class Builder { diff --git a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithMappedTypes/expected/types/Query.kt b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithMappedTypes/expected/types/Query.kt index 65c8965bf..1fb057f00 100644 --- a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithMappedTypes/expected/types/Query.kt +++ b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithMappedTypes/expected/types/Query.kt @@ -5,15 +5,13 @@ import com.fasterxml.jackson.`annotation`.JsonProperty import com.fasterxml.jackson.`annotation`.JsonTypeInfo import com.fasterxml.jackson.databind.`annotation`.JsonDeserialize import com.fasterxml.jackson.databind.`annotation`.JsonPOJOBuilder +import com.netflix.graphql.dgs.codegen.cases.dataClassWithMappedTypes.expected.Generated import graphql.relay.SimpleListConnection import java.lang.IllegalStateException import kotlin.collections.List import kotlin.jvm.JvmName -import com.netflix.graphql.dgs.codegen.cases.dataClassWithMappedTypes.expected.Generated as ExpectedGenerated -import jakarta.`annotation`.Generated as AnnotationGenerated -@AnnotationGenerated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) -@ExpectedGenerated +@Generated @JsonTypeInfo(use = JsonTypeInfo.Id.NONE) @JsonDeserialize(builder = Query.Builder::class) public class Query( @@ -32,8 +30,7 @@ public class Query( public val entityConnection: SimpleListConnection? get() = __entityConnection.invoke() - @AnnotationGenerated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) - @ExpectedGenerated + @Generated public companion object { private val entityDefault: () -> List? = { throw IllegalStateException("Field `entity` was not requested") } @@ -42,8 +39,7 @@ public class Query( { throw IllegalStateException("Field `entityConnection` was not requested") } } - @AnnotationGenerated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) - @ExpectedGenerated + @Generated @JsonPOJOBuilder @JsonIgnoreProperties("__typename") public class Builder { diff --git a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithNonNullableAndInterface/expected/DgsClient.kt b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithNonNullableAndInterface/expected/DgsClient.kt index 4855d7589..e59e60117 100644 --- a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithNonNullableAndInterface/expected/DgsClient.kt +++ b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithNonNullableAndInterface/expected/DgsClient.kt @@ -6,7 +6,6 @@ import com.netflix.graphql.dgs.codegen.cases.dataClassWithNonNullableAndInterfac import graphql.language.OperationDefinition import kotlin.String -@jakarta.`annotation`.Generated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) @Generated public object DgsClient { public fun buildQuery(inputValueSerializer: InputValueSerializerInterface? = null, diff --git a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithNonNullableAndInterface/expected/DgsConstants.kt b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithNonNullableAndInterface/expected/DgsConstants.kt index ac9318510..6eafc9ac6 100644 --- a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithNonNullableAndInterface/expected/DgsConstants.kt +++ b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithNonNullableAndInterface/expected/DgsConstants.kt @@ -2,12 +2,10 @@ package com.netflix.graphql.dgs.codegen.cases.dataClassWithNonNullableAndInterfa import kotlin.String -@jakarta.`annotation`.Generated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) @Generated public object DgsConstants { public const val QUERY_TYPE: String = "Query" - @jakarta.`annotation`.Generated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) @Generated public object QUERY { public const val TYPE_NAME: String = "Query" @@ -15,7 +13,6 @@ public object DgsConstants { public const val People: String = "people" } - @jakarta.`annotation`.Generated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) @Generated public object EMPLOYEE { public const val TYPE_NAME: String = "Employee" @@ -27,7 +24,6 @@ public object DgsConstants { public const val Company: String = "company" } - @jakarta.`annotation`.Generated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) @Generated public object PERSON { public const val TYPE_NAME: String = "Person" diff --git a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithNonNullableAndInterface/expected/client/EmployeeProjection.kt b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithNonNullableAndInterface/expected/client/EmployeeProjection.kt index ae69e8a79..c41009ba9 100644 --- a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithNonNullableAndInterface/expected/client/EmployeeProjection.kt +++ b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithNonNullableAndInterface/expected/client/EmployeeProjection.kt @@ -2,11 +2,9 @@ package com.netflix.graphql.dgs.codegen.cases.dataClassWithNonNullableAndInterfa import com.netflix.graphql.dgs.client.codegen.InputValueSerializerInterface import com.netflix.graphql.dgs.codegen.GraphQLProjection -import com.netflix.graphql.dgs.codegen.cases.dataClassWithNonNullableAndInterface.expected.Generated as ExpectedGenerated -import jakarta.`annotation`.Generated as AnnotationGenerated +import com.netflix.graphql.dgs.codegen.cases.dataClassWithNonNullableAndInterface.expected.Generated -@AnnotationGenerated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) -@ExpectedGenerated +@Generated public class EmployeeProjection( inputValueSerializer: InputValueSerializerInterface? = null, ) : GraphQLProjection(inputValueSerializer) { diff --git a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithNonNullableAndInterface/expected/client/PersonProjection.kt b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithNonNullableAndInterface/expected/client/PersonProjection.kt index 1d7a20563..d78fe9a94 100644 --- a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithNonNullableAndInterface/expected/client/PersonProjection.kt +++ b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithNonNullableAndInterface/expected/client/PersonProjection.kt @@ -2,11 +2,9 @@ package com.netflix.graphql.dgs.codegen.cases.dataClassWithNonNullableAndInterfa import com.netflix.graphql.dgs.client.codegen.InputValueSerializerInterface import com.netflix.graphql.dgs.codegen.GraphQLProjection -import com.netflix.graphql.dgs.codegen.cases.dataClassWithNonNullableAndInterface.expected.Generated as ExpectedGenerated -import jakarta.`annotation`.Generated as AnnotationGenerated +import com.netflix.graphql.dgs.codegen.cases.dataClassWithNonNullableAndInterface.expected.Generated -@AnnotationGenerated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) -@ExpectedGenerated +@Generated public class PersonProjection( inputValueSerializer: InputValueSerializerInterface? = null, ) : GraphQLProjection(inputValueSerializer) { diff --git a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithNonNullableAndInterface/expected/client/QueryProjection.kt b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithNonNullableAndInterface/expected/client/QueryProjection.kt index 6368f625d..336a1effa 100644 --- a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithNonNullableAndInterface/expected/client/QueryProjection.kt +++ b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithNonNullableAndInterface/expected/client/QueryProjection.kt @@ -2,12 +2,10 @@ package com.netflix.graphql.dgs.codegen.cases.dataClassWithNonNullableAndInterfa import com.netflix.graphql.dgs.client.codegen.InputValueSerializerInterface import com.netflix.graphql.dgs.codegen.GraphQLProjection +import com.netflix.graphql.dgs.codegen.cases.dataClassWithNonNullableAndInterface.expected.Generated import kotlin.String -import com.netflix.graphql.dgs.codegen.cases.dataClassWithNonNullableAndInterface.expected.Generated as ExpectedGenerated -import jakarta.`annotation`.Generated as AnnotationGenerated -@AnnotationGenerated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) -@ExpectedGenerated +@Generated public class QueryProjection( inputValueSerializer: InputValueSerializerInterface? = null, ) : GraphQLProjection(inputValueSerializer) { diff --git a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithNonNullableAndInterface/expected/types/Employee.kt b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithNonNullableAndInterface/expected/types/Employee.kt index fb684a1dc..30d8f2419 100644 --- a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithNonNullableAndInterface/expected/types/Employee.kt +++ b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithNonNullableAndInterface/expected/types/Employee.kt @@ -5,15 +5,13 @@ import com.fasterxml.jackson.`annotation`.JsonProperty import com.fasterxml.jackson.`annotation`.JsonTypeInfo import com.fasterxml.jackson.databind.`annotation`.JsonDeserialize import com.fasterxml.jackson.databind.`annotation`.JsonPOJOBuilder +import com.netflix.graphql.dgs.codegen.cases.dataClassWithNonNullableAndInterface.expected.Generated import java.lang.IllegalStateException import kotlin.String import kotlin.Suppress import kotlin.jvm.JvmName -import com.netflix.graphql.dgs.codegen.cases.dataClassWithNonNullableAndInterface.expected.Generated as ExpectedGenerated -import jakarta.`annotation`.Generated as AnnotationGenerated -@AnnotationGenerated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) -@ExpectedGenerated +@Generated @JsonTypeInfo(use = JsonTypeInfo.Id.NONE) @JsonDeserialize(builder = Employee.Builder::class) public class Employee( @@ -42,8 +40,7 @@ public class Employee( override val company: String? get() = __company.invoke() - @AnnotationGenerated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) - @ExpectedGenerated + @Generated public companion object { private val firstnameDefault: () -> String = { throw IllegalStateException("Field `firstname` was not requested") } @@ -55,8 +52,7 @@ public class Employee( { throw IllegalStateException("Field `company` was not requested") } } - @AnnotationGenerated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) - @ExpectedGenerated + @Generated @JsonPOJOBuilder @JsonIgnoreProperties("__typename") public class Builder { diff --git a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithNonNullableAndInterface/expected/types/Person.kt b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithNonNullableAndInterface/expected/types/Person.kt index fd02e21c3..7e3c29be4 100644 --- a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithNonNullableAndInterface/expected/types/Person.kt +++ b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithNonNullableAndInterface/expected/types/Person.kt @@ -2,14 +2,12 @@ package com.netflix.graphql.dgs.codegen.cases.dataClassWithNonNullableAndInterfa import com.fasterxml.jackson.`annotation`.JsonSubTypes import com.fasterxml.jackson.`annotation`.JsonTypeInfo +import com.netflix.graphql.dgs.codegen.cases.dataClassWithNonNullableAndInterface.expected.Generated import kotlin.String import kotlin.Suppress import kotlin.jvm.JvmName -import com.netflix.graphql.dgs.codegen.cases.dataClassWithNonNullableAndInterface.expected.Generated as ExpectedGenerated -import jakarta.`annotation`.Generated as AnnotationGenerated -@AnnotationGenerated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) -@ExpectedGenerated +@Generated @JsonTypeInfo( use = JsonTypeInfo.Id.NAME, include = JsonTypeInfo.As.PROPERTY, diff --git a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithNonNullableAndInterface/expected/types/Query.kt b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithNonNullableAndInterface/expected/types/Query.kt index 37e1d7fb6..cc1994f55 100644 --- a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithNonNullableAndInterface/expected/types/Query.kt +++ b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithNonNullableAndInterface/expected/types/Query.kt @@ -5,14 +5,12 @@ import com.fasterxml.jackson.`annotation`.JsonProperty import com.fasterxml.jackson.`annotation`.JsonTypeInfo import com.fasterxml.jackson.databind.`annotation`.JsonDeserialize import com.fasterxml.jackson.databind.`annotation`.JsonPOJOBuilder +import com.netflix.graphql.dgs.codegen.cases.dataClassWithNonNullableAndInterface.expected.Generated import java.lang.IllegalStateException import kotlin.collections.List import kotlin.jvm.JvmName -import com.netflix.graphql.dgs.codegen.cases.dataClassWithNonNullableAndInterface.expected.Generated as ExpectedGenerated -import jakarta.`annotation`.Generated as AnnotationGenerated -@AnnotationGenerated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) -@ExpectedGenerated +@Generated @JsonTypeInfo(use = JsonTypeInfo.Id.NONE) @JsonDeserialize(builder = Query.Builder::class) public class Query( @@ -24,15 +22,13 @@ public class Query( public val people: List? get() = __people.invoke() - @AnnotationGenerated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) - @ExpectedGenerated + @Generated public companion object { private val peopleDefault: () -> List? = { throw IllegalStateException("Field `people` was not requested") } } - @AnnotationGenerated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) - @ExpectedGenerated + @Generated @JsonPOJOBuilder @JsonIgnoreProperties("__typename") public class Builder { diff --git a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithNonNullableComplexType/expected/DgsClient.kt b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithNonNullableComplexType/expected/DgsClient.kt index 4b856b5fe..e63947b03 100644 --- a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithNonNullableComplexType/expected/DgsClient.kt +++ b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithNonNullableComplexType/expected/DgsClient.kt @@ -1,5 +1,4 @@ package com.netflix.graphql.dgs.codegen.cases.dataClassWithNonNullableComplexType.expected -@jakarta.`annotation`.Generated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) @Generated public object DgsClient diff --git a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithNonNullableComplexType/expected/DgsConstants.kt b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithNonNullableComplexType/expected/DgsConstants.kt index 7c5cec36e..de6c4d422 100644 --- a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithNonNullableComplexType/expected/DgsConstants.kt +++ b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithNonNullableComplexType/expected/DgsConstants.kt @@ -2,10 +2,8 @@ package com.netflix.graphql.dgs.codegen.cases.dataClassWithNonNullableComplexTyp import kotlin.String -@jakarta.`annotation`.Generated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) @Generated public object DgsConstants { - @jakarta.`annotation`.Generated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) @Generated public object MYTYPE { public const val TYPE_NAME: String = "MyType" @@ -13,7 +11,6 @@ public object DgsConstants { public const val Other: String = "other" } - @jakarta.`annotation`.Generated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) @Generated public object OTHERTYPE { public const val TYPE_NAME: String = "OtherType" diff --git a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithNonNullableComplexType/expected/client/MyTypeProjection.kt b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithNonNullableComplexType/expected/client/MyTypeProjection.kt index 05efab057..fa498c2dd 100644 --- a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithNonNullableComplexType/expected/client/MyTypeProjection.kt +++ b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithNonNullableComplexType/expected/client/MyTypeProjection.kt @@ -2,12 +2,10 @@ package com.netflix.graphql.dgs.codegen.cases.dataClassWithNonNullableComplexTyp import com.netflix.graphql.dgs.client.codegen.InputValueSerializerInterface import com.netflix.graphql.dgs.codegen.GraphQLProjection +import com.netflix.graphql.dgs.codegen.cases.dataClassWithNonNullableComplexType.expected.Generated import kotlin.String -import com.netflix.graphql.dgs.codegen.cases.dataClassWithNonNullableComplexType.expected.Generated as ExpectedGenerated -import jakarta.`annotation`.Generated as AnnotationGenerated -@AnnotationGenerated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) -@ExpectedGenerated +@Generated public class MyTypeProjection( inputValueSerializer: InputValueSerializerInterface? = null, ) : GraphQLProjection(inputValueSerializer) { diff --git a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithNonNullableComplexType/expected/client/OtherTypeProjection.kt b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithNonNullableComplexType/expected/client/OtherTypeProjection.kt index 56836fcd5..7a2c493d9 100644 --- a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithNonNullableComplexType/expected/client/OtherTypeProjection.kt +++ b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithNonNullableComplexType/expected/client/OtherTypeProjection.kt @@ -2,11 +2,9 @@ package com.netflix.graphql.dgs.codegen.cases.dataClassWithNonNullableComplexTyp import com.netflix.graphql.dgs.client.codegen.InputValueSerializerInterface import com.netflix.graphql.dgs.codegen.GraphQLProjection -import com.netflix.graphql.dgs.codegen.cases.dataClassWithNonNullableComplexType.expected.Generated as ExpectedGenerated -import jakarta.`annotation`.Generated as AnnotationGenerated +import com.netflix.graphql.dgs.codegen.cases.dataClassWithNonNullableComplexType.expected.Generated -@AnnotationGenerated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) -@ExpectedGenerated +@Generated public class OtherTypeProjection( inputValueSerializer: InputValueSerializerInterface? = null, ) : GraphQLProjection(inputValueSerializer) { diff --git a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithNonNullableComplexType/expected/types/MyType.kt b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithNonNullableComplexType/expected/types/MyType.kt index 6bbb94ce3..cebd92b94 100644 --- a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithNonNullableComplexType/expected/types/MyType.kt +++ b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithNonNullableComplexType/expected/types/MyType.kt @@ -5,13 +5,11 @@ import com.fasterxml.jackson.`annotation`.JsonProperty import com.fasterxml.jackson.`annotation`.JsonTypeInfo import com.fasterxml.jackson.databind.`annotation`.JsonDeserialize import com.fasterxml.jackson.databind.`annotation`.JsonPOJOBuilder +import com.netflix.graphql.dgs.codegen.cases.dataClassWithNonNullableComplexType.expected.Generated import java.lang.IllegalStateException import kotlin.jvm.JvmName -import com.netflix.graphql.dgs.codegen.cases.dataClassWithNonNullableComplexType.expected.Generated as ExpectedGenerated -import jakarta.`annotation`.Generated as AnnotationGenerated -@AnnotationGenerated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) -@ExpectedGenerated +@Generated @JsonTypeInfo(use = JsonTypeInfo.Id.NONE) @JsonDeserialize(builder = MyType.Builder::class) public class MyType( @@ -23,15 +21,13 @@ public class MyType( public val other: OtherType get() = __other.invoke() - @AnnotationGenerated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) - @ExpectedGenerated + @Generated public companion object { private val otherDefault: () -> OtherType = { throw IllegalStateException("Field `other` was not requested") } } - @AnnotationGenerated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) - @ExpectedGenerated + @Generated @JsonPOJOBuilder @JsonIgnoreProperties("__typename") public class Builder { diff --git a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithNonNullableComplexType/expected/types/OtherType.kt b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithNonNullableComplexType/expected/types/OtherType.kt index f6ddd2e07..51282e0d3 100644 --- a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithNonNullableComplexType/expected/types/OtherType.kt +++ b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithNonNullableComplexType/expected/types/OtherType.kt @@ -5,14 +5,12 @@ import com.fasterxml.jackson.`annotation`.JsonProperty import com.fasterxml.jackson.`annotation`.JsonTypeInfo import com.fasterxml.jackson.databind.`annotation`.JsonDeserialize import com.fasterxml.jackson.databind.`annotation`.JsonPOJOBuilder +import com.netflix.graphql.dgs.codegen.cases.dataClassWithNonNullableComplexType.expected.Generated import java.lang.IllegalStateException import kotlin.String import kotlin.jvm.JvmName -import com.netflix.graphql.dgs.codegen.cases.dataClassWithNonNullableComplexType.expected.Generated as ExpectedGenerated -import jakarta.`annotation`.Generated as AnnotationGenerated -@AnnotationGenerated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) -@ExpectedGenerated +@Generated @JsonTypeInfo(use = JsonTypeInfo.Id.NONE) @JsonDeserialize(builder = OtherType.Builder::class) public class OtherType( @@ -24,15 +22,13 @@ public class OtherType( public val name: String get() = __name.invoke() - @AnnotationGenerated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) - @ExpectedGenerated + @Generated public companion object { private val nameDefault: () -> String = { throw IllegalStateException("Field `name` was not requested") } } - @AnnotationGenerated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) - @ExpectedGenerated + @Generated @JsonPOJOBuilder @JsonIgnoreProperties("__typename") public class Builder { diff --git a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithNonNullableListOfNullableValues/expected/DgsClient.kt b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithNonNullableListOfNullableValues/expected/DgsClient.kt index fafd53bfa..27cc3aec1 100644 --- a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithNonNullableListOfNullableValues/expected/DgsClient.kt +++ b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithNonNullableListOfNullableValues/expected/DgsClient.kt @@ -6,7 +6,6 @@ import com.netflix.graphql.dgs.codegen.cases.dataClassWithNonNullableListOfNulla import graphql.language.OperationDefinition import kotlin.String -@jakarta.`annotation`.Generated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) @Generated public object DgsClient { public fun buildQuery(inputValueSerializer: InputValueSerializerInterface? = null, diff --git a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithNonNullableListOfNullableValues/expected/DgsConstants.kt b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithNonNullableListOfNullableValues/expected/DgsConstants.kt index 192fa89da..b0d3f2588 100644 --- a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithNonNullableListOfNullableValues/expected/DgsConstants.kt +++ b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithNonNullableListOfNullableValues/expected/DgsConstants.kt @@ -2,12 +2,10 @@ package com.netflix.graphql.dgs.codegen.cases.dataClassWithNonNullableListOfNull import kotlin.String -@jakarta.`annotation`.Generated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) @Generated public object DgsConstants { public const val QUERY_TYPE: String = "Query" - @jakarta.`annotation`.Generated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) @Generated public object QUERY { public const val TYPE_NAME: String = "Query" @@ -15,7 +13,6 @@ public object DgsConstants { public const val People: String = "people" } - @jakarta.`annotation`.Generated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) @Generated public object PERSON { public const val TYPE_NAME: String = "Person" diff --git a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithNonNullableListOfNullableValues/expected/client/PersonProjection.kt b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithNonNullableListOfNullableValues/expected/client/PersonProjection.kt index 06dc59d11..890e5406a 100644 --- a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithNonNullableListOfNullableValues/expected/client/PersonProjection.kt +++ b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithNonNullableListOfNullableValues/expected/client/PersonProjection.kt @@ -2,11 +2,9 @@ package com.netflix.graphql.dgs.codegen.cases.dataClassWithNonNullableListOfNull import com.netflix.graphql.dgs.client.codegen.InputValueSerializerInterface import com.netflix.graphql.dgs.codegen.GraphQLProjection -import com.netflix.graphql.dgs.codegen.cases.dataClassWithNonNullableListOfNullableValues.expected.Generated as ExpectedGenerated -import jakarta.`annotation`.Generated as AnnotationGenerated +import com.netflix.graphql.dgs.codegen.cases.dataClassWithNonNullableListOfNullableValues.expected.Generated -@AnnotationGenerated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) -@ExpectedGenerated +@Generated public class PersonProjection( inputValueSerializer: InputValueSerializerInterface? = null, ) : GraphQLProjection(inputValueSerializer) { diff --git a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithNonNullableListOfNullableValues/expected/client/QueryProjection.kt b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithNonNullableListOfNullableValues/expected/client/QueryProjection.kt index 1ad68a75d..52b6e4dd6 100644 --- a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithNonNullableListOfNullableValues/expected/client/QueryProjection.kt +++ b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithNonNullableListOfNullableValues/expected/client/QueryProjection.kt @@ -2,12 +2,10 @@ package com.netflix.graphql.dgs.codegen.cases.dataClassWithNonNullableListOfNull import com.netflix.graphql.dgs.client.codegen.InputValueSerializerInterface import com.netflix.graphql.dgs.codegen.GraphQLProjection +import com.netflix.graphql.dgs.codegen.cases.dataClassWithNonNullableListOfNullableValues.expected.Generated import kotlin.String -import com.netflix.graphql.dgs.codegen.cases.dataClassWithNonNullableListOfNullableValues.expected.Generated as ExpectedGenerated -import jakarta.`annotation`.Generated as AnnotationGenerated -@AnnotationGenerated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) -@ExpectedGenerated +@Generated public class QueryProjection( inputValueSerializer: InputValueSerializerInterface? = null, ) : GraphQLProjection(inputValueSerializer) { diff --git a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithNonNullableListOfNullableValues/expected/types/Person.kt b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithNonNullableListOfNullableValues/expected/types/Person.kt index 03884e07c..4a41f86c8 100644 --- a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithNonNullableListOfNullableValues/expected/types/Person.kt +++ b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithNonNullableListOfNullableValues/expected/types/Person.kt @@ -5,15 +5,13 @@ import com.fasterxml.jackson.`annotation`.JsonProperty import com.fasterxml.jackson.`annotation`.JsonTypeInfo import com.fasterxml.jackson.databind.`annotation`.JsonDeserialize import com.fasterxml.jackson.databind.`annotation`.JsonPOJOBuilder +import com.netflix.graphql.dgs.codegen.cases.dataClassWithNonNullableListOfNullableValues.expected.Generated import java.lang.IllegalStateException import kotlin.String import kotlin.collections.List import kotlin.jvm.JvmName -import com.netflix.graphql.dgs.codegen.cases.dataClassWithNonNullableListOfNullableValues.expected.Generated as ExpectedGenerated -import jakarta.`annotation`.Generated as AnnotationGenerated -@AnnotationGenerated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) -@ExpectedGenerated +@Generated @JsonTypeInfo(use = JsonTypeInfo.Id.NONE) @JsonDeserialize(builder = Person.Builder::class) public class Person( @@ -32,8 +30,7 @@ public class Person( public val email: List get() = __email.invoke() - @AnnotationGenerated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) - @ExpectedGenerated + @Generated public companion object { private val nameDefault: () -> String = { throw IllegalStateException("Field `name` was not requested") } @@ -42,8 +39,7 @@ public class Person( { throw IllegalStateException("Field `email` was not requested") } } - @AnnotationGenerated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) - @ExpectedGenerated + @Generated @JsonPOJOBuilder @JsonIgnoreProperties("__typename") public class Builder { diff --git a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithNonNullableListOfNullableValues/expected/types/Query.kt b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithNonNullableListOfNullableValues/expected/types/Query.kt index b3ac655ff..3241da1bc 100644 --- a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithNonNullableListOfNullableValues/expected/types/Query.kt +++ b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithNonNullableListOfNullableValues/expected/types/Query.kt @@ -5,14 +5,12 @@ import com.fasterxml.jackson.`annotation`.JsonProperty import com.fasterxml.jackson.`annotation`.JsonTypeInfo import com.fasterxml.jackson.databind.`annotation`.JsonDeserialize import com.fasterxml.jackson.databind.`annotation`.JsonPOJOBuilder +import com.netflix.graphql.dgs.codegen.cases.dataClassWithNonNullableListOfNullableValues.expected.Generated import java.lang.IllegalStateException import kotlin.collections.List import kotlin.jvm.JvmName -import com.netflix.graphql.dgs.codegen.cases.dataClassWithNonNullableListOfNullableValues.expected.Generated as ExpectedGenerated -import jakarta.`annotation`.Generated as AnnotationGenerated -@AnnotationGenerated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) -@ExpectedGenerated +@Generated @JsonTypeInfo(use = JsonTypeInfo.Id.NONE) @JsonDeserialize(builder = Query.Builder::class) public class Query( @@ -24,15 +22,13 @@ public class Query( public val people: List? get() = __people.invoke() - @AnnotationGenerated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) - @ExpectedGenerated + @Generated public companion object { private val peopleDefault: () -> List? = { throw IllegalStateException("Field `people` was not requested") } } - @AnnotationGenerated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) - @ExpectedGenerated + @Generated @JsonPOJOBuilder @JsonIgnoreProperties("__typename") public class Builder { diff --git a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithNonNullablePrimitive/expected/DgsClient.kt b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithNonNullablePrimitive/expected/DgsClient.kt index 5aa763ef9..910e00f2d 100644 --- a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithNonNullablePrimitive/expected/DgsClient.kt +++ b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithNonNullablePrimitive/expected/DgsClient.kt @@ -1,5 +1,4 @@ package com.netflix.graphql.dgs.codegen.cases.dataClassWithNonNullablePrimitive.expected -@jakarta.`annotation`.Generated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) @Generated public object DgsClient diff --git a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithNonNullablePrimitive/expected/DgsConstants.kt b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithNonNullablePrimitive/expected/DgsConstants.kt index eb5e5beff..2b13fa5cf 100644 --- a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithNonNullablePrimitive/expected/DgsConstants.kt +++ b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithNonNullablePrimitive/expected/DgsConstants.kt @@ -2,10 +2,8 @@ package com.netflix.graphql.dgs.codegen.cases.dataClassWithNonNullablePrimitive. import kotlin.String -@jakarta.`annotation`.Generated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) @Generated public object DgsConstants { - @jakarta.`annotation`.Generated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) @Generated public object MYTYPE { public const val TYPE_NAME: String = "MyType" diff --git a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithNonNullablePrimitive/expected/client/MyTypeProjection.kt b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithNonNullablePrimitive/expected/client/MyTypeProjection.kt index 089df5501..50f7d0dac 100644 --- a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithNonNullablePrimitive/expected/client/MyTypeProjection.kt +++ b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithNonNullablePrimitive/expected/client/MyTypeProjection.kt @@ -2,11 +2,9 @@ package com.netflix.graphql.dgs.codegen.cases.dataClassWithNonNullablePrimitive. import com.netflix.graphql.dgs.client.codegen.InputValueSerializerInterface import com.netflix.graphql.dgs.codegen.GraphQLProjection -import com.netflix.graphql.dgs.codegen.cases.dataClassWithNonNullablePrimitive.expected.Generated as ExpectedGenerated -import jakarta.`annotation`.Generated as AnnotationGenerated +import com.netflix.graphql.dgs.codegen.cases.dataClassWithNonNullablePrimitive.expected.Generated -@AnnotationGenerated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) -@ExpectedGenerated +@Generated public class MyTypeProjection( inputValueSerializer: InputValueSerializerInterface? = null, ) : GraphQLProjection(inputValueSerializer) { diff --git a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithNonNullablePrimitive/expected/types/MyType.kt b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithNonNullablePrimitive/expected/types/MyType.kt index 40fb6bfab..189a1a364 100644 --- a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithNonNullablePrimitive/expected/types/MyType.kt +++ b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithNonNullablePrimitive/expected/types/MyType.kt @@ -5,16 +5,14 @@ import com.fasterxml.jackson.`annotation`.JsonProperty import com.fasterxml.jackson.`annotation`.JsonTypeInfo import com.fasterxml.jackson.databind.`annotation`.JsonDeserialize import com.fasterxml.jackson.databind.`annotation`.JsonPOJOBuilder +import com.netflix.graphql.dgs.codegen.cases.dataClassWithNonNullablePrimitive.expected.Generated import java.lang.IllegalStateException import kotlin.Boolean import kotlin.Double import kotlin.Int import kotlin.jvm.JvmName -import com.netflix.graphql.dgs.codegen.cases.dataClassWithNonNullablePrimitive.expected.Generated as ExpectedGenerated -import jakarta.`annotation`.Generated as AnnotationGenerated -@AnnotationGenerated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) -@ExpectedGenerated +@Generated @JsonTypeInfo(use = JsonTypeInfo.Id.NONE) @JsonDeserialize(builder = MyType.Builder::class) public class MyType( @@ -40,8 +38,7 @@ public class MyType( public val floaty: Double get() = __floaty.invoke() - @AnnotationGenerated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) - @ExpectedGenerated + @Generated public companion object { private val countDefault: () -> Int = { throw IllegalStateException("Field `count` was not requested") } @@ -53,8 +50,7 @@ public class MyType( { throw IllegalStateException("Field `floaty` was not requested") } } - @AnnotationGenerated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) - @ExpectedGenerated + @Generated @JsonPOJOBuilder @JsonIgnoreProperties("__typename") public class Builder { diff --git a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithNonNullablePrimitiveInList/expected/DgsClient.kt b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithNonNullablePrimitiveInList/expected/DgsClient.kt index f165face8..4f84f6096 100644 --- a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithNonNullablePrimitiveInList/expected/DgsClient.kt +++ b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithNonNullablePrimitiveInList/expected/DgsClient.kt @@ -1,5 +1,4 @@ package com.netflix.graphql.dgs.codegen.cases.dataClassWithNonNullablePrimitiveInList.expected -@jakarta.`annotation`.Generated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) @Generated public object DgsClient diff --git a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithNonNullablePrimitiveInList/expected/DgsConstants.kt b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithNonNullablePrimitiveInList/expected/DgsConstants.kt index 272bad39c..eaf0da961 100644 --- a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithNonNullablePrimitiveInList/expected/DgsConstants.kt +++ b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithNonNullablePrimitiveInList/expected/DgsConstants.kt @@ -2,10 +2,8 @@ package com.netflix.graphql.dgs.codegen.cases.dataClassWithNonNullablePrimitiveI import kotlin.String -@jakarta.`annotation`.Generated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) @Generated public object DgsConstants { - @jakarta.`annotation`.Generated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) @Generated public object MYTYPE { public const val TYPE_NAME: String = "MyType" diff --git a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithNonNullablePrimitiveInList/expected/client/MyTypeProjection.kt b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithNonNullablePrimitiveInList/expected/client/MyTypeProjection.kt index f0e11f43c..06cd9ff7e 100644 --- a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithNonNullablePrimitiveInList/expected/client/MyTypeProjection.kt +++ b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithNonNullablePrimitiveInList/expected/client/MyTypeProjection.kt @@ -2,11 +2,9 @@ package com.netflix.graphql.dgs.codegen.cases.dataClassWithNonNullablePrimitiveI import com.netflix.graphql.dgs.client.codegen.InputValueSerializerInterface import com.netflix.graphql.dgs.codegen.GraphQLProjection -import com.netflix.graphql.dgs.codegen.cases.dataClassWithNonNullablePrimitiveInList.expected.Generated as ExpectedGenerated -import jakarta.`annotation`.Generated as AnnotationGenerated +import com.netflix.graphql.dgs.codegen.cases.dataClassWithNonNullablePrimitiveInList.expected.Generated -@AnnotationGenerated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) -@ExpectedGenerated +@Generated public class MyTypeProjection( inputValueSerializer: InputValueSerializerInterface? = null, ) : GraphQLProjection(inputValueSerializer) { diff --git a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithNonNullablePrimitiveInList/expected/types/MyType.kt b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithNonNullablePrimitiveInList/expected/types/MyType.kt index 309c16a74..80bbb1673 100644 --- a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithNonNullablePrimitiveInList/expected/types/MyType.kt +++ b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithNonNullablePrimitiveInList/expected/types/MyType.kt @@ -5,17 +5,15 @@ import com.fasterxml.jackson.`annotation`.JsonProperty import com.fasterxml.jackson.`annotation`.JsonTypeInfo import com.fasterxml.jackson.databind.`annotation`.JsonDeserialize import com.fasterxml.jackson.databind.`annotation`.JsonPOJOBuilder +import com.netflix.graphql.dgs.codegen.cases.dataClassWithNonNullablePrimitiveInList.expected.Generated import java.lang.IllegalStateException import kotlin.Boolean import kotlin.Double import kotlin.Int import kotlin.collections.List import kotlin.jvm.JvmName -import com.netflix.graphql.dgs.codegen.cases.dataClassWithNonNullablePrimitiveInList.expected.Generated as ExpectedGenerated -import jakarta.`annotation`.Generated as AnnotationGenerated -@AnnotationGenerated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) -@ExpectedGenerated +@Generated @JsonTypeInfo(use = JsonTypeInfo.Id.NONE) @JsonDeserialize(builder = MyType.Builder::class) public class MyType( @@ -41,8 +39,7 @@ public class MyType( public val floaty: List? get() = __floaty.invoke() - @AnnotationGenerated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) - @ExpectedGenerated + @Generated public companion object { private val countDefault: () -> List? = { throw IllegalStateException("Field `count` was not requested") } @@ -54,8 +51,7 @@ public class MyType( { throw IllegalStateException("Field `floaty` was not requested") } } - @AnnotationGenerated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) - @ExpectedGenerated + @Generated @JsonPOJOBuilder @JsonIgnoreProperties("__typename") public class Builder { diff --git a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithNonNullableProperties/expected/DgsClient.kt b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithNonNullableProperties/expected/DgsClient.kt index 0e4b59b83..55e944b06 100644 --- a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithNonNullableProperties/expected/DgsClient.kt +++ b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithNonNullableProperties/expected/DgsClient.kt @@ -6,7 +6,6 @@ import com.netflix.graphql.dgs.codegen.cases.dataClassWithNonNullableProperties. import graphql.language.OperationDefinition import kotlin.String -@jakarta.`annotation`.Generated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) @Generated public object DgsClient { public fun buildQuery(inputValueSerializer: InputValueSerializerInterface? = null, diff --git a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithNonNullableProperties/expected/DgsConstants.kt b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithNonNullableProperties/expected/DgsConstants.kt index 259b3095c..e63322ecc 100644 --- a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithNonNullableProperties/expected/DgsConstants.kt +++ b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithNonNullableProperties/expected/DgsConstants.kt @@ -2,12 +2,10 @@ package com.netflix.graphql.dgs.codegen.cases.dataClassWithNonNullableProperties import kotlin.String -@jakarta.`annotation`.Generated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) @Generated public object DgsConstants { public const val QUERY_TYPE: String = "Query" - @jakarta.`annotation`.Generated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) @Generated public object QUERY { public const val TYPE_NAME: String = "Query" @@ -15,7 +13,6 @@ public object DgsConstants { public const val People: String = "people" } - @jakarta.`annotation`.Generated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) @Generated public object PERSON { public const val TYPE_NAME: String = "Person" diff --git a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithNonNullableProperties/expected/client/PersonProjection.kt b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithNonNullableProperties/expected/client/PersonProjection.kt index efc210598..b52d4ee38 100644 --- a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithNonNullableProperties/expected/client/PersonProjection.kt +++ b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithNonNullableProperties/expected/client/PersonProjection.kt @@ -2,11 +2,9 @@ package com.netflix.graphql.dgs.codegen.cases.dataClassWithNonNullableProperties import com.netflix.graphql.dgs.client.codegen.InputValueSerializerInterface import com.netflix.graphql.dgs.codegen.GraphQLProjection -import com.netflix.graphql.dgs.codegen.cases.dataClassWithNonNullableProperties.expected.Generated as ExpectedGenerated -import jakarta.`annotation`.Generated as AnnotationGenerated +import com.netflix.graphql.dgs.codegen.cases.dataClassWithNonNullableProperties.expected.Generated -@AnnotationGenerated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) -@ExpectedGenerated +@Generated public class PersonProjection( inputValueSerializer: InputValueSerializerInterface? = null, ) : GraphQLProjection(inputValueSerializer) { diff --git a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithNonNullableProperties/expected/client/QueryProjection.kt b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithNonNullableProperties/expected/client/QueryProjection.kt index 668e32d6c..8b3f61668 100644 --- a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithNonNullableProperties/expected/client/QueryProjection.kt +++ b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithNonNullableProperties/expected/client/QueryProjection.kt @@ -2,12 +2,10 @@ package com.netflix.graphql.dgs.codegen.cases.dataClassWithNonNullableProperties import com.netflix.graphql.dgs.client.codegen.InputValueSerializerInterface import com.netflix.graphql.dgs.codegen.GraphQLProjection +import com.netflix.graphql.dgs.codegen.cases.dataClassWithNonNullableProperties.expected.Generated import kotlin.String -import com.netflix.graphql.dgs.codegen.cases.dataClassWithNonNullableProperties.expected.Generated as ExpectedGenerated -import jakarta.`annotation`.Generated as AnnotationGenerated -@AnnotationGenerated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) -@ExpectedGenerated +@Generated public class QueryProjection( inputValueSerializer: InputValueSerializerInterface? = null, ) : GraphQLProjection(inputValueSerializer) { diff --git a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithNonNullableProperties/expected/types/Person.kt b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithNonNullableProperties/expected/types/Person.kt index 873f48aeb..df789bf64 100644 --- a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithNonNullableProperties/expected/types/Person.kt +++ b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithNonNullableProperties/expected/types/Person.kt @@ -5,15 +5,13 @@ import com.fasterxml.jackson.`annotation`.JsonProperty import com.fasterxml.jackson.`annotation`.JsonTypeInfo import com.fasterxml.jackson.databind.`annotation`.JsonDeserialize import com.fasterxml.jackson.databind.`annotation`.JsonPOJOBuilder +import com.netflix.graphql.dgs.codegen.cases.dataClassWithNonNullableProperties.expected.Generated import java.lang.IllegalStateException import kotlin.String import kotlin.collections.List import kotlin.jvm.JvmName -import com.netflix.graphql.dgs.codegen.cases.dataClassWithNonNullableProperties.expected.Generated as ExpectedGenerated -import jakarta.`annotation`.Generated as AnnotationGenerated -@AnnotationGenerated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) -@ExpectedGenerated +@Generated @JsonTypeInfo(use = JsonTypeInfo.Id.NONE) @JsonDeserialize(builder = Person.Builder::class) public class Person( @@ -32,8 +30,7 @@ public class Person( public val email: List get() = __email.invoke() - @AnnotationGenerated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) - @ExpectedGenerated + @Generated public companion object { private val nameDefault: () -> String = { throw IllegalStateException("Field `name` was not requested") } @@ -42,8 +39,7 @@ public class Person( { throw IllegalStateException("Field `email` was not requested") } } - @AnnotationGenerated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) - @ExpectedGenerated + @Generated @JsonPOJOBuilder @JsonIgnoreProperties("__typename") public class Builder { diff --git a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithNonNullableProperties/expected/types/Query.kt b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithNonNullableProperties/expected/types/Query.kt index 68fc0a4b6..179851bb1 100644 --- a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithNonNullableProperties/expected/types/Query.kt +++ b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithNonNullableProperties/expected/types/Query.kt @@ -5,14 +5,12 @@ import com.fasterxml.jackson.`annotation`.JsonProperty import com.fasterxml.jackson.`annotation`.JsonTypeInfo import com.fasterxml.jackson.databind.`annotation`.JsonDeserialize import com.fasterxml.jackson.databind.`annotation`.JsonPOJOBuilder +import com.netflix.graphql.dgs.codegen.cases.dataClassWithNonNullableProperties.expected.Generated import java.lang.IllegalStateException import kotlin.collections.List import kotlin.jvm.JvmName -import com.netflix.graphql.dgs.codegen.cases.dataClassWithNonNullableProperties.expected.Generated as ExpectedGenerated -import jakarta.`annotation`.Generated as AnnotationGenerated -@AnnotationGenerated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) -@ExpectedGenerated +@Generated @JsonTypeInfo(use = JsonTypeInfo.Id.NONE) @JsonDeserialize(builder = Query.Builder::class) public class Query( @@ -24,15 +22,13 @@ public class Query( public val people: List? get() = __people.invoke() - @AnnotationGenerated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) - @ExpectedGenerated + @Generated public companion object { private val peopleDefault: () -> List? = { throw IllegalStateException("Field `people` was not requested") } } - @AnnotationGenerated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) - @ExpectedGenerated + @Generated @JsonPOJOBuilder @JsonIgnoreProperties("__typename") public class Builder { diff --git a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithNullablePrimitive/expected/DgsClient.kt b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithNullablePrimitive/expected/DgsClient.kt index 97fdf67bb..ed656db49 100644 --- a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithNullablePrimitive/expected/DgsClient.kt +++ b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithNullablePrimitive/expected/DgsClient.kt @@ -1,5 +1,4 @@ package com.netflix.graphql.dgs.codegen.cases.dataClassWithNullablePrimitive.expected -@jakarta.`annotation`.Generated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) @Generated public object DgsClient diff --git a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithNullablePrimitive/expected/DgsConstants.kt b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithNullablePrimitive/expected/DgsConstants.kt index 118c55471..68bbd54e1 100644 --- a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithNullablePrimitive/expected/DgsConstants.kt +++ b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithNullablePrimitive/expected/DgsConstants.kt @@ -2,10 +2,8 @@ package com.netflix.graphql.dgs.codegen.cases.dataClassWithNullablePrimitive.exp import kotlin.String -@jakarta.`annotation`.Generated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) @Generated public object DgsConstants { - @jakarta.`annotation`.Generated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) @Generated public object MYTYPE { public const val TYPE_NAME: String = "MyType" diff --git a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithNullablePrimitive/expected/client/MyTypeProjection.kt b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithNullablePrimitive/expected/client/MyTypeProjection.kt index a450934ec..9a9888600 100644 --- a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithNullablePrimitive/expected/client/MyTypeProjection.kt +++ b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithNullablePrimitive/expected/client/MyTypeProjection.kt @@ -2,11 +2,9 @@ package com.netflix.graphql.dgs.codegen.cases.dataClassWithNullablePrimitive.exp import com.netflix.graphql.dgs.client.codegen.InputValueSerializerInterface import com.netflix.graphql.dgs.codegen.GraphQLProjection -import com.netflix.graphql.dgs.codegen.cases.dataClassWithNullablePrimitive.expected.Generated as ExpectedGenerated -import jakarta.`annotation`.Generated as AnnotationGenerated +import com.netflix.graphql.dgs.codegen.cases.dataClassWithNullablePrimitive.expected.Generated -@AnnotationGenerated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) -@ExpectedGenerated +@Generated public class MyTypeProjection( inputValueSerializer: InputValueSerializerInterface? = null, ) : GraphQLProjection(inputValueSerializer) { diff --git a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithNullablePrimitive/expected/types/MyType.kt b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithNullablePrimitive/expected/types/MyType.kt index 538a5dcca..f3164c40a 100644 --- a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithNullablePrimitive/expected/types/MyType.kt +++ b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithNullablePrimitive/expected/types/MyType.kt @@ -5,16 +5,14 @@ import com.fasterxml.jackson.`annotation`.JsonProperty import com.fasterxml.jackson.`annotation`.JsonTypeInfo import com.fasterxml.jackson.databind.`annotation`.JsonDeserialize import com.fasterxml.jackson.databind.`annotation`.JsonPOJOBuilder +import com.netflix.graphql.dgs.codegen.cases.dataClassWithNullablePrimitive.expected.Generated import java.lang.IllegalStateException import kotlin.Boolean import kotlin.Double import kotlin.Int import kotlin.jvm.JvmName -import com.netflix.graphql.dgs.codegen.cases.dataClassWithNullablePrimitive.expected.Generated as ExpectedGenerated -import jakarta.`annotation`.Generated as AnnotationGenerated -@AnnotationGenerated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) -@ExpectedGenerated +@Generated @JsonTypeInfo(use = JsonTypeInfo.Id.NONE) @JsonDeserialize(builder = MyType.Builder::class) public class MyType( @@ -40,8 +38,7 @@ public class MyType( public val floaty: Double? get() = __floaty.invoke() - @AnnotationGenerated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) - @ExpectedGenerated + @Generated public companion object { private val countDefault: () -> Int? = { throw IllegalStateException("Field `count` was not requested") } @@ -53,8 +50,7 @@ public class MyType( { throw IllegalStateException("Field `floaty` was not requested") } } - @AnnotationGenerated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) - @ExpectedGenerated + @Generated @JsonPOJOBuilder @JsonIgnoreProperties("__typename") public class Builder { diff --git a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithRecursiveField/expected/DgsClient.kt b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithRecursiveField/expected/DgsClient.kt index d2604516d..84970e6a0 100644 --- a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithRecursiveField/expected/DgsClient.kt +++ b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithRecursiveField/expected/DgsClient.kt @@ -6,7 +6,6 @@ import com.netflix.graphql.dgs.codegen.cases.dataClassWithRecursiveField.expecte import graphql.language.OperationDefinition import kotlin.String -@jakarta.`annotation`.Generated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) @Generated public object DgsClient { public fun buildQuery(inputValueSerializer: InputValueSerializerInterface? = null, diff --git a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithRecursiveField/expected/DgsConstants.kt b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithRecursiveField/expected/DgsConstants.kt index 7b9d1914d..cfc161894 100644 --- a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithRecursiveField/expected/DgsConstants.kt +++ b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithRecursiveField/expected/DgsConstants.kt @@ -2,12 +2,10 @@ package com.netflix.graphql.dgs.codegen.cases.dataClassWithRecursiveField.expect import kotlin.String -@jakarta.`annotation`.Generated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) @Generated public object DgsConstants { public const val QUERY_TYPE: String = "Query" - @jakarta.`annotation`.Generated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) @Generated public object QUERY { public const val TYPE_NAME: String = "Query" @@ -15,7 +13,6 @@ public object DgsConstants { public const val People: String = "people" } - @jakarta.`annotation`.Generated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) @Generated public object PERSON { public const val TYPE_NAME: String = "Person" diff --git a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithRecursiveField/expected/client/PersonProjection.kt b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithRecursiveField/expected/client/PersonProjection.kt index 7182b0bcf..9da7b84a0 100644 --- a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithRecursiveField/expected/client/PersonProjection.kt +++ b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithRecursiveField/expected/client/PersonProjection.kt @@ -2,12 +2,10 @@ package com.netflix.graphql.dgs.codegen.cases.dataClassWithRecursiveField.expect import com.netflix.graphql.dgs.client.codegen.InputValueSerializerInterface import com.netflix.graphql.dgs.codegen.GraphQLProjection +import com.netflix.graphql.dgs.codegen.cases.dataClassWithRecursiveField.expected.Generated import kotlin.String -import com.netflix.graphql.dgs.codegen.cases.dataClassWithRecursiveField.expected.Generated as ExpectedGenerated -import jakarta.`annotation`.Generated as AnnotationGenerated -@AnnotationGenerated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) -@ExpectedGenerated +@Generated public class PersonProjection( inputValueSerializer: InputValueSerializerInterface? = null, ) : GraphQLProjection(inputValueSerializer) { diff --git a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithRecursiveField/expected/client/QueryProjection.kt b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithRecursiveField/expected/client/QueryProjection.kt index ce116cf38..98692bd35 100644 --- a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithRecursiveField/expected/client/QueryProjection.kt +++ b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithRecursiveField/expected/client/QueryProjection.kt @@ -2,12 +2,10 @@ package com.netflix.graphql.dgs.codegen.cases.dataClassWithRecursiveField.expect import com.netflix.graphql.dgs.client.codegen.InputValueSerializerInterface import com.netflix.graphql.dgs.codegen.GraphQLProjection +import com.netflix.graphql.dgs.codegen.cases.dataClassWithRecursiveField.expected.Generated import kotlin.String -import com.netflix.graphql.dgs.codegen.cases.dataClassWithRecursiveField.expected.Generated as ExpectedGenerated -import jakarta.`annotation`.Generated as AnnotationGenerated -@AnnotationGenerated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) -@ExpectedGenerated +@Generated public class QueryProjection( inputValueSerializer: InputValueSerializerInterface? = null, ) : GraphQLProjection(inputValueSerializer) { diff --git a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithRecursiveField/expected/types/Person.kt b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithRecursiveField/expected/types/Person.kt index 5715d0951..351585e13 100644 --- a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithRecursiveField/expected/types/Person.kt +++ b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithRecursiveField/expected/types/Person.kt @@ -5,15 +5,13 @@ import com.fasterxml.jackson.`annotation`.JsonProperty import com.fasterxml.jackson.`annotation`.JsonTypeInfo import com.fasterxml.jackson.databind.`annotation`.JsonDeserialize import com.fasterxml.jackson.databind.`annotation`.JsonPOJOBuilder +import com.netflix.graphql.dgs.codegen.cases.dataClassWithRecursiveField.expected.Generated import java.lang.IllegalStateException import kotlin.String import kotlin.collections.List import kotlin.jvm.JvmName -import com.netflix.graphql.dgs.codegen.cases.dataClassWithRecursiveField.expected.Generated as ExpectedGenerated -import jakarta.`annotation`.Generated as AnnotationGenerated -@AnnotationGenerated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) -@ExpectedGenerated +@Generated @JsonTypeInfo(use = JsonTypeInfo.Id.NONE) @JsonDeserialize(builder = Person.Builder::class) public class Person( @@ -39,8 +37,7 @@ public class Person( public val friends: List? get() = __friends.invoke() - @AnnotationGenerated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) - @ExpectedGenerated + @Generated public companion object { private val firstnameDefault: () -> String? = { throw IllegalStateException("Field `firstname` was not requested") } @@ -52,8 +49,7 @@ public class Person( { throw IllegalStateException("Field `friends` was not requested") } } - @AnnotationGenerated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) - @ExpectedGenerated + @Generated @JsonPOJOBuilder @JsonIgnoreProperties("__typename") public class Builder { diff --git a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithRecursiveField/expected/types/Query.kt b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithRecursiveField/expected/types/Query.kt index 5e814152f..1f1f38107 100644 --- a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithRecursiveField/expected/types/Query.kt +++ b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithRecursiveField/expected/types/Query.kt @@ -5,14 +5,12 @@ import com.fasterxml.jackson.`annotation`.JsonProperty import com.fasterxml.jackson.`annotation`.JsonTypeInfo import com.fasterxml.jackson.databind.`annotation`.JsonDeserialize import com.fasterxml.jackson.databind.`annotation`.JsonPOJOBuilder +import com.netflix.graphql.dgs.codegen.cases.dataClassWithRecursiveField.expected.Generated import java.lang.IllegalStateException import kotlin.collections.List import kotlin.jvm.JvmName -import com.netflix.graphql.dgs.codegen.cases.dataClassWithRecursiveField.expected.Generated as ExpectedGenerated -import jakarta.`annotation`.Generated as AnnotationGenerated -@AnnotationGenerated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) -@ExpectedGenerated +@Generated @JsonTypeInfo(use = JsonTypeInfo.Id.NONE) @JsonDeserialize(builder = Query.Builder::class) public class Query( @@ -24,15 +22,13 @@ public class Query( public val people: List? get() = __people.invoke() - @AnnotationGenerated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) - @ExpectedGenerated + @Generated public companion object { private val peopleDefault: () -> List? = { throw IllegalStateException("Field `people` was not requested") } } - @AnnotationGenerated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) - @ExpectedGenerated + @Generated @JsonPOJOBuilder @JsonIgnoreProperties("__typename") public class Builder { diff --git a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithReservedWord/expected/DgsClient.kt b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithReservedWord/expected/DgsClient.kt index 4f1846926..5274e6eb8 100644 --- a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithReservedWord/expected/DgsClient.kt +++ b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithReservedWord/expected/DgsClient.kt @@ -6,7 +6,6 @@ import com.netflix.graphql.dgs.codegen.cases.dataClassWithReservedWord.expected. import graphql.language.OperationDefinition import kotlin.String -@jakarta.`annotation`.Generated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) @Generated public object DgsClient { public fun buildQuery(inputValueSerializer: InputValueSerializerInterface? = null, diff --git a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithReservedWord/expected/DgsConstants.kt b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithReservedWord/expected/DgsConstants.kt index c893ade14..5bf14139b 100644 --- a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithReservedWord/expected/DgsConstants.kt +++ b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithReservedWord/expected/DgsConstants.kt @@ -2,12 +2,10 @@ package com.netflix.graphql.dgs.codegen.cases.dataClassWithReservedWord.expected import kotlin.String -@jakarta.`annotation`.Generated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) @Generated public object DgsConstants { public const val QUERY_TYPE: String = "Query" - @jakarta.`annotation`.Generated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) @Generated public object SAMPLETYPE { public const val TYPE_NAME: String = "SampleType" @@ -15,7 +13,6 @@ public object DgsConstants { public const val Return: String = "return" } - @jakarta.`annotation`.Generated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) @Generated public object QUERY { public const val TYPE_NAME: String = "Query" @@ -23,7 +20,6 @@ public object DgsConstants { public const val People: String = "people" } - @jakarta.`annotation`.Generated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) @Generated public object PERSON { public const val TYPE_NAME: String = "Person" @@ -32,7 +28,6 @@ public object DgsConstants { public const val Interface: String = "interface" - @jakarta.`annotation`.Generated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) @Generated public object INFO_INPUT_ARGUMENT { public const val Package: String = "package" diff --git a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithReservedWord/expected/client/PersonProjection.kt b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithReservedWord/expected/client/PersonProjection.kt index 7281eef4d..b099832f5 100644 --- a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithReservedWord/expected/client/PersonProjection.kt +++ b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithReservedWord/expected/client/PersonProjection.kt @@ -2,12 +2,10 @@ package com.netflix.graphql.dgs.codegen.cases.dataClassWithReservedWord.expected import com.netflix.graphql.dgs.client.codegen.InputValueSerializerInterface import com.netflix.graphql.dgs.codegen.GraphQLProjection +import com.netflix.graphql.dgs.codegen.cases.dataClassWithReservedWord.expected.Generated import kotlin.String -import com.netflix.graphql.dgs.codegen.cases.dataClassWithReservedWord.expected.Generated as ExpectedGenerated -import jakarta.`annotation`.Generated as AnnotationGenerated -@AnnotationGenerated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) -@ExpectedGenerated +@Generated public class PersonProjection( inputValueSerializer: InputValueSerializerInterface? = null, ) : GraphQLProjection(inputValueSerializer) { diff --git a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithReservedWord/expected/client/QueryProjection.kt b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithReservedWord/expected/client/QueryProjection.kt index 3adda4cd8..cf371eb78 100644 --- a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithReservedWord/expected/client/QueryProjection.kt +++ b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithReservedWord/expected/client/QueryProjection.kt @@ -2,12 +2,10 @@ package com.netflix.graphql.dgs.codegen.cases.dataClassWithReservedWord.expected import com.netflix.graphql.dgs.client.codegen.InputValueSerializerInterface import com.netflix.graphql.dgs.codegen.GraphQLProjection +import com.netflix.graphql.dgs.codegen.cases.dataClassWithReservedWord.expected.Generated import kotlin.String -import com.netflix.graphql.dgs.codegen.cases.dataClassWithReservedWord.expected.Generated as ExpectedGenerated -import jakarta.`annotation`.Generated as AnnotationGenerated -@AnnotationGenerated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) -@ExpectedGenerated +@Generated public class QueryProjection( inputValueSerializer: InputValueSerializerInterface? = null, ) : GraphQLProjection(inputValueSerializer) { diff --git a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithReservedWord/expected/client/SampleTypeProjection.kt b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithReservedWord/expected/client/SampleTypeProjection.kt index 50fe1a8ce..876142373 100644 --- a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithReservedWord/expected/client/SampleTypeProjection.kt +++ b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithReservedWord/expected/client/SampleTypeProjection.kt @@ -2,11 +2,9 @@ package com.netflix.graphql.dgs.codegen.cases.dataClassWithReservedWord.expected import com.netflix.graphql.dgs.client.codegen.InputValueSerializerInterface import com.netflix.graphql.dgs.codegen.GraphQLProjection -import com.netflix.graphql.dgs.codegen.cases.dataClassWithReservedWord.expected.Generated as ExpectedGenerated -import jakarta.`annotation`.Generated as AnnotationGenerated +import com.netflix.graphql.dgs.codegen.cases.dataClassWithReservedWord.expected.Generated -@AnnotationGenerated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) -@ExpectedGenerated +@Generated public class SampleTypeProjection( inputValueSerializer: InputValueSerializerInterface? = null, ) : GraphQLProjection(inputValueSerializer) { diff --git a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithReservedWord/expected/types/Person.kt b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithReservedWord/expected/types/Person.kt index e35ff4625..16166bf4b 100644 --- a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithReservedWord/expected/types/Person.kt +++ b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithReservedWord/expected/types/Person.kt @@ -5,14 +5,12 @@ import com.fasterxml.jackson.`annotation`.JsonProperty import com.fasterxml.jackson.`annotation`.JsonTypeInfo import com.fasterxml.jackson.databind.`annotation`.JsonDeserialize import com.fasterxml.jackson.databind.`annotation`.JsonPOJOBuilder +import com.netflix.graphql.dgs.codegen.cases.dataClassWithReservedWord.expected.Generated import java.lang.IllegalStateException import kotlin.String import kotlin.jvm.JvmName -import com.netflix.graphql.dgs.codegen.cases.dataClassWithReservedWord.expected.Generated as ExpectedGenerated -import jakarta.`annotation`.Generated as AnnotationGenerated -@AnnotationGenerated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) -@ExpectedGenerated +@Generated @JsonTypeInfo(use = JsonTypeInfo.Id.NONE) @JsonDeserialize(builder = Person.Builder::class) public class Person( @@ -31,8 +29,7 @@ public class Person( public val `interface`: String? get() = __interface.invoke() - @AnnotationGenerated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) - @ExpectedGenerated + @Generated public companion object { private val infoDefault: () -> String? = { throw IllegalStateException("Field `info` was not requested") } @@ -41,8 +38,7 @@ public class Person( { throw IllegalStateException("Field `interface` was not requested") } } - @AnnotationGenerated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) - @ExpectedGenerated + @Generated @JsonPOJOBuilder @JsonIgnoreProperties("__typename") public class Builder { diff --git a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithReservedWord/expected/types/Query.kt b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithReservedWord/expected/types/Query.kt index 4ccf9f20f..dfbfa2a3d 100644 --- a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithReservedWord/expected/types/Query.kt +++ b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithReservedWord/expected/types/Query.kt @@ -5,14 +5,12 @@ import com.fasterxml.jackson.`annotation`.JsonProperty import com.fasterxml.jackson.`annotation`.JsonTypeInfo import com.fasterxml.jackson.databind.`annotation`.JsonDeserialize import com.fasterxml.jackson.databind.`annotation`.JsonPOJOBuilder +import com.netflix.graphql.dgs.codegen.cases.dataClassWithReservedWord.expected.Generated import java.lang.IllegalStateException import kotlin.collections.List import kotlin.jvm.JvmName -import com.netflix.graphql.dgs.codegen.cases.dataClassWithReservedWord.expected.Generated as ExpectedGenerated -import jakarta.`annotation`.Generated as AnnotationGenerated -@AnnotationGenerated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) -@ExpectedGenerated +@Generated @JsonTypeInfo(use = JsonTypeInfo.Id.NONE) @JsonDeserialize(builder = Query.Builder::class) public class Query( @@ -24,15 +22,13 @@ public class Query( public val people: List? get() = __people.invoke() - @AnnotationGenerated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) - @ExpectedGenerated + @Generated public companion object { private val peopleDefault: () -> List? = { throw IllegalStateException("Field `people` was not requested") } } - @AnnotationGenerated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) - @ExpectedGenerated + @Generated @JsonPOJOBuilder @JsonIgnoreProperties("__typename") public class Builder { diff --git a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithReservedWord/expected/types/SampleType.kt b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithReservedWord/expected/types/SampleType.kt index decf8ffcf..fec342e08 100644 --- a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithReservedWord/expected/types/SampleType.kt +++ b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithReservedWord/expected/types/SampleType.kt @@ -5,14 +5,12 @@ import com.fasterxml.jackson.`annotation`.JsonProperty import com.fasterxml.jackson.`annotation`.JsonTypeInfo import com.fasterxml.jackson.databind.`annotation`.JsonDeserialize import com.fasterxml.jackson.databind.`annotation`.JsonPOJOBuilder +import com.netflix.graphql.dgs.codegen.cases.dataClassWithReservedWord.expected.Generated import java.lang.IllegalStateException import kotlin.String import kotlin.jvm.JvmName -import com.netflix.graphql.dgs.codegen.cases.dataClassWithReservedWord.expected.Generated as ExpectedGenerated -import jakarta.`annotation`.Generated as AnnotationGenerated -@AnnotationGenerated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) -@ExpectedGenerated +@Generated @JsonTypeInfo(use = JsonTypeInfo.Id.NONE) @JsonDeserialize(builder = SampleType.Builder::class) public class SampleType( @@ -24,15 +22,13 @@ public class SampleType( public val `return`: String get() = __return.invoke() - @AnnotationGenerated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) - @ExpectedGenerated + @Generated public companion object { private val returnDefault: () -> String = { throw IllegalStateException("Field `return` was not requested") } } - @AnnotationGenerated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) - @ExpectedGenerated + @Generated @JsonPOJOBuilder @JsonIgnoreProperties("__typename") public class Builder { diff --git a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithStringProperties/expected/DgsClient.kt b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithStringProperties/expected/DgsClient.kt index 0f2e14ed2..b108c8db9 100644 --- a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithStringProperties/expected/DgsClient.kt +++ b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithStringProperties/expected/DgsClient.kt @@ -6,7 +6,6 @@ import com.netflix.graphql.dgs.codegen.cases.dataClassWithStringProperties.expec import graphql.language.OperationDefinition import kotlin.String -@jakarta.`annotation`.Generated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) @Generated public object DgsClient { public fun buildQuery(inputValueSerializer: InputValueSerializerInterface? = null, diff --git a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithStringProperties/expected/DgsConstants.kt b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithStringProperties/expected/DgsConstants.kt index 1cc9de635..7caefae4c 100644 --- a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithStringProperties/expected/DgsConstants.kt +++ b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithStringProperties/expected/DgsConstants.kt @@ -2,12 +2,10 @@ package com.netflix.graphql.dgs.codegen.cases.dataClassWithStringProperties.expe import kotlin.String -@jakarta.`annotation`.Generated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) @Generated public object DgsConstants { public const val QUERY_TYPE: String = "Query" - @jakarta.`annotation`.Generated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) @Generated public object QUERY { public const val TYPE_NAME: String = "Query" @@ -15,7 +13,6 @@ public object DgsConstants { public const val People: String = "people" } - @jakarta.`annotation`.Generated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) @Generated public object PERSON { public const val TYPE_NAME: String = "Person" diff --git a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithStringProperties/expected/client/PersonProjection.kt b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithStringProperties/expected/client/PersonProjection.kt index 4d0b6d7c9..a93dd9bf9 100644 --- a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithStringProperties/expected/client/PersonProjection.kt +++ b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithStringProperties/expected/client/PersonProjection.kt @@ -2,11 +2,9 @@ package com.netflix.graphql.dgs.codegen.cases.dataClassWithStringProperties.expe import com.netflix.graphql.dgs.client.codegen.InputValueSerializerInterface import com.netflix.graphql.dgs.codegen.GraphQLProjection -import com.netflix.graphql.dgs.codegen.cases.dataClassWithStringProperties.expected.Generated as ExpectedGenerated -import jakarta.`annotation`.Generated as AnnotationGenerated +import com.netflix.graphql.dgs.codegen.cases.dataClassWithStringProperties.expected.Generated -@AnnotationGenerated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) -@ExpectedGenerated +@Generated public class PersonProjection( inputValueSerializer: InputValueSerializerInterface? = null, ) : GraphQLProjection(inputValueSerializer) { diff --git a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithStringProperties/expected/client/QueryProjection.kt b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithStringProperties/expected/client/QueryProjection.kt index f1ca4ca34..e745830ff 100644 --- a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithStringProperties/expected/client/QueryProjection.kt +++ b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithStringProperties/expected/client/QueryProjection.kt @@ -2,12 +2,10 @@ package com.netflix.graphql.dgs.codegen.cases.dataClassWithStringProperties.expe import com.netflix.graphql.dgs.client.codegen.InputValueSerializerInterface import com.netflix.graphql.dgs.codegen.GraphQLProjection +import com.netflix.graphql.dgs.codegen.cases.dataClassWithStringProperties.expected.Generated import kotlin.String -import com.netflix.graphql.dgs.codegen.cases.dataClassWithStringProperties.expected.Generated as ExpectedGenerated -import jakarta.`annotation`.Generated as AnnotationGenerated -@AnnotationGenerated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) -@ExpectedGenerated +@Generated public class QueryProjection( inputValueSerializer: InputValueSerializerInterface? = null, ) : GraphQLProjection(inputValueSerializer) { diff --git a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithStringProperties/expected/types/Person.kt b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithStringProperties/expected/types/Person.kt index 05f6b721a..a719af1c7 100644 --- a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithStringProperties/expected/types/Person.kt +++ b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithStringProperties/expected/types/Person.kt @@ -5,14 +5,12 @@ import com.fasterxml.jackson.`annotation`.JsonProperty import com.fasterxml.jackson.`annotation`.JsonTypeInfo import com.fasterxml.jackson.databind.`annotation`.JsonDeserialize import com.fasterxml.jackson.databind.`annotation`.JsonPOJOBuilder +import com.netflix.graphql.dgs.codegen.cases.dataClassWithStringProperties.expected.Generated import java.lang.IllegalStateException import kotlin.String import kotlin.jvm.JvmName -import com.netflix.graphql.dgs.codegen.cases.dataClassWithStringProperties.expected.Generated as ExpectedGenerated -import jakarta.`annotation`.Generated as AnnotationGenerated -@AnnotationGenerated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) -@ExpectedGenerated +@Generated @JsonTypeInfo(use = JsonTypeInfo.Id.NONE) @JsonDeserialize(builder = Person.Builder::class) public class Person( @@ -31,8 +29,7 @@ public class Person( public val lastname: String? get() = __lastname.invoke() - @AnnotationGenerated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) - @ExpectedGenerated + @Generated public companion object { private val firstnameDefault: () -> String? = { throw IllegalStateException("Field `firstname` was not requested") } @@ -41,8 +38,7 @@ public class Person( { throw IllegalStateException("Field `lastname` was not requested") } } - @AnnotationGenerated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) - @ExpectedGenerated + @Generated @JsonPOJOBuilder @JsonIgnoreProperties("__typename") public class Builder { diff --git a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithStringProperties/expected/types/Query.kt b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithStringProperties/expected/types/Query.kt index 17ef0d3ea..aef99ad49 100644 --- a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithStringProperties/expected/types/Query.kt +++ b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithStringProperties/expected/types/Query.kt @@ -5,14 +5,12 @@ import com.fasterxml.jackson.`annotation`.JsonProperty import com.fasterxml.jackson.`annotation`.JsonTypeInfo import com.fasterxml.jackson.databind.`annotation`.JsonDeserialize import com.fasterxml.jackson.databind.`annotation`.JsonPOJOBuilder +import com.netflix.graphql.dgs.codegen.cases.dataClassWithStringProperties.expected.Generated import java.lang.IllegalStateException import kotlin.collections.List import kotlin.jvm.JvmName -import com.netflix.graphql.dgs.codegen.cases.dataClassWithStringProperties.expected.Generated as ExpectedGenerated -import jakarta.`annotation`.Generated as AnnotationGenerated -@AnnotationGenerated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) -@ExpectedGenerated +@Generated @JsonTypeInfo(use = JsonTypeInfo.Id.NONE) @JsonDeserialize(builder = Query.Builder::class) public class Query( @@ -24,15 +22,13 @@ public class Query( public val people: List? get() = __people.invoke() - @AnnotationGenerated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) - @ExpectedGenerated + @Generated public companion object { private val peopleDefault: () -> List? = { throw IllegalStateException("Field `people` was not requested") } } - @AnnotationGenerated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) - @ExpectedGenerated + @Generated @JsonPOJOBuilder @JsonIgnoreProperties("__typename") public class Builder { diff --git a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/enum/expected/DgsClient.kt b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/enum/expected/DgsClient.kt index da56d639e..b83aff448 100644 --- a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/enum/expected/DgsClient.kt +++ b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/enum/expected/DgsClient.kt @@ -6,7 +6,6 @@ import com.netflix.graphql.dgs.codegen.cases.`enum`.expected.client.QueryProject import graphql.language.OperationDefinition import kotlin.String -@jakarta.`annotation`.Generated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) @Generated public object DgsClient { public fun buildQuery(inputValueSerializer: InputValueSerializerInterface? = null, diff --git a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/enum/expected/DgsConstants.kt b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/enum/expected/DgsConstants.kt index 11dfaa75f..714eac8bd 100644 --- a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/enum/expected/DgsConstants.kt +++ b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/enum/expected/DgsConstants.kt @@ -2,12 +2,10 @@ package com.netflix.graphql.dgs.codegen.cases.`enum`.expected import kotlin.String -@jakarta.`annotation`.Generated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) @Generated public object DgsConstants { public const val QUERY_TYPE: String = "Query" - @jakarta.`annotation`.Generated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) @Generated public object QUERY { public const val TYPE_NAME: String = "Query" diff --git a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/enum/expected/client/QueryProjection.kt b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/enum/expected/client/QueryProjection.kt index 387ba6517..5ce5db1e4 100644 --- a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/enum/expected/client/QueryProjection.kt +++ b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/enum/expected/client/QueryProjection.kt @@ -2,11 +2,9 @@ package com.netflix.graphql.dgs.codegen.cases.`enum`.expected.client import com.netflix.graphql.dgs.client.codegen.InputValueSerializerInterface import com.netflix.graphql.dgs.codegen.GraphQLProjection -import com.netflix.graphql.dgs.codegen.cases.`enum`.expected.Generated as ExpectedGenerated -import jakarta.`annotation`.Generated as AnnotationGenerated +import com.netflix.graphql.dgs.codegen.cases.`enum`.expected.Generated -@AnnotationGenerated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) -@ExpectedGenerated +@Generated public class QueryProjection( inputValueSerializer: InputValueSerializerInterface? = null, ) : GraphQLProjection(inputValueSerializer) { diff --git a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/enum/expected/types/EmployeeTypes.kt b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/enum/expected/types/EmployeeTypes.kt index d547fe304..95fca1804 100644 --- a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/enum/expected/types/EmployeeTypes.kt +++ b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/enum/expected/types/EmployeeTypes.kt @@ -1,23 +1,17 @@ package com.netflix.graphql.dgs.codegen.cases.`enum`.expected.types -import com.netflix.graphql.dgs.codegen.cases.`enum`.expected.Generated as ExpectedGenerated -import jakarta.`annotation`.Generated as AnnotationGenerated +import com.netflix.graphql.dgs.codegen.cases.`enum`.expected.Generated -@AnnotationGenerated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) -@ExpectedGenerated +@Generated public enum class EmployeeTypes { - @AnnotationGenerated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) - @ExpectedGenerated + @Generated ENGINEER, - @AnnotationGenerated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) - @ExpectedGenerated + @Generated MANAGER, - @AnnotationGenerated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) - @ExpectedGenerated + @Generated DIRECTOR, ; - @AnnotationGenerated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) - @ExpectedGenerated + @Generated public companion object } diff --git a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/enum/expected/types/Query.kt b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/enum/expected/types/Query.kt index 3b32c1e85..2c519850d 100644 --- a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/enum/expected/types/Query.kt +++ b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/enum/expected/types/Query.kt @@ -5,14 +5,12 @@ import com.fasterxml.jackson.`annotation`.JsonProperty import com.fasterxml.jackson.`annotation`.JsonTypeInfo import com.fasterxml.jackson.databind.`annotation`.JsonDeserialize import com.fasterxml.jackson.databind.`annotation`.JsonPOJOBuilder +import com.netflix.graphql.dgs.codegen.cases.`enum`.expected.Generated import java.lang.IllegalStateException import kotlin.collections.List import kotlin.jvm.JvmName -import com.netflix.graphql.dgs.codegen.cases.`enum`.expected.Generated as ExpectedGenerated -import jakarta.`annotation`.Generated as AnnotationGenerated -@AnnotationGenerated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) -@ExpectedGenerated +@Generated @JsonTypeInfo(use = JsonTypeInfo.Id.NONE) @JsonDeserialize(builder = Query.Builder::class) public class Query( @@ -24,15 +22,13 @@ public class Query( public val types: List? get() = __types.invoke() - @AnnotationGenerated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) - @ExpectedGenerated + @Generated public companion object { private val typesDefault: () -> List? = { throw IllegalStateException("Field `types` was not requested") } } - @AnnotationGenerated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) - @ExpectedGenerated + @Generated @JsonPOJOBuilder @JsonIgnoreProperties("__typename") public class Builder { diff --git a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/enumDocs/expected/DgsClient.kt b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/enumDocs/expected/DgsClient.kt index 15ddd436b..81cc6f2e2 100644 --- a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/enumDocs/expected/DgsClient.kt +++ b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/enumDocs/expected/DgsClient.kt @@ -1,5 +1,4 @@ package com.netflix.graphql.dgs.codegen.cases.enumDocs.expected -@jakarta.`annotation`.Generated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) @Generated public object DgsClient diff --git a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/enumDocs/expected/DgsConstants.kt b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/enumDocs/expected/DgsConstants.kt index c76d29c36..b44aa2f04 100644 --- a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/enumDocs/expected/DgsConstants.kt +++ b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/enumDocs/expected/DgsConstants.kt @@ -1,5 +1,4 @@ package com.netflix.graphql.dgs.codegen.cases.enumDocs.expected -@jakarta.`annotation`.Generated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) @Generated public object DgsConstants diff --git a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/enumDocs/expected/types/Color.kt b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/enumDocs/expected/types/Color.kt index a290d2cd1..de3cd2922 100644 --- a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/enumDocs/expected/types/Color.kt +++ b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/enumDocs/expected/types/Color.kt @@ -1,26 +1,20 @@ package com.netflix.graphql.dgs.codegen.cases.enumDocs.expected.types -import com.netflix.graphql.dgs.codegen.cases.enumDocs.expected.Generated as ExpectedGenerated -import jakarta.`annotation`.Generated as AnnotationGenerated +import com.netflix.graphql.dgs.codegen.cases.enumDocs.expected.Generated /** * Some options */ -@AnnotationGenerated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) -@ExpectedGenerated +@Generated public enum class Color { - @AnnotationGenerated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) - @ExpectedGenerated + @Generated red, - @AnnotationGenerated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) - @ExpectedGenerated + @Generated white, - @AnnotationGenerated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) - @ExpectedGenerated + @Generated blue, ; - @AnnotationGenerated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) - @ExpectedGenerated + @Generated public companion object } diff --git a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/enumWithExtendedType/expected/DgsClient.kt b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/enumWithExtendedType/expected/DgsClient.kt index 5c78d9ca3..354dbeda2 100644 --- a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/enumWithExtendedType/expected/DgsClient.kt +++ b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/enumWithExtendedType/expected/DgsClient.kt @@ -6,7 +6,6 @@ import com.netflix.graphql.dgs.codegen.cases.enumWithExtendedType.expected.clien import graphql.language.OperationDefinition import kotlin.String -@jakarta.`annotation`.Generated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) @Generated public object DgsClient { public fun buildQuery(inputValueSerializer: InputValueSerializerInterface? = null, diff --git a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/enumWithExtendedType/expected/DgsConstants.kt b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/enumWithExtendedType/expected/DgsConstants.kt index 67290df1e..e1f72a144 100644 --- a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/enumWithExtendedType/expected/DgsConstants.kt +++ b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/enumWithExtendedType/expected/DgsConstants.kt @@ -2,12 +2,10 @@ package com.netflix.graphql.dgs.codegen.cases.enumWithExtendedType.expected import kotlin.String -@jakarta.`annotation`.Generated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) @Generated public object DgsConstants { public const val QUERY_TYPE: String = "Query" - @jakarta.`annotation`.Generated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) @Generated public object QUERY { public const val TYPE_NAME: String = "Query" diff --git a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/enumWithExtendedType/expected/client/QueryProjection.kt b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/enumWithExtendedType/expected/client/QueryProjection.kt index f55421133..0f8236088 100644 --- a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/enumWithExtendedType/expected/client/QueryProjection.kt +++ b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/enumWithExtendedType/expected/client/QueryProjection.kt @@ -2,11 +2,9 @@ package com.netflix.graphql.dgs.codegen.cases.enumWithExtendedType.expected.clie import com.netflix.graphql.dgs.client.codegen.InputValueSerializerInterface import com.netflix.graphql.dgs.codegen.GraphQLProjection -import com.netflix.graphql.dgs.codegen.cases.enumWithExtendedType.expected.Generated as ExpectedGenerated -import jakarta.`annotation`.Generated as AnnotationGenerated +import com.netflix.graphql.dgs.codegen.cases.enumWithExtendedType.expected.Generated -@AnnotationGenerated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) -@ExpectedGenerated +@Generated public class QueryProjection( inputValueSerializer: InputValueSerializerInterface? = null, ) : GraphQLProjection(inputValueSerializer) { diff --git a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/enumWithExtendedType/expected/types/EmployeeTypes.kt b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/enumWithExtendedType/expected/types/EmployeeTypes.kt index 52764f431..1fffb3b4e 100644 --- a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/enumWithExtendedType/expected/types/EmployeeTypes.kt +++ b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/enumWithExtendedType/expected/types/EmployeeTypes.kt @@ -1,26 +1,19 @@ package com.netflix.graphql.dgs.codegen.cases.enumWithExtendedType.expected.types -import com.netflix.graphql.dgs.codegen.cases.enumWithExtendedType.expected.Generated as ExpectedGenerated -import jakarta.`annotation`.Generated as AnnotationGenerated +import com.netflix.graphql.dgs.codegen.cases.enumWithExtendedType.expected.Generated -@AnnotationGenerated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) -@ExpectedGenerated +@Generated public enum class EmployeeTypes { - @AnnotationGenerated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) - @ExpectedGenerated + @Generated ENGINEER, - @AnnotationGenerated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) - @ExpectedGenerated + @Generated MANAGER, - @AnnotationGenerated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) - @ExpectedGenerated + @Generated DIRECTOR, - @AnnotationGenerated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) - @ExpectedGenerated + @Generated QA, ; - @AnnotationGenerated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) - @ExpectedGenerated + @Generated public companion object } diff --git a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/enumWithExtendedType/expected/types/Query.kt b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/enumWithExtendedType/expected/types/Query.kt index 149d36d9b..04d3b8024 100644 --- a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/enumWithExtendedType/expected/types/Query.kt +++ b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/enumWithExtendedType/expected/types/Query.kt @@ -5,14 +5,12 @@ import com.fasterxml.jackson.`annotation`.JsonProperty import com.fasterxml.jackson.`annotation`.JsonTypeInfo import com.fasterxml.jackson.databind.`annotation`.JsonDeserialize import com.fasterxml.jackson.databind.`annotation`.JsonPOJOBuilder +import com.netflix.graphql.dgs.codegen.cases.enumWithExtendedType.expected.Generated import java.lang.IllegalStateException import kotlin.collections.List import kotlin.jvm.JvmName -import com.netflix.graphql.dgs.codegen.cases.enumWithExtendedType.expected.Generated as ExpectedGenerated -import jakarta.`annotation`.Generated as AnnotationGenerated -@AnnotationGenerated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) -@ExpectedGenerated +@Generated @JsonTypeInfo(use = JsonTypeInfo.Id.NONE) @JsonDeserialize(builder = Query.Builder::class) public class Query( @@ -24,15 +22,13 @@ public class Query( public val types: List? get() = __types.invoke() - @AnnotationGenerated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) - @ExpectedGenerated + @Generated public companion object { private val typesDefault: () -> List? = { throw IllegalStateException("Field `types` was not requested") } } - @AnnotationGenerated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) - @ExpectedGenerated + @Generated @JsonPOJOBuilder @JsonIgnoreProperties("__typename") public class Builder { diff --git a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/extendedDataClassWithInterface/expected/DgsClient.kt b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/extendedDataClassWithInterface/expected/DgsClient.kt index eae204b7e..9889df695 100644 --- a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/extendedDataClassWithInterface/expected/DgsClient.kt +++ b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/extendedDataClassWithInterface/expected/DgsClient.kt @@ -1,5 +1,4 @@ package com.netflix.graphql.dgs.codegen.cases.extendedDataClassWithInterface.expected -@jakarta.`annotation`.Generated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) @Generated public object DgsClient diff --git a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/extendedDataClassWithInterface/expected/DgsConstants.kt b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/extendedDataClassWithInterface/expected/DgsConstants.kt index bf91a747b..9d912362e 100644 --- a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/extendedDataClassWithInterface/expected/DgsConstants.kt +++ b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/extendedDataClassWithInterface/expected/DgsConstants.kt @@ -2,10 +2,8 @@ package com.netflix.graphql.dgs.codegen.cases.extendedDataClassWithInterface.exp import kotlin.String -@jakarta.`annotation`.Generated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) @Generated public object DgsConstants { - @jakarta.`annotation`.Generated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) @Generated public object EXAMPLE { public const val TYPE_NAME: String = "Example" @@ -15,7 +13,6 @@ public object DgsConstants { public const val Age: String = "age" } - @jakarta.`annotation`.Generated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) @Generated public object A { public const val TYPE_NAME: String = "A" @@ -23,7 +20,6 @@ public object DgsConstants { public const val Name: String = "name" } - @jakarta.`annotation`.Generated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) @Generated public object B { public const val TYPE_NAME: String = "B" diff --git a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/extendedDataClassWithInterface/expected/client/AProjection.kt b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/extendedDataClassWithInterface/expected/client/AProjection.kt index 74ec7f3e7..ebb8a9015 100644 --- a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/extendedDataClassWithInterface/expected/client/AProjection.kt +++ b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/extendedDataClassWithInterface/expected/client/AProjection.kt @@ -2,11 +2,9 @@ package com.netflix.graphql.dgs.codegen.cases.extendedDataClassWithInterface.exp import com.netflix.graphql.dgs.client.codegen.InputValueSerializerInterface import com.netflix.graphql.dgs.codegen.GraphQLProjection -import com.netflix.graphql.dgs.codegen.cases.extendedDataClassWithInterface.expected.Generated as ExpectedGenerated -import jakarta.`annotation`.Generated as AnnotationGenerated +import com.netflix.graphql.dgs.codegen.cases.extendedDataClassWithInterface.expected.Generated -@AnnotationGenerated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) -@ExpectedGenerated +@Generated public class AProjection( inputValueSerializer: InputValueSerializerInterface? = null, ) : GraphQLProjection(inputValueSerializer) { diff --git a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/extendedDataClassWithInterface/expected/client/BProjection.kt b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/extendedDataClassWithInterface/expected/client/BProjection.kt index 7b5fdda77..899817948 100644 --- a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/extendedDataClassWithInterface/expected/client/BProjection.kt +++ b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/extendedDataClassWithInterface/expected/client/BProjection.kt @@ -2,11 +2,9 @@ package com.netflix.graphql.dgs.codegen.cases.extendedDataClassWithInterface.exp import com.netflix.graphql.dgs.client.codegen.InputValueSerializerInterface import com.netflix.graphql.dgs.codegen.GraphQLProjection -import com.netflix.graphql.dgs.codegen.cases.extendedDataClassWithInterface.expected.Generated as ExpectedGenerated -import jakarta.`annotation`.Generated as AnnotationGenerated +import com.netflix.graphql.dgs.codegen.cases.extendedDataClassWithInterface.expected.Generated -@AnnotationGenerated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) -@ExpectedGenerated +@Generated public class BProjection( inputValueSerializer: InputValueSerializerInterface? = null, ) : GraphQLProjection(inputValueSerializer) { diff --git a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/extendedDataClassWithInterface/expected/client/ExampleProjection.kt b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/extendedDataClassWithInterface/expected/client/ExampleProjection.kt index 4ef142dc5..be3e16785 100644 --- a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/extendedDataClassWithInterface/expected/client/ExampleProjection.kt +++ b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/extendedDataClassWithInterface/expected/client/ExampleProjection.kt @@ -2,11 +2,9 @@ package com.netflix.graphql.dgs.codegen.cases.extendedDataClassWithInterface.exp import com.netflix.graphql.dgs.client.codegen.InputValueSerializerInterface import com.netflix.graphql.dgs.codegen.GraphQLProjection -import com.netflix.graphql.dgs.codegen.cases.extendedDataClassWithInterface.expected.Generated as ExpectedGenerated -import jakarta.`annotation`.Generated as AnnotationGenerated +import com.netflix.graphql.dgs.codegen.cases.extendedDataClassWithInterface.expected.Generated -@AnnotationGenerated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) -@ExpectedGenerated +@Generated public class ExampleProjection( inputValueSerializer: InputValueSerializerInterface? = null, ) : GraphQLProjection(inputValueSerializer) { diff --git a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/extendedDataClassWithInterface/expected/types/A.kt b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/extendedDataClassWithInterface/expected/types/A.kt index 4a385b80d..e115aef17 100644 --- a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/extendedDataClassWithInterface/expected/types/A.kt +++ b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/extendedDataClassWithInterface/expected/types/A.kt @@ -2,14 +2,12 @@ package com.netflix.graphql.dgs.codegen.cases.extendedDataClassWithInterface.exp import com.fasterxml.jackson.`annotation`.JsonSubTypes import com.fasterxml.jackson.`annotation`.JsonTypeInfo +import com.netflix.graphql.dgs.codegen.cases.extendedDataClassWithInterface.expected.Generated import kotlin.String import kotlin.Suppress import kotlin.jvm.JvmName -import com.netflix.graphql.dgs.codegen.cases.extendedDataClassWithInterface.expected.Generated as ExpectedGenerated -import jakarta.`annotation`.Generated as AnnotationGenerated -@AnnotationGenerated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) -@ExpectedGenerated +@Generated @JsonTypeInfo( use = JsonTypeInfo.Id.NAME, include = JsonTypeInfo.As.PROPERTY, diff --git a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/extendedDataClassWithInterface/expected/types/B.kt b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/extendedDataClassWithInterface/expected/types/B.kt index 8a2ede791..0916e1f74 100644 --- a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/extendedDataClassWithInterface/expected/types/B.kt +++ b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/extendedDataClassWithInterface/expected/types/B.kt @@ -2,14 +2,12 @@ package com.netflix.graphql.dgs.codegen.cases.extendedDataClassWithInterface.exp import com.fasterxml.jackson.`annotation`.JsonSubTypes import com.fasterxml.jackson.`annotation`.JsonTypeInfo +import com.netflix.graphql.dgs.codegen.cases.extendedDataClassWithInterface.expected.Generated import kotlin.Int import kotlin.Suppress import kotlin.jvm.JvmName -import com.netflix.graphql.dgs.codegen.cases.extendedDataClassWithInterface.expected.Generated as ExpectedGenerated -import jakarta.`annotation`.Generated as AnnotationGenerated -@AnnotationGenerated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) -@ExpectedGenerated +@Generated @JsonTypeInfo( use = JsonTypeInfo.Id.NAME, include = JsonTypeInfo.As.PROPERTY, diff --git a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/extendedDataClassWithInterface/expected/types/Example.kt b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/extendedDataClassWithInterface/expected/types/Example.kt index f0e2c1897..1e5f76c2b 100644 --- a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/extendedDataClassWithInterface/expected/types/Example.kt +++ b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/extendedDataClassWithInterface/expected/types/Example.kt @@ -5,16 +5,14 @@ import com.fasterxml.jackson.`annotation`.JsonProperty import com.fasterxml.jackson.`annotation`.JsonTypeInfo import com.fasterxml.jackson.databind.`annotation`.JsonDeserialize import com.fasterxml.jackson.databind.`annotation`.JsonPOJOBuilder +import com.netflix.graphql.dgs.codegen.cases.extendedDataClassWithInterface.expected.Generated import java.lang.IllegalStateException import kotlin.Int import kotlin.String import kotlin.Suppress import kotlin.jvm.JvmName -import com.netflix.graphql.dgs.codegen.cases.extendedDataClassWithInterface.expected.Generated as ExpectedGenerated -import jakarta.`annotation`.Generated as AnnotationGenerated -@AnnotationGenerated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) -@ExpectedGenerated +@Generated @JsonTypeInfo(use = JsonTypeInfo.Id.NONE) @JsonDeserialize(builder = Example.Builder::class) public class Example( @@ -36,8 +34,7 @@ public class Example( override val age: Int? get() = __age.invoke() - @AnnotationGenerated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) - @ExpectedGenerated + @Generated public companion object { private val nameDefault: () -> String? = { throw IllegalStateException("Field `name` was not requested") } @@ -46,8 +43,7 @@ public class Example( { throw IllegalStateException("Field `age` was not requested") } } - @AnnotationGenerated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) - @ExpectedGenerated + @Generated @JsonPOJOBuilder @JsonIgnoreProperties("__typename") public class Builder { diff --git a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/input/expected/DgsClient.kt b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/input/expected/DgsClient.kt index cbb0d780c..6025dd6fb 100644 --- a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/input/expected/DgsClient.kt +++ b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/input/expected/DgsClient.kt @@ -6,7 +6,6 @@ import com.netflix.graphql.dgs.codegen.cases.input.expected.client.QueryProjecti import graphql.language.OperationDefinition import kotlin.String -@jakarta.`annotation`.Generated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) @Generated public object DgsClient { public fun buildQuery(inputValueSerializer: InputValueSerializerInterface? = null, diff --git a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/input/expected/DgsConstants.kt b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/input/expected/DgsConstants.kt index 407e3d61d..23b32de5b 100644 --- a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/input/expected/DgsConstants.kt +++ b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/input/expected/DgsConstants.kt @@ -2,26 +2,22 @@ package com.netflix.graphql.dgs.codegen.cases.input.expected import kotlin.String -@jakarta.`annotation`.Generated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) @Generated public object DgsConstants { public const val QUERY_TYPE: String = "Query" - @jakarta.`annotation`.Generated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) @Generated public object QUERY { public const val TYPE_NAME: String = "Query" public const val Movies: String = "movies" - @jakarta.`annotation`.Generated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) @Generated public object MOVIES_INPUT_ARGUMENT { public const val Filter: String = "filter" } } - @jakarta.`annotation`.Generated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) @Generated public object MOVIEFILTER { public const val TYPE_NAME: String = "MovieFilter" diff --git a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/input/expected/client/QueryProjection.kt b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/input/expected/client/QueryProjection.kt index bdbe88070..ec8496240 100644 --- a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/input/expected/client/QueryProjection.kt +++ b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/input/expected/client/QueryProjection.kt @@ -2,12 +2,10 @@ package com.netflix.graphql.dgs.codegen.cases.input.expected.client import com.netflix.graphql.dgs.client.codegen.InputValueSerializerInterface import com.netflix.graphql.dgs.codegen.GraphQLProjection +import com.netflix.graphql.dgs.codegen.cases.input.expected.Generated import com.netflix.graphql.dgs.codegen.cases.input.expected.types.MovieFilter -import com.netflix.graphql.dgs.codegen.cases.input.expected.Generated as ExpectedGenerated -import jakarta.`annotation`.Generated as AnnotationGenerated -@AnnotationGenerated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) -@ExpectedGenerated +@Generated public class QueryProjection( inputValueSerializer: InputValueSerializerInterface? = null, ) : GraphQLProjection(inputValueSerializer) { diff --git a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/input/expected/types/MovieFilter.kt b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/input/expected/types/MovieFilter.kt index a77b6bafb..63607166d 100644 --- a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/input/expected/types/MovieFilter.kt +++ b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/input/expected/types/MovieFilter.kt @@ -2,15 +2,13 @@ package com.netflix.graphql.dgs.codegen.cases.input.expected.types import com.fasterxml.jackson.`annotation`.JsonProperty import com.netflix.graphql.dgs.codegen.GraphQLInput +import com.netflix.graphql.dgs.codegen.cases.input.expected.Generated import kotlin.Any import kotlin.Pair import kotlin.String import kotlin.collections.List -import com.netflix.graphql.dgs.codegen.cases.input.expected.Generated as ExpectedGenerated -import jakarta.`annotation`.Generated as AnnotationGenerated -@AnnotationGenerated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) -@ExpectedGenerated +@Generated public data class MovieFilter( @JsonProperty("genre") public val genre: String? = default("genre", null), diff --git a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/input/expected/types/Query.kt b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/input/expected/types/Query.kt index 602ab4bb9..83f27dc51 100644 --- a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/input/expected/types/Query.kt +++ b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/input/expected/types/Query.kt @@ -5,15 +5,13 @@ import com.fasterxml.jackson.`annotation`.JsonProperty import com.fasterxml.jackson.`annotation`.JsonTypeInfo import com.fasterxml.jackson.databind.`annotation`.JsonDeserialize import com.fasterxml.jackson.databind.`annotation`.JsonPOJOBuilder +import com.netflix.graphql.dgs.codegen.cases.input.expected.Generated import java.lang.IllegalStateException import kotlin.String import kotlin.collections.List import kotlin.jvm.JvmName -import com.netflix.graphql.dgs.codegen.cases.input.expected.Generated as ExpectedGenerated -import jakarta.`annotation`.Generated as AnnotationGenerated -@AnnotationGenerated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) -@ExpectedGenerated +@Generated @JsonTypeInfo(use = JsonTypeInfo.Id.NONE) @JsonDeserialize(builder = Query.Builder::class) public class Query( @@ -25,15 +23,13 @@ public class Query( public val movies: List? get() = __movies.invoke() - @AnnotationGenerated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) - @ExpectedGenerated + @Generated public companion object { private val moviesDefault: () -> List? = { throw IllegalStateException("Field `movies` was not requested") } } - @AnnotationGenerated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) - @ExpectedGenerated + @Generated @JsonPOJOBuilder @JsonIgnoreProperties("__typename") public class Builder { diff --git a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/inputWithDefaultBigDecimal/expected/DgsClient.kt b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/inputWithDefaultBigDecimal/expected/DgsClient.kt index c8c10a4a4..a29c7bbe7 100644 --- a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/inputWithDefaultBigDecimal/expected/DgsClient.kt +++ b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/inputWithDefaultBigDecimal/expected/DgsClient.kt @@ -6,7 +6,6 @@ import com.netflix.graphql.dgs.codegen.cases.inputWithDefaultBigDecimal.expected import graphql.language.OperationDefinition import kotlin.String -@jakarta.`annotation`.Generated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) @Generated public object DgsClient { public fun buildQuery(inputValueSerializer: InputValueSerializerInterface? = null, diff --git a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/inputWithDefaultBigDecimal/expected/DgsConstants.kt b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/inputWithDefaultBigDecimal/expected/DgsConstants.kt index a2b8475b3..f821deaf8 100644 --- a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/inputWithDefaultBigDecimal/expected/DgsConstants.kt +++ b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/inputWithDefaultBigDecimal/expected/DgsConstants.kt @@ -2,26 +2,22 @@ package com.netflix.graphql.dgs.codegen.cases.inputWithDefaultBigDecimal.expecte import kotlin.String -@jakarta.`annotation`.Generated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) @Generated public object DgsConstants { public const val QUERY_TYPE: String = "Query" - @jakarta.`annotation`.Generated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) @Generated public object QUERY { public const val TYPE_NAME: String = "Query" public const val Orders: String = "orders" - @jakarta.`annotation`.Generated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) @Generated public object ORDERS_INPUT_ARGUMENT { public const val Filter: String = "filter" } } - @jakarta.`annotation`.Generated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) @Generated public object ORDERFILTER { public const val TYPE_NAME: String = "OrderFilter" diff --git a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/inputWithDefaultBigDecimal/expected/client/QueryProjection.kt b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/inputWithDefaultBigDecimal/expected/client/QueryProjection.kt index 3714583d1..d06472c9f 100644 --- a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/inputWithDefaultBigDecimal/expected/client/QueryProjection.kt +++ b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/inputWithDefaultBigDecimal/expected/client/QueryProjection.kt @@ -2,12 +2,10 @@ package com.netflix.graphql.dgs.codegen.cases.inputWithDefaultBigDecimal.expecte import com.netflix.graphql.dgs.client.codegen.InputValueSerializerInterface import com.netflix.graphql.dgs.codegen.GraphQLProjection +import com.netflix.graphql.dgs.codegen.cases.inputWithDefaultBigDecimal.expected.Generated import com.netflix.graphql.dgs.codegen.cases.inputWithDefaultBigDecimal.expected.types.OrderFilter -import com.netflix.graphql.dgs.codegen.cases.inputWithDefaultBigDecimal.expected.Generated as ExpectedGenerated -import jakarta.`annotation`.Generated as AnnotationGenerated -@AnnotationGenerated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) -@ExpectedGenerated +@Generated public class QueryProjection( inputValueSerializer: InputValueSerializerInterface? = null, ) : GraphQLProjection(inputValueSerializer) { diff --git a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/inputWithDefaultBigDecimal/expected/types/OrderFilter.kt b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/inputWithDefaultBigDecimal/expected/types/OrderFilter.kt index 9b2a0defc..40011641d 100644 --- a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/inputWithDefaultBigDecimal/expected/types/OrderFilter.kt +++ b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/inputWithDefaultBigDecimal/expected/types/OrderFilter.kt @@ -2,16 +2,14 @@ package com.netflix.graphql.dgs.codegen.cases.inputWithDefaultBigDecimal.expecte import com.fasterxml.jackson.`annotation`.JsonProperty import com.netflix.graphql.dgs.codegen.GraphQLInput +import com.netflix.graphql.dgs.codegen.cases.inputWithDefaultBigDecimal.expected.Generated import java.math.BigDecimal import kotlin.Any import kotlin.Pair import kotlin.String import kotlin.collections.List -import com.netflix.graphql.dgs.codegen.cases.inputWithDefaultBigDecimal.expected.Generated as ExpectedGenerated -import jakarta.`annotation`.Generated as AnnotationGenerated -@AnnotationGenerated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) -@ExpectedGenerated +@Generated public data class OrderFilter( @JsonProperty("min") public val min: BigDecimal = default("min", java.math.BigDecimal("1.1")), diff --git a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/inputWithDefaultBigDecimal/expected/types/Query.kt b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/inputWithDefaultBigDecimal/expected/types/Query.kt index 0b94d4236..2d08886df 100644 --- a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/inputWithDefaultBigDecimal/expected/types/Query.kt +++ b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/inputWithDefaultBigDecimal/expected/types/Query.kt @@ -5,14 +5,12 @@ import com.fasterxml.jackson.`annotation`.JsonProperty import com.fasterxml.jackson.`annotation`.JsonTypeInfo import com.fasterxml.jackson.databind.`annotation`.JsonDeserialize import com.fasterxml.jackson.databind.`annotation`.JsonPOJOBuilder +import com.netflix.graphql.dgs.codegen.cases.inputWithDefaultBigDecimal.expected.Generated import java.lang.IllegalStateException import kotlin.String import kotlin.jvm.JvmName -import com.netflix.graphql.dgs.codegen.cases.inputWithDefaultBigDecimal.expected.Generated as ExpectedGenerated -import jakarta.`annotation`.Generated as AnnotationGenerated -@AnnotationGenerated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) -@ExpectedGenerated +@Generated @JsonTypeInfo(use = JsonTypeInfo.Id.NONE) @JsonDeserialize(builder = Query.Builder::class) public class Query( @@ -24,15 +22,13 @@ public class Query( public val orders: String? get() = __orders.invoke() - @AnnotationGenerated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) - @ExpectedGenerated + @Generated public companion object { private val ordersDefault: () -> String? = { throw IllegalStateException("Field `orders` was not requested") } } - @AnnotationGenerated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) - @ExpectedGenerated + @Generated @JsonPOJOBuilder @JsonIgnoreProperties("__typename") public class Builder { diff --git a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/inputWithDefaultCurrency/expected/DgsClient.kt b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/inputWithDefaultCurrency/expected/DgsClient.kt index e0adf8d72..d05c30631 100644 --- a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/inputWithDefaultCurrency/expected/DgsClient.kt +++ b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/inputWithDefaultCurrency/expected/DgsClient.kt @@ -6,7 +6,6 @@ import com.netflix.graphql.dgs.codegen.cases.inputWithDefaultCurrency.expected.c import graphql.language.OperationDefinition import kotlin.String -@jakarta.`annotation`.Generated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) @Generated public object DgsClient { public fun buildQuery(inputValueSerializer: InputValueSerializerInterface? = null, diff --git a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/inputWithDefaultCurrency/expected/DgsConstants.kt b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/inputWithDefaultCurrency/expected/DgsConstants.kt index c8a734d4d..e5184dea8 100644 --- a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/inputWithDefaultCurrency/expected/DgsConstants.kt +++ b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/inputWithDefaultCurrency/expected/DgsConstants.kt @@ -2,26 +2,22 @@ package com.netflix.graphql.dgs.codegen.cases.inputWithDefaultCurrency.expected import kotlin.String -@jakarta.`annotation`.Generated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) @Generated public object DgsConstants { public const val QUERY_TYPE: String = "Query" - @jakarta.`annotation`.Generated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) @Generated public object QUERY { public const val TYPE_NAME: String = "Query" public const val Orders: String = "orders" - @jakarta.`annotation`.Generated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) @Generated public object ORDERS_INPUT_ARGUMENT { public const val Filter: String = "filter" } } - @jakarta.`annotation`.Generated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) @Generated public object ORDERFILTER { public const val TYPE_NAME: String = "OrderFilter" diff --git a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/inputWithDefaultCurrency/expected/client/QueryProjection.kt b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/inputWithDefaultCurrency/expected/client/QueryProjection.kt index c4d3143a8..9e0998810 100644 --- a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/inputWithDefaultCurrency/expected/client/QueryProjection.kt +++ b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/inputWithDefaultCurrency/expected/client/QueryProjection.kt @@ -2,12 +2,10 @@ package com.netflix.graphql.dgs.codegen.cases.inputWithDefaultCurrency.expected. import com.netflix.graphql.dgs.client.codegen.InputValueSerializerInterface import com.netflix.graphql.dgs.codegen.GraphQLProjection +import com.netflix.graphql.dgs.codegen.cases.inputWithDefaultCurrency.expected.Generated import com.netflix.graphql.dgs.codegen.cases.inputWithDefaultCurrency.expected.types.OrderFilter -import com.netflix.graphql.dgs.codegen.cases.inputWithDefaultCurrency.expected.Generated as ExpectedGenerated -import jakarta.`annotation`.Generated as AnnotationGenerated -@AnnotationGenerated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) -@ExpectedGenerated +@Generated public class QueryProjection( inputValueSerializer: InputValueSerializerInterface? = null, ) : GraphQLProjection(inputValueSerializer) { diff --git a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/inputWithDefaultCurrency/expected/types/OrderFilter.kt b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/inputWithDefaultCurrency/expected/types/OrderFilter.kt index f56778e1f..fb6940978 100644 --- a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/inputWithDefaultCurrency/expected/types/OrderFilter.kt +++ b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/inputWithDefaultCurrency/expected/types/OrderFilter.kt @@ -2,16 +2,14 @@ package com.netflix.graphql.dgs.codegen.cases.inputWithDefaultCurrency.expected. import com.fasterxml.jackson.`annotation`.JsonProperty import com.netflix.graphql.dgs.codegen.GraphQLInput +import com.netflix.graphql.dgs.codegen.cases.inputWithDefaultCurrency.expected.Generated import java.util.Currency import kotlin.Any import kotlin.Pair import kotlin.String import kotlin.collections.List -import com.netflix.graphql.dgs.codegen.cases.inputWithDefaultCurrency.expected.Generated as ExpectedGenerated -import jakarta.`annotation`.Generated as AnnotationGenerated -@AnnotationGenerated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) -@ExpectedGenerated +@Generated public data class OrderFilter( @JsonProperty("value") public val `value`: Currency = default("value", diff --git a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/inputWithDefaultCurrency/expected/types/Query.kt b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/inputWithDefaultCurrency/expected/types/Query.kt index 9f3fdcb7a..451b3c28c 100644 --- a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/inputWithDefaultCurrency/expected/types/Query.kt +++ b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/inputWithDefaultCurrency/expected/types/Query.kt @@ -5,14 +5,12 @@ import com.fasterxml.jackson.`annotation`.JsonProperty import com.fasterxml.jackson.`annotation`.JsonTypeInfo import com.fasterxml.jackson.databind.`annotation`.JsonDeserialize import com.fasterxml.jackson.databind.`annotation`.JsonPOJOBuilder +import com.netflix.graphql.dgs.codegen.cases.inputWithDefaultCurrency.expected.Generated import java.lang.IllegalStateException import kotlin.String import kotlin.jvm.JvmName -import com.netflix.graphql.dgs.codegen.cases.inputWithDefaultCurrency.expected.Generated as ExpectedGenerated -import jakarta.`annotation`.Generated as AnnotationGenerated -@AnnotationGenerated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) -@ExpectedGenerated +@Generated @JsonTypeInfo(use = JsonTypeInfo.Id.NONE) @JsonDeserialize(builder = Query.Builder::class) public class Query( @@ -24,15 +22,13 @@ public class Query( public val orders: String? get() = __orders.invoke() - @AnnotationGenerated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) - @ExpectedGenerated + @Generated public companion object { private val ordersDefault: () -> String? = { throw IllegalStateException("Field `orders` was not requested") } } - @AnnotationGenerated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) - @ExpectedGenerated + @Generated @JsonPOJOBuilder @JsonIgnoreProperties("__typename") public class Builder { diff --git a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/inputWithDefaultEnumValueForArray/expected/DgsClient.kt b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/inputWithDefaultEnumValueForArray/expected/DgsClient.kt index 2b30074b0..e2f389b27 100644 --- a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/inputWithDefaultEnumValueForArray/expected/DgsClient.kt +++ b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/inputWithDefaultEnumValueForArray/expected/DgsClient.kt @@ -1,5 +1,4 @@ package com.netflix.graphql.dgs.codegen.cases.inputWithDefaultEnumValueForArray.expected -@jakarta.`annotation`.Generated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) @Generated public object DgsClient diff --git a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/inputWithDefaultEnumValueForArray/expected/DgsConstants.kt b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/inputWithDefaultEnumValueForArray/expected/DgsConstants.kt index 34c13def6..96d09b290 100644 --- a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/inputWithDefaultEnumValueForArray/expected/DgsConstants.kt +++ b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/inputWithDefaultEnumValueForArray/expected/DgsConstants.kt @@ -2,10 +2,8 @@ package com.netflix.graphql.dgs.codegen.cases.inputWithDefaultEnumValueForArray. import kotlin.String -@jakarta.`annotation`.Generated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) @Generated public object DgsConstants { - @jakarta.`annotation`.Generated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) @Generated public object SOMETYPE { public const val TYPE_NAME: String = "SomeType" diff --git a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/inputWithDefaultEnumValueForArray/expected/types/Color.kt b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/inputWithDefaultEnumValueForArray/expected/types/Color.kt index e5a217712..649f2b425 100644 --- a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/inputWithDefaultEnumValueForArray/expected/types/Color.kt +++ b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/inputWithDefaultEnumValueForArray/expected/types/Color.kt @@ -1,20 +1,15 @@ package com.netflix.graphql.dgs.codegen.cases.inputWithDefaultEnumValueForArray.expected.types -import com.netflix.graphql.dgs.codegen.cases.inputWithDefaultEnumValueForArray.expected.Generated as ExpectedGenerated -import jakarta.`annotation`.Generated as AnnotationGenerated +import com.netflix.graphql.dgs.codegen.cases.inputWithDefaultEnumValueForArray.expected.Generated -@AnnotationGenerated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) -@ExpectedGenerated +@Generated public enum class Color { - @AnnotationGenerated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) - @ExpectedGenerated + @Generated red, - @AnnotationGenerated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) - @ExpectedGenerated + @Generated blue, ; - @AnnotationGenerated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) - @ExpectedGenerated + @Generated public companion object } diff --git a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/inputWithDefaultEnumValueForArray/expected/types/SomeType.kt b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/inputWithDefaultEnumValueForArray/expected/types/SomeType.kt index f8e5c774e..6d6e61aaa 100644 --- a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/inputWithDefaultEnumValueForArray/expected/types/SomeType.kt +++ b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/inputWithDefaultEnumValueForArray/expected/types/SomeType.kt @@ -2,15 +2,13 @@ package com.netflix.graphql.dgs.codegen.cases.inputWithDefaultEnumValueForArray. import com.fasterxml.jackson.`annotation`.JsonProperty import com.netflix.graphql.dgs.codegen.GraphQLInput +import com.netflix.graphql.dgs.codegen.cases.inputWithDefaultEnumValueForArray.expected.Generated import kotlin.Any import kotlin.Pair import kotlin.String import kotlin.collections.List -import com.netflix.graphql.dgs.codegen.cases.inputWithDefaultEnumValueForArray.expected.Generated as ExpectedGenerated -import jakarta.`annotation`.Generated as AnnotationGenerated -@AnnotationGenerated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) -@ExpectedGenerated +@Generated public data class SomeType( @JsonProperty("colors") public val colors: List? = default?>("colors", diff --git a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/inputWithDefaultIntValueForArray/expected/DgsClient.kt b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/inputWithDefaultIntValueForArray/expected/DgsClient.kt index 54ac1ee9d..e5048fe16 100644 --- a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/inputWithDefaultIntValueForArray/expected/DgsClient.kt +++ b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/inputWithDefaultIntValueForArray/expected/DgsClient.kt @@ -1,5 +1,4 @@ package com.netflix.graphql.dgs.codegen.cases.inputWithDefaultIntValueForArray.expected -@jakarta.`annotation`.Generated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) @Generated public object DgsClient diff --git a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/inputWithDefaultIntValueForArray/expected/DgsConstants.kt b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/inputWithDefaultIntValueForArray/expected/DgsConstants.kt index 913ac36d0..eea5d16d0 100644 --- a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/inputWithDefaultIntValueForArray/expected/DgsConstants.kt +++ b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/inputWithDefaultIntValueForArray/expected/DgsConstants.kt @@ -2,10 +2,8 @@ package com.netflix.graphql.dgs.codegen.cases.inputWithDefaultIntValueForArray.e import kotlin.String -@jakarta.`annotation`.Generated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) @Generated public object DgsConstants { - @jakarta.`annotation`.Generated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) @Generated public object SOMETYPE { public const val TYPE_NAME: String = "SomeType" diff --git a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/inputWithDefaultIntValueForArray/expected/types/SomeType.kt b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/inputWithDefaultIntValueForArray/expected/types/SomeType.kt index d2b7fa45e..382cc804f 100644 --- a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/inputWithDefaultIntValueForArray/expected/types/SomeType.kt +++ b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/inputWithDefaultIntValueForArray/expected/types/SomeType.kt @@ -2,16 +2,14 @@ package com.netflix.graphql.dgs.codegen.cases.inputWithDefaultIntValueForArray.e import com.fasterxml.jackson.`annotation`.JsonProperty import com.netflix.graphql.dgs.codegen.GraphQLInput +import com.netflix.graphql.dgs.codegen.cases.inputWithDefaultIntValueForArray.expected.Generated import kotlin.Any import kotlin.Int import kotlin.Pair import kotlin.String import kotlin.collections.List -import com.netflix.graphql.dgs.codegen.cases.inputWithDefaultIntValueForArray.expected.Generated as ExpectedGenerated -import jakarta.`annotation`.Generated as AnnotationGenerated -@AnnotationGenerated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) -@ExpectedGenerated +@Generated public data class SomeType( @JsonProperty("numbers") public val numbers: List? = default?>("numbers", listOf(1, 2, 3)), diff --git a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/inputWithDefaultStringValueForArray/expected/DgsClient.kt b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/inputWithDefaultStringValueForArray/expected/DgsClient.kt index 9588564cf..e1a54eea8 100644 --- a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/inputWithDefaultStringValueForArray/expected/DgsClient.kt +++ b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/inputWithDefaultStringValueForArray/expected/DgsClient.kt @@ -1,5 +1,4 @@ package com.netflix.graphql.dgs.codegen.cases.inputWithDefaultStringValueForArray.expected -@jakarta.`annotation`.Generated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) @Generated public object DgsClient diff --git a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/inputWithDefaultStringValueForArray/expected/DgsConstants.kt b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/inputWithDefaultStringValueForArray/expected/DgsConstants.kt index a4f209518..fcb141551 100644 --- a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/inputWithDefaultStringValueForArray/expected/DgsConstants.kt +++ b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/inputWithDefaultStringValueForArray/expected/DgsConstants.kt @@ -2,10 +2,8 @@ package com.netflix.graphql.dgs.codegen.cases.inputWithDefaultStringValueForArra import kotlin.String -@jakarta.`annotation`.Generated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) @Generated public object DgsConstants { - @jakarta.`annotation`.Generated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) @Generated public object SOMETYPE { public const val TYPE_NAME: String = "SomeType" diff --git a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/inputWithDefaultStringValueForArray/expected/types/SomeType.kt b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/inputWithDefaultStringValueForArray/expected/types/SomeType.kt index 72b1ce123..822f317dc 100644 --- a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/inputWithDefaultStringValueForArray/expected/types/SomeType.kt +++ b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/inputWithDefaultStringValueForArray/expected/types/SomeType.kt @@ -2,15 +2,13 @@ package com.netflix.graphql.dgs.codegen.cases.inputWithDefaultStringValueForArra import com.fasterxml.jackson.`annotation`.JsonProperty import com.netflix.graphql.dgs.codegen.GraphQLInput +import com.netflix.graphql.dgs.codegen.cases.inputWithDefaultStringValueForArray.expected.Generated import kotlin.Any import kotlin.Pair import kotlin.String import kotlin.collections.List -import com.netflix.graphql.dgs.codegen.cases.inputWithDefaultStringValueForArray.expected.Generated as ExpectedGenerated -import jakarta.`annotation`.Generated as AnnotationGenerated -@AnnotationGenerated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) -@ExpectedGenerated +@Generated public data class SomeType( @JsonProperty("names") public val names: List? = default?>("names", listOf("A", "B")), diff --git a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/inputWithDefaultValueForArray/expected/DgsClient.kt b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/inputWithDefaultValueForArray/expected/DgsClient.kt index 49605aeb8..426637278 100644 --- a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/inputWithDefaultValueForArray/expected/DgsClient.kt +++ b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/inputWithDefaultValueForArray/expected/DgsClient.kt @@ -1,5 +1,4 @@ package com.netflix.graphql.dgs.codegen.cases.inputWithDefaultValueForArray.expected -@jakarta.`annotation`.Generated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) @Generated public object DgsClient diff --git a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/inputWithDefaultValueForArray/expected/DgsConstants.kt b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/inputWithDefaultValueForArray/expected/DgsConstants.kt index 7f01038db..a4b99e65b 100644 --- a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/inputWithDefaultValueForArray/expected/DgsConstants.kt +++ b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/inputWithDefaultValueForArray/expected/DgsConstants.kt @@ -2,10 +2,8 @@ package com.netflix.graphql.dgs.codegen.cases.inputWithDefaultValueForArray.expe import kotlin.String -@jakarta.`annotation`.Generated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) @Generated public object DgsConstants { - @jakarta.`annotation`.Generated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) @Generated public object SOMETYPE { public const val TYPE_NAME: String = "SomeType" diff --git a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/inputWithDefaultValueForArray/expected/types/SomeType.kt b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/inputWithDefaultValueForArray/expected/types/SomeType.kt index 3f7a99741..630e1b88e 100644 --- a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/inputWithDefaultValueForArray/expected/types/SomeType.kt +++ b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/inputWithDefaultValueForArray/expected/types/SomeType.kt @@ -2,15 +2,13 @@ package com.netflix.graphql.dgs.codegen.cases.inputWithDefaultValueForArray.expe import com.fasterxml.jackson.`annotation`.JsonProperty import com.netflix.graphql.dgs.codegen.GraphQLInput +import com.netflix.graphql.dgs.codegen.cases.inputWithDefaultValueForArray.expected.Generated import kotlin.Any import kotlin.Pair import kotlin.String import kotlin.collections.List -import com.netflix.graphql.dgs.codegen.cases.inputWithDefaultValueForArray.expected.Generated as ExpectedGenerated -import jakarta.`annotation`.Generated as AnnotationGenerated -@AnnotationGenerated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) -@ExpectedGenerated +@Generated public data class SomeType( @JsonProperty("names") public val names: List? = default?>("names", emptyList()), diff --git a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/inputWithDefaultValueForEnum/expected/DgsClient.kt b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/inputWithDefaultValueForEnum/expected/DgsClient.kt index 4efd11b38..2c9abd8e5 100644 --- a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/inputWithDefaultValueForEnum/expected/DgsClient.kt +++ b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/inputWithDefaultValueForEnum/expected/DgsClient.kt @@ -1,5 +1,4 @@ package com.netflix.graphql.dgs.codegen.cases.inputWithDefaultValueForEnum.expected -@jakarta.`annotation`.Generated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) @Generated public object DgsClient diff --git a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/inputWithDefaultValueForEnum/expected/DgsConstants.kt b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/inputWithDefaultValueForEnum/expected/DgsConstants.kt index 9f48fb48d..4baf82f5f 100644 --- a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/inputWithDefaultValueForEnum/expected/DgsConstants.kt +++ b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/inputWithDefaultValueForEnum/expected/DgsConstants.kt @@ -2,10 +2,8 @@ package com.netflix.graphql.dgs.codegen.cases.inputWithDefaultValueForEnum.expec import kotlin.String -@jakarta.`annotation`.Generated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) @Generated public object DgsConstants { - @jakarta.`annotation`.Generated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) @Generated public object COLORFILTER { public const val TYPE_NAME: String = "ColorFilter" diff --git a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/inputWithDefaultValueForEnum/expected/types/Color.kt b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/inputWithDefaultValueForEnum/expected/types/Color.kt index f2cbabfa2..6777a6a24 100644 --- a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/inputWithDefaultValueForEnum/expected/types/Color.kt +++ b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/inputWithDefaultValueForEnum/expected/types/Color.kt @@ -1,17 +1,13 @@ package com.netflix.graphql.dgs.codegen.cases.inputWithDefaultValueForEnum.expected.types -import com.netflix.graphql.dgs.codegen.cases.inputWithDefaultValueForEnum.expected.Generated as ExpectedGenerated -import jakarta.`annotation`.Generated as AnnotationGenerated +import com.netflix.graphql.dgs.codegen.cases.inputWithDefaultValueForEnum.expected.Generated -@AnnotationGenerated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) -@ExpectedGenerated +@Generated public enum class Color { - @AnnotationGenerated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) - @ExpectedGenerated + @Generated red, ; - @AnnotationGenerated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) - @ExpectedGenerated + @Generated public companion object } diff --git a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/inputWithDefaultValueForEnum/expected/types/ColorFilter.kt b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/inputWithDefaultValueForEnum/expected/types/ColorFilter.kt index 413a612c8..12e3302f5 100644 --- a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/inputWithDefaultValueForEnum/expected/types/ColorFilter.kt +++ b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/inputWithDefaultValueForEnum/expected/types/ColorFilter.kt @@ -2,15 +2,13 @@ package com.netflix.graphql.dgs.codegen.cases.inputWithDefaultValueForEnum.expec import com.fasterxml.jackson.`annotation`.JsonProperty import com.netflix.graphql.dgs.codegen.GraphQLInput +import com.netflix.graphql.dgs.codegen.cases.inputWithDefaultValueForEnum.expected.Generated import kotlin.Any import kotlin.Pair import kotlin.String import kotlin.collections.List -import com.netflix.graphql.dgs.codegen.cases.inputWithDefaultValueForEnum.expected.Generated as ExpectedGenerated -import jakarta.`annotation`.Generated as AnnotationGenerated -@AnnotationGenerated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) -@ExpectedGenerated +@Generated public data class ColorFilter( @JsonProperty("color") public val color: Color? = default("color", diff --git a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/inputWithDefaultValueForNonNullableFields/expected/DgsClient.kt b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/inputWithDefaultValueForNonNullableFields/expected/DgsClient.kt index bb3f945b2..5ed9ed30c 100644 --- a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/inputWithDefaultValueForNonNullableFields/expected/DgsClient.kt +++ b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/inputWithDefaultValueForNonNullableFields/expected/DgsClient.kt @@ -1,5 +1,4 @@ package com.netflix.graphql.dgs.codegen.cases.inputWithDefaultValueForNonNullableFields.expected -@jakarta.`annotation`.Generated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) @Generated public object DgsClient diff --git a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/inputWithDefaultValueForNonNullableFields/expected/DgsConstants.kt b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/inputWithDefaultValueForNonNullableFields/expected/DgsConstants.kt index 1b92e7859..381c7db9b 100644 --- a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/inputWithDefaultValueForNonNullableFields/expected/DgsConstants.kt +++ b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/inputWithDefaultValueForNonNullableFields/expected/DgsConstants.kt @@ -2,10 +2,8 @@ package com.netflix.graphql.dgs.codegen.cases.inputWithDefaultValueForNonNullabl import kotlin.String -@jakarta.`annotation`.Generated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) @Generated public object DgsConstants { - @jakarta.`annotation`.Generated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) @Generated public object PERSON { public const val TYPE_NAME: String = "Person" @@ -21,7 +19,6 @@ public object DgsConstants { public const val IsHappy: String = "isHappy" } - @jakarta.`annotation`.Generated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) @Generated public object CAR { public const val TYPE_NAME: String = "Car" diff --git a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/inputWithDefaultValueForNonNullableFields/expected/types/Car.kt b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/inputWithDefaultValueForNonNullableFields/expected/types/Car.kt index bc1784e7d..9fec2714d 100644 --- a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/inputWithDefaultValueForNonNullableFields/expected/types/Car.kt +++ b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/inputWithDefaultValueForNonNullableFields/expected/types/Car.kt @@ -2,15 +2,13 @@ package com.netflix.graphql.dgs.codegen.cases.inputWithDefaultValueForNonNullabl import com.fasterxml.jackson.`annotation`.JsonProperty import com.netflix.graphql.dgs.codegen.GraphQLInput +import com.netflix.graphql.dgs.codegen.cases.inputWithDefaultValueForNonNullableFields.expected.Generated import kotlin.Any import kotlin.Pair import kotlin.String import kotlin.collections.List -import com.netflix.graphql.dgs.codegen.cases.inputWithDefaultValueForNonNullableFields.expected.Generated as ExpectedGenerated -import jakarta.`annotation`.Generated as AnnotationGenerated -@AnnotationGenerated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) -@ExpectedGenerated +@Generated public data class Car( @JsonProperty("brand") public val brand: String = default("brand", "BMW"), diff --git a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/inputWithDefaultValueForNonNullableFields/expected/types/Hobby.kt b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/inputWithDefaultValueForNonNullableFields/expected/types/Hobby.kt index 76d82fe78..3885f889e 100644 --- a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/inputWithDefaultValueForNonNullableFields/expected/types/Hobby.kt +++ b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/inputWithDefaultValueForNonNullableFields/expected/types/Hobby.kt @@ -1,20 +1,15 @@ package com.netflix.graphql.dgs.codegen.cases.inputWithDefaultValueForNonNullableFields.expected.types -import com.netflix.graphql.dgs.codegen.cases.inputWithDefaultValueForNonNullableFields.expected.Generated as ExpectedGenerated -import jakarta.`annotation`.Generated as AnnotationGenerated +import com.netflix.graphql.dgs.codegen.cases.inputWithDefaultValueForNonNullableFields.expected.Generated -@AnnotationGenerated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) -@ExpectedGenerated +@Generated public enum class Hobby { - @AnnotationGenerated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) - @ExpectedGenerated + @Generated Football, - @AnnotationGenerated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) - @ExpectedGenerated + @Generated Hokey, ; - @AnnotationGenerated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) - @ExpectedGenerated + @Generated public companion object } diff --git a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/inputWithDefaultValueForNonNullableFields/expected/types/Person.kt b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/inputWithDefaultValueForNonNullableFields/expected/types/Person.kt index adcdd66f9..c795c56c0 100644 --- a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/inputWithDefaultValueForNonNullableFields/expected/types/Person.kt +++ b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/inputWithDefaultValueForNonNullableFields/expected/types/Person.kt @@ -2,17 +2,15 @@ package com.netflix.graphql.dgs.codegen.cases.inputWithDefaultValueForNonNullabl import com.fasterxml.jackson.`annotation`.JsonProperty import com.netflix.graphql.dgs.codegen.GraphQLInput +import com.netflix.graphql.dgs.codegen.cases.inputWithDefaultValueForNonNullableFields.expected.Generated import kotlin.Any import kotlin.Boolean import kotlin.Int import kotlin.Pair import kotlin.String import kotlin.collections.List -import com.netflix.graphql.dgs.codegen.cases.inputWithDefaultValueForNonNullableFields.expected.Generated as ExpectedGenerated -import jakarta.`annotation`.Generated as AnnotationGenerated -@AnnotationGenerated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) -@ExpectedGenerated +@Generated public data class Person( @JsonProperty("name") public val name: String = default("name", "Damian"), diff --git a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/inputWithDefaultValueForObject/expected/DgsClient.kt b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/inputWithDefaultValueForObject/expected/DgsClient.kt index e39f3e983..ae2824718 100644 --- a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/inputWithDefaultValueForObject/expected/DgsClient.kt +++ b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/inputWithDefaultValueForObject/expected/DgsClient.kt @@ -1,5 +1,4 @@ package com.netflix.graphql.dgs.codegen.cases.inputWithDefaultValueForObject.expected -@jakarta.`annotation`.Generated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) @Generated public object DgsClient diff --git a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/inputWithDefaultValueForObject/expected/DgsConstants.kt b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/inputWithDefaultValueForObject/expected/DgsConstants.kt index 39c55e3d2..4d5f35e5b 100644 --- a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/inputWithDefaultValueForObject/expected/DgsConstants.kt +++ b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/inputWithDefaultValueForObject/expected/DgsConstants.kt @@ -2,10 +2,8 @@ package com.netflix.graphql.dgs.codegen.cases.inputWithDefaultValueForObject.exp import kotlin.String -@jakarta.`annotation`.Generated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) @Generated public object DgsConstants { - @jakarta.`annotation`.Generated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) @Generated public object PERSON { public const val TYPE_NAME: String = "Person" @@ -17,7 +15,6 @@ public object DgsConstants { public const val Car: String = "car" } - @jakarta.`annotation`.Generated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) @Generated public object CAR { public const val TYPE_NAME: String = "Car" @@ -25,7 +22,6 @@ public object DgsConstants { public const val Brand: String = "brand" } - @jakarta.`annotation`.Generated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) @Generated public object MOVIEFILTER { public const val TYPE_NAME: String = "MovieFilter" diff --git a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/inputWithDefaultValueForObject/expected/types/Car.kt b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/inputWithDefaultValueForObject/expected/types/Car.kt index f7534e69c..23c601ab2 100644 --- a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/inputWithDefaultValueForObject/expected/types/Car.kt +++ b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/inputWithDefaultValueForObject/expected/types/Car.kt @@ -2,15 +2,13 @@ package com.netflix.graphql.dgs.codegen.cases.inputWithDefaultValueForObject.exp import com.fasterxml.jackson.`annotation`.JsonProperty import com.netflix.graphql.dgs.codegen.GraphQLInput +import com.netflix.graphql.dgs.codegen.cases.inputWithDefaultValueForObject.expected.Generated import kotlin.Any import kotlin.Pair import kotlin.String import kotlin.collections.List -import com.netflix.graphql.dgs.codegen.cases.inputWithDefaultValueForObject.expected.Generated as ExpectedGenerated -import jakarta.`annotation`.Generated as AnnotationGenerated -@AnnotationGenerated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) -@ExpectedGenerated +@Generated public data class Car( @JsonProperty("brand") public val brand: String = default("brand", "BMW"), diff --git a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/inputWithDefaultValueForObject/expected/types/MovieFilter.kt b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/inputWithDefaultValueForObject/expected/types/MovieFilter.kt index fd17cd222..0902a8673 100644 --- a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/inputWithDefaultValueForObject/expected/types/MovieFilter.kt +++ b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/inputWithDefaultValueForObject/expected/types/MovieFilter.kt @@ -2,15 +2,13 @@ package com.netflix.graphql.dgs.codegen.cases.inputWithDefaultValueForObject.exp import com.fasterxml.jackson.`annotation`.JsonProperty import com.netflix.graphql.dgs.codegen.GraphQLInput +import com.netflix.graphql.dgs.codegen.cases.inputWithDefaultValueForObject.expected.Generated import kotlin.Any import kotlin.Pair import kotlin.String import kotlin.collections.List -import com.netflix.graphql.dgs.codegen.cases.inputWithDefaultValueForObject.expected.Generated as ExpectedGenerated -import jakarta.`annotation`.Generated as AnnotationGenerated -@AnnotationGenerated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) -@ExpectedGenerated +@Generated public data class MovieFilter( @JsonProperty("director") public val director: Person? = default("director", diff --git a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/inputWithDefaultValueForObject/expected/types/Person.kt b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/inputWithDefaultValueForObject/expected/types/Person.kt index 29da76442..ad902fed1 100644 --- a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/inputWithDefaultValueForObject/expected/types/Person.kt +++ b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/inputWithDefaultValueForObject/expected/types/Person.kt @@ -2,16 +2,14 @@ package com.netflix.graphql.dgs.codegen.cases.inputWithDefaultValueForObject.exp import com.fasterxml.jackson.`annotation`.JsonProperty import com.netflix.graphql.dgs.codegen.GraphQLInput +import com.netflix.graphql.dgs.codegen.cases.inputWithDefaultValueForObject.expected.Generated import kotlin.Any import kotlin.Int import kotlin.Pair import kotlin.String import kotlin.collections.List -import com.netflix.graphql.dgs.codegen.cases.inputWithDefaultValueForObject.expected.Generated as ExpectedGenerated -import jakarta.`annotation`.Generated as AnnotationGenerated -@AnnotationGenerated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) -@ExpectedGenerated +@Generated public data class Person( @JsonProperty("name") public val name: String? = default("name", "John"), diff --git a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/inputWithExtendedType/expected/DgsClient.kt b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/inputWithExtendedType/expected/DgsClient.kt index c31e73898..a175f44ef 100644 --- a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/inputWithExtendedType/expected/DgsClient.kt +++ b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/inputWithExtendedType/expected/DgsClient.kt @@ -6,7 +6,6 @@ import com.netflix.graphql.dgs.codegen.cases.inputWithExtendedType.expected.clie import graphql.language.OperationDefinition import kotlin.String -@jakarta.`annotation`.Generated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) @Generated public object DgsClient { public fun buildQuery(inputValueSerializer: InputValueSerializerInterface? = null, diff --git a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/inputWithExtendedType/expected/DgsConstants.kt b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/inputWithExtendedType/expected/DgsConstants.kt index c025a0132..4bcf6c0cd 100644 --- a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/inputWithExtendedType/expected/DgsConstants.kt +++ b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/inputWithExtendedType/expected/DgsConstants.kt @@ -2,26 +2,22 @@ package com.netflix.graphql.dgs.codegen.cases.inputWithExtendedType.expected import kotlin.String -@jakarta.`annotation`.Generated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) @Generated public object DgsConstants { public const val QUERY_TYPE: String = "Query" - @jakarta.`annotation`.Generated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) @Generated public object QUERY { public const val TYPE_NAME: String = "Query" public const val Movies: String = "movies" - @jakarta.`annotation`.Generated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) @Generated public object MOVIES_INPUT_ARGUMENT { public const val Filter: String = "filter" } } - @jakarta.`annotation`.Generated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) @Generated public object MOVIEFILTER { public const val TYPE_NAME: String = "MovieFilter" diff --git a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/inputWithExtendedType/expected/client/QueryProjection.kt b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/inputWithExtendedType/expected/client/QueryProjection.kt index c1ede3ef7..4d9f50e51 100644 --- a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/inputWithExtendedType/expected/client/QueryProjection.kt +++ b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/inputWithExtendedType/expected/client/QueryProjection.kt @@ -2,12 +2,10 @@ package com.netflix.graphql.dgs.codegen.cases.inputWithExtendedType.expected.cli import com.netflix.graphql.dgs.client.codegen.InputValueSerializerInterface import com.netflix.graphql.dgs.codegen.GraphQLProjection +import com.netflix.graphql.dgs.codegen.cases.inputWithExtendedType.expected.Generated import com.netflix.graphql.dgs.codegen.cases.inputWithExtendedType.expected.types.MovieFilter -import com.netflix.graphql.dgs.codegen.cases.inputWithExtendedType.expected.Generated as ExpectedGenerated -import jakarta.`annotation`.Generated as AnnotationGenerated -@AnnotationGenerated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) -@ExpectedGenerated +@Generated public class QueryProjection( inputValueSerializer: InputValueSerializerInterface? = null, ) : GraphQLProjection(inputValueSerializer) { diff --git a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/inputWithExtendedType/expected/types/MovieFilter.kt b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/inputWithExtendedType/expected/types/MovieFilter.kt index 6125b4c5f..e68f9e971 100644 --- a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/inputWithExtendedType/expected/types/MovieFilter.kt +++ b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/inputWithExtendedType/expected/types/MovieFilter.kt @@ -2,16 +2,14 @@ package com.netflix.graphql.dgs.codegen.cases.inputWithExtendedType.expected.typ import com.fasterxml.jackson.`annotation`.JsonProperty import com.netflix.graphql.dgs.codegen.GraphQLInput +import com.netflix.graphql.dgs.codegen.cases.inputWithExtendedType.expected.Generated import kotlin.Any import kotlin.Int import kotlin.Pair import kotlin.String import kotlin.collections.List -import com.netflix.graphql.dgs.codegen.cases.inputWithExtendedType.expected.Generated as ExpectedGenerated -import jakarta.`annotation`.Generated as AnnotationGenerated -@AnnotationGenerated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) -@ExpectedGenerated +@Generated public data class MovieFilter( @JsonProperty("genre") public val genre: String? = default("genre", null), diff --git a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/inputWithExtendedType/expected/types/Query.kt b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/inputWithExtendedType/expected/types/Query.kt index 339cf5e73..f6a722b54 100644 --- a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/inputWithExtendedType/expected/types/Query.kt +++ b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/inputWithExtendedType/expected/types/Query.kt @@ -5,15 +5,13 @@ import com.fasterxml.jackson.`annotation`.JsonProperty import com.fasterxml.jackson.`annotation`.JsonTypeInfo import com.fasterxml.jackson.databind.`annotation`.JsonDeserialize import com.fasterxml.jackson.databind.`annotation`.JsonPOJOBuilder +import com.netflix.graphql.dgs.codegen.cases.inputWithExtendedType.expected.Generated import java.lang.IllegalStateException import kotlin.String import kotlin.collections.List import kotlin.jvm.JvmName -import com.netflix.graphql.dgs.codegen.cases.inputWithExtendedType.expected.Generated as ExpectedGenerated -import jakarta.`annotation`.Generated as AnnotationGenerated -@AnnotationGenerated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) -@ExpectedGenerated +@Generated @JsonTypeInfo(use = JsonTypeInfo.Id.NONE) @JsonDeserialize(builder = Query.Builder::class) public class Query( @@ -25,15 +23,13 @@ public class Query( public val movies: List? get() = __movies.invoke() - @AnnotationGenerated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) - @ExpectedGenerated + @Generated public companion object { private val moviesDefault: () -> List? = { throw IllegalStateException("Field `movies` was not requested") } } - @AnnotationGenerated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) - @ExpectedGenerated + @Generated @JsonPOJOBuilder @JsonIgnoreProperties("__typename") public class Builder { diff --git a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/inputWithReservedWord/expected/DgsClient.kt b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/inputWithReservedWord/expected/DgsClient.kt index fdda10e4b..122d8895a 100644 --- a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/inputWithReservedWord/expected/DgsClient.kt +++ b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/inputWithReservedWord/expected/DgsClient.kt @@ -1,5 +1,4 @@ package com.netflix.graphql.dgs.codegen.cases.inputWithReservedWord.expected -@jakarta.`annotation`.Generated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) @Generated public object DgsClient diff --git a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/inputWithReservedWord/expected/DgsConstants.kt b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/inputWithReservedWord/expected/DgsConstants.kt index 4732cc047..442809392 100644 --- a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/inputWithReservedWord/expected/DgsConstants.kt +++ b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/inputWithReservedWord/expected/DgsConstants.kt @@ -2,10 +2,8 @@ package com.netflix.graphql.dgs.codegen.cases.inputWithReservedWord.expected import kotlin.String -@jakarta.`annotation`.Generated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) @Generated public object DgsConstants { - @jakarta.`annotation`.Generated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) @Generated public object SAMPLEINPUT { public const val TYPE_NAME: String = "SampleInput" diff --git a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/inputWithReservedWord/expected/types/SampleInput.kt b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/inputWithReservedWord/expected/types/SampleInput.kt index 029668a4c..22318e136 100644 --- a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/inputWithReservedWord/expected/types/SampleInput.kt +++ b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/inputWithReservedWord/expected/types/SampleInput.kt @@ -2,15 +2,13 @@ package com.netflix.graphql.dgs.codegen.cases.inputWithReservedWord.expected.typ import com.fasterxml.jackson.`annotation`.JsonProperty import com.netflix.graphql.dgs.codegen.GraphQLInput +import com.netflix.graphql.dgs.codegen.cases.inputWithReservedWord.expected.Generated import kotlin.Any import kotlin.Pair import kotlin.String import kotlin.collections.List -import com.netflix.graphql.dgs.codegen.cases.inputWithReservedWord.expected.Generated as ExpectedGenerated -import jakarta.`annotation`.Generated as AnnotationGenerated -@AnnotationGenerated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) -@ExpectedGenerated +@Generated public data class SampleInput( @JsonProperty("return") public val `return`: String, diff --git a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/interfaceClassWithInterfaceFields/expected/DgsClient.kt b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/interfaceClassWithInterfaceFields/expected/DgsClient.kt index cc69195ad..06649d20f 100644 --- a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/interfaceClassWithInterfaceFields/expected/DgsClient.kt +++ b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/interfaceClassWithInterfaceFields/expected/DgsClient.kt @@ -1,5 +1,4 @@ package com.netflix.graphql.dgs.codegen.cases.interfaceClassWithInterfaceFields.expected -@jakarta.`annotation`.Generated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) @Generated public object DgsClient diff --git a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/interfaceClassWithInterfaceFields/expected/DgsConstants.kt b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/interfaceClassWithInterfaceFields/expected/DgsConstants.kt index 9528b606b..6ce019a01 100644 --- a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/interfaceClassWithInterfaceFields/expected/DgsConstants.kt +++ b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/interfaceClassWithInterfaceFields/expected/DgsConstants.kt @@ -2,10 +2,8 @@ package com.netflix.graphql.dgs.codegen.cases.interfaceClassWithInterfaceFields. import kotlin.String -@jakarta.`annotation`.Generated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) @Generated public object DgsConstants { - @jakarta.`annotation`.Generated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) @Generated public object DOG { public const val TYPE_NAME: String = "Dog" @@ -23,7 +21,6 @@ public object DgsConstants { public const val Parents: String = "parents" } - @jakarta.`annotation`.Generated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) @Generated public object BIRD { public const val TYPE_NAME: String = "Bird" @@ -41,7 +38,6 @@ public object DgsConstants { public const val Parents: String = "parents" } - @jakarta.`annotation`.Generated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) @Generated public object PET { public const val TYPE_NAME: String = "Pet" diff --git a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/interfaceClassWithInterfaceFields/expected/client/BirdProjection.kt b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/interfaceClassWithInterfaceFields/expected/client/BirdProjection.kt index 1897640d3..6770165eb 100644 --- a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/interfaceClassWithInterfaceFields/expected/client/BirdProjection.kt +++ b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/interfaceClassWithInterfaceFields/expected/client/BirdProjection.kt @@ -2,12 +2,10 @@ package com.netflix.graphql.dgs.codegen.cases.interfaceClassWithInterfaceFields. import com.netflix.graphql.dgs.client.codegen.InputValueSerializerInterface import com.netflix.graphql.dgs.codegen.GraphQLProjection +import com.netflix.graphql.dgs.codegen.cases.interfaceClassWithInterfaceFields.expected.Generated import kotlin.String -import com.netflix.graphql.dgs.codegen.cases.interfaceClassWithInterfaceFields.expected.Generated as ExpectedGenerated -import jakarta.`annotation`.Generated as AnnotationGenerated -@AnnotationGenerated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) -@ExpectedGenerated +@Generated public class BirdProjection( inputValueSerializer: InputValueSerializerInterface? = null, ) : GraphQLProjection(inputValueSerializer) { diff --git a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/interfaceClassWithInterfaceFields/expected/client/DogProjection.kt b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/interfaceClassWithInterfaceFields/expected/client/DogProjection.kt index 5e744a765..97da3657c 100644 --- a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/interfaceClassWithInterfaceFields/expected/client/DogProjection.kt +++ b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/interfaceClassWithInterfaceFields/expected/client/DogProjection.kt @@ -2,12 +2,10 @@ package com.netflix.graphql.dgs.codegen.cases.interfaceClassWithInterfaceFields. import com.netflix.graphql.dgs.client.codegen.InputValueSerializerInterface import com.netflix.graphql.dgs.codegen.GraphQLProjection +import com.netflix.graphql.dgs.codegen.cases.interfaceClassWithInterfaceFields.expected.Generated import kotlin.String -import com.netflix.graphql.dgs.codegen.cases.interfaceClassWithInterfaceFields.expected.Generated as ExpectedGenerated -import jakarta.`annotation`.Generated as AnnotationGenerated -@AnnotationGenerated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) -@ExpectedGenerated +@Generated public class DogProjection( inputValueSerializer: InputValueSerializerInterface? = null, ) : GraphQLProjection(inputValueSerializer) { diff --git a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/interfaceClassWithInterfaceFields/expected/client/PetProjection.kt b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/interfaceClassWithInterfaceFields/expected/client/PetProjection.kt index 132234e7a..900c6aefe 100644 --- a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/interfaceClassWithInterfaceFields/expected/client/PetProjection.kt +++ b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/interfaceClassWithInterfaceFields/expected/client/PetProjection.kt @@ -2,12 +2,10 @@ package com.netflix.graphql.dgs.codegen.cases.interfaceClassWithInterfaceFields. import com.netflix.graphql.dgs.client.codegen.InputValueSerializerInterface import com.netflix.graphql.dgs.codegen.GraphQLProjection +import com.netflix.graphql.dgs.codegen.cases.interfaceClassWithInterfaceFields.expected.Generated import kotlin.String -import com.netflix.graphql.dgs.codegen.cases.interfaceClassWithInterfaceFields.expected.Generated as ExpectedGenerated -import jakarta.`annotation`.Generated as AnnotationGenerated -@AnnotationGenerated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) -@ExpectedGenerated +@Generated public class PetProjection( inputValueSerializer: InputValueSerializerInterface? = null, ) : GraphQLProjection(inputValueSerializer) { diff --git a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/interfaceClassWithInterfaceFields/expected/types/Bird.kt b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/interfaceClassWithInterfaceFields/expected/types/Bird.kt index e0d904022..83d4ecd8e 100644 --- a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/interfaceClassWithInterfaceFields/expected/types/Bird.kt +++ b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/interfaceClassWithInterfaceFields/expected/types/Bird.kt @@ -5,16 +5,14 @@ import com.fasterxml.jackson.`annotation`.JsonProperty import com.fasterxml.jackson.`annotation`.JsonTypeInfo import com.fasterxml.jackson.databind.`annotation`.JsonDeserialize import com.fasterxml.jackson.databind.`annotation`.JsonPOJOBuilder +import com.netflix.graphql.dgs.codegen.cases.interfaceClassWithInterfaceFields.expected.Generated import java.lang.IllegalStateException import kotlin.String import kotlin.Suppress import kotlin.collections.List import kotlin.jvm.JvmName -import com.netflix.graphql.dgs.codegen.cases.interfaceClassWithInterfaceFields.expected.Generated as ExpectedGenerated -import jakarta.`annotation`.Generated as AnnotationGenerated -@AnnotationGenerated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) -@ExpectedGenerated +@Generated @JsonTypeInfo(use = JsonTypeInfo.Id.NONE) @JsonDeserialize(builder = Bird.Builder::class) public class Bird( @@ -67,8 +65,7 @@ public class Bird( override val parents: List? get() = __parents.invoke() - @AnnotationGenerated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) - @ExpectedGenerated + @Generated public companion object { private val idDefault: () -> String = { throw IllegalStateException("Field `id` was not requested") } @@ -89,8 +86,7 @@ public class Bird( { throw IllegalStateException("Field `parents` was not requested") } } - @AnnotationGenerated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) - @ExpectedGenerated + @Generated @JsonPOJOBuilder @JsonIgnoreProperties("__typename") public class Builder { diff --git a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/interfaceClassWithInterfaceFields/expected/types/Dog.kt b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/interfaceClassWithInterfaceFields/expected/types/Dog.kt index 065af7528..3abed9f24 100644 --- a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/interfaceClassWithInterfaceFields/expected/types/Dog.kt +++ b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/interfaceClassWithInterfaceFields/expected/types/Dog.kt @@ -5,16 +5,14 @@ import com.fasterxml.jackson.`annotation`.JsonProperty import com.fasterxml.jackson.`annotation`.JsonTypeInfo import com.fasterxml.jackson.databind.`annotation`.JsonDeserialize import com.fasterxml.jackson.databind.`annotation`.JsonPOJOBuilder +import com.netflix.graphql.dgs.codegen.cases.interfaceClassWithInterfaceFields.expected.Generated import java.lang.IllegalStateException import kotlin.String import kotlin.Suppress import kotlin.collections.List import kotlin.jvm.JvmName -import com.netflix.graphql.dgs.codegen.cases.interfaceClassWithInterfaceFields.expected.Generated as ExpectedGenerated -import jakarta.`annotation`.Generated as AnnotationGenerated -@AnnotationGenerated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) -@ExpectedGenerated +@Generated @JsonTypeInfo(use = JsonTypeInfo.Id.NONE) @JsonDeserialize(builder = Dog.Builder::class) public class Dog( @@ -67,8 +65,7 @@ public class Dog( override val parents: List? get() = __parents.invoke() - @AnnotationGenerated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) - @ExpectedGenerated + @Generated public companion object { private val idDefault: () -> String = { throw IllegalStateException("Field `id` was not requested") } @@ -89,8 +86,7 @@ public class Dog( { throw IllegalStateException("Field `parents` was not requested") } } - @AnnotationGenerated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) - @ExpectedGenerated + @Generated @JsonPOJOBuilder @JsonIgnoreProperties("__typename") public class Builder { diff --git a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/interfaceClassWithInterfaceFields/expected/types/Pet.kt b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/interfaceClassWithInterfaceFields/expected/types/Pet.kt index 0e8fb316c..eff4659e8 100644 --- a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/interfaceClassWithInterfaceFields/expected/types/Pet.kt +++ b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/interfaceClassWithInterfaceFields/expected/types/Pet.kt @@ -2,15 +2,13 @@ package com.netflix.graphql.dgs.codegen.cases.interfaceClassWithInterfaceFields. import com.fasterxml.jackson.`annotation`.JsonSubTypes import com.fasterxml.jackson.`annotation`.JsonTypeInfo +import com.netflix.graphql.dgs.codegen.cases.interfaceClassWithInterfaceFields.expected.Generated import kotlin.String import kotlin.Suppress import kotlin.collections.List import kotlin.jvm.JvmName -import com.netflix.graphql.dgs.codegen.cases.interfaceClassWithInterfaceFields.expected.Generated as ExpectedGenerated -import jakarta.`annotation`.Generated as AnnotationGenerated -@AnnotationGenerated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) -@ExpectedGenerated +@Generated @JsonTypeInfo( use = JsonTypeInfo.Id.NAME, include = JsonTypeInfo.As.PROPERTY, diff --git a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/interfaceClassWithInterfaceFieldsOfDifferentType/expected/DgsClient.kt b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/interfaceClassWithInterfaceFieldsOfDifferentType/expected/DgsClient.kt index 2b6152d67..fe803e719 100644 --- a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/interfaceClassWithInterfaceFieldsOfDifferentType/expected/DgsClient.kt +++ b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/interfaceClassWithInterfaceFieldsOfDifferentType/expected/DgsClient.kt @@ -1,5 +1,4 @@ package com.netflix.graphql.dgs.codegen.cases.interfaceClassWithInterfaceFieldsOfDifferentType.expected -@jakarta.`annotation`.Generated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) @Generated public object DgsClient diff --git a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/interfaceClassWithInterfaceFieldsOfDifferentType/expected/DgsConstants.kt b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/interfaceClassWithInterfaceFieldsOfDifferentType/expected/DgsConstants.kt index ad0aa6a07..3f100da4f 100644 --- a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/interfaceClassWithInterfaceFieldsOfDifferentType/expected/DgsConstants.kt +++ b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/interfaceClassWithInterfaceFieldsOfDifferentType/expected/DgsConstants.kt @@ -2,10 +2,8 @@ package com.netflix.graphql.dgs.codegen.cases.interfaceClassWithInterfaceFieldsO import kotlin.String -@jakarta.`annotation`.Generated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) @Generated public object DgsConstants { - @jakarta.`annotation`.Generated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) @Generated public object VEGETARIAN { public const val TYPE_NAME: String = "Vegetarian" @@ -15,7 +13,6 @@ public object DgsConstants { public const val Vegetables: String = "vegetables" } - @jakarta.`annotation`.Generated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) @Generated public object DOG { public const val TYPE_NAME: String = "Dog" @@ -25,7 +22,6 @@ public object DgsConstants { public const val Diet: String = "diet" } - @jakarta.`annotation`.Generated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) @Generated public object PET { public const val TYPE_NAME: String = "Pet" @@ -35,7 +31,6 @@ public object DgsConstants { public const val Diet: String = "diet" } - @jakarta.`annotation`.Generated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) @Generated public object DIET { public const val TYPE_NAME: String = "Diet" diff --git a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/interfaceClassWithInterfaceFieldsOfDifferentType/expected/client/DietProjection.kt b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/interfaceClassWithInterfaceFieldsOfDifferentType/expected/client/DietProjection.kt index 5afcb1c19..e9cf199dd 100644 --- a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/interfaceClassWithInterfaceFieldsOfDifferentType/expected/client/DietProjection.kt +++ b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/interfaceClassWithInterfaceFieldsOfDifferentType/expected/client/DietProjection.kt @@ -2,11 +2,9 @@ package com.netflix.graphql.dgs.codegen.cases.interfaceClassWithInterfaceFieldsO import com.netflix.graphql.dgs.client.codegen.InputValueSerializerInterface import com.netflix.graphql.dgs.codegen.GraphQLProjection -import com.netflix.graphql.dgs.codegen.cases.interfaceClassWithInterfaceFieldsOfDifferentType.expected.Generated as ExpectedGenerated -import jakarta.`annotation`.Generated as AnnotationGenerated +import com.netflix.graphql.dgs.codegen.cases.interfaceClassWithInterfaceFieldsOfDifferentType.expected.Generated -@AnnotationGenerated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) -@ExpectedGenerated +@Generated public class DietProjection( inputValueSerializer: InputValueSerializerInterface? = null, ) : GraphQLProjection(inputValueSerializer) { diff --git a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/interfaceClassWithInterfaceFieldsOfDifferentType/expected/client/DogProjection.kt b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/interfaceClassWithInterfaceFieldsOfDifferentType/expected/client/DogProjection.kt index a25331a04..06bc7a462 100644 --- a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/interfaceClassWithInterfaceFieldsOfDifferentType/expected/client/DogProjection.kt +++ b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/interfaceClassWithInterfaceFieldsOfDifferentType/expected/client/DogProjection.kt @@ -2,12 +2,10 @@ package com.netflix.graphql.dgs.codegen.cases.interfaceClassWithInterfaceFieldsO import com.netflix.graphql.dgs.client.codegen.InputValueSerializerInterface import com.netflix.graphql.dgs.codegen.GraphQLProjection +import com.netflix.graphql.dgs.codegen.cases.interfaceClassWithInterfaceFieldsOfDifferentType.expected.Generated import kotlin.String -import com.netflix.graphql.dgs.codegen.cases.interfaceClassWithInterfaceFieldsOfDifferentType.expected.Generated as ExpectedGenerated -import jakarta.`annotation`.Generated as AnnotationGenerated -@AnnotationGenerated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) -@ExpectedGenerated +@Generated public class DogProjection( inputValueSerializer: InputValueSerializerInterface? = null, ) : GraphQLProjection(inputValueSerializer) { diff --git a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/interfaceClassWithInterfaceFieldsOfDifferentType/expected/client/PetProjection.kt b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/interfaceClassWithInterfaceFieldsOfDifferentType/expected/client/PetProjection.kt index 6477cb648..76a0dabb0 100644 --- a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/interfaceClassWithInterfaceFieldsOfDifferentType/expected/client/PetProjection.kt +++ b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/interfaceClassWithInterfaceFieldsOfDifferentType/expected/client/PetProjection.kt @@ -2,12 +2,10 @@ package com.netflix.graphql.dgs.codegen.cases.interfaceClassWithInterfaceFieldsO import com.netflix.graphql.dgs.client.codegen.InputValueSerializerInterface import com.netflix.graphql.dgs.codegen.GraphQLProjection +import com.netflix.graphql.dgs.codegen.cases.interfaceClassWithInterfaceFieldsOfDifferentType.expected.Generated import kotlin.String -import com.netflix.graphql.dgs.codegen.cases.interfaceClassWithInterfaceFieldsOfDifferentType.expected.Generated as ExpectedGenerated -import jakarta.`annotation`.Generated as AnnotationGenerated -@AnnotationGenerated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) -@ExpectedGenerated +@Generated public class PetProjection( inputValueSerializer: InputValueSerializerInterface? = null, ) : GraphQLProjection(inputValueSerializer) { diff --git a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/interfaceClassWithInterfaceFieldsOfDifferentType/expected/client/VegetarianProjection.kt b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/interfaceClassWithInterfaceFieldsOfDifferentType/expected/client/VegetarianProjection.kt index 6328cb7cf..fcf5d35fe 100644 --- a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/interfaceClassWithInterfaceFieldsOfDifferentType/expected/client/VegetarianProjection.kt +++ b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/interfaceClassWithInterfaceFieldsOfDifferentType/expected/client/VegetarianProjection.kt @@ -2,11 +2,9 @@ package com.netflix.graphql.dgs.codegen.cases.interfaceClassWithInterfaceFieldsO import com.netflix.graphql.dgs.client.codegen.InputValueSerializerInterface import com.netflix.graphql.dgs.codegen.GraphQLProjection -import com.netflix.graphql.dgs.codegen.cases.interfaceClassWithInterfaceFieldsOfDifferentType.expected.Generated as ExpectedGenerated -import jakarta.`annotation`.Generated as AnnotationGenerated +import com.netflix.graphql.dgs.codegen.cases.interfaceClassWithInterfaceFieldsOfDifferentType.expected.Generated -@AnnotationGenerated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) -@ExpectedGenerated +@Generated public class VegetarianProjection( inputValueSerializer: InputValueSerializerInterface? = null, ) : GraphQLProjection(inputValueSerializer) { diff --git a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/interfaceClassWithInterfaceFieldsOfDifferentType/expected/types/Diet.kt b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/interfaceClassWithInterfaceFieldsOfDifferentType/expected/types/Diet.kt index 932397f28..b183698cf 100644 --- a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/interfaceClassWithInterfaceFieldsOfDifferentType/expected/types/Diet.kt +++ b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/interfaceClassWithInterfaceFieldsOfDifferentType/expected/types/Diet.kt @@ -2,14 +2,12 @@ package com.netflix.graphql.dgs.codegen.cases.interfaceClassWithInterfaceFieldsO import com.fasterxml.jackson.`annotation`.JsonSubTypes import com.fasterxml.jackson.`annotation`.JsonTypeInfo +import com.netflix.graphql.dgs.codegen.cases.interfaceClassWithInterfaceFieldsOfDifferentType.expected.Generated import kotlin.String import kotlin.Suppress import kotlin.jvm.JvmName -import com.netflix.graphql.dgs.codegen.cases.interfaceClassWithInterfaceFieldsOfDifferentType.expected.Generated as ExpectedGenerated -import jakarta.`annotation`.Generated as AnnotationGenerated -@AnnotationGenerated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) -@ExpectedGenerated +@Generated @JsonTypeInfo( use = JsonTypeInfo.Id.NAME, include = JsonTypeInfo.As.PROPERTY, diff --git a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/interfaceClassWithInterfaceFieldsOfDifferentType/expected/types/Dog.kt b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/interfaceClassWithInterfaceFieldsOfDifferentType/expected/types/Dog.kt index 8b59f5ea6..4b5bd3295 100644 --- a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/interfaceClassWithInterfaceFieldsOfDifferentType/expected/types/Dog.kt +++ b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/interfaceClassWithInterfaceFieldsOfDifferentType/expected/types/Dog.kt @@ -5,15 +5,13 @@ import com.fasterxml.jackson.`annotation`.JsonProperty import com.fasterxml.jackson.`annotation`.JsonTypeInfo import com.fasterxml.jackson.databind.`annotation`.JsonDeserialize import com.fasterxml.jackson.databind.`annotation`.JsonPOJOBuilder +import com.netflix.graphql.dgs.codegen.cases.interfaceClassWithInterfaceFieldsOfDifferentType.expected.Generated import java.lang.IllegalStateException import kotlin.String import kotlin.Suppress import kotlin.jvm.JvmName -import com.netflix.graphql.dgs.codegen.cases.interfaceClassWithInterfaceFieldsOfDifferentType.expected.Generated as ExpectedGenerated -import jakarta.`annotation`.Generated as AnnotationGenerated -@AnnotationGenerated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) -@ExpectedGenerated +@Generated @JsonTypeInfo(use = JsonTypeInfo.Id.NONE) @JsonDeserialize(builder = Dog.Builder::class) public class Dog( @@ -34,8 +32,7 @@ public class Dog( override val diet: Vegetarian? get() = __diet.invoke() - @AnnotationGenerated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) - @ExpectedGenerated + @Generated public companion object { private val nameDefault: () -> String? = { throw IllegalStateException("Field `name` was not requested") } @@ -44,8 +41,7 @@ public class Dog( { throw IllegalStateException("Field `diet` was not requested") } } - @AnnotationGenerated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) - @ExpectedGenerated + @Generated @JsonPOJOBuilder @JsonIgnoreProperties("__typename") public class Builder { diff --git a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/interfaceClassWithInterfaceFieldsOfDifferentType/expected/types/Pet.kt b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/interfaceClassWithInterfaceFieldsOfDifferentType/expected/types/Pet.kt index 6dbbac298..cc9382900 100644 --- a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/interfaceClassWithInterfaceFieldsOfDifferentType/expected/types/Pet.kt +++ b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/interfaceClassWithInterfaceFieldsOfDifferentType/expected/types/Pet.kt @@ -2,14 +2,12 @@ package com.netflix.graphql.dgs.codegen.cases.interfaceClassWithInterfaceFieldsO import com.fasterxml.jackson.`annotation`.JsonSubTypes import com.fasterxml.jackson.`annotation`.JsonTypeInfo +import com.netflix.graphql.dgs.codegen.cases.interfaceClassWithInterfaceFieldsOfDifferentType.expected.Generated import kotlin.String import kotlin.Suppress import kotlin.jvm.JvmName -import com.netflix.graphql.dgs.codegen.cases.interfaceClassWithInterfaceFieldsOfDifferentType.expected.Generated as ExpectedGenerated -import jakarta.`annotation`.Generated as AnnotationGenerated -@AnnotationGenerated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) -@ExpectedGenerated +@Generated @JsonTypeInfo( use = JsonTypeInfo.Id.NAME, include = JsonTypeInfo.As.PROPERTY, diff --git a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/interfaceClassWithInterfaceFieldsOfDifferentType/expected/types/Vegetarian.kt b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/interfaceClassWithInterfaceFieldsOfDifferentType/expected/types/Vegetarian.kt index 4459a0e29..41a4ac0cd 100644 --- a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/interfaceClassWithInterfaceFieldsOfDifferentType/expected/types/Vegetarian.kt +++ b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/interfaceClassWithInterfaceFieldsOfDifferentType/expected/types/Vegetarian.kt @@ -5,16 +5,14 @@ import com.fasterxml.jackson.`annotation`.JsonProperty import com.fasterxml.jackson.`annotation`.JsonTypeInfo import com.fasterxml.jackson.databind.`annotation`.JsonDeserialize import com.fasterxml.jackson.databind.`annotation`.JsonPOJOBuilder +import com.netflix.graphql.dgs.codegen.cases.interfaceClassWithInterfaceFieldsOfDifferentType.expected.Generated import java.lang.IllegalStateException import kotlin.String import kotlin.Suppress import kotlin.collections.List import kotlin.jvm.JvmName -import com.netflix.graphql.dgs.codegen.cases.interfaceClassWithInterfaceFieldsOfDifferentType.expected.Generated as ExpectedGenerated -import jakarta.`annotation`.Generated as AnnotationGenerated -@AnnotationGenerated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) -@ExpectedGenerated +@Generated @JsonTypeInfo(use = JsonTypeInfo.Id.NONE) @JsonDeserialize(builder = Vegetarian.Builder::class) public class Vegetarian( @@ -34,8 +32,7 @@ public class Vegetarian( public val vegetables: List? get() = __vegetables.invoke() - @AnnotationGenerated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) - @ExpectedGenerated + @Generated public companion object { private val caloriesDefault: () -> String? = { throw IllegalStateException("Field `calories` was not requested") } @@ -44,8 +41,7 @@ public class Vegetarian( { throw IllegalStateException("Field `vegetables` was not requested") } } - @AnnotationGenerated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) - @ExpectedGenerated + @Generated @JsonPOJOBuilder @JsonIgnoreProperties("__typename") public class Builder { diff --git a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/interfaceClassWithNonNullableFields/expected/DgsClient.kt b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/interfaceClassWithNonNullableFields/expected/DgsClient.kt index 41acc4e79..fe7448f93 100644 --- a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/interfaceClassWithNonNullableFields/expected/DgsClient.kt +++ b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/interfaceClassWithNonNullableFields/expected/DgsClient.kt @@ -6,7 +6,6 @@ import com.netflix.graphql.dgs.codegen.cases.interfaceClassWithNonNullableFields import graphql.language.OperationDefinition import kotlin.String -@jakarta.`annotation`.Generated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) @Generated public object DgsClient { public fun buildQuery(inputValueSerializer: InputValueSerializerInterface? = null, diff --git a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/interfaceClassWithNonNullableFields/expected/DgsConstants.kt b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/interfaceClassWithNonNullableFields/expected/DgsConstants.kt index 17ec98895..701c86669 100644 --- a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/interfaceClassWithNonNullableFields/expected/DgsConstants.kt +++ b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/interfaceClassWithNonNullableFields/expected/DgsConstants.kt @@ -2,12 +2,10 @@ package com.netflix.graphql.dgs.codegen.cases.interfaceClassWithNonNullableField import kotlin.String -@jakarta.`annotation`.Generated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) @Generated public object DgsConstants { public const val QUERY_TYPE: String = "Query" - @jakarta.`annotation`.Generated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) @Generated public object QUERY { public const val TYPE_NAME: String = "Query" @@ -15,7 +13,6 @@ public object DgsConstants { public const val People: String = "people" } - @jakarta.`annotation`.Generated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) @Generated public object EMPLOYEE { public const val TYPE_NAME: String = "Employee" @@ -27,7 +24,6 @@ public object DgsConstants { public const val Company: String = "company" } - @jakarta.`annotation`.Generated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) @Generated public object PERSON { public const val TYPE_NAME: String = "Person" diff --git a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/interfaceClassWithNonNullableFields/expected/client/EmployeeProjection.kt b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/interfaceClassWithNonNullableFields/expected/client/EmployeeProjection.kt index 49b214b11..8601f071c 100644 --- a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/interfaceClassWithNonNullableFields/expected/client/EmployeeProjection.kt +++ b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/interfaceClassWithNonNullableFields/expected/client/EmployeeProjection.kt @@ -2,11 +2,9 @@ package com.netflix.graphql.dgs.codegen.cases.interfaceClassWithNonNullableField import com.netflix.graphql.dgs.client.codegen.InputValueSerializerInterface import com.netflix.graphql.dgs.codegen.GraphQLProjection -import com.netflix.graphql.dgs.codegen.cases.interfaceClassWithNonNullableFields.expected.Generated as ExpectedGenerated -import jakarta.`annotation`.Generated as AnnotationGenerated +import com.netflix.graphql.dgs.codegen.cases.interfaceClassWithNonNullableFields.expected.Generated -@AnnotationGenerated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) -@ExpectedGenerated +@Generated public class EmployeeProjection( inputValueSerializer: InputValueSerializerInterface? = null, ) : GraphQLProjection(inputValueSerializer) { diff --git a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/interfaceClassWithNonNullableFields/expected/client/PersonProjection.kt b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/interfaceClassWithNonNullableFields/expected/client/PersonProjection.kt index 55434c8ea..3bd4dbb8c 100644 --- a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/interfaceClassWithNonNullableFields/expected/client/PersonProjection.kt +++ b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/interfaceClassWithNonNullableFields/expected/client/PersonProjection.kt @@ -2,11 +2,9 @@ package com.netflix.graphql.dgs.codegen.cases.interfaceClassWithNonNullableField import com.netflix.graphql.dgs.client.codegen.InputValueSerializerInterface import com.netflix.graphql.dgs.codegen.GraphQLProjection -import com.netflix.graphql.dgs.codegen.cases.interfaceClassWithNonNullableFields.expected.Generated as ExpectedGenerated -import jakarta.`annotation`.Generated as AnnotationGenerated +import com.netflix.graphql.dgs.codegen.cases.interfaceClassWithNonNullableFields.expected.Generated -@AnnotationGenerated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) -@ExpectedGenerated +@Generated public class PersonProjection( inputValueSerializer: InputValueSerializerInterface? = null, ) : GraphQLProjection(inputValueSerializer) { diff --git a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/interfaceClassWithNonNullableFields/expected/client/QueryProjection.kt b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/interfaceClassWithNonNullableFields/expected/client/QueryProjection.kt index b9ab47c23..2242b1b6a 100644 --- a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/interfaceClassWithNonNullableFields/expected/client/QueryProjection.kt +++ b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/interfaceClassWithNonNullableFields/expected/client/QueryProjection.kt @@ -2,12 +2,10 @@ package com.netflix.graphql.dgs.codegen.cases.interfaceClassWithNonNullableField import com.netflix.graphql.dgs.client.codegen.InputValueSerializerInterface import com.netflix.graphql.dgs.codegen.GraphQLProjection +import com.netflix.graphql.dgs.codegen.cases.interfaceClassWithNonNullableFields.expected.Generated import kotlin.String -import com.netflix.graphql.dgs.codegen.cases.interfaceClassWithNonNullableFields.expected.Generated as ExpectedGenerated -import jakarta.`annotation`.Generated as AnnotationGenerated -@AnnotationGenerated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) -@ExpectedGenerated +@Generated public class QueryProjection( inputValueSerializer: InputValueSerializerInterface? = null, ) : GraphQLProjection(inputValueSerializer) { diff --git a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/interfaceClassWithNonNullableFields/expected/types/Employee.kt b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/interfaceClassWithNonNullableFields/expected/types/Employee.kt index e848b08d1..29ca5ac4f 100644 --- a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/interfaceClassWithNonNullableFields/expected/types/Employee.kt +++ b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/interfaceClassWithNonNullableFields/expected/types/Employee.kt @@ -5,15 +5,13 @@ import com.fasterxml.jackson.`annotation`.JsonProperty import com.fasterxml.jackson.`annotation`.JsonTypeInfo import com.fasterxml.jackson.databind.`annotation`.JsonDeserialize import com.fasterxml.jackson.databind.`annotation`.JsonPOJOBuilder +import com.netflix.graphql.dgs.codegen.cases.interfaceClassWithNonNullableFields.expected.Generated import java.lang.IllegalStateException import kotlin.String import kotlin.Suppress import kotlin.jvm.JvmName -import com.netflix.graphql.dgs.codegen.cases.interfaceClassWithNonNullableFields.expected.Generated as ExpectedGenerated -import jakarta.`annotation`.Generated as AnnotationGenerated -@AnnotationGenerated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) -@ExpectedGenerated +@Generated @JsonTypeInfo(use = JsonTypeInfo.Id.NONE) @JsonDeserialize(builder = Employee.Builder::class) public class Employee( @@ -41,8 +39,7 @@ public class Employee( public val company: String? get() = __company.invoke() - @AnnotationGenerated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) - @ExpectedGenerated + @Generated public companion object { private val firstnameDefault: () -> String = { throw IllegalStateException("Field `firstname` was not requested") } @@ -54,8 +51,7 @@ public class Employee( { throw IllegalStateException("Field `company` was not requested") } } - @AnnotationGenerated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) - @ExpectedGenerated + @Generated @JsonPOJOBuilder @JsonIgnoreProperties("__typename") public class Builder { diff --git a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/interfaceClassWithNonNullableFields/expected/types/Person.kt b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/interfaceClassWithNonNullableFields/expected/types/Person.kt index fc5e2744a..aa2c083b7 100644 --- a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/interfaceClassWithNonNullableFields/expected/types/Person.kt +++ b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/interfaceClassWithNonNullableFields/expected/types/Person.kt @@ -2,14 +2,12 @@ package com.netflix.graphql.dgs.codegen.cases.interfaceClassWithNonNullableField import com.fasterxml.jackson.`annotation`.JsonSubTypes import com.fasterxml.jackson.`annotation`.JsonTypeInfo +import com.netflix.graphql.dgs.codegen.cases.interfaceClassWithNonNullableFields.expected.Generated import kotlin.String import kotlin.Suppress import kotlin.jvm.JvmName -import com.netflix.graphql.dgs.codegen.cases.interfaceClassWithNonNullableFields.expected.Generated as ExpectedGenerated -import jakarta.`annotation`.Generated as AnnotationGenerated -@AnnotationGenerated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) -@ExpectedGenerated +@Generated @JsonTypeInfo( use = JsonTypeInfo.Id.NAME, include = JsonTypeInfo.As.PROPERTY, diff --git a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/interfaceClassWithNonNullableFields/expected/types/Query.kt b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/interfaceClassWithNonNullableFields/expected/types/Query.kt index c4e964c78..66cd01130 100644 --- a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/interfaceClassWithNonNullableFields/expected/types/Query.kt +++ b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/interfaceClassWithNonNullableFields/expected/types/Query.kt @@ -5,14 +5,12 @@ import com.fasterxml.jackson.`annotation`.JsonProperty import com.fasterxml.jackson.`annotation`.JsonTypeInfo import com.fasterxml.jackson.databind.`annotation`.JsonDeserialize import com.fasterxml.jackson.databind.`annotation`.JsonPOJOBuilder +import com.netflix.graphql.dgs.codegen.cases.interfaceClassWithNonNullableFields.expected.Generated import java.lang.IllegalStateException import kotlin.collections.List import kotlin.jvm.JvmName -import com.netflix.graphql.dgs.codegen.cases.interfaceClassWithNonNullableFields.expected.Generated as ExpectedGenerated -import jakarta.`annotation`.Generated as AnnotationGenerated -@AnnotationGenerated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) -@ExpectedGenerated +@Generated @JsonTypeInfo(use = JsonTypeInfo.Id.NONE) @JsonDeserialize(builder = Query.Builder::class) public class Query( @@ -24,15 +22,13 @@ public class Query( public val people: List? get() = __people.invoke() - @AnnotationGenerated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) - @ExpectedGenerated + @Generated public companion object { private val peopleDefault: () -> List? = { throw IllegalStateException("Field `people` was not requested") } } - @AnnotationGenerated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) - @ExpectedGenerated + @Generated @JsonPOJOBuilder @JsonIgnoreProperties("__typename") public class Builder { diff --git a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/interfaceDocs/expected/DgsClient.kt b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/interfaceDocs/expected/DgsClient.kt index 4ce9c1457..31922574d 100644 --- a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/interfaceDocs/expected/DgsClient.kt +++ b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/interfaceDocs/expected/DgsClient.kt @@ -1,5 +1,4 @@ package com.netflix.graphql.dgs.codegen.cases.interfaceDocs.expected -@jakarta.`annotation`.Generated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) @Generated public object DgsClient diff --git a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/interfaceDocs/expected/DgsConstants.kt b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/interfaceDocs/expected/DgsConstants.kt index 8174490fc..d4c8080a6 100644 --- a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/interfaceDocs/expected/DgsConstants.kt +++ b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/interfaceDocs/expected/DgsConstants.kt @@ -2,10 +2,8 @@ package com.netflix.graphql.dgs.codegen.cases.interfaceDocs.expected import kotlin.String -@jakarta.`annotation`.Generated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) @Generated public object DgsConstants { - @jakarta.`annotation`.Generated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) @Generated public object TITLED { public const val TYPE_NAME: String = "Titled" diff --git a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/interfaceDocs/expected/client/TitledProjection.kt b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/interfaceDocs/expected/client/TitledProjection.kt index 51c25f3b6..f0c3a53fa 100644 --- a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/interfaceDocs/expected/client/TitledProjection.kt +++ b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/interfaceDocs/expected/client/TitledProjection.kt @@ -2,11 +2,9 @@ package com.netflix.graphql.dgs.codegen.cases.interfaceDocs.expected.client import com.netflix.graphql.dgs.client.codegen.InputValueSerializerInterface import com.netflix.graphql.dgs.codegen.GraphQLProjection -import com.netflix.graphql.dgs.codegen.cases.interfaceDocs.expected.Generated as ExpectedGenerated -import jakarta.`annotation`.Generated as AnnotationGenerated +import com.netflix.graphql.dgs.codegen.cases.interfaceDocs.expected.Generated -@AnnotationGenerated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) -@ExpectedGenerated +@Generated public class TitledProjection( inputValueSerializer: InputValueSerializerInterface? = null, ) : GraphQLProjection(inputValueSerializer) { diff --git a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/interfaceDocs/expected/types/Titled.kt b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/interfaceDocs/expected/types/Titled.kt index c3f097c05..88e703344 100644 --- a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/interfaceDocs/expected/types/Titled.kt +++ b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/interfaceDocs/expected/types/Titled.kt @@ -1,17 +1,15 @@ package com.netflix.graphql.dgs.codegen.cases.interfaceDocs.expected.types import com.fasterxml.jackson.`annotation`.JsonTypeInfo +import com.netflix.graphql.dgs.codegen.cases.interfaceDocs.expected.Generated import kotlin.String import kotlin.Suppress import kotlin.jvm.JvmName -import com.netflix.graphql.dgs.codegen.cases.interfaceDocs.expected.Generated as ExpectedGenerated -import jakarta.`annotation`.Generated as AnnotationGenerated /** * Anything with a title! */ -@AnnotationGenerated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) -@ExpectedGenerated +@Generated @JsonTypeInfo( use = JsonTypeInfo.Id.NAME, include = JsonTypeInfo.As.PROPERTY, diff --git a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/interfaceFieldsDocs/expected/DgsClient.kt b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/interfaceFieldsDocs/expected/DgsClient.kt index 344ed9f1f..c9305a046 100644 --- a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/interfaceFieldsDocs/expected/DgsClient.kt +++ b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/interfaceFieldsDocs/expected/DgsClient.kt @@ -1,5 +1,4 @@ package com.netflix.graphql.dgs.codegen.cases.interfaceFieldsDocs.expected -@jakarta.`annotation`.Generated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) @Generated public object DgsClient diff --git a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/interfaceFieldsDocs/expected/DgsConstants.kt b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/interfaceFieldsDocs/expected/DgsConstants.kt index 773471a66..350918edb 100644 --- a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/interfaceFieldsDocs/expected/DgsConstants.kt +++ b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/interfaceFieldsDocs/expected/DgsConstants.kt @@ -2,10 +2,8 @@ package com.netflix.graphql.dgs.codegen.cases.interfaceFieldsDocs.expected import kotlin.String -@jakarta.`annotation`.Generated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) @Generated public object DgsConstants { - @jakarta.`annotation`.Generated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) @Generated public object TITLED { public const val TYPE_NAME: String = "Titled" diff --git a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/interfaceFieldsDocs/expected/client/TitledProjection.kt b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/interfaceFieldsDocs/expected/client/TitledProjection.kt index 223937f60..c3bc0a296 100644 --- a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/interfaceFieldsDocs/expected/client/TitledProjection.kt +++ b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/interfaceFieldsDocs/expected/client/TitledProjection.kt @@ -2,11 +2,9 @@ package com.netflix.graphql.dgs.codegen.cases.interfaceFieldsDocs.expected.clien import com.netflix.graphql.dgs.client.codegen.InputValueSerializerInterface import com.netflix.graphql.dgs.codegen.GraphQLProjection -import com.netflix.graphql.dgs.codegen.cases.interfaceFieldsDocs.expected.Generated as ExpectedGenerated -import jakarta.`annotation`.Generated as AnnotationGenerated +import com.netflix.graphql.dgs.codegen.cases.interfaceFieldsDocs.expected.Generated -@AnnotationGenerated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) -@ExpectedGenerated +@Generated public class TitledProjection( inputValueSerializer: InputValueSerializerInterface? = null, ) : GraphQLProjection(inputValueSerializer) { diff --git a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/interfaceFieldsDocs/expected/types/Titled.kt b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/interfaceFieldsDocs/expected/types/Titled.kt index 2c6341eee..c1d273dd2 100644 --- a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/interfaceFieldsDocs/expected/types/Titled.kt +++ b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/interfaceFieldsDocs/expected/types/Titled.kt @@ -1,14 +1,12 @@ package com.netflix.graphql.dgs.codegen.cases.interfaceFieldsDocs.expected.types import com.fasterxml.jackson.`annotation`.JsonTypeInfo +import com.netflix.graphql.dgs.codegen.cases.interfaceFieldsDocs.expected.Generated import kotlin.String import kotlin.Suppress import kotlin.jvm.JvmName -import com.netflix.graphql.dgs.codegen.cases.interfaceFieldsDocs.expected.Generated as ExpectedGenerated -import jakarta.`annotation`.Generated as AnnotationGenerated -@AnnotationGenerated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) -@ExpectedGenerated +@Generated @JsonTypeInfo( use = JsonTypeInfo.Id.NAME, include = JsonTypeInfo.As.PROPERTY, diff --git a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/interfaceWithInterfaceInheritance/expected/DgsClient.kt b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/interfaceWithInterfaceInheritance/expected/DgsClient.kt index 39d5c4305..b05126fb3 100644 --- a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/interfaceWithInterfaceInheritance/expected/DgsClient.kt +++ b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/interfaceWithInterfaceInheritance/expected/DgsClient.kt @@ -6,7 +6,6 @@ import com.netflix.graphql.dgs.codegen.cases.interfaceWithInterfaceInheritance.e import graphql.language.OperationDefinition import kotlin.String -@jakarta.`annotation`.Generated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) @Generated public object DgsClient { public fun buildQuery(inputValueSerializer: InputValueSerializerInterface? = null, diff --git a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/interfaceWithInterfaceInheritance/expected/DgsConstants.kt b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/interfaceWithInterfaceInheritance/expected/DgsConstants.kt index a89f62a93..380cacd78 100644 --- a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/interfaceWithInterfaceInheritance/expected/DgsConstants.kt +++ b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/interfaceWithInterfaceInheritance/expected/DgsConstants.kt @@ -2,12 +2,10 @@ package com.netflix.graphql.dgs.codegen.cases.interfaceWithInterfaceInheritance. import kotlin.String -@jakarta.`annotation`.Generated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) @Generated public object DgsConstants { public const val QUERY_TYPE: String = "Query" - @jakarta.`annotation`.Generated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) @Generated public object QUERY { public const val TYPE_NAME: String = "Query" @@ -15,7 +13,6 @@ public object DgsConstants { public const val Fruits: String = "fruits" } - @jakarta.`annotation`.Generated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) @Generated public object SEED { public const val TYPE_NAME: String = "Seed" @@ -23,7 +20,6 @@ public object DgsConstants { public const val Name: String = "name" } - @jakarta.`annotation`.Generated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) @Generated public object FRUIT { public const val TYPE_NAME: String = "Fruit" @@ -31,7 +27,6 @@ public object DgsConstants { public const val Seeds: String = "seeds" } - @jakarta.`annotation`.Generated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) @Generated public object STONEFRUIT { public const val TYPE_NAME: String = "StoneFruit" diff --git a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/interfaceWithInterfaceInheritance/expected/client/FruitProjection.kt b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/interfaceWithInterfaceInheritance/expected/client/FruitProjection.kt index 566195644..01152b079 100644 --- a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/interfaceWithInterfaceInheritance/expected/client/FruitProjection.kt +++ b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/interfaceWithInterfaceInheritance/expected/client/FruitProjection.kt @@ -2,12 +2,10 @@ package com.netflix.graphql.dgs.codegen.cases.interfaceWithInterfaceInheritance. import com.netflix.graphql.dgs.client.codegen.InputValueSerializerInterface import com.netflix.graphql.dgs.codegen.GraphQLProjection +import com.netflix.graphql.dgs.codegen.cases.interfaceWithInterfaceInheritance.expected.Generated import kotlin.String -import com.netflix.graphql.dgs.codegen.cases.interfaceWithInterfaceInheritance.expected.Generated as ExpectedGenerated -import jakarta.`annotation`.Generated as AnnotationGenerated -@AnnotationGenerated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) -@ExpectedGenerated +@Generated public class FruitProjection( inputValueSerializer: InputValueSerializerInterface? = null, ) : GraphQLProjection(inputValueSerializer) { diff --git a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/interfaceWithInterfaceInheritance/expected/client/QueryProjection.kt b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/interfaceWithInterfaceInheritance/expected/client/QueryProjection.kt index 2a1c75072..75d71162e 100644 --- a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/interfaceWithInterfaceInheritance/expected/client/QueryProjection.kt +++ b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/interfaceWithInterfaceInheritance/expected/client/QueryProjection.kt @@ -2,12 +2,10 @@ package com.netflix.graphql.dgs.codegen.cases.interfaceWithInterfaceInheritance. import com.netflix.graphql.dgs.client.codegen.InputValueSerializerInterface import com.netflix.graphql.dgs.codegen.GraphQLProjection +import com.netflix.graphql.dgs.codegen.cases.interfaceWithInterfaceInheritance.expected.Generated import kotlin.String -import com.netflix.graphql.dgs.codegen.cases.interfaceWithInterfaceInheritance.expected.Generated as ExpectedGenerated -import jakarta.`annotation`.Generated as AnnotationGenerated -@AnnotationGenerated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) -@ExpectedGenerated +@Generated public class QueryProjection( inputValueSerializer: InputValueSerializerInterface? = null, ) : GraphQLProjection(inputValueSerializer) { diff --git a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/interfaceWithInterfaceInheritance/expected/client/SeedProjection.kt b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/interfaceWithInterfaceInheritance/expected/client/SeedProjection.kt index cb5b417e0..ba2d7e7f7 100644 --- a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/interfaceWithInterfaceInheritance/expected/client/SeedProjection.kt +++ b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/interfaceWithInterfaceInheritance/expected/client/SeedProjection.kt @@ -2,11 +2,9 @@ package com.netflix.graphql.dgs.codegen.cases.interfaceWithInterfaceInheritance. import com.netflix.graphql.dgs.client.codegen.InputValueSerializerInterface import com.netflix.graphql.dgs.codegen.GraphQLProjection -import com.netflix.graphql.dgs.codegen.cases.interfaceWithInterfaceInheritance.expected.Generated as ExpectedGenerated -import jakarta.`annotation`.Generated as AnnotationGenerated +import com.netflix.graphql.dgs.codegen.cases.interfaceWithInterfaceInheritance.expected.Generated -@AnnotationGenerated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) -@ExpectedGenerated +@Generated public class SeedProjection( inputValueSerializer: InputValueSerializerInterface? = null, ) : GraphQLProjection(inputValueSerializer) { diff --git a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/interfaceWithInterfaceInheritance/expected/client/StoneFruitProjection.kt b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/interfaceWithInterfaceInheritance/expected/client/StoneFruitProjection.kt index d7c07b9db..78f21da29 100644 --- a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/interfaceWithInterfaceInheritance/expected/client/StoneFruitProjection.kt +++ b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/interfaceWithInterfaceInheritance/expected/client/StoneFruitProjection.kt @@ -2,12 +2,10 @@ package com.netflix.graphql.dgs.codegen.cases.interfaceWithInterfaceInheritance. import com.netflix.graphql.dgs.client.codegen.InputValueSerializerInterface import com.netflix.graphql.dgs.codegen.GraphQLProjection +import com.netflix.graphql.dgs.codegen.cases.interfaceWithInterfaceInheritance.expected.Generated import kotlin.String -import com.netflix.graphql.dgs.codegen.cases.interfaceWithInterfaceInheritance.expected.Generated as ExpectedGenerated -import jakarta.`annotation`.Generated as AnnotationGenerated -@AnnotationGenerated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) -@ExpectedGenerated +@Generated public class StoneFruitProjection( inputValueSerializer: InputValueSerializerInterface? = null, ) : GraphQLProjection(inputValueSerializer) { diff --git a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/interfaceWithInterfaceInheritance/expected/types/Fruit.kt b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/interfaceWithInterfaceInheritance/expected/types/Fruit.kt index 8e0184beb..e5d5d8bbe 100644 --- a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/interfaceWithInterfaceInheritance/expected/types/Fruit.kt +++ b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/interfaceWithInterfaceInheritance/expected/types/Fruit.kt @@ -1,14 +1,12 @@ package com.netflix.graphql.dgs.codegen.cases.interfaceWithInterfaceInheritance.expected.types import com.fasterxml.jackson.`annotation`.JsonTypeInfo +import com.netflix.graphql.dgs.codegen.cases.interfaceWithInterfaceInheritance.expected.Generated import kotlin.Suppress import kotlin.collections.List import kotlin.jvm.JvmName -import com.netflix.graphql.dgs.codegen.cases.interfaceWithInterfaceInheritance.expected.Generated as ExpectedGenerated -import jakarta.`annotation`.Generated as AnnotationGenerated -@AnnotationGenerated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) -@ExpectedGenerated +@Generated @JsonTypeInfo( use = JsonTypeInfo.Id.NAME, include = JsonTypeInfo.As.PROPERTY, diff --git a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/interfaceWithInterfaceInheritance/expected/types/Query.kt b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/interfaceWithInterfaceInheritance/expected/types/Query.kt index de0be9d57..4b6d570dd 100644 --- a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/interfaceWithInterfaceInheritance/expected/types/Query.kt +++ b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/interfaceWithInterfaceInheritance/expected/types/Query.kt @@ -5,14 +5,12 @@ import com.fasterxml.jackson.`annotation`.JsonProperty import com.fasterxml.jackson.`annotation`.JsonTypeInfo import com.fasterxml.jackson.databind.`annotation`.JsonDeserialize import com.fasterxml.jackson.databind.`annotation`.JsonPOJOBuilder +import com.netflix.graphql.dgs.codegen.cases.interfaceWithInterfaceInheritance.expected.Generated import java.lang.IllegalStateException import kotlin.collections.List import kotlin.jvm.JvmName -import com.netflix.graphql.dgs.codegen.cases.interfaceWithInterfaceInheritance.expected.Generated as ExpectedGenerated -import jakarta.`annotation`.Generated as AnnotationGenerated -@AnnotationGenerated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) -@ExpectedGenerated +@Generated @JsonTypeInfo(use = JsonTypeInfo.Id.NONE) @JsonDeserialize(builder = Query.Builder::class) public class Query( @@ -24,15 +22,13 @@ public class Query( public val fruits: List? get() = __fruits.invoke() - @AnnotationGenerated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) - @ExpectedGenerated + @Generated public companion object { private val fruitsDefault: () -> List? = { throw IllegalStateException("Field `fruits` was not requested") } } - @AnnotationGenerated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) - @ExpectedGenerated + @Generated @JsonPOJOBuilder @JsonIgnoreProperties("__typename") public class Builder { diff --git a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/interfaceWithInterfaceInheritance/expected/types/Seed.kt b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/interfaceWithInterfaceInheritance/expected/types/Seed.kt index 9dea64cd4..fc2b21e17 100644 --- a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/interfaceWithInterfaceInheritance/expected/types/Seed.kt +++ b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/interfaceWithInterfaceInheritance/expected/types/Seed.kt @@ -5,14 +5,12 @@ import com.fasterxml.jackson.`annotation`.JsonProperty import com.fasterxml.jackson.`annotation`.JsonTypeInfo import com.fasterxml.jackson.databind.`annotation`.JsonDeserialize import com.fasterxml.jackson.databind.`annotation`.JsonPOJOBuilder +import com.netflix.graphql.dgs.codegen.cases.interfaceWithInterfaceInheritance.expected.Generated import java.lang.IllegalStateException import kotlin.String import kotlin.jvm.JvmName -import com.netflix.graphql.dgs.codegen.cases.interfaceWithInterfaceInheritance.expected.Generated as ExpectedGenerated -import jakarta.`annotation`.Generated as AnnotationGenerated -@AnnotationGenerated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) -@ExpectedGenerated +@Generated @JsonTypeInfo(use = JsonTypeInfo.Id.NONE) @JsonDeserialize(builder = Seed.Builder::class) public class Seed( @@ -24,15 +22,13 @@ public class Seed( public val name: String? get() = __name.invoke() - @AnnotationGenerated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) - @ExpectedGenerated + @Generated public companion object { private val nameDefault: () -> String? = { throw IllegalStateException("Field `name` was not requested") } } - @AnnotationGenerated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) - @ExpectedGenerated + @Generated @JsonPOJOBuilder @JsonIgnoreProperties("__typename") public class Builder { diff --git a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/interfaceWithInterfaceInheritance/expected/types/StoneFruit.kt b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/interfaceWithInterfaceInheritance/expected/types/StoneFruit.kt index 056be5cfa..70491fa68 100644 --- a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/interfaceWithInterfaceInheritance/expected/types/StoneFruit.kt +++ b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/interfaceWithInterfaceInheritance/expected/types/StoneFruit.kt @@ -1,15 +1,13 @@ package com.netflix.graphql.dgs.codegen.cases.interfaceWithInterfaceInheritance.expected.types import com.fasterxml.jackson.`annotation`.JsonTypeInfo +import com.netflix.graphql.dgs.codegen.cases.interfaceWithInterfaceInheritance.expected.Generated import kotlin.Boolean import kotlin.Suppress import kotlin.collections.List import kotlin.jvm.JvmName -import com.netflix.graphql.dgs.codegen.cases.interfaceWithInterfaceInheritance.expected.Generated as ExpectedGenerated -import jakarta.`annotation`.Generated as AnnotationGenerated -@AnnotationGenerated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) -@ExpectedGenerated +@Generated @JsonTypeInfo( use = JsonTypeInfo.Id.NAME, include = JsonTypeInfo.As.PROPERTY, diff --git a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/interfaceWithUnderscoreFields/expected/DgsClient.kt b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/interfaceWithUnderscoreFields/expected/DgsClient.kt index 0280ff01a..3f433d62d 100644 --- a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/interfaceWithUnderscoreFields/expected/DgsClient.kt +++ b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/interfaceWithUnderscoreFields/expected/DgsClient.kt @@ -6,7 +6,6 @@ import com.netflix.graphql.dgs.codegen.cases.interfaceWithUnderscoreFields.expec import graphql.language.OperationDefinition import kotlin.String -@jakarta.`annotation`.Generated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) @Generated public object DgsClient { public fun buildQuery(inputValueSerializer: InputValueSerializerInterface? = null, diff --git a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/interfaceWithUnderscoreFields/expected/DgsConstants.kt b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/interfaceWithUnderscoreFields/expected/DgsConstants.kt index f2fa37bf8..928ee4ace 100644 --- a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/interfaceWithUnderscoreFields/expected/DgsConstants.kt +++ b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/interfaceWithUnderscoreFields/expected/DgsConstants.kt @@ -2,12 +2,10 @@ package com.netflix.graphql.dgs.codegen.cases.interfaceWithUnderscoreFields.expe import kotlin.String -@jakarta.`annotation`.Generated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) @Generated public object DgsConstants { public const val QUERY_TYPE: String = "Query" - @jakarta.`annotation`.Generated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) @Generated public object QUERY { public const val TYPE_NAME: String = "Query" @@ -15,7 +13,6 @@ public object DgsConstants { public const val Is: String = "is" } - @jakarta.`annotation`.Generated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) @Generated public object T { public const val TYPE_NAME: String = "T" @@ -25,7 +22,6 @@ public object DgsConstants { public const val Id: String = "id" } - @jakarta.`annotation`.Generated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) @Generated public object I { public const val TYPE_NAME: String = "I" diff --git a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/interfaceWithUnderscoreFields/expected/client/IProjection.kt b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/interfaceWithUnderscoreFields/expected/client/IProjection.kt index be86b5c90..cfa286f1f 100644 --- a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/interfaceWithUnderscoreFields/expected/client/IProjection.kt +++ b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/interfaceWithUnderscoreFields/expected/client/IProjection.kt @@ -2,11 +2,9 @@ package com.netflix.graphql.dgs.codegen.cases.interfaceWithUnderscoreFields.expe import com.netflix.graphql.dgs.client.codegen.InputValueSerializerInterface import com.netflix.graphql.dgs.codegen.GraphQLProjection -import com.netflix.graphql.dgs.codegen.cases.interfaceWithUnderscoreFields.expected.Generated as ExpectedGenerated -import jakarta.`annotation`.Generated as AnnotationGenerated +import com.netflix.graphql.dgs.codegen.cases.interfaceWithUnderscoreFields.expected.Generated -@AnnotationGenerated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) -@ExpectedGenerated +@Generated public class IProjection( inputValueSerializer: InputValueSerializerInterface? = null, ) : GraphQLProjection(inputValueSerializer) { diff --git a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/interfaceWithUnderscoreFields/expected/client/QueryProjection.kt b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/interfaceWithUnderscoreFields/expected/client/QueryProjection.kt index b6853990f..32c51b1e8 100644 --- a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/interfaceWithUnderscoreFields/expected/client/QueryProjection.kt +++ b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/interfaceWithUnderscoreFields/expected/client/QueryProjection.kt @@ -2,12 +2,10 @@ package com.netflix.graphql.dgs.codegen.cases.interfaceWithUnderscoreFields.expe import com.netflix.graphql.dgs.client.codegen.InputValueSerializerInterface import com.netflix.graphql.dgs.codegen.GraphQLProjection +import com.netflix.graphql.dgs.codegen.cases.interfaceWithUnderscoreFields.expected.Generated import kotlin.String -import com.netflix.graphql.dgs.codegen.cases.interfaceWithUnderscoreFields.expected.Generated as ExpectedGenerated -import jakarta.`annotation`.Generated as AnnotationGenerated -@AnnotationGenerated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) -@ExpectedGenerated +@Generated public class QueryProjection( inputValueSerializer: InputValueSerializerInterface? = null, ) : GraphQLProjection(inputValueSerializer) { diff --git a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/interfaceWithUnderscoreFields/expected/client/TProjection.kt b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/interfaceWithUnderscoreFields/expected/client/TProjection.kt index fc1e91083..323ad0368 100644 --- a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/interfaceWithUnderscoreFields/expected/client/TProjection.kt +++ b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/interfaceWithUnderscoreFields/expected/client/TProjection.kt @@ -2,11 +2,9 @@ package com.netflix.graphql.dgs.codegen.cases.interfaceWithUnderscoreFields.expe import com.netflix.graphql.dgs.client.codegen.InputValueSerializerInterface import com.netflix.graphql.dgs.codegen.GraphQLProjection -import com.netflix.graphql.dgs.codegen.cases.interfaceWithUnderscoreFields.expected.Generated as ExpectedGenerated -import jakarta.`annotation`.Generated as AnnotationGenerated +import com.netflix.graphql.dgs.codegen.cases.interfaceWithUnderscoreFields.expected.Generated -@AnnotationGenerated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) -@ExpectedGenerated +@Generated public class TProjection( inputValueSerializer: InputValueSerializerInterface? = null, ) : GraphQLProjection(inputValueSerializer) { diff --git a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/interfaceWithUnderscoreFields/expected/types/I.kt b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/interfaceWithUnderscoreFields/expected/types/I.kt index 1f20cde76..868fe175d 100644 --- a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/interfaceWithUnderscoreFields/expected/types/I.kt +++ b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/interfaceWithUnderscoreFields/expected/types/I.kt @@ -2,14 +2,12 @@ package com.netflix.graphql.dgs.codegen.cases.interfaceWithUnderscoreFields.expe import com.fasterxml.jackson.`annotation`.JsonSubTypes import com.fasterxml.jackson.`annotation`.JsonTypeInfo +import com.netflix.graphql.dgs.codegen.cases.interfaceWithUnderscoreFields.expected.Generated import kotlin.String import kotlin.Suppress import kotlin.jvm.JvmName -import com.netflix.graphql.dgs.codegen.cases.interfaceWithUnderscoreFields.expected.Generated as ExpectedGenerated -import jakarta.`annotation`.Generated as AnnotationGenerated -@AnnotationGenerated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) -@ExpectedGenerated +@Generated @JsonTypeInfo( use = JsonTypeInfo.Id.NAME, include = JsonTypeInfo.As.PROPERTY, diff --git a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/interfaceWithUnderscoreFields/expected/types/Query.kt b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/interfaceWithUnderscoreFields/expected/types/Query.kt index 7c49aa907..6dccd0fe3 100644 --- a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/interfaceWithUnderscoreFields/expected/types/Query.kt +++ b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/interfaceWithUnderscoreFields/expected/types/Query.kt @@ -5,14 +5,12 @@ import com.fasterxml.jackson.`annotation`.JsonProperty import com.fasterxml.jackson.`annotation`.JsonTypeInfo import com.fasterxml.jackson.databind.`annotation`.JsonDeserialize import com.fasterxml.jackson.databind.`annotation`.JsonPOJOBuilder +import com.netflix.graphql.dgs.codegen.cases.interfaceWithUnderscoreFields.expected.Generated import java.lang.IllegalStateException import kotlin.collections.List import kotlin.jvm.JvmName -import com.netflix.graphql.dgs.codegen.cases.interfaceWithUnderscoreFields.expected.Generated as ExpectedGenerated -import jakarta.`annotation`.Generated as AnnotationGenerated -@AnnotationGenerated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) -@ExpectedGenerated +@Generated @JsonTypeInfo(use = JsonTypeInfo.Id.NONE) @JsonDeserialize(builder = Query.Builder::class) public class Query( @@ -24,15 +22,13 @@ public class Query( public val `is`: List? get() = __is.invoke() - @AnnotationGenerated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) - @ExpectedGenerated + @Generated public companion object { private val isDefault: () -> List? = { throw IllegalStateException("Field `is` was not requested") } } - @AnnotationGenerated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) - @ExpectedGenerated + @Generated @JsonPOJOBuilder @JsonIgnoreProperties("__typename") public class Builder { diff --git a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/interfaceWithUnderscoreFields/expected/types/T.kt b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/interfaceWithUnderscoreFields/expected/types/T.kt index cc077c508..ed429fd49 100644 --- a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/interfaceWithUnderscoreFields/expected/types/T.kt +++ b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/interfaceWithUnderscoreFields/expected/types/T.kt @@ -5,15 +5,13 @@ import com.fasterxml.jackson.`annotation`.JsonProperty import com.fasterxml.jackson.`annotation`.JsonTypeInfo import com.fasterxml.jackson.databind.`annotation`.JsonDeserialize import com.fasterxml.jackson.databind.`annotation`.JsonPOJOBuilder +import com.netflix.graphql.dgs.codegen.cases.interfaceWithUnderscoreFields.expected.Generated import java.lang.IllegalStateException import kotlin.String import kotlin.Suppress import kotlin.jvm.JvmName -import com.netflix.graphql.dgs.codegen.cases.interfaceWithUnderscoreFields.expected.Generated as ExpectedGenerated -import jakarta.`annotation`.Generated as AnnotationGenerated -@AnnotationGenerated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) -@ExpectedGenerated +@Generated @JsonTypeInfo(use = JsonTypeInfo.Id.NONE) @JsonDeserialize(builder = T.Builder::class) public class T( @@ -33,8 +31,7 @@ public class T( public val id: String? get() = __id.invoke() - @AnnotationGenerated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) - @ExpectedGenerated + @Generated public companion object { private val _idDefault: () -> String? = { throw IllegalStateException("Field `_id` was not requested") } @@ -43,8 +40,7 @@ public class T( { throw IllegalStateException("Field `id` was not requested") } } - @AnnotationGenerated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) - @ExpectedGenerated + @Generated @JsonPOJOBuilder @JsonIgnoreProperties("__typename") public class Builder { diff --git a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/projectionWithEnum/expected/DgsClient.kt b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/projectionWithEnum/expected/DgsClient.kt index adbd9ead3..65b64676a 100644 --- a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/projectionWithEnum/expected/DgsClient.kt +++ b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/projectionWithEnum/expected/DgsClient.kt @@ -6,7 +6,6 @@ import com.netflix.graphql.dgs.codegen.cases.projectionWithEnum.expected.client. import graphql.language.OperationDefinition import kotlin.String -@jakarta.`annotation`.Generated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) @Generated public object DgsClient { public fun buildQuery(inputValueSerializer: InputValueSerializerInterface? = null, diff --git a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/projectionWithEnum/expected/DgsConstants.kt b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/projectionWithEnum/expected/DgsConstants.kt index 5ca78b489..6cc561815 100644 --- a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/projectionWithEnum/expected/DgsConstants.kt +++ b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/projectionWithEnum/expected/DgsConstants.kt @@ -2,12 +2,10 @@ package com.netflix.graphql.dgs.codegen.cases.projectionWithEnum.expected import kotlin.String -@jakarta.`annotation`.Generated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) @Generated public object DgsConstants { public const val QUERY_TYPE: String = "Query" - @jakarta.`annotation`.Generated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) @Generated public object QUERY { public const val TYPE_NAME: String = "Query" diff --git a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/projectionWithEnum/expected/client/QueryProjection.kt b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/projectionWithEnum/expected/client/QueryProjection.kt index 5f66db1b2..9b5e30f52 100644 --- a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/projectionWithEnum/expected/client/QueryProjection.kt +++ b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/projectionWithEnum/expected/client/QueryProjection.kt @@ -2,11 +2,9 @@ package com.netflix.graphql.dgs.codegen.cases.projectionWithEnum.expected.client import com.netflix.graphql.dgs.client.codegen.InputValueSerializerInterface import com.netflix.graphql.dgs.codegen.GraphQLProjection -import com.netflix.graphql.dgs.codegen.cases.projectionWithEnum.expected.Generated as ExpectedGenerated -import jakarta.`annotation`.Generated as AnnotationGenerated +import com.netflix.graphql.dgs.codegen.cases.projectionWithEnum.expected.Generated -@AnnotationGenerated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) -@ExpectedGenerated +@Generated public class QueryProjection( inputValueSerializer: InputValueSerializerInterface? = null, ) : GraphQLProjection(inputValueSerializer) { diff --git a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/projectionWithEnum/expected/types/E.kt b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/projectionWithEnum/expected/types/E.kt index 15323a506..dfe0c5c8e 100644 --- a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/projectionWithEnum/expected/types/E.kt +++ b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/projectionWithEnum/expected/types/E.kt @@ -1,17 +1,13 @@ package com.netflix.graphql.dgs.codegen.cases.projectionWithEnum.expected.types -import com.netflix.graphql.dgs.codegen.cases.projectionWithEnum.expected.Generated as ExpectedGenerated -import jakarta.`annotation`.Generated as AnnotationGenerated +import com.netflix.graphql.dgs.codegen.cases.projectionWithEnum.expected.Generated -@AnnotationGenerated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) -@ExpectedGenerated +@Generated public enum class E { - @AnnotationGenerated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) - @ExpectedGenerated + @Generated V, ; - @AnnotationGenerated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) - @ExpectedGenerated + @Generated public companion object } diff --git a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/projectionWithEnum/expected/types/Query.kt b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/projectionWithEnum/expected/types/Query.kt index 247de179b..08ec1c6eb 100644 --- a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/projectionWithEnum/expected/types/Query.kt +++ b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/projectionWithEnum/expected/types/Query.kt @@ -5,14 +5,12 @@ import com.fasterxml.jackson.`annotation`.JsonProperty import com.fasterxml.jackson.`annotation`.JsonTypeInfo import com.fasterxml.jackson.databind.`annotation`.JsonDeserialize import com.fasterxml.jackson.databind.`annotation`.JsonPOJOBuilder +import com.netflix.graphql.dgs.codegen.cases.projectionWithEnum.expected.Generated import java.lang.IllegalStateException import kotlin.collections.List import kotlin.jvm.JvmName -import com.netflix.graphql.dgs.codegen.cases.projectionWithEnum.expected.Generated as ExpectedGenerated -import jakarta.`annotation`.Generated as AnnotationGenerated -@AnnotationGenerated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) -@ExpectedGenerated +@Generated @JsonTypeInfo(use = JsonTypeInfo.Id.NONE) @JsonDeserialize(builder = Query.Builder::class) public class Query( @@ -31,8 +29,7 @@ public class Query( public val es: List? get() = __es.invoke() - @AnnotationGenerated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) - @ExpectedGenerated + @Generated public companion object { private val eDefault: () -> E? = { throw IllegalStateException("Field `e` was not requested") } @@ -41,8 +38,7 @@ public class Query( { throw IllegalStateException("Field `es` was not requested") } } - @AnnotationGenerated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) - @ExpectedGenerated + @Generated @JsonPOJOBuilder @JsonIgnoreProperties("__typename") public class Builder { diff --git a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/projectionWithNestedInputs/expected/DgsClient.kt b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/projectionWithNestedInputs/expected/DgsClient.kt index 3c2754a2a..14e447789 100644 --- a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/projectionWithNestedInputs/expected/DgsClient.kt +++ b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/projectionWithNestedInputs/expected/DgsClient.kt @@ -6,7 +6,6 @@ import com.netflix.graphql.dgs.codegen.cases.projectionWithNestedInputs.expected import graphql.language.OperationDefinition import kotlin.String -@jakarta.`annotation`.Generated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) @Generated public object DgsClient { public fun buildQuery(inputValueSerializer: InputValueSerializerInterface? = null, diff --git a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/projectionWithNestedInputs/expected/DgsConstants.kt b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/projectionWithNestedInputs/expected/DgsConstants.kt index 1d4ca08c5..cdd390b9f 100644 --- a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/projectionWithNestedInputs/expected/DgsConstants.kt +++ b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/projectionWithNestedInputs/expected/DgsConstants.kt @@ -2,12 +2,10 @@ package com.netflix.graphql.dgs.codegen.cases.projectionWithNestedInputs.expecte import kotlin.String -@jakarta.`annotation`.Generated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) @Generated public object DgsConstants { public const val QUERY_TYPE: String = "Query" - @jakarta.`annotation`.Generated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) @Generated public object QUERY { public const val TYPE_NAME: String = "Query" @@ -16,7 +14,6 @@ public object DgsConstants { public const val Q2: String = "q2" - @jakarta.`annotation`.Generated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) @Generated public object Q1_INPUT_ARGUMENT { public const val Arg1: String = "arg1" @@ -24,7 +21,6 @@ public object DgsConstants { public const val Arg2: String = "arg2" } - @jakarta.`annotation`.Generated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) @Generated public object Q2_INPUT_ARGUMENT { public const val Arg1: String = "arg1" @@ -33,7 +29,6 @@ public object DgsConstants { } } - @jakarta.`annotation`.Generated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) @Generated public object I1 { public const val TYPE_NAME: String = "I1" @@ -43,7 +38,6 @@ public object DgsConstants { public const val Arg2: String = "arg2" } - @jakarta.`annotation`.Generated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) @Generated public object I2 { public const val TYPE_NAME: String = "I2" diff --git a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/projectionWithNestedInputs/expected/client/QueryProjection.kt b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/projectionWithNestedInputs/expected/client/QueryProjection.kt index e64d95a15..04d54865e 100644 --- a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/projectionWithNestedInputs/expected/client/QueryProjection.kt +++ b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/projectionWithNestedInputs/expected/client/QueryProjection.kt @@ -2,14 +2,12 @@ package com.netflix.graphql.dgs.codegen.cases.projectionWithNestedInputs.expecte import com.netflix.graphql.dgs.client.codegen.InputValueSerializerInterface import com.netflix.graphql.dgs.codegen.GraphQLProjection +import com.netflix.graphql.dgs.codegen.cases.projectionWithNestedInputs.expected.Generated import com.netflix.graphql.dgs.codegen.cases.projectionWithNestedInputs.expected.types.I1 import com.netflix.graphql.dgs.codegen.cases.projectionWithNestedInputs.expected.types.I2 import kotlin.String -import com.netflix.graphql.dgs.codegen.cases.projectionWithNestedInputs.expected.Generated as ExpectedGenerated -import jakarta.`annotation`.Generated as AnnotationGenerated -@AnnotationGenerated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) -@ExpectedGenerated +@Generated public class QueryProjection( inputValueSerializer: InputValueSerializerInterface? = null, ) : GraphQLProjection(inputValueSerializer) { diff --git a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/projectionWithNestedInputs/expected/types/I1.kt b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/projectionWithNestedInputs/expected/types/I1.kt index ebb700a14..175087126 100644 --- a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/projectionWithNestedInputs/expected/types/I1.kt +++ b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/projectionWithNestedInputs/expected/types/I1.kt @@ -2,15 +2,13 @@ package com.netflix.graphql.dgs.codegen.cases.projectionWithNestedInputs.expecte import com.fasterxml.jackson.`annotation`.JsonProperty import com.netflix.graphql.dgs.codegen.GraphQLInput +import com.netflix.graphql.dgs.codegen.cases.projectionWithNestedInputs.expected.Generated import kotlin.Any import kotlin.Pair import kotlin.String import kotlin.collections.List -import com.netflix.graphql.dgs.codegen.cases.projectionWithNestedInputs.expected.Generated as ExpectedGenerated -import jakarta.`annotation`.Generated as AnnotationGenerated -@AnnotationGenerated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) -@ExpectedGenerated +@Generated public data class I1( @JsonProperty("arg1") public val arg1: I1? = default("arg1", null), diff --git a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/projectionWithNestedInputs/expected/types/I2.kt b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/projectionWithNestedInputs/expected/types/I2.kt index 2c992f7b0..afab8c2cc 100644 --- a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/projectionWithNestedInputs/expected/types/I2.kt +++ b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/projectionWithNestedInputs/expected/types/I2.kt @@ -2,15 +2,13 @@ package com.netflix.graphql.dgs.codegen.cases.projectionWithNestedInputs.expecte import com.fasterxml.jackson.`annotation`.JsonProperty import com.netflix.graphql.dgs.codegen.GraphQLInput +import com.netflix.graphql.dgs.codegen.cases.projectionWithNestedInputs.expected.Generated import kotlin.Any import kotlin.Pair import kotlin.String import kotlin.collections.List -import com.netflix.graphql.dgs.codegen.cases.projectionWithNestedInputs.expected.Generated as ExpectedGenerated -import jakarta.`annotation`.Generated as AnnotationGenerated -@AnnotationGenerated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) -@ExpectedGenerated +@Generated public data class I2( @JsonProperty("arg1") public val arg1: String? = default("arg1", null), diff --git a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/projectionWithNestedInputs/expected/types/Query.kt b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/projectionWithNestedInputs/expected/types/Query.kt index e6a9c8756..7a67eadcb 100644 --- a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/projectionWithNestedInputs/expected/types/Query.kt +++ b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/projectionWithNestedInputs/expected/types/Query.kt @@ -5,14 +5,12 @@ import com.fasterxml.jackson.`annotation`.JsonProperty import com.fasterxml.jackson.`annotation`.JsonTypeInfo import com.fasterxml.jackson.databind.`annotation`.JsonDeserialize import com.fasterxml.jackson.databind.`annotation`.JsonPOJOBuilder +import com.netflix.graphql.dgs.codegen.cases.projectionWithNestedInputs.expected.Generated import java.lang.IllegalStateException import kotlin.String import kotlin.jvm.JvmName -import com.netflix.graphql.dgs.codegen.cases.projectionWithNestedInputs.expected.Generated as ExpectedGenerated -import jakarta.`annotation`.Generated as AnnotationGenerated -@AnnotationGenerated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) -@ExpectedGenerated +@Generated @JsonTypeInfo(use = JsonTypeInfo.Id.NONE) @JsonDeserialize(builder = Query.Builder::class) public class Query( @@ -31,8 +29,7 @@ public class Query( public val q2: String? get() = __q2.invoke() - @AnnotationGenerated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) - @ExpectedGenerated + @Generated public companion object { private val q1Default: () -> String? = { throw IllegalStateException("Field `q1` was not requested") } @@ -41,8 +38,7 @@ public class Query( { throw IllegalStateException("Field `q2` was not requested") } } - @AnnotationGenerated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) - @ExpectedGenerated + @Generated @JsonPOJOBuilder @JsonIgnoreProperties("__typename") public class Builder { diff --git a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/projectionWithPrimitiveAndArgs/expected/DgsClient.kt b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/projectionWithPrimitiveAndArgs/expected/DgsClient.kt index d71bb2a78..4303eec00 100644 --- a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/projectionWithPrimitiveAndArgs/expected/DgsClient.kt +++ b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/projectionWithPrimitiveAndArgs/expected/DgsClient.kt @@ -6,7 +6,6 @@ import com.netflix.graphql.dgs.codegen.cases.projectionWithPrimitiveAndArgs.expe import graphql.language.OperationDefinition import kotlin.String -@jakarta.`annotation`.Generated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) @Generated public object DgsClient { public fun buildQuery(inputValueSerializer: InputValueSerializerInterface? = null, diff --git a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/projectionWithPrimitiveAndArgs/expected/DgsConstants.kt b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/projectionWithPrimitiveAndArgs/expected/DgsConstants.kt index 98569872c..6035d0da4 100644 --- a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/projectionWithPrimitiveAndArgs/expected/DgsConstants.kt +++ b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/projectionWithPrimitiveAndArgs/expected/DgsConstants.kt @@ -2,19 +2,16 @@ package com.netflix.graphql.dgs.codegen.cases.projectionWithPrimitiveAndArgs.exp import kotlin.String -@jakarta.`annotation`.Generated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) @Generated public object DgsConstants { public const val QUERY_TYPE: String = "Query" - @jakarta.`annotation`.Generated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) @Generated public object QUERY { public const val TYPE_NAME: String = "Query" public const val String: String = "string" - @jakarta.`annotation`.Generated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) @Generated public object STRING_INPUT_ARGUMENT { public const val A1: String = "a1" @@ -25,7 +22,6 @@ public object DgsConstants { } } - @jakarta.`annotation`.Generated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) @Generated public object I { public const val TYPE_NAME: String = "I" diff --git a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/projectionWithPrimitiveAndArgs/expected/client/QueryProjection.kt b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/projectionWithPrimitiveAndArgs/expected/client/QueryProjection.kt index c05ac0c13..2f19e2d44 100644 --- a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/projectionWithPrimitiveAndArgs/expected/client/QueryProjection.kt +++ b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/projectionWithPrimitiveAndArgs/expected/client/QueryProjection.kt @@ -2,13 +2,11 @@ package com.netflix.graphql.dgs.codegen.cases.projectionWithPrimitiveAndArgs.exp import com.netflix.graphql.dgs.client.codegen.InputValueSerializerInterface import com.netflix.graphql.dgs.codegen.GraphQLProjection +import com.netflix.graphql.dgs.codegen.cases.projectionWithPrimitiveAndArgs.expected.Generated import com.netflix.graphql.dgs.codegen.cases.projectionWithPrimitiveAndArgs.expected.types.I import kotlin.String -import com.netflix.graphql.dgs.codegen.cases.projectionWithPrimitiveAndArgs.expected.Generated as ExpectedGenerated -import jakarta.`annotation`.Generated as AnnotationGenerated -@AnnotationGenerated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) -@ExpectedGenerated +@Generated public class QueryProjection( inputValueSerializer: InputValueSerializerInterface? = null, ) : GraphQLProjection(inputValueSerializer) { diff --git a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/projectionWithPrimitiveAndArgs/expected/types/I.kt b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/projectionWithPrimitiveAndArgs/expected/types/I.kt index d2abe705a..bfc41fbb1 100644 --- a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/projectionWithPrimitiveAndArgs/expected/types/I.kt +++ b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/projectionWithPrimitiveAndArgs/expected/types/I.kt @@ -2,15 +2,13 @@ package com.netflix.graphql.dgs.codegen.cases.projectionWithPrimitiveAndArgs.exp import com.fasterxml.jackson.`annotation`.JsonProperty import com.netflix.graphql.dgs.codegen.GraphQLInput +import com.netflix.graphql.dgs.codegen.cases.projectionWithPrimitiveAndArgs.expected.Generated import kotlin.Any import kotlin.Pair import kotlin.String import kotlin.collections.List -import com.netflix.graphql.dgs.codegen.cases.projectionWithPrimitiveAndArgs.expected.Generated as ExpectedGenerated -import jakarta.`annotation`.Generated as AnnotationGenerated -@AnnotationGenerated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) -@ExpectedGenerated +@Generated public data class I( @JsonProperty("arg") public val arg: String? = default("arg", null), diff --git a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/projectionWithPrimitiveAndArgs/expected/types/Query.kt b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/projectionWithPrimitiveAndArgs/expected/types/Query.kt index a0e2607b6..08955f999 100644 --- a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/projectionWithPrimitiveAndArgs/expected/types/Query.kt +++ b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/projectionWithPrimitiveAndArgs/expected/types/Query.kt @@ -5,14 +5,12 @@ import com.fasterxml.jackson.`annotation`.JsonProperty import com.fasterxml.jackson.`annotation`.JsonTypeInfo import com.fasterxml.jackson.databind.`annotation`.JsonDeserialize import com.fasterxml.jackson.databind.`annotation`.JsonPOJOBuilder +import com.netflix.graphql.dgs.codegen.cases.projectionWithPrimitiveAndArgs.expected.Generated import java.lang.IllegalStateException import kotlin.String import kotlin.jvm.JvmName -import com.netflix.graphql.dgs.codegen.cases.projectionWithPrimitiveAndArgs.expected.Generated as ExpectedGenerated -import jakarta.`annotation`.Generated as AnnotationGenerated -@AnnotationGenerated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) -@ExpectedGenerated +@Generated @JsonTypeInfo(use = JsonTypeInfo.Id.NONE) @JsonDeserialize(builder = Query.Builder::class) public class Query( @@ -24,15 +22,13 @@ public class Query( public val string: String? get() = __string.invoke() - @AnnotationGenerated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) - @ExpectedGenerated + @Generated public companion object { private val stringDefault: () -> String? = { throw IllegalStateException("Field `string` was not requested") } } - @AnnotationGenerated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) - @ExpectedGenerated + @Generated @JsonPOJOBuilder @JsonIgnoreProperties("__typename") public class Builder { diff --git a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/projectionWithPrimitives/expected/DgsClient.kt b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/projectionWithPrimitives/expected/DgsClient.kt index fb0579155..54741fb17 100644 --- a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/projectionWithPrimitives/expected/DgsClient.kt +++ b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/projectionWithPrimitives/expected/DgsClient.kt @@ -6,7 +6,6 @@ import com.netflix.graphql.dgs.codegen.cases.projectionWithPrimitives.expected.c import graphql.language.OperationDefinition import kotlin.String -@jakarta.`annotation`.Generated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) @Generated public object DgsClient { public fun buildQuery(inputValueSerializer: InputValueSerializerInterface? = null, diff --git a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/projectionWithPrimitives/expected/DgsConstants.kt b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/projectionWithPrimitives/expected/DgsConstants.kt index 318d57ed3..58e612680 100644 --- a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/projectionWithPrimitives/expected/DgsConstants.kt +++ b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/projectionWithPrimitives/expected/DgsConstants.kt @@ -2,12 +2,10 @@ package com.netflix.graphql.dgs.codegen.cases.projectionWithPrimitives.expected import kotlin.String -@jakarta.`annotation`.Generated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) @Generated public object DgsConstants { public const val QUERY_TYPE: String = "Query" - @jakarta.`annotation`.Generated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) @Generated public object QUERY { public const val TYPE_NAME: String = "Query" diff --git a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/projectionWithPrimitives/expected/client/QueryProjection.kt b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/projectionWithPrimitives/expected/client/QueryProjection.kt index 8d6c18cf3..31153a697 100644 --- a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/projectionWithPrimitives/expected/client/QueryProjection.kt +++ b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/projectionWithPrimitives/expected/client/QueryProjection.kt @@ -2,11 +2,9 @@ package com.netflix.graphql.dgs.codegen.cases.projectionWithPrimitives.expected. import com.netflix.graphql.dgs.client.codegen.InputValueSerializerInterface import com.netflix.graphql.dgs.codegen.GraphQLProjection -import com.netflix.graphql.dgs.codegen.cases.projectionWithPrimitives.expected.Generated as ExpectedGenerated -import jakarta.`annotation`.Generated as AnnotationGenerated +import com.netflix.graphql.dgs.codegen.cases.projectionWithPrimitives.expected.Generated -@AnnotationGenerated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) -@ExpectedGenerated +@Generated public class QueryProjection( inputValueSerializer: InputValueSerializerInterface? = null, ) : GraphQLProjection(inputValueSerializer) { diff --git a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/projectionWithPrimitives/expected/types/Query.kt b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/projectionWithPrimitives/expected/types/Query.kt index 5b00d5964..503fb36a5 100644 --- a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/projectionWithPrimitives/expected/types/Query.kt +++ b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/projectionWithPrimitives/expected/types/Query.kt @@ -5,15 +5,13 @@ import com.fasterxml.jackson.`annotation`.JsonProperty import com.fasterxml.jackson.`annotation`.JsonTypeInfo import com.fasterxml.jackson.databind.`annotation`.JsonDeserialize import com.fasterxml.jackson.databind.`annotation`.JsonPOJOBuilder +import com.netflix.graphql.dgs.codegen.cases.projectionWithPrimitives.expected.Generated import java.lang.IllegalStateException import kotlin.String import kotlin.collections.List import kotlin.jvm.JvmName -import com.netflix.graphql.dgs.codegen.cases.projectionWithPrimitives.expected.Generated as ExpectedGenerated -import jakarta.`annotation`.Generated as AnnotationGenerated -@AnnotationGenerated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) -@ExpectedGenerated +@Generated @JsonTypeInfo(use = JsonTypeInfo.Id.NONE) @JsonDeserialize(builder = Query.Builder::class) public class Query( @@ -32,8 +30,7 @@ public class Query( public val strings: List? get() = __strings.invoke() - @AnnotationGenerated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) - @ExpectedGenerated + @Generated public companion object { private val stringDefault: () -> String? = { throw IllegalStateException("Field `string` was not requested") } @@ -42,8 +39,7 @@ public class Query( { throw IllegalStateException("Field `strings` was not requested") } } - @AnnotationGenerated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) - @ExpectedGenerated + @Generated @JsonPOJOBuilder @JsonIgnoreProperties("__typename") public class Builder { diff --git a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/projectionWithType/expected/DgsClient.kt b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/projectionWithType/expected/DgsClient.kt index 6e015da13..df877616c 100644 --- a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/projectionWithType/expected/DgsClient.kt +++ b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/projectionWithType/expected/DgsClient.kt @@ -6,7 +6,6 @@ import com.netflix.graphql.dgs.codegen.cases.projectionWithType.expected.client. import graphql.language.OperationDefinition import kotlin.String -@jakarta.`annotation`.Generated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) @Generated public object DgsClient { public fun buildQuery(inputValueSerializer: InputValueSerializerInterface? = null, diff --git a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/projectionWithType/expected/DgsConstants.kt b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/projectionWithType/expected/DgsConstants.kt index 24bd18b36..a732397d7 100644 --- a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/projectionWithType/expected/DgsConstants.kt +++ b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/projectionWithType/expected/DgsConstants.kt @@ -2,12 +2,10 @@ package com.netflix.graphql.dgs.codegen.cases.projectionWithType.expected import kotlin.String -@jakarta.`annotation`.Generated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) @Generated public object DgsConstants { public const val QUERY_TYPE: String = "Query" - @jakarta.`annotation`.Generated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) @Generated public object QUERY { public const val TYPE_NAME: String = "Query" @@ -17,7 +15,6 @@ public object DgsConstants { public const val People: String = "people" } - @jakarta.`annotation`.Generated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) @Generated public object EMPLOYEE { public const val TYPE_NAME: String = "Employee" @@ -27,7 +24,6 @@ public object DgsConstants { public const val Company: String = "company" } - @jakarta.`annotation`.Generated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) @Generated public object PERSON { public const val TYPE_NAME: String = "Person" diff --git a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/projectionWithType/expected/client/EmployeeProjection.kt b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/projectionWithType/expected/client/EmployeeProjection.kt index ba488a3c4..e5d93fd08 100644 --- a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/projectionWithType/expected/client/EmployeeProjection.kt +++ b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/projectionWithType/expected/client/EmployeeProjection.kt @@ -2,11 +2,9 @@ package com.netflix.graphql.dgs.codegen.cases.projectionWithType.expected.client import com.netflix.graphql.dgs.client.codegen.InputValueSerializerInterface import com.netflix.graphql.dgs.codegen.GraphQLProjection -import com.netflix.graphql.dgs.codegen.cases.projectionWithType.expected.Generated as ExpectedGenerated -import jakarta.`annotation`.Generated as AnnotationGenerated +import com.netflix.graphql.dgs.codegen.cases.projectionWithType.expected.Generated -@AnnotationGenerated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) -@ExpectedGenerated +@Generated public class EmployeeProjection( inputValueSerializer: InputValueSerializerInterface? = null, ) : GraphQLProjection(inputValueSerializer) { diff --git a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/projectionWithType/expected/client/PersonProjection.kt b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/projectionWithType/expected/client/PersonProjection.kt index 7e9e78ccb..9877163bc 100644 --- a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/projectionWithType/expected/client/PersonProjection.kt +++ b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/projectionWithType/expected/client/PersonProjection.kt @@ -2,11 +2,9 @@ package com.netflix.graphql.dgs.codegen.cases.projectionWithType.expected.client import com.netflix.graphql.dgs.client.codegen.InputValueSerializerInterface import com.netflix.graphql.dgs.codegen.GraphQLProjection -import com.netflix.graphql.dgs.codegen.cases.projectionWithType.expected.Generated as ExpectedGenerated -import jakarta.`annotation`.Generated as AnnotationGenerated +import com.netflix.graphql.dgs.codegen.cases.projectionWithType.expected.Generated -@AnnotationGenerated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) -@ExpectedGenerated +@Generated public class PersonProjection( inputValueSerializer: InputValueSerializerInterface? = null, ) : GraphQLProjection(inputValueSerializer) { diff --git a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/projectionWithType/expected/client/QueryProjection.kt b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/projectionWithType/expected/client/QueryProjection.kt index b586126d4..b89f0cad8 100644 --- a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/projectionWithType/expected/client/QueryProjection.kt +++ b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/projectionWithType/expected/client/QueryProjection.kt @@ -2,12 +2,10 @@ package com.netflix.graphql.dgs.codegen.cases.projectionWithType.expected.client import com.netflix.graphql.dgs.client.codegen.InputValueSerializerInterface import com.netflix.graphql.dgs.codegen.GraphQLProjection +import com.netflix.graphql.dgs.codegen.cases.projectionWithType.expected.Generated import kotlin.String -import com.netflix.graphql.dgs.codegen.cases.projectionWithType.expected.Generated as ExpectedGenerated -import jakarta.`annotation`.Generated as AnnotationGenerated -@AnnotationGenerated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) -@ExpectedGenerated +@Generated public class QueryProjection( inputValueSerializer: InputValueSerializerInterface? = null, ) : GraphQLProjection(inputValueSerializer) { diff --git a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/projectionWithType/expected/types/Employee.kt b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/projectionWithType/expected/types/Employee.kt index 1f3df9815..bd77d3704 100644 --- a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/projectionWithType/expected/types/Employee.kt +++ b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/projectionWithType/expected/types/Employee.kt @@ -5,15 +5,13 @@ import com.fasterxml.jackson.`annotation`.JsonProperty import com.fasterxml.jackson.`annotation`.JsonTypeInfo import com.fasterxml.jackson.databind.`annotation`.JsonDeserialize import com.fasterxml.jackson.databind.`annotation`.JsonPOJOBuilder +import com.netflix.graphql.dgs.codegen.cases.projectionWithType.expected.Generated import java.lang.IllegalStateException import kotlin.String import kotlin.Suppress import kotlin.jvm.JvmName -import com.netflix.graphql.dgs.codegen.cases.projectionWithType.expected.Generated as ExpectedGenerated -import jakarta.`annotation`.Generated as AnnotationGenerated -@AnnotationGenerated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) -@ExpectedGenerated +@Generated @JsonTypeInfo(use = JsonTypeInfo.Id.NONE) @JsonDeserialize(builder = Employee.Builder::class) public class Employee( @@ -33,8 +31,7 @@ public class Employee( public val company: String? get() = __company.invoke() - @AnnotationGenerated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) - @ExpectedGenerated + @Generated public companion object { private val firstnameDefault: () -> String? = { throw IllegalStateException("Field `firstname` was not requested") } @@ -43,8 +40,7 @@ public class Employee( { throw IllegalStateException("Field `company` was not requested") } } - @AnnotationGenerated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) - @ExpectedGenerated + @Generated @JsonPOJOBuilder @JsonIgnoreProperties("__typename") public class Builder { diff --git a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/projectionWithType/expected/types/Person.kt b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/projectionWithType/expected/types/Person.kt index 1901b8da7..6fa22c107 100644 --- a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/projectionWithType/expected/types/Person.kt +++ b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/projectionWithType/expected/types/Person.kt @@ -2,14 +2,12 @@ package com.netflix.graphql.dgs.codegen.cases.projectionWithType.expected.types import com.fasterxml.jackson.`annotation`.JsonSubTypes import com.fasterxml.jackson.`annotation`.JsonTypeInfo +import com.netflix.graphql.dgs.codegen.cases.projectionWithType.expected.Generated import kotlin.String import kotlin.Suppress import kotlin.jvm.JvmName -import com.netflix.graphql.dgs.codegen.cases.projectionWithType.expected.Generated as ExpectedGenerated -import jakarta.`annotation`.Generated as AnnotationGenerated -@AnnotationGenerated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) -@ExpectedGenerated +@Generated @JsonTypeInfo( use = JsonTypeInfo.Id.NAME, include = JsonTypeInfo.As.PROPERTY, diff --git a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/projectionWithType/expected/types/Query.kt b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/projectionWithType/expected/types/Query.kt index abe4e128f..d01b70f46 100644 --- a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/projectionWithType/expected/types/Query.kt +++ b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/projectionWithType/expected/types/Query.kt @@ -5,14 +5,12 @@ import com.fasterxml.jackson.`annotation`.JsonProperty import com.fasterxml.jackson.`annotation`.JsonTypeInfo import com.fasterxml.jackson.databind.`annotation`.JsonDeserialize import com.fasterxml.jackson.databind.`annotation`.JsonPOJOBuilder +import com.netflix.graphql.dgs.codegen.cases.projectionWithType.expected.Generated import java.lang.IllegalStateException import kotlin.collections.List import kotlin.jvm.JvmName -import com.netflix.graphql.dgs.codegen.cases.projectionWithType.expected.Generated as ExpectedGenerated -import jakarta.`annotation`.Generated as AnnotationGenerated -@AnnotationGenerated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) -@ExpectedGenerated +@Generated @JsonTypeInfo(use = JsonTypeInfo.Id.NONE) @JsonDeserialize(builder = Query.Builder::class) public class Query( @@ -31,8 +29,7 @@ public class Query( public val people: List? get() = __people.invoke() - @AnnotationGenerated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) - @ExpectedGenerated + @Generated public companion object { private val personDefault: () -> Person? = { throw IllegalStateException("Field `person` was not requested") } @@ -41,8 +38,7 @@ public class Query( { throw IllegalStateException("Field `people` was not requested") } } - @AnnotationGenerated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) - @ExpectedGenerated + @Generated @JsonPOJOBuilder @JsonIgnoreProperties("__typename") public class Builder { diff --git a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/projectionWithTypeAndArgs/expected/DgsClient.kt b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/projectionWithTypeAndArgs/expected/DgsClient.kt index 90d78e931..cf425b94c 100644 --- a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/projectionWithTypeAndArgs/expected/DgsClient.kt +++ b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/projectionWithTypeAndArgs/expected/DgsClient.kt @@ -6,7 +6,6 @@ import com.netflix.graphql.dgs.codegen.cases.projectionWithTypeAndArgs.expected. import graphql.language.OperationDefinition import kotlin.String -@jakarta.`annotation`.Generated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) @Generated public object DgsClient { public fun buildQuery(inputValueSerializer: InputValueSerializerInterface? = null, diff --git a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/projectionWithTypeAndArgs/expected/DgsConstants.kt b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/projectionWithTypeAndArgs/expected/DgsConstants.kt index ea41413b6..b2c01cd65 100644 --- a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/projectionWithTypeAndArgs/expected/DgsConstants.kt +++ b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/projectionWithTypeAndArgs/expected/DgsConstants.kt @@ -2,19 +2,16 @@ package com.netflix.graphql.dgs.codegen.cases.projectionWithTypeAndArgs.expected import kotlin.String -@jakarta.`annotation`.Generated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) @Generated public object DgsConstants { public const val QUERY_TYPE: String = "Query" - @jakarta.`annotation`.Generated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) @Generated public object QUERY { public const val TYPE_NAME: String = "Query" public const val Person: String = "person" - @jakarta.`annotation`.Generated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) @Generated public object PERSON_INPUT_ARGUMENT { public const val A1: String = "a1" @@ -25,7 +22,6 @@ public object DgsConstants { } } - @jakarta.`annotation`.Generated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) @Generated public object EMPLOYEE { public const val TYPE_NAME: String = "Employee" @@ -35,7 +31,6 @@ public object DgsConstants { public const val Company: String = "company" } - @jakarta.`annotation`.Generated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) @Generated public object I { public const val TYPE_NAME: String = "I" @@ -43,7 +38,6 @@ public object DgsConstants { public const val Arg: String = "arg" } - @jakarta.`annotation`.Generated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) @Generated public object PERSON { public const val TYPE_NAME: String = "Person" diff --git a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/projectionWithTypeAndArgs/expected/client/EmployeeProjection.kt b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/projectionWithTypeAndArgs/expected/client/EmployeeProjection.kt index c2bc185db..f31ab2a67 100644 --- a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/projectionWithTypeAndArgs/expected/client/EmployeeProjection.kt +++ b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/projectionWithTypeAndArgs/expected/client/EmployeeProjection.kt @@ -2,11 +2,9 @@ package com.netflix.graphql.dgs.codegen.cases.projectionWithTypeAndArgs.expected import com.netflix.graphql.dgs.client.codegen.InputValueSerializerInterface import com.netflix.graphql.dgs.codegen.GraphQLProjection -import com.netflix.graphql.dgs.codegen.cases.projectionWithTypeAndArgs.expected.Generated as ExpectedGenerated -import jakarta.`annotation`.Generated as AnnotationGenerated +import com.netflix.graphql.dgs.codegen.cases.projectionWithTypeAndArgs.expected.Generated -@AnnotationGenerated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) -@ExpectedGenerated +@Generated public class EmployeeProjection( inputValueSerializer: InputValueSerializerInterface? = null, ) : GraphQLProjection(inputValueSerializer) { diff --git a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/projectionWithTypeAndArgs/expected/client/PersonProjection.kt b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/projectionWithTypeAndArgs/expected/client/PersonProjection.kt index 1c4fa3482..8d334e0c0 100644 --- a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/projectionWithTypeAndArgs/expected/client/PersonProjection.kt +++ b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/projectionWithTypeAndArgs/expected/client/PersonProjection.kt @@ -2,11 +2,9 @@ package com.netflix.graphql.dgs.codegen.cases.projectionWithTypeAndArgs.expected import com.netflix.graphql.dgs.client.codegen.InputValueSerializerInterface import com.netflix.graphql.dgs.codegen.GraphQLProjection -import com.netflix.graphql.dgs.codegen.cases.projectionWithTypeAndArgs.expected.Generated as ExpectedGenerated -import jakarta.`annotation`.Generated as AnnotationGenerated +import com.netflix.graphql.dgs.codegen.cases.projectionWithTypeAndArgs.expected.Generated -@AnnotationGenerated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) -@ExpectedGenerated +@Generated public class PersonProjection( inputValueSerializer: InputValueSerializerInterface? = null, ) : GraphQLProjection(inputValueSerializer) { diff --git a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/projectionWithTypeAndArgs/expected/client/QueryProjection.kt b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/projectionWithTypeAndArgs/expected/client/QueryProjection.kt index 317582d4d..f8a5c751d 100644 --- a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/projectionWithTypeAndArgs/expected/client/QueryProjection.kt +++ b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/projectionWithTypeAndArgs/expected/client/QueryProjection.kt @@ -2,13 +2,11 @@ package com.netflix.graphql.dgs.codegen.cases.projectionWithTypeAndArgs.expected import com.netflix.graphql.dgs.client.codegen.InputValueSerializerInterface import com.netflix.graphql.dgs.codegen.GraphQLProjection +import com.netflix.graphql.dgs.codegen.cases.projectionWithTypeAndArgs.expected.Generated import com.netflix.graphql.dgs.codegen.cases.projectionWithTypeAndArgs.expected.types.I import kotlin.String -import com.netflix.graphql.dgs.codegen.cases.projectionWithTypeAndArgs.expected.Generated as ExpectedGenerated -import jakarta.`annotation`.Generated as AnnotationGenerated -@AnnotationGenerated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) -@ExpectedGenerated +@Generated public class QueryProjection( inputValueSerializer: InputValueSerializerInterface? = null, ) : GraphQLProjection(inputValueSerializer) { diff --git a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/projectionWithTypeAndArgs/expected/types/Employee.kt b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/projectionWithTypeAndArgs/expected/types/Employee.kt index e7be8a40a..837792727 100644 --- a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/projectionWithTypeAndArgs/expected/types/Employee.kt +++ b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/projectionWithTypeAndArgs/expected/types/Employee.kt @@ -5,15 +5,13 @@ import com.fasterxml.jackson.`annotation`.JsonProperty import com.fasterxml.jackson.`annotation`.JsonTypeInfo import com.fasterxml.jackson.databind.`annotation`.JsonDeserialize import com.fasterxml.jackson.databind.`annotation`.JsonPOJOBuilder +import com.netflix.graphql.dgs.codegen.cases.projectionWithTypeAndArgs.expected.Generated import java.lang.IllegalStateException import kotlin.String import kotlin.Suppress import kotlin.jvm.JvmName -import com.netflix.graphql.dgs.codegen.cases.projectionWithTypeAndArgs.expected.Generated as ExpectedGenerated -import jakarta.`annotation`.Generated as AnnotationGenerated -@AnnotationGenerated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) -@ExpectedGenerated +@Generated @JsonTypeInfo(use = JsonTypeInfo.Id.NONE) @JsonDeserialize(builder = Employee.Builder::class) public class Employee( @@ -33,8 +31,7 @@ public class Employee( public val company: String? get() = __company.invoke() - @AnnotationGenerated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) - @ExpectedGenerated + @Generated public companion object { private val firstnameDefault: () -> String? = { throw IllegalStateException("Field `firstname` was not requested") } @@ -43,8 +40,7 @@ public class Employee( { throw IllegalStateException("Field `company` was not requested") } } - @AnnotationGenerated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) - @ExpectedGenerated + @Generated @JsonPOJOBuilder @JsonIgnoreProperties("__typename") public class Builder { diff --git a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/projectionWithTypeAndArgs/expected/types/I.kt b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/projectionWithTypeAndArgs/expected/types/I.kt index e47b286bb..711a2bb82 100644 --- a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/projectionWithTypeAndArgs/expected/types/I.kt +++ b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/projectionWithTypeAndArgs/expected/types/I.kt @@ -2,15 +2,13 @@ package com.netflix.graphql.dgs.codegen.cases.projectionWithTypeAndArgs.expected import com.fasterxml.jackson.`annotation`.JsonProperty import com.netflix.graphql.dgs.codegen.GraphQLInput +import com.netflix.graphql.dgs.codegen.cases.projectionWithTypeAndArgs.expected.Generated import kotlin.Any import kotlin.Pair import kotlin.String import kotlin.collections.List -import com.netflix.graphql.dgs.codegen.cases.projectionWithTypeAndArgs.expected.Generated as ExpectedGenerated -import jakarta.`annotation`.Generated as AnnotationGenerated -@AnnotationGenerated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) -@ExpectedGenerated +@Generated public data class I( @JsonProperty("arg") public val arg: String? = default("arg", null), diff --git a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/projectionWithTypeAndArgs/expected/types/Person.kt b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/projectionWithTypeAndArgs/expected/types/Person.kt index df3ac7800..4e36cea04 100644 --- a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/projectionWithTypeAndArgs/expected/types/Person.kt +++ b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/projectionWithTypeAndArgs/expected/types/Person.kt @@ -2,14 +2,12 @@ package com.netflix.graphql.dgs.codegen.cases.projectionWithTypeAndArgs.expected import com.fasterxml.jackson.`annotation`.JsonSubTypes import com.fasterxml.jackson.`annotation`.JsonTypeInfo +import com.netflix.graphql.dgs.codegen.cases.projectionWithTypeAndArgs.expected.Generated import kotlin.String import kotlin.Suppress import kotlin.jvm.JvmName -import com.netflix.graphql.dgs.codegen.cases.projectionWithTypeAndArgs.expected.Generated as ExpectedGenerated -import jakarta.`annotation`.Generated as AnnotationGenerated -@AnnotationGenerated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) -@ExpectedGenerated +@Generated @JsonTypeInfo( use = JsonTypeInfo.Id.NAME, include = JsonTypeInfo.As.PROPERTY, diff --git a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/projectionWithTypeAndArgs/expected/types/Query.kt b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/projectionWithTypeAndArgs/expected/types/Query.kt index 0bb6d6e93..20a23af14 100644 --- a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/projectionWithTypeAndArgs/expected/types/Query.kt +++ b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/projectionWithTypeAndArgs/expected/types/Query.kt @@ -5,13 +5,11 @@ import com.fasterxml.jackson.`annotation`.JsonProperty import com.fasterxml.jackson.`annotation`.JsonTypeInfo import com.fasterxml.jackson.databind.`annotation`.JsonDeserialize import com.fasterxml.jackson.databind.`annotation`.JsonPOJOBuilder +import com.netflix.graphql.dgs.codegen.cases.projectionWithTypeAndArgs.expected.Generated import java.lang.IllegalStateException import kotlin.jvm.JvmName -import com.netflix.graphql.dgs.codegen.cases.projectionWithTypeAndArgs.expected.Generated as ExpectedGenerated -import jakarta.`annotation`.Generated as AnnotationGenerated -@AnnotationGenerated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) -@ExpectedGenerated +@Generated @JsonTypeInfo(use = JsonTypeInfo.Id.NONE) @JsonDeserialize(builder = Query.Builder::class) public class Query( @@ -23,15 +21,13 @@ public class Query( public val person: Person? get() = __person.invoke() - @AnnotationGenerated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) - @ExpectedGenerated + @Generated public companion object { private val personDefault: () -> Person? = { throw IllegalStateException("Field `person` was not requested") } } - @AnnotationGenerated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) - @ExpectedGenerated + @Generated @JsonPOJOBuilder @JsonIgnoreProperties("__typename") public class Builder { diff --git a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/projectionWithUnion/expected/DgsClient.kt b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/projectionWithUnion/expected/DgsClient.kt index ee45ce22d..4f5745c95 100644 --- a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/projectionWithUnion/expected/DgsClient.kt +++ b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/projectionWithUnion/expected/DgsClient.kt @@ -6,7 +6,6 @@ import com.netflix.graphql.dgs.codegen.cases.projectionWithUnion.expected.client import graphql.language.OperationDefinition import kotlin.String -@jakarta.`annotation`.Generated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) @Generated public object DgsClient { public fun buildQuery(inputValueSerializer: InputValueSerializerInterface? = null, diff --git a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/projectionWithUnion/expected/DgsConstants.kt b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/projectionWithUnion/expected/DgsConstants.kt index 58121e719..a42bd854c 100644 --- a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/projectionWithUnion/expected/DgsConstants.kt +++ b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/projectionWithUnion/expected/DgsConstants.kt @@ -2,12 +2,10 @@ package com.netflix.graphql.dgs.codegen.cases.projectionWithUnion.expected import kotlin.String -@jakarta.`annotation`.Generated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) @Generated public object DgsConstants { public const val QUERY_TYPE: String = "Query" - @jakarta.`annotation`.Generated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) @Generated public object QUERY { public const val TYPE_NAME: String = "Query" @@ -17,7 +15,6 @@ public object DgsConstants { public const val Us: String = "us" } - @jakarta.`annotation`.Generated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) @Generated public object EMPLOYEE { public const val TYPE_NAME: String = "Employee" @@ -27,7 +24,6 @@ public object DgsConstants { public const val Company: String = "company" } - @jakarta.`annotation`.Generated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) @Generated public object PERSON { public const val TYPE_NAME: String = "Person" @@ -35,7 +31,6 @@ public object DgsConstants { public const val Firstname: String = "firstname" } - @jakarta.`annotation`.Generated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) @Generated public object U { public const val TYPE_NAME: String = "U" diff --git a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/projectionWithUnion/expected/client/EmployeeProjection.kt b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/projectionWithUnion/expected/client/EmployeeProjection.kt index 537a6d87d..4fbf13f5c 100644 --- a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/projectionWithUnion/expected/client/EmployeeProjection.kt +++ b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/projectionWithUnion/expected/client/EmployeeProjection.kt @@ -2,11 +2,9 @@ package com.netflix.graphql.dgs.codegen.cases.projectionWithUnion.expected.clien import com.netflix.graphql.dgs.client.codegen.InputValueSerializerInterface import com.netflix.graphql.dgs.codegen.GraphQLProjection -import com.netflix.graphql.dgs.codegen.cases.projectionWithUnion.expected.Generated as ExpectedGenerated -import jakarta.`annotation`.Generated as AnnotationGenerated +import com.netflix.graphql.dgs.codegen.cases.projectionWithUnion.expected.Generated -@AnnotationGenerated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) -@ExpectedGenerated +@Generated public class EmployeeProjection( inputValueSerializer: InputValueSerializerInterface? = null, ) : GraphQLProjection(inputValueSerializer) { diff --git a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/projectionWithUnion/expected/client/PersonProjection.kt b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/projectionWithUnion/expected/client/PersonProjection.kt index 16585588f..1ff01b325 100644 --- a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/projectionWithUnion/expected/client/PersonProjection.kt +++ b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/projectionWithUnion/expected/client/PersonProjection.kt @@ -2,11 +2,9 @@ package com.netflix.graphql.dgs.codegen.cases.projectionWithUnion.expected.clien import com.netflix.graphql.dgs.client.codegen.InputValueSerializerInterface import com.netflix.graphql.dgs.codegen.GraphQLProjection -import com.netflix.graphql.dgs.codegen.cases.projectionWithUnion.expected.Generated as ExpectedGenerated -import jakarta.`annotation`.Generated as AnnotationGenerated +import com.netflix.graphql.dgs.codegen.cases.projectionWithUnion.expected.Generated -@AnnotationGenerated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) -@ExpectedGenerated +@Generated public class PersonProjection( inputValueSerializer: InputValueSerializerInterface? = null, ) : GraphQLProjection(inputValueSerializer) { diff --git a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/projectionWithUnion/expected/client/QueryProjection.kt b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/projectionWithUnion/expected/client/QueryProjection.kt index a90314ff2..e459f53ed 100644 --- a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/projectionWithUnion/expected/client/QueryProjection.kt +++ b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/projectionWithUnion/expected/client/QueryProjection.kt @@ -2,12 +2,10 @@ package com.netflix.graphql.dgs.codegen.cases.projectionWithUnion.expected.clien import com.netflix.graphql.dgs.client.codegen.InputValueSerializerInterface import com.netflix.graphql.dgs.codegen.GraphQLProjection +import com.netflix.graphql.dgs.codegen.cases.projectionWithUnion.expected.Generated import kotlin.String -import com.netflix.graphql.dgs.codegen.cases.projectionWithUnion.expected.Generated as ExpectedGenerated -import jakarta.`annotation`.Generated as AnnotationGenerated -@AnnotationGenerated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) -@ExpectedGenerated +@Generated public class QueryProjection( inputValueSerializer: InputValueSerializerInterface? = null, ) : GraphQLProjection(inputValueSerializer) { diff --git a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/projectionWithUnion/expected/client/UProjection.kt b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/projectionWithUnion/expected/client/UProjection.kt index 02b933aa7..28260c4f6 100644 --- a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/projectionWithUnion/expected/client/UProjection.kt +++ b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/projectionWithUnion/expected/client/UProjection.kt @@ -2,11 +2,9 @@ package com.netflix.graphql.dgs.codegen.cases.projectionWithUnion.expected.clien import com.netflix.graphql.dgs.client.codegen.InputValueSerializerInterface import com.netflix.graphql.dgs.codegen.GraphQLProjection -import com.netflix.graphql.dgs.codegen.cases.projectionWithUnion.expected.Generated as ExpectedGenerated -import jakarta.`annotation`.Generated as AnnotationGenerated +import com.netflix.graphql.dgs.codegen.cases.projectionWithUnion.expected.Generated -@AnnotationGenerated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) -@ExpectedGenerated +@Generated public class UProjection( inputValueSerializer: InputValueSerializerInterface? = null, ) : GraphQLProjection(inputValueSerializer) { diff --git a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/projectionWithUnion/expected/types/Employee.kt b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/projectionWithUnion/expected/types/Employee.kt index 46f36204d..15c609deb 100644 --- a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/projectionWithUnion/expected/types/Employee.kt +++ b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/projectionWithUnion/expected/types/Employee.kt @@ -5,15 +5,13 @@ import com.fasterxml.jackson.`annotation`.JsonProperty import com.fasterxml.jackson.`annotation`.JsonTypeInfo import com.fasterxml.jackson.databind.`annotation`.JsonDeserialize import com.fasterxml.jackson.databind.`annotation`.JsonPOJOBuilder +import com.netflix.graphql.dgs.codegen.cases.projectionWithUnion.expected.Generated import java.lang.IllegalStateException import kotlin.String import kotlin.Suppress import kotlin.jvm.JvmName -import com.netflix.graphql.dgs.codegen.cases.projectionWithUnion.expected.Generated as ExpectedGenerated -import jakarta.`annotation`.Generated as AnnotationGenerated -@AnnotationGenerated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) -@ExpectedGenerated +@Generated @JsonTypeInfo(use = JsonTypeInfo.Id.NONE) @JsonDeserialize(builder = Employee.Builder::class) public class Employee( @@ -34,8 +32,7 @@ public class Employee( public val company: String? get() = __company.invoke() - @AnnotationGenerated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) - @ExpectedGenerated + @Generated public companion object { private val firstnameDefault: () -> String? = { throw IllegalStateException("Field `firstname` was not requested") } @@ -44,8 +41,7 @@ public class Employee( { throw IllegalStateException("Field `company` was not requested") } } - @AnnotationGenerated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) - @ExpectedGenerated + @Generated @JsonPOJOBuilder @JsonIgnoreProperties("__typename") public class Builder { diff --git a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/projectionWithUnion/expected/types/Person.kt b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/projectionWithUnion/expected/types/Person.kt index 13099dfc6..b319c122a 100644 --- a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/projectionWithUnion/expected/types/Person.kt +++ b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/projectionWithUnion/expected/types/Person.kt @@ -2,14 +2,12 @@ package com.netflix.graphql.dgs.codegen.cases.projectionWithUnion.expected.types import com.fasterxml.jackson.`annotation`.JsonSubTypes import com.fasterxml.jackson.`annotation`.JsonTypeInfo +import com.netflix.graphql.dgs.codegen.cases.projectionWithUnion.expected.Generated import kotlin.String import kotlin.Suppress import kotlin.jvm.JvmName -import com.netflix.graphql.dgs.codegen.cases.projectionWithUnion.expected.Generated as ExpectedGenerated -import jakarta.`annotation`.Generated as AnnotationGenerated -@AnnotationGenerated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) -@ExpectedGenerated +@Generated @JsonTypeInfo( use = JsonTypeInfo.Id.NAME, include = JsonTypeInfo.As.PROPERTY, diff --git a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/projectionWithUnion/expected/types/Query.kt b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/projectionWithUnion/expected/types/Query.kt index 6b3acf737..b4d63229c 100644 --- a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/projectionWithUnion/expected/types/Query.kt +++ b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/projectionWithUnion/expected/types/Query.kt @@ -5,14 +5,12 @@ import com.fasterxml.jackson.`annotation`.JsonProperty import com.fasterxml.jackson.`annotation`.JsonTypeInfo import com.fasterxml.jackson.databind.`annotation`.JsonDeserialize import com.fasterxml.jackson.databind.`annotation`.JsonPOJOBuilder +import com.netflix.graphql.dgs.codegen.cases.projectionWithUnion.expected.Generated import java.lang.IllegalStateException import kotlin.collections.List import kotlin.jvm.JvmName -import com.netflix.graphql.dgs.codegen.cases.projectionWithUnion.expected.Generated as ExpectedGenerated -import jakarta.`annotation`.Generated as AnnotationGenerated -@AnnotationGenerated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) -@ExpectedGenerated +@Generated @JsonTypeInfo(use = JsonTypeInfo.Id.NONE) @JsonDeserialize(builder = Query.Builder::class) public class Query( @@ -31,8 +29,7 @@ public class Query( public val us: List? get() = __us.invoke() - @AnnotationGenerated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) - @ExpectedGenerated + @Generated public companion object { private val uDefault: () -> U? = { throw IllegalStateException("Field `u` was not requested") } @@ -41,8 +38,7 @@ public class Query( { throw IllegalStateException("Field `us` was not requested") } } - @AnnotationGenerated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) - @ExpectedGenerated + @Generated @JsonPOJOBuilder @JsonIgnoreProperties("__typename") public class Builder { diff --git a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/projectionWithUnion/expected/types/U.kt b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/projectionWithUnion/expected/types/U.kt index e56d455c8..31d641712 100644 --- a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/projectionWithUnion/expected/types/U.kt +++ b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/projectionWithUnion/expected/types/U.kt @@ -2,11 +2,9 @@ package com.netflix.graphql.dgs.codegen.cases.projectionWithUnion.expected.types import com.fasterxml.jackson.`annotation`.JsonSubTypes import com.fasterxml.jackson.`annotation`.JsonTypeInfo -import com.netflix.graphql.dgs.codegen.cases.projectionWithUnion.expected.Generated as ExpectedGenerated -import jakarta.`annotation`.Generated as AnnotationGenerated +import com.netflix.graphql.dgs.codegen.cases.projectionWithUnion.expected.Generated -@AnnotationGenerated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) -@ExpectedGenerated +@Generated @JsonTypeInfo( use = JsonTypeInfo.Id.NAME, include = JsonTypeInfo.As.PROPERTY, diff --git a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/skipCodegenOnFields/expected/DgsClient.kt b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/skipCodegenOnFields/expected/DgsClient.kt index 274052c24..655e8148c 100644 --- a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/skipCodegenOnFields/expected/DgsClient.kt +++ b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/skipCodegenOnFields/expected/DgsClient.kt @@ -1,5 +1,4 @@ package com.netflix.graphql.dgs.codegen.cases.skipCodegenOnFields.expected -@jakarta.`annotation`.Generated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) @Generated public object DgsClient diff --git a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/skipCodegenOnFields/expected/DgsConstants.kt b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/skipCodegenOnFields/expected/DgsConstants.kt index 419a9cd5b..e969aefa7 100644 --- a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/skipCodegenOnFields/expected/DgsConstants.kt +++ b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/skipCodegenOnFields/expected/DgsConstants.kt @@ -2,10 +2,8 @@ package com.netflix.graphql.dgs.codegen.cases.skipCodegenOnFields.expected import kotlin.String -@jakarta.`annotation`.Generated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) @Generated public object DgsConstants { - @jakarta.`annotation`.Generated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) @Generated public object PERSON { public const val TYPE_NAME: String = "Person" diff --git a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/skipCodegenOnFields/expected/client/PersonProjection.kt b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/skipCodegenOnFields/expected/client/PersonProjection.kt index 46fbdd0a1..c99590c48 100644 --- a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/skipCodegenOnFields/expected/client/PersonProjection.kt +++ b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/skipCodegenOnFields/expected/client/PersonProjection.kt @@ -2,11 +2,9 @@ package com.netflix.graphql.dgs.codegen.cases.skipCodegenOnFields.expected.clien import com.netflix.graphql.dgs.client.codegen.InputValueSerializerInterface import com.netflix.graphql.dgs.codegen.GraphQLProjection -import com.netflix.graphql.dgs.codegen.cases.skipCodegenOnFields.expected.Generated as ExpectedGenerated -import jakarta.`annotation`.Generated as AnnotationGenerated +import com.netflix.graphql.dgs.codegen.cases.skipCodegenOnFields.expected.Generated -@AnnotationGenerated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) -@ExpectedGenerated +@Generated public class PersonProjection( inputValueSerializer: InputValueSerializerInterface? = null, ) : GraphQLProjection(inputValueSerializer) { diff --git a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/skipCodegenOnFields/expected/types/Person.kt b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/skipCodegenOnFields/expected/types/Person.kt index 5c0ff348e..16ce6c6ce 100644 --- a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/skipCodegenOnFields/expected/types/Person.kt +++ b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/skipCodegenOnFields/expected/types/Person.kt @@ -5,14 +5,12 @@ import com.fasterxml.jackson.`annotation`.JsonProperty import com.fasterxml.jackson.`annotation`.JsonTypeInfo import com.fasterxml.jackson.databind.`annotation`.JsonDeserialize import com.fasterxml.jackson.databind.`annotation`.JsonPOJOBuilder +import com.netflix.graphql.dgs.codegen.cases.skipCodegenOnFields.expected.Generated import java.lang.IllegalStateException import kotlin.String import kotlin.jvm.JvmName -import com.netflix.graphql.dgs.codegen.cases.skipCodegenOnFields.expected.Generated as ExpectedGenerated -import jakarta.`annotation`.Generated as AnnotationGenerated -@AnnotationGenerated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) -@ExpectedGenerated +@Generated @JsonTypeInfo(use = JsonTypeInfo.Id.NONE) @JsonDeserialize(builder = Person.Builder::class) public class Person( @@ -24,15 +22,13 @@ public class Person( public val name: String? get() = __name.invoke() - @AnnotationGenerated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) - @ExpectedGenerated + @Generated public companion object { private val nameDefault: () -> String? = { throw IllegalStateException("Field `name` was not requested") } } - @AnnotationGenerated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) - @ExpectedGenerated + @Generated @JsonPOJOBuilder @JsonIgnoreProperties("__typename") public class Builder { diff --git a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/skipCodegenOnInterfaceFields/expected/DgsClient.kt b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/skipCodegenOnInterfaceFields/expected/DgsClient.kt index 15b17d231..aa02a88f4 100644 --- a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/skipCodegenOnInterfaceFields/expected/DgsClient.kt +++ b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/skipCodegenOnInterfaceFields/expected/DgsClient.kt @@ -1,5 +1,4 @@ package com.netflix.graphql.dgs.codegen.cases.skipCodegenOnInterfaceFields.expected -@jakarta.`annotation`.Generated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) @Generated public object DgsClient diff --git a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/skipCodegenOnInterfaceFields/expected/DgsConstants.kt b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/skipCodegenOnInterfaceFields/expected/DgsConstants.kt index a9a44d8ef..47160aa8d 100644 --- a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/skipCodegenOnInterfaceFields/expected/DgsConstants.kt +++ b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/skipCodegenOnInterfaceFields/expected/DgsConstants.kt @@ -2,10 +2,8 @@ package com.netflix.graphql.dgs.codegen.cases.skipCodegenOnInterfaceFields.expec import kotlin.String -@jakarta.`annotation`.Generated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) @Generated public object DgsConstants { - @jakarta.`annotation`.Generated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) @Generated public object PERSON { public const val TYPE_NAME: String = "Person" diff --git a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/skipCodegenOnInterfaceFields/expected/client/PersonProjection.kt b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/skipCodegenOnInterfaceFields/expected/client/PersonProjection.kt index 2a935fdd5..4103ed357 100644 --- a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/skipCodegenOnInterfaceFields/expected/client/PersonProjection.kt +++ b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/skipCodegenOnInterfaceFields/expected/client/PersonProjection.kt @@ -2,11 +2,9 @@ package com.netflix.graphql.dgs.codegen.cases.skipCodegenOnInterfaceFields.expec import com.netflix.graphql.dgs.client.codegen.InputValueSerializerInterface import com.netflix.graphql.dgs.codegen.GraphQLProjection -import com.netflix.graphql.dgs.codegen.cases.skipCodegenOnInterfaceFields.expected.Generated as ExpectedGenerated -import jakarta.`annotation`.Generated as AnnotationGenerated +import com.netflix.graphql.dgs.codegen.cases.skipCodegenOnInterfaceFields.expected.Generated -@AnnotationGenerated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) -@ExpectedGenerated +@Generated public class PersonProjection( inputValueSerializer: InputValueSerializerInterface? = null, ) : GraphQLProjection(inputValueSerializer) { diff --git a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/skipCodegenOnInterfaceFields/expected/types/Person.kt b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/skipCodegenOnInterfaceFields/expected/types/Person.kt index 16d51e1cd..4a73ae9be 100644 --- a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/skipCodegenOnInterfaceFields/expected/types/Person.kt +++ b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/skipCodegenOnInterfaceFields/expected/types/Person.kt @@ -1,14 +1,12 @@ package com.netflix.graphql.dgs.codegen.cases.skipCodegenOnInterfaceFields.expected.types import com.fasterxml.jackson.`annotation`.JsonTypeInfo +import com.netflix.graphql.dgs.codegen.cases.skipCodegenOnInterfaceFields.expected.Generated import kotlin.String import kotlin.Suppress import kotlin.jvm.JvmName -import com.netflix.graphql.dgs.codegen.cases.skipCodegenOnInterfaceFields.expected.Generated as ExpectedGenerated -import jakarta.`annotation`.Generated as AnnotationGenerated -@AnnotationGenerated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) -@ExpectedGenerated +@Generated @JsonTypeInfo( use = JsonTypeInfo.Id.NAME, include = JsonTypeInfo.As.PROPERTY, diff --git a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/skipCodegenOnTypes/expected/DgsClient.kt b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/skipCodegenOnTypes/expected/DgsClient.kt index 9bc4c699b..e7af36dd6 100644 --- a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/skipCodegenOnTypes/expected/DgsClient.kt +++ b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/skipCodegenOnTypes/expected/DgsClient.kt @@ -1,5 +1,4 @@ package com.netflix.graphql.dgs.codegen.cases.skipCodegenOnTypes.expected -@jakarta.`annotation`.Generated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) @Generated public object DgsClient diff --git a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/skipCodegenOnTypes/expected/DgsConstants.kt b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/skipCodegenOnTypes/expected/DgsConstants.kt index 2281400cf..12370fe68 100644 --- a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/skipCodegenOnTypes/expected/DgsConstants.kt +++ b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/skipCodegenOnTypes/expected/DgsConstants.kt @@ -2,10 +2,8 @@ package com.netflix.graphql.dgs.codegen.cases.skipCodegenOnTypes.expected import kotlin.String -@jakarta.`annotation`.Generated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) @Generated public object DgsConstants { - @jakarta.`annotation`.Generated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) @Generated public object PERSON { public const val TYPE_NAME: String = "Person" @@ -13,7 +11,6 @@ public object DgsConstants { public const val Name: String = "name" } - @jakarta.`annotation`.Generated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) @Generated public object CAR { public const val TYPE_NAME: String = "Car" diff --git a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/skipCodegenOnTypes/expected/client/PersonProjection.kt b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/skipCodegenOnTypes/expected/client/PersonProjection.kt index 45d6a85df..db19aa0f6 100644 --- a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/skipCodegenOnTypes/expected/client/PersonProjection.kt +++ b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/skipCodegenOnTypes/expected/client/PersonProjection.kt @@ -2,11 +2,9 @@ package com.netflix.graphql.dgs.codegen.cases.skipCodegenOnTypes.expected.client import com.netflix.graphql.dgs.client.codegen.InputValueSerializerInterface import com.netflix.graphql.dgs.codegen.GraphQLProjection -import com.netflix.graphql.dgs.codegen.cases.skipCodegenOnTypes.expected.Generated as ExpectedGenerated -import jakarta.`annotation`.Generated as AnnotationGenerated +import com.netflix.graphql.dgs.codegen.cases.skipCodegenOnTypes.expected.Generated -@AnnotationGenerated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) -@ExpectedGenerated +@Generated public class PersonProjection( inputValueSerializer: InputValueSerializerInterface? = null, ) : GraphQLProjection(inputValueSerializer) { diff --git a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/skipCodegenOnTypes/expected/types/Person.kt b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/skipCodegenOnTypes/expected/types/Person.kt index 156a4430b..96bd85dff 100644 --- a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/skipCodegenOnTypes/expected/types/Person.kt +++ b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/skipCodegenOnTypes/expected/types/Person.kt @@ -5,14 +5,12 @@ import com.fasterxml.jackson.`annotation`.JsonProperty import com.fasterxml.jackson.`annotation`.JsonTypeInfo import com.fasterxml.jackson.databind.`annotation`.JsonDeserialize import com.fasterxml.jackson.databind.`annotation`.JsonPOJOBuilder +import com.netflix.graphql.dgs.codegen.cases.skipCodegenOnTypes.expected.Generated import java.lang.IllegalStateException import kotlin.String import kotlin.jvm.JvmName -import com.netflix.graphql.dgs.codegen.cases.skipCodegenOnTypes.expected.Generated as ExpectedGenerated -import jakarta.`annotation`.Generated as AnnotationGenerated -@AnnotationGenerated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) -@ExpectedGenerated +@Generated @JsonTypeInfo(use = JsonTypeInfo.Id.NONE) @JsonDeserialize(builder = Person.Builder::class) public class Person( @@ -24,15 +22,13 @@ public class Person( public val name: String? get() = __name.invoke() - @AnnotationGenerated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) - @ExpectedGenerated + @Generated public companion object { private val nameDefault: () -> String? = { throw IllegalStateException("Field `name` was not requested") } } - @AnnotationGenerated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) - @ExpectedGenerated + @Generated @JsonPOJOBuilder @JsonIgnoreProperties("__typename") public class Builder { diff --git a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/union/expected/DgsClient.kt b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/union/expected/DgsClient.kt index 5d8bc544b..2f18e4a3b 100644 --- a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/union/expected/DgsClient.kt +++ b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/union/expected/DgsClient.kt @@ -6,7 +6,6 @@ import com.netflix.graphql.dgs.codegen.cases.union.expected.client.QueryProjecti import graphql.language.OperationDefinition import kotlin.String -@jakarta.`annotation`.Generated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) @Generated public object DgsClient { public fun buildQuery(inputValueSerializer: InputValueSerializerInterface? = null, diff --git a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/union/expected/DgsConstants.kt b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/union/expected/DgsConstants.kt index ef99f1e5d..8e9d0ab9e 100644 --- a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/union/expected/DgsConstants.kt +++ b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/union/expected/DgsConstants.kt @@ -2,12 +2,10 @@ package com.netflix.graphql.dgs.codegen.cases.union.expected import kotlin.String -@jakarta.`annotation`.Generated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) @Generated public object DgsConstants { public const val QUERY_TYPE: String = "Query" - @jakarta.`annotation`.Generated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) @Generated public object QUERY { public const val TYPE_NAME: String = "Query" @@ -15,7 +13,6 @@ public object DgsConstants { public const val Search: String = "search" } - @jakarta.`annotation`.Generated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) @Generated public object MOVIE { public const val TYPE_NAME: String = "Movie" @@ -23,7 +20,6 @@ public object DgsConstants { public const val Title: String = "title" } - @jakarta.`annotation`.Generated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) @Generated public object ACTOR { public const val TYPE_NAME: String = "Actor" @@ -31,7 +27,6 @@ public object DgsConstants { public const val Name: String = "name" } - @jakarta.`annotation`.Generated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) @Generated public object SEARCHRESULT { public const val TYPE_NAME: String = "SearchResult" diff --git a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/union/expected/client/ActorProjection.kt b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/union/expected/client/ActorProjection.kt index b0ef4f37f..27166ba73 100644 --- a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/union/expected/client/ActorProjection.kt +++ b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/union/expected/client/ActorProjection.kt @@ -2,11 +2,9 @@ package com.netflix.graphql.dgs.codegen.cases.union.expected.client import com.netflix.graphql.dgs.client.codegen.InputValueSerializerInterface import com.netflix.graphql.dgs.codegen.GraphQLProjection -import com.netflix.graphql.dgs.codegen.cases.union.expected.Generated as ExpectedGenerated -import jakarta.`annotation`.Generated as AnnotationGenerated +import com.netflix.graphql.dgs.codegen.cases.union.expected.Generated -@AnnotationGenerated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) -@ExpectedGenerated +@Generated public class ActorProjection( inputValueSerializer: InputValueSerializerInterface? = null, ) : GraphQLProjection(inputValueSerializer) { diff --git a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/union/expected/client/MovieProjection.kt b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/union/expected/client/MovieProjection.kt index f824e11a4..dc3646ec7 100644 --- a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/union/expected/client/MovieProjection.kt +++ b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/union/expected/client/MovieProjection.kt @@ -2,11 +2,9 @@ package com.netflix.graphql.dgs.codegen.cases.union.expected.client import com.netflix.graphql.dgs.client.codegen.InputValueSerializerInterface import com.netflix.graphql.dgs.codegen.GraphQLProjection -import com.netflix.graphql.dgs.codegen.cases.union.expected.Generated as ExpectedGenerated -import jakarta.`annotation`.Generated as AnnotationGenerated +import com.netflix.graphql.dgs.codegen.cases.union.expected.Generated -@AnnotationGenerated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) -@ExpectedGenerated +@Generated public class MovieProjection( inputValueSerializer: InputValueSerializerInterface? = null, ) : GraphQLProjection(inputValueSerializer) { diff --git a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/union/expected/client/QueryProjection.kt b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/union/expected/client/QueryProjection.kt index 5d6e090d4..20ac52ccf 100644 --- a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/union/expected/client/QueryProjection.kt +++ b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/union/expected/client/QueryProjection.kt @@ -2,12 +2,10 @@ package com.netflix.graphql.dgs.codegen.cases.union.expected.client import com.netflix.graphql.dgs.client.codegen.InputValueSerializerInterface import com.netflix.graphql.dgs.codegen.GraphQLProjection +import com.netflix.graphql.dgs.codegen.cases.union.expected.Generated import kotlin.String -import com.netflix.graphql.dgs.codegen.cases.union.expected.Generated as ExpectedGenerated -import jakarta.`annotation`.Generated as AnnotationGenerated -@AnnotationGenerated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) -@ExpectedGenerated +@Generated public class QueryProjection( inputValueSerializer: InputValueSerializerInterface? = null, ) : GraphQLProjection(inputValueSerializer) { diff --git a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/union/expected/client/SearchResultProjection.kt b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/union/expected/client/SearchResultProjection.kt index 7ada06828..6c2a0917d 100644 --- a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/union/expected/client/SearchResultProjection.kt +++ b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/union/expected/client/SearchResultProjection.kt @@ -2,11 +2,9 @@ package com.netflix.graphql.dgs.codegen.cases.union.expected.client import com.netflix.graphql.dgs.client.codegen.InputValueSerializerInterface import com.netflix.graphql.dgs.codegen.GraphQLProjection -import com.netflix.graphql.dgs.codegen.cases.union.expected.Generated as ExpectedGenerated -import jakarta.`annotation`.Generated as AnnotationGenerated +import com.netflix.graphql.dgs.codegen.cases.union.expected.Generated -@AnnotationGenerated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) -@ExpectedGenerated +@Generated public class SearchResultProjection( inputValueSerializer: InputValueSerializerInterface? = null, ) : GraphQLProjection(inputValueSerializer) { diff --git a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/union/expected/types/Actor.kt b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/union/expected/types/Actor.kt index 9c268f634..cd03452e6 100644 --- a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/union/expected/types/Actor.kt +++ b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/union/expected/types/Actor.kt @@ -5,14 +5,12 @@ import com.fasterxml.jackson.`annotation`.JsonProperty import com.fasterxml.jackson.`annotation`.JsonTypeInfo import com.fasterxml.jackson.databind.`annotation`.JsonDeserialize import com.fasterxml.jackson.databind.`annotation`.JsonPOJOBuilder +import com.netflix.graphql.dgs.codegen.cases.union.expected.Generated import java.lang.IllegalStateException import kotlin.String import kotlin.jvm.JvmName -import com.netflix.graphql.dgs.codegen.cases.union.expected.Generated as ExpectedGenerated -import jakarta.`annotation`.Generated as AnnotationGenerated -@AnnotationGenerated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) -@ExpectedGenerated +@Generated @JsonTypeInfo(use = JsonTypeInfo.Id.NONE) @JsonDeserialize(builder = Actor.Builder::class) public class Actor( @@ -24,15 +22,13 @@ public class Actor( public val name: String? get() = __name.invoke() - @AnnotationGenerated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) - @ExpectedGenerated + @Generated public companion object { private val nameDefault: () -> String? = { throw IllegalStateException("Field `name` was not requested") } } - @AnnotationGenerated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) - @ExpectedGenerated + @Generated @JsonPOJOBuilder @JsonIgnoreProperties("__typename") public class Builder { diff --git a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/union/expected/types/Movie.kt b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/union/expected/types/Movie.kt index 1c80f6f7d..41ea6b9f4 100644 --- a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/union/expected/types/Movie.kt +++ b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/union/expected/types/Movie.kt @@ -5,14 +5,12 @@ import com.fasterxml.jackson.`annotation`.JsonProperty import com.fasterxml.jackson.`annotation`.JsonTypeInfo import com.fasterxml.jackson.databind.`annotation`.JsonDeserialize import com.fasterxml.jackson.databind.`annotation`.JsonPOJOBuilder +import com.netflix.graphql.dgs.codegen.cases.union.expected.Generated import java.lang.IllegalStateException import kotlin.String import kotlin.jvm.JvmName -import com.netflix.graphql.dgs.codegen.cases.union.expected.Generated as ExpectedGenerated -import jakarta.`annotation`.Generated as AnnotationGenerated -@AnnotationGenerated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) -@ExpectedGenerated +@Generated @JsonTypeInfo(use = JsonTypeInfo.Id.NONE) @JsonDeserialize(builder = Movie.Builder::class) public class Movie( @@ -24,15 +22,13 @@ public class Movie( public val title: String? get() = __title.invoke() - @AnnotationGenerated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) - @ExpectedGenerated + @Generated public companion object { private val titleDefault: () -> String? = { throw IllegalStateException("Field `title` was not requested") } } - @AnnotationGenerated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) - @ExpectedGenerated + @Generated @JsonPOJOBuilder @JsonIgnoreProperties("__typename") public class Builder { diff --git a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/union/expected/types/Query.kt b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/union/expected/types/Query.kt index 3e5f90938..2aa3a3055 100644 --- a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/union/expected/types/Query.kt +++ b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/union/expected/types/Query.kt @@ -5,14 +5,12 @@ import com.fasterxml.jackson.`annotation`.JsonProperty import com.fasterxml.jackson.`annotation`.JsonTypeInfo import com.fasterxml.jackson.databind.`annotation`.JsonDeserialize import com.fasterxml.jackson.databind.`annotation`.JsonPOJOBuilder +import com.netflix.graphql.dgs.codegen.cases.union.expected.Generated import java.lang.IllegalStateException import kotlin.collections.List import kotlin.jvm.JvmName -import com.netflix.graphql.dgs.codegen.cases.union.expected.Generated as ExpectedGenerated -import jakarta.`annotation`.Generated as AnnotationGenerated -@AnnotationGenerated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) -@ExpectedGenerated +@Generated @JsonTypeInfo(use = JsonTypeInfo.Id.NONE) @JsonDeserialize(builder = Query.Builder::class) public class Query( @@ -24,15 +22,13 @@ public class Query( public val search: List? get() = __search.invoke() - @AnnotationGenerated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) - @ExpectedGenerated + @Generated public companion object { private val searchDefault: () -> List? = { throw IllegalStateException("Field `search` was not requested") } } - @AnnotationGenerated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) - @ExpectedGenerated + @Generated @JsonPOJOBuilder @JsonIgnoreProperties("__typename") public class Builder { diff --git a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/union/expected/types/SearchResult.kt b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/union/expected/types/SearchResult.kt index dcc90e6f6..32bbe3bed 100644 --- a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/union/expected/types/SearchResult.kt +++ b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/union/expected/types/SearchResult.kt @@ -2,11 +2,9 @@ package com.netflix.graphql.dgs.codegen.cases.union.expected.types import com.fasterxml.jackson.`annotation`.JsonSubTypes import com.fasterxml.jackson.`annotation`.JsonTypeInfo -import com.netflix.graphql.dgs.codegen.cases.union.expected.Generated as ExpectedGenerated -import jakarta.`annotation`.Generated as AnnotationGenerated +import com.netflix.graphql.dgs.codegen.cases.union.expected.Generated -@AnnotationGenerated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) -@ExpectedGenerated +@Generated @JsonTypeInfo( use = JsonTypeInfo.Id.NAME, include = JsonTypeInfo.As.PROPERTY, diff --git a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/unionTypesWithoutInterfaceCanDeserialize/expected/DgsClient.kt b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/unionTypesWithoutInterfaceCanDeserialize/expected/DgsClient.kt index e1256f43b..4b79ba562 100644 --- a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/unionTypesWithoutInterfaceCanDeserialize/expected/DgsClient.kt +++ b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/unionTypesWithoutInterfaceCanDeserialize/expected/DgsClient.kt @@ -6,7 +6,6 @@ import com.netflix.graphql.dgs.codegen.cases.unionTypesWithoutInterfaceCanDeseri import graphql.language.OperationDefinition import kotlin.String -@jakarta.`annotation`.Generated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) @Generated public object DgsClient { public fun buildQuery(inputValueSerializer: InputValueSerializerInterface? = null, diff --git a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/unionTypesWithoutInterfaceCanDeserialize/expected/DgsConstants.kt b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/unionTypesWithoutInterfaceCanDeserialize/expected/DgsConstants.kt index f1888f945..5c449fe47 100644 --- a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/unionTypesWithoutInterfaceCanDeserialize/expected/DgsConstants.kt +++ b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/unionTypesWithoutInterfaceCanDeserialize/expected/DgsConstants.kt @@ -2,26 +2,22 @@ package com.netflix.graphql.dgs.codegen.cases.unionTypesWithoutInterfaceCanDeser import kotlin.String -@jakarta.`annotation`.Generated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) @Generated public object DgsConstants { public const val QUERY_TYPE: String = "Query" - @jakarta.`annotation`.Generated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) @Generated public object QUERY { public const val TYPE_NAME: String = "Query" public const val Search: String = "search" - @jakarta.`annotation`.Generated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) @Generated public object SEARCH_INPUT_ARGUMENT { public const val Text: String = "text" } } - @jakarta.`annotation`.Generated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) @Generated public object HUMAN { public const val TYPE_NAME: String = "Human" @@ -33,7 +29,6 @@ public object DgsConstants { public const val TotalCredits: String = "totalCredits" } - @jakarta.`annotation`.Generated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) @Generated public object DROID { public const val TYPE_NAME: String = "Droid" @@ -45,7 +40,6 @@ public object DgsConstants { public const val PrimaryFunction: String = "primaryFunction" } - @jakarta.`annotation`.Generated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) @Generated public object SEARCHRESULTPAGE { public const val TYPE_NAME: String = "SearchResultPage" @@ -53,7 +47,6 @@ public object DgsConstants { public const val Items: String = "items" } - @jakarta.`annotation`.Generated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) @Generated public object SEARCHRESULT { public const val TYPE_NAME: String = "SearchResult" diff --git a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/unionTypesWithoutInterfaceCanDeserialize/expected/client/DroidProjection.kt b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/unionTypesWithoutInterfaceCanDeserialize/expected/client/DroidProjection.kt index 55efff7fd..cf12cd521 100644 --- a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/unionTypesWithoutInterfaceCanDeserialize/expected/client/DroidProjection.kt +++ b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/unionTypesWithoutInterfaceCanDeserialize/expected/client/DroidProjection.kt @@ -2,11 +2,9 @@ package com.netflix.graphql.dgs.codegen.cases.unionTypesWithoutInterfaceCanDeser import com.netflix.graphql.dgs.client.codegen.InputValueSerializerInterface import com.netflix.graphql.dgs.codegen.GraphQLProjection -import com.netflix.graphql.dgs.codegen.cases.unionTypesWithoutInterfaceCanDeserialize.expected.Generated as ExpectedGenerated -import jakarta.`annotation`.Generated as AnnotationGenerated +import com.netflix.graphql.dgs.codegen.cases.unionTypesWithoutInterfaceCanDeserialize.expected.Generated -@AnnotationGenerated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) -@ExpectedGenerated +@Generated public class DroidProjection( inputValueSerializer: InputValueSerializerInterface? = null, ) : GraphQLProjection(inputValueSerializer) { diff --git a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/unionTypesWithoutInterfaceCanDeserialize/expected/client/HumanProjection.kt b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/unionTypesWithoutInterfaceCanDeserialize/expected/client/HumanProjection.kt index bfdf4b998..cff4c1dd8 100644 --- a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/unionTypesWithoutInterfaceCanDeserialize/expected/client/HumanProjection.kt +++ b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/unionTypesWithoutInterfaceCanDeserialize/expected/client/HumanProjection.kt @@ -2,11 +2,9 @@ package com.netflix.graphql.dgs.codegen.cases.unionTypesWithoutInterfaceCanDeser import com.netflix.graphql.dgs.client.codegen.InputValueSerializerInterface import com.netflix.graphql.dgs.codegen.GraphQLProjection -import com.netflix.graphql.dgs.codegen.cases.unionTypesWithoutInterfaceCanDeserialize.expected.Generated as ExpectedGenerated -import jakarta.`annotation`.Generated as AnnotationGenerated +import com.netflix.graphql.dgs.codegen.cases.unionTypesWithoutInterfaceCanDeserialize.expected.Generated -@AnnotationGenerated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) -@ExpectedGenerated +@Generated public class HumanProjection( inputValueSerializer: InputValueSerializerInterface? = null, ) : GraphQLProjection(inputValueSerializer) { diff --git a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/unionTypesWithoutInterfaceCanDeserialize/expected/client/QueryProjection.kt b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/unionTypesWithoutInterfaceCanDeserialize/expected/client/QueryProjection.kt index ad3d80067..7f8c1613e 100644 --- a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/unionTypesWithoutInterfaceCanDeserialize/expected/client/QueryProjection.kt +++ b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/unionTypesWithoutInterfaceCanDeserialize/expected/client/QueryProjection.kt @@ -2,12 +2,10 @@ package com.netflix.graphql.dgs.codegen.cases.unionTypesWithoutInterfaceCanDeser import com.netflix.graphql.dgs.client.codegen.InputValueSerializerInterface import com.netflix.graphql.dgs.codegen.GraphQLProjection +import com.netflix.graphql.dgs.codegen.cases.unionTypesWithoutInterfaceCanDeserialize.expected.Generated import kotlin.String -import com.netflix.graphql.dgs.codegen.cases.unionTypesWithoutInterfaceCanDeserialize.expected.Generated as ExpectedGenerated -import jakarta.`annotation`.Generated as AnnotationGenerated -@AnnotationGenerated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) -@ExpectedGenerated +@Generated public class QueryProjection( inputValueSerializer: InputValueSerializerInterface? = null, ) : GraphQLProjection(inputValueSerializer) { diff --git a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/unionTypesWithoutInterfaceCanDeserialize/expected/client/SearchResultPageProjection.kt b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/unionTypesWithoutInterfaceCanDeserialize/expected/client/SearchResultPageProjection.kt index d400fcf17..19c95af86 100644 --- a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/unionTypesWithoutInterfaceCanDeserialize/expected/client/SearchResultPageProjection.kt +++ b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/unionTypesWithoutInterfaceCanDeserialize/expected/client/SearchResultPageProjection.kt @@ -2,12 +2,10 @@ package com.netflix.graphql.dgs.codegen.cases.unionTypesWithoutInterfaceCanDeser import com.netflix.graphql.dgs.client.codegen.InputValueSerializerInterface import com.netflix.graphql.dgs.codegen.GraphQLProjection +import com.netflix.graphql.dgs.codegen.cases.unionTypesWithoutInterfaceCanDeserialize.expected.Generated import kotlin.String -import com.netflix.graphql.dgs.codegen.cases.unionTypesWithoutInterfaceCanDeserialize.expected.Generated as ExpectedGenerated -import jakarta.`annotation`.Generated as AnnotationGenerated -@AnnotationGenerated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) -@ExpectedGenerated +@Generated public class SearchResultPageProjection( inputValueSerializer: InputValueSerializerInterface? = null, ) : GraphQLProjection(inputValueSerializer) { diff --git a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/unionTypesWithoutInterfaceCanDeserialize/expected/client/SearchResultProjection.kt b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/unionTypesWithoutInterfaceCanDeserialize/expected/client/SearchResultProjection.kt index 85b516a68..24bb4aa34 100644 --- a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/unionTypesWithoutInterfaceCanDeserialize/expected/client/SearchResultProjection.kt +++ b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/unionTypesWithoutInterfaceCanDeserialize/expected/client/SearchResultProjection.kt @@ -2,11 +2,9 @@ package com.netflix.graphql.dgs.codegen.cases.unionTypesWithoutInterfaceCanDeser import com.netflix.graphql.dgs.client.codegen.InputValueSerializerInterface import com.netflix.graphql.dgs.codegen.GraphQLProjection -import com.netflix.graphql.dgs.codegen.cases.unionTypesWithoutInterfaceCanDeserialize.expected.Generated as ExpectedGenerated -import jakarta.`annotation`.Generated as AnnotationGenerated +import com.netflix.graphql.dgs.codegen.cases.unionTypesWithoutInterfaceCanDeserialize.expected.Generated -@AnnotationGenerated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) -@ExpectedGenerated +@Generated public class SearchResultProjection( inputValueSerializer: InputValueSerializerInterface? = null, ) : GraphQLProjection(inputValueSerializer) { diff --git a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/unionTypesWithoutInterfaceCanDeserialize/expected/types/Droid.kt b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/unionTypesWithoutInterfaceCanDeserialize/expected/types/Droid.kt index ae03c30d3..248345302 100644 --- a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/unionTypesWithoutInterfaceCanDeserialize/expected/types/Droid.kt +++ b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/unionTypesWithoutInterfaceCanDeserialize/expected/types/Droid.kt @@ -5,14 +5,12 @@ import com.fasterxml.jackson.`annotation`.JsonProperty import com.fasterxml.jackson.`annotation`.JsonTypeInfo import com.fasterxml.jackson.databind.`annotation`.JsonDeserialize import com.fasterxml.jackson.databind.`annotation`.JsonPOJOBuilder +import com.netflix.graphql.dgs.codegen.cases.unionTypesWithoutInterfaceCanDeserialize.expected.Generated import java.lang.IllegalStateException import kotlin.String import kotlin.jvm.JvmName -import com.netflix.graphql.dgs.codegen.cases.unionTypesWithoutInterfaceCanDeserialize.expected.Generated as ExpectedGenerated -import jakarta.`annotation`.Generated as AnnotationGenerated -@AnnotationGenerated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) -@ExpectedGenerated +@Generated @JsonTypeInfo(use = JsonTypeInfo.Id.NONE) @JsonDeserialize(builder = Droid.Builder::class) public class Droid( @@ -38,8 +36,7 @@ public class Droid( public val primaryFunction: String? get() = __primaryFunction.invoke() - @AnnotationGenerated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) - @ExpectedGenerated + @Generated public companion object { private val idDefault: () -> String = { throw IllegalStateException("Field `id` was not requested") } @@ -51,8 +48,7 @@ public class Droid( { throw IllegalStateException("Field `primaryFunction` was not requested") } } - @AnnotationGenerated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) - @ExpectedGenerated + @Generated @JsonPOJOBuilder @JsonIgnoreProperties("__typename") public class Builder { diff --git a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/unionTypesWithoutInterfaceCanDeserialize/expected/types/Human.kt b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/unionTypesWithoutInterfaceCanDeserialize/expected/types/Human.kt index 1b0fb0652..8cf730972 100644 --- a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/unionTypesWithoutInterfaceCanDeserialize/expected/types/Human.kt +++ b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/unionTypesWithoutInterfaceCanDeserialize/expected/types/Human.kt @@ -5,15 +5,13 @@ import com.fasterxml.jackson.`annotation`.JsonProperty import com.fasterxml.jackson.`annotation`.JsonTypeInfo import com.fasterxml.jackson.databind.`annotation`.JsonDeserialize import com.fasterxml.jackson.databind.`annotation`.JsonPOJOBuilder +import com.netflix.graphql.dgs.codegen.cases.unionTypesWithoutInterfaceCanDeserialize.expected.Generated import java.lang.IllegalStateException import kotlin.Int import kotlin.String import kotlin.jvm.JvmName -import com.netflix.graphql.dgs.codegen.cases.unionTypesWithoutInterfaceCanDeserialize.expected.Generated as ExpectedGenerated -import jakarta.`annotation`.Generated as AnnotationGenerated -@AnnotationGenerated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) -@ExpectedGenerated +@Generated @JsonTypeInfo(use = JsonTypeInfo.Id.NONE) @JsonDeserialize(builder = Human.Builder::class) public class Human( @@ -39,8 +37,7 @@ public class Human( public val totalCredits: Int? get() = __totalCredits.invoke() - @AnnotationGenerated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) - @ExpectedGenerated + @Generated public companion object { private val idDefault: () -> String = { throw IllegalStateException("Field `id` was not requested") } @@ -52,8 +49,7 @@ public class Human( { throw IllegalStateException("Field `totalCredits` was not requested") } } - @AnnotationGenerated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) - @ExpectedGenerated + @Generated @JsonPOJOBuilder @JsonIgnoreProperties("__typename") public class Builder { diff --git a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/unionTypesWithoutInterfaceCanDeserialize/expected/types/Query.kt b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/unionTypesWithoutInterfaceCanDeserialize/expected/types/Query.kt index 7d361fc7f..564fb462a 100644 --- a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/unionTypesWithoutInterfaceCanDeserialize/expected/types/Query.kt +++ b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/unionTypesWithoutInterfaceCanDeserialize/expected/types/Query.kt @@ -5,13 +5,11 @@ import com.fasterxml.jackson.`annotation`.JsonProperty import com.fasterxml.jackson.`annotation`.JsonTypeInfo import com.fasterxml.jackson.databind.`annotation`.JsonDeserialize import com.fasterxml.jackson.databind.`annotation`.JsonPOJOBuilder +import com.netflix.graphql.dgs.codegen.cases.unionTypesWithoutInterfaceCanDeserialize.expected.Generated import java.lang.IllegalStateException import kotlin.jvm.JvmName -import com.netflix.graphql.dgs.codegen.cases.unionTypesWithoutInterfaceCanDeserialize.expected.Generated as ExpectedGenerated -import jakarta.`annotation`.Generated as AnnotationGenerated -@AnnotationGenerated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) -@ExpectedGenerated +@Generated @JsonTypeInfo(use = JsonTypeInfo.Id.NONE) @JsonDeserialize(builder = Query.Builder::class) public class Query( @@ -23,15 +21,13 @@ public class Query( public val search: SearchResultPage? get() = __search.invoke() - @AnnotationGenerated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) - @ExpectedGenerated + @Generated public companion object { private val searchDefault: () -> SearchResultPage? = { throw IllegalStateException("Field `search` was not requested") } } - @AnnotationGenerated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) - @ExpectedGenerated + @Generated @JsonPOJOBuilder @JsonIgnoreProperties("__typename") public class Builder { diff --git a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/unionTypesWithoutInterfaceCanDeserialize/expected/types/SearchResult.kt b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/unionTypesWithoutInterfaceCanDeserialize/expected/types/SearchResult.kt index 803c8c0ec..503e5816d 100644 --- a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/unionTypesWithoutInterfaceCanDeserialize/expected/types/SearchResult.kt +++ b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/unionTypesWithoutInterfaceCanDeserialize/expected/types/SearchResult.kt @@ -2,11 +2,9 @@ package com.netflix.graphql.dgs.codegen.cases.unionTypesWithoutInterfaceCanDeser import com.fasterxml.jackson.`annotation`.JsonSubTypes import com.fasterxml.jackson.`annotation`.JsonTypeInfo -import com.netflix.graphql.dgs.codegen.cases.unionTypesWithoutInterfaceCanDeserialize.expected.Generated as ExpectedGenerated -import jakarta.`annotation`.Generated as AnnotationGenerated +import com.netflix.graphql.dgs.codegen.cases.unionTypesWithoutInterfaceCanDeserialize.expected.Generated -@AnnotationGenerated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) -@ExpectedGenerated +@Generated @JsonTypeInfo( use = JsonTypeInfo.Id.NAME, include = JsonTypeInfo.As.PROPERTY, diff --git a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/unionTypesWithoutInterfaceCanDeserialize/expected/types/SearchResultPage.kt b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/unionTypesWithoutInterfaceCanDeserialize/expected/types/SearchResultPage.kt index 34c9a4d98..c4a2cbe23 100644 --- a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/unionTypesWithoutInterfaceCanDeserialize/expected/types/SearchResultPage.kt +++ b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/unionTypesWithoutInterfaceCanDeserialize/expected/types/SearchResultPage.kt @@ -5,14 +5,12 @@ import com.fasterxml.jackson.`annotation`.JsonProperty import com.fasterxml.jackson.`annotation`.JsonTypeInfo import com.fasterxml.jackson.databind.`annotation`.JsonDeserialize import com.fasterxml.jackson.databind.`annotation`.JsonPOJOBuilder +import com.netflix.graphql.dgs.codegen.cases.unionTypesWithoutInterfaceCanDeserialize.expected.Generated import java.lang.IllegalStateException import kotlin.collections.List import kotlin.jvm.JvmName -import com.netflix.graphql.dgs.codegen.cases.unionTypesWithoutInterfaceCanDeserialize.expected.Generated as ExpectedGenerated -import jakarta.`annotation`.Generated as AnnotationGenerated -@AnnotationGenerated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) -@ExpectedGenerated +@Generated @JsonTypeInfo(use = JsonTypeInfo.Id.NONE) @JsonDeserialize(builder = SearchResultPage.Builder::class) public class SearchResultPage( @@ -24,15 +22,13 @@ public class SearchResultPage( public val items: List? get() = __items.invoke() - @AnnotationGenerated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) - @ExpectedGenerated + @Generated public companion object { private val itemsDefault: () -> List? = { throw IllegalStateException("Field `items` was not requested") } } - @AnnotationGenerated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) - @ExpectedGenerated + @Generated @JsonPOJOBuilder @JsonIgnoreProperties("__typename") public class Builder { diff --git a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/unionWithExtendedType/expected/DgsClient.kt b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/unionWithExtendedType/expected/DgsClient.kt index 8af5f4f38..c8aa0b778 100644 --- a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/unionWithExtendedType/expected/DgsClient.kt +++ b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/unionWithExtendedType/expected/DgsClient.kt @@ -6,7 +6,6 @@ import com.netflix.graphql.dgs.codegen.cases.unionWithExtendedType.expected.clie import graphql.language.OperationDefinition import kotlin.String -@jakarta.`annotation`.Generated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) @Generated public object DgsClient { public fun buildQuery(inputValueSerializer: InputValueSerializerInterface? = null, diff --git a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/unionWithExtendedType/expected/DgsConstants.kt b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/unionWithExtendedType/expected/DgsConstants.kt index 111384486..860b890a9 100644 --- a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/unionWithExtendedType/expected/DgsConstants.kt +++ b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/unionWithExtendedType/expected/DgsConstants.kt @@ -2,12 +2,10 @@ package com.netflix.graphql.dgs.codegen.cases.unionWithExtendedType.expected import kotlin.String -@jakarta.`annotation`.Generated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) @Generated public object DgsConstants { public const val QUERY_TYPE: String = "Query" - @jakarta.`annotation`.Generated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) @Generated public object QUERY { public const val TYPE_NAME: String = "Query" @@ -15,7 +13,6 @@ public object DgsConstants { public const val Search: String = "search" } - @jakarta.`annotation`.Generated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) @Generated public object MOVIE { public const val TYPE_NAME: String = "Movie" @@ -23,7 +20,6 @@ public object DgsConstants { public const val Title: String = "title" } - @jakarta.`annotation`.Generated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) @Generated public object ACTOR { public const val TYPE_NAME: String = "Actor" @@ -31,7 +27,6 @@ public object DgsConstants { public const val Name: String = "name" } - @jakarta.`annotation`.Generated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) @Generated public object RATING { public const val TYPE_NAME: String = "Rating" @@ -39,7 +34,6 @@ public object DgsConstants { public const val Stars: String = "stars" } - @jakarta.`annotation`.Generated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) @Generated public object SEARCHRESULT { public const val TYPE_NAME: String = "SearchResult" diff --git a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/unionWithExtendedType/expected/client/ActorProjection.kt b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/unionWithExtendedType/expected/client/ActorProjection.kt index fdc5d8126..9d70e12fa 100644 --- a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/unionWithExtendedType/expected/client/ActorProjection.kt +++ b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/unionWithExtendedType/expected/client/ActorProjection.kt @@ -2,11 +2,9 @@ package com.netflix.graphql.dgs.codegen.cases.unionWithExtendedType.expected.cli import com.netflix.graphql.dgs.client.codegen.InputValueSerializerInterface import com.netflix.graphql.dgs.codegen.GraphQLProjection -import com.netflix.graphql.dgs.codegen.cases.unionWithExtendedType.expected.Generated as ExpectedGenerated -import jakarta.`annotation`.Generated as AnnotationGenerated +import com.netflix.graphql.dgs.codegen.cases.unionWithExtendedType.expected.Generated -@AnnotationGenerated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) -@ExpectedGenerated +@Generated public class ActorProjection( inputValueSerializer: InputValueSerializerInterface? = null, ) : GraphQLProjection(inputValueSerializer) { diff --git a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/unionWithExtendedType/expected/client/MovieProjection.kt b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/unionWithExtendedType/expected/client/MovieProjection.kt index 1183fb03d..095b8e526 100644 --- a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/unionWithExtendedType/expected/client/MovieProjection.kt +++ b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/unionWithExtendedType/expected/client/MovieProjection.kt @@ -2,11 +2,9 @@ package com.netflix.graphql.dgs.codegen.cases.unionWithExtendedType.expected.cli import com.netflix.graphql.dgs.client.codegen.InputValueSerializerInterface import com.netflix.graphql.dgs.codegen.GraphQLProjection -import com.netflix.graphql.dgs.codegen.cases.unionWithExtendedType.expected.Generated as ExpectedGenerated -import jakarta.`annotation`.Generated as AnnotationGenerated +import com.netflix.graphql.dgs.codegen.cases.unionWithExtendedType.expected.Generated -@AnnotationGenerated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) -@ExpectedGenerated +@Generated public class MovieProjection( inputValueSerializer: InputValueSerializerInterface? = null, ) : GraphQLProjection(inputValueSerializer) { diff --git a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/unionWithExtendedType/expected/client/QueryProjection.kt b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/unionWithExtendedType/expected/client/QueryProjection.kt index 693d56913..d3597c535 100644 --- a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/unionWithExtendedType/expected/client/QueryProjection.kt +++ b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/unionWithExtendedType/expected/client/QueryProjection.kt @@ -2,12 +2,10 @@ package com.netflix.graphql.dgs.codegen.cases.unionWithExtendedType.expected.cli import com.netflix.graphql.dgs.client.codegen.InputValueSerializerInterface import com.netflix.graphql.dgs.codegen.GraphQLProjection +import com.netflix.graphql.dgs.codegen.cases.unionWithExtendedType.expected.Generated import kotlin.String -import com.netflix.graphql.dgs.codegen.cases.unionWithExtendedType.expected.Generated as ExpectedGenerated -import jakarta.`annotation`.Generated as AnnotationGenerated -@AnnotationGenerated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) -@ExpectedGenerated +@Generated public class QueryProjection( inputValueSerializer: InputValueSerializerInterface? = null, ) : GraphQLProjection(inputValueSerializer) { diff --git a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/unionWithExtendedType/expected/client/RatingProjection.kt b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/unionWithExtendedType/expected/client/RatingProjection.kt index 114f4c06c..aac904c87 100644 --- a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/unionWithExtendedType/expected/client/RatingProjection.kt +++ b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/unionWithExtendedType/expected/client/RatingProjection.kt @@ -2,11 +2,9 @@ package com.netflix.graphql.dgs.codegen.cases.unionWithExtendedType.expected.cli import com.netflix.graphql.dgs.client.codegen.InputValueSerializerInterface import com.netflix.graphql.dgs.codegen.GraphQLProjection -import com.netflix.graphql.dgs.codegen.cases.unionWithExtendedType.expected.Generated as ExpectedGenerated -import jakarta.`annotation`.Generated as AnnotationGenerated +import com.netflix.graphql.dgs.codegen.cases.unionWithExtendedType.expected.Generated -@AnnotationGenerated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) -@ExpectedGenerated +@Generated public class RatingProjection( inputValueSerializer: InputValueSerializerInterface? = null, ) : GraphQLProjection(inputValueSerializer) { diff --git a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/unionWithExtendedType/expected/client/SearchResultProjection.kt b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/unionWithExtendedType/expected/client/SearchResultProjection.kt index 5b045b990..5998d8733 100644 --- a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/unionWithExtendedType/expected/client/SearchResultProjection.kt +++ b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/unionWithExtendedType/expected/client/SearchResultProjection.kt @@ -2,11 +2,9 @@ package com.netflix.graphql.dgs.codegen.cases.unionWithExtendedType.expected.cli import com.netflix.graphql.dgs.client.codegen.InputValueSerializerInterface import com.netflix.graphql.dgs.codegen.GraphQLProjection -import com.netflix.graphql.dgs.codegen.cases.unionWithExtendedType.expected.Generated as ExpectedGenerated -import jakarta.`annotation`.Generated as AnnotationGenerated +import com.netflix.graphql.dgs.codegen.cases.unionWithExtendedType.expected.Generated -@AnnotationGenerated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) -@ExpectedGenerated +@Generated public class SearchResultProjection( inputValueSerializer: InputValueSerializerInterface? = null, ) : GraphQLProjection(inputValueSerializer) { diff --git a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/unionWithExtendedType/expected/types/Actor.kt b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/unionWithExtendedType/expected/types/Actor.kt index f549afbbd..5da7bad41 100644 --- a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/unionWithExtendedType/expected/types/Actor.kt +++ b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/unionWithExtendedType/expected/types/Actor.kt @@ -5,14 +5,12 @@ import com.fasterxml.jackson.`annotation`.JsonProperty import com.fasterxml.jackson.`annotation`.JsonTypeInfo import com.fasterxml.jackson.databind.`annotation`.JsonDeserialize import com.fasterxml.jackson.databind.`annotation`.JsonPOJOBuilder +import com.netflix.graphql.dgs.codegen.cases.unionWithExtendedType.expected.Generated import java.lang.IllegalStateException import kotlin.String import kotlin.jvm.JvmName -import com.netflix.graphql.dgs.codegen.cases.unionWithExtendedType.expected.Generated as ExpectedGenerated -import jakarta.`annotation`.Generated as AnnotationGenerated -@AnnotationGenerated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) -@ExpectedGenerated +@Generated @JsonTypeInfo(use = JsonTypeInfo.Id.NONE) @JsonDeserialize(builder = Actor.Builder::class) public class Actor( @@ -24,15 +22,13 @@ public class Actor( public val name: String? get() = __name.invoke() - @AnnotationGenerated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) - @ExpectedGenerated + @Generated public companion object { private val nameDefault: () -> String? = { throw IllegalStateException("Field `name` was not requested") } } - @AnnotationGenerated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) - @ExpectedGenerated + @Generated @JsonPOJOBuilder @JsonIgnoreProperties("__typename") public class Builder { diff --git a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/unionWithExtendedType/expected/types/Movie.kt b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/unionWithExtendedType/expected/types/Movie.kt index c9d342ee3..027d987b5 100644 --- a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/unionWithExtendedType/expected/types/Movie.kt +++ b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/unionWithExtendedType/expected/types/Movie.kt @@ -5,14 +5,12 @@ import com.fasterxml.jackson.`annotation`.JsonProperty import com.fasterxml.jackson.`annotation`.JsonTypeInfo import com.fasterxml.jackson.databind.`annotation`.JsonDeserialize import com.fasterxml.jackson.databind.`annotation`.JsonPOJOBuilder +import com.netflix.graphql.dgs.codegen.cases.unionWithExtendedType.expected.Generated import java.lang.IllegalStateException import kotlin.String import kotlin.jvm.JvmName -import com.netflix.graphql.dgs.codegen.cases.unionWithExtendedType.expected.Generated as ExpectedGenerated -import jakarta.`annotation`.Generated as AnnotationGenerated -@AnnotationGenerated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) -@ExpectedGenerated +@Generated @JsonTypeInfo(use = JsonTypeInfo.Id.NONE) @JsonDeserialize(builder = Movie.Builder::class) public class Movie( @@ -24,15 +22,13 @@ public class Movie( public val title: String? get() = __title.invoke() - @AnnotationGenerated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) - @ExpectedGenerated + @Generated public companion object { private val titleDefault: () -> String? = { throw IllegalStateException("Field `title` was not requested") } } - @AnnotationGenerated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) - @ExpectedGenerated + @Generated @JsonPOJOBuilder @JsonIgnoreProperties("__typename") public class Builder { diff --git a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/unionWithExtendedType/expected/types/Query.kt b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/unionWithExtendedType/expected/types/Query.kt index 54125a817..2831e29c5 100644 --- a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/unionWithExtendedType/expected/types/Query.kt +++ b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/unionWithExtendedType/expected/types/Query.kt @@ -5,14 +5,12 @@ import com.fasterxml.jackson.`annotation`.JsonProperty import com.fasterxml.jackson.`annotation`.JsonTypeInfo import com.fasterxml.jackson.databind.`annotation`.JsonDeserialize import com.fasterxml.jackson.databind.`annotation`.JsonPOJOBuilder +import com.netflix.graphql.dgs.codegen.cases.unionWithExtendedType.expected.Generated import java.lang.IllegalStateException import kotlin.collections.List import kotlin.jvm.JvmName -import com.netflix.graphql.dgs.codegen.cases.unionWithExtendedType.expected.Generated as ExpectedGenerated -import jakarta.`annotation`.Generated as AnnotationGenerated -@AnnotationGenerated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) -@ExpectedGenerated +@Generated @JsonTypeInfo(use = JsonTypeInfo.Id.NONE) @JsonDeserialize(builder = Query.Builder::class) public class Query( @@ -24,15 +22,13 @@ public class Query( public val search: List? get() = __search.invoke() - @AnnotationGenerated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) - @ExpectedGenerated + @Generated public companion object { private val searchDefault: () -> List? = { throw IllegalStateException("Field `search` was not requested") } } - @AnnotationGenerated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) - @ExpectedGenerated + @Generated @JsonPOJOBuilder @JsonIgnoreProperties("__typename") public class Builder { diff --git a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/unionWithExtendedType/expected/types/Rating.kt b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/unionWithExtendedType/expected/types/Rating.kt index 0442002fa..5cb010ab6 100644 --- a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/unionWithExtendedType/expected/types/Rating.kt +++ b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/unionWithExtendedType/expected/types/Rating.kt @@ -5,14 +5,12 @@ import com.fasterxml.jackson.`annotation`.JsonProperty import com.fasterxml.jackson.`annotation`.JsonTypeInfo import com.fasterxml.jackson.databind.`annotation`.JsonDeserialize import com.fasterxml.jackson.databind.`annotation`.JsonPOJOBuilder +import com.netflix.graphql.dgs.codegen.cases.unionWithExtendedType.expected.Generated import java.lang.IllegalStateException import kotlin.Int import kotlin.jvm.JvmName -import com.netflix.graphql.dgs.codegen.cases.unionWithExtendedType.expected.Generated as ExpectedGenerated -import jakarta.`annotation`.Generated as AnnotationGenerated -@AnnotationGenerated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) -@ExpectedGenerated +@Generated @JsonTypeInfo(use = JsonTypeInfo.Id.NONE) @JsonDeserialize(builder = Rating.Builder::class) public class Rating( @@ -24,15 +22,13 @@ public class Rating( public val stars: Int? get() = __stars.invoke() - @AnnotationGenerated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) - @ExpectedGenerated + @Generated public companion object { private val starsDefault: () -> Int? = { throw IllegalStateException("Field `stars` was not requested") } } - @AnnotationGenerated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) - @ExpectedGenerated + @Generated @JsonPOJOBuilder @JsonIgnoreProperties("__typename") public class Builder { diff --git a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/unionWithExtendedType/expected/types/SearchResult.kt b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/unionWithExtendedType/expected/types/SearchResult.kt index 9dd4fc42a..5f5c51ac4 100644 --- a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/unionWithExtendedType/expected/types/SearchResult.kt +++ b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/unionWithExtendedType/expected/types/SearchResult.kt @@ -2,11 +2,9 @@ package com.netflix.graphql.dgs.codegen.cases.unionWithExtendedType.expected.typ import com.fasterxml.jackson.`annotation`.JsonSubTypes import com.fasterxml.jackson.`annotation`.JsonTypeInfo -import com.netflix.graphql.dgs.codegen.cases.unionWithExtendedType.expected.Generated as ExpectedGenerated -import jakarta.`annotation`.Generated as AnnotationGenerated +import com.netflix.graphql.dgs.codegen.cases.unionWithExtendedType.expected.Generated -@AnnotationGenerated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) -@ExpectedGenerated +@Generated @JsonTypeInfo( use = JsonTypeInfo.Id.NAME, include = JsonTypeInfo.As.PROPERTY, diff --git a/graphql-dgs-codegen-core/src/main/kotlin/com/netflix/graphql/dgs/codegen/CodeGen.kt b/graphql-dgs-codegen-core/src/main/kotlin/com/netflix/graphql/dgs/codegen/CodeGen.kt index e9eaffeb8..29e5739e0 100644 --- a/graphql-dgs-codegen-core/src/main/kotlin/com/netflix/graphql/dgs/codegen/CodeGen.kt +++ b/graphql-dgs-codegen-core/src/main/kotlin/com/netflix/graphql/dgs/codegen/CodeGen.kt @@ -346,7 +346,7 @@ class CodeGen( .fold(CodeGenResult.EMPTY) { result, next -> result.merge(next) } private fun generateJavaGeneratedAnnotation(config: CodeGenConfig): CodeGenResult = - if (config.addGeneratedAnnotation) { + if (config.addGeneratedAnnotation && config.generatedAnnotationType == null) { val retention = AnnotationSpec .builder(java.lang.annotation.Retention::class.java) @@ -467,7 +467,7 @@ class CodeGen( } private fun generateKotlinGeneratedAnnotation(config: CodeGenConfig): CodeGenResult = - if (config.addGeneratedAnnotation) { + if (config.addGeneratedAnnotation && config.generatedAnnotationType == null) { val generated = KTypeSpec .annotationBuilder(KClassName(config.packageName, "Generated")) @@ -579,6 +579,8 @@ class CodeGenConfig( var implementSerializable: Boolean = false, var addGeneratedAnnotation: Boolean = true, var disableDatesInGeneratedAnnotation: Boolean = true, + /** Fully-qualified class name of the @Generated annotation to apply to generated types. Default `.Generated`. */ + var generatedAnnotationType: String? = null, var addDeprecatedAnnotation: Boolean = false, var trackInputFieldSet: Boolean = false, var generateJSpecifyAnnotations: Boolean = false, diff --git a/graphql-dgs-codegen-core/src/main/kotlin/com/netflix/graphql/dgs/codegen/generators/java/JavaPoetUtils.kt b/graphql-dgs-codegen-core/src/main/kotlin/com/netflix/graphql/dgs/codegen/generators/java/JavaPoetUtils.kt index 83315bae2..2b5005438 100644 --- a/graphql-dgs-codegen-core/src/main/kotlin/com/netflix/graphql/dgs/codegen/generators/java/JavaPoetUtils.kt +++ b/graphql-dgs-codegen-core/src/main/kotlin/com/netflix/graphql/dgs/codegen/generators/java/JavaPoetUtils.kt @@ -22,9 +22,9 @@ import com.fasterxml.jackson.annotation.JsonSubTypes import com.fasterxml.jackson.annotation.JsonTypeInfo import com.netflix.graphql.dgs.codegen.CodeGen import com.netflix.graphql.dgs.codegen.CodeGenConfig +import com.netflix.graphql.dgs.codegen.generators.shared.JAKARTA_GENERATED_ANNOTATION import com.netflix.graphql.dgs.codegen.generators.shared.PackageParserUtil import com.netflix.graphql.dgs.codegen.generators.shared.ParserConstants -import com.netflix.graphql.dgs.codegen.generators.shared.generatedAnnotationClassName import com.netflix.graphql.dgs.codegen.generators.shared.generatedDate import com.palantir.javapoet.AnnotationSpec import com.palantir.javapoet.ClassName @@ -144,34 +144,36 @@ fun String.toTypeName(isGenericParam: Boolean = false): TypeName { private fun generatedAnnotation( packageName: String, generateDate: Boolean, -): List { - val graphqlGenerated = - AnnotationSpec + generatedAnnotationType: String?, +): AnnotationSpec { + if (generatedAnnotationType == null) { + return AnnotationSpec .builder(ClassName.get(packageName, "Generated")) .build() + } - return if (generatedAnnotationClassName == null) { - listOf(graphqlGenerated) - } else { - val generatedAnnotation = ClassName.bestGuess(generatedAnnotationClassName) - - var jakartaGeneratedBuilder = - AnnotationSpec - .builder(generatedAnnotation) - .addMember("value", "${'$'}S", CodeGen::class.qualifiedName!!) + val builder = AnnotationSpec.builder(ClassName.bestGuess(generatedAnnotationType)) + if (generatedAnnotationType == JAKARTA_GENERATED_ANNOTATION) { + builder.addMember("value", "${'$'}S", CodeGen::class.qualifiedName!!) if (generateDate) { - jakartaGeneratedBuilder = jakartaGeneratedBuilder.addMember("date", "${'$'}S", generatedDate) + builder.addMember("date", "${'$'}S", generatedDate) } - - listOf(jakartaGeneratedBuilder.build(), graphqlGenerated) } + + return builder.build() } fun TypeSpec.Builder.addOptionalGeneratedAnnotation(config: CodeGenConfig): TypeSpec.Builder = apply { if (config.addGeneratedAnnotation) { - generatedAnnotation(config.packageName, !config.disableDatesInGeneratedAnnotation).forEach { addAnnotation(it) } + addAnnotation( + generatedAnnotation( + config.packageName, + !config.disableDatesInGeneratedAnnotation, + config.generatedAnnotationType, + ), + ) } } diff --git a/graphql-dgs-codegen-core/src/main/kotlin/com/netflix/graphql/dgs/codegen/generators/kotlin/KotlinPoetUtils.kt b/graphql-dgs-codegen-core/src/main/kotlin/com/netflix/graphql/dgs/codegen/generators/kotlin/KotlinPoetUtils.kt index 0f285c4f3..febec82bb 100644 --- a/graphql-dgs-codegen-core/src/main/kotlin/com/netflix/graphql/dgs/codegen/generators/kotlin/KotlinPoetUtils.kt +++ b/graphql-dgs-codegen-core/src/main/kotlin/com/netflix/graphql/dgs/codegen/generators/kotlin/KotlinPoetUtils.kt @@ -27,9 +27,9 @@ import com.fasterxml.jackson.databind.annotation.JsonPOJOBuilder import com.netflix.graphql.dgs.codegen.CodeGen import com.netflix.graphql.dgs.codegen.CodeGenConfig import com.netflix.graphql.dgs.codegen.generators.shared.CodeGeneratorUtils.capitalized +import com.netflix.graphql.dgs.codegen.generators.shared.JAKARTA_GENERATED_ANNOTATION import com.netflix.graphql.dgs.codegen.generators.shared.PackageParserUtil import com.netflix.graphql.dgs.codegen.generators.shared.ParserConstants -import com.netflix.graphql.dgs.codegen.generators.shared.generatedAnnotationClassName import com.netflix.graphql.dgs.codegen.generators.shared.generatedDate import com.squareup.kotlinpoet.* import graphql.introspection.Introspection @@ -187,28 +187,24 @@ fun suppressInapplicableJvmNameAnnotation(): AnnotationSpec = private fun generatedAnnotation( packageName: String, generateDate: Boolean, -): List { - val graphqlGenerated = - AnnotationSpec + generatedAnnotationType: String?, +): AnnotationSpec { + if (generatedAnnotationType == null) { + return AnnotationSpec .builder(ClassName(packageName, "Generated")) .build() + } - return if (generatedAnnotationClassName == null) { - listOf(graphqlGenerated) - } else { - val generatedAnnotation = ClassName.bestGuess(generatedAnnotationClassName) - - val javaxGenerated = - AnnotationSpec - .builder(generatedAnnotation) - .addMember("value = [%S]", CodeGen::class.qualifiedName!!) + val builder = AnnotationSpec.builder(ClassName.bestGuess(generatedAnnotationType)) + if (generatedAnnotationType == JAKARTA_GENERATED_ANNOTATION) { + builder.addMember("value = [%S]", CodeGen::class.qualifiedName!!) if (generateDate) { - javaxGenerated.addMember("date = %S", generatedDate) + builder.addMember("date = %S", generatedDate) } - - listOf(javaxGenerated.build(), graphqlGenerated) } + + return builder.build() } /** @@ -468,8 +464,12 @@ fun TypeSpec.Builder.addEnumConstants(enumSpecs: Iterable): TypeSpec.B fun TypeSpec.Builder.addOptionalGeneratedAnnotation(config: CodeGenConfig): TypeSpec.Builder = apply { if (config.addGeneratedAnnotation) { - generatedAnnotation(config.packageName, !config.disableDatesInGeneratedAnnotation).forEach { - addAnnotation(it) - } + addAnnotation( + generatedAnnotation( + config.packageName, + !config.disableDatesInGeneratedAnnotation, + config.generatedAnnotationType, + ), + ) } } diff --git a/graphql-dgs-codegen-core/src/main/kotlin/com/netflix/graphql/dgs/codegen/generators/shared/SharedTypeUtils.kt b/graphql-dgs-codegen-core/src/main/kotlin/com/netflix/graphql/dgs/codegen/generators/shared/SharedTypeUtils.kt index 58812e9b7..8d09af1cc 100644 --- a/graphql-dgs-codegen-core/src/main/kotlin/com/netflix/graphql/dgs/codegen/generators/shared/SharedTypeUtils.kt +++ b/graphql-dgs-codegen-core/src/main/kotlin/com/netflix/graphql/dgs/codegen/generators/shared/SharedTypeUtils.kt @@ -176,9 +176,6 @@ internal fun findSchemaTypeMapping( return null } -internal val generatedAnnotationClassName: String? = - runCatching { - Class.forName("jakarta.annotation.Generated").canonicalName - }.getOrNull() - internal val generatedDate: String = Instant.now().toString() + +internal const val JAKARTA_GENERATED_ANNOTATION = "jakarta.annotation.Generated" diff --git a/graphql-dgs-codegen-core/src/test/kotlin/com/netflix/graphql/dgs/codegen/CodeGenTest.kt b/graphql-dgs-codegen-core/src/test/kotlin/com/netflix/graphql/dgs/codegen/CodeGenTest.kt index 83ea48d06..047ca1d76 100644 --- a/graphql-dgs-codegen-core/src/test/kotlin/com/netflix/graphql/dgs/codegen/CodeGenTest.kt +++ b/graphql-dgs-codegen-core/src/test/kotlin/com/netflix/graphql/dgs/codegen/CodeGenTest.kt @@ -19,7 +19,6 @@ package com.netflix.graphql.dgs.codegen import com.netflix.graphql.dgs.codegen.generators.java.disableJsonTypeInfoAnnotation -import com.netflix.graphql.dgs.codegen.generators.shared.generatedAnnotationClassName import com.palantir.javapoet.AnnotationSpec import com.palantir.javapoet.ClassName import com.palantir.javapoet.CodeBlock @@ -811,11 +810,10 @@ class CodeGenTest { | |import com.fasterxml.jackson.annotation.JsonSubTypes; |import com.fasterxml.jackson.annotation.JsonTypeInfo; - |import jakarta.annotation.Generated; + |import com.netflix.graphql.dgs.codegen.tests.generated.Generated; |import java.lang.String; | - |@Generated("com.netflix.graphql.dgs.codegen.CodeGen") - |@com.netflix.graphql.dgs.codegen.tests.generated.Generated + |@Generated |@JsonTypeInfo( | use = JsonTypeInfo.Id.NAME, | include = JsonTypeInfo.As.PROPERTY, @@ -884,11 +882,10 @@ class CodeGenTest { | |import com.fasterxml.jackson.annotation.JsonSubTypes; |import com.fasterxml.jackson.annotation.JsonTypeInfo; - |import jakarta.annotation.Generated; + |import com.netflix.graphql.dgs.codegen.tests.generated.Generated; |import java.lang.Boolean; | - |@Generated("com.netflix.graphql.dgs.codegen.CodeGen") - |@com.netflix.graphql.dgs.codegen.tests.generated.Generated + |@Generated |@JsonTypeInfo( | use = JsonTypeInfo.Id.NAME, | include = JsonTypeInfo.As.PROPERTY, @@ -966,12 +963,11 @@ class CodeGenTest { | |import com.fasterxml.jackson.annotation.JsonSubTypes; |import com.fasterxml.jackson.annotation.JsonTypeInfo; - |import jakarta.annotation.Generated; + |import com.netflix.graphql.dgs.codegen.tests.generated.Generated; |import java.lang.String; |import java.util.List; | - |@Generated("com.netflix.graphql.dgs.codegen.CodeGen") - |@com.netflix.graphql.dgs.codegen.tests.generated.Generated + |@Generated |@JsonTypeInfo( | use = JsonTypeInfo.Id.NAME, | include = JsonTypeInfo.As.PROPERTY, @@ -1044,11 +1040,10 @@ class CodeGenTest { | |import com.fasterxml.jackson.annotation.JsonSubTypes; |import com.fasterxml.jackson.annotation.JsonTypeInfo; - |import jakarta.annotation.Generated; + |import com.netflix.graphql.dgs.codegen.tests.generated.Generated; |import java.lang.String; | - |@Generated("com.netflix.graphql.dgs.codegen.CodeGen") - |@com.netflix.graphql.dgs.codegen.tests.generated.Generated + |@Generated |@JsonTypeInfo( | use = JsonTypeInfo.Id.NAME, | include = JsonTypeInfo.As.PROPERTY, @@ -1115,11 +1110,10 @@ class CodeGenTest { | |import com.fasterxml.jackson.annotation.JsonSubTypes; |import com.fasterxml.jackson.annotation.JsonTypeInfo; - |import jakarta.annotation.Generated; + |import com.netflix.graphql.dgs.codegen.tests.generated.Generated; |import java.lang.String; | - |@Generated("com.netflix.graphql.dgs.codegen.CodeGen") - |@com.netflix.graphql.dgs.codegen.tests.generated.Generated + |@Generated |@JsonTypeInfo( | use = JsonTypeInfo.Id.NAME, | include = JsonTypeInfo.As.PROPERTY, @@ -1417,11 +1411,10 @@ class CodeGenTest { """ package com.netflix.graphql.dgs.codegen.tests.generated.types; - import jakarta.annotation.Generated; + import com.netflix.graphql.dgs.codegen.tests.generated.Generated; import java.lang.Deprecated; - @Generated("com.netflix.graphql.dgs.codegen.CodeGen") - @com.netflix.graphql.dgs.codegen.tests.generated.Generated + @Generated public enum EmployeeTypes { /** * chatGPT does the engineering now @@ -1464,10 +1457,9 @@ class CodeGenTest { """ |package com.netflix.graphql.dgs.codegen.tests.generated.types; | - |import jakarta.annotation.Generated; + |import com.netflix.graphql.dgs.codegen.tests.generated.Generated; | - |@Generated("com.netflix.graphql.dgs.codegen.CodeGen") - |@com.netflix.graphql.dgs.codegen.tests.generated.Generated + |@Generated |public enum SomeEnum { | @ValidName | ENUM_VALUE @@ -1770,12 +1762,11 @@ class CodeGenTest { | |import com.fasterxml.jackson.annotation.JsonSubTypes; |import com.fasterxml.jackson.annotation.JsonTypeInfo; - |import jakarta.annotation.Generated; + |import com.netflix.graphql.dgs.codegen.tests.generated.Generated; |import java.lang.String; |import mypackage.Cat; | - |@Generated("com.netflix.graphql.dgs.codegen.CodeGen") - |@com.netflix.graphql.dgs.codegen.tests.generated.Generated + |@Generated |@JsonTypeInfo( | use = JsonTypeInfo.Id.NAME, | include = JsonTypeInfo.As.PROPERTY, @@ -2778,10 +2769,9 @@ class CodeGenTest { | |import com.fasterxml.jackson.annotation.JsonSubTypes; |import com.fasterxml.jackson.annotation.JsonTypeInfo; - |import jakarta.annotation.Generated; + |import com.netflix.graphql.dgs.codegen.tests.generated.Generated; | - |@Generated("com.netflix.graphql.dgs.codegen.CodeGen") - |@com.netflix.graphql.dgs.codegen.tests.generated.Generated + |@Generated |@JsonTypeInfo( | use = JsonTypeInfo.Id.NAME, | include = JsonTypeInfo.As.PROPERTY, @@ -3111,11 +3101,10 @@ class CodeGenTest { """ |package com.netflix.graphql.dgs.codegen.tests.generated.types; | - |import jakarta.annotation.Generated; + |import com.netflix.graphql.dgs.codegen.tests.generated.Generated; |import java.lang.String; | - |@Generated("com.netflix.graphql.dgs.codegen.CodeGen") - |@com.netflix.graphql.dgs.codegen.tests.generated.Generated + |@Generated |public interface Person { | String getFirstname(); | @@ -3136,11 +3125,10 @@ class CodeGenTest { | |import com.fasterxml.jackson.annotation.JsonSubTypes; |import com.fasterxml.jackson.annotation.JsonTypeInfo; - |import jakarta.annotation.Generated; + |import com.netflix.graphql.dgs.codegen.tests.generated.Generated; |import java.lang.String; | - |@Generated("com.netflix.graphql.dgs.codegen.CodeGen") - |@com.netflix.graphql.dgs.codegen.tests.generated.Generated + |@Generated |@JsonTypeInfo( | use = JsonTypeInfo.Id.NAME, | include = JsonTypeInfo.As.PROPERTY, @@ -3169,14 +3157,13 @@ class CodeGenTest { |package com.netflix.graphql.dgs.codegen.tests.generated.types; | |import com.fasterxml.jackson.annotation.JsonTypeInfo; - |import jakarta.annotation.Generated; + |import com.netflix.graphql.dgs.codegen.tests.generated.Generated; |import java.lang.Object; |import java.lang.Override; |import java.lang.String; |import java.util.Objects; | - |@Generated("com.netflix.graphql.dgs.codegen.CodeGen") - |@com.netflix.graphql.dgs.codegen.tests.generated.Generated + |@Generated |@JsonTypeInfo( | use = JsonTypeInfo.Id.NONE |) @@ -3256,8 +3243,7 @@ class CodeGenTest { | return new Builder(); | } | - | @Generated("com.netflix.graphql.dgs.codegen.CodeGen") - | @com.netflix.graphql.dgs.codegen.tests.generated.Generated + | @Generated | public static class Builder { | private String firstname; | @@ -3351,12 +3337,11 @@ class CodeGenTest { """ |package com.netflix.graphql.dgs.codegen.tests.generated.types; | - |import jakarta.annotation.Generated; + |import com.netflix.graphql.dgs.codegen.tests.generated.Generated; |import java.lang.Integer; |import java.lang.String; | - |@Generated("com.netflix.graphql.dgs.codegen.CodeGen") - |@com.netflix.graphql.dgs.codegen.tests.generated.Generated + |@Generated |public interface Person { | String getName(); | @@ -3377,12 +3362,11 @@ class CodeGenTest { | |import com.fasterxml.jackson.annotation.JsonSubTypes; |import com.fasterxml.jackson.annotation.JsonTypeInfo; - |import jakarta.annotation.Generated; + |import com.netflix.graphql.dgs.codegen.tests.generated.Generated; |import java.lang.Integer; |import java.lang.String; | - |@Generated("com.netflix.graphql.dgs.codegen.CodeGen") - |@com.netflix.graphql.dgs.codegen.tests.generated.Generated + |@Generated |@JsonTypeInfo( | use = JsonTypeInfo.Id.NAME, | include = JsonTypeInfo.As.PROPERTY, @@ -3453,13 +3437,12 @@ class CodeGenTest { """ |package com.netflix.graphql.dgs.codegen.tests.generated.types; | - |import jakarta.annotation.Generated; + |import com.netflix.graphql.dgs.codegen.tests.generated.Generated; |import java.lang.Integer; |import java.lang.String; |import java.util.List; | - |@Generated("com.netflix.graphql.dgs.codegen.CodeGen") - |@com.netflix.graphql.dgs.codegen.tests.generated.Generated + |@Generated |public interface Person { | String getName(); | @@ -3488,13 +3471,12 @@ class CodeGenTest { | |import com.fasterxml.jackson.annotation.JsonSubTypes; |import com.fasterxml.jackson.annotation.JsonTypeInfo; - |import jakarta.annotation.Generated; + |import com.netflix.graphql.dgs.codegen.tests.generated.Generated; |import java.lang.Integer; |import java.lang.String; |import java.util.List; | - |@Generated("com.netflix.graphql.dgs.codegen.CodeGen") - |@com.netflix.graphql.dgs.codegen.tests.generated.Generated + |@Generated |@JsonTypeInfo( | use = JsonTypeInfo.Id.NAME, | include = JsonTypeInfo.As.PROPERTY, @@ -3557,11 +3539,10 @@ class CodeGenTest { """ |package com.netflix.graphql.dgs.codegen.tests.generated.types; | - |import jakarta.annotation.Generated; + |import com.netflix.graphql.dgs.codegen.tests.generated.Generated; |import java.lang.String; | - |@Generated("com.netflix.graphql.dgs.codegen.CodeGen") - |@com.netflix.graphql.dgs.codegen.tests.generated.Generated + |@Generated |public interface Person { | String getFirstname(); | @@ -3788,11 +3769,10 @@ class CodeGenTest { | |import com.fasterxml.jackson.annotation.JsonSubTypes; |import com.fasterxml.jackson.annotation.JsonTypeInfo; - |import jakarta.annotation.Generated; + |import com.netflix.graphql.dgs.codegen.tests.generated.Generated; |import java.lang.String; | - |@Generated("com.netflix.graphql.dgs.codegen.CodeGen") - |@com.netflix.graphql.dgs.codegen.tests.generated.Generated + |@Generated |@JsonTypeInfo( | use = JsonTypeInfo.Id.NAME, | include = JsonTypeInfo.As.PROPERTY, @@ -3966,12 +3946,11 @@ class CodeGenTest { | |import com.fasterxml.jackson.annotation.JsonSubTypes; |import com.fasterxml.jackson.annotation.JsonTypeInfo; - |import jakarta.annotation.Generated; + |import com.netflix.graphql.dgs.codegen.tests.generated.Generated; |import java.lang.String; |import java.util.List; | - |@Generated("com.netflix.graphql.dgs.codegen.CodeGen") - |@com.netflix.graphql.dgs.codegen.tests.generated.Generated + |@Generated |@JsonTypeInfo( | use = JsonTypeInfo.Id.NAME, | include = JsonTypeInfo.As.PROPERTY, @@ -4041,13 +4020,12 @@ class CodeGenTest { """ |package com.netflix.graphql.dgs.codegen.tests.generated.types; | - |import jakarta.annotation.Generated; + |import com.netflix.graphql.dgs.codegen.tests.generated.Generated; |import java.lang.Integer; |import java.lang.String; |import java.util.List; | - |@Generated("com.netflix.graphql.dgs.codegen.CodeGen") - |@com.netflix.graphql.dgs.codegen.tests.generated.Generated + |@Generated |public interface Person { | String getName(); | @@ -4068,13 +4046,12 @@ class CodeGenTest { | |import com.fasterxml.jackson.annotation.JsonSubTypes; |import com.fasterxml.jackson.annotation.JsonTypeInfo; - |import jakarta.annotation.Generated; + |import com.netflix.graphql.dgs.codegen.tests.generated.Generated; |import java.lang.Integer; |import java.lang.String; |import java.util.List; | - |@Generated("com.netflix.graphql.dgs.codegen.CodeGen") - |@com.netflix.graphql.dgs.codegen.tests.generated.Generated + |@Generated |@JsonTypeInfo( | use = JsonTypeInfo.Id.NAME, | include = JsonTypeInfo.As.PROPERTY, @@ -4892,33 +4869,8 @@ It takes a title and such. } @Test - fun generateSourceWithGeneratedAnnotation() { - val schema = - """ - type Query { - employees(filter:EmployeeFilterInput) : [Person] - } - - interface Person { - firstname: String - lastname: String - } - - type Employee implements Person { - firstname: String - lastname: String - company: String - } - enum EmployeeTypes { - ENGINEER - MANAGER - DIRECTOR - } - - input EmployeeFilterInput { - rank: String - } - """.trimIndent() + fun generateSourceWithDefaultGeneratedAnnotation() { + val schema = generatedAnnotationTestSchema val codeGenResult = CodeGen( @@ -4926,8 +4878,6 @@ It takes a title and such. schemas = setOf(schema), packageName = BASE_PACKAGE_NAME, language = Language.JAVA, - addGeneratedAnnotation = true, - disableDatesInGeneratedAnnotation = false, generateClientApi = true, ), ).generate() @@ -4937,40 +4887,40 @@ It takes a title and such. .javaSources() .partition { it.typeSpec().name() == "Generated" && it.typeSpec().kind() == TypeSpec.Kind.ANNOTATION } - allSources.assertJavaGeneratedAnnotation(true) + allSources.assertJavaGeneratedAnnotation() assertThat(generatedAnnotationFile.single().toString()) .contains("java.lang.annotation.Retention", "RetentionPolicy.CLASS") assertCompilesJava(codeGenResult) } @Test - fun generateSourceWithGeneratedAnnotationWithoutDate() { - val schema = - """ - type Query { - employees(filter:EmployeeFilterInput) : [Person] - } + fun generateSourceWithJakartaGeneratedAnnotationWithDate() { + val schema = generatedAnnotationTestSchema - interface Person { - firstname: String - lastname: String - } + val codeGenResult = + CodeGen( + CodeGenConfig( + schemas = setOf(schema), + packageName = BASE_PACKAGE_NAME, + language = Language.JAVA, + addGeneratedAnnotation = true, + disableDatesInGeneratedAnnotation = false, + generatedAnnotationType = "jakarta.annotation.Generated", + generateClientApi = true, + ), + ).generate() - type Employee implements Person { - firstname: String - lastname: String - company: String - } - enum EmployeeTypes { - ENGINEER - MANAGER - DIRECTOR - } - - input EmployeeFilterInput { - rank: String - } - """.trimIndent() + assertThat(codeGenResult.javaSources()) + .noneMatch { it.typeSpec().name() == "Generated" && it.typeSpec().kind() == TypeSpec.Kind.ANNOTATION } + + codeGenResult + .javaSources() + .assertJavaGeneratedAnnotation("jakarta.annotation.Generated", shouldHaveDate = true) + } + + @Test + fun generateSourceWithJakartaGeneratedAnnotationWithoutDate() { + val schema = generatedAnnotationTestSchema val codeGenResult = CodeGen( @@ -4980,49 +4930,22 @@ It takes a title and such. language = Language.JAVA, addGeneratedAnnotation = true, disableDatesInGeneratedAnnotation = true, + generatedAnnotationType = "jakarta.annotation.Generated", generateClientApi = true, ), ).generate() - val (generatedAnnotationFile, allSources) = - codeGenResult - .javaSources() - .partition { it.typeSpec().name() == "Generated" && it.typeSpec().kind() == TypeSpec.Kind.ANNOTATION } + assertThat(codeGenResult.javaSources()) + .noneMatch { it.typeSpec().name() == "Generated" && it.typeSpec().kind() == TypeSpec.Kind.ANNOTATION } - allSources.assertJavaGeneratedAnnotation(false) - assertThat(generatedAnnotationFile.single().toString()) - .contains("java.lang.annotation.Retention", "RetentionPolicy.CLASS") - assertCompilesJava(codeGenResult) + codeGenResult + .javaSources() + .assertJavaGeneratedAnnotation("jakarta.annotation.Generated", shouldHaveDate = false) } @Test fun generateSourceWithoutGeneratedAnnotation() { - val schema = - """ - type Query { - employees(filter:EmployeeFilterInput) : [Person] - } - - interface Person { - firstname: String - lastname: String - } - - type Employee implements Person { - firstname: String - lastname: String - company: String - } - enum EmployeeTypes { - ENGINEER - MANAGER - DIRECTOR - } - - input EmployeeFilterInput { - rank: String - } - """.trimIndent() + val schema = generatedAnnotationTestSchema val codeGenResult = CodeGen( @@ -5041,12 +4964,39 @@ It takes a title and such. codeGenResult.javaSources().forEach { file -> assertThat(file.typeSpec().annotations().map { it.canonicalName() }) .`as`("no @Generated annotation on %s", file.typeSpec()) - .doesNotContain("$BASE_PACKAGE_NAME.Generated", generatedAnnotationClassName) + .doesNotContain("$BASE_PACKAGE_NAME.Generated", "jakarta.annotation.Generated") } assertCompilesJava(codeGenResult) } + private val generatedAnnotationTestSchema = + """ + type Query { + employees(filter:EmployeeFilterInput) : [Person] + } + + interface Person { + firstname: String + lastname: String + } + + type Employee implements Person { + firstname: String + lastname: String + company: String + } + enum EmployeeTypes { + ENGINEER + MANAGER + DIRECTOR + } + + input EmployeeFilterInput { + rank: String + } + """.trimIndent() + @Test fun deprecateAnnotation() { val schema = diff --git a/graphql-dgs-codegen-core/src/test/kotlin/com/netflix/graphql/dgs/codegen/Kotlin2CodeGenTest.kt b/graphql-dgs-codegen-core/src/test/kotlin/com/netflix/graphql/dgs/codegen/Kotlin2CodeGenTest.kt index 8a9806736..bb583e56e 100644 --- a/graphql-dgs-codegen-core/src/test/kotlin/com/netflix/graphql/dgs/codegen/Kotlin2CodeGenTest.kt +++ b/graphql-dgs-codegen-core/src/test/kotlin/com/netflix/graphql/dgs/codegen/Kotlin2CodeGenTest.kt @@ -85,21 +85,17 @@ class Kotlin2CodeGenTest { """ |package com.netflix.graphql.dgs.codegen.tests.generated.enums | + |import com.netflix.graphql.dgs.codegen.tests.generated.Generated |import kotlin.Deprecated - |import com.netflix.graphql.dgs.codegen.tests.generated.Generated as GeneratedGenerated - |import jakarta.`annotation`.Generated as AnnotationGenerated | - |@AnnotationGenerated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) - |@GeneratedGenerated + |@Generated |public enum class TownJobTypes { - | @AnnotationGenerated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) - | @GeneratedGenerated + | @Generated | @Deprecated(message = "town switched to electric lights") | LAMPLIGHTER, | ; | - | @AnnotationGenerated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) - | @GeneratedGenerated + | @Generated | public companion object |} | @@ -134,19 +130,16 @@ class Kotlin2CodeGenTest { """ |package com.netflix.graphql.dgs.codegen.tests.generated.enums | - |import com.netflix.graphql.dgs.codegen.tests.generated.Generated as GeneratedGenerated - |import jakarta.`annotation`.Generated as AnnotationGenerated + |import com.netflix.graphql.dgs.codegen.tests.generated.Generated | - |@AnnotationGenerated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) - |@GeneratedGenerated + |@Generated |public enum class MyEnum { | A, | B, | C, | ; | - | @AnnotationGenerated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) - | @GeneratedGenerated + | @Generated | public companion object |} | diff --git a/graphql-dgs-codegen-core/src/test/kotlin/com/netflix/graphql/dgs/codegen/KotlinCodeGenTest.kt b/graphql-dgs-codegen-core/src/test/kotlin/com/netflix/graphql/dgs/codegen/KotlinCodeGenTest.kt index 5400d8eb2..4dd5864ff 100644 --- a/graphql-dgs-codegen-core/src/test/kotlin/com/netflix/graphql/dgs/codegen/KotlinCodeGenTest.kt +++ b/graphql-dgs-codegen-core/src/test/kotlin/com/netflix/graphql/dgs/codegen/KotlinCodeGenTest.kt @@ -18,7 +18,6 @@ package com.netflix.graphql.dgs.codegen -import com.netflix.graphql.dgs.codegen.generators.shared.generatedAnnotationClassName import com.squareup.kotlinpoet.* import com.squareup.kotlinpoet.ParameterizedTypeName.Companion.parameterizedBy import org.assertj.core.api.Assertions.assertThat @@ -679,12 +678,10 @@ class KotlinCodeGenTest { | |import com.fasterxml.jackson.`annotation`.JsonSubTypes |import com.fasterxml.jackson.`annotation`.JsonTypeInfo + |import com.netflix.graphql.dgs.codegen.tests.generated.Generated |import kotlin.String - |import com.netflix.graphql.dgs.codegen.tests.generated.Generated as GeneratedGenerated - |import jakarta.`annotation`.Generated as AnnotationGenerated | - |@AnnotationGenerated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) - |@GeneratedGenerated + |@Generated |@JsonTypeInfo( | use = JsonTypeInfo.Id.NAME, | include = JsonTypeInfo.As.PROPERTY, @@ -698,8 +695,7 @@ class KotlinCodeGenTest { | | public val lastname: String? | - | @AnnotationGenerated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) - | @GeneratedGenerated + | @Generated | public companion object |} | @@ -712,12 +708,10 @@ class KotlinCodeGenTest { | |import com.fasterxml.jackson.`annotation`.JsonProperty |import com.fasterxml.jackson.`annotation`.JsonTypeInfo + |import com.netflix.graphql.dgs.codegen.tests.generated.Generated |import kotlin.String - |import com.netflix.graphql.dgs.codegen.tests.generated.Generated as GeneratedGenerated - |import jakarta.`annotation`.Generated as AnnotationGenerated | - |@AnnotationGenerated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) - |@GeneratedGenerated + |@Generated |@JsonTypeInfo(use = JsonTypeInfo.Id.NONE) |public data class Employee( | @JsonProperty("firstname") @@ -727,8 +721,7 @@ class KotlinCodeGenTest { | @JsonProperty("company") | public val company: String? = null, |) : Person { - | @AnnotationGenerated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) - | @GeneratedGenerated + | @Generated | public companion object |} | @@ -1142,19 +1135,16 @@ class KotlinCodeGenTest { """ |package com.netflix.graphql.dgs.codegen.tests.generated.enums | + |import com.netflix.graphql.dgs.codegen.tests.generated.Generated |import kotlin.Deprecated - |import com.netflix.graphql.dgs.codegen.tests.generated.Generated as GeneratedGenerated - |import jakarta.`annotation`.Generated as AnnotationGenerated | - |@AnnotationGenerated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) - |@GeneratedGenerated + |@Generated |public enum class TownJobTypes { | @Deprecated(message = "town switched to electric lights") | LAMPLIGHTER, | ; | - | @AnnotationGenerated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) - | @GeneratedGenerated + | @Generated | public companion object |} | @@ -1188,18 +1178,15 @@ class KotlinCodeGenTest { |package com.netflix.graphql.dgs.codegen.tests.generated.enums | |import ValidName - |import com.netflix.graphql.dgs.codegen.tests.generated.Generated as GeneratedGenerated - |import jakarta.`annotation`.Generated as AnnotationGenerated + |import com.netflix.graphql.dgs.codegen.tests.generated.Generated | - |@AnnotationGenerated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) - |@GeneratedGenerated + |@Generated |public enum class SomeEnum { | @ValidName | ENUM_VALUE, | ; | - | @AnnotationGenerated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) - | @GeneratedGenerated + | @Generated | public companion object |} | @@ -1316,13 +1303,11 @@ class KotlinCodeGenTest { | |import com.fasterxml.jackson.`annotation`.JsonSubTypes |import com.fasterxml.jackson.`annotation`.JsonTypeInfo + |import com.netflix.graphql.dgs.codegen.tests.generated.Generated |import kotlin.String |import mypackage.Cat - |import com.netflix.graphql.dgs.codegen.tests.generated.Generated as GeneratedGenerated - |import jakarta.`annotation`.Generated as AnnotationGenerated | - |@AnnotationGenerated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) - |@GeneratedGenerated + |@Generated |@JsonTypeInfo( | use = JsonTypeInfo.Id.NAME, | include = JsonTypeInfo.As.PROPERTY, @@ -1335,8 +1320,7 @@ class KotlinCodeGenTest { |public interface Pet { | public val name: String | - | @AnnotationGenerated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) - | @GeneratedGenerated + | @Generated | public companion object |} | @@ -1378,12 +1362,10 @@ class KotlinCodeGenTest { | |import com.fasterxml.jackson.`annotation`.JsonSubTypes |import com.fasterxml.jackson.`annotation`.JsonTypeInfo + |import com.netflix.graphql.dgs.codegen.tests.generated.Generated |import mypackage.Cat - |import com.netflix.graphql.dgs.codegen.tests.generated.Generated as GeneratedGenerated - |import jakarta.`annotation`.Generated as AnnotationGenerated | - |@AnnotationGenerated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) - |@GeneratedGenerated + |@Generated |@JsonTypeInfo( | use = JsonTypeInfo.Id.NAME, | include = JsonTypeInfo.As.PROPERTY, @@ -1394,8 +1376,7 @@ class KotlinCodeGenTest { | JsonSubTypes.Type(value = Dog::class, name = "Dog") |]) |public interface Pet { - | @AnnotationGenerated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) - | @GeneratedGenerated + | @Generated | public companion object |} | @@ -2481,11 +2462,9 @@ class KotlinCodeGenTest { | |import com.fasterxml.jackson.`annotation`.JsonSubTypes |import com.fasterxml.jackson.`annotation`.JsonTypeInfo - |import com.netflix.graphql.dgs.codegen.tests.generated.Generated as GeneratedGenerated - |import jakarta.`annotation`.Generated as AnnotationGenerated + |import com.netflix.graphql.dgs.codegen.tests.generated.Generated | - |@AnnotationGenerated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) - |@GeneratedGenerated + |@Generated |@JsonTypeInfo( | use = JsonTypeInfo.Id.NAME, | include = JsonTypeInfo.As.PROPERTY, @@ -2497,8 +2476,7 @@ class KotlinCodeGenTest { | JsonSubTypes.Type(value = Rating::class, name = "Rating") |]) |public interface SearchResult { - | @AnnotationGenerated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) - | @GeneratedGenerated + | @Generated | public companion object |} | @@ -3759,19 +3737,16 @@ class KotlinCodeGenTest { """ |package com.netflix.graphql.dgs.codegen.tests.generated.types | + |import com.netflix.graphql.dgs.codegen.tests.generated.Generated |import kotlin.String - |import com.netflix.graphql.dgs.codegen.tests.generated.Generated as GeneratedGenerated - |import jakarta.`annotation`.Generated as AnnotationGenerated | - |@AnnotationGenerated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) - |@GeneratedGenerated + |@Generated |public interface Person { | public val firstname: String? | | public val lastname: String? | - | @AnnotationGenerated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) - | @GeneratedGenerated + | @Generated | public companion object |} | @@ -3785,12 +3760,10 @@ class KotlinCodeGenTest { | |import com.fasterxml.jackson.`annotation`.JsonSubTypes |import com.fasterxml.jackson.`annotation`.JsonTypeInfo + |import com.netflix.graphql.dgs.codegen.tests.generated.Generated |import kotlin.String - |import com.netflix.graphql.dgs.codegen.tests.generated.Generated as GeneratedGenerated - |import jakarta.`annotation`.Generated as AnnotationGenerated | - |@AnnotationGenerated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) - |@GeneratedGenerated + |@Generated |@JsonTypeInfo( | use = JsonTypeInfo.Id.NAME, | include = JsonTypeInfo.As.PROPERTY, @@ -3806,8 +3779,7 @@ class KotlinCodeGenTest { | | public val company: String? | - | @AnnotationGenerated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) - | @GeneratedGenerated + | @Generated | public companion object |} | @@ -3820,12 +3792,10 @@ class KotlinCodeGenTest { | |import com.fasterxml.jackson.`annotation`.JsonProperty |import com.fasterxml.jackson.`annotation`.JsonTypeInfo + |import com.netflix.graphql.dgs.codegen.tests.generated.Generated |import kotlin.String - |import com.netflix.graphql.dgs.codegen.tests.generated.Generated as GeneratedGenerated - |import jakarta.`annotation`.Generated as AnnotationGenerated | - |@AnnotationGenerated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) - |@GeneratedGenerated + |@Generated |@JsonTypeInfo(use = JsonTypeInfo.Id.NONE) |public data class Talent( | @JsonProperty("firstname") @@ -3837,8 +3807,7 @@ class KotlinCodeGenTest { | @JsonProperty("imdbProfile") | public val imdbProfile: String? = null, |) : Employee { - | @AnnotationGenerated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) - | @GeneratedGenerated + | @Generated | public companion object |} | @@ -3897,13 +3866,11 @@ class KotlinCodeGenTest { | |import com.fasterxml.jackson.`annotation`.JsonSubTypes |import com.fasterxml.jackson.`annotation`.JsonTypeInfo + |import com.netflix.graphql.dgs.codegen.tests.generated.Generated |import kotlin.String |import kotlin.collections.List - |import com.netflix.graphql.dgs.codegen.tests.generated.Generated as GeneratedGenerated - |import jakarta.`annotation`.Generated as AnnotationGenerated | - |@AnnotationGenerated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) - |@GeneratedGenerated + |@Generated |@JsonTypeInfo( | use = JsonTypeInfo.Id.NAME, | include = JsonTypeInfo.As.PROPERTY, @@ -3926,8 +3893,7 @@ class KotlinCodeGenTest { | | public val parents: List? | - | @AnnotationGenerated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) - | @GeneratedGenerated + | @Generated | public companion object |} | @@ -3979,12 +3945,10 @@ class KotlinCodeGenTest { | |import com.fasterxml.jackson.`annotation`.JsonSubTypes |import com.fasterxml.jackson.`annotation`.JsonTypeInfo + |import com.netflix.graphql.dgs.codegen.tests.generated.Generated |import kotlin.String - |import com.netflix.graphql.dgs.codegen.tests.generated.Generated as GeneratedGenerated - |import jakarta.`annotation`.Generated as AnnotationGenerated | - |@AnnotationGenerated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) - |@GeneratedGenerated + |@Generated |@JsonTypeInfo( | use = JsonTypeInfo.Id.NAME, | include = JsonTypeInfo.As.PROPERTY, @@ -3998,8 +3962,7 @@ class KotlinCodeGenTest { | | public val diet: Diet? | - | @AnnotationGenerated(value = ["com.netflix.graphql.dgs.codegen.CodeGen"]) - | @GeneratedGenerated + | @Generated | public companion object |} | @@ -4428,33 +4391,8 @@ It takes a title and such. } @Test - fun generateSourceWithGeneratedAnnotation() { - val schema = - """ - type Query { - employees(filter:EmployeeFilterInput) : [Person] - } - - interface Person { - firstname: String - lastname: String - } - - type Employee implements Person { - firstname: String - lastname: String - company: String - } - enum EmployeeTypes { - ENGINEER - MANAGER - DIRECTOR - } - - input EmployeeFilterInput { - rank: String - } - """.trimIndent() + fun generateSourceWithDefaultGeneratedAnnotation() { + val schema = generatedAnnotationTestSchema val codeGenResult = CodeGen( @@ -4462,8 +4400,6 @@ It takes a title and such. schemas = setOf(schema), packageName = BASE_PACKAGE_NAME, language = Language.KOTLIN, - addGeneratedAnnotation = true, - disableDatesInGeneratedAnnotation = false, generateClientApi = true, ), ).generate() @@ -4473,8 +4409,8 @@ It takes a title and such. .kotlinSources() .partition { it.name == "Generated" } - allKotlinSources.assertKotlinGeneratedAnnotation(shouldHaveDate = true) - codeGenResult.javaSources().assertJavaGeneratedAnnotation(shouldHaveDate = true) + allKotlinSources.assertKotlinGeneratedAnnotation() + codeGenResult.javaSources().assertJavaGeneratedAnnotation() assertThat(generatedAnnotationFile.single().toString()) .contains("@Retention(value = AnnotationRetention.BINARY)") @@ -4483,33 +4419,36 @@ It takes a title and such. } @Test - fun generateSourceWithGeneratedAnnotationWithoutDate() { - val schema = - """ - type Query { - employees(filter:EmployeeFilterInput) : [Person] - } + fun generateSourceWithJakartaGeneratedAnnotationWithDate() { + val schema = generatedAnnotationTestSchema - interface Person { - firstname: String - lastname: String - } + val codeGenResult = + CodeGen( + CodeGenConfig( + schemas = setOf(schema), + packageName = BASE_PACKAGE_NAME, + language = Language.KOTLIN, + addGeneratedAnnotation = true, + disableDatesInGeneratedAnnotation = false, + generatedAnnotationType = "jakarta.annotation.Generated", + generateClientApi = true, + ), + ).generate() - type Employee implements Person { - firstname: String - lastname: String - company: String - } - enum EmployeeTypes { - ENGINEER - MANAGER - DIRECTOR - } - - input EmployeeFilterInput { - rank: String - } - """.trimIndent() + assertThat(codeGenResult.kotlinSources()).noneMatch { it.name == "Generated" } + assertThat(codeGenResult.javaSources()).noneMatch { it.typeSpec().name() == "Generated" } + + codeGenResult + .kotlinSources() + .assertKotlinGeneratedAnnotation("jakarta.annotation.Generated", shouldHaveDate = true) + codeGenResult + .javaSources() + .assertJavaGeneratedAnnotation("jakarta.annotation.Generated", shouldHaveDate = true) + } + + @Test + fun generateSourceWithJakartaGeneratedAnnotationWithoutDate() { + val schema = generatedAnnotationTestSchema val codeGenResult = CodeGen( @@ -4519,52 +4458,25 @@ It takes a title and such. language = Language.KOTLIN, addGeneratedAnnotation = true, disableDatesInGeneratedAnnotation = true, + generatedAnnotationType = "jakarta.annotation.Generated", generateClientApi = true, ), ).generate() - val (generatedAnnotationFile, allKotlinSources) = - codeGenResult - .kotlinSources() - .partition { it.name == "Generated" } - - allKotlinSources.assertKotlinGeneratedAnnotation(shouldHaveDate = false) - codeGenResult.javaSources().assertJavaGeneratedAnnotation(shouldHaveDate = false) - - assertThat(generatedAnnotationFile.single().toString()) - .contains("@Retention(value = AnnotationRetention.BINARY)") + assertThat(codeGenResult.kotlinSources()).noneMatch { it.name == "Generated" } + assertThat(codeGenResult.javaSources()).noneMatch { it.typeSpec().name() == "Generated" } - assertCompilesKotlin(codeGenResult) + codeGenResult + .kotlinSources() + .assertKotlinGeneratedAnnotation("jakarta.annotation.Generated", shouldHaveDate = false) + codeGenResult + .javaSources() + .assertJavaGeneratedAnnotation("jakarta.annotation.Generated", shouldHaveDate = false) } @Test fun generateSourceWithoutGeneratedAnnotation() { - val schema = - """ - type Query { - employees(filter:EmployeeFilterInput) : [Person] - } - - interface Person { - firstname: String - lastname: String - } - - type Employee implements Person { - firstname: String - lastname: String - company: String - } - enum EmployeeTypes { - ENGINEER - MANAGER - DIRECTOR - } - - input EmployeeFilterInput { - rank: String - } - """.trimIndent() + val schema = generatedAnnotationTestSchema val codeGenResult = CodeGen( @@ -4584,13 +4496,13 @@ It takes a title and such. file.members.filterIsInstance(TypeSpec::class.java).forEach { type -> assertThat(type.annotations.map { it.canonicalName() }) .`as`("no @Generated annotation on %s at %s", type, file) - .doesNotContain("$BASE_PACKAGE_NAME.Generated", generatedAnnotationClassName) + .doesNotContain("$BASE_PACKAGE_NAME.Generated", "jakarta.annotation.Generated") } } codeGenResult.javaSources().forEach { file -> assertThat(file.typeSpec().annotations().map { it.canonicalName() }) .`as`("no @Generated annotation on %s", file.typeSpec()) - .doesNotContain("$BASE_PACKAGE_NAME.Generated", generatedAnnotationClassName) + .doesNotContain("$BASE_PACKAGE_NAME.Generated", "jakarta.annotation.Generated") } assertCompilesKotlin(codeGenResult) @@ -5354,4 +5266,31 @@ It takes a title and such. assertCompilesKotlin(generatedResult) } + + private val generatedAnnotationTestSchema = + """ + type Query { + employees(filter:EmployeeFilterInput) : [Person] + } + + interface Person { + firstname: String + lastname: String + } + + type Employee implements Person { + firstname: String + lastname: String + company: String + } + enum EmployeeTypes { + ENGINEER + MANAGER + DIRECTOR + } + + input EmployeeFilterInput { + rank: String + } + """.trimIndent() } diff --git a/graphql-dgs-codegen-core/src/test/kotlin/com/netflix/graphql/dgs/codegen/TestUtils.kt b/graphql-dgs-codegen-core/src/test/kotlin/com/netflix/graphql/dgs/codegen/TestUtils.kt index b6d003787..e947607c5 100644 --- a/graphql-dgs-codegen-core/src/test/kotlin/com/netflix/graphql/dgs/codegen/TestUtils.kt +++ b/graphql-dgs-codegen-core/src/test/kotlin/com/netflix/graphql/dgs/codegen/TestUtils.kt @@ -21,7 +21,6 @@ package com.netflix.graphql.dgs.codegen import com.google.testing.compile.Compilation import com.google.testing.compile.CompilationSubject import com.google.testing.compile.Compiler.javac -import com.netflix.graphql.dgs.codegen.generators.shared.generatedAnnotationClassName import com.palantir.javapoet.AnnotationSpec import com.palantir.javapoet.ClassName import com.palantir.javapoet.JavaFile @@ -133,69 +132,67 @@ fun invokeMethod( return result as T } -fun List.assertKotlinGeneratedAnnotation(shouldHaveDate: Boolean) = - onEach { - it.members - .filterIsInstance(KTypeSpec::class.java) - .forEach { typeSpec -> typeSpec.assertKotlinGeneratedAnnotation(it, shouldHaveDate) } - } +fun List.assertKotlinGeneratedAnnotation( + generatedAnnotationType: String? = null, + shouldHaveDate: Boolean = false, +) = onEach { + it.members + .filterIsInstance() + .forEach { typeSpec -> typeSpec.assertKotlinGeneratedAnnotation(it, generatedAnnotationType, shouldHaveDate) } +} -fun List.assertJavaGeneratedAnnotation(shouldHaveDate: Boolean) = - onEach { - it.typeSpec().assertJavaGeneratedAnnotation(shouldHaveDate) - } +fun List.assertJavaGeneratedAnnotation( + generatedAnnotationType: String? = null, + shouldHaveDate: Boolean = false, +) = onEach { + it.typeSpec().assertJavaGeneratedAnnotation(generatedAnnotationType, shouldHaveDate) +} fun KTypeSpec.assertKotlinGeneratedAnnotation( fileSpec: FileSpec, + generatedAnnotationType: String?, shouldHaveDate: Boolean, ) { - val generatedSpec = - annotations - .firstOrNull { it.canonicalName() == "$BASE_PACKAGE_NAME.Generated" } + val expectedName = generatedAnnotationType ?: "$BASE_PACKAGE_NAME.Generated" + val generatedSpec = annotations.firstOrNull { it.canonicalName() == expectedName } assertThat(generatedSpec) - .`as`("@Generated annotation exists in %s at %s", this, fileSpec) - .isNotNull - - val javaxGeneratedSpec = - annotations.firstOrNull { it.canonicalName() == generatedAnnotationClassName } - assertThat(javaxGeneratedSpec) - .`as`("$generatedAnnotationClassName annotation exists in %s at %s", this, fileSpec) + .`as`("@$expectedName annotation exists in %s at %s", this, fileSpec) .isNotNull - if (shouldHaveDate) { - assertThat(javaxGeneratedSpec!!.members) - .`as`("generatedAnnotationClassName has a date in %s at %s", this, fileSpec) - .anyMatch { it.toString().startsWith("date = ") } - } else { - assertThat(javaxGeneratedSpec!!.members) - .`as`("generatedAnnotationClassName has no date in %s at %s", this, fileSpec) - .noneMatch { it.toString().startsWith("date = ") } + if (generatedAnnotationType != null) { + if (shouldHaveDate) { + assertThat(generatedSpec!!.members) + .`as`("$expectedName has a date in %s at %s", this, fileSpec) + .anyMatch { it.toString().startsWith("date = ") } + } else { + assertThat(generatedSpec!!.members) + .`as`("$expectedName has no date in %s at %s", this, fileSpec) + .noneMatch { it.toString().startsWith("date = ") } + } } - typeSpecs.forEach { it.assertKotlinGeneratedAnnotation(fileSpec, shouldHaveDate) } + typeSpecs.forEach { it.assertKotlinGeneratedAnnotation(fileSpec, generatedAnnotationType, shouldHaveDate) } } -fun TypeSpec.assertJavaGeneratedAnnotation(shouldHaveDate: Boolean) { - val generatedSpec = - annotations() - .firstOrNull { it.canonicalName() == "$BASE_PACKAGE_NAME.Generated" } +fun TypeSpec.assertJavaGeneratedAnnotation( + generatedAnnotationType: String?, + shouldHaveDate: Boolean, +) { + val expectedName = generatedAnnotationType ?: "$BASE_PACKAGE_NAME.Generated" + val generatedSpec = annotations().firstOrNull { it.canonicalName() == expectedName } assertThat(generatedSpec) - .`as`("@Generated annotation exists in %s", this) + .`as`("@$expectedName annotation exists in %s", this) .isNotNull - val jakartaGeneratedSpec = - annotations().firstOrNull { it.canonicalName() == generatedAnnotationClassName } - assertThat(jakartaGeneratedSpec) - .`as`("$generatedAnnotationClassName annotation exists in %s", this) - .isNotNull - - if (shouldHaveDate) { - assertThat(jakartaGeneratedSpec!!.members().keys).contains("date") - } else { - assertThat(jakartaGeneratedSpec!!.members().keys).doesNotContain("date") + if (generatedAnnotationType != null) { + if (shouldHaveDate) { + assertThat(generatedSpec!!.members().keys).contains("date") + } else { + assertThat(generatedSpec!!.members().keys).doesNotContain("date") + } } - this.typeSpecs().forEach { it.assertJavaGeneratedAnnotation(shouldHaveDate) } + this.typeSpecs().forEach { it.assertJavaGeneratedAnnotation(generatedAnnotationType, shouldHaveDate) } } fun AnnotationSpec.canonicalName(): String = (type() as ClassName).canonicalName() diff --git a/graphql-dgs-codegen-core/src/test/kotlin/com/netflix/graphql/dgs/codegen/clientapi/ClientApiGenFragmentTest.kt b/graphql-dgs-codegen-core/src/test/kotlin/com/netflix/graphql/dgs/codegen/clientapi/ClientApiGenFragmentTest.kt index 8046dbc22..890c24833 100644 --- a/graphql-dgs-codegen-core/src/test/kotlin/com/netflix/graphql/dgs/codegen/clientapi/ClientApiGenFragmentTest.kt +++ b/graphql-dgs-codegen-core/src/test/kotlin/com/netflix/graphql/dgs/codegen/clientapi/ClientApiGenFragmentTest.kt @@ -308,10 +308,9 @@ class ClientApiGenFragmentTest { | |import com.fasterxml.jackson.annotation.JsonSubTypes; |import com.fasterxml.jackson.annotation.JsonTypeInfo; - |import jakarta.annotation.Generated; + |import com.netflix.graphql.dgs.codegen.tests.generated.Generated; | - |@Generated("com.netflix.graphql.dgs.codegen.CodeGen") - |@com.netflix.graphql.dgs.codegen.tests.generated.Generated + |@Generated |@JsonTypeInfo( | use = JsonTypeInfo.Id.NAME, | include = JsonTypeInfo.As.PROPERTY, diff --git a/graphql-dgs-codegen-gradle/src/main/kotlin/com/netflix/graphql/dgs/codegen/gradle/GenerateJavaTask.kt b/graphql-dgs-codegen-gradle/src/main/kotlin/com/netflix/graphql/dgs/codegen/gradle/GenerateJavaTask.kt index 6da7e5c26..cb44de469 100644 --- a/graphql-dgs-codegen-gradle/src/main/kotlin/com/netflix/graphql/dgs/codegen/gradle/GenerateJavaTask.kt +++ b/graphql-dgs-codegen-gradle/src/main/kotlin/com/netflix/graphql/dgs/codegen/gradle/GenerateJavaTask.kt @@ -143,6 +143,10 @@ open class GenerateJavaTask @Input var disableDatesInGeneratedAnnotation = true + @Input + @org.gradle.api.tasks.Optional + var generatedAnnotationType: String? = null + @Input var addDeprecatedAnnotation = false @@ -216,6 +220,7 @@ open class GenerateJavaTask implementSerializable = implementSerializable, addGeneratedAnnotation = addGeneratedAnnotation, disableDatesInGeneratedAnnotation = disableDatesInGeneratedAnnotation, + generatedAnnotationType = generatedAnnotationType, addDeprecatedAnnotation = addDeprecatedAnnotation, includeImports = includeImports, includeEnumImports = includeEnumImports, From b1ecf3000fbe0fadabb683ee5f47e2dafc759b23 Mon Sep 17 00:00:00 2001 From: Jiho Lee Date: Tue, 28 Apr 2026 14:25:21 -0700 Subject: [PATCH 7/7] Remove jakarta annotation dependency from gradle tests --- .../resources/test-project-no-schema-files/build.gradle | 9 --------- .../build_with_default_dir.gradle | 9 --------- .../src/test/resources/test-project/build.gradle | 9 --------- .../resources/test-project/build_with_default_dir.gradle | 8 -------- 4 files changed, 35 deletions(-) diff --git a/graphql-dgs-codegen-gradle/src/test/resources/test-project-no-schema-files/build.gradle b/graphql-dgs-codegen-gradle/src/test/resources/test-project-no-schema-files/build.gradle index db59451d2..11b42e633 100644 --- a/graphql-dgs-codegen-gradle/src/test/resources/test-project-no-schema-files/build.gradle +++ b/graphql-dgs-codegen-gradle/src/test/resources/test-project-no-schema-files/build.gradle @@ -26,15 +26,6 @@ configurations { CodeGenConfiguration.exclude group: "com.netflix.graphql.dgs.codegen", module: "graphql-dgs-codegen-core" } -repositories { - mavenCentral() -} - -dependencies { - // Required to resolve @jakarta.annotation.Generated emitted when addGeneratedAnnotation is true - implementation 'jakarta.annotation:jakarta.annotation-api:2.1.1' -} - generateJava { schemaPaths = ["${projectDir}/src/main/resources/schema"] packageName = 'com.netflix.testproject.graphql' diff --git a/graphql-dgs-codegen-gradle/src/test/resources/test-project-no-schema-files/build_with_default_dir.gradle b/graphql-dgs-codegen-gradle/src/test/resources/test-project-no-schema-files/build_with_default_dir.gradle index c8f19106b..a9c9a6196 100644 --- a/graphql-dgs-codegen-gradle/src/test/resources/test-project-no-schema-files/build_with_default_dir.gradle +++ b/graphql-dgs-codegen-gradle/src/test/resources/test-project-no-schema-files/build_with_default_dir.gradle @@ -26,15 +26,6 @@ configurations { CodeGenConfiguration.exclude group: "com.netflix.graphql.dgs.codegen", module: "graphql-dgs-codegen-core" } -repositories { - mavenCentral() -} - -dependencies { - // Required to resolve @jakarta.annotation.Generated emitted when addGeneratedAnnotation is true - implementation 'jakarta.annotation:jakarta.annotation-api:2.1.1' -} - generateJava { schemaPaths = ["${projectDir}/src/main/resources/schema"] packageName = 'com.netflix.testproject.graphql' diff --git a/graphql-dgs-codegen-gradle/src/test/resources/test-project/build.gradle b/graphql-dgs-codegen-gradle/src/test/resources/test-project/build.gradle index 940de6078..fe412e2a8 100644 --- a/graphql-dgs-codegen-gradle/src/test/resources/test-project/build.gradle +++ b/graphql-dgs-codegen-gradle/src/test/resources/test-project/build.gradle @@ -26,15 +26,6 @@ configurations { CodeGenConfiguration.exclude group: "com.netflix.graphql.dgs.codegen", module: "graphql-dgs-codegen-core" } -repositories { - mavenCentral() -} - -dependencies { - // Required to resolve @jakarta.annotation.Generated emitted when addGeneratedAnnotation is true - implementation 'jakarta.annotation:jakarta.annotation-api:2.1.1' -} - generateJava { schemaPaths = ["${projectDir}/src/main/resources/schema"] packageName = 'com.netflix.testproject.graphql' diff --git a/graphql-dgs-codegen-gradle/src/test/resources/test-project/build_with_default_dir.gradle b/graphql-dgs-codegen-gradle/src/test/resources/test-project/build_with_default_dir.gradle index 82de2d352..a9c9a6196 100644 --- a/graphql-dgs-codegen-gradle/src/test/resources/test-project/build_with_default_dir.gradle +++ b/graphql-dgs-codegen-gradle/src/test/resources/test-project/build_with_default_dir.gradle @@ -21,14 +21,6 @@ plugins { id 'com.netflix.dgs.codegen' } -repositories { - mavenCentral() -} - -dependencies { - implementation 'jakarta.annotation:jakarta.annotation-api:2.1.1' -} - configurations { // injected by Gradle Runner through test configuration, see CodegenGradlePluginTest CodeGenConfiguration.exclude group: "com.netflix.graphql.dgs.codegen", module: "graphql-dgs-codegen-core"