From 14e97892908a2daf3329a0b7a9d3e0de0d1cfbd6 Mon Sep 17 00:00:00 2001 From: Martin Bonnin Date: Thu, 3 Aug 2023 16:15:42 +0200 Subject: [PATCH] Update KotlinPoet (#5147) * update KotlinPoet * hide new class --- gradle/libraries.toml | 2 +- .../apollo3/compiler/codegen/kotlin/CgFile.kt | 3 + .../compiler/codegen/kotlin/KotlinCodeGen.kt | 4 + .../codegen/kotlin/file/OperationBuilder.kt | 12 +- .../codegen/kotlin/model/ModelBuilder.kt | 6 +- .../antlr_tokens/TestQuery.kt.expected | 18 +- .../TestQuery_ResponseAdapter.kt.expected | 13 +- .../TestQuery_VariablesAdapter.kt.expected | 3 +- .../arguments_hardcoded/TestQuery.kt.expected | 22 +- .../TestQuery_ResponseAdapter.kt.expected | 13 +- .../big_query/TestQuery.kt.expected | 22 +- .../TestQuery_ResponseAdapter.kt.expected | 13 +- .../capitalized_fields/TestQuery.kt.expected | 22 +- .../TestQuery_ResponseAdapter.kt.expected | 25 +- .../capitalized_fields/TestQuery.kt.expected | 22 +- .../TestQuery_ResponseAdapter.kt.expected | 19 +- .../case_sensitive_enum/TestQuery.kt.expected | 22 +- .../TestQuery_ResponseAdapter.kt.expected | 7 +- .../adapter/Enum_ResponseAdapter.kt.expected | 8 +- .../companion/TestQuery.kt.expected | 22 +- .../TestQuery_ResponseAdapter.kt.expected | 13 +- .../custom_scalar_type/TestQuery.kt.expected | 22 +- .../TestQuery_ResponseAdapter.kt.expected | 28 +- .../data_builders/AnimalQuery.kt.expected | 23 +- .../data_builders/CharacterQuery.kt.expected | 23 +- .../data_builders/NodeQuery.kt.expected | 23 +- .../AnimalQuery_ResponseAdapter.kt.expected | 13 +- ...CharacterQuery_ResponseAdapter.kt.expected | 13 +- .../NodeQuery_ResponseAdapter.kt.expected | 13 +- .../fragment/CatFragmentImpl.kt.expected | 12 +- ...atFragmentImpl_ResponseAdapter.kt.expected | 7 +- .../fragment/DogFragmentImpl.kt.expected | 12 +- ...ogFragmentImpl_ResponseAdapter.kt.expected | 7 +- .../fragment/DroidFragmentImpl.kt.expected | 12 +- ...idFragmentImpl_ResponseAdapter.kt.expected | 7 +- .../fragment/HumanFragmentImpl.kt.expected | 12 +- ...anFragmentImpl_ResponseAdapter.kt.expected | 7 +- .../data_builders/type/Animal.kt.expected | 4 +- .../data_builders/type/Cat.kt.expected | 4 +- .../data_builders/type/Character.kt.expected | 6 +- .../data_builders/type/Dog.kt.expected | 4 +- .../data_builders/type/Droid.kt.expected | 4 +- .../data_builders/type/Human.kt.expected | 4 +- .../data_builders/type/Node.kt.expected | 4 +- .../data_builders/type/Query.kt.expected | 4 +- .../data_builders/AnimalQuery.kt.expected | 46 +-- .../data_builders/CharacterQuery.kt.expected | 58 ++-- .../data_builders/NodeQuery.kt.expected | 52 ++-- .../AnimalQuery_ResponseAdapter.kt.expected | 19 +- ...CharacterQuery_ResponseAdapter.kt.expected | 19 +- .../NodeQuery_ResponseAdapter.kt.expected | 19 +- .../fragment/CatFragmentImpl.kt.expected | 14 +- ...atFragmentImpl_ResponseAdapter.kt.expected | 7 +- .../fragment/DogFragmentImpl.kt.expected | 14 +- ...ogFragmentImpl_ResponseAdapter.kt.expected | 7 +- .../fragment/DroidFragmentImpl.kt.expected | 15 +- ...idFragmentImpl_ResponseAdapter.kt.expected | 7 +- .../fragment/HumanFragmentImpl.kt.expected | 15 +- ...anFragmentImpl_ResponseAdapter.kt.expected | 7 +- .../data_builders/type/Animal.kt.expected | 4 +- .../data_builders/type/Cat.kt.expected | 4 +- .../data_builders/type/Character.kt.expected | 6 +- .../data_builders/type/Dog.kt.expected | 4 +- .../data_builders/type/Droid.kt.expected | 4 +- .../data_builders/type/Human.kt.expected | 4 +- .../data_builders/type/Node.kt.expected | 4 +- .../data_builders/type/Query.kt.expected | 4 +- .../TestQuery.kt.expected | 22 +- .../TestQuery_ResponseAdapter.kt.expected | 25 +- .../fragment/HorseFragmentImpl.kt.expected | 13 +- ...seFragmentImpl_ResponseAdapter.kt.expected | 13 +- .../TestQuery.kt.expected | 30 +- .../TestQuery_ResponseAdapter.kt.expected | 19 +- .../fragment/HorseFragmentImpl.kt.expected | 18 +- ...seFragmentImpl_ResponseAdapter.kt.expected | 13 +- .../CatQuery.kt.expected | 22 +- .../CatQuery_ResponseAdapter.kt.expected | 13 +- .../fragment/AnimalFragmentImpl.kt.expected | 13 +- ...alFragmentImpl_ResponseAdapter.kt.expected | 19 +- .../CatQuery.kt.expected | 46 +-- .../CatQuery_ResponseAdapter.kt.expected | 17 +- .../fragment/AnimalFragment.kt.expected | 11 +- .../fragment/AnimalFragmentImpl.kt.expected | 33 +-- ...alFragmentImpl_ResponseAdapter.kt.expected | 13 +- .../deprecation/TestQuery.kt.expected | 18 +- .../TestQuery_ResponseAdapter.kt.expected | 13 +- .../TestQuery_VariablesAdapter.kt.expected | 3 +- .../Episode_ResponseAdapter.kt.expected | 8 +- .../enum_field/TestQuery.kt.expected | 22 +- .../TestQuery_ResponseAdapter.kt.expected | 7 +- .../GravityAsEnum_ResponseAdapter.kt.expected | 7 +- .../Gravity_ResponseAdapter.kt.expected | 8 +- .../enums_as_sealed/TestQuery.kt.expected | 22 +- .../TestQuery_ResponseAdapter.kt.expected | 7 +- .../enums_as_sealed/type/Enum.kt.expected | 6 +- .../adapter/Enum_ResponseAdapter.kt.expected | 8 +- .../TestQuery.kt.expected | 18 +- .../TestQuery_ResponseAdapter.kt.expected | 19 +- .../TestQuery_VariablesAdapter.kt.expected | 3 +- .../TestQuery.kt.expected | 22 +- .../TestQuery_ResponseAdapter.kt.expected | 37 ++- .../TestQuery.kt.expected | 52 ++-- .../TestQuery_ResponseAdapter.kt.expected | 21 +- .../TestQuery.kt.expected | 18 +- .../TestQuery_ResponseAdapter.kt.expected | 13 +- .../TestQuery_VariablesAdapter.kt.expected | 3 +- .../fragment/DroidDetailsImpl.kt.expected | 13 +- ...oidDetailsImpl_ResponseAdapter.kt.expected | 7 +- .../fragment/HeroDetailsImpl.kt.expected | 13 +- ...eroDetailsImpl_ResponseAdapter.kt.expected | 7 +- .../fragment/HumanDetailsImpl.kt.expected | 13 +- ...manDetailsImpl_ResponseAdapter.kt.expected | 7 +- .../OtherDroidDetailsImpl.kt.expected | 13 +- ...oidDetailsImpl_ResponseAdapter.kt.expected | 7 +- .../TestQuery.kt.expected | 22 +- .../TestQuery_ResponseAdapter.kt.expected | 13 +- .../fragment/HeroDetailsImpl.kt.expected | 13 +- ...eroDetailsImpl_ResponseAdapter.kt.expected | 25 +- .../TestQuery.kt.expected | 38 +-- .../TestQuery_ResponseAdapter.kt.expected | 32 +-- .../fragment/HeroDetailsImpl.kt.expected | 25 +- ...eroDetailsImpl_ResponseAdapter.kt.expected | 25 +- .../fragment_used_twice/TestQuery.kt.expected | 22 +- .../TestQuery_ResponseAdapter.kt.expected | 13 +- .../fragment/CharacterDetailsImpl.kt.expected | 13 +- ...terDetailsImpl_ResponseAdapter.kt.expected | 7 +- .../fragment/HeroDetailsImpl.kt.expected | 13 +- ...eroDetailsImpl_ResponseAdapter.kt.expected | 7 +- .../fragment/HumanDetailsImpl.kt.expected | 13 +- ...manDetailsImpl_ResponseAdapter.kt.expected | 7 +- .../fragment_used_twice/TestQuery.kt.expected | 50 ++-- .../TestQuery_ResponseAdapter.kt.expected | 17 +- .../fragment/CharacterDetailsImpl.kt.expected | 18 +- ...terDetailsImpl_ResponseAdapter.kt.expected | 7 +- .../fragment/HeroDetails.kt.expected | 8 +- .../fragment/HeroDetailsImpl.kt.expected | 23 +- ...eroDetailsImpl_ResponseAdapter.kt.expected | 7 +- .../fragment/HumanDetails.kt.expected | 13 +- .../fragment/HumanDetailsImpl.kt.expected | 35 +-- ...manDetailsImpl_ResponseAdapter.kt.expected | 11 +- .../TestQuery.kt.expected | 22 +- .../TestQuery_ResponseAdapter.kt.expected | 13 +- .../fragment/DroidDetailsImpl.kt.expected | 13 +- ...oidDetailsImpl_ResponseAdapter.kt.expected | 7 +- .../fragment/HeroDetailsImpl.kt.expected | 13 +- ...eroDetailsImpl_ResponseAdapter.kt.expected | 31 +- .../fragment/HumanDetailsImpl.kt.expected | 13 +- ...manDetailsImpl_ResponseAdapter.kt.expected | 7 +- .../Episode_ResponseAdapter.kt.expected | 8 +- .../TestQuery.kt.expected | 96 ++++--- .../TestQuery_ResponseAdapter.kt.expected | 76 +++-- .../fragment/DroidDetailsImpl.kt.expected | 18 +- ...oidDetailsImpl_ResponseAdapter.kt.expected | 7 +- .../fragment/HeroDetails.kt.expected | 43 +-- .../fragment/HeroDetailsImpl.kt.expected | 84 +++--- ...eroDetailsImpl_ResponseAdapter.kt.expected | 67 +++-- .../fragment/HumanDetailsImpl.kt.expected | 16 +- ...manDetailsImpl_ResponseAdapter.kt.expected | 7 +- .../Episode_ResponseAdapter.kt.expected | 8 +- .../TestQuery.kt.expected | 22 +- .../TestQuery_ResponseAdapter.kt.expected | 13 +- .../fragment/IFragmentImpl.kt.expected | 13 +- .../IFragmentImpl_ResponseAdapter.kt.expected | 13 +- .../TestQuery.kt.expected | 37 +-- .../TestQuery_ResponseAdapter.kt.expected | 17 +- .../fragment/IFragment.kt.expected | 6 +- .../fragment/IFragmentImpl.kt.expected | 25 +- .../IFragmentImpl_ResponseAdapter.kt.expected | 11 +- .../TestQuery.kt.expected | 22 +- .../TestQuery_ResponseAdapter.kt.expected | 13 +- .../fragment/DroidDetails1Impl.kt.expected | 13 +- ...idDetails1Impl_ResponseAdapter.kt.expected | 7 +- .../fragment/DroidDetails2Impl.kt.expected | 13 +- ...idDetails2Impl_ResponseAdapter.kt.expected | 7 +- .../TestQuery.kt.expected | 40 +-- .../TestQuery_ResponseAdapter.kt.expected | 17 +- .../fragment/DroidDetails1Impl.kt.expected | 16 +- ...idDetails1Impl_ResponseAdapter.kt.expected | 7 +- .../fragment/DroidDetails2Impl.kt.expected | 16 +- ...idDetails2Impl_ResponseAdapter.kt.expected | 7 +- .../InlineMultipleWithDefer.kt.expected | 22 +- ...ineMultipleWithDeferAndInclude.kt.expected | 18 +- .../InlineMultipleWithDeferWithIf.kt.expected | 18 +- .../InlineSingleWithDefer.kt.expected | 23 +- .../SpreadMultipleWithDefer.kt.expected | 22 +- ...eadMultipleWithDeferAndInclude.kt.expected | 18 +- .../SpreadMultipleWithDeferWithIf.kt.expected | 18 +- .../SpreadSingleWithDefer.kt.expected | 23 +- ...eferAndInclude_ResponseAdapter.kt.expected | 49 ++-- ...ferAndInclude_VariablesAdapter.kt.expected | 3 +- ...ithDeferWithIf_ResponseAdapter.kt.expected | 31 +- ...thDeferWithIf_VariablesAdapter.kt.expected | 3 +- ...tipleWithDefer_ResponseAdapter.kt.expected | 25 +- ...ingleWithDefer_ResponseAdapter.kt.expected | 19 +- ...eferAndInclude_ResponseAdapter.kt.expected | 13 +- ...ferAndInclude_VariablesAdapter.kt.expected | 3 +- ...ithDeferWithIf_ResponseAdapter.kt.expected | 13 +- ...thDeferWithIf_VariablesAdapter.kt.expected | 3 +- ...tipleWithDefer_ResponseAdapter.kt.expected | 13 +- ...ingleWithDefer_ResponseAdapter.kt.expected | 13 +- .../CharacterDetails2Impl.kt.expected | 13 +- ...erDetails2Impl_ResponseAdapter.kt.expected | 7 +- .../CharacterDetails3Impl.kt.expected | 13 +- ...erDetails3Impl_ResponseAdapter.kt.expected | 7 +- .../fragment/CharacterDetailsImpl.kt.expected | 13 +- ...terDetailsImpl_ResponseAdapter.kt.expected | 7 +- .../fragment/DroidDetailsImpl.kt.expected | 13 +- ...oidDetailsImpl_ResponseAdapter.kt.expected | 7 +- .../TestQuery.kt.expected | 22 +- .../TestQuery_ResponseAdapter.kt.expected | 19 +- .../fragment/DroidDetailsImpl.kt.expected | 13 +- ...oidDetailsImpl_ResponseAdapter.kt.expected | 7 +- .../fragment/HumanDetailsImpl.kt.expected | 13 +- ...manDetailsImpl_ResponseAdapter.kt.expected | 7 +- .../TestQuery.kt.expected | 75 ++--- .../TestQuery_ResponseAdapter.kt.expected | 31 +- .../fragment/DroidDetailsImpl.kt.expected | 18 +- ...oidDetailsImpl_ResponseAdapter.kt.expected | 7 +- .../fragment/HumanDetailsImpl.kt.expected | 18 +- ...manDetailsImpl_ResponseAdapter.kt.expected | 7 +- .../hero_details/HeroDetails.kt.expected | 22 +- .../HeroDetails_ResponseAdapter.kt.expected | 32 +-- .../hero_type_ResponseAdapter.kt.expected | 8 +- .../HeroDetailsQuery.kt.expected | 23 +- ...roDetailsQuery_ResponseAdapter.kt.expected | 32 +-- .../hero_name/TestQuery.kt.expected | 22 +- .../TestQuery_ResponseAdapter.kt.expected | 19 +- .../hero_name/TestQuery.kt.expected | 38 +-- .../TestQuery_ResponseAdapter.kt.expected | 17 +- ...ryAVeryAVeryAVeryAVeryLongName.kt.expected | 18 +- ...yAVeryLongName_ResponseAdapter.kt.expected | 13 +- ...AVeryLongName_VariablesAdapter.kt.expected | 3 +- .../Episode_ResponseAdapter.kt.expected | 8 +- .../hero_with_review/TestQuery.kt.expected | 18 +- .../TestQuery_ResponseAdapter.kt.expected | 13 +- .../TestQuery_VariablesAdapter.kt.expected | 3 +- .../Episode_ResponseAdapter.kt.expected | 8 +- .../TestQuery.kt.expected | 22 +- .../TestQuery_ResponseAdapter.kt.expected | 19 +- .../TestQuery.kt.expected | 34 +-- .../TestQuery_ResponseAdapter.kt.expected | 17 +- .../TestQuery.kt.expected | 22 +- .../TestQuery_ResponseAdapter.kt.expected | 31 +- .../TestQuery.kt.expected | 44 +-- .../TestQuery_ResponseAdapter.kt.expected | 19 +- .../TestOperation.kt.expected | 22 +- .../TestOperation_ResponseAdapter.kt.expected | 64 ++--- .../adapter/Race_ResponseAdapter.kt.expected | 8 +- .../TestOperation.kt.expected | 104 +++---- .../TestOperation_ResponseAdapter.kt.expected | 39 ++- .../adapter/Race_ResponseAdapter.kt.expected | 8 +- .../TestQuery.kt.expected | 22 +- .../TestQuery_ResponseAdapter.kt.expected | 58 ++-- .../TestQuery.kt.expected | 22 +- .../TestQuery_ResponseAdapter.kt.expected | 32 +-- .../TestQuery.kt.expected | 22 +- .../TestQuery_ResponseAdapter.kt.expected | 19 +- .../TestQuery.kt.expected | 30 +- .../TestQuery_ResponseAdapter.kt.expected | 17 +- .../TestQuery.kt.expected | 22 +- .../TestQuery_ResponseAdapter.kt.expected | 19 +- .../TestQuery.kt.expected | 34 +-- .../TestQuery_ResponseAdapter.kt.expected | 17 +- .../TestQuery.kt.expected | 18 +- .../TestQuery_ResponseAdapter.kt.expected | 31 +- .../TestQuery_VariablesAdapter.kt.expected | 3 +- .../TestQuery.kt.expected | 22 +- .../TestQuery_ResponseAdapter.kt.expected | 37 ++- .../Episode_ResponseAdapter.kt.expected | 8 +- .../TestQuery.kt.expected | 41 +-- .../TestQuery_ResponseAdapter.kt.expected | 31 +- .../Episode_ResponseAdapter.kt.expected | 8 +- .../input_object_type/TestQuery.kt.expected | 18 +- .../TestQuery_ResponseAdapter.kt.expected | 13 +- .../TestQuery_VariablesAdapter.kt.expected | 3 +- .../ColorInput_InputAdapter.kt.expected | 9 +- .../Episode_ResponseAdapter.kt.expected | 8 +- .../ReviewInput_InputAdapter.kt.expected | 18 +- .../ReviewRefInput_InputAdapter.kt.expected | 9 +- .../TestQuery.kt.expected | 18 +- .../TestQuery_ResponseAdapter.kt.expected | 13 +- .../TestQuery_VariablesAdapter.kt.expected | 3 +- .../Episode_ResponseAdapter.kt.expected | 8 +- .../TestQuery.kt.expected | 22 +- .../TestQuery_ResponseAdapter.kt.expected | 25 +- .../TestQuery.kt.expected | 41 +-- .../TestQuery_ResponseAdapter.kt.expected | 19 +- .../GetHuman.kt.expected | 22 +- .../GetHuman_ResponseAdapter.kt.expected | 25 +- .../GetHuman.kt.expected | 30 +- .../GetHuman_ResponseAdapter.kt.expected | 23 +- .../introspection_query/TestQuery.kt.expected | 22 +- .../TestQuery_ResponseAdapter.kt.expected | 31 +- .../__TypeKind_ResponseAdapter.kt.expected | 7 +- .../java8annotation/LoginBarber.kt.expected | 18 +- .../LoginBarber_ResponseAdapter.kt.expected | 13 +- .../LoginBarber_VariablesAdapter.kt.expected | 3 +- .../adapter/Login_InputAdapter.kt.expected | 9 +- .../MyQuery.kt.expected | 18 +- .../MyQuery_ResponseAdapter.kt.expected | 19 +- .../MyQuery_VariablesAdapter.kt.expected | 3 +- .../adapter/MyInput_InputAdapter.kt.expected | 9 +- .../java_apollo_optionals/MyQuery.kt.expected | 18 +- .../MyQuery_ResponseAdapter.kt.expected | 19 +- .../MyQuery_VariablesAdapter.kt.expected | 3 +- .../adapter/MyInput_InputAdapter.kt.expected | 9 +- .../java_guava_optionals/MyQuery.kt.expected | 18 +- .../MyQuery_ResponseAdapter.kt.expected | 19 +- .../MyQuery_VariablesAdapter.kt.expected | 3 +- .../adapter/MyInput_InputAdapter.kt.expected | 9 +- .../java_hashcode/TestQuery.kt.expected | 22 +- .../TestQuery_ResponseAdapter.kt.expected | 7 +- .../java_java_optionals/MyQuery.kt.expected | 18 +- .../MyQuery_ResponseAdapter.kt.expected | 19 +- .../MyQuery_VariablesAdapter.kt.expected | 3 +- .../adapter/MyInput_InputAdapter.kt.expected | 9 +- .../MyQuery.kt.expected | 18 +- .../MyQuery_ResponseAdapter.kt.expected | 19 +- .../MyQuery_VariablesAdapter.kt.expected | 3 +- .../adapter/MyInput_InputAdapter.kt.expected | 9 +- .../MyQuery.kt.expected | 18 +- .../MyQuery_ResponseAdapter.kt.expected | 19 +- .../MyQuery_VariablesAdapter.kt.expected | 3 +- .../adapter/MyInput_InputAdapter.kt.expected | 9 +- .../JavaPrimitiveQuery.kt.expected | 19 +- ...PrimitiveQuery_ResponseAdapter.kt.expected | 19 +- ...rimitiveQuery_VariablesAdapter.kt.expected | 3 +- .../adapter/MyInput_InputAdapter.kt.expected | 9 +- .../src/test/graphql/com/example/measurements | 270 +++++++++--------- .../merged_include/TestQuery.kt.expected | 22 +- .../TestQuery_ResponseAdapter.kt.expected | 13 +- .../monomorphic/TestQuery.kt.expected | 22 +- .../TestQuery_ResponseAdapter.kt.expected | 25 +- .../monomorphic/TestQuery.kt.expected | 35 +-- .../TestQuery_ResponseAdapter.kt.expected | 17 +- .../multiple_fragments/TestQuery.kt.expected | 22 +- .../TestQuery_ResponseAdapter.kt.expected | 13 +- .../fragment/AFragmentImpl.kt.expected | 13 +- .../AFragmentImpl_ResponseAdapter.kt.expected | 13 +- .../fragment/Fragment1Impl.kt.expected | 13 +- .../Fragment1Impl_ResponseAdapter.kt.expected | 7 +- .../fragment/Fragment2Impl.kt.expected | 13 +- .../Fragment2Impl_ResponseAdapter.kt.expected | 7 +- .../multiple_fragments/TestQuery.kt.expected | 47 +-- .../TestQuery_ResponseAdapter.kt.expected | 23 +- .../fragment/AFragment.kt.expected | 16 +- .../fragment/AFragmentImpl.kt.expected | 35 +-- .../AFragmentImpl_ResponseAdapter.kt.expected | 17 +- .../fragment/Fragment1Impl.kt.expected | 15 +- .../Fragment1Impl_ResponseAdapter.kt.expected | 7 +- .../fragment/Fragment2Impl.kt.expected | 15 +- .../Fragment2Impl_ResponseAdapter.kt.expected | 7 +- .../CreateReviewForEpisode.kt.expected | 20 +- ...viewForEpisode_ResponseAdapter.kt.expected | 28 +- ...iewForEpisode_VariablesAdapter.kt.expected | 3 +- .../type/Character.kt.expected | 6 +- .../type/Droid.kt.expected | 4 +- .../type/Human.kt.expected | 4 +- .../type/Mutation.kt.expected | 4 +- .../type/Review.kt.expected | 4 +- .../type/SearchResult.kt.expected | 6 +- .../type/Starship.kt.expected | 4 +- .../ColorInput_InputAdapter.kt.expected | 9 +- .../Episode_ResponseAdapter.kt.expected | 8 +- .../ReviewInput_InputAdapter.kt.expected | 18 +- .../ReviewRefInput_InputAdapter.kt.expected | 9 +- ...CreateReviewForEpisodeMutation.kt.expected | 18 +- ...pisodeMutation_ResponseAdapter.kt.expected | 13 +- ...isodeMutation_VariablesAdapter.kt.expected | 3 +- .../ColorInput_InputAdapter.kt.expected | 9 +- .../Episode_ResponseAdapter.kt.expected | 8 +- .../ReviewInput_InputAdapter.kt.expected | 9 +- .../ReviewRefInput_InputAdapter.kt.expected | 9 +- .../TestQuery.kt.expected | 22 +- .../TestQuery_ResponseAdapter.kt.expected | 13 +- .../fragment/DroidDetailsImpl.kt.expected | 13 +- ...oidDetailsImpl_ResponseAdapter.kt.expected | 13 +- .../fragment/HumanDetailsImpl.kt.expected | 13 +- ...manDetailsImpl_ResponseAdapter.kt.expected | 25 +- .../TestQuery.kt.expected | 61 ++-- .../TestQuery_ResponseAdapter.kt.expected | 44 ++- .../fragment/DroidDetailsImpl.kt.expected | 22 +- ...oidDetailsImpl_ResponseAdapter.kt.expected | 13 +- .../fragment/HumanDetailsImpl.kt.expected | 26 +- ...manDetailsImpl_ResponseAdapter.kt.expected | 25 +- .../GetHero.kt.expected | 22 +- .../GetHero_ResponseAdapter.kt.expected | 19 +- .../CharacterAppearsInImpl.kt.expected | 13 +- ...rAppearsInImpl_ResponseAdapter.kt.expected | 7 +- .../fragment/CharacterNameImpl.kt.expected | 13 +- ...racterNameImpl_ResponseAdapter.kt.expected | 7 +- .../Episode_ResponseAdapter.kt.expected | 8 +- .../GetHero.kt.expected | 33 ++- .../GetHero_ResponseAdapter.kt.expected | 13 +- .../CharacterAppearsInImpl.kt.expected | 16 +- ...rAppearsInImpl_ResponseAdapter.kt.expected | 7 +- .../fragment/CharacterNameImpl.kt.expected | 16 +- ...racterNameImpl_ResponseAdapter.kt.expected | 7 +- .../Episode_ResponseAdapter.kt.expected | 8 +- .../GetUser.kt.expected | 18 +- .../GetUser_ResponseAdapter.kt.expected | 7 +- .../GetUser_VariablesAdapter.kt.expected | 3 +- .../fragment/QueryFragmentImpl.kt.expected | 9 +- ...ryFragmentImpl_ResponseAdapter.kt.expected | 19 +- .../fragment/UserFragmentImpl.kt.expected | 9 +- ...erFragmentImpl_ResponseAdapter.kt.expected | 7 +- ...yFragmentImpl_VariablesAdapter.kt.expected | 3 +- ...rFragmentImpl_VariablesAdapter.kt.expected | 3 +- .../UserQuery_InputAdapter.kt.expected | 9 +- .../GetUser.kt.expected | 39 +-- .../GetUser_ResponseAdapter.kt.expected | 19 +- .../GetUser_VariablesAdapter.kt.expected | 3 +- .../fragment/QueryFragment.kt.expected | 10 +- .../fragment/QueryFragmentImpl.kt.expected | 28 +- ...ryFragmentImpl_ResponseAdapter.kt.expected | 19 +- .../fragment/UserFragmentImpl.kt.expected | 16 +- ...erFragmentImpl_ResponseAdapter.kt.expected | 7 +- ...yFragmentImpl_VariablesAdapter.kt.expected | 3 +- ...rFragmentImpl_VariablesAdapter.kt.expected | 3 +- .../UserQuery_InputAdapter.kt.expected | 9 +- .../TestQuery.kt.expected | 22 +- .../TestQuery_ResponseAdapter.kt.expected | 13 +- ...oidDetailsImpl_ResponseAdapter.kt.expected | 7 +- ...manDetailsImpl_ResponseAdapter.kt.expected | 7 +- .../TestQuery.kt.expected | 51 ++-- .../TestQuery_ResponseAdapter.kt.expected | 19 +- .../TestQuery.kt.expected | 18 +- .../TestQuery_ResponseAdapter.kt.expected | 51 ++-- .../TestQuery_VariablesAdapter.kt.expected | 3 +- .../Episode_ResponseAdapter.kt.expected | 8 +- .../TestQuery.kt.expected | 59 ++-- .../TestQuery_ResponseAdapter.kt.expected | 39 ++- .../TestQuery_VariablesAdapter.kt.expected | 3 +- .../Episode_ResponseAdapter.kt.expected | 8 +- .../TestQuery.kt.expected | 22 +- .../TestQuery_ResponseAdapter.kt.expected | 65 ++--- .../TestQuery.kt.expected | 79 ++--- .../TestQuery_ResponseAdapter.kt.expected | 37 ++- .../AllStarships.kt.expected | 23 +- .../AllStarships_ResponseAdapter.kt.expected | 25 +- .../fragment/PilotFragmentImpl.kt.expected | 13 +- ...otFragmentImpl_ResponseAdapter.kt.expected | 13 +- .../fragment/PlanetFragmentImpl.kt.expected | 13 +- ...etFragmentImpl_ResponseAdapter.kt.expected | 7 +- .../fragment/StarshipFragmentImpl.kt.expected | 13 +- ...ipFragmentImpl_ResponseAdapter.kt.expected | 25 +- .../AllStarships.kt.expected | 53 ++-- .../AllStarships_ResponseAdapter.kt.expected | 52 ++-- .../fragment/PilotFragment.kt.expected | 6 +- .../fragment/PilotFragmentImpl.kt.expected | 26 +- ...otFragmentImpl_ResponseAdapter.kt.expected | 13 +- .../fragment/PlanetFragmentImpl.kt.expected | 16 +- ...etFragmentImpl_ResponseAdapter.kt.expected | 7 +- .../fragment/StarshipFragment.kt.expected | 15 +- .../fragment/StarshipFragmentImpl.kt.expected | 41 +-- ...ipFragmentImpl_ResponseAdapter.kt.expected | 32 +-- .../nonnull/TestQuery.kt.expected | 22 +- .../TestQuery_ResponseAdapter.kt.expected | 13 +- .../TestQuery.kt.expected | 22 +- .../TestQuery_ResponseAdapter.kt.expected | 25 +- .../fragment/BFragmentImpl.kt.expected | 13 +- .../BFragmentImpl_ResponseAdapter.kt.expected | 7 +- .../TestQuery.kt.expected | 42 +-- .../TestQuery_ResponseAdapter.kt.expected | 17 +- .../fragment/BFragmentImpl.kt.expected | 15 +- .../BFragmentImpl_ResponseAdapter.kt.expected | 7 +- .../TestQuery.kt.expected | 22 +- .../TestQuery_ResponseAdapter.kt.expected | 13 +- .../TestOperation.kt.expected | 22 +- .../TestOperation_ResponseAdapter.kt.expected | 31 +- .../TestOperation.kt.expected | 64 +++-- .../TestOperation_ResponseAdapter.kt.expected | 21 +- .../TestOperation.kt.expected | 22 +- .../TestOperation_ResponseAdapter.kt.expected | 13 +- .../fragment/AnimalFragmentImpl.kt.expected | 13 +- ...alFragmentImpl_ResponseAdapter.kt.expected | 25 +- .../TestOperation.kt.expected | 56 ++-- .../TestOperation_ResponseAdapter.kt.expected | 25 +- .../fragment/AnimalFragment.kt.expected | 15 +- .../fragment/AnimalFragmentImpl.kt.expected | 45 +-- ...alFragmentImpl_ResponseAdapter.kt.expected | 19 +- .../optional/TestQuery.kt.expected | 22 +- .../TestQuery_ResponseAdapter.kt.expected | 13 +- .../Episode_ResponseAdapter.kt.expected | 8 +- .../TestQuery.kt.expected | 22 +- .../TestQuery_ResponseAdapter.kt.expected | 31 +- .../TestQuery.kt.expected | 48 ++-- .../TestQuery_ResponseAdapter.kt.expected | 21 +- .../recursive_selection/TestQuery.kt.expected | 22 +- .../TestQuery_ResponseAdapter.kt.expected | 25 +- .../reserved_keywords/TestQuery.kt.expected | 22 +- .../TestQuery_ResponseAdapter.kt.expected | 25 +- .../reserved_keywords/TestQuery.kt.expected | 30 +- .../TestQuery_ResponseAdapter.kt.expected | 23 +- .../root_query_fragment/TestQuery.kt.expected | 22 +- .../TestQuery_ResponseAdapter.kt.expected | 7 +- .../fragment/QueryFragmentImpl.kt.expected | 13 +- ...ryFragmentImpl_ResponseAdapter.kt.expected | 13 +- .../root_query_fragment/TestQuery.kt.expected | 32 ++- .../TestQuery_ResponseAdapter.kt.expected | 13 +- .../fragment/QueryFragmentImpl.kt.expected | 20 +- ...ryFragmentImpl_ResponseAdapter.kt.expected | 13 +- .../TestQuery.kt.expected | 22 +- .../TestQuery_ResponseAdapter.kt.expected | 7 +- .../fragment/DroidFragmentImpl.kt.expected | 13 +- ...idFragmentImpl_ResponseAdapter.kt.expected | 7 +- .../fragment/HeroFragmentImpl.kt.expected | 13 +- ...roFragmentImpl_ResponseAdapter.kt.expected | 7 +- .../fragment/QueryFragmentImpl.kt.expected | 13 +- ...ryFragmentImpl_ResponseAdapter.kt.expected | 31 +- .../TestQuery.kt.expected | 56 ++-- .../TestQuery_ResponseAdapter.kt.expected | 25 +- .../fragment/DroidFragmentImpl.kt.expected | 18 +- ...idFragmentImpl_ResponseAdapter.kt.expected | 7 +- .../fragment/HeroFragmentImpl.kt.expected | 16 +- ...roFragmentImpl_ResponseAdapter.kt.expected | 7 +- .../fragment/QueryFragment.kt.expected | 13 +- .../fragment/QueryFragmentImpl.kt.expected | 45 +-- ...ryFragmentImpl_ResponseAdapter.kt.expected | 25 +- .../TestQuery.kt.expected | 22 +- .../TestQuery_ResponseAdapter.kt.expected | 37 ++- .../Episode_ResponseAdapter.kt.expected | 8 +- .../TestQuery.kt.expected | 38 +-- .../TestQuery_ResponseAdapter.kt.expected | 23 +- .../Episode_ResponseAdapter.kt.expected | 8 +- .../simple_fragment/TestQuery.kt.expected | 23 +- .../TestQuery_ResponseAdapter.kt.expected | 13 +- .../fragment/HeroDetailsImpl.kt.expected | 12 +- ...eroDetailsImpl_ResponseAdapter.kt.expected | 7 +- .../fragment/HumanDetailsImpl.kt.expected | 12 +- ...manDetailsImpl_ResponseAdapter.kt.expected | 7 +- .../type/Character.kt.expected | 6 +- .../simple_fragment/type/Droid.kt.expected | 4 +- .../simple_fragment/type/Human.kt.expected | 4 +- .../simple_fragment/type/Query.kt.expected | 4 +- .../type/SearchResult.kt.expected | 6 +- .../simple_fragment/type/Starship.kt.expected | 4 +- .../simple_fragment/TestQuery.kt.expected | 41 +-- .../TestQuery_ResponseAdapter.kt.expected | 17 +- .../fragment/HeroDetails.kt.expected | 11 +- .../fragment/HeroDetailsImpl.kt.expected | 27 +- ...eroDetailsImpl_ResponseAdapter.kt.expected | 11 +- .../fragment/HumanDetailsImpl.kt.expected | 17 +- ...manDetailsImpl_ResponseAdapter.kt.expected | 7 +- .../type/Character.kt.expected | 6 +- .../simple_fragment/type/Droid.kt.expected | 4 +- .../simple_fragment/type/Human.kt.expected | 4 +- .../simple_fragment/type/Query.kt.expected | 4 +- .../type/SearchResult.kt.expected | 6 +- .../simple_fragment/type/Starship.kt.expected | 4 +- .../TestQuery.kt.expected | 22 +- .../TestQuery_ResponseAdapter.kt.expected | 13 +- .../fragment/HeroDetailsImpl.kt.expected | 13 +- ...eroDetailsImpl_ResponseAdapter.kt.expected | 25 +- .../TestQuery.kt.expected | 56 ++-- .../TestQuery_ResponseAdapter.kt.expected | 25 +- .../fragment/HeroDetails.kt.expected | 15 +- .../fragment/HeroDetailsImpl.kt.expected | 44 +-- ...eroDetailsImpl_ResponseAdapter.kt.expected | 19 +- .../TestQuery.kt.expected | 22 +- .../TestQuery_ResponseAdapter.kt.expected | 37 ++- .../TestQuery.kt.expected | 47 +-- .../TestQuery_ResponseAdapter.kt.expected | 19 +- .../simple_union/AnimalQuery.kt.expected | 22 +- .../AnimalQuery_ResponseAdapter.kt.expected | 13 +- .../fragment/CatFragmentImpl.kt.expected | 13 +- ...atFragmentImpl_ResponseAdapter.kt.expected | 7 +- .../fragment/DogFragmentImpl.kt.expected | 13 +- ...ogFragmentImpl_ResponseAdapter.kt.expected | 7 +- .../simple_union/AnimalQuery.kt.expected | 45 +-- .../AnimalQuery_ResponseAdapter.kt.expected | 19 +- .../fragment/CatFragmentImpl.kt.expected | 15 +- ...atFragmentImpl_ResponseAdapter.kt.expected | 7 +- .../fragment/DogFragmentImpl.kt.expected | 15 +- ...ogFragmentImpl_ResponseAdapter.kt.expected | 7 +- .../starships/TestQuery.kt.expected | 18 +- .../TestQuery_ResponseAdapter.kt.expected | 13 +- .../TestQuery_VariablesAdapter.kt.expected | 3 +- .../TestSubscription.kt.expected | 19 +- ...stSubscription_ResponseAdapter.kt.expected | 13 +- ...tSubscription_VariablesAdapter.kt.expected | 3 +- .../suppressed_warnings/CatQuery.kt.expected | 18 +- .../CatQuery_ResponseAdapter.kt.expected | 13 +- .../CatQuery_VariablesAdapter.kt.expected | 3 +- .../Direction_ResponseAdapter.kt.expected | 8 +- .../adapter/Filter_InputAdapter.kt.expected | 9 +- .../target_name/TestQuery.kt.expected | 18 +- .../TestQuery_ResponseAdapter.kt.expected | 31 +- .../TestQuery_VariablesAdapter.kt.expected | 3 +- .../renamedEnum_ResponseAdapter.kt.expected | 7 +- .../renamedInput_InputAdapter.kt.expected | 9 +- .../target_name/TestQuery.kt.expected | 26 +- .../TestQuery_ResponseAdapter.kt.expected | 29 +- .../TestQuery_VariablesAdapter.kt.expected | 3 +- .../renamedEnum_ResponseAdapter.kt.expected | 7 +- .../renamedInput_InputAdapter.kt.expected | 9 +- .../test_inline/GetPage.kt.expected | 22 +- .../GetPage_ResponseAdapter.kt.expected | 38 ++- .../test_inline/GetPage.kt.expected | 50 ++-- .../GetPage_ResponseAdapter.kt.expected | 33 ++- .../two_heroes_unique/TestQuery.kt.expected | 22 +- .../TestQuery_ResponseAdapter.kt.expected | 19 +- .../TestQuery.kt.expected | 22 +- .../TestQuery_ResponseAdapter.kt.expected | 57 ++-- .../TestQuery.kt.expected | 22 +- .../TestQuery_ResponseAdapter.kt.expected | 25 +- .../TestQuery.kt.expected | 35 +-- .../TestQuery_ResponseAdapter.kt.expected | 19 +- .../union_fragment/TestQuery.kt.expected | 22 +- .../TestQuery_ResponseAdapter.kt.expected | 19 +- .../fragment/StarshipImpl.kt.expected | 14 +- .../StarshipImpl_ResponseAdapter.kt.expected | 7 +- .../union_fragment/TestQuery.kt.expected | 35 +-- .../TestQuery_ResponseAdapter.kt.expected | 17 +- .../fragment/StarshipImpl.kt.expected | 15 +- .../StarshipImpl_ResponseAdapter.kt.expected | 7 +- .../TestQuery.kt.expected | 22 +- .../TestQuery_ResponseAdapter.kt.expected | 73 +++-- .../Episode_ResponseAdapter.kt.expected | 8 +- .../TestQuery.kt.expected | 53 ++-- .../TestQuery_ResponseAdapter.kt.expected | 43 ++- .../Episode_ResponseAdapter.kt.expected | 8 +- .../HeroDetailQuery.kt.expected | 22 +- ...eroDetailQuery_ResponseAdapter.kt.expected | 38 ++- .../fragment/HeroDetailsImpl.kt.expected | 13 +- ...eroDetailsImpl_ResponseAdapter.kt.expected | 25 +- .../Episode_ResponseAdapter.kt.expected | 8 +- .../HeroDetailQuery.kt.expected | 57 ++-- ...eroDetailQuery_ResponseAdapter.kt.expected | 56 ++-- .../fragment/HeroDetailsImpl.kt.expected | 25 +- ...eroDetailsImpl_ResponseAdapter.kt.expected | 25 +- .../Episode_ResponseAdapter.kt.expected | 8 +- .../TestQuery.kt.expected | 18 +- .../TestQuery_ResponseAdapter.kt.expected | 13 +- .../TestQuery_VariablesAdapter.kt.expected | 3 +- .../Episode_ResponseAdapter.kt.expected | 8 +- 636 files changed, 5800 insertions(+), 6034 deletions(-) diff --git a/gradle/libraries.toml b/gradle/libraries.toml index 99b7c2c6bd6..8f23c660ffe 100644 --- a/gradle/libraries.toml +++ b/gradle/libraries.toml @@ -153,7 +153,7 @@ moshi = { group = "com.squareup.moshi", name = "moshi", version = "1.14.0" } okio = "com.squareup.okio:okio:3.2.0" # okio was pinned to 3.2.0 to stay compatible with Kotlin 1.5. Now that we have 1.6 as a minimum version, we could certainly update okio-nodefilesystem = "com.squareup.okio:okio-nodefilesystem:3.2.0" poet-java = { group = "com.squareup", name = "javapoet", version.ref = "javaPoet" } -poet-kotlin = { group = "com.squareup", name = "kotlinpoet", version = "1.12.0" } +poet-kotlin = { group = "com.squareup", name = "kotlinpoet", version = "1.14.2" } rx-java2 = { group = "io.reactivex.rxjava2", name = "rxjava", version.ref = "rx-java2" } rx-java3 = { group = "io.reactivex.rxjava3", name = "rxjava", version.ref = "rx-java3" } sqldelight-android = { group = "app.cash.sqldelight", name = "android-driver", version.ref = "sqldelight" } diff --git a/libraries/apollo-compiler/src/main/kotlin/com/apollographql/apollo3/compiler/codegen/kotlin/CgFile.kt b/libraries/apollo-compiler/src/main/kotlin/com/apollographql/apollo3/compiler/codegen/kotlin/CgFile.kt index 6c50a603e1c..f012f9a9a0a 100644 --- a/libraries/apollo-compiler/src/main/kotlin/com/apollographql/apollo3/compiler/codegen/kotlin/CgFile.kt +++ b/libraries/apollo-compiler/src/main/kotlin/com/apollographql/apollo3/compiler/codegen/kotlin/CgFile.kt @@ -1,5 +1,6 @@ package com.apollographql.apollo3.compiler.codegen.kotlin +import com.squareup.kotlinpoet.ClassName import com.squareup.kotlinpoet.FileSpec import com.squareup.kotlinpoet.FunSpec import com.squareup.kotlinpoet.PropertySpec @@ -14,6 +15,7 @@ internal class CgFile( val propertySpecs: List = emptyList(), val funSpecs: List = emptyList(), val fileName: String, + val imports: List = emptyList() ) internal interface CgFileBuilder { @@ -21,3 +23,4 @@ internal interface CgFileBuilder { fun build(): CgFile } +internal class CgImport(val className: ClassName, val alias: String ) diff --git a/libraries/apollo-compiler/src/main/kotlin/com/apollographql/apollo3/compiler/codegen/kotlin/KotlinCodeGen.kt b/libraries/apollo-compiler/src/main/kotlin/com/apollographql/apollo3/compiler/codegen/kotlin/KotlinCodeGen.kt index 323d980b5b8..4d4fb1018ec 100644 --- a/libraries/apollo-compiler/src/main/kotlin/com/apollographql/apollo3/compiler/codegen/kotlin/KotlinCodeGen.kt +++ b/libraries/apollo-compiler/src/main/kotlin/com/apollographql/apollo3/compiler/codegen/kotlin/KotlinCodeGen.kt @@ -32,6 +32,7 @@ import com.apollographql.apollo3.compiler.hooks.ApolloCompilerKotlinHooks import com.apollographql.apollo3.compiler.ir.DefaultIrOperations import com.apollographql.apollo3.compiler.ir.DefaultIrSchema import com.apollographql.apollo3.compiler.operationoutput.findOperationId +import com.squareup.kotlinpoet.ClassName import com.squareup.kotlinpoet.FileSpec import com.squareup.kotlinpoet.FunSpec import com.squareup.kotlinpoet.KModifier @@ -221,6 +222,9 @@ internal object KotlinCodeGen { cgFile.propertySpecs.map { propertySpec -> propertySpec.internal(generateAsInternal) }.forEach { propertySpec -> builder.addProperty(propertySpec) } + cgFile.imports.forEach { + builder.addAliasedImport(it.className, it.alias) + } ApolloCompilerKotlinHooks.FileInfo(fileSpec = builder.build()) } .let { hooks.postProcessFiles(it) } diff --git a/libraries/apollo-compiler/src/main/kotlin/com/apollographql/apollo3/compiler/codegen/kotlin/file/OperationBuilder.kt b/libraries/apollo-compiler/src/main/kotlin/com/apollographql/apollo3/compiler/codegen/kotlin/file/OperationBuilder.kt index 4cf139a0338..19b276d9b07 100644 --- a/libraries/apollo-compiler/src/main/kotlin/com/apollographql/apollo3/compiler/codegen/kotlin/file/OperationBuilder.kt +++ b/libraries/apollo-compiler/src/main/kotlin/com/apollographql/apollo3/compiler/codegen/kotlin/file/OperationBuilder.kt @@ -2,6 +2,7 @@ package com.apollographql.apollo3.compiler.codegen.kotlin.file import com.apollographql.apollo3.ast.QueryDocumentMinifier import com.apollographql.apollo3.compiler.applyIf +import com.apollographql.apollo3.compiler.capitalizeFirstLetter import com.apollographql.apollo3.compiler.codegen.Identifier.OPERATION_DOCUMENT import com.apollographql.apollo3.compiler.codegen.Identifier.OPERATION_ID import com.apollographql.apollo3.compiler.codegen.Identifier.OPERATION_NAME @@ -10,6 +11,7 @@ import com.apollographql.apollo3.compiler.codegen.Identifier.id import com.apollographql.apollo3.compiler.codegen.Identifier.name import com.apollographql.apollo3.compiler.codegen.kotlin.CgFile import com.apollographql.apollo3.compiler.codegen.kotlin.CgFileBuilder +import com.apollographql.apollo3.compiler.codegen.kotlin.CgImport import com.apollographql.apollo3.compiler.codegen.kotlin.KotlinContext import com.apollographql.apollo3.compiler.codegen.kotlin.KotlinSymbols import com.apollographql.apollo3.compiler.codegen.kotlin.helpers.makeDataClass @@ -72,10 +74,18 @@ internal class OperationBuilder( } override fun build(): CgFile { + val className = context.resolver.resolveSchemaType(operation.typeCondition) return CgFile( packageName = packageName, fileName = simpleName, - typeSpecs = listOf(typeSpec()) + typeSpecs = listOf(typeSpec()), + imports = listOf( + CgImport( + className, + "Compiled${className.simpleName.capitalizeFirstLetter()}" + ) + + ) ) } diff --git a/libraries/apollo-compiler/src/main/kotlin/com/apollographql/apollo3/compiler/codegen/kotlin/model/ModelBuilder.kt b/libraries/apollo-compiler/src/main/kotlin/com/apollographql/apollo3/compiler/codegen/kotlin/model/ModelBuilder.kt index 4d304c82613..7b18bc2163d 100644 --- a/libraries/apollo-compiler/src/main/kotlin/com/apollographql/apollo3/compiler/codegen/kotlin/model/ModelBuilder.kt +++ b/libraries/apollo-compiler/src/main/kotlin/com/apollographql/apollo3/compiler/codegen/kotlin/model/ModelBuilder.kt @@ -116,11 +116,15 @@ internal class ModelBuilder( private fun buildAccessorFunSpecs(model: IrModel): List { return model.accessors.map { accessor -> + val returnedClassName = context.resolver.resolveModel(accessor.returnedModelId) FunSpec.builder(accessor.funName()) .applyIf(!context.jsExport) { receiver(context.resolver.resolveModel(model.id)) } - .addCode("return·this as? %T\n", context.resolver.resolveModel(accessor.returnedModelId)) + .returns(returnedClassName.copy(nullable = true)) + .addAnnotation(AnnotationSpec.builder(KotlinSymbols.Suppress).addMember("%S", "USELESS_CAST").build()) + // https://github.com/square/kotlinpoet/pull/1559 + .addCode("return this as? %T\n", returnedClassName) .build() } } diff --git a/libraries/apollo-compiler/src/test/graphql/com/example/antlr_tokens/kotlin/responseBased/antlr_tokens/TestQuery.kt.expected b/libraries/apollo-compiler/src/test/graphql/com/example/antlr_tokens/kotlin/responseBased/antlr_tokens/TestQuery.kt.expected index 923bd0ae1c8..648161945a3 100644 --- a/libraries/apollo-compiler/src/test/graphql/com/example/antlr_tokens/kotlin/responseBased/antlr_tokens/TestQuery.kt.expected +++ b/libraries/apollo-compiler/src/test/graphql/com/example/antlr_tokens/kotlin/responseBased/antlr_tokens/TestQuery.kt.expected @@ -18,31 +18,31 @@ import com.example.antlr_tokens.adapter.TestQuery_VariablesAdapter import com.example.antlr_tokens.selections.TestQuerySelections import kotlin.Boolean import kotlin.String -import kotlin.Unit +import com.example.antlr_tokens.type.Query as CompiledQuery public data class TestQuery( public val operation: Optional = Optional.Absent, ) : Query { - public override fun id(): String = OPERATION_ID + override fun id(): String = OPERATION_ID - public override fun document(): String = OPERATION_DOCUMENT + override fun document(): String = OPERATION_DOCUMENT - public override fun name(): String = OPERATION_NAME + override fun name(): String = OPERATION_NAME - public override fun serializeVariables( + override fun serializeVariables( writer: JsonWriter, customScalarAdapters: CustomScalarAdapters, withBooleanDefaultValues: Boolean, - ): Unit { + ) { TestQuery_VariablesAdapter.serializeVariables(writer, this, customScalarAdapters, withBooleanDefaultValues) } - public override fun adapter(): CompositeAdapter = TestQuery_ResponseAdapter.Data.obj() + override fun adapter(): CompositeAdapter = TestQuery_ResponseAdapter.Data.obj() - public override fun rootField(): CompiledField = CompiledField.Builder( + override fun rootField(): CompiledField = CompiledField.Builder( name = "data", - type = com.example.antlr_tokens.type.Query.type + type = CompiledQuery.type ) .selections(selections = TestQuerySelections.__root) .build() diff --git a/libraries/apollo-compiler/src/test/graphql/com/example/antlr_tokens/kotlin/responseBased/antlr_tokens/adapter/TestQuery_ResponseAdapter.kt.expected b/libraries/apollo-compiler/src/test/graphql/com/example/antlr_tokens/kotlin/responseBased/antlr_tokens/adapter/TestQuery_ResponseAdapter.kt.expected index 607f8d5796c..795b1034e71 100644 --- a/libraries/apollo-compiler/src/test/graphql/com/example/antlr_tokens/kotlin/responseBased/antlr_tokens/adapter/TestQuery_ResponseAdapter.kt.expected +++ b/libraries/apollo-compiler/src/test/graphql/com/example/antlr_tokens/kotlin/responseBased/antlr_tokens/adapter/TestQuery_ResponseAdapter.kt.expected @@ -15,14 +15,13 @@ import com.apollographql.apollo3.api.nullable import com.apollographql.apollo3.api.obj import com.example.antlr_tokens.TestQuery import kotlin.String -import kotlin.Unit import kotlin.collections.List public object TestQuery_ResponseAdapter { public object Data : CompositeAdapter { public val RESPONSE_NAMES: List = listOf("typeWithGraphQLKeywords") - public override fun fromJson(reader: JsonReader, adapterContext: CompositeAdapterContext): + override fun fromJson(reader: JsonReader, adapterContext: CompositeAdapterContext): TestQuery.Data { var _typeWithGraphQLKeywords: TestQuery.Data.TypeWithGraphQLKeywords? = null @@ -38,11 +37,11 @@ public object TestQuery_ResponseAdapter { ) } - public override fun toJson( + override fun toJson( writer: JsonWriter, `value`: TestQuery.Data, adapterContext: CompositeAdapterContext, - ): Unit { + ) { writer.name("typeWithGraphQLKeywords") TypeWithGraphQLKeywords.obj().nullable().toJson(writer, value.typeWithGraphQLKeywords, adapterContext) @@ -52,7 +51,7 @@ public object TestQuery_ResponseAdapter { CompositeAdapter { public val RESPONSE_NAMES: List = listOf("on", "null", "alias") - public override fun fromJson(reader: JsonReader, adapterContext: CompositeAdapterContext): + override fun fromJson(reader: JsonReader, adapterContext: CompositeAdapterContext): TestQuery.Data.TypeWithGraphQLKeywords { var _on: String? = null var _null: String? = null @@ -74,11 +73,11 @@ public object TestQuery_ResponseAdapter { ) } - public override fun toJson( + override fun toJson( writer: JsonWriter, `value`: TestQuery.Data.TypeWithGraphQLKeywords, adapterContext: CompositeAdapterContext, - ): Unit { + ) { writer.name("on") NullableStringAdapter.toJson(writer, CustomScalarAdapters.Empty, value.on) diff --git a/libraries/apollo-compiler/src/test/graphql/com/example/antlr_tokens/kotlin/responseBased/antlr_tokens/adapter/TestQuery_VariablesAdapter.kt.expected b/libraries/apollo-compiler/src/test/graphql/com/example/antlr_tokens/kotlin/responseBased/antlr_tokens/adapter/TestQuery_VariablesAdapter.kt.expected index af72c1a6337..a51b82a285d 100644 --- a/libraries/apollo-compiler/src/test/graphql/com/example/antlr_tokens/kotlin/responseBased/antlr_tokens/adapter/TestQuery_VariablesAdapter.kt.expected +++ b/libraries/apollo-compiler/src/test/graphql/com/example/antlr_tokens/kotlin/responseBased/antlr_tokens/adapter/TestQuery_VariablesAdapter.kt.expected @@ -14,7 +14,6 @@ import com.apollographql.apollo3.api.present import com.example.antlr_tokens.TestQuery import kotlin.Boolean import kotlin.Suppress -import kotlin.Unit public object TestQuery_VariablesAdapter { @Suppress( @@ -26,7 +25,7 @@ public object TestQuery_VariablesAdapter { `value`: TestQuery, customScalarAdapters: CustomScalarAdapters, withBooleanDefaultValues: Boolean, - ): Unit { + ) { val adapterContext = CompositeAdapterContext.Builder().customScalarAdapters(customScalarAdapters).build() if (value.operation is Optional.Present) { diff --git a/libraries/apollo-compiler/src/test/graphql/com/example/arguments_hardcoded/kotlin/responseBased/arguments_hardcoded/TestQuery.kt.expected b/libraries/apollo-compiler/src/test/graphql/com/example/arguments_hardcoded/kotlin/responseBased/arguments_hardcoded/TestQuery.kt.expected index 98e0bd88bb4..5a835ba5348 100644 --- a/libraries/apollo-compiler/src/test/graphql/com/example/arguments_hardcoded/kotlin/responseBased/arguments_hardcoded/TestQuery.kt.expected +++ b/libraries/apollo-compiler/src/test/graphql/com/example/arguments_hardcoded/kotlin/responseBased/arguments_hardcoded/TestQuery.kt.expected @@ -18,33 +18,33 @@ import kotlin.Any import kotlin.Boolean import kotlin.Int import kotlin.String -import kotlin.Unit import kotlin.collections.List +import com.example.arguments_hardcoded.type.Query as CompiledQuery public class TestQuery() : Query { - public override fun equals(other: Any?): Boolean = other != null && other::class == this::class + override fun equals(other: Any?): Boolean = other != null && other::class == this::class - public override fun hashCode(): Int = this::class.hashCode() + override fun hashCode(): Int = this::class.hashCode() - public override fun id(): String = OPERATION_ID + override fun id(): String = OPERATION_ID - public override fun document(): String = OPERATION_DOCUMENT + override fun document(): String = OPERATION_DOCUMENT - public override fun name(): String = OPERATION_NAME + override fun name(): String = OPERATION_NAME - public override fun serializeVariables( + override fun serializeVariables( writer: JsonWriter, customScalarAdapters: CustomScalarAdapters, withBooleanDefaultValues: Boolean, - ): Unit { + ) { // This operation doesn't have any variable } - public override fun adapter(): CompositeAdapter = TestQuery_ResponseAdapter.Data.obj() + override fun adapter(): CompositeAdapter = TestQuery_ResponseAdapter.Data.obj() - public override fun rootField(): CompiledField = CompiledField.Builder( + override fun rootField(): CompiledField = CompiledField.Builder( name = "data", - type = com.example.arguments_hardcoded.type.Query.type + type = CompiledQuery.type ) .selections(selections = TestQuerySelections.__root) .build() diff --git a/libraries/apollo-compiler/src/test/graphql/com/example/arguments_hardcoded/kotlin/responseBased/arguments_hardcoded/adapter/TestQuery_ResponseAdapter.kt.expected b/libraries/apollo-compiler/src/test/graphql/com/example/arguments_hardcoded/kotlin/responseBased/arguments_hardcoded/adapter/TestQuery_ResponseAdapter.kt.expected index 01c0ec2b62b..b6ebe03673f 100644 --- a/libraries/apollo-compiler/src/test/graphql/com/example/arguments_hardcoded/kotlin/responseBased/arguments_hardcoded/adapter/TestQuery_ResponseAdapter.kt.expected +++ b/libraries/apollo-compiler/src/test/graphql/com/example/arguments_hardcoded/kotlin/responseBased/arguments_hardcoded/adapter/TestQuery_ResponseAdapter.kt.expected @@ -18,14 +18,13 @@ import com.apollographql.apollo3.api.obj import com.example.arguments_hardcoded.TestQuery import kotlin.Int import kotlin.String -import kotlin.Unit import kotlin.collections.List public object TestQuery_ResponseAdapter { public object Data : CompositeAdapter { public val RESPONSE_NAMES: List = listOf("reviews", "testNullableArguments") - public override fun fromJson(reader: JsonReader, adapterContext: CompositeAdapterContext): + override fun fromJson(reader: JsonReader, adapterContext: CompositeAdapterContext): TestQuery.Data { var _reviews: List? = null var _testNullableArguments: Int? = null @@ -44,11 +43,11 @@ public object TestQuery_ResponseAdapter { ) } - public override fun toJson( + override fun toJson( writer: JsonWriter, `value`: TestQuery.Data, adapterContext: CompositeAdapterContext, - ): Unit { + ) { writer.name("reviews") Review.obj().nullable().list().nullable().toJson(writer, value.reviews, adapterContext) @@ -59,7 +58,7 @@ public object TestQuery_ResponseAdapter { private object Review : CompositeAdapter { public val RESPONSE_NAMES: List = listOf("stars", "commentary") - public override fun fromJson(reader: JsonReader, adapterContext: CompositeAdapterContext): + override fun fromJson(reader: JsonReader, adapterContext: CompositeAdapterContext): TestQuery.Data.Review { var _stars: Int? = null var _commentary: String? = null @@ -78,11 +77,11 @@ public object TestQuery_ResponseAdapter { ) } - public override fun toJson( + override fun toJson( writer: JsonWriter, `value`: TestQuery.Data.Review, adapterContext: CompositeAdapterContext, - ): Unit { + ) { writer.name("stars") IntAdapter.toJson(writer, CustomScalarAdapters.Empty, value.stars) diff --git a/libraries/apollo-compiler/src/test/graphql/com/example/big_query/kotlin/responseBased/big_query/TestQuery.kt.expected b/libraries/apollo-compiler/src/test/graphql/com/example/big_query/kotlin/responseBased/big_query/TestQuery.kt.expected index de4241e9cd0..b7ec107170d 100644 --- a/libraries/apollo-compiler/src/test/graphql/com/example/big_query/kotlin/responseBased/big_query/TestQuery.kt.expected +++ b/libraries/apollo-compiler/src/test/graphql/com/example/big_query/kotlin/responseBased/big_query/TestQuery.kt.expected @@ -18,32 +18,32 @@ import kotlin.Any import kotlin.Boolean import kotlin.Int import kotlin.String -import kotlin.Unit +import com.example.big_query.type.Query as CompiledQuery public class TestQuery() : Query { - public override fun equals(other: Any?): Boolean = other != null && other::class == this::class + override fun equals(other: Any?): Boolean = other != null && other::class == this::class - public override fun hashCode(): Int = this::class.hashCode() + override fun hashCode(): Int = this::class.hashCode() - public override fun id(): String = OPERATION_ID + override fun id(): String = OPERATION_ID - public override fun document(): String = OPERATION_DOCUMENT + override fun document(): String = OPERATION_DOCUMENT - public override fun name(): String = OPERATION_NAME + override fun name(): String = OPERATION_NAME - public override fun serializeVariables( + override fun serializeVariables( writer: JsonWriter, customScalarAdapters: CustomScalarAdapters, withBooleanDefaultValues: Boolean, - ): Unit { + ) { // This operation doesn't have any variable } - public override fun adapter(): CompositeAdapter = TestQuery_ResponseAdapter.Data.obj() + override fun adapter(): CompositeAdapter = TestQuery_ResponseAdapter.Data.obj() - public override fun rootField(): CompiledField = CompiledField.Builder( + override fun rootField(): CompiledField = CompiledField.Builder( name = "data", - type = com.example.big_query.type.Query.type + type = CompiledQuery.type ) .selections(selections = TestQuerySelections.__root) .build() diff --git a/libraries/apollo-compiler/src/test/graphql/com/example/big_query/kotlin/responseBased/big_query/adapter/TestQuery_ResponseAdapter.kt.expected b/libraries/apollo-compiler/src/test/graphql/com/example/big_query/kotlin/responseBased/big_query/adapter/TestQuery_ResponseAdapter.kt.expected index 9ecbf627581..863de8b7dd3 100644 --- a/libraries/apollo-compiler/src/test/graphql/com/example/big_query/kotlin/responseBased/big_query/adapter/TestQuery_ResponseAdapter.kt.expected +++ b/libraries/apollo-compiler/src/test/graphql/com/example/big_query/kotlin/responseBased/big_query/adapter/TestQuery_ResponseAdapter.kt.expected @@ -15,14 +15,13 @@ import com.apollographql.apollo3.api.nullable import com.apollographql.apollo3.api.obj import com.example.big_query.TestQuery import kotlin.String -import kotlin.Unit import kotlin.collections.List public object TestQuery_ResponseAdapter { public object Data : CompositeAdapter { public val RESPONSE_NAMES: List = listOf("character") - public override fun fromJson(reader: JsonReader, adapterContext: CompositeAdapterContext): + override fun fromJson(reader: JsonReader, adapterContext: CompositeAdapterContext): TestQuery.Data { var _character: TestQuery.Data.Character? = null @@ -38,11 +37,11 @@ public object TestQuery_ResponseAdapter { ) } - public override fun toJson( + override fun toJson( writer: JsonWriter, `value`: TestQuery.Data, adapterContext: CompositeAdapterContext, - ): Unit { + ) { writer.name("character") Character.obj().nullable().toJson(writer, value.character, adapterContext) } @@ -50,7 +49,7 @@ public object TestQuery_ResponseAdapter { private object Character : CompositeAdapter { public val RESPONSE_NAMES: List = listOf("name") - public override fun fromJson(reader: JsonReader, adapterContext: CompositeAdapterContext): + override fun fromJson(reader: JsonReader, adapterContext: CompositeAdapterContext): TestQuery.Data.Character { var _name: String? = null @@ -66,11 +65,11 @@ public object TestQuery_ResponseAdapter { ) } - public override fun toJson( + override fun toJson( writer: JsonWriter, `value`: TestQuery.Data.Character, adapterContext: CompositeAdapterContext, - ): Unit { + ) { writer.name("name") StringAdapter.toJson(writer, CustomScalarAdapters.Empty, value.name) } diff --git a/libraries/apollo-compiler/src/test/graphql/com/example/capitalized_fields/kotlin/operationBased/capitalized_fields/TestQuery.kt.expected b/libraries/apollo-compiler/src/test/graphql/com/example/capitalized_fields/kotlin/operationBased/capitalized_fields/TestQuery.kt.expected index 2b55f1ea3ca..dc4ba16ef5d 100644 --- a/libraries/apollo-compiler/src/test/graphql/com/example/capitalized_fields/kotlin/operationBased/capitalized_fields/TestQuery.kt.expected +++ b/libraries/apollo-compiler/src/test/graphql/com/example/capitalized_fields/kotlin/operationBased/capitalized_fields/TestQuery.kt.expected @@ -18,32 +18,32 @@ import kotlin.Any import kotlin.Boolean import kotlin.Int import kotlin.String -import kotlin.Unit +import com.example.capitalized_fields.type.Query as CompiledQuery public class TestQuery() : Query { - public override fun equals(other: Any?): Boolean = other != null && other::class == this::class + override fun equals(other: Any?): Boolean = other != null && other::class == this::class - public override fun hashCode(): Int = this::class.hashCode() + override fun hashCode(): Int = this::class.hashCode() - public override fun id(): String = OPERATION_ID + override fun id(): String = OPERATION_ID - public override fun document(): String = OPERATION_DOCUMENT + override fun document(): String = OPERATION_DOCUMENT - public override fun name(): String = OPERATION_NAME + override fun name(): String = OPERATION_NAME - public override fun serializeVariables( + override fun serializeVariables( writer: JsonWriter, customScalarAdapters: CustomScalarAdapters, withBooleanDefaultValues: Boolean, - ): Unit { + ) { // This operation doesn't have any variable } - public override fun adapter(): CompositeAdapter = TestQuery_ResponseAdapter.Data.obj() + override fun adapter(): CompositeAdapter = TestQuery_ResponseAdapter.Data.obj() - public override fun rootField(): CompiledField = CompiledField.Builder( + override fun rootField(): CompiledField = CompiledField.Builder( name = "data", - type = com.example.capitalized_fields.type.Query.type + type = CompiledQuery.type ) .selections(selections = TestQuerySelections.__root) .build() diff --git a/libraries/apollo-compiler/src/test/graphql/com/example/capitalized_fields/kotlin/operationBased/capitalized_fields/adapter/TestQuery_ResponseAdapter.kt.expected b/libraries/apollo-compiler/src/test/graphql/com/example/capitalized_fields/kotlin/operationBased/capitalized_fields/adapter/TestQuery_ResponseAdapter.kt.expected index b52bbb27fa3..09959f8d161 100644 --- a/libraries/apollo-compiler/src/test/graphql/com/example/capitalized_fields/kotlin/operationBased/capitalized_fields/adapter/TestQuery_ResponseAdapter.kt.expected +++ b/libraries/apollo-compiler/src/test/graphql/com/example/capitalized_fields/kotlin/operationBased/capitalized_fields/adapter/TestQuery_ResponseAdapter.kt.expected @@ -16,14 +16,13 @@ import com.apollographql.apollo3.api.nullable import com.apollographql.apollo3.api.obj import com.example.capitalized_fields.TestQuery import kotlin.String -import kotlin.Unit import kotlin.collections.List public object TestQuery_ResponseAdapter { public object Data : CompositeAdapter { public val RESPONSE_NAMES: List = listOf("Horse") - public override fun fromJson(reader: JsonReader, adapterContext: CompositeAdapterContext): + override fun fromJson(reader: JsonReader, adapterContext: CompositeAdapterContext): TestQuery.Data { var _Horse: TestQuery.Horse? = null @@ -39,11 +38,11 @@ public object TestQuery_ResponseAdapter { ) } - public override fun toJson( + override fun toJson( writer: JsonWriter, `value`: TestQuery.Data, adapterContext: CompositeAdapterContext, - ): Unit { + ) { writer.name("Horse") Horse.obj(true).nullable().toJson(writer, value.Horse, adapterContext) } @@ -52,7 +51,7 @@ public object TestQuery_ResponseAdapter { public object Horse : CompositeAdapter { public val RESPONSE_NAMES: List = listOf("__typename", "Donkey") - public override fun fromJson(reader: JsonReader, adapterContext: CompositeAdapterContext): + override fun fromJson(reader: JsonReader, adapterContext: CompositeAdapterContext): TestQuery.Horse { var __typename: String? = null var _Donkey: String? = null @@ -76,11 +75,11 @@ public object TestQuery_ResponseAdapter { ) } - public override fun toJson( + override fun toJson( writer: JsonWriter, `value`: TestQuery.Horse, adapterContext: CompositeAdapterContext, - ): Unit { + ) { writer.name("__typename") StringAdapter.toJson(writer, CustomScalarAdapters.Empty, value.__typename) @@ -95,7 +94,7 @@ public object TestQuery_ResponseAdapter { public object OnHorse : CompositeAdapter { public val RESPONSE_NAMES: List = listOf("Cow") - public override fun fromJson(reader: JsonReader, adapterContext: CompositeAdapterContext): + override fun fromJson(reader: JsonReader, adapterContext: CompositeAdapterContext): TestQuery.OnHorse { var _Cow: TestQuery.Cow? = null @@ -111,11 +110,11 @@ public object TestQuery_ResponseAdapter { ) } - public override fun toJson( + override fun toJson( writer: JsonWriter, `value`: TestQuery.OnHorse, adapterContext: CompositeAdapterContext, - ): Unit { + ) { writer.name("Cow") Cow.obj().nullable().toJson(writer, value.Cow, adapterContext) } @@ -124,7 +123,7 @@ public object TestQuery_ResponseAdapter { public object Cow : CompositeAdapter { public val RESPONSE_NAMES: List = listOf("Moo") - public override fun fromJson(reader: JsonReader, adapterContext: CompositeAdapterContext): + override fun fromJson(reader: JsonReader, adapterContext: CompositeAdapterContext): TestQuery.Cow { var _Moo: String? = null @@ -140,11 +139,11 @@ public object TestQuery_ResponseAdapter { ) } - public override fun toJson( + override fun toJson( writer: JsonWriter, `value`: TestQuery.Cow, adapterContext: CompositeAdapterContext, - ): Unit { + ) { writer.name("Moo") NullableStringAdapter.toJson(writer, CustomScalarAdapters.Empty, value.Moo) } diff --git a/libraries/apollo-compiler/src/test/graphql/com/example/capitalized_fields/kotlin/responseBased/capitalized_fields/TestQuery.kt.expected b/libraries/apollo-compiler/src/test/graphql/com/example/capitalized_fields/kotlin/responseBased/capitalized_fields/TestQuery.kt.expected index 4d419687325..df709898a7d 100644 --- a/libraries/apollo-compiler/src/test/graphql/com/example/capitalized_fields/kotlin/responseBased/capitalized_fields/TestQuery.kt.expected +++ b/libraries/apollo-compiler/src/test/graphql/com/example/capitalized_fields/kotlin/responseBased/capitalized_fields/TestQuery.kt.expected @@ -18,32 +18,32 @@ import kotlin.Any import kotlin.Boolean import kotlin.Int import kotlin.String -import kotlin.Unit +import com.example.capitalized_fields.type.Query as CompiledQuery public class TestQuery() : Query { - public override fun equals(other: Any?): Boolean = other != null && other::class == this::class + override fun equals(other: Any?): Boolean = other != null && other::class == this::class - public override fun hashCode(): Int = this::class.hashCode() + override fun hashCode(): Int = this::class.hashCode() - public override fun id(): String = OPERATION_ID + override fun id(): String = OPERATION_ID - public override fun document(): String = OPERATION_DOCUMENT + override fun document(): String = OPERATION_DOCUMENT - public override fun name(): String = OPERATION_NAME + override fun name(): String = OPERATION_NAME - public override fun serializeVariables( + override fun serializeVariables( writer: JsonWriter, customScalarAdapters: CustomScalarAdapters, withBooleanDefaultValues: Boolean, - ): Unit { + ) { // This operation doesn't have any variable } - public override fun adapter(): CompositeAdapter = TestQuery_ResponseAdapter.Data.obj() + override fun adapter(): CompositeAdapter = TestQuery_ResponseAdapter.Data.obj() - public override fun rootField(): CompiledField = CompiledField.Builder( + override fun rootField(): CompiledField = CompiledField.Builder( name = "data", - type = com.example.capitalized_fields.type.Query.type + type = CompiledQuery.type ) .selections(selections = TestQuerySelections.__root) .build() diff --git a/libraries/apollo-compiler/src/test/graphql/com/example/capitalized_fields/kotlin/responseBased/capitalized_fields/adapter/TestQuery_ResponseAdapter.kt.expected b/libraries/apollo-compiler/src/test/graphql/com/example/capitalized_fields/kotlin/responseBased/capitalized_fields/adapter/TestQuery_ResponseAdapter.kt.expected index 2c3583db7be..a29b58b6523 100644 --- a/libraries/apollo-compiler/src/test/graphql/com/example/capitalized_fields/kotlin/responseBased/capitalized_fields/adapter/TestQuery_ResponseAdapter.kt.expected +++ b/libraries/apollo-compiler/src/test/graphql/com/example/capitalized_fields/kotlin/responseBased/capitalized_fields/adapter/TestQuery_ResponseAdapter.kt.expected @@ -16,14 +16,13 @@ import com.apollographql.apollo3.api.nullable import com.apollographql.apollo3.api.obj import com.example.capitalized_fields.TestQuery import kotlin.String -import kotlin.Unit import kotlin.collections.List public object TestQuery_ResponseAdapter { public object Data : CompositeAdapter { public val RESPONSE_NAMES: List = listOf("Horse") - public override fun fromJson(reader: JsonReader, adapterContext: CompositeAdapterContext): + override fun fromJson(reader: JsonReader, adapterContext: CompositeAdapterContext): TestQuery.Data { var _Horse: TestQuery.Horse? = null @@ -39,11 +38,11 @@ public object TestQuery_ResponseAdapter { ) } - public override fun toJson( + override fun toJson( writer: JsonWriter, `value`: TestQuery.Data, adapterContext: CompositeAdapterContext, - ): Unit { + ) { writer.name("Horse") Horse.obj().nullable().toJson(writer, value.Horse, adapterContext) } @@ -52,7 +51,7 @@ public object TestQuery_ResponseAdapter { public object Horse : CompositeAdapter { public val RESPONSE_NAMES: List = listOf("__typename", "Donkey", "Cow") - public override fun fromJson(reader: JsonReader, adapterContext: CompositeAdapterContext): + override fun fromJson(reader: JsonReader, adapterContext: CompositeAdapterContext): TestQuery.Horse { var __typename: String? = null var _Donkey: String? = null @@ -74,11 +73,11 @@ public object TestQuery_ResponseAdapter { ) } - public override fun toJson( + override fun toJson( writer: JsonWriter, `value`: TestQuery.Horse, adapterContext: CompositeAdapterContext, - ): Unit { + ) { writer.name("__typename") StringAdapter.toJson(writer, CustomScalarAdapters.Empty, value.__typename) @@ -93,7 +92,7 @@ public object TestQuery_ResponseAdapter { public object Cow : CompositeAdapter { public val RESPONSE_NAMES: List = listOf("Moo") - public override fun fromJson(reader: JsonReader, adapterContext: CompositeAdapterContext): + override fun fromJson(reader: JsonReader, adapterContext: CompositeAdapterContext): TestQuery.Cow { var _Moo: String? = null @@ -109,11 +108,11 @@ public object TestQuery_ResponseAdapter { ) } - public override fun toJson( + override fun toJson( writer: JsonWriter, `value`: TestQuery.Cow, adapterContext: CompositeAdapterContext, - ): Unit { + ) { writer.name("Moo") NullableStringAdapter.toJson(writer, CustomScalarAdapters.Empty, value.Moo) } diff --git a/libraries/apollo-compiler/src/test/graphql/com/example/case_sensitive_enum/kotlin/responseBased/case_sensitive_enum/TestQuery.kt.expected b/libraries/apollo-compiler/src/test/graphql/com/example/case_sensitive_enum/kotlin/responseBased/case_sensitive_enum/TestQuery.kt.expected index 1108fb04445..09193aaeaa6 100644 --- a/libraries/apollo-compiler/src/test/graphql/com/example/case_sensitive_enum/kotlin/responseBased/case_sensitive_enum/TestQuery.kt.expected +++ b/libraries/apollo-compiler/src/test/graphql/com/example/case_sensitive_enum/kotlin/responseBased/case_sensitive_enum/TestQuery.kt.expected @@ -19,32 +19,32 @@ import kotlin.Any import kotlin.Boolean import kotlin.Int import kotlin.String -import kotlin.Unit +import com.example.case_sensitive_enum.type.Query as CompiledQuery public class TestQuery() : Query { - public override fun equals(other: Any?): Boolean = other != null && other::class == this::class + override fun equals(other: Any?): Boolean = other != null && other::class == this::class - public override fun hashCode(): Int = this::class.hashCode() + override fun hashCode(): Int = this::class.hashCode() - public override fun id(): String = OPERATION_ID + override fun id(): String = OPERATION_ID - public override fun document(): String = OPERATION_DOCUMENT + override fun document(): String = OPERATION_DOCUMENT - public override fun name(): String = OPERATION_NAME + override fun name(): String = OPERATION_NAME - public override fun serializeVariables( + override fun serializeVariables( writer: JsonWriter, customScalarAdapters: CustomScalarAdapters, withBooleanDefaultValues: Boolean, - ): Unit { + ) { // This operation doesn't have any variable } - public override fun adapter(): CompositeAdapter = TestQuery_ResponseAdapter.Data.obj() + override fun adapter(): CompositeAdapter = TestQuery_ResponseAdapter.Data.obj() - public override fun rootField(): CompiledField = CompiledField.Builder( + override fun rootField(): CompiledField = CompiledField.Builder( name = "data", - type = com.example.case_sensitive_enum.type.Query.type + type = CompiledQuery.type ) .selections(selections = TestQuerySelections.__root) .build() diff --git a/libraries/apollo-compiler/src/test/graphql/com/example/case_sensitive_enum/kotlin/responseBased/case_sensitive_enum/adapter/TestQuery_ResponseAdapter.kt.expected b/libraries/apollo-compiler/src/test/graphql/com/example/case_sensitive_enum/kotlin/responseBased/case_sensitive_enum/adapter/TestQuery_ResponseAdapter.kt.expected index a903b057b93..97231310da5 100644 --- a/libraries/apollo-compiler/src/test/graphql/com/example/case_sensitive_enum/kotlin/responseBased/case_sensitive_enum/adapter/TestQuery_ResponseAdapter.kt.expected +++ b/libraries/apollo-compiler/src/test/graphql/com/example/case_sensitive_enum/kotlin/responseBased/case_sensitive_enum/adapter/TestQuery_ResponseAdapter.kt.expected @@ -15,14 +15,13 @@ import com.example.case_sensitive_enum.TestQuery import com.example.case_sensitive_enum.type.Enum import com.example.case_sensitive_enum.type.adapter.Enum_ResponseAdapter import kotlin.String -import kotlin.Unit import kotlin.collections.List public object TestQuery_ResponseAdapter { public object Data : CompositeAdapter { public val RESPONSE_NAMES: List = listOf("enum") - public override fun fromJson(reader: JsonReader, adapterContext: CompositeAdapterContext): + override fun fromJson(reader: JsonReader, adapterContext: CompositeAdapterContext): TestQuery.Data { var _enum: Enum? = null @@ -38,11 +37,11 @@ public object TestQuery_ResponseAdapter { ) } - public override fun toJson( + override fun toJson( writer: JsonWriter, `value`: TestQuery.Data, adapterContext: CompositeAdapterContext, - ): Unit { + ) { writer.name("enum") Enum_ResponseAdapter.nullable().toJson(writer, CustomScalarAdapters.Empty, value.`enum`) } diff --git a/libraries/apollo-compiler/src/test/graphql/com/example/case_sensitive_enum/kotlin/responseBased/case_sensitive_enum/type/adapter/Enum_ResponseAdapter.kt.expected b/libraries/apollo-compiler/src/test/graphql/com/example/case_sensitive_enum/kotlin/responseBased/case_sensitive_enum/type/adapter/Enum_ResponseAdapter.kt.expected index 41afc1184f6..c27ae2a899a 100644 --- a/libraries/apollo-compiler/src/test/graphql/com/example/case_sensitive_enum/kotlin/responseBased/case_sensitive_enum/type/adapter/Enum_ResponseAdapter.kt.expected +++ b/libraries/apollo-compiler/src/test/graphql/com/example/case_sensitive_enum/kotlin/responseBased/case_sensitive_enum/type/adapter/Enum_ResponseAdapter.kt.expected @@ -10,20 +10,18 @@ import com.apollographql.apollo3.api.CustomScalarAdapters import com.apollographql.apollo3.api.json.JsonReader import com.apollographql.apollo3.api.json.JsonWriter import com.example.case_sensitive_enum.type.Enum -import kotlin.Unit public object Enum_ResponseAdapter : Adapter { - public override fun fromJson(reader: JsonReader, customScalarAdapters: CustomScalarAdapters): - Enum { + override fun fromJson(reader: JsonReader, customScalarAdapters: CustomScalarAdapters): Enum { val rawValue = reader.nextString()!! return Enum.safeValueOf(rawValue) } - public override fun toJson( + override fun toJson( writer: JsonWriter, customScalarAdapters: CustomScalarAdapters, `value`: Enum, - ): Unit { + ) { writer.value(value.rawValue) } } diff --git a/libraries/apollo-compiler/src/test/graphql/com/example/companion/kotlin/operationBased/companion/TestQuery.kt.expected b/libraries/apollo-compiler/src/test/graphql/com/example/companion/kotlin/operationBased/companion/TestQuery.kt.expected index ea1e1862e22..805964a77ca 100644 --- a/libraries/apollo-compiler/src/test/graphql/com/example/companion/kotlin/operationBased/companion/TestQuery.kt.expected +++ b/libraries/apollo-compiler/src/test/graphql/com/example/companion/kotlin/operationBased/companion/TestQuery.kt.expected @@ -18,32 +18,32 @@ import kotlin.Any import kotlin.Boolean import kotlin.Int import kotlin.String -import kotlin.Unit +import com.example.`companion`.type.Query as CompiledQuery public class TestQuery() : Query { - public override fun equals(other: Any?): Boolean = other != null && other::class == this::class + override fun equals(other: Any?): Boolean = other != null && other::class == this::class - public override fun hashCode(): Int = this::class.hashCode() + override fun hashCode(): Int = this::class.hashCode() - public override fun id(): String = OPERATION_ID + override fun id(): String = OPERATION_ID - public override fun document(): String = OPERATION_DOCUMENT + override fun document(): String = OPERATION_DOCUMENT - public override fun name(): String = OPERATION_NAME + override fun name(): String = OPERATION_NAME - public override fun serializeVariables( + override fun serializeVariables( writer: JsonWriter, customScalarAdapters: CustomScalarAdapters, withBooleanDefaultValues: Boolean, - ): Unit { + ) { // This operation doesn't have any variable } - public override fun adapter(): CompositeAdapter = TestQuery_ResponseAdapter.Data.obj() + override fun adapter(): CompositeAdapter = TestQuery_ResponseAdapter.Data.obj() - public override fun rootField(): CompiledField = CompiledField.Builder( + override fun rootField(): CompiledField = CompiledField.Builder( name = "data", - type = com.example.`companion`.type.Query.type + type = CompiledQuery.type ) .selections(selections = TestQuerySelections.__root) .build() diff --git a/libraries/apollo-compiler/src/test/graphql/com/example/companion/kotlin/operationBased/companion/adapter/TestQuery_ResponseAdapter.kt.expected b/libraries/apollo-compiler/src/test/graphql/com/example/companion/kotlin/operationBased/companion/adapter/TestQuery_ResponseAdapter.kt.expected index 1575e6e7aea..9c3d2d5e3db 100644 --- a/libraries/apollo-compiler/src/test/graphql/com/example/companion/kotlin/operationBased/companion/adapter/TestQuery_ResponseAdapter.kt.expected +++ b/libraries/apollo-compiler/src/test/graphql/com/example/companion/kotlin/operationBased/companion/adapter/TestQuery_ResponseAdapter.kt.expected @@ -16,14 +16,13 @@ import com.apollographql.apollo3.api.obj import com.example.`companion`.TestQuery import kotlin.Int import kotlin.String -import kotlin.Unit import kotlin.collections.List public object TestQuery_ResponseAdapter { public object Data : CompositeAdapter { public val RESPONSE_NAMES: List = listOf("companion") - public override fun fromJson(reader: JsonReader, adapterContext: CompositeAdapterContext): + override fun fromJson(reader: JsonReader, adapterContext: CompositeAdapterContext): TestQuery.Data { var _companion: TestQuery.Companion_? = null @@ -39,11 +38,11 @@ public object TestQuery_ResponseAdapter { ) } - public override fun toJson( + override fun toJson( writer: JsonWriter, `value`: TestQuery.Data, adapterContext: CompositeAdapterContext, - ): Unit { + ) { writer.name("companion") Companion.obj().nullable().toJson(writer, value.`companion`, adapterContext) } @@ -52,7 +51,7 @@ public object TestQuery_ResponseAdapter { public object Companion : CompositeAdapter { public val RESPONSE_NAMES: List = listOf("foo") - public override fun fromJson(reader: JsonReader, adapterContext: CompositeAdapterContext): + override fun fromJson(reader: JsonReader, adapterContext: CompositeAdapterContext): TestQuery.Companion_ { var _foo: Int? = null @@ -68,11 +67,11 @@ public object TestQuery_ResponseAdapter { ) } - public override fun toJson( + override fun toJson( writer: JsonWriter, `value`: TestQuery.Companion_, adapterContext: CompositeAdapterContext, - ): Unit { + ) { writer.name("foo") IntAdapter.toJson(writer, CustomScalarAdapters.Empty, value.foo) } diff --git a/libraries/apollo-compiler/src/test/graphql/com/example/custom_scalar_type/kotlin/responseBased/custom_scalar_type/TestQuery.kt.expected b/libraries/apollo-compiler/src/test/graphql/com/example/custom_scalar_type/kotlin/responseBased/custom_scalar_type/TestQuery.kt.expected index 5123befb58b..9efae703418 100644 --- a/libraries/apollo-compiler/src/test/graphql/com/example/custom_scalar_type/kotlin/responseBased/custom_scalar_type/TestQuery.kt.expected +++ b/libraries/apollo-compiler/src/test/graphql/com/example/custom_scalar_type/kotlin/responseBased/custom_scalar_type/TestQuery.kt.expected @@ -20,33 +20,33 @@ import kotlin.Boolean import kotlin.Int import kotlin.Long import kotlin.String -import kotlin.Unit import kotlin.collections.List +import com.example.custom_scalar_type.type.Query as CompiledQuery public class TestQuery() : Query { - public override fun equals(other: Any?): Boolean = other != null && other::class == this::class + override fun equals(other: Any?): Boolean = other != null && other::class == this::class - public override fun hashCode(): Int = this::class.hashCode() + override fun hashCode(): Int = this::class.hashCode() - public override fun id(): String = OPERATION_ID + override fun id(): String = OPERATION_ID - public override fun document(): String = OPERATION_DOCUMENT + override fun document(): String = OPERATION_DOCUMENT - public override fun name(): String = OPERATION_NAME + override fun name(): String = OPERATION_NAME - public override fun serializeVariables( + override fun serializeVariables( writer: JsonWriter, customScalarAdapters: CustomScalarAdapters, withBooleanDefaultValues: Boolean, - ): Unit { + ) { // This operation doesn't have any variable } - public override fun adapter(): CompositeAdapter = TestQuery_ResponseAdapter.Data.obj() + override fun adapter(): CompositeAdapter = TestQuery_ResponseAdapter.Data.obj() - public override fun rootField(): CompiledField = CompiledField.Builder( + override fun rootField(): CompiledField = CompiledField.Builder( name = "data", - type = com.example.custom_scalar_type.type.Query.type + type = CompiledQuery.type ) .selections(selections = TestQuerySelections.__root) .build() diff --git a/libraries/apollo-compiler/src/test/graphql/com/example/custom_scalar_type/kotlin/responseBased/custom_scalar_type/adapter/TestQuery_ResponseAdapter.kt.expected b/libraries/apollo-compiler/src/test/graphql/com/example/custom_scalar_type/kotlin/responseBased/custom_scalar_type/adapter/TestQuery_ResponseAdapter.kt.expected index 2ce25b6a312..b0dbbe66565 100644 --- a/libraries/apollo-compiler/src/test/graphql/com/example/custom_scalar_type/kotlin/responseBased/custom_scalar_type/adapter/TestQuery_ResponseAdapter.kt.expected +++ b/libraries/apollo-compiler/src/test/graphql/com/example/custom_scalar_type/kotlin/responseBased/custom_scalar_type/adapter/TestQuery_ResponseAdapter.kt.expected @@ -16,18 +16,18 @@ import com.apollographql.apollo3.api.nullable import com.apollographql.apollo3.api.obj import com.example.custom_scalar_type.TestQuery import com.example.custom_scalar_type.type.GraphQLID -import java.util.Date import kotlin.Any import kotlin.Long import kotlin.String -import kotlin.Unit import kotlin.collections.List +import com.example.custom_scalar_type.type.Date as TypeDate +import java.util.Date as UtilDate public object TestQuery_ResponseAdapter { public object Data : CompositeAdapter { public val RESPONSE_NAMES: List = listOf("hero") - public override fun fromJson(reader: JsonReader, adapterContext: CompositeAdapterContext): + override fun fromJson(reader: JsonReader, adapterContext: CompositeAdapterContext): TestQuery.Data { var _hero: TestQuery.Data.Hero? = null @@ -43,11 +43,11 @@ public object TestQuery_ResponseAdapter { ) } - public override fun toJson( + override fun toJson( writer: JsonWriter, `value`: TestQuery.Data, adapterContext: CompositeAdapterContext, - ): Unit { + ) { writer.name("hero") Hero.obj().nullable().toJson(writer, value.hero, adapterContext) } @@ -56,12 +56,12 @@ public object TestQuery_ResponseAdapter { public val RESPONSE_NAMES: List = listOf("id", "name", "birthDate", "appearanceDates", "fieldWithUnsupportedType", "profileLink", "links") - public override fun fromJson(reader: JsonReader, adapterContext: CompositeAdapterContext): + override fun fromJson(reader: JsonReader, adapterContext: CompositeAdapterContext): TestQuery.Data.Hero { var _id: Long? = null var _name: String? = null - var _birthDate: Date? = null - var _appearanceDates: List? = null + var _birthDate: UtilDate? = null + var _appearanceDates: List? = null var _fieldWithUnsupportedType: Any? = null var _profileLink: String? = null var _links: List? = null @@ -70,8 +70,8 @@ public object TestQuery_ResponseAdapter { when (reader.selectName(RESPONSE_NAMES)) { 0 -> _id = adapterContext.customScalarAdapters.responseAdapterFor(GraphQLID.type).fromJson(reader, CustomScalarAdapters.Empty) 1 -> _name = com.example.MyStringAdapter().fromJson(reader, CustomScalarAdapters.Empty) - 2 -> _birthDate = adapterContext.customScalarAdapters.responseAdapterFor(com.example.custom_scalar_type.type.Date.type).fromJson(reader, CustomScalarAdapters.Empty) - 3 -> _appearanceDates = adapterContext.customScalarAdapters.responseAdapterFor(com.example.custom_scalar_type.type.Date.type).list().fromJson(reader, CustomScalarAdapters.Empty) + 2 -> _birthDate = adapterContext.customScalarAdapters.responseAdapterFor(TypeDate.type).fromJson(reader, CustomScalarAdapters.Empty) + 3 -> _appearanceDates = adapterContext.customScalarAdapters.responseAdapterFor(TypeDate.type).list().fromJson(reader, CustomScalarAdapters.Empty) 4 -> _fieldWithUnsupportedType = AnyAdapter.fromJson(reader, CustomScalarAdapters.Empty) 5 -> _profileLink = com.example.UrlAdapter.fromJson(reader, CustomScalarAdapters.Empty) 6 -> _links = com.example.UrlAdapter.list().fromJson(reader, CustomScalarAdapters.Empty) @@ -90,11 +90,11 @@ public object TestQuery_ResponseAdapter { ) } - public override fun toJson( + override fun toJson( writer: JsonWriter, `value`: TestQuery.Data.Hero, adapterContext: CompositeAdapterContext, - ): Unit { + ) { writer.name("id") adapterContext.customScalarAdapters.responseAdapterFor(GraphQLID.type).toJson(writer, CustomScalarAdapters.Empty, value.id) @@ -103,11 +103,11 @@ public object TestQuery_ResponseAdapter { com.example.MyStringAdapter().toJson(writer, CustomScalarAdapters.Empty, value.name) writer.name("birthDate") - adapterContext.customScalarAdapters.responseAdapterFor(com.example.custom_scalar_type.type.Date.type).toJson(writer, + adapterContext.customScalarAdapters.responseAdapterFor(TypeDate.type).toJson(writer, CustomScalarAdapters.Empty, value.birthDate) writer.name("appearanceDates") - adapterContext.customScalarAdapters.responseAdapterFor(com.example.custom_scalar_type.type.Date.type).list().toJson(writer, + adapterContext.customScalarAdapters.responseAdapterFor(TypeDate.type).list().toJson(writer, CustomScalarAdapters.Empty, value.appearanceDates) writer.name("fieldWithUnsupportedType") diff --git a/libraries/apollo-compiler/src/test/graphql/com/example/data_builders/kotlin/operationBased/data_builders/AnimalQuery.kt.expected b/libraries/apollo-compiler/src/test/graphql/com/example/data_builders/kotlin/operationBased/data_builders/AnimalQuery.kt.expected index 37c015b8957..6cbfafb3a24 100644 --- a/libraries/apollo-compiler/src/test/graphql/com/example/data_builders/kotlin/operationBased/data_builders/AnimalQuery.kt.expected +++ b/libraries/apollo-compiler/src/test/graphql/com/example/data_builders/kotlin/operationBased/data_builders/AnimalQuery.kt.expected @@ -27,31 +27,32 @@ import kotlin.Boolean import kotlin.Int import kotlin.String import kotlin.Unit +import com.example.data_builders.type.Query as CompiledQuery public class AnimalQuery() : Query { - public override fun equals(other: Any?): Boolean = other != null && other::class == this::class + override fun equals(other: Any?): Boolean = other != null && other::class == this::class - public override fun hashCode(): Int = this::class.hashCode() + override fun hashCode(): Int = this::class.hashCode() - public override fun id(): String = OPERATION_ID + override fun id(): String = OPERATION_ID - public override fun document(): String = OPERATION_DOCUMENT + override fun document(): String = OPERATION_DOCUMENT - public override fun name(): String = OPERATION_NAME + override fun name(): String = OPERATION_NAME - public override fun serializeVariables( + override fun serializeVariables( writer: JsonWriter, customScalarAdapters: CustomScalarAdapters, withBooleanDefaultValues: Boolean, - ): Unit { + ) { // This operation doesn't have any variable } - public override fun adapter(): CompositeAdapter = AnimalQuery_ResponseAdapter.Data.obj() + override fun adapter(): CompositeAdapter = AnimalQuery_ResponseAdapter.Data.obj() - public override fun rootField(): CompiledField = CompiledField.Builder( + override fun rootField(): CompiledField = CompiledField.Builder( name = "data", - type = com.example.data_builders.type.Query.type + type = CompiledQuery.type ) .selections(selections = AnimalQuerySelections.__root) .build() @@ -105,7 +106,7 @@ public class AnimalQuery() : Query { public fun Data(resolver: FakeResolver = DefaultFakeResolver(__Schema.all), block: QueryBuilder.() -> Unit = {}): Data = buildData( - com.example.data_builders.type.Query, + CompiledQuery, block, AnimalQuery_ResponseAdapter.Data, AnimalQuerySelections.__root, diff --git a/libraries/apollo-compiler/src/test/graphql/com/example/data_builders/kotlin/operationBased/data_builders/CharacterQuery.kt.expected b/libraries/apollo-compiler/src/test/graphql/com/example/data_builders/kotlin/operationBased/data_builders/CharacterQuery.kt.expected index 6d9267c64bb..01d10e17fbd 100644 --- a/libraries/apollo-compiler/src/test/graphql/com/example/data_builders/kotlin/operationBased/data_builders/CharacterQuery.kt.expected +++ b/libraries/apollo-compiler/src/test/graphql/com/example/data_builders/kotlin/operationBased/data_builders/CharacterQuery.kt.expected @@ -27,31 +27,32 @@ import kotlin.Boolean import kotlin.Int import kotlin.String import kotlin.Unit +import com.example.data_builders.type.Query as CompiledQuery public class CharacterQuery() : Query { - public override fun equals(other: Any?): Boolean = other != null && other::class == this::class + override fun equals(other: Any?): Boolean = other != null && other::class == this::class - public override fun hashCode(): Int = this::class.hashCode() + override fun hashCode(): Int = this::class.hashCode() - public override fun id(): String = OPERATION_ID + override fun id(): String = OPERATION_ID - public override fun document(): String = OPERATION_DOCUMENT + override fun document(): String = OPERATION_DOCUMENT - public override fun name(): String = OPERATION_NAME + override fun name(): String = OPERATION_NAME - public override fun serializeVariables( + override fun serializeVariables( writer: JsonWriter, customScalarAdapters: CustomScalarAdapters, withBooleanDefaultValues: Boolean, - ): Unit { + ) { // This operation doesn't have any variable } - public override fun adapter(): CompositeAdapter = CharacterQuery_ResponseAdapter.Data.obj() + override fun adapter(): CompositeAdapter = CharacterQuery_ResponseAdapter.Data.obj() - public override fun rootField(): CompiledField = CompiledField.Builder( + override fun rootField(): CompiledField = CompiledField.Builder( name = "data", - type = com.example.data_builders.type.Query.type + type = CompiledQuery.type ) .selections(selections = CharacterQuerySelections.__root) .build() @@ -109,7 +110,7 @@ public class CharacterQuery() : Query { public fun Data(resolver: FakeResolver = DefaultFakeResolver(__Schema.all), block: QueryBuilder.() -> Unit = {}): Data = buildData( - com.example.data_builders.type.Query, + CompiledQuery, block, CharacterQuery_ResponseAdapter.Data, CharacterQuerySelections.__root, diff --git a/libraries/apollo-compiler/src/test/graphql/com/example/data_builders/kotlin/operationBased/data_builders/NodeQuery.kt.expected b/libraries/apollo-compiler/src/test/graphql/com/example/data_builders/kotlin/operationBased/data_builders/NodeQuery.kt.expected index 020646cc15a..5df867a17c2 100644 --- a/libraries/apollo-compiler/src/test/graphql/com/example/data_builders/kotlin/operationBased/data_builders/NodeQuery.kt.expected +++ b/libraries/apollo-compiler/src/test/graphql/com/example/data_builders/kotlin/operationBased/data_builders/NodeQuery.kt.expected @@ -27,31 +27,32 @@ import kotlin.Boolean import kotlin.Int import kotlin.String import kotlin.Unit +import com.example.data_builders.type.Query as CompiledQuery public class NodeQuery() : Query { - public override fun equals(other: Any?): Boolean = other != null && other::class == this::class + override fun equals(other: Any?): Boolean = other != null && other::class == this::class - public override fun hashCode(): Int = this::class.hashCode() + override fun hashCode(): Int = this::class.hashCode() - public override fun id(): String = OPERATION_ID + override fun id(): String = OPERATION_ID - public override fun document(): String = OPERATION_DOCUMENT + override fun document(): String = OPERATION_DOCUMENT - public override fun name(): String = OPERATION_NAME + override fun name(): String = OPERATION_NAME - public override fun serializeVariables( + override fun serializeVariables( writer: JsonWriter, customScalarAdapters: CustomScalarAdapters, withBooleanDefaultValues: Boolean, - ): Unit { + ) { // This operation doesn't have any variable } - public override fun adapter(): CompositeAdapter = NodeQuery_ResponseAdapter.Data.obj() + override fun adapter(): CompositeAdapter = NodeQuery_ResponseAdapter.Data.obj() - public override fun rootField(): CompiledField = CompiledField.Builder( + override fun rootField(): CompiledField = CompiledField.Builder( name = "data", - type = com.example.data_builders.type.Query.type + type = CompiledQuery.type ) .selections(selections = NodeQuerySelections.__root) .build() @@ -107,7 +108,7 @@ public class NodeQuery() : Query { public fun Data(resolver: FakeResolver = DefaultFakeResolver(__Schema.all), block: QueryBuilder.() -> Unit = {}): Data = buildData( - com.example.data_builders.type.Query, + CompiledQuery, block, NodeQuery_ResponseAdapter.Data, NodeQuerySelections.__root, diff --git a/libraries/apollo-compiler/src/test/graphql/com/example/data_builders/kotlin/operationBased/data_builders/adapter/AnimalQuery_ResponseAdapter.kt.expected b/libraries/apollo-compiler/src/test/graphql/com/example/data_builders/kotlin/operationBased/data_builders/adapter/AnimalQuery_ResponseAdapter.kt.expected index effc666916c..a27b6becbd8 100644 --- a/libraries/apollo-compiler/src/test/graphql/com/example/data_builders/kotlin/operationBased/data_builders/adapter/AnimalQuery_ResponseAdapter.kt.expected +++ b/libraries/apollo-compiler/src/test/graphql/com/example/data_builders/kotlin/operationBased/data_builders/adapter/AnimalQuery_ResponseAdapter.kt.expected @@ -18,14 +18,13 @@ import com.example.data_builders.AnimalQuery import com.example.data_builders.fragment.CatFragment import com.example.data_builders.fragment.DogFragment import kotlin.String -import kotlin.Unit import kotlin.collections.List public object AnimalQuery_ResponseAdapter { public object Data : CompositeAdapter { public val RESPONSE_NAMES: List = listOf("animal") - public override fun fromJson(reader: JsonReader, adapterContext: CompositeAdapterContext): + override fun fromJson(reader: JsonReader, adapterContext: CompositeAdapterContext): AnimalQuery.Data { var _animal: AnimalQuery.Data.Animal? = null @@ -41,11 +40,11 @@ public object AnimalQuery_ResponseAdapter { ) } - public override fun toJson( + override fun toJson( writer: JsonWriter, `value`: AnimalQuery.Data, adapterContext: CompositeAdapterContext, - ): Unit { + ) { writer.name("animal") Animal.obj(true).toJson(writer, value.animal, adapterContext) } @@ -53,7 +52,7 @@ public object AnimalQuery_ResponseAdapter { private object Animal : CompositeAdapter { public val RESPONSE_NAMES: List = listOf("__typename") - public override fun fromJson(reader: JsonReader, adapterContext: CompositeAdapterContext): + override fun fromJson(reader: JsonReader, adapterContext: CompositeAdapterContext): AnimalQuery.Data.Animal { var __typename: String? = null @@ -89,11 +88,11 @@ public object AnimalQuery_ResponseAdapter { ) } - public override fun toJson( + override fun toJson( writer: JsonWriter, `value`: AnimalQuery.Data.Animal, adapterContext: CompositeAdapterContext, - ): Unit { + ) { writer.name("__typename") StringAdapter.toJson(writer, CustomScalarAdapters.Empty, value.__typename) diff --git a/libraries/apollo-compiler/src/test/graphql/com/example/data_builders/kotlin/operationBased/data_builders/adapter/CharacterQuery_ResponseAdapter.kt.expected b/libraries/apollo-compiler/src/test/graphql/com/example/data_builders/kotlin/operationBased/data_builders/adapter/CharacterQuery_ResponseAdapter.kt.expected index 1ebe49b3477..da6a0d14edb 100644 --- a/libraries/apollo-compiler/src/test/graphql/com/example/data_builders/kotlin/operationBased/data_builders/adapter/CharacterQuery_ResponseAdapter.kt.expected +++ b/libraries/apollo-compiler/src/test/graphql/com/example/data_builders/kotlin/operationBased/data_builders/adapter/CharacterQuery_ResponseAdapter.kt.expected @@ -18,14 +18,13 @@ import com.example.data_builders.CharacterQuery import com.example.data_builders.fragment.DroidFragment import com.example.data_builders.fragment.HumanFragment import kotlin.String -import kotlin.Unit import kotlin.collections.List public object CharacterQuery_ResponseAdapter { public object Data : CompositeAdapter { public val RESPONSE_NAMES: List = listOf("character") - public override fun fromJson(reader: JsonReader, adapterContext: CompositeAdapterContext): + override fun fromJson(reader: JsonReader, adapterContext: CompositeAdapterContext): CharacterQuery.Data { var _character: CharacterQuery.Data.Character? = null @@ -41,11 +40,11 @@ public object CharacterQuery_ResponseAdapter { ) } - public override fun toJson( + override fun toJson( writer: JsonWriter, `value`: CharacterQuery.Data, adapterContext: CompositeAdapterContext, - ): Unit { + ) { writer.name("character") Character.obj(true).toJson(writer, value.character, adapterContext) } @@ -53,7 +52,7 @@ public object CharacterQuery_ResponseAdapter { private object Character : CompositeAdapter { public val RESPONSE_NAMES: List = listOf("__typename", "id", "name") - public override fun fromJson(reader: JsonReader, adapterContext: CompositeAdapterContext): + override fun fromJson(reader: JsonReader, adapterContext: CompositeAdapterContext): CharacterQuery.Data.Character { var __typename: String? = null var _id: String? = null @@ -95,11 +94,11 @@ public object CharacterQuery_ResponseAdapter { ) } - public override fun toJson( + override fun toJson( writer: JsonWriter, `value`: CharacterQuery.Data.Character, adapterContext: CompositeAdapterContext, - ): Unit { + ) { writer.name("__typename") StringAdapter.toJson(writer, CustomScalarAdapters.Empty, value.__typename) diff --git a/libraries/apollo-compiler/src/test/graphql/com/example/data_builders/kotlin/operationBased/data_builders/adapter/NodeQuery_ResponseAdapter.kt.expected b/libraries/apollo-compiler/src/test/graphql/com/example/data_builders/kotlin/operationBased/data_builders/adapter/NodeQuery_ResponseAdapter.kt.expected index c3987995d22..e262560c590 100644 --- a/libraries/apollo-compiler/src/test/graphql/com/example/data_builders/kotlin/operationBased/data_builders/adapter/NodeQuery_ResponseAdapter.kt.expected +++ b/libraries/apollo-compiler/src/test/graphql/com/example/data_builders/kotlin/operationBased/data_builders/adapter/NodeQuery_ResponseAdapter.kt.expected @@ -18,14 +18,13 @@ import com.example.data_builders.NodeQuery import com.example.data_builders.fragment.DroidFragment import com.example.data_builders.fragment.HumanFragment import kotlin.String -import kotlin.Unit import kotlin.collections.List public object NodeQuery_ResponseAdapter { public object Data : CompositeAdapter { public val RESPONSE_NAMES: List = listOf("node") - public override fun fromJson(reader: JsonReader, adapterContext: CompositeAdapterContext): + override fun fromJson(reader: JsonReader, adapterContext: CompositeAdapterContext): NodeQuery.Data { var _node: NodeQuery.Data.Node? = null @@ -41,11 +40,11 @@ public object NodeQuery_ResponseAdapter { ) } - public override fun toJson( + override fun toJson( writer: JsonWriter, `value`: NodeQuery.Data, adapterContext: CompositeAdapterContext, - ): Unit { + ) { writer.name("node") Node.obj(true).toJson(writer, value.node, adapterContext) } @@ -53,7 +52,7 @@ public object NodeQuery_ResponseAdapter { private object Node : CompositeAdapter { public val RESPONSE_NAMES: List = listOf("__typename", "id") - public override fun fromJson(reader: JsonReader, adapterContext: CompositeAdapterContext): + override fun fromJson(reader: JsonReader, adapterContext: CompositeAdapterContext): NodeQuery.Data.Node { var __typename: String? = null var _id: String? = null @@ -92,11 +91,11 @@ public object NodeQuery_ResponseAdapter { ) } - public override fun toJson( + override fun toJson( writer: JsonWriter, `value`: NodeQuery.Data.Node, adapterContext: CompositeAdapterContext, - ): Unit { + ) { writer.name("__typename") StringAdapter.toJson(writer, CustomScalarAdapters.Empty, value.__typename) diff --git a/libraries/apollo-compiler/src/test/graphql/com/example/data_builders/kotlin/operationBased/data_builders/fragment/CatFragmentImpl.kt.expected b/libraries/apollo-compiler/src/test/graphql/com/example/data_builders/kotlin/operationBased/data_builders/fragment/CatFragmentImpl.kt.expected index 03a1ed7b5f7..7a8f1b56902 100644 --- a/libraries/apollo-compiler/src/test/graphql/com/example/data_builders/kotlin/operationBased/data_builders/fragment/CatFragmentImpl.kt.expected +++ b/libraries/apollo-compiler/src/test/graphql/com/example/data_builders/kotlin/operationBased/data_builders/fragment/CatFragmentImpl.kt.expected @@ -25,22 +25,22 @@ import kotlin.Int import kotlin.Unit public class CatFragmentImpl() : Fragment { - public override fun equals(other: Any?): Boolean = other != null && other::class == this::class + override fun equals(other: Any?): Boolean = other != null && other::class == this::class - public override fun hashCode(): Int = this::class.hashCode() + override fun hashCode(): Int = this::class.hashCode() - public override fun serializeVariables( + override fun serializeVariables( writer: JsonWriter, customScalarAdapters: CustomScalarAdapters, withBooleanDefaultValues: Boolean, - ): Unit { + ) { // This fragment doesn't have any variable } - public override fun adapter(): CompositeAdapter = + override fun adapter(): CompositeAdapter = CatFragmentImpl_ResponseAdapter.CatFragment.obj() - public override fun rootField(): CompiledField = CompiledField.Builder( + override fun rootField(): CompiledField = CompiledField.Builder( name = "data", type = Cat.type ) diff --git a/libraries/apollo-compiler/src/test/graphql/com/example/data_builders/kotlin/operationBased/data_builders/fragment/CatFragmentImpl_ResponseAdapter.kt.expected b/libraries/apollo-compiler/src/test/graphql/com/example/data_builders/kotlin/operationBased/data_builders/fragment/CatFragmentImpl_ResponseAdapter.kt.expected index 4563a3cdba0..c8ba1803801 100644 --- a/libraries/apollo-compiler/src/test/graphql/com/example/data_builders/kotlin/operationBased/data_builders/fragment/CatFragmentImpl_ResponseAdapter.kt.expected +++ b/libraries/apollo-compiler/src/test/graphql/com/example/data_builders/kotlin/operationBased/data_builders/fragment/CatFragmentImpl_ResponseAdapter.kt.expected @@ -12,14 +12,13 @@ import com.apollographql.apollo3.api.StringAdapter import com.apollographql.apollo3.api.json.JsonReader import com.apollographql.apollo3.api.json.JsonWriter import kotlin.String -import kotlin.Unit import kotlin.collections.List public object CatFragmentImpl_ResponseAdapter { public object CatFragment : CompositeAdapter { public val RESPONSE_NAMES: List = listOf("meow") - public override fun fromJson(reader: JsonReader, adapterContext: CompositeAdapterContext): + override fun fromJson(reader: JsonReader, adapterContext: CompositeAdapterContext): com.example.data_builders.fragment.CatFragment { var _meow: String? = null @@ -35,11 +34,11 @@ public object CatFragmentImpl_ResponseAdapter { ) } - public override fun toJson( + override fun toJson( writer: JsonWriter, `value`: com.example.data_builders.fragment.CatFragment, adapterContext: CompositeAdapterContext, - ): Unit { + ) { writer.name("meow") StringAdapter.toJson(writer, CustomScalarAdapters.Empty, value.meow) } diff --git a/libraries/apollo-compiler/src/test/graphql/com/example/data_builders/kotlin/operationBased/data_builders/fragment/DogFragmentImpl.kt.expected b/libraries/apollo-compiler/src/test/graphql/com/example/data_builders/kotlin/operationBased/data_builders/fragment/DogFragmentImpl.kt.expected index 04cd27e8757..59571d383f6 100644 --- a/libraries/apollo-compiler/src/test/graphql/com/example/data_builders/kotlin/operationBased/data_builders/fragment/DogFragmentImpl.kt.expected +++ b/libraries/apollo-compiler/src/test/graphql/com/example/data_builders/kotlin/operationBased/data_builders/fragment/DogFragmentImpl.kt.expected @@ -25,22 +25,22 @@ import kotlin.Int import kotlin.Unit public class DogFragmentImpl() : Fragment { - public override fun equals(other: Any?): Boolean = other != null && other::class == this::class + override fun equals(other: Any?): Boolean = other != null && other::class == this::class - public override fun hashCode(): Int = this::class.hashCode() + override fun hashCode(): Int = this::class.hashCode() - public override fun serializeVariables( + override fun serializeVariables( writer: JsonWriter, customScalarAdapters: CustomScalarAdapters, withBooleanDefaultValues: Boolean, - ): Unit { + ) { // This fragment doesn't have any variable } - public override fun adapter(): CompositeAdapter = + override fun adapter(): CompositeAdapter = DogFragmentImpl_ResponseAdapter.DogFragment.obj() - public override fun rootField(): CompiledField = CompiledField.Builder( + override fun rootField(): CompiledField = CompiledField.Builder( name = "data", type = Dog.type ) diff --git a/libraries/apollo-compiler/src/test/graphql/com/example/data_builders/kotlin/operationBased/data_builders/fragment/DogFragmentImpl_ResponseAdapter.kt.expected b/libraries/apollo-compiler/src/test/graphql/com/example/data_builders/kotlin/operationBased/data_builders/fragment/DogFragmentImpl_ResponseAdapter.kt.expected index da0ca673d12..4fa19f2738d 100644 --- a/libraries/apollo-compiler/src/test/graphql/com/example/data_builders/kotlin/operationBased/data_builders/fragment/DogFragmentImpl_ResponseAdapter.kt.expected +++ b/libraries/apollo-compiler/src/test/graphql/com/example/data_builders/kotlin/operationBased/data_builders/fragment/DogFragmentImpl_ResponseAdapter.kt.expected @@ -12,14 +12,13 @@ import com.apollographql.apollo3.api.StringAdapter import com.apollographql.apollo3.api.json.JsonReader import com.apollographql.apollo3.api.json.JsonWriter import kotlin.String -import kotlin.Unit import kotlin.collections.List public object DogFragmentImpl_ResponseAdapter { public object DogFragment : CompositeAdapter { public val RESPONSE_NAMES: List = listOf("woof") - public override fun fromJson(reader: JsonReader, adapterContext: CompositeAdapterContext): + override fun fromJson(reader: JsonReader, adapterContext: CompositeAdapterContext): com.example.data_builders.fragment.DogFragment { var _woof: String? = null @@ -35,11 +34,11 @@ public object DogFragmentImpl_ResponseAdapter { ) } - public override fun toJson( + override fun toJson( writer: JsonWriter, `value`: com.example.data_builders.fragment.DogFragment, adapterContext: CompositeAdapterContext, - ): Unit { + ) { writer.name("woof") StringAdapter.toJson(writer, CustomScalarAdapters.Empty, value.woof) } diff --git a/libraries/apollo-compiler/src/test/graphql/com/example/data_builders/kotlin/operationBased/data_builders/fragment/DroidFragmentImpl.kt.expected b/libraries/apollo-compiler/src/test/graphql/com/example/data_builders/kotlin/operationBased/data_builders/fragment/DroidFragmentImpl.kt.expected index 7ba568b15b6..85a31a37fce 100644 --- a/libraries/apollo-compiler/src/test/graphql/com/example/data_builders/kotlin/operationBased/data_builders/fragment/DroidFragmentImpl.kt.expected +++ b/libraries/apollo-compiler/src/test/graphql/com/example/data_builders/kotlin/operationBased/data_builders/fragment/DroidFragmentImpl.kt.expected @@ -25,22 +25,22 @@ import kotlin.Int import kotlin.Unit public class DroidFragmentImpl() : Fragment { - public override fun equals(other: Any?): Boolean = other != null && other::class == this::class + override fun equals(other: Any?): Boolean = other != null && other::class == this::class - public override fun hashCode(): Int = this::class.hashCode() + override fun hashCode(): Int = this::class.hashCode() - public override fun serializeVariables( + override fun serializeVariables( writer: JsonWriter, customScalarAdapters: CustomScalarAdapters, withBooleanDefaultValues: Boolean, - ): Unit { + ) { // This fragment doesn't have any variable } - public override fun adapter(): CompositeAdapter = + override fun adapter(): CompositeAdapter = DroidFragmentImpl_ResponseAdapter.DroidFragment.obj() - public override fun rootField(): CompiledField = CompiledField.Builder( + override fun rootField(): CompiledField = CompiledField.Builder( name = "data", type = Droid.type ) diff --git a/libraries/apollo-compiler/src/test/graphql/com/example/data_builders/kotlin/operationBased/data_builders/fragment/DroidFragmentImpl_ResponseAdapter.kt.expected b/libraries/apollo-compiler/src/test/graphql/com/example/data_builders/kotlin/operationBased/data_builders/fragment/DroidFragmentImpl_ResponseAdapter.kt.expected index 84de444aa9d..741c5faad65 100644 --- a/libraries/apollo-compiler/src/test/graphql/com/example/data_builders/kotlin/operationBased/data_builders/fragment/DroidFragmentImpl_ResponseAdapter.kt.expected +++ b/libraries/apollo-compiler/src/test/graphql/com/example/data_builders/kotlin/operationBased/data_builders/fragment/DroidFragmentImpl_ResponseAdapter.kt.expected @@ -12,14 +12,13 @@ import com.apollographql.apollo3.api.StringAdapter import com.apollographql.apollo3.api.json.JsonReader import com.apollographql.apollo3.api.json.JsonWriter import kotlin.String -import kotlin.Unit import kotlin.collections.List public object DroidFragmentImpl_ResponseAdapter { public object DroidFragment : CompositeAdapter { public val RESPONSE_NAMES: List = listOf("primaryFunction") - public override fun fromJson(reader: JsonReader, adapterContext: CompositeAdapterContext): + override fun fromJson(reader: JsonReader, adapterContext: CompositeAdapterContext): com.example.data_builders.fragment.DroidFragment { var _primaryFunction: String? = null @@ -35,11 +34,11 @@ public object DroidFragmentImpl_ResponseAdapter { ) } - public override fun toJson( + override fun toJson( writer: JsonWriter, `value`: com.example.data_builders.fragment.DroidFragment, adapterContext: CompositeAdapterContext, - ): Unit { + ) { writer.name("primaryFunction") StringAdapter.toJson(writer, CustomScalarAdapters.Empty, value.primaryFunction) } diff --git a/libraries/apollo-compiler/src/test/graphql/com/example/data_builders/kotlin/operationBased/data_builders/fragment/HumanFragmentImpl.kt.expected b/libraries/apollo-compiler/src/test/graphql/com/example/data_builders/kotlin/operationBased/data_builders/fragment/HumanFragmentImpl.kt.expected index 4df2953d959..8ef51647835 100644 --- a/libraries/apollo-compiler/src/test/graphql/com/example/data_builders/kotlin/operationBased/data_builders/fragment/HumanFragmentImpl.kt.expected +++ b/libraries/apollo-compiler/src/test/graphql/com/example/data_builders/kotlin/operationBased/data_builders/fragment/HumanFragmentImpl.kt.expected @@ -25,22 +25,22 @@ import kotlin.Int import kotlin.Unit public class HumanFragmentImpl() : Fragment { - public override fun equals(other: Any?): Boolean = other != null && other::class == this::class + override fun equals(other: Any?): Boolean = other != null && other::class == this::class - public override fun hashCode(): Int = this::class.hashCode() + override fun hashCode(): Int = this::class.hashCode() - public override fun serializeVariables( + override fun serializeVariables( writer: JsonWriter, customScalarAdapters: CustomScalarAdapters, withBooleanDefaultValues: Boolean, - ): Unit { + ) { // This fragment doesn't have any variable } - public override fun adapter(): CompositeAdapter = + override fun adapter(): CompositeAdapter = HumanFragmentImpl_ResponseAdapter.HumanFragment.obj() - public override fun rootField(): CompiledField = CompiledField.Builder( + override fun rootField(): CompiledField = CompiledField.Builder( name = "data", type = Human.type ) diff --git a/libraries/apollo-compiler/src/test/graphql/com/example/data_builders/kotlin/operationBased/data_builders/fragment/HumanFragmentImpl_ResponseAdapter.kt.expected b/libraries/apollo-compiler/src/test/graphql/com/example/data_builders/kotlin/operationBased/data_builders/fragment/HumanFragmentImpl_ResponseAdapter.kt.expected index e15cc9bfb68..6cb4b6b7f8f 100644 --- a/libraries/apollo-compiler/src/test/graphql/com/example/data_builders/kotlin/operationBased/data_builders/fragment/HumanFragmentImpl_ResponseAdapter.kt.expected +++ b/libraries/apollo-compiler/src/test/graphql/com/example/data_builders/kotlin/operationBased/data_builders/fragment/HumanFragmentImpl_ResponseAdapter.kt.expected @@ -12,14 +12,13 @@ import com.apollographql.apollo3.api.StringAdapter import com.apollographql.apollo3.api.json.JsonReader import com.apollographql.apollo3.api.json.JsonWriter import kotlin.String -import kotlin.Unit import kotlin.collections.List public object HumanFragmentImpl_ResponseAdapter { public object HumanFragment : CompositeAdapter { public val RESPONSE_NAMES: List = listOf("homePlanet") - public override fun fromJson(reader: JsonReader, adapterContext: CompositeAdapterContext): + override fun fromJson(reader: JsonReader, adapterContext: CompositeAdapterContext): com.example.data_builders.fragment.HumanFragment { var _homePlanet: String? = null @@ -35,11 +34,11 @@ public object HumanFragmentImpl_ResponseAdapter { ) } - public override fun toJson( + override fun toJson( writer: JsonWriter, `value`: com.example.data_builders.fragment.HumanFragment, adapterContext: CompositeAdapterContext, - ): Unit { + ) { writer.name("homePlanet") StringAdapter.toJson(writer, CustomScalarAdapters.Empty, value.homePlanet) } diff --git a/libraries/apollo-compiler/src/test/graphql/com/example/data_builders/kotlin/operationBased/data_builders/type/Animal.kt.expected b/libraries/apollo-compiler/src/test/graphql/com/example/data_builders/kotlin/operationBased/data_builders/type/Animal.kt.expected index ce6bc892167..cba56a87dec 100644 --- a/libraries/apollo-compiler/src/test/graphql/com/example/data_builders/kotlin/operationBased/data_builders/type/Animal.kt.expected +++ b/libraries/apollo-compiler/src/test/graphql/com/example/data_builders/kotlin/operationBased/data_builders/type/Animal.kt.expected @@ -19,7 +19,7 @@ public class Animal { public companion object : BuilderFactory { public val type: UnionType = UnionType("Animal", Cat.type, Dog.type) - public override fun newBuilder(customScalarAdapters: CustomScalarAdapters): OtherAnimalBuilder = + override fun newBuilder(customScalarAdapters: CustomScalarAdapters): OtherAnimalBuilder = OtherAnimalBuilder(customScalarAdapters) } } @@ -29,7 +29,7 @@ public interface AnimalMap : Map public class OtherAnimalBuilder( customScalarAdapters: CustomScalarAdapters, ) : ObjectBuilder(customScalarAdapters) { - public override fun build(): OtherAnimalMap = OtherAnimalMap(__fields) + override fun build(): OtherAnimalMap = OtherAnimalMap(__fields) } public class OtherAnimalMap( diff --git a/libraries/apollo-compiler/src/test/graphql/com/example/data_builders/kotlin/operationBased/data_builders/type/Cat.kt.expected b/libraries/apollo-compiler/src/test/graphql/com/example/data_builders/kotlin/operationBased/data_builders/type/Cat.kt.expected index 0245b584b69..fed7246d02d 100644 --- a/libraries/apollo-compiler/src/test/graphql/com/example/data_builders/kotlin/operationBased/data_builders/type/Cat.kt.expected +++ b/libraries/apollo-compiler/src/test/graphql/com/example/data_builders/kotlin/operationBased/data_builders/type/Cat.kt.expected @@ -20,7 +20,7 @@ public class Cat { public val type: ObjectType = ObjectType.Builder(name = "Cat").interfaces(listOf(Node.type)).build() - public override fun newBuilder(customScalarAdapters: CustomScalarAdapters): CatBuilder = + override fun newBuilder(customScalarAdapters: CustomScalarAdapters): CatBuilder = CatBuilder(customScalarAdapters) } } @@ -35,7 +35,7 @@ public class CatBuilder( init { __typename = "Cat"} - public override fun build(): CatMap = CatMap(__fields) + override fun build(): CatMap = CatMap(__fields) } public class CatMap( diff --git a/libraries/apollo-compiler/src/test/graphql/com/example/data_builders/kotlin/operationBased/data_builders/type/Character.kt.expected b/libraries/apollo-compiler/src/test/graphql/com/example/data_builders/kotlin/operationBased/data_builders/type/Character.kt.expected index 77d913ff56c..91f0e9c8b16 100644 --- a/libraries/apollo-compiler/src/test/graphql/com/example/data_builders/kotlin/operationBased/data_builders/type/Character.kt.expected +++ b/libraries/apollo-compiler/src/test/graphql/com/example/data_builders/kotlin/operationBased/data_builders/type/Character.kt.expected @@ -20,8 +20,8 @@ public class Character { public val type: InterfaceType = InterfaceType.Builder(name = "Character").interfaces(listOf(Node.type)).build() - public override fun newBuilder(customScalarAdapters: CustomScalarAdapters): - OtherCharacterBuilder = OtherCharacterBuilder(customScalarAdapters) + override fun newBuilder(customScalarAdapters: CustomScalarAdapters): OtherCharacterBuilder = + OtherCharacterBuilder(customScalarAdapters) } } @@ -34,7 +34,7 @@ public class OtherCharacterBuilder( public var name: String by __fields - public override fun build(): OtherCharacterMap = OtherCharacterMap(__fields) + override fun build(): OtherCharacterMap = OtherCharacterMap(__fields) } public class OtherCharacterMap( diff --git a/libraries/apollo-compiler/src/test/graphql/com/example/data_builders/kotlin/operationBased/data_builders/type/Dog.kt.expected b/libraries/apollo-compiler/src/test/graphql/com/example/data_builders/kotlin/operationBased/data_builders/type/Dog.kt.expected index 501beff35c8..2854da2f60a 100644 --- a/libraries/apollo-compiler/src/test/graphql/com/example/data_builders/kotlin/operationBased/data_builders/type/Dog.kt.expected +++ b/libraries/apollo-compiler/src/test/graphql/com/example/data_builders/kotlin/operationBased/data_builders/type/Dog.kt.expected @@ -20,7 +20,7 @@ public class Dog { public val type: ObjectType = ObjectType.Builder(name = "Dog").interfaces(listOf(Node.type)).build() - public override fun newBuilder(customScalarAdapters: CustomScalarAdapters): DogBuilder = + override fun newBuilder(customScalarAdapters: CustomScalarAdapters): DogBuilder = DogBuilder(customScalarAdapters) } } @@ -35,7 +35,7 @@ public class DogBuilder( init { __typename = "Dog"} - public override fun build(): DogMap = DogMap(__fields) + override fun build(): DogMap = DogMap(__fields) } public class DogMap( diff --git a/libraries/apollo-compiler/src/test/graphql/com/example/data_builders/kotlin/operationBased/data_builders/type/Droid.kt.expected b/libraries/apollo-compiler/src/test/graphql/com/example/data_builders/kotlin/operationBased/data_builders/type/Droid.kt.expected index a82bb37a4bd..19c5c405995 100644 --- a/libraries/apollo-compiler/src/test/graphql/com/example/data_builders/kotlin/operationBased/data_builders/type/Droid.kt.expected +++ b/libraries/apollo-compiler/src/test/graphql/com/example/data_builders/kotlin/operationBased/data_builders/type/Droid.kt.expected @@ -20,7 +20,7 @@ public class Droid { public val type: ObjectType = ObjectType.Builder(name = "Droid").interfaces(listOf(Character.type)).build() - public override fun newBuilder(customScalarAdapters: CustomScalarAdapters): DroidBuilder = + override fun newBuilder(customScalarAdapters: CustomScalarAdapters): DroidBuilder = DroidBuilder(customScalarAdapters) } } @@ -35,7 +35,7 @@ public class DroidBuilder( init { __typename = "Droid"} - public override fun build(): DroidMap = DroidMap(__fields) + override fun build(): DroidMap = DroidMap(__fields) } public class DroidMap( diff --git a/libraries/apollo-compiler/src/test/graphql/com/example/data_builders/kotlin/operationBased/data_builders/type/Human.kt.expected b/libraries/apollo-compiler/src/test/graphql/com/example/data_builders/kotlin/operationBased/data_builders/type/Human.kt.expected index 1e657b8f55e..4288a967595 100644 --- a/libraries/apollo-compiler/src/test/graphql/com/example/data_builders/kotlin/operationBased/data_builders/type/Human.kt.expected +++ b/libraries/apollo-compiler/src/test/graphql/com/example/data_builders/kotlin/operationBased/data_builders/type/Human.kt.expected @@ -20,7 +20,7 @@ public class Human { public val type: ObjectType = ObjectType.Builder(name = "Human").interfaces(listOf(Character.type)).build() - public override fun newBuilder(customScalarAdapters: CustomScalarAdapters): HumanBuilder = + override fun newBuilder(customScalarAdapters: CustomScalarAdapters): HumanBuilder = HumanBuilder(customScalarAdapters) } } @@ -37,7 +37,7 @@ public class HumanBuilder( init { __typename = "Human"} - public override fun build(): HumanMap = HumanMap(__fields) + override fun build(): HumanMap = HumanMap(__fields) } public class HumanMap( diff --git a/libraries/apollo-compiler/src/test/graphql/com/example/data_builders/kotlin/operationBased/data_builders/type/Node.kt.expected b/libraries/apollo-compiler/src/test/graphql/com/example/data_builders/kotlin/operationBased/data_builders/type/Node.kt.expected index 3e315e5a7d2..fd8fba5b2aa 100644 --- a/libraries/apollo-compiler/src/test/graphql/com/example/data_builders/kotlin/operationBased/data_builders/type/Node.kt.expected +++ b/libraries/apollo-compiler/src/test/graphql/com/example/data_builders/kotlin/operationBased/data_builders/type/Node.kt.expected @@ -19,7 +19,7 @@ public class Node { public companion object : BuilderFactory { public val type: InterfaceType = InterfaceType.Builder(name = "Node").build() - public override fun newBuilder(customScalarAdapters: CustomScalarAdapters): OtherNodeBuilder = + override fun newBuilder(customScalarAdapters: CustomScalarAdapters): OtherNodeBuilder = OtherNodeBuilder(customScalarAdapters) } } @@ -31,7 +31,7 @@ public class OtherNodeBuilder( ) : ObjectBuilder(customScalarAdapters) { public var id: String by __fields - public override fun build(): OtherNodeMap = OtherNodeMap(__fields) + override fun build(): OtherNodeMap = OtherNodeMap(__fields) } public class OtherNodeMap( diff --git a/libraries/apollo-compiler/src/test/graphql/com/example/data_builders/kotlin/operationBased/data_builders/type/Query.kt.expected b/libraries/apollo-compiler/src/test/graphql/com/example/data_builders/kotlin/operationBased/data_builders/type/Query.kt.expected index 2c042bf3496..f01f163eb5e 100644 --- a/libraries/apollo-compiler/src/test/graphql/com/example/data_builders/kotlin/operationBased/data_builders/type/Query.kt.expected +++ b/libraries/apollo-compiler/src/test/graphql/com/example/data_builders/kotlin/operationBased/data_builders/type/Query.kt.expected @@ -19,7 +19,7 @@ public class Query { public companion object : BuilderFactory { public val type: ObjectType = ObjectType.Builder(name = "Query").build() - public override fun newBuilder(customScalarAdapters: CustomScalarAdapters): QueryBuilder = + override fun newBuilder(customScalarAdapters: CustomScalarAdapters): QueryBuilder = QueryBuilder(customScalarAdapters) } } @@ -36,7 +36,7 @@ public class QueryBuilder( init { __typename = "Query"} - public override fun build(): QueryMap = QueryMap(__fields) + override fun build(): QueryMap = QueryMap(__fields) } public class QueryMap( diff --git a/libraries/apollo-compiler/src/test/graphql/com/example/data_builders/kotlin/responseBased/data_builders/AnimalQuery.kt.expected b/libraries/apollo-compiler/src/test/graphql/com/example/data_builders/kotlin/responseBased/data_builders/AnimalQuery.kt.expected index 612d6e9907b..81b238f97ce 100644 --- a/libraries/apollo-compiler/src/test/graphql/com/example/data_builders/kotlin/responseBased/data_builders/AnimalQuery.kt.expected +++ b/libraries/apollo-compiler/src/test/graphql/com/example/data_builders/kotlin/responseBased/data_builders/AnimalQuery.kt.expected @@ -26,32 +26,34 @@ import kotlin.Any import kotlin.Boolean import kotlin.Int import kotlin.String +import kotlin.Suppress import kotlin.Unit +import com.example.data_builders.type.Query as CompiledQuery public class AnimalQuery() : Query { - public override fun equals(other: Any?): Boolean = other != null && other::class == this::class + override fun equals(other: Any?): Boolean = other != null && other::class == this::class - public override fun hashCode(): Int = this::class.hashCode() + override fun hashCode(): Int = this::class.hashCode() - public override fun id(): String = OPERATION_ID + override fun id(): String = OPERATION_ID - public override fun document(): String = OPERATION_DOCUMENT + override fun document(): String = OPERATION_DOCUMENT - public override fun name(): String = OPERATION_NAME + override fun name(): String = OPERATION_NAME - public override fun serializeVariables( + override fun serializeVariables( writer: JsonWriter, customScalarAdapters: CustomScalarAdapters, withBooleanDefaultValues: Boolean, - ): Unit { + ) { // This operation doesn't have any variable } - public override fun adapter(): CompositeAdapter = AnimalQuery_ResponseAdapter.Data.obj() + override fun adapter(): CompositeAdapter = AnimalQuery_ResponseAdapter.Data.obj() - public override fun rootField(): CompiledField = CompiledField.Builder( + override fun rootField(): CompiledField = CompiledField.Builder( name = "data", - type = com.example.data_builders.type.Query.type + type = CompiledQuery.type ) .selections(selections = AnimalQuerySelections.__root) .build() @@ -64,28 +66,32 @@ public class AnimalQuery() : Query { public val __typename: String public companion object { - public fun Animal.catFragment() = this as? CatFragment + @Suppress("USELESS_CAST") + public fun Animal.catFragment(): CatFragment? = this as? CatFragment - public fun Animal.dogFragment() = this as? DogFragment + @Suppress("USELESS_CAST") + public fun Animal.dogFragment(): DogFragment? = this as? DogFragment - public fun Animal.asCat() = this as? CatAnimal + @Suppress("USELESS_CAST") + public fun Animal.asCat(): CatAnimal? = this as? CatAnimal - public fun Animal.asDog() = this as? DogAnimal + @Suppress("USELESS_CAST") + public fun Animal.asDog(): DogAnimal? = this as? DogAnimal } } public data class CatAnimal( - public override val __typename: String, - public override val meow: String, + override val __typename: String, + override val meow: String, ) : Animal, CatFragment public data class DogAnimal( - public override val __typename: String, - public override val woof: String, + override val __typename: String, + override val woof: String, ) : Animal, DogFragment public data class OtherAnimal( - public override val __typename: String, + override val __typename: String, ) : Animal } @@ -121,7 +127,7 @@ public class AnimalQuery() : Query { public fun Data(resolver: FakeResolver = DefaultFakeResolver(__Schema.all), block: QueryBuilder.() -> Unit = {}): Data = buildData( - com.example.data_builders.type.Query, + CompiledQuery, block, AnimalQuery_ResponseAdapter.Data, AnimalQuerySelections.__root, diff --git a/libraries/apollo-compiler/src/test/graphql/com/example/data_builders/kotlin/responseBased/data_builders/CharacterQuery.kt.expected b/libraries/apollo-compiler/src/test/graphql/com/example/data_builders/kotlin/responseBased/data_builders/CharacterQuery.kt.expected index 3340e936fec..8d74c22c996 100644 --- a/libraries/apollo-compiler/src/test/graphql/com/example/data_builders/kotlin/responseBased/data_builders/CharacterQuery.kt.expected +++ b/libraries/apollo-compiler/src/test/graphql/com/example/data_builders/kotlin/responseBased/data_builders/CharacterQuery.kt.expected @@ -26,32 +26,34 @@ import kotlin.Any import kotlin.Boolean import kotlin.Int import kotlin.String +import kotlin.Suppress import kotlin.Unit +import com.example.data_builders.type.Query as CompiledQuery public class CharacterQuery() : Query { - public override fun equals(other: Any?): Boolean = other != null && other::class == this::class + override fun equals(other: Any?): Boolean = other != null && other::class == this::class - public override fun hashCode(): Int = this::class.hashCode() + override fun hashCode(): Int = this::class.hashCode() - public override fun id(): String = OPERATION_ID + override fun id(): String = OPERATION_ID - public override fun document(): String = OPERATION_DOCUMENT + override fun document(): String = OPERATION_DOCUMENT - public override fun name(): String = OPERATION_NAME + override fun name(): String = OPERATION_NAME - public override fun serializeVariables( + override fun serializeVariables( writer: JsonWriter, customScalarAdapters: CustomScalarAdapters, withBooleanDefaultValues: Boolean, - ): Unit { + ) { // This operation doesn't have any variable } - public override fun adapter(): CompositeAdapter = CharacterQuery_ResponseAdapter.Data.obj() + override fun adapter(): CompositeAdapter = CharacterQuery_ResponseAdapter.Data.obj() - public override fun rootField(): CompiledField = CompiledField.Builder( + override fun rootField(): CompiledField = CompiledField.Builder( name = "data", - type = com.example.data_builders.type.Query.type + type = CompiledQuery.type ) .selections(selections = CharacterQuerySelections.__root) .build() @@ -68,34 +70,38 @@ public class CharacterQuery() : Query { public val name: String public companion object { - public fun Character.humanFragment() = this as? HumanFragment + @Suppress("USELESS_CAST") + public fun Character.humanFragment(): HumanFragment? = this as? HumanFragment - public fun Character.droidFragment() = this as? DroidFragment + @Suppress("USELESS_CAST") + public fun Character.droidFragment(): DroidFragment? = this as? DroidFragment - public fun Character.asHuman() = this as? HumanCharacter + @Suppress("USELESS_CAST") + public fun Character.asHuman(): HumanCharacter? = this as? HumanCharacter - public fun Character.asDroid() = this as? DroidCharacter + @Suppress("USELESS_CAST") + public fun Character.asDroid(): DroidCharacter? = this as? DroidCharacter } } public data class HumanCharacter( - public override val __typename: String, - public override val id: String, - public override val name: String, - public override val homePlanet: String, + override val __typename: String, + override val id: String, + override val name: String, + override val homePlanet: String, ) : Character, HumanFragment public data class DroidCharacter( - public override val __typename: String, - public override val id: String, - public override val name: String, - public override val primaryFunction: String, + override val __typename: String, + override val id: String, + override val name: String, + override val primaryFunction: String, ) : Character, DroidFragment public data class OtherCharacter( - public override val __typename: String, - public override val id: String, - public override val name: String, + override val __typename: String, + override val id: String, + override val name: String, ) : Character } @@ -133,7 +139,7 @@ public class CharacterQuery() : Query { public fun Data(resolver: FakeResolver = DefaultFakeResolver(__Schema.all), block: QueryBuilder.() -> Unit = {}): Data = buildData( - com.example.data_builders.type.Query, + CompiledQuery, block, CharacterQuery_ResponseAdapter.Data, CharacterQuerySelections.__root, diff --git a/libraries/apollo-compiler/src/test/graphql/com/example/data_builders/kotlin/responseBased/data_builders/NodeQuery.kt.expected b/libraries/apollo-compiler/src/test/graphql/com/example/data_builders/kotlin/responseBased/data_builders/NodeQuery.kt.expected index 03acfadba9d..daab52d8987 100644 --- a/libraries/apollo-compiler/src/test/graphql/com/example/data_builders/kotlin/responseBased/data_builders/NodeQuery.kt.expected +++ b/libraries/apollo-compiler/src/test/graphql/com/example/data_builders/kotlin/responseBased/data_builders/NodeQuery.kt.expected @@ -26,32 +26,34 @@ import kotlin.Any import kotlin.Boolean import kotlin.Int import kotlin.String +import kotlin.Suppress import kotlin.Unit +import com.example.data_builders.type.Query as CompiledQuery public class NodeQuery() : Query { - public override fun equals(other: Any?): Boolean = other != null && other::class == this::class + override fun equals(other: Any?): Boolean = other != null && other::class == this::class - public override fun hashCode(): Int = this::class.hashCode() + override fun hashCode(): Int = this::class.hashCode() - public override fun id(): String = OPERATION_ID + override fun id(): String = OPERATION_ID - public override fun document(): String = OPERATION_DOCUMENT + override fun document(): String = OPERATION_DOCUMENT - public override fun name(): String = OPERATION_NAME + override fun name(): String = OPERATION_NAME - public override fun serializeVariables( + override fun serializeVariables( writer: JsonWriter, customScalarAdapters: CustomScalarAdapters, withBooleanDefaultValues: Boolean, - ): Unit { + ) { // This operation doesn't have any variable } - public override fun adapter(): CompositeAdapter = NodeQuery_ResponseAdapter.Data.obj() + override fun adapter(): CompositeAdapter = NodeQuery_ResponseAdapter.Data.obj() - public override fun rootField(): CompiledField = CompiledField.Builder( + override fun rootField(): CompiledField = CompiledField.Builder( name = "data", - type = com.example.data_builders.type.Query.type + type = CompiledQuery.type ) .selections(selections = NodeQuerySelections.__root) .build() @@ -66,31 +68,35 @@ public class NodeQuery() : Query { public val id: String public companion object { - public fun Node.humanFragment() = this as? HumanFragment + @Suppress("USELESS_CAST") + public fun Node.humanFragment(): HumanFragment? = this as? HumanFragment - public fun Node.droidFragment() = this as? DroidFragment + @Suppress("USELESS_CAST") + public fun Node.droidFragment(): DroidFragment? = this as? DroidFragment - public fun Node.asHuman() = this as? HumanNode + @Suppress("USELESS_CAST") + public fun Node.asHuman(): HumanNode? = this as? HumanNode - public fun Node.asDroid() = this as? DroidNode + @Suppress("USELESS_CAST") + public fun Node.asDroid(): DroidNode? = this as? DroidNode } } public data class HumanNode( - public override val __typename: String, - public override val id: String, - public override val homePlanet: String, + override val __typename: String, + override val id: String, + override val homePlanet: String, ) : Node, HumanFragment public data class DroidNode( - public override val __typename: String, - public override val id: String, - public override val primaryFunction: String, + override val __typename: String, + override val id: String, + override val primaryFunction: String, ) : Node, DroidFragment public data class OtherNode( - public override val __typename: String, - public override val id: String, + override val __typename: String, + override val id: String, ) : Node } @@ -127,7 +133,7 @@ public class NodeQuery() : Query { public fun Data(resolver: FakeResolver = DefaultFakeResolver(__Schema.all), block: QueryBuilder.() -> Unit = {}): Data = buildData( - com.example.data_builders.type.Query, + CompiledQuery, block, NodeQuery_ResponseAdapter.Data, NodeQuerySelections.__root, diff --git a/libraries/apollo-compiler/src/test/graphql/com/example/data_builders/kotlin/responseBased/data_builders/adapter/AnimalQuery_ResponseAdapter.kt.expected b/libraries/apollo-compiler/src/test/graphql/com/example/data_builders/kotlin/responseBased/data_builders/adapter/AnimalQuery_ResponseAdapter.kt.expected index 98ed63c44f8..5d3bde9cd65 100644 --- a/libraries/apollo-compiler/src/test/graphql/com/example/data_builders/kotlin/responseBased/data_builders/adapter/AnimalQuery_ResponseAdapter.kt.expected +++ b/libraries/apollo-compiler/src/test/graphql/com/example/data_builders/kotlin/responseBased/data_builders/adapter/AnimalQuery_ResponseAdapter.kt.expected @@ -16,14 +16,13 @@ import com.apollographql.apollo3.api.obj import com.example.data_builders.AnimalQuery import kotlin.String import kotlin.Suppress -import kotlin.Unit import kotlin.collections.List public object AnimalQuery_ResponseAdapter { public object Data : CompositeAdapter { public val RESPONSE_NAMES: List = listOf("animal") - public override fun fromJson(reader: JsonReader, adapterContext: CompositeAdapterContext): + override fun fromJson(reader: JsonReader, adapterContext: CompositeAdapterContext): AnimalQuery.Data { var _animal: AnimalQuery.Data.Animal? = null @@ -39,17 +38,17 @@ public object AnimalQuery_ResponseAdapter { ) } - public override fun toJson( + override fun toJson( writer: JsonWriter, `value`: AnimalQuery.Data, adapterContext: CompositeAdapterContext, - ): Unit { + ) { writer.name("animal") Animal.obj().toJson(writer, value.animal, adapterContext) } private object Animal : CompositeAdapter { - public override fun fromJson(reader: JsonReader, adapterContext: CompositeAdapterContext): + override fun fromJson(reader: JsonReader, adapterContext: CompositeAdapterContext): AnimalQuery.Data.Animal { val __typename = reader.readTypename() return when(__typename) { @@ -62,11 +61,11 @@ public object AnimalQuery_ResponseAdapter { } } - public override fun toJson( + override fun toJson( writer: JsonWriter, `value`: AnimalQuery.Data.Animal, adapterContext: CompositeAdapterContext, - ): Unit { + ) { when(value) { is AnimalQuery.Data.CatAnimal -> CatAnimal.toJson(writer, value, adapterContext) is AnimalQuery.Data.DogAnimal -> DogAnimal.toJson(writer, value, adapterContext) @@ -104,7 +103,7 @@ public object AnimalQuery_ResponseAdapter { writer: JsonWriter, `value`: AnimalQuery.Data.CatAnimal, @Suppress("UNUSED_PARAMETER") adapterContext: CompositeAdapterContext, - ): Unit { + ) { writer.name("__typename") StringAdapter.toJson(writer, CustomScalarAdapters.Empty, value.__typename) @@ -142,7 +141,7 @@ public object AnimalQuery_ResponseAdapter { writer: JsonWriter, `value`: AnimalQuery.Data.DogAnimal, @Suppress("UNUSED_PARAMETER") adapterContext: CompositeAdapterContext, - ): Unit { + ) { writer.name("__typename") StringAdapter.toJson(writer, CustomScalarAdapters.Empty, value.__typename) @@ -177,7 +176,7 @@ public object AnimalQuery_ResponseAdapter { writer: JsonWriter, `value`: AnimalQuery.Data.OtherAnimal, @Suppress("UNUSED_PARAMETER") adapterContext: CompositeAdapterContext, - ): Unit { + ) { writer.name("__typename") StringAdapter.toJson(writer, CustomScalarAdapters.Empty, value.__typename) } diff --git a/libraries/apollo-compiler/src/test/graphql/com/example/data_builders/kotlin/responseBased/data_builders/adapter/CharacterQuery_ResponseAdapter.kt.expected b/libraries/apollo-compiler/src/test/graphql/com/example/data_builders/kotlin/responseBased/data_builders/adapter/CharacterQuery_ResponseAdapter.kt.expected index 7a99fc47458..c4087f00ef8 100644 --- a/libraries/apollo-compiler/src/test/graphql/com/example/data_builders/kotlin/responseBased/data_builders/adapter/CharacterQuery_ResponseAdapter.kt.expected +++ b/libraries/apollo-compiler/src/test/graphql/com/example/data_builders/kotlin/responseBased/data_builders/adapter/CharacterQuery_ResponseAdapter.kt.expected @@ -16,14 +16,13 @@ import com.apollographql.apollo3.api.obj import com.example.data_builders.CharacterQuery import kotlin.String import kotlin.Suppress -import kotlin.Unit import kotlin.collections.List public object CharacterQuery_ResponseAdapter { public object Data : CompositeAdapter { public val RESPONSE_NAMES: List = listOf("character") - public override fun fromJson(reader: JsonReader, adapterContext: CompositeAdapterContext): + override fun fromJson(reader: JsonReader, adapterContext: CompositeAdapterContext): CharacterQuery.Data { var _character: CharacterQuery.Data.Character? = null @@ -39,17 +38,17 @@ public object CharacterQuery_ResponseAdapter { ) } - public override fun toJson( + override fun toJson( writer: JsonWriter, `value`: CharacterQuery.Data, adapterContext: CompositeAdapterContext, - ): Unit { + ) { writer.name("character") Character.obj().toJson(writer, value.character, adapterContext) } private object Character : CompositeAdapter { - public override fun fromJson(reader: JsonReader, adapterContext: CompositeAdapterContext): + override fun fromJson(reader: JsonReader, adapterContext: CompositeAdapterContext): CharacterQuery.Data.Character { val __typename = reader.readTypename() return when(__typename) { @@ -62,11 +61,11 @@ public object CharacterQuery_ResponseAdapter { } } - public override fun toJson( + override fun toJson( writer: JsonWriter, `value`: CharacterQuery.Data.Character, adapterContext: CompositeAdapterContext, - ): Unit { + ) { when(value) { is CharacterQuery.Data.HumanCharacter -> HumanCharacter.toJson(writer, value, adapterContext) @@ -113,7 +112,7 @@ public object CharacterQuery_ResponseAdapter { writer: JsonWriter, `value`: CharacterQuery.Data.HumanCharacter, @Suppress("UNUSED_PARAMETER") adapterContext: CompositeAdapterContext, - ): Unit { + ) { writer.name("__typename") StringAdapter.toJson(writer, CustomScalarAdapters.Empty, value.__typename) @@ -164,7 +163,7 @@ public object CharacterQuery_ResponseAdapter { writer: JsonWriter, `value`: CharacterQuery.Data.DroidCharacter, @Suppress("UNUSED_PARAMETER") adapterContext: CompositeAdapterContext, - ): Unit { + ) { writer.name("__typename") StringAdapter.toJson(writer, CustomScalarAdapters.Empty, value.__typename) @@ -211,7 +210,7 @@ public object CharacterQuery_ResponseAdapter { writer: JsonWriter, `value`: CharacterQuery.Data.OtherCharacter, @Suppress("UNUSED_PARAMETER") adapterContext: CompositeAdapterContext, - ): Unit { + ) { writer.name("__typename") StringAdapter.toJson(writer, CustomScalarAdapters.Empty, value.__typename) diff --git a/libraries/apollo-compiler/src/test/graphql/com/example/data_builders/kotlin/responseBased/data_builders/adapter/NodeQuery_ResponseAdapter.kt.expected b/libraries/apollo-compiler/src/test/graphql/com/example/data_builders/kotlin/responseBased/data_builders/adapter/NodeQuery_ResponseAdapter.kt.expected index a5f612e3e9c..a8f5e798d4d 100644 --- a/libraries/apollo-compiler/src/test/graphql/com/example/data_builders/kotlin/responseBased/data_builders/adapter/NodeQuery_ResponseAdapter.kt.expected +++ b/libraries/apollo-compiler/src/test/graphql/com/example/data_builders/kotlin/responseBased/data_builders/adapter/NodeQuery_ResponseAdapter.kt.expected @@ -16,14 +16,13 @@ import com.apollographql.apollo3.api.obj import com.example.data_builders.NodeQuery import kotlin.String import kotlin.Suppress -import kotlin.Unit import kotlin.collections.List public object NodeQuery_ResponseAdapter { public object Data : CompositeAdapter { public val RESPONSE_NAMES: List = listOf("node") - public override fun fromJson(reader: JsonReader, adapterContext: CompositeAdapterContext): + override fun fromJson(reader: JsonReader, adapterContext: CompositeAdapterContext): NodeQuery.Data { var _node: NodeQuery.Data.Node? = null @@ -39,17 +38,17 @@ public object NodeQuery_ResponseAdapter { ) } - public override fun toJson( + override fun toJson( writer: JsonWriter, `value`: NodeQuery.Data, adapterContext: CompositeAdapterContext, - ): Unit { + ) { writer.name("node") Node.obj().toJson(writer, value.node, adapterContext) } private object Node : CompositeAdapter { - public override fun fromJson(reader: JsonReader, adapterContext: CompositeAdapterContext): + override fun fromJson(reader: JsonReader, adapterContext: CompositeAdapterContext): NodeQuery.Data.Node { val __typename = reader.readTypename() return when(__typename) { @@ -62,11 +61,11 @@ public object NodeQuery_ResponseAdapter { } } - public override fun toJson( + override fun toJson( writer: JsonWriter, `value`: NodeQuery.Data.Node, adapterContext: CompositeAdapterContext, - ): Unit { + ) { when(value) { is NodeQuery.Data.HumanNode -> HumanNode.toJson(writer, value, adapterContext) is NodeQuery.Data.DroidNode -> DroidNode.toJson(writer, value, adapterContext) @@ -107,7 +106,7 @@ public object NodeQuery_ResponseAdapter { writer: JsonWriter, `value`: NodeQuery.Data.HumanNode, @Suppress("UNUSED_PARAMETER") adapterContext: CompositeAdapterContext, - ): Unit { + ) { writer.name("__typename") StringAdapter.toJson(writer, CustomScalarAdapters.Empty, value.__typename) @@ -151,7 +150,7 @@ public object NodeQuery_ResponseAdapter { writer: JsonWriter, `value`: NodeQuery.Data.DroidNode, @Suppress("UNUSED_PARAMETER") adapterContext: CompositeAdapterContext, - ): Unit { + ) { writer.name("__typename") StringAdapter.toJson(writer, CustomScalarAdapters.Empty, value.__typename) @@ -192,7 +191,7 @@ public object NodeQuery_ResponseAdapter { writer: JsonWriter, `value`: NodeQuery.Data.OtherNode, @Suppress("UNUSED_PARAMETER") adapterContext: CompositeAdapterContext, - ): Unit { + ) { writer.name("__typename") StringAdapter.toJson(writer, CustomScalarAdapters.Empty, value.__typename) diff --git a/libraries/apollo-compiler/src/test/graphql/com/example/data_builders/kotlin/responseBased/data_builders/fragment/CatFragmentImpl.kt.expected b/libraries/apollo-compiler/src/test/graphql/com/example/data_builders/kotlin/responseBased/data_builders/fragment/CatFragmentImpl.kt.expected index 51b86e78f38..c7a240d165b 100644 --- a/libraries/apollo-compiler/src/test/graphql/com/example/data_builders/kotlin/responseBased/data_builders/fragment/CatFragmentImpl.kt.expected +++ b/libraries/apollo-compiler/src/test/graphql/com/example/data_builders/kotlin/responseBased/data_builders/fragment/CatFragmentImpl.kt.expected @@ -26,21 +26,21 @@ import kotlin.String import kotlin.Unit public class CatFragmentImpl() : Fragment { - public override fun equals(other: Any?): Boolean = other != null && other::class == this::class + override fun equals(other: Any?): Boolean = other != null && other::class == this::class - public override fun hashCode(): Int = this::class.hashCode() + override fun hashCode(): Int = this::class.hashCode() - public override fun serializeVariables( + override fun serializeVariables( writer: JsonWriter, customScalarAdapters: CustomScalarAdapters, withBooleanDefaultValues: Boolean, - ): Unit { + ) { // This fragment doesn't have any variable } - public override fun adapter(): CompositeAdapter = CatFragmentImpl_ResponseAdapter.Data.obj() + override fun adapter(): CompositeAdapter = CatFragmentImpl_ResponseAdapter.Data.obj() - public override fun rootField(): CompiledField = CompiledField.Builder( + override fun rootField(): CompiledField = CompiledField.Builder( name = "data", type = Cat.type ) @@ -48,7 +48,7 @@ public class CatFragmentImpl() : Fragment { .build() public data class Data( - public override val meow: String, + override val meow: String, ) : CatFragment, Fragment.Data public companion object { diff --git a/libraries/apollo-compiler/src/test/graphql/com/example/data_builders/kotlin/responseBased/data_builders/fragment/CatFragmentImpl_ResponseAdapter.kt.expected b/libraries/apollo-compiler/src/test/graphql/com/example/data_builders/kotlin/responseBased/data_builders/fragment/CatFragmentImpl_ResponseAdapter.kt.expected index d8671da568d..ced0f5867ab 100644 --- a/libraries/apollo-compiler/src/test/graphql/com/example/data_builders/kotlin/responseBased/data_builders/fragment/CatFragmentImpl_ResponseAdapter.kt.expected +++ b/libraries/apollo-compiler/src/test/graphql/com/example/data_builders/kotlin/responseBased/data_builders/fragment/CatFragmentImpl_ResponseAdapter.kt.expected @@ -12,14 +12,13 @@ import com.apollographql.apollo3.api.StringAdapter import com.apollographql.apollo3.api.json.JsonReader import com.apollographql.apollo3.api.json.JsonWriter import kotlin.String -import kotlin.Unit import kotlin.collections.List public object CatFragmentImpl_ResponseAdapter { public object Data : CompositeAdapter { public val RESPONSE_NAMES: List = listOf("meow") - public override fun fromJson(reader: JsonReader, adapterContext: CompositeAdapterContext): + override fun fromJson(reader: JsonReader, adapterContext: CompositeAdapterContext): CatFragmentImpl.Data { var _meow: String? = null @@ -35,11 +34,11 @@ public object CatFragmentImpl_ResponseAdapter { ) } - public override fun toJson( + override fun toJson( writer: JsonWriter, `value`: CatFragmentImpl.Data, adapterContext: CompositeAdapterContext, - ): Unit { + ) { writer.name("meow") StringAdapter.toJson(writer, CustomScalarAdapters.Empty, value.meow) } diff --git a/libraries/apollo-compiler/src/test/graphql/com/example/data_builders/kotlin/responseBased/data_builders/fragment/DogFragmentImpl.kt.expected b/libraries/apollo-compiler/src/test/graphql/com/example/data_builders/kotlin/responseBased/data_builders/fragment/DogFragmentImpl.kt.expected index 7c666996dff..92910f698bd 100644 --- a/libraries/apollo-compiler/src/test/graphql/com/example/data_builders/kotlin/responseBased/data_builders/fragment/DogFragmentImpl.kt.expected +++ b/libraries/apollo-compiler/src/test/graphql/com/example/data_builders/kotlin/responseBased/data_builders/fragment/DogFragmentImpl.kt.expected @@ -26,21 +26,21 @@ import kotlin.String import kotlin.Unit public class DogFragmentImpl() : Fragment { - public override fun equals(other: Any?): Boolean = other != null && other::class == this::class + override fun equals(other: Any?): Boolean = other != null && other::class == this::class - public override fun hashCode(): Int = this::class.hashCode() + override fun hashCode(): Int = this::class.hashCode() - public override fun serializeVariables( + override fun serializeVariables( writer: JsonWriter, customScalarAdapters: CustomScalarAdapters, withBooleanDefaultValues: Boolean, - ): Unit { + ) { // This fragment doesn't have any variable } - public override fun adapter(): CompositeAdapter = DogFragmentImpl_ResponseAdapter.Data.obj() + override fun adapter(): CompositeAdapter = DogFragmentImpl_ResponseAdapter.Data.obj() - public override fun rootField(): CompiledField = CompiledField.Builder( + override fun rootField(): CompiledField = CompiledField.Builder( name = "data", type = Dog.type ) @@ -48,7 +48,7 @@ public class DogFragmentImpl() : Fragment { .build() public data class Data( - public override val woof: String, + override val woof: String, ) : DogFragment, Fragment.Data public companion object { diff --git a/libraries/apollo-compiler/src/test/graphql/com/example/data_builders/kotlin/responseBased/data_builders/fragment/DogFragmentImpl_ResponseAdapter.kt.expected b/libraries/apollo-compiler/src/test/graphql/com/example/data_builders/kotlin/responseBased/data_builders/fragment/DogFragmentImpl_ResponseAdapter.kt.expected index dfb87370da8..a4feaa29364 100644 --- a/libraries/apollo-compiler/src/test/graphql/com/example/data_builders/kotlin/responseBased/data_builders/fragment/DogFragmentImpl_ResponseAdapter.kt.expected +++ b/libraries/apollo-compiler/src/test/graphql/com/example/data_builders/kotlin/responseBased/data_builders/fragment/DogFragmentImpl_ResponseAdapter.kt.expected @@ -12,14 +12,13 @@ import com.apollographql.apollo3.api.StringAdapter import com.apollographql.apollo3.api.json.JsonReader import com.apollographql.apollo3.api.json.JsonWriter import kotlin.String -import kotlin.Unit import kotlin.collections.List public object DogFragmentImpl_ResponseAdapter { public object Data : CompositeAdapter { public val RESPONSE_NAMES: List = listOf("woof") - public override fun fromJson(reader: JsonReader, adapterContext: CompositeAdapterContext): + override fun fromJson(reader: JsonReader, adapterContext: CompositeAdapterContext): DogFragmentImpl.Data { var _woof: String? = null @@ -35,11 +34,11 @@ public object DogFragmentImpl_ResponseAdapter { ) } - public override fun toJson( + override fun toJson( writer: JsonWriter, `value`: DogFragmentImpl.Data, adapterContext: CompositeAdapterContext, - ): Unit { + ) { writer.name("woof") StringAdapter.toJson(writer, CustomScalarAdapters.Empty, value.woof) } diff --git a/libraries/apollo-compiler/src/test/graphql/com/example/data_builders/kotlin/responseBased/data_builders/fragment/DroidFragmentImpl.kt.expected b/libraries/apollo-compiler/src/test/graphql/com/example/data_builders/kotlin/responseBased/data_builders/fragment/DroidFragmentImpl.kt.expected index f2528c649c3..d1690222c41 100644 --- a/libraries/apollo-compiler/src/test/graphql/com/example/data_builders/kotlin/responseBased/data_builders/fragment/DroidFragmentImpl.kt.expected +++ b/libraries/apollo-compiler/src/test/graphql/com/example/data_builders/kotlin/responseBased/data_builders/fragment/DroidFragmentImpl.kt.expected @@ -26,22 +26,21 @@ import kotlin.String import kotlin.Unit public class DroidFragmentImpl() : Fragment { - public override fun equals(other: Any?): Boolean = other != null && other::class == this::class + override fun equals(other: Any?): Boolean = other != null && other::class == this::class - public override fun hashCode(): Int = this::class.hashCode() + override fun hashCode(): Int = this::class.hashCode() - public override fun serializeVariables( + override fun serializeVariables( writer: JsonWriter, customScalarAdapters: CustomScalarAdapters, withBooleanDefaultValues: Boolean, - ): Unit { + ) { // This fragment doesn't have any variable } - public override fun adapter(): CompositeAdapter = - DroidFragmentImpl_ResponseAdapter.Data.obj() + override fun adapter(): CompositeAdapter = DroidFragmentImpl_ResponseAdapter.Data.obj() - public override fun rootField(): CompiledField = CompiledField.Builder( + override fun rootField(): CompiledField = CompiledField.Builder( name = "data", type = Droid.type ) @@ -49,7 +48,7 @@ public class DroidFragmentImpl() : Fragment { .build() public data class Data( - public override val primaryFunction: String, + override val primaryFunction: String, ) : DroidFragment, Fragment.Data public companion object { diff --git a/libraries/apollo-compiler/src/test/graphql/com/example/data_builders/kotlin/responseBased/data_builders/fragment/DroidFragmentImpl_ResponseAdapter.kt.expected b/libraries/apollo-compiler/src/test/graphql/com/example/data_builders/kotlin/responseBased/data_builders/fragment/DroidFragmentImpl_ResponseAdapter.kt.expected index c7af53741e5..02e2607e1fd 100644 --- a/libraries/apollo-compiler/src/test/graphql/com/example/data_builders/kotlin/responseBased/data_builders/fragment/DroidFragmentImpl_ResponseAdapter.kt.expected +++ b/libraries/apollo-compiler/src/test/graphql/com/example/data_builders/kotlin/responseBased/data_builders/fragment/DroidFragmentImpl_ResponseAdapter.kt.expected @@ -12,14 +12,13 @@ import com.apollographql.apollo3.api.StringAdapter import com.apollographql.apollo3.api.json.JsonReader import com.apollographql.apollo3.api.json.JsonWriter import kotlin.String -import kotlin.Unit import kotlin.collections.List public object DroidFragmentImpl_ResponseAdapter { public object Data : CompositeAdapter { public val RESPONSE_NAMES: List = listOf("primaryFunction") - public override fun fromJson(reader: JsonReader, adapterContext: CompositeAdapterContext): + override fun fromJson(reader: JsonReader, adapterContext: CompositeAdapterContext): DroidFragmentImpl.Data { var _primaryFunction: String? = null @@ -35,11 +34,11 @@ public object DroidFragmentImpl_ResponseAdapter { ) } - public override fun toJson( + override fun toJson( writer: JsonWriter, `value`: DroidFragmentImpl.Data, adapterContext: CompositeAdapterContext, - ): Unit { + ) { writer.name("primaryFunction") StringAdapter.toJson(writer, CustomScalarAdapters.Empty, value.primaryFunction) } diff --git a/libraries/apollo-compiler/src/test/graphql/com/example/data_builders/kotlin/responseBased/data_builders/fragment/HumanFragmentImpl.kt.expected b/libraries/apollo-compiler/src/test/graphql/com/example/data_builders/kotlin/responseBased/data_builders/fragment/HumanFragmentImpl.kt.expected index 74c9bb17003..12e2d0c902f 100644 --- a/libraries/apollo-compiler/src/test/graphql/com/example/data_builders/kotlin/responseBased/data_builders/fragment/HumanFragmentImpl.kt.expected +++ b/libraries/apollo-compiler/src/test/graphql/com/example/data_builders/kotlin/responseBased/data_builders/fragment/HumanFragmentImpl.kt.expected @@ -26,22 +26,21 @@ import kotlin.String import kotlin.Unit public class HumanFragmentImpl() : Fragment { - public override fun equals(other: Any?): Boolean = other != null && other::class == this::class + override fun equals(other: Any?): Boolean = other != null && other::class == this::class - public override fun hashCode(): Int = this::class.hashCode() + override fun hashCode(): Int = this::class.hashCode() - public override fun serializeVariables( + override fun serializeVariables( writer: JsonWriter, customScalarAdapters: CustomScalarAdapters, withBooleanDefaultValues: Boolean, - ): Unit { + ) { // This fragment doesn't have any variable } - public override fun adapter(): CompositeAdapter = - HumanFragmentImpl_ResponseAdapter.Data.obj() + override fun adapter(): CompositeAdapter = HumanFragmentImpl_ResponseAdapter.Data.obj() - public override fun rootField(): CompiledField = CompiledField.Builder( + override fun rootField(): CompiledField = CompiledField.Builder( name = "data", type = Human.type ) @@ -49,7 +48,7 @@ public class HumanFragmentImpl() : Fragment { .build() public data class Data( - public override val homePlanet: String, + override val homePlanet: String, ) : HumanFragment, Fragment.Data public companion object { diff --git a/libraries/apollo-compiler/src/test/graphql/com/example/data_builders/kotlin/responseBased/data_builders/fragment/HumanFragmentImpl_ResponseAdapter.kt.expected b/libraries/apollo-compiler/src/test/graphql/com/example/data_builders/kotlin/responseBased/data_builders/fragment/HumanFragmentImpl_ResponseAdapter.kt.expected index 55dae6576ff..4ca71f5778f 100644 --- a/libraries/apollo-compiler/src/test/graphql/com/example/data_builders/kotlin/responseBased/data_builders/fragment/HumanFragmentImpl_ResponseAdapter.kt.expected +++ b/libraries/apollo-compiler/src/test/graphql/com/example/data_builders/kotlin/responseBased/data_builders/fragment/HumanFragmentImpl_ResponseAdapter.kt.expected @@ -12,14 +12,13 @@ import com.apollographql.apollo3.api.StringAdapter import com.apollographql.apollo3.api.json.JsonReader import com.apollographql.apollo3.api.json.JsonWriter import kotlin.String -import kotlin.Unit import kotlin.collections.List public object HumanFragmentImpl_ResponseAdapter { public object Data : CompositeAdapter { public val RESPONSE_NAMES: List = listOf("homePlanet") - public override fun fromJson(reader: JsonReader, adapterContext: CompositeAdapterContext): + override fun fromJson(reader: JsonReader, adapterContext: CompositeAdapterContext): HumanFragmentImpl.Data { var _homePlanet: String? = null @@ -35,11 +34,11 @@ public object HumanFragmentImpl_ResponseAdapter { ) } - public override fun toJson( + override fun toJson( writer: JsonWriter, `value`: HumanFragmentImpl.Data, adapterContext: CompositeAdapterContext, - ): Unit { + ) { writer.name("homePlanet") StringAdapter.toJson(writer, CustomScalarAdapters.Empty, value.homePlanet) } diff --git a/libraries/apollo-compiler/src/test/graphql/com/example/data_builders/kotlin/responseBased/data_builders/type/Animal.kt.expected b/libraries/apollo-compiler/src/test/graphql/com/example/data_builders/kotlin/responseBased/data_builders/type/Animal.kt.expected index ce6bc892167..cba56a87dec 100644 --- a/libraries/apollo-compiler/src/test/graphql/com/example/data_builders/kotlin/responseBased/data_builders/type/Animal.kt.expected +++ b/libraries/apollo-compiler/src/test/graphql/com/example/data_builders/kotlin/responseBased/data_builders/type/Animal.kt.expected @@ -19,7 +19,7 @@ public class Animal { public companion object : BuilderFactory { public val type: UnionType = UnionType("Animal", Cat.type, Dog.type) - public override fun newBuilder(customScalarAdapters: CustomScalarAdapters): OtherAnimalBuilder = + override fun newBuilder(customScalarAdapters: CustomScalarAdapters): OtherAnimalBuilder = OtherAnimalBuilder(customScalarAdapters) } } @@ -29,7 +29,7 @@ public interface AnimalMap : Map public class OtherAnimalBuilder( customScalarAdapters: CustomScalarAdapters, ) : ObjectBuilder(customScalarAdapters) { - public override fun build(): OtherAnimalMap = OtherAnimalMap(__fields) + override fun build(): OtherAnimalMap = OtherAnimalMap(__fields) } public class OtherAnimalMap( diff --git a/libraries/apollo-compiler/src/test/graphql/com/example/data_builders/kotlin/responseBased/data_builders/type/Cat.kt.expected b/libraries/apollo-compiler/src/test/graphql/com/example/data_builders/kotlin/responseBased/data_builders/type/Cat.kt.expected index 0245b584b69..fed7246d02d 100644 --- a/libraries/apollo-compiler/src/test/graphql/com/example/data_builders/kotlin/responseBased/data_builders/type/Cat.kt.expected +++ b/libraries/apollo-compiler/src/test/graphql/com/example/data_builders/kotlin/responseBased/data_builders/type/Cat.kt.expected @@ -20,7 +20,7 @@ public class Cat { public val type: ObjectType = ObjectType.Builder(name = "Cat").interfaces(listOf(Node.type)).build() - public override fun newBuilder(customScalarAdapters: CustomScalarAdapters): CatBuilder = + override fun newBuilder(customScalarAdapters: CustomScalarAdapters): CatBuilder = CatBuilder(customScalarAdapters) } } @@ -35,7 +35,7 @@ public class CatBuilder( init { __typename = "Cat"} - public override fun build(): CatMap = CatMap(__fields) + override fun build(): CatMap = CatMap(__fields) } public class CatMap( diff --git a/libraries/apollo-compiler/src/test/graphql/com/example/data_builders/kotlin/responseBased/data_builders/type/Character.kt.expected b/libraries/apollo-compiler/src/test/graphql/com/example/data_builders/kotlin/responseBased/data_builders/type/Character.kt.expected index 77d913ff56c..91f0e9c8b16 100644 --- a/libraries/apollo-compiler/src/test/graphql/com/example/data_builders/kotlin/responseBased/data_builders/type/Character.kt.expected +++ b/libraries/apollo-compiler/src/test/graphql/com/example/data_builders/kotlin/responseBased/data_builders/type/Character.kt.expected @@ -20,8 +20,8 @@ public class Character { public val type: InterfaceType = InterfaceType.Builder(name = "Character").interfaces(listOf(Node.type)).build() - public override fun newBuilder(customScalarAdapters: CustomScalarAdapters): - OtherCharacterBuilder = OtherCharacterBuilder(customScalarAdapters) + override fun newBuilder(customScalarAdapters: CustomScalarAdapters): OtherCharacterBuilder = + OtherCharacterBuilder(customScalarAdapters) } } @@ -34,7 +34,7 @@ public class OtherCharacterBuilder( public var name: String by __fields - public override fun build(): OtherCharacterMap = OtherCharacterMap(__fields) + override fun build(): OtherCharacterMap = OtherCharacterMap(__fields) } public class OtherCharacterMap( diff --git a/libraries/apollo-compiler/src/test/graphql/com/example/data_builders/kotlin/responseBased/data_builders/type/Dog.kt.expected b/libraries/apollo-compiler/src/test/graphql/com/example/data_builders/kotlin/responseBased/data_builders/type/Dog.kt.expected index 501beff35c8..2854da2f60a 100644 --- a/libraries/apollo-compiler/src/test/graphql/com/example/data_builders/kotlin/responseBased/data_builders/type/Dog.kt.expected +++ b/libraries/apollo-compiler/src/test/graphql/com/example/data_builders/kotlin/responseBased/data_builders/type/Dog.kt.expected @@ -20,7 +20,7 @@ public class Dog { public val type: ObjectType = ObjectType.Builder(name = "Dog").interfaces(listOf(Node.type)).build() - public override fun newBuilder(customScalarAdapters: CustomScalarAdapters): DogBuilder = + override fun newBuilder(customScalarAdapters: CustomScalarAdapters): DogBuilder = DogBuilder(customScalarAdapters) } } @@ -35,7 +35,7 @@ public class DogBuilder( init { __typename = "Dog"} - public override fun build(): DogMap = DogMap(__fields) + override fun build(): DogMap = DogMap(__fields) } public class DogMap( diff --git a/libraries/apollo-compiler/src/test/graphql/com/example/data_builders/kotlin/responseBased/data_builders/type/Droid.kt.expected b/libraries/apollo-compiler/src/test/graphql/com/example/data_builders/kotlin/responseBased/data_builders/type/Droid.kt.expected index a82bb37a4bd..19c5c405995 100644 --- a/libraries/apollo-compiler/src/test/graphql/com/example/data_builders/kotlin/responseBased/data_builders/type/Droid.kt.expected +++ b/libraries/apollo-compiler/src/test/graphql/com/example/data_builders/kotlin/responseBased/data_builders/type/Droid.kt.expected @@ -20,7 +20,7 @@ public class Droid { public val type: ObjectType = ObjectType.Builder(name = "Droid").interfaces(listOf(Character.type)).build() - public override fun newBuilder(customScalarAdapters: CustomScalarAdapters): DroidBuilder = + override fun newBuilder(customScalarAdapters: CustomScalarAdapters): DroidBuilder = DroidBuilder(customScalarAdapters) } } @@ -35,7 +35,7 @@ public class DroidBuilder( init { __typename = "Droid"} - public override fun build(): DroidMap = DroidMap(__fields) + override fun build(): DroidMap = DroidMap(__fields) } public class DroidMap( diff --git a/libraries/apollo-compiler/src/test/graphql/com/example/data_builders/kotlin/responseBased/data_builders/type/Human.kt.expected b/libraries/apollo-compiler/src/test/graphql/com/example/data_builders/kotlin/responseBased/data_builders/type/Human.kt.expected index 1e657b8f55e..4288a967595 100644 --- a/libraries/apollo-compiler/src/test/graphql/com/example/data_builders/kotlin/responseBased/data_builders/type/Human.kt.expected +++ b/libraries/apollo-compiler/src/test/graphql/com/example/data_builders/kotlin/responseBased/data_builders/type/Human.kt.expected @@ -20,7 +20,7 @@ public class Human { public val type: ObjectType = ObjectType.Builder(name = "Human").interfaces(listOf(Character.type)).build() - public override fun newBuilder(customScalarAdapters: CustomScalarAdapters): HumanBuilder = + override fun newBuilder(customScalarAdapters: CustomScalarAdapters): HumanBuilder = HumanBuilder(customScalarAdapters) } } @@ -37,7 +37,7 @@ public class HumanBuilder( init { __typename = "Human"} - public override fun build(): HumanMap = HumanMap(__fields) + override fun build(): HumanMap = HumanMap(__fields) } public class HumanMap( diff --git a/libraries/apollo-compiler/src/test/graphql/com/example/data_builders/kotlin/responseBased/data_builders/type/Node.kt.expected b/libraries/apollo-compiler/src/test/graphql/com/example/data_builders/kotlin/responseBased/data_builders/type/Node.kt.expected index 3e315e5a7d2..fd8fba5b2aa 100644 --- a/libraries/apollo-compiler/src/test/graphql/com/example/data_builders/kotlin/responseBased/data_builders/type/Node.kt.expected +++ b/libraries/apollo-compiler/src/test/graphql/com/example/data_builders/kotlin/responseBased/data_builders/type/Node.kt.expected @@ -19,7 +19,7 @@ public class Node { public companion object : BuilderFactory { public val type: InterfaceType = InterfaceType.Builder(name = "Node").build() - public override fun newBuilder(customScalarAdapters: CustomScalarAdapters): OtherNodeBuilder = + override fun newBuilder(customScalarAdapters: CustomScalarAdapters): OtherNodeBuilder = OtherNodeBuilder(customScalarAdapters) } } @@ -31,7 +31,7 @@ public class OtherNodeBuilder( ) : ObjectBuilder(customScalarAdapters) { public var id: String by __fields - public override fun build(): OtherNodeMap = OtherNodeMap(__fields) + override fun build(): OtherNodeMap = OtherNodeMap(__fields) } public class OtherNodeMap( diff --git a/libraries/apollo-compiler/src/test/graphql/com/example/data_builders/kotlin/responseBased/data_builders/type/Query.kt.expected b/libraries/apollo-compiler/src/test/graphql/com/example/data_builders/kotlin/responseBased/data_builders/type/Query.kt.expected index 2c042bf3496..f01f163eb5e 100644 --- a/libraries/apollo-compiler/src/test/graphql/com/example/data_builders/kotlin/responseBased/data_builders/type/Query.kt.expected +++ b/libraries/apollo-compiler/src/test/graphql/com/example/data_builders/kotlin/responseBased/data_builders/type/Query.kt.expected @@ -19,7 +19,7 @@ public class Query { public companion object : BuilderFactory { public val type: ObjectType = ObjectType.Builder(name = "Query").build() - public override fun newBuilder(customScalarAdapters: CustomScalarAdapters): QueryBuilder = + override fun newBuilder(customScalarAdapters: CustomScalarAdapters): QueryBuilder = QueryBuilder(customScalarAdapters) } } @@ -36,7 +36,7 @@ public class QueryBuilder( init { __typename = "Query"} - public override fun build(): QueryMap = QueryMap(__fields) + override fun build(): QueryMap = QueryMap(__fields) } public class QueryMap( diff --git a/libraries/apollo-compiler/src/test/graphql/com/example/decapitalized_fields/kotlin/operationBased/decapitalized_fields/TestQuery.kt.expected b/libraries/apollo-compiler/src/test/graphql/com/example/decapitalized_fields/kotlin/operationBased/decapitalized_fields/TestQuery.kt.expected index c0d1b98b06d..4948a52f66a 100644 --- a/libraries/apollo-compiler/src/test/graphql/com/example/decapitalized_fields/kotlin/operationBased/decapitalized_fields/TestQuery.kt.expected +++ b/libraries/apollo-compiler/src/test/graphql/com/example/decapitalized_fields/kotlin/operationBased/decapitalized_fields/TestQuery.kt.expected @@ -19,32 +19,32 @@ import kotlin.Any import kotlin.Boolean import kotlin.Int import kotlin.String -import kotlin.Unit +import com.example.decapitalized_fields.type.Query as CompiledQuery public class TestQuery() : Query { - public override fun equals(other: Any?): Boolean = other != null && other::class == this::class + override fun equals(other: Any?): Boolean = other != null && other::class == this::class - public override fun hashCode(): Int = this::class.hashCode() + override fun hashCode(): Int = this::class.hashCode() - public override fun id(): String = OPERATION_ID + override fun id(): String = OPERATION_ID - public override fun document(): String = OPERATION_DOCUMENT + override fun document(): String = OPERATION_DOCUMENT - public override fun name(): String = OPERATION_NAME + override fun name(): String = OPERATION_NAME - public override fun serializeVariables( + override fun serializeVariables( writer: JsonWriter, customScalarAdapters: CustomScalarAdapters, withBooleanDefaultValues: Boolean, - ): Unit { + ) { // This operation doesn't have any variable } - public override fun adapter(): CompositeAdapter = TestQuery_ResponseAdapter.Data.obj() + override fun adapter(): CompositeAdapter = TestQuery_ResponseAdapter.Data.obj() - public override fun rootField(): CompiledField = CompiledField.Builder( + override fun rootField(): CompiledField = CompiledField.Builder( name = "data", - type = com.example.decapitalized_fields.type.Query.type + type = CompiledQuery.type ) .selections(selections = TestQuerySelections.__root) .build() diff --git a/libraries/apollo-compiler/src/test/graphql/com/example/decapitalized_fields/kotlin/operationBased/decapitalized_fields/adapter/TestQuery_ResponseAdapter.kt.expected b/libraries/apollo-compiler/src/test/graphql/com/example/decapitalized_fields/kotlin/operationBased/decapitalized_fields/adapter/TestQuery_ResponseAdapter.kt.expected index 0070c0bda40..182329387ff 100644 --- a/libraries/apollo-compiler/src/test/graphql/com/example/decapitalized_fields/kotlin/operationBased/decapitalized_fields/adapter/TestQuery_ResponseAdapter.kt.expected +++ b/libraries/apollo-compiler/src/test/graphql/com/example/decapitalized_fields/kotlin/operationBased/decapitalized_fields/adapter/TestQuery_ResponseAdapter.kt.expected @@ -16,14 +16,13 @@ import com.apollographql.apollo3.api.nullable import com.apollographql.apollo3.api.obj import com.example.decapitalized_fields.TestQuery import kotlin.String -import kotlin.Unit import kotlin.collections.List public object TestQuery_ResponseAdapter { public object Data : CompositeAdapter { public val RESPONSE_NAMES: List = listOf("Horse") - public override fun fromJson(reader: JsonReader, adapterContext: CompositeAdapterContext): + override fun fromJson(reader: JsonReader, adapterContext: CompositeAdapterContext): TestQuery.Data { var _Horse: TestQuery.Data.Horse? = null @@ -39,11 +38,11 @@ public object TestQuery_ResponseAdapter { ) } - public override fun toJson( + override fun toJson( writer: JsonWriter, `value`: TestQuery.Data, adapterContext: CompositeAdapterContext, - ): Unit { + ) { writer.name("Horse") Horse.obj(true).nullable().toJson(writer, value.horse, adapterContext) } @@ -51,7 +50,7 @@ public object TestQuery_ResponseAdapter { private object Horse : CompositeAdapter { public val RESPONSE_NAMES: List = listOf("__typename", "Donkey") - public override fun fromJson(reader: JsonReader, adapterContext: CompositeAdapterContext): + override fun fromJson(reader: JsonReader, adapterContext: CompositeAdapterContext): TestQuery.Data.Horse { var __typename: String? = null var _Donkey: String? = null @@ -80,11 +79,11 @@ public object TestQuery_ResponseAdapter { ) } - public override fun toJson( + override fun toJson( writer: JsonWriter, `value`: TestQuery.Data.Horse, adapterContext: CompositeAdapterContext, - ): Unit { + ) { writer.name("__typename") StringAdapter.toJson(writer, CustomScalarAdapters.Empty, value.__typename) @@ -101,7 +100,7 @@ public object TestQuery_ResponseAdapter { private object OnHorse : CompositeAdapter { public val RESPONSE_NAMES: List = listOf("Cow") - public override fun fromJson(reader: JsonReader, adapterContext: CompositeAdapterContext): + override fun fromJson(reader: JsonReader, adapterContext: CompositeAdapterContext): TestQuery.Data.Horse.OnHorse { var _Cow: TestQuery.Data.Horse.OnHorse.Cow? = null @@ -117,11 +116,11 @@ public object TestQuery_ResponseAdapter { ) } - public override fun toJson( + override fun toJson( writer: JsonWriter, `value`: TestQuery.Data.Horse.OnHorse, adapterContext: CompositeAdapterContext, - ): Unit { + ) { writer.name("Cow") Cow.obj().nullable().toJson(writer, value.cow, adapterContext) } @@ -129,7 +128,7 @@ public object TestQuery_ResponseAdapter { private object Cow : CompositeAdapter { public val RESPONSE_NAMES: List = listOf("Moo") - public override fun fromJson(reader: JsonReader, adapterContext: CompositeAdapterContext): + override fun fromJson(reader: JsonReader, adapterContext: CompositeAdapterContext): TestQuery.Data.Horse.OnHorse.Cow { var _Moo: String? = null @@ -145,11 +144,11 @@ public object TestQuery_ResponseAdapter { ) } - public override fun toJson( + override fun toJson( writer: JsonWriter, `value`: TestQuery.Data.Horse.OnHorse.Cow, adapterContext: CompositeAdapterContext, - ): Unit { + ) { writer.name("Moo") NullableStringAdapter.toJson(writer, CustomScalarAdapters.Empty, value.moo) } diff --git a/libraries/apollo-compiler/src/test/graphql/com/example/decapitalized_fields/kotlin/operationBased/decapitalized_fields/fragment/HorseFragmentImpl.kt.expected b/libraries/apollo-compiler/src/test/graphql/com/example/decapitalized_fields/kotlin/operationBased/decapitalized_fields/fragment/HorseFragmentImpl.kt.expected index b2c84730a35..7263a031dcd 100644 --- a/libraries/apollo-compiler/src/test/graphql/com/example/decapitalized_fields/kotlin/operationBased/decapitalized_fields/fragment/HorseFragmentImpl.kt.expected +++ b/libraries/apollo-compiler/src/test/graphql/com/example/decapitalized_fields/kotlin/operationBased/decapitalized_fields/fragment/HorseFragmentImpl.kt.expected @@ -16,25 +16,24 @@ import com.example.decapitalized_fields.type.Horse import kotlin.Any import kotlin.Boolean import kotlin.Int -import kotlin.Unit public class HorseFragmentImpl() : Fragment { - public override fun equals(other: Any?): Boolean = other != null && other::class == this::class + override fun equals(other: Any?): Boolean = other != null && other::class == this::class - public override fun hashCode(): Int = this::class.hashCode() + override fun hashCode(): Int = this::class.hashCode() - public override fun serializeVariables( + override fun serializeVariables( writer: JsonWriter, customScalarAdapters: CustomScalarAdapters, withBooleanDefaultValues: Boolean, - ): Unit { + ) { // This fragment doesn't have any variable } - public override fun adapter(): CompositeAdapter = + override fun adapter(): CompositeAdapter = HorseFragmentImpl_ResponseAdapter.HorseFragment.obj() - public override fun rootField(): CompiledField = CompiledField.Builder( + override fun rootField(): CompiledField = CompiledField.Builder( name = "data", type = Horse.type ) diff --git a/libraries/apollo-compiler/src/test/graphql/com/example/decapitalized_fields/kotlin/operationBased/decapitalized_fields/fragment/HorseFragmentImpl_ResponseAdapter.kt.expected b/libraries/apollo-compiler/src/test/graphql/com/example/decapitalized_fields/kotlin/operationBased/decapitalized_fields/fragment/HorseFragmentImpl_ResponseAdapter.kt.expected index 18c85535f7b..15eded8be5c 100644 --- a/libraries/apollo-compiler/src/test/graphql/com/example/decapitalized_fields/kotlin/operationBased/decapitalized_fields/fragment/HorseFragmentImpl_ResponseAdapter.kt.expected +++ b/libraries/apollo-compiler/src/test/graphql/com/example/decapitalized_fields/kotlin/operationBased/decapitalized_fields/fragment/HorseFragmentImpl_ResponseAdapter.kt.expected @@ -14,7 +14,6 @@ import com.apollographql.apollo3.api.json.JsonWriter import com.apollographql.apollo3.api.nullable import com.apollographql.apollo3.api.obj import kotlin.String -import kotlin.Unit import kotlin.collections.List public object HorseFragmentImpl_ResponseAdapter { @@ -22,7 +21,7 @@ public object HorseFragmentImpl_ResponseAdapter { CompositeAdapter { public val RESPONSE_NAMES: List = listOf("Cow") - public override fun fromJson(reader: JsonReader, adapterContext: CompositeAdapterContext): + override fun fromJson(reader: JsonReader, adapterContext: CompositeAdapterContext): com.example.decapitalized_fields.fragment.HorseFragment { var _Cow: com.example.decapitalized_fields.fragment.HorseFragment.Cow? = null @@ -38,11 +37,11 @@ public object HorseFragmentImpl_ResponseAdapter { ) } - public override fun toJson( + override fun toJson( writer: JsonWriter, `value`: com.example.decapitalized_fields.fragment.HorseFragment, adapterContext: CompositeAdapterContext, - ): Unit { + ) { writer.name("Cow") Cow.obj().nullable().toJson(writer, value.cow, adapterContext) } @@ -51,7 +50,7 @@ public object HorseFragmentImpl_ResponseAdapter { CompositeAdapter { public val RESPONSE_NAMES: List = listOf("Moo") - public override fun fromJson(reader: JsonReader, adapterContext: CompositeAdapterContext): + override fun fromJson(reader: JsonReader, adapterContext: CompositeAdapterContext): com.example.decapitalized_fields.fragment.HorseFragment.Cow { var _Moo: String? = null @@ -67,11 +66,11 @@ public object HorseFragmentImpl_ResponseAdapter { ) } - public override fun toJson( + override fun toJson( writer: JsonWriter, `value`: com.example.decapitalized_fields.fragment.HorseFragment.Cow, adapterContext: CompositeAdapterContext, - ): Unit { + ) { writer.name("Moo") NullableStringAdapter.toJson(writer, CustomScalarAdapters.Empty, value.moo) } diff --git a/libraries/apollo-compiler/src/test/graphql/com/example/decapitalized_fields/kotlin/responseBased/decapitalized_fields/TestQuery.kt.expected b/libraries/apollo-compiler/src/test/graphql/com/example/decapitalized_fields/kotlin/responseBased/decapitalized_fields/TestQuery.kt.expected index a1d420d0866..e9a8b885aba 100644 --- a/libraries/apollo-compiler/src/test/graphql/com/example/decapitalized_fields/kotlin/responseBased/decapitalized_fields/TestQuery.kt.expected +++ b/libraries/apollo-compiler/src/test/graphql/com/example/decapitalized_fields/kotlin/responseBased/decapitalized_fields/TestQuery.kt.expected @@ -19,32 +19,33 @@ import kotlin.Any import kotlin.Boolean import kotlin.Int import kotlin.String -import kotlin.Unit +import kotlin.Suppress +import com.example.decapitalized_fields.type.Query as CompiledQuery public class TestQuery() : Query { - public override fun equals(other: Any?): Boolean = other != null && other::class == this::class + override fun equals(other: Any?): Boolean = other != null && other::class == this::class - public override fun hashCode(): Int = this::class.hashCode() + override fun hashCode(): Int = this::class.hashCode() - public override fun id(): String = OPERATION_ID + override fun id(): String = OPERATION_ID - public override fun document(): String = OPERATION_DOCUMENT + override fun document(): String = OPERATION_DOCUMENT - public override fun name(): String = OPERATION_NAME + override fun name(): String = OPERATION_NAME - public override fun serializeVariables( + override fun serializeVariables( writer: JsonWriter, customScalarAdapters: CustomScalarAdapters, withBooleanDefaultValues: Boolean, - ): Unit { + ) { // This operation doesn't have any variable } - public override fun adapter(): CompositeAdapter = TestQuery_ResponseAdapter.Data.obj() + override fun adapter(): CompositeAdapter = TestQuery_ResponseAdapter.Data.obj() - public override fun rootField(): CompiledField = CompiledField.Builder( + override fun rootField(): CompiledField = CompiledField.Builder( name = "data", - type = com.example.decapitalized_fields.type.Query.type + type = CompiledQuery.type ) .selections(selections = TestQuerySelections.__root) .build() @@ -56,14 +57,15 @@ public class TestQuery() : Query { public data class Horse( public val __typename: String, public val donkey: String?, - public override val cow: Cow?, + override val cow: Cow?, ) : HorseFragment { public data class Cow( - public override val moo: String?, + override val moo: String?, ) : HorseFragment.Cow public companion object { - public fun Horse.horseFragment() = this as? HorseFragment + @Suppress("USELESS_CAST") + public fun Horse.horseFragment(): HorseFragment? = this as? HorseFragment } } } diff --git a/libraries/apollo-compiler/src/test/graphql/com/example/decapitalized_fields/kotlin/responseBased/decapitalized_fields/adapter/TestQuery_ResponseAdapter.kt.expected b/libraries/apollo-compiler/src/test/graphql/com/example/decapitalized_fields/kotlin/responseBased/decapitalized_fields/adapter/TestQuery_ResponseAdapter.kt.expected index c6b891cca9b..3a9bbe7a197 100644 --- a/libraries/apollo-compiler/src/test/graphql/com/example/decapitalized_fields/kotlin/responseBased/decapitalized_fields/adapter/TestQuery_ResponseAdapter.kt.expected +++ b/libraries/apollo-compiler/src/test/graphql/com/example/decapitalized_fields/kotlin/responseBased/decapitalized_fields/adapter/TestQuery_ResponseAdapter.kt.expected @@ -16,14 +16,13 @@ import com.apollographql.apollo3.api.nullable import com.apollographql.apollo3.api.obj import com.example.decapitalized_fields.TestQuery import kotlin.String -import kotlin.Unit import kotlin.collections.List public object TestQuery_ResponseAdapter { public object Data : CompositeAdapter { public val RESPONSE_NAMES: List = listOf("Horse") - public override fun fromJson(reader: JsonReader, adapterContext: CompositeAdapterContext): + override fun fromJson(reader: JsonReader, adapterContext: CompositeAdapterContext): TestQuery.Data { var _Horse: TestQuery.Data.Horse? = null @@ -39,11 +38,11 @@ public object TestQuery_ResponseAdapter { ) } - public override fun toJson( + override fun toJson( writer: JsonWriter, `value`: TestQuery.Data, adapterContext: CompositeAdapterContext, - ): Unit { + ) { writer.name("Horse") Horse.obj().nullable().toJson(writer, value.horse, adapterContext) } @@ -51,7 +50,7 @@ public object TestQuery_ResponseAdapter { private object Horse : CompositeAdapter { public val RESPONSE_NAMES: List = listOf("__typename", "Donkey", "Cow") - public override fun fromJson(reader: JsonReader, adapterContext: CompositeAdapterContext): + override fun fromJson(reader: JsonReader, adapterContext: CompositeAdapterContext): TestQuery.Data.Horse { var __typename: String? = null var _Donkey: String? = null @@ -73,11 +72,11 @@ public object TestQuery_ResponseAdapter { ) } - public override fun toJson( + override fun toJson( writer: JsonWriter, `value`: TestQuery.Data.Horse, adapterContext: CompositeAdapterContext, - ): Unit { + ) { writer.name("__typename") StringAdapter.toJson(writer, CustomScalarAdapters.Empty, value.__typename) @@ -91,7 +90,7 @@ public object TestQuery_ResponseAdapter { private object Cow : CompositeAdapter { public val RESPONSE_NAMES: List = listOf("Moo") - public override fun fromJson(reader: JsonReader, adapterContext: CompositeAdapterContext): + override fun fromJson(reader: JsonReader, adapterContext: CompositeAdapterContext): TestQuery.Data.Horse.Cow { var _Moo: String? = null @@ -107,11 +106,11 @@ public object TestQuery_ResponseAdapter { ) } - public override fun toJson( + override fun toJson( writer: JsonWriter, `value`: TestQuery.Data.Horse.Cow, adapterContext: CompositeAdapterContext, - ): Unit { + ) { writer.name("Moo") NullableStringAdapter.toJson(writer, CustomScalarAdapters.Empty, value.moo) } diff --git a/libraries/apollo-compiler/src/test/graphql/com/example/decapitalized_fields/kotlin/responseBased/decapitalized_fields/fragment/HorseFragmentImpl.kt.expected b/libraries/apollo-compiler/src/test/graphql/com/example/decapitalized_fields/kotlin/responseBased/decapitalized_fields/fragment/HorseFragmentImpl.kt.expected index b6a70545fbd..52d179a2662 100644 --- a/libraries/apollo-compiler/src/test/graphql/com/example/decapitalized_fields/kotlin/responseBased/decapitalized_fields/fragment/HorseFragmentImpl.kt.expected +++ b/libraries/apollo-compiler/src/test/graphql/com/example/decapitalized_fields/kotlin/responseBased/decapitalized_fields/fragment/HorseFragmentImpl.kt.expected @@ -17,25 +17,23 @@ import kotlin.Any import kotlin.Boolean import kotlin.Int import kotlin.String -import kotlin.Unit public class HorseFragmentImpl() : Fragment { - public override fun equals(other: Any?): Boolean = other != null && other::class == this::class + override fun equals(other: Any?): Boolean = other != null && other::class == this::class - public override fun hashCode(): Int = this::class.hashCode() + override fun hashCode(): Int = this::class.hashCode() - public override fun serializeVariables( + override fun serializeVariables( writer: JsonWriter, customScalarAdapters: CustomScalarAdapters, withBooleanDefaultValues: Boolean, - ): Unit { + ) { // This fragment doesn't have any variable } - public override fun adapter(): CompositeAdapter = - HorseFragmentImpl_ResponseAdapter.Data.obj() + override fun adapter(): CompositeAdapter = HorseFragmentImpl_ResponseAdapter.Data.obj() - public override fun rootField(): CompiledField = CompiledField.Builder( + override fun rootField(): CompiledField = CompiledField.Builder( name = "data", type = Horse.type ) @@ -43,10 +41,10 @@ public class HorseFragmentImpl() : Fragment { .build() public data class Data( - public override val cow: Cow?, + override val cow: Cow?, ) : HorseFragment, Fragment.Data { public data class Cow( - public override val moo: String?, + override val moo: String?, ) : HorseFragment.Cow } } diff --git a/libraries/apollo-compiler/src/test/graphql/com/example/decapitalized_fields/kotlin/responseBased/decapitalized_fields/fragment/HorseFragmentImpl_ResponseAdapter.kt.expected b/libraries/apollo-compiler/src/test/graphql/com/example/decapitalized_fields/kotlin/responseBased/decapitalized_fields/fragment/HorseFragmentImpl_ResponseAdapter.kt.expected index a318d1b504c..3224e91074f 100644 --- a/libraries/apollo-compiler/src/test/graphql/com/example/decapitalized_fields/kotlin/responseBased/decapitalized_fields/fragment/HorseFragmentImpl_ResponseAdapter.kt.expected +++ b/libraries/apollo-compiler/src/test/graphql/com/example/decapitalized_fields/kotlin/responseBased/decapitalized_fields/fragment/HorseFragmentImpl_ResponseAdapter.kt.expected @@ -14,14 +14,13 @@ import com.apollographql.apollo3.api.json.JsonWriter import com.apollographql.apollo3.api.nullable import com.apollographql.apollo3.api.obj import kotlin.String -import kotlin.Unit import kotlin.collections.List public object HorseFragmentImpl_ResponseAdapter { public object Data : CompositeAdapter { public val RESPONSE_NAMES: List = listOf("Cow") - public override fun fromJson(reader: JsonReader, adapterContext: CompositeAdapterContext): + override fun fromJson(reader: JsonReader, adapterContext: CompositeAdapterContext): HorseFragmentImpl.Data { var _Cow: HorseFragmentImpl.Data.Cow? = null @@ -37,11 +36,11 @@ public object HorseFragmentImpl_ResponseAdapter { ) } - public override fun toJson( + override fun toJson( writer: JsonWriter, `value`: HorseFragmentImpl.Data, adapterContext: CompositeAdapterContext, - ): Unit { + ) { writer.name("Cow") Cow.obj().nullable().toJson(writer, value.cow, adapterContext) } @@ -49,7 +48,7 @@ public object HorseFragmentImpl_ResponseAdapter { private object Cow : CompositeAdapter { public val RESPONSE_NAMES: List = listOf("Moo") - public override fun fromJson(reader: JsonReader, adapterContext: CompositeAdapterContext): + override fun fromJson(reader: JsonReader, adapterContext: CompositeAdapterContext): HorseFragmentImpl.Data.Cow { var _Moo: String? = null @@ -65,11 +64,11 @@ public object HorseFragmentImpl_ResponseAdapter { ) } - public override fun toJson( + override fun toJson( writer: JsonWriter, `value`: HorseFragmentImpl.Data.Cow, adapterContext: CompositeAdapterContext, - ): Unit { + ) { writer.name("Moo") NullableStringAdapter.toJson(writer, CustomScalarAdapters.Empty, value.moo) } diff --git a/libraries/apollo-compiler/src/test/graphql/com/example/deprecated_merged_field/kotlin/operationBased/deprecated_merged_field/CatQuery.kt.expected b/libraries/apollo-compiler/src/test/graphql/com/example/deprecated_merged_field/kotlin/operationBased/deprecated_merged_field/CatQuery.kt.expected index d8816dcd776..199bb36d7c1 100644 --- a/libraries/apollo-compiler/src/test/graphql/com/example/deprecated_merged_field/kotlin/operationBased/deprecated_merged_field/CatQuery.kt.expected +++ b/libraries/apollo-compiler/src/test/graphql/com/example/deprecated_merged_field/kotlin/operationBased/deprecated_merged_field/CatQuery.kt.expected @@ -19,32 +19,32 @@ import kotlin.Any import kotlin.Boolean import kotlin.Int import kotlin.String -import kotlin.Unit +import com.example.deprecated_merged_field.type.Query as CompiledQuery public class CatQuery() : Query { - public override fun equals(other: Any?): Boolean = other != null && other::class == this::class + override fun equals(other: Any?): Boolean = other != null && other::class == this::class - public override fun hashCode(): Int = this::class.hashCode() + override fun hashCode(): Int = this::class.hashCode() - public override fun id(): String = OPERATION_ID + override fun id(): String = OPERATION_ID - public override fun document(): String = OPERATION_DOCUMENT + override fun document(): String = OPERATION_DOCUMENT - public override fun name(): String = OPERATION_NAME + override fun name(): String = OPERATION_NAME - public override fun serializeVariables( + override fun serializeVariables( writer: JsonWriter, customScalarAdapters: CustomScalarAdapters, withBooleanDefaultValues: Boolean, - ): Unit { + ) { // This operation doesn't have any variable } - public override fun adapter(): CompositeAdapter = CatQuery_ResponseAdapter.Data.obj() + override fun adapter(): CompositeAdapter = CatQuery_ResponseAdapter.Data.obj() - public override fun rootField(): CompiledField = CompiledField.Builder( + override fun rootField(): CompiledField = CompiledField.Builder( name = "data", - type = com.example.deprecated_merged_field.type.Query.type + type = CompiledQuery.type ) .selections(selections = CatQuerySelections.__root) .build() diff --git a/libraries/apollo-compiler/src/test/graphql/com/example/deprecated_merged_field/kotlin/operationBased/deprecated_merged_field/adapter/CatQuery_ResponseAdapter.kt.expected b/libraries/apollo-compiler/src/test/graphql/com/example/deprecated_merged_field/kotlin/operationBased/deprecated_merged_field/adapter/CatQuery_ResponseAdapter.kt.expected index 2ade0936ff8..ae9277ab22f 100644 --- a/libraries/apollo-compiler/src/test/graphql/com/example/deprecated_merged_field/kotlin/operationBased/deprecated_merged_field/adapter/CatQuery_ResponseAdapter.kt.expected +++ b/libraries/apollo-compiler/src/test/graphql/com/example/deprecated_merged_field/kotlin/operationBased/deprecated_merged_field/adapter/CatQuery_ResponseAdapter.kt.expected @@ -15,14 +15,13 @@ import com.apollographql.apollo3.api.nullable import com.apollographql.apollo3.api.obj import com.example.deprecated_merged_field.CatQuery import kotlin.String -import kotlin.Unit import kotlin.collections.List public object CatQuery_ResponseAdapter { public object Data : CompositeAdapter { public val RESPONSE_NAMES: List = listOf("cat") - public override fun fromJson(reader: JsonReader, adapterContext: CompositeAdapterContext): + override fun fromJson(reader: JsonReader, adapterContext: CompositeAdapterContext): CatQuery.Data { var _cat: CatQuery.Data.Cat? = null @@ -38,11 +37,11 @@ public object CatQuery_ResponseAdapter { ) } - public override fun toJson( + override fun toJson( writer: JsonWriter, `value`: CatQuery.Data, adapterContext: CompositeAdapterContext, - ): Unit { + ) { writer.name("cat") Cat.obj(true).nullable().toJson(writer, value.cat, adapterContext) } @@ -50,7 +49,7 @@ public object CatQuery_ResponseAdapter { private object Cat : CompositeAdapter { public val RESPONSE_NAMES: List = listOf("__typename") - public override fun fromJson(reader: JsonReader, adapterContext: CompositeAdapterContext): + override fun fromJson(reader: JsonReader, adapterContext: CompositeAdapterContext): CatQuery.Data.Cat { var __typename: String? = null @@ -71,11 +70,11 @@ public object CatQuery_ResponseAdapter { ) } - public override fun toJson( + override fun toJson( writer: JsonWriter, `value`: CatQuery.Data.Cat, adapterContext: CompositeAdapterContext, - ): Unit { + ) { writer.name("__typename") StringAdapter.toJson(writer, CustomScalarAdapters.Empty, value.__typename) diff --git a/libraries/apollo-compiler/src/test/graphql/com/example/deprecated_merged_field/kotlin/operationBased/deprecated_merged_field/fragment/AnimalFragmentImpl.kt.expected b/libraries/apollo-compiler/src/test/graphql/com/example/deprecated_merged_field/kotlin/operationBased/deprecated_merged_field/fragment/AnimalFragmentImpl.kt.expected index e7e01fa81cf..edd2122916f 100644 --- a/libraries/apollo-compiler/src/test/graphql/com/example/deprecated_merged_field/kotlin/operationBased/deprecated_merged_field/fragment/AnimalFragmentImpl.kt.expected +++ b/libraries/apollo-compiler/src/test/graphql/com/example/deprecated_merged_field/kotlin/operationBased/deprecated_merged_field/fragment/AnimalFragmentImpl.kt.expected @@ -16,25 +16,24 @@ import com.example.deprecated_merged_field.type.Animal import kotlin.Any import kotlin.Boolean import kotlin.Int -import kotlin.Unit public class AnimalFragmentImpl() : Fragment { - public override fun equals(other: Any?): Boolean = other != null && other::class == this::class + override fun equals(other: Any?): Boolean = other != null && other::class == this::class - public override fun hashCode(): Int = this::class.hashCode() + override fun hashCode(): Int = this::class.hashCode() - public override fun serializeVariables( + override fun serializeVariables( writer: JsonWriter, customScalarAdapters: CustomScalarAdapters, withBooleanDefaultValues: Boolean, - ): Unit { + ) { // This fragment doesn't have any variable } - public override fun adapter(): CompositeAdapter = + override fun adapter(): CompositeAdapter = AnimalFragmentImpl_ResponseAdapter.AnimalFragment.obj(true) - public override fun rootField(): CompiledField = CompiledField.Builder( + override fun rootField(): CompiledField = CompiledField.Builder( name = "data", type = Animal.type ) diff --git a/libraries/apollo-compiler/src/test/graphql/com/example/deprecated_merged_field/kotlin/operationBased/deprecated_merged_field/fragment/AnimalFragmentImpl_ResponseAdapter.kt.expected b/libraries/apollo-compiler/src/test/graphql/com/example/deprecated_merged_field/kotlin/operationBased/deprecated_merged_field/fragment/AnimalFragmentImpl_ResponseAdapter.kt.expected index 5b5288e1b4c..de45c732b42 100644 --- a/libraries/apollo-compiler/src/test/graphql/com/example/deprecated_merged_field/kotlin/operationBased/deprecated_merged_field/fragment/AnimalFragmentImpl_ResponseAdapter.kt.expected +++ b/libraries/apollo-compiler/src/test/graphql/com/example/deprecated_merged_field/kotlin/operationBased/deprecated_merged_field/fragment/AnimalFragmentImpl_ResponseAdapter.kt.expected @@ -14,7 +14,6 @@ import com.apollographql.apollo3.api.json.JsonReader import com.apollographql.apollo3.api.json.JsonWriter import com.apollographql.apollo3.api.possibleTypes import kotlin.String -import kotlin.Unit import kotlin.collections.List public object AnimalFragmentImpl_ResponseAdapter { @@ -22,7 +21,7 @@ public object AnimalFragmentImpl_ResponseAdapter { CompositeAdapter { public val RESPONSE_NAMES: List = listOf("__typename") - public override fun fromJson(reader: JsonReader, adapterContext: CompositeAdapterContext): + override fun fromJson(reader: JsonReader, adapterContext: CompositeAdapterContext): com.example.deprecated_merged_field.fragment.AnimalFragment { var __typename: String? = null @@ -58,11 +57,11 @@ public object AnimalFragmentImpl_ResponseAdapter { ) } - public override fun toJson( + override fun toJson( writer: JsonWriter, `value`: com.example.deprecated_merged_field.fragment.AnimalFragment, adapterContext: CompositeAdapterContext, - ): Unit { + ) { writer.name("__typename") StringAdapter.toJson(writer, CustomScalarAdapters.Empty, value.__typename) @@ -81,7 +80,7 @@ public object AnimalFragmentImpl_ResponseAdapter { CompositeAdapter { public val RESPONSE_NAMES: List = listOf("name") - public override fun fromJson(reader: JsonReader, adapterContext: CompositeAdapterContext): + override fun fromJson(reader: JsonReader, adapterContext: CompositeAdapterContext): com.example.deprecated_merged_field.fragment.AnimalFragment.OnCat { var _name: String? = null @@ -97,11 +96,11 @@ public object AnimalFragmentImpl_ResponseAdapter { ) } - public override fun toJson( + override fun toJson( writer: JsonWriter, `value`: com.example.deprecated_merged_field.fragment.AnimalFragment.OnCat, adapterContext: CompositeAdapterContext, - ): Unit { + ) { writer.name("name") StringAdapter.toJson(writer, CustomScalarAdapters.Empty, value.name) } @@ -111,7 +110,7 @@ public object AnimalFragmentImpl_ResponseAdapter { CompositeAdapter { public val RESPONSE_NAMES: List = listOf("name") - public override fun fromJson(reader: JsonReader, adapterContext: CompositeAdapterContext): + override fun fromJson(reader: JsonReader, adapterContext: CompositeAdapterContext): com.example.deprecated_merged_field.fragment.AnimalFragment.OnDog { var _name: String? = null @@ -127,11 +126,11 @@ public object AnimalFragmentImpl_ResponseAdapter { ) } - public override fun toJson( + override fun toJson( writer: JsonWriter, `value`: com.example.deprecated_merged_field.fragment.AnimalFragment.OnDog, adapterContext: CompositeAdapterContext, - ): Unit { + ) { writer.name("name") StringAdapter.toJson(writer, CustomScalarAdapters.Empty, value.name) } diff --git a/libraries/apollo-compiler/src/test/graphql/com/example/deprecated_merged_field/kotlin/responseBased/deprecated_merged_field/CatQuery.kt.expected b/libraries/apollo-compiler/src/test/graphql/com/example/deprecated_merged_field/kotlin/responseBased/deprecated_merged_field/CatQuery.kt.expected index 5a15f120b27..e4b72a42c3b 100644 --- a/libraries/apollo-compiler/src/test/graphql/com/example/deprecated_merged_field/kotlin/responseBased/deprecated_merged_field/CatQuery.kt.expected +++ b/libraries/apollo-compiler/src/test/graphql/com/example/deprecated_merged_field/kotlin/responseBased/deprecated_merged_field/CatQuery.kt.expected @@ -22,32 +22,33 @@ import kotlin.Boolean import kotlin.Deprecated import kotlin.Int import kotlin.String -import kotlin.Unit +import kotlin.Suppress +import com.example.deprecated_merged_field.type.Query as CompiledQuery public class CatQuery() : Query { - public override fun equals(other: Any?): Boolean = other != null && other::class == this::class + override fun equals(other: Any?): Boolean = other != null && other::class == this::class - public override fun hashCode(): Int = this::class.hashCode() + override fun hashCode(): Int = this::class.hashCode() - public override fun id(): String = OPERATION_ID + override fun id(): String = OPERATION_ID - public override fun document(): String = OPERATION_DOCUMENT + override fun document(): String = OPERATION_DOCUMENT - public override fun name(): String = OPERATION_NAME + override fun name(): String = OPERATION_NAME - public override fun serializeVariables( + override fun serializeVariables( writer: JsonWriter, customScalarAdapters: CustomScalarAdapters, withBooleanDefaultValues: Boolean, - ): Unit { + ) { // This operation doesn't have any variable } - public override fun adapter(): CompositeAdapter = CatQuery_ResponseAdapter.Data.obj() + override fun adapter(): CompositeAdapter = CatQuery_ResponseAdapter.Data.obj() - public override fun rootField(): CompiledField = CompiledField.Builder( + override fun rootField(): CompiledField = CompiledField.Builder( name = "data", - type = com.example.deprecated_merged_field.type.Query.type + type = CompiledQuery.type ) .selections(selections = CatQuerySelections.__root) .build() @@ -60,34 +61,37 @@ public class CatQuery() : Query { public val __typename: String public companion object { - public fun Cat.animalFragment() = this as? AnimalFragment + @Suppress("USELESS_CAST") + public fun Cat.animalFragment(): AnimalFragment? = this as? AnimalFragment - public fun Cat.asAnimal() = this as? AnimalCat + @Suppress("USELESS_CAST") + public fun Cat.asAnimal(): AnimalCat? = this as? AnimalCat - public fun Cat.asAnimalDog() = this as? AnimalDogCat + @Suppress("USELESS_CAST") + public fun Cat.asAnimalDog(): AnimalDogCat? = this as? AnimalDogCat } } public sealed interface AnimalDogCat : AnimalCat, CatAnimalFragment, DogAnimalFragment { - public override val __typename: String + override val __typename: String @Deprecated(message = "Deprecated in: 'Dog'") - public override val name: String + override val name: String } public sealed interface AnimalCat : Cat, CatAnimalFragment { - public override val __typename: String + override val __typename: String - public override val name: String + override val name: String } public data class OtherCat( - public override val __typename: String, + override val __typename: String, ) : Cat public data class OtherAnimalCat( - public override val __typename: String, - public override val name: String, + override val __typename: String, + override val name: String, ) : AnimalCat, CatAnimalFragment } diff --git a/libraries/apollo-compiler/src/test/graphql/com/example/deprecated_merged_field/kotlin/responseBased/deprecated_merged_field/adapter/CatQuery_ResponseAdapter.kt.expected b/libraries/apollo-compiler/src/test/graphql/com/example/deprecated_merged_field/kotlin/responseBased/deprecated_merged_field/adapter/CatQuery_ResponseAdapter.kt.expected index 9649fe263d8..fed2736429c 100644 --- a/libraries/apollo-compiler/src/test/graphql/com/example/deprecated_merged_field/kotlin/responseBased/deprecated_merged_field/adapter/CatQuery_ResponseAdapter.kt.expected +++ b/libraries/apollo-compiler/src/test/graphql/com/example/deprecated_merged_field/kotlin/responseBased/deprecated_merged_field/adapter/CatQuery_ResponseAdapter.kt.expected @@ -17,14 +17,13 @@ import com.apollographql.apollo3.api.obj import com.example.deprecated_merged_field.CatQuery import kotlin.String import kotlin.Suppress -import kotlin.Unit import kotlin.collections.List public object CatQuery_ResponseAdapter { public object Data : CompositeAdapter { public val RESPONSE_NAMES: List = listOf("cat") - public override fun fromJson(reader: JsonReader, adapterContext: CompositeAdapterContext): + override fun fromJson(reader: JsonReader, adapterContext: CompositeAdapterContext): CatQuery.Data { var _cat: CatQuery.Data.Cat? = null @@ -40,17 +39,17 @@ public object CatQuery_ResponseAdapter { ) } - public override fun toJson( + override fun toJson( writer: JsonWriter, `value`: CatQuery.Data, adapterContext: CompositeAdapterContext, - ): Unit { + ) { writer.name("cat") Cat.obj().nullable().toJson(writer, value.cat, adapterContext) } private object Cat : CompositeAdapter { - public override fun fromJson(reader: JsonReader, adapterContext: CompositeAdapterContext): + override fun fromJson(reader: JsonReader, adapterContext: CompositeAdapterContext): CatQuery.Data.Cat { val __typename = reader.readTypename() return when(__typename) { @@ -61,11 +60,11 @@ public object CatQuery_ResponseAdapter { } } - public override fun toJson( + override fun toJson( writer: JsonWriter, `value`: CatQuery.Data.Cat, adapterContext: CompositeAdapterContext, - ): Unit { + ) { when(value) { is CatQuery.Data.OtherAnimalCat -> OtherAnimalCat.toJson(writer, value, adapterContext) is CatQuery.Data.OtherCat -> OtherCat.toJson(writer, value, adapterContext) @@ -99,7 +98,7 @@ public object CatQuery_ResponseAdapter { writer: JsonWriter, `value`: CatQuery.Data.OtherCat, @Suppress("UNUSED_PARAMETER") adapterContext: CompositeAdapterContext, - ): Unit { + ) { writer.name("__typename") StringAdapter.toJson(writer, CustomScalarAdapters.Empty, value.__typename) } @@ -134,7 +133,7 @@ public object CatQuery_ResponseAdapter { writer: JsonWriter, `value`: CatQuery.Data.OtherAnimalCat, @Suppress("UNUSED_PARAMETER") adapterContext: CompositeAdapterContext, - ): Unit { + ) { writer.name("__typename") StringAdapter.toJson(writer, CustomScalarAdapters.Empty, value.__typename) diff --git a/libraries/apollo-compiler/src/test/graphql/com/example/deprecated_merged_field/kotlin/responseBased/deprecated_merged_field/fragment/AnimalFragment.kt.expected b/libraries/apollo-compiler/src/test/graphql/com/example/deprecated_merged_field/kotlin/responseBased/deprecated_merged_field/fragment/AnimalFragment.kt.expected index bbc65d30ab3..ca3aba56a1a 100644 --- a/libraries/apollo-compiler/src/test/graphql/com/example/deprecated_merged_field/kotlin/responseBased/deprecated_merged_field/fragment/AnimalFragment.kt.expected +++ b/libraries/apollo-compiler/src/test/graphql/com/example/deprecated_merged_field/kotlin/responseBased/deprecated_merged_field/fragment/AnimalFragment.kt.expected @@ -7,25 +7,28 @@ package com.example.deprecated_merged_field.fragment import kotlin.Deprecated import kotlin.String +import kotlin.Suppress public interface AnimalFragment { public val __typename: String public companion object { - public fun AnimalFragment.asCat() = this as? CatAnimalFragment + @Suppress("USELESS_CAST") + public fun AnimalFragment.asCat(): CatAnimalFragment? = this as? CatAnimalFragment - public fun AnimalFragment.asDog() = this as? DogAnimalFragment + @Suppress("USELESS_CAST") + public fun AnimalFragment.asDog(): DogAnimalFragment? = this as? DogAnimalFragment } } public interface CatAnimalFragment : AnimalFragment { - public override val __typename: String + override val __typename: String public val name: String } public interface DogAnimalFragment : AnimalFragment { - public override val __typename: String + override val __typename: String @Deprecated(message = "No longer supported") public val name: String diff --git a/libraries/apollo-compiler/src/test/graphql/com/example/deprecated_merged_field/kotlin/responseBased/deprecated_merged_field/fragment/AnimalFragmentImpl.kt.expected b/libraries/apollo-compiler/src/test/graphql/com/example/deprecated_merged_field/kotlin/responseBased/deprecated_merged_field/fragment/AnimalFragmentImpl.kt.expected index 881a7c6a237..84203610237 100644 --- a/libraries/apollo-compiler/src/test/graphql/com/example/deprecated_merged_field/kotlin/responseBased/deprecated_merged_field/fragment/AnimalFragmentImpl.kt.expected +++ b/libraries/apollo-compiler/src/test/graphql/com/example/deprecated_merged_field/kotlin/responseBased/deprecated_merged_field/fragment/AnimalFragmentImpl.kt.expected @@ -18,25 +18,24 @@ import kotlin.Boolean import kotlin.Deprecated import kotlin.Int import kotlin.String -import kotlin.Unit +import kotlin.Suppress public class AnimalFragmentImpl() : Fragment { - public override fun equals(other: Any?): Boolean = other != null && other::class == this::class + override fun equals(other: Any?): Boolean = other != null && other::class == this::class - public override fun hashCode(): Int = this::class.hashCode() + override fun hashCode(): Int = this::class.hashCode() - public override fun serializeVariables( + override fun serializeVariables( writer: JsonWriter, customScalarAdapters: CustomScalarAdapters, withBooleanDefaultValues: Boolean, - ): Unit { + ) { // This fragment doesn't have any variable } - public override fun adapter(): CompositeAdapter = - AnimalFragmentImpl_ResponseAdapter.Data.obj() + override fun adapter(): CompositeAdapter = AnimalFragmentImpl_ResponseAdapter.Data.obj() - public override fun rootField(): CompiledField = CompiledField.Builder( + override fun rootField(): CompiledField = CompiledField.Builder( name = "data", type = Animal.type ) @@ -44,27 +43,29 @@ public class AnimalFragmentImpl() : Fragment { .build() public sealed interface Data : AnimalFragment, Fragment.Data { - public override val __typename: String + override val __typename: String public companion object { - public fun Data.asCat() = this as? CatData + @Suppress("USELESS_CAST") + public fun Data.asCat(): CatData? = this as? CatData - public fun Data.asDog() = this as? DogData + @Suppress("USELESS_CAST") + public fun Data.asDog(): DogData? = this as? DogData } } public data class CatData( - public override val __typename: String, - public override val name: String, + override val __typename: String, + override val name: String, ) : Data, CatAnimalFragment public data class DogData( - public override val __typename: String, + override val __typename: String, @Deprecated(message = "No longer supported") - public override val name: String, + override val name: String, ) : Data, DogAnimalFragment public data class OtherData( - public override val __typename: String, + override val __typename: String, ) : Data, AnimalFragment } diff --git a/libraries/apollo-compiler/src/test/graphql/com/example/deprecated_merged_field/kotlin/responseBased/deprecated_merged_field/fragment/AnimalFragmentImpl_ResponseAdapter.kt.expected b/libraries/apollo-compiler/src/test/graphql/com/example/deprecated_merged_field/kotlin/responseBased/deprecated_merged_field/fragment/AnimalFragmentImpl_ResponseAdapter.kt.expected index 977ac34d915..1146018a888 100644 --- a/libraries/apollo-compiler/src/test/graphql/com/example/deprecated_merged_field/kotlin/responseBased/deprecated_merged_field/fragment/AnimalFragmentImpl_ResponseAdapter.kt.expected +++ b/libraries/apollo-compiler/src/test/graphql/com/example/deprecated_merged_field/kotlin/responseBased/deprecated_merged_field/fragment/AnimalFragmentImpl_ResponseAdapter.kt.expected @@ -14,12 +14,11 @@ import com.apollographql.apollo3.api.json.JsonWriter import com.apollographql.apollo3.api.json.readTypename import kotlin.String import kotlin.Suppress -import kotlin.Unit import kotlin.collections.List public object AnimalFragmentImpl_ResponseAdapter { public object Data : CompositeAdapter { - public override fun fromJson(reader: JsonReader, adapterContext: CompositeAdapterContext): + override fun fromJson(reader: JsonReader, adapterContext: CompositeAdapterContext): AnimalFragmentImpl.Data { val __typename = reader.readTypename() return when(__typename) { @@ -32,11 +31,11 @@ public object AnimalFragmentImpl_ResponseAdapter { } } - public override fun toJson( + override fun toJson( writer: JsonWriter, `value`: AnimalFragmentImpl.Data, adapterContext: CompositeAdapterContext, - ): Unit { + ) { when(value) { is AnimalFragmentImpl.CatData -> CatData.toJson(writer, value, adapterContext) is AnimalFragmentImpl.DogData -> DogData.toJson(writer, value, adapterContext) @@ -74,7 +73,7 @@ public object AnimalFragmentImpl_ResponseAdapter { writer: JsonWriter, `value`: AnimalFragmentImpl.CatData, @Suppress("UNUSED_PARAMETER") adapterContext: CompositeAdapterContext, - ): Unit { + ) { writer.name("__typename") StringAdapter.toJson(writer, CustomScalarAdapters.Empty, value.__typename) @@ -112,7 +111,7 @@ public object AnimalFragmentImpl_ResponseAdapter { writer: JsonWriter, `value`: AnimalFragmentImpl.DogData, @Suppress("UNUSED_PARAMETER") adapterContext: CompositeAdapterContext, - ): Unit { + ) { writer.name("__typename") StringAdapter.toJson(writer, CustomScalarAdapters.Empty, value.__typename) @@ -147,7 +146,7 @@ public object AnimalFragmentImpl_ResponseAdapter { writer: JsonWriter, `value`: AnimalFragmentImpl.OtherData, @Suppress("UNUSED_PARAMETER") adapterContext: CompositeAdapterContext, - ): Unit { + ) { writer.name("__typename") StringAdapter.toJson(writer, CustomScalarAdapters.Empty, value.__typename) } diff --git a/libraries/apollo-compiler/src/test/graphql/com/example/deprecation/kotlin/responseBased/deprecation/TestQuery.kt.expected b/libraries/apollo-compiler/src/test/graphql/com/example/deprecation/kotlin/responseBased/deprecation/TestQuery.kt.expected index a273707294f..31dd2d38d85 100644 --- a/libraries/apollo-compiler/src/test/graphql/com/example/deprecation/kotlin/responseBased/deprecation/TestQuery.kt.expected +++ b/libraries/apollo-compiler/src/test/graphql/com/example/deprecation/kotlin/responseBased/deprecation/TestQuery.kt.expected @@ -20,31 +20,31 @@ import com.example.deprecation.type.Episode import kotlin.Boolean import kotlin.Deprecated import kotlin.String -import kotlin.Unit +import com.example.deprecation.type.Query as CompiledQuery public data class TestQuery( public val episode: Optional = Optional.Absent, ) : Query { - public override fun id(): String = OPERATION_ID + override fun id(): String = OPERATION_ID - public override fun document(): String = OPERATION_DOCUMENT + override fun document(): String = OPERATION_DOCUMENT - public override fun name(): String = OPERATION_NAME + override fun name(): String = OPERATION_NAME - public override fun serializeVariables( + override fun serializeVariables( writer: JsonWriter, customScalarAdapters: CustomScalarAdapters, withBooleanDefaultValues: Boolean, - ): Unit { + ) { TestQuery_VariablesAdapter.serializeVariables(writer, this, customScalarAdapters, withBooleanDefaultValues) } - public override fun adapter(): CompositeAdapter = TestQuery_ResponseAdapter.Data.obj() + override fun adapter(): CompositeAdapter = TestQuery_ResponseAdapter.Data.obj() - public override fun rootField(): CompiledField = CompiledField.Builder( + override fun rootField(): CompiledField = CompiledField.Builder( name = "data", - type = com.example.deprecation.type.Query.type + type = CompiledQuery.type ) .selections(selections = TestQuerySelections.__root) .build() diff --git a/libraries/apollo-compiler/src/test/graphql/com/example/deprecation/kotlin/responseBased/deprecation/adapter/TestQuery_ResponseAdapter.kt.expected b/libraries/apollo-compiler/src/test/graphql/com/example/deprecation/kotlin/responseBased/deprecation/adapter/TestQuery_ResponseAdapter.kt.expected index eec01f32d49..3e5b839ddd1 100644 --- a/libraries/apollo-compiler/src/test/graphql/com/example/deprecation/kotlin/responseBased/deprecation/adapter/TestQuery_ResponseAdapter.kt.expected +++ b/libraries/apollo-compiler/src/test/graphql/com/example/deprecation/kotlin/responseBased/deprecation/adapter/TestQuery_ResponseAdapter.kt.expected @@ -17,14 +17,13 @@ import com.apollographql.apollo3.api.obj import com.example.deprecation.TestQuery import kotlin.Boolean import kotlin.String -import kotlin.Unit import kotlin.collections.List public object TestQuery_ResponseAdapter { public object Data : CompositeAdapter { public val RESPONSE_NAMES: List = listOf("hero") - public override fun fromJson(reader: JsonReader, adapterContext: CompositeAdapterContext): + override fun fromJson(reader: JsonReader, adapterContext: CompositeAdapterContext): TestQuery.Data { var _hero: TestQuery.Data.Hero? = null @@ -40,11 +39,11 @@ public object TestQuery_ResponseAdapter { ) } - public override fun toJson( + override fun toJson( writer: JsonWriter, `value`: TestQuery.Data, adapterContext: CompositeAdapterContext, - ): Unit { + ) { writer.name("hero") Hero.obj().nullable().toJson(writer, value.hero, adapterContext) } @@ -52,7 +51,7 @@ public object TestQuery_ResponseAdapter { private object Hero : CompositeAdapter { public val RESPONSE_NAMES: List = listOf("name", "deprecated", "deprecatedBool") - public override fun fromJson(reader: JsonReader, adapterContext: CompositeAdapterContext): + override fun fromJson(reader: JsonReader, adapterContext: CompositeAdapterContext): TestQuery.Data.Hero { var _name: String? = null var _deprecated: String? = null @@ -74,11 +73,11 @@ public object TestQuery_ResponseAdapter { ) } - public override fun toJson( + override fun toJson( writer: JsonWriter, `value`: TestQuery.Data.Hero, adapterContext: CompositeAdapterContext, - ): Unit { + ) { writer.name("name") StringAdapter.toJson(writer, CustomScalarAdapters.Empty, value.name) diff --git a/libraries/apollo-compiler/src/test/graphql/com/example/deprecation/kotlin/responseBased/deprecation/adapter/TestQuery_VariablesAdapter.kt.expected b/libraries/apollo-compiler/src/test/graphql/com/example/deprecation/kotlin/responseBased/deprecation/adapter/TestQuery_VariablesAdapter.kt.expected index 483d65d955a..8d4ef2b8997 100644 --- a/libraries/apollo-compiler/src/test/graphql/com/example/deprecation/kotlin/responseBased/deprecation/adapter/TestQuery_VariablesAdapter.kt.expected +++ b/libraries/apollo-compiler/src/test/graphql/com/example/deprecation/kotlin/responseBased/deprecation/adapter/TestQuery_VariablesAdapter.kt.expected @@ -15,7 +15,6 @@ import com.example.deprecation.TestQuery import com.example.deprecation.type.adapter.Episode_ResponseAdapter import kotlin.Boolean import kotlin.Suppress -import kotlin.Unit public object TestQuery_VariablesAdapter { @Suppress( @@ -27,7 +26,7 @@ public object TestQuery_VariablesAdapter { `value`: TestQuery, customScalarAdapters: CustomScalarAdapters, withBooleanDefaultValues: Boolean, - ): Unit { + ) { val adapterContext = CompositeAdapterContext.Builder().customScalarAdapters(customScalarAdapters).build() if (value.episode is Optional.Present) { diff --git a/libraries/apollo-compiler/src/test/graphql/com/example/deprecation/kotlin/responseBased/deprecation/type/adapter/Episode_ResponseAdapter.kt.expected b/libraries/apollo-compiler/src/test/graphql/com/example/deprecation/kotlin/responseBased/deprecation/type/adapter/Episode_ResponseAdapter.kt.expected index e1e31d8723a..2329202a48d 100644 --- a/libraries/apollo-compiler/src/test/graphql/com/example/deprecation/kotlin/responseBased/deprecation/type/adapter/Episode_ResponseAdapter.kt.expected +++ b/libraries/apollo-compiler/src/test/graphql/com/example/deprecation/kotlin/responseBased/deprecation/type/adapter/Episode_ResponseAdapter.kt.expected @@ -10,20 +10,18 @@ import com.apollographql.apollo3.api.CustomScalarAdapters import com.apollographql.apollo3.api.json.JsonReader import com.apollographql.apollo3.api.json.JsonWriter import com.example.deprecation.type.Episode -import kotlin.Unit public object Episode_ResponseAdapter : Adapter { - public override fun fromJson(reader: JsonReader, customScalarAdapters: CustomScalarAdapters): - Episode { + override fun fromJson(reader: JsonReader, customScalarAdapters: CustomScalarAdapters): Episode { val rawValue = reader.nextString()!! return Episode.safeValueOf(rawValue) } - public override fun toJson( + override fun toJson( writer: JsonWriter, customScalarAdapters: CustomScalarAdapters, `value`: Episode, - ): Unit { + ) { writer.value(value.rawValue) } } diff --git a/libraries/apollo-compiler/src/test/graphql/com/example/enum_field/kotlin/responseBased/enum_field/TestQuery.kt.expected b/libraries/apollo-compiler/src/test/graphql/com/example/enum_field/kotlin/responseBased/enum_field/TestQuery.kt.expected index 9d0bccab49f..de7a768887a 100644 --- a/libraries/apollo-compiler/src/test/graphql/com/example/enum_field/kotlin/responseBased/enum_field/TestQuery.kt.expected +++ b/libraries/apollo-compiler/src/test/graphql/com/example/enum_field/kotlin/responseBased/enum_field/TestQuery.kt.expected @@ -20,32 +20,32 @@ import kotlin.Any import kotlin.Boolean import kotlin.Int import kotlin.String -import kotlin.Unit +import com.example.enum_field.type.Query as CompiledQuery public class TestQuery() : Query { - public override fun equals(other: Any?): Boolean = other != null && other::class == this::class + override fun equals(other: Any?): Boolean = other != null && other::class == this::class - public override fun hashCode(): Int = this::class.hashCode() + override fun hashCode(): Int = this::class.hashCode() - public override fun id(): String = OPERATION_ID + override fun id(): String = OPERATION_ID - public override fun document(): String = OPERATION_DOCUMENT + override fun document(): String = OPERATION_DOCUMENT - public override fun name(): String = OPERATION_NAME + override fun name(): String = OPERATION_NAME - public override fun serializeVariables( + override fun serializeVariables( writer: JsonWriter, customScalarAdapters: CustomScalarAdapters, withBooleanDefaultValues: Boolean, - ): Unit { + ) { // This operation doesn't have any variable } - public override fun adapter(): CompositeAdapter = TestQuery_ResponseAdapter.Data.obj() + override fun adapter(): CompositeAdapter = TestQuery_ResponseAdapter.Data.obj() - public override fun rootField(): CompiledField = CompiledField.Builder( + override fun rootField(): CompiledField = CompiledField.Builder( name = "data", - type = com.example.enum_field.type.Query.type + type = CompiledQuery.type ) .selections(selections = TestQuerySelections.__root) .build() diff --git a/libraries/apollo-compiler/src/test/graphql/com/example/enum_field/kotlin/responseBased/enum_field/adapter/TestQuery_ResponseAdapter.kt.expected b/libraries/apollo-compiler/src/test/graphql/com/example/enum_field/kotlin/responseBased/enum_field/adapter/TestQuery_ResponseAdapter.kt.expected index de0f33345ae..6dcd077f1cf 100644 --- a/libraries/apollo-compiler/src/test/graphql/com/example/enum_field/kotlin/responseBased/enum_field/adapter/TestQuery_ResponseAdapter.kt.expected +++ b/libraries/apollo-compiler/src/test/graphql/com/example/enum_field/kotlin/responseBased/enum_field/adapter/TestQuery_ResponseAdapter.kt.expected @@ -17,14 +17,13 @@ import com.example.enum_field.type.GravityAsEnum import com.example.enum_field.type.adapter.GravityAsEnum_ResponseAdapter import com.example.enum_field.type.adapter.Gravity_ResponseAdapter import kotlin.String -import kotlin.Unit import kotlin.collections.List public object TestQuery_ResponseAdapter { public object Data : CompositeAdapter { public val RESPONSE_NAMES: List = listOf("gravity", "gravityAsEnum") - public override fun fromJson(reader: JsonReader, adapterContext: CompositeAdapterContext): + override fun fromJson(reader: JsonReader, adapterContext: CompositeAdapterContext): TestQuery.Data { var _gravity: Gravity? = null var _gravityAsEnum: GravityAsEnum? = null @@ -43,11 +42,11 @@ public object TestQuery_ResponseAdapter { ) } - public override fun toJson( + override fun toJson( writer: JsonWriter, `value`: TestQuery.Data, adapterContext: CompositeAdapterContext, - ): Unit { + ) { writer.name("gravity") Gravity_ResponseAdapter.nullable().toJson(writer, CustomScalarAdapters.Empty, value.gravity) diff --git a/libraries/apollo-compiler/src/test/graphql/com/example/enum_field/kotlin/responseBased/enum_field/type/adapter/GravityAsEnum_ResponseAdapter.kt.expected b/libraries/apollo-compiler/src/test/graphql/com/example/enum_field/kotlin/responseBased/enum_field/type/adapter/GravityAsEnum_ResponseAdapter.kt.expected index d394b15b3e2..dfba59ad652 100644 --- a/libraries/apollo-compiler/src/test/graphql/com/example/enum_field/kotlin/responseBased/enum_field/type/adapter/GravityAsEnum_ResponseAdapter.kt.expected +++ b/libraries/apollo-compiler/src/test/graphql/com/example/enum_field/kotlin/responseBased/enum_field/type/adapter/GravityAsEnum_ResponseAdapter.kt.expected @@ -10,20 +10,19 @@ import com.apollographql.apollo3.api.CustomScalarAdapters import com.apollographql.apollo3.api.json.JsonReader import com.apollographql.apollo3.api.json.JsonWriter import com.example.enum_field.type.GravityAsEnum -import kotlin.Unit public object GravityAsEnum_ResponseAdapter : Adapter { - public override fun fromJson(reader: JsonReader, customScalarAdapters: CustomScalarAdapters): + override fun fromJson(reader: JsonReader, customScalarAdapters: CustomScalarAdapters): GravityAsEnum { val rawValue = reader.nextString()!! return GravityAsEnum.safeValueOf(rawValue) } - public override fun toJson( + override fun toJson( writer: JsonWriter, customScalarAdapters: CustomScalarAdapters, `value`: GravityAsEnum, - ): Unit { + ) { writer.value(value.rawValue) } } diff --git a/libraries/apollo-compiler/src/test/graphql/com/example/enum_field/kotlin/responseBased/enum_field/type/adapter/Gravity_ResponseAdapter.kt.expected b/libraries/apollo-compiler/src/test/graphql/com/example/enum_field/kotlin/responseBased/enum_field/type/adapter/Gravity_ResponseAdapter.kt.expected index 12c1fc61bb3..c7ed21c7b8e 100644 --- a/libraries/apollo-compiler/src/test/graphql/com/example/enum_field/kotlin/responseBased/enum_field/type/adapter/Gravity_ResponseAdapter.kt.expected +++ b/libraries/apollo-compiler/src/test/graphql/com/example/enum_field/kotlin/responseBased/enum_field/type/adapter/Gravity_ResponseAdapter.kt.expected @@ -10,20 +10,18 @@ import com.apollographql.apollo3.api.CustomScalarAdapters import com.apollographql.apollo3.api.json.JsonReader import com.apollographql.apollo3.api.json.JsonWriter import com.example.enum_field.type.Gravity -import kotlin.Unit public object Gravity_ResponseAdapter : Adapter { - public override fun fromJson(reader: JsonReader, customScalarAdapters: CustomScalarAdapters): - Gravity { + override fun fromJson(reader: JsonReader, customScalarAdapters: CustomScalarAdapters): Gravity { val rawValue = reader.nextString()!! return Gravity.safeValueOf(rawValue) } - public override fun toJson( + override fun toJson( writer: JsonWriter, customScalarAdapters: CustomScalarAdapters, `value`: Gravity, - ): Unit { + ) { writer.value(value.rawValue) } } diff --git a/libraries/apollo-compiler/src/test/graphql/com/example/enums_as_sealed/kotlin/responseBased/enums_as_sealed/TestQuery.kt.expected b/libraries/apollo-compiler/src/test/graphql/com/example/enums_as_sealed/kotlin/responseBased/enums_as_sealed/TestQuery.kt.expected index 455defd7af9..b6d4733762e 100644 --- a/libraries/apollo-compiler/src/test/graphql/com/example/enums_as_sealed/kotlin/responseBased/enums_as_sealed/TestQuery.kt.expected +++ b/libraries/apollo-compiler/src/test/graphql/com/example/enums_as_sealed/kotlin/responseBased/enums_as_sealed/TestQuery.kt.expected @@ -19,32 +19,32 @@ import kotlin.Any import kotlin.Boolean import kotlin.Int import kotlin.String -import kotlin.Unit +import com.example.enums_as_sealed.type.Query as CompiledQuery public class TestQuery() : Query { - public override fun equals(other: Any?): Boolean = other != null && other::class == this::class + override fun equals(other: Any?): Boolean = other != null && other::class == this::class - public override fun hashCode(): Int = this::class.hashCode() + override fun hashCode(): Int = this::class.hashCode() - public override fun id(): String = OPERATION_ID + override fun id(): String = OPERATION_ID - public override fun document(): String = OPERATION_DOCUMENT + override fun document(): String = OPERATION_DOCUMENT - public override fun name(): String = OPERATION_NAME + override fun name(): String = OPERATION_NAME - public override fun serializeVariables( + override fun serializeVariables( writer: JsonWriter, customScalarAdapters: CustomScalarAdapters, withBooleanDefaultValues: Boolean, - ): Unit { + ) { // This operation doesn't have any variable } - public override fun adapter(): CompositeAdapter = TestQuery_ResponseAdapter.Data.obj() + override fun adapter(): CompositeAdapter = TestQuery_ResponseAdapter.Data.obj() - public override fun rootField(): CompiledField = CompiledField.Builder( + override fun rootField(): CompiledField = CompiledField.Builder( name = "data", - type = com.example.enums_as_sealed.type.Query.type + type = CompiledQuery.type ) .selections(selections = TestQuerySelections.__root) .build() diff --git a/libraries/apollo-compiler/src/test/graphql/com/example/enums_as_sealed/kotlin/responseBased/enums_as_sealed/adapter/TestQuery_ResponseAdapter.kt.expected b/libraries/apollo-compiler/src/test/graphql/com/example/enums_as_sealed/kotlin/responseBased/enums_as_sealed/adapter/TestQuery_ResponseAdapter.kt.expected index 1044249a5eb..695460a5526 100644 --- a/libraries/apollo-compiler/src/test/graphql/com/example/enums_as_sealed/kotlin/responseBased/enums_as_sealed/adapter/TestQuery_ResponseAdapter.kt.expected +++ b/libraries/apollo-compiler/src/test/graphql/com/example/enums_as_sealed/kotlin/responseBased/enums_as_sealed/adapter/TestQuery_ResponseAdapter.kt.expected @@ -15,14 +15,13 @@ import com.example.enums_as_sealed.TestQuery import com.example.enums_as_sealed.type.Enum import com.example.enums_as_sealed.type.adapter.Enum_ResponseAdapter import kotlin.String -import kotlin.Unit import kotlin.collections.List public object TestQuery_ResponseAdapter { public object Data : CompositeAdapter { public val RESPONSE_NAMES: List = listOf("enum") - public override fun fromJson(reader: JsonReader, adapterContext: CompositeAdapterContext): + override fun fromJson(reader: JsonReader, adapterContext: CompositeAdapterContext): TestQuery.Data { var _enum: Enum? = null @@ -38,11 +37,11 @@ public object TestQuery_ResponseAdapter { ) } - public override fun toJson( + override fun toJson( writer: JsonWriter, `value`: TestQuery.Data, adapterContext: CompositeAdapterContext, - ): Unit { + ) { writer.name("enum") Enum_ResponseAdapter.nullable().toJson(writer, CustomScalarAdapters.Empty, value.`enum`) } diff --git a/libraries/apollo-compiler/src/test/graphql/com/example/enums_as_sealed/kotlin/responseBased/enums_as_sealed/type/Enum.kt.expected b/libraries/apollo-compiler/src/test/graphql/com/example/enums_as_sealed/kotlin/responseBased/enums_as_sealed/type/Enum.kt.expected index c253f2943c4..3109e321d75 100644 --- a/libraries/apollo-compiler/src/test/graphql/com/example/enums_as_sealed/kotlin/responseBased/enums_as_sealed/type/Enum.kt.expected +++ b/libraries/apollo-compiler/src/test/graphql/com/example/enums_as_sealed/kotlin/responseBased/enums_as_sealed/type/Enum.kt.expected @@ -63,13 +63,13 @@ public sealed class Enum( public class UNKNOWN__( rawValue: String, ) : Enum(rawValue = rawValue) { - public override fun equals(other: Any?): Boolean { + override fun equals(other: Any?): Boolean { if (other !is UNKNOWN__) return false return this.rawValue == other.rawValue } - public override fun hashCode(): Int = this.rawValue.hashCode() + override fun hashCode(): Int = this.rawValue.hashCode() - public override fun toString(): String = "UNKNOWN__($rawValue)" + override fun toString(): String = "UNKNOWN__($rawValue)" } } diff --git a/libraries/apollo-compiler/src/test/graphql/com/example/enums_as_sealed/kotlin/responseBased/enums_as_sealed/type/adapter/Enum_ResponseAdapter.kt.expected b/libraries/apollo-compiler/src/test/graphql/com/example/enums_as_sealed/kotlin/responseBased/enums_as_sealed/type/adapter/Enum_ResponseAdapter.kt.expected index 93d04ec0e01..dafc0f9522b 100644 --- a/libraries/apollo-compiler/src/test/graphql/com/example/enums_as_sealed/kotlin/responseBased/enums_as_sealed/type/adapter/Enum_ResponseAdapter.kt.expected +++ b/libraries/apollo-compiler/src/test/graphql/com/example/enums_as_sealed/kotlin/responseBased/enums_as_sealed/type/adapter/Enum_ResponseAdapter.kt.expected @@ -10,20 +10,18 @@ import com.apollographql.apollo3.api.CustomScalarAdapters import com.apollographql.apollo3.api.json.JsonReader import com.apollographql.apollo3.api.json.JsonWriter import com.example.enums_as_sealed.type.Enum -import kotlin.Unit public object Enum_ResponseAdapter : Adapter { - public override fun fromJson(reader: JsonReader, customScalarAdapters: CustomScalarAdapters): - Enum { + override fun fromJson(reader: JsonReader, customScalarAdapters: CustomScalarAdapters): Enum { val rawValue = reader.nextString()!! return Enum.safeValueOf(rawValue) } - public override fun toJson( + override fun toJson( writer: JsonWriter, customScalarAdapters: CustomScalarAdapters, `value`: Enum, - ): Unit { + ) { writer.value(value.rawValue) } } diff --git a/libraries/apollo-compiler/src/test/graphql/com/example/field_with_include_directive/kotlin/responseBased/field_with_include_directive/TestQuery.kt.expected b/libraries/apollo-compiler/src/test/graphql/com/example/field_with_include_directive/kotlin/responseBased/field_with_include_directive/TestQuery.kt.expected index a3481b65738..0cfb1d553a4 100644 --- a/libraries/apollo-compiler/src/test/graphql/com/example/field_with_include_directive/kotlin/responseBased/field_with_include_directive/TestQuery.kt.expected +++ b/libraries/apollo-compiler/src/test/graphql/com/example/field_with_include_directive/kotlin/responseBased/field_with_include_directive/TestQuery.kt.expected @@ -18,32 +18,32 @@ import com.example.field_with_include_directive.selections.TestQuerySelections import kotlin.Boolean import kotlin.Int import kotlin.String -import kotlin.Unit +import com.example.field_with_include_directive.type.Query as CompiledQuery public data class TestQuery( public val includeName: Boolean, public val skipFriends: Boolean, ) : Query { - public override fun id(): String = OPERATION_ID + override fun id(): String = OPERATION_ID - public override fun document(): String = OPERATION_DOCUMENT + override fun document(): String = OPERATION_DOCUMENT - public override fun name(): String = OPERATION_NAME + override fun name(): String = OPERATION_NAME - public override fun serializeVariables( + override fun serializeVariables( writer: JsonWriter, customScalarAdapters: CustomScalarAdapters, withBooleanDefaultValues: Boolean, - ): Unit { + ) { TestQuery_VariablesAdapter.serializeVariables(writer, this, customScalarAdapters, withBooleanDefaultValues) } - public override fun adapter(): CompositeAdapter = TestQuery_ResponseAdapter.Data.obj() + override fun adapter(): CompositeAdapter = TestQuery_ResponseAdapter.Data.obj() - public override fun rootField(): CompiledField = CompiledField.Builder( + override fun rootField(): CompiledField = CompiledField.Builder( name = "data", - type = com.example.field_with_include_directive.type.Query.type + type = CompiledQuery.type ) .selections(selections = TestQuerySelections.__root) .build() diff --git a/libraries/apollo-compiler/src/test/graphql/com/example/field_with_include_directive/kotlin/responseBased/field_with_include_directive/adapter/TestQuery_ResponseAdapter.kt.expected b/libraries/apollo-compiler/src/test/graphql/com/example/field_with_include_directive/kotlin/responseBased/field_with_include_directive/adapter/TestQuery_ResponseAdapter.kt.expected index cd954d175af..07224b5c865 100644 --- a/libraries/apollo-compiler/src/test/graphql/com/example/field_with_include_directive/kotlin/responseBased/field_with_include_directive/adapter/TestQuery_ResponseAdapter.kt.expected +++ b/libraries/apollo-compiler/src/test/graphql/com/example/field_with_include_directive/kotlin/responseBased/field_with_include_directive/adapter/TestQuery_ResponseAdapter.kt.expected @@ -17,14 +17,13 @@ import com.apollographql.apollo3.api.obj import com.example.field_with_include_directive.TestQuery import kotlin.Int import kotlin.String -import kotlin.Unit import kotlin.collections.List public object TestQuery_ResponseAdapter { public object Data : CompositeAdapter { public val RESPONSE_NAMES: List = listOf("hero") - public override fun fromJson(reader: JsonReader, adapterContext: CompositeAdapterContext): + override fun fromJson(reader: JsonReader, adapterContext: CompositeAdapterContext): TestQuery.Data { var _hero: TestQuery.Data.Hero? = null @@ -40,11 +39,11 @@ public object TestQuery_ResponseAdapter { ) } - public override fun toJson( + override fun toJson( writer: JsonWriter, `value`: TestQuery.Data, adapterContext: CompositeAdapterContext, - ): Unit { + ) { writer.name("hero") Hero.obj().nullable().toJson(writer, value.hero, adapterContext) } @@ -52,7 +51,7 @@ public object TestQuery_ResponseAdapter { private object Hero : CompositeAdapter { public val RESPONSE_NAMES: List = listOf("name", "friendsConnection") - public override fun fromJson(reader: JsonReader, adapterContext: CompositeAdapterContext): + override fun fromJson(reader: JsonReader, adapterContext: CompositeAdapterContext): TestQuery.Data.Hero { var _name: String? = null var _friendsConnection: TestQuery.Data.Hero.FriendsConnection? = null @@ -71,11 +70,11 @@ public object TestQuery_ResponseAdapter { ) } - public override fun toJson( + override fun toJson( writer: JsonWriter, `value`: TestQuery.Data.Hero, adapterContext: CompositeAdapterContext, - ): Unit { + ) { writer.name("name") NullableStringAdapter.toJson(writer, CustomScalarAdapters.Empty, value.name) @@ -86,7 +85,7 @@ public object TestQuery_ResponseAdapter { private object FriendsConnection : CompositeAdapter { public val RESPONSE_NAMES: List = listOf("totalCount") - public override fun fromJson(reader: JsonReader, adapterContext: CompositeAdapterContext): + override fun fromJson(reader: JsonReader, adapterContext: CompositeAdapterContext): TestQuery.Data.Hero.FriendsConnection { var _totalCount: Int? = null @@ -102,11 +101,11 @@ public object TestQuery_ResponseAdapter { ) } - public override fun toJson( + override fun toJson( writer: JsonWriter, `value`: TestQuery.Data.Hero.FriendsConnection, adapterContext: CompositeAdapterContext, - ): Unit { + ) { writer.name("totalCount") NullableIntAdapter.toJson(writer, CustomScalarAdapters.Empty, value.totalCount) } diff --git a/libraries/apollo-compiler/src/test/graphql/com/example/field_with_include_directive/kotlin/responseBased/field_with_include_directive/adapter/TestQuery_VariablesAdapter.kt.expected b/libraries/apollo-compiler/src/test/graphql/com/example/field_with_include_directive/kotlin/responseBased/field_with_include_directive/adapter/TestQuery_VariablesAdapter.kt.expected index 51703fc5f96..9fa95d0c6a2 100644 --- a/libraries/apollo-compiler/src/test/graphql/com/example/field_with_include_directive/kotlin/responseBased/field_with_include_directive/adapter/TestQuery_VariablesAdapter.kt.expected +++ b/libraries/apollo-compiler/src/test/graphql/com/example/field_with_include_directive/kotlin/responseBased/field_with_include_directive/adapter/TestQuery_VariablesAdapter.kt.expected @@ -12,7 +12,6 @@ import com.apollographql.apollo3.api.json.JsonWriter import com.example.field_with_include_directive.TestQuery import kotlin.Boolean import kotlin.Suppress -import kotlin.Unit public object TestQuery_VariablesAdapter { @Suppress( @@ -24,7 +23,7 @@ public object TestQuery_VariablesAdapter { `value`: TestQuery, customScalarAdapters: CustomScalarAdapters, withBooleanDefaultValues: Boolean, - ): Unit { + ) { val adapterContext = CompositeAdapterContext.Builder().customScalarAdapters(customScalarAdapters).build() writer.name("includeName") diff --git a/libraries/apollo-compiler/src/test/graphql/com/example/fieldset_with_multiple_super/kotlin/operationBased/fieldset_with_multiple_super/TestQuery.kt.expected b/libraries/apollo-compiler/src/test/graphql/com/example/fieldset_with_multiple_super/kotlin/operationBased/fieldset_with_multiple_super/TestQuery.kt.expected index b41540fa82a..40de981a49f 100644 --- a/libraries/apollo-compiler/src/test/graphql/com/example/fieldset_with_multiple_super/kotlin/operationBased/fieldset_with_multiple_super/TestQuery.kt.expected +++ b/libraries/apollo-compiler/src/test/graphql/com/example/fieldset_with_multiple_super/kotlin/operationBased/fieldset_with_multiple_super/TestQuery.kt.expected @@ -18,32 +18,32 @@ import kotlin.Any import kotlin.Boolean import kotlin.Int import kotlin.String -import kotlin.Unit +import com.example.fieldset_with_multiple_super.type.Query as CompiledQuery public class TestQuery() : Query { - public override fun equals(other: Any?): Boolean = other != null && other::class == this::class + override fun equals(other: Any?): Boolean = other != null && other::class == this::class - public override fun hashCode(): Int = this::class.hashCode() + override fun hashCode(): Int = this::class.hashCode() - public override fun id(): String = OPERATION_ID + override fun id(): String = OPERATION_ID - public override fun document(): String = OPERATION_DOCUMENT + override fun document(): String = OPERATION_DOCUMENT - public override fun name(): String = OPERATION_NAME + override fun name(): String = OPERATION_NAME - public override fun serializeVariables( + override fun serializeVariables( writer: JsonWriter, customScalarAdapters: CustomScalarAdapters, withBooleanDefaultValues: Boolean, - ): Unit { + ) { // This operation doesn't have any variable } - public override fun adapter(): CompositeAdapter = TestQuery_ResponseAdapter.Data.obj() + override fun adapter(): CompositeAdapter = TestQuery_ResponseAdapter.Data.obj() - public override fun rootField(): CompiledField = CompiledField.Builder( + override fun rootField(): CompiledField = CompiledField.Builder( name = "data", - type = com.example.fieldset_with_multiple_super.type.Query.type + type = CompiledQuery.type ) .selections(selections = TestQuerySelections.__root) .build() diff --git a/libraries/apollo-compiler/src/test/graphql/com/example/fieldset_with_multiple_super/kotlin/operationBased/fieldset_with_multiple_super/adapter/TestQuery_ResponseAdapter.kt.expected b/libraries/apollo-compiler/src/test/graphql/com/example/fieldset_with_multiple_super/kotlin/operationBased/fieldset_with_multiple_super/adapter/TestQuery_ResponseAdapter.kt.expected index 13195f0c811..4a5cbb71f6e 100644 --- a/libraries/apollo-compiler/src/test/graphql/com/example/fieldset_with_multiple_super/kotlin/operationBased/fieldset_with_multiple_super/adapter/TestQuery_ResponseAdapter.kt.expected +++ b/libraries/apollo-compiler/src/test/graphql/com/example/fieldset_with_multiple_super/kotlin/operationBased/fieldset_with_multiple_super/adapter/TestQuery_ResponseAdapter.kt.expected @@ -18,14 +18,13 @@ import com.apollographql.apollo3.api.obj import com.apollographql.apollo3.api.possibleTypes import com.example.fieldset_with_multiple_super.TestQuery import kotlin.String -import kotlin.Unit import kotlin.collections.List public object TestQuery_ResponseAdapter { public object Data : CompositeAdapter { public val RESPONSE_NAMES: List = listOf("c") - public override fun fromJson(reader: JsonReader, adapterContext: CompositeAdapterContext): + override fun fromJson(reader: JsonReader, adapterContext: CompositeAdapterContext): TestQuery.Data { var _c: TestQuery.Data.C? = null @@ -41,11 +40,11 @@ public object TestQuery_ResponseAdapter { ) } - public override fun toJson( + override fun toJson( writer: JsonWriter, `value`: TestQuery.Data, adapterContext: CompositeAdapterContext, - ): Unit { + ) { writer.name("c") C.obj(true).nullable().toJson(writer, value.c, adapterContext) } @@ -53,7 +52,7 @@ public object TestQuery_ResponseAdapter { private object C : CompositeAdapter { public val RESPONSE_NAMES: List = listOf("__typename") - public override fun fromJson(reader: JsonReader, adapterContext: CompositeAdapterContext): + override fun fromJson(reader: JsonReader, adapterContext: CompositeAdapterContext): TestQuery.Data.C { var __typename: String? = null @@ -89,11 +88,11 @@ public object TestQuery_ResponseAdapter { ) } - public override fun toJson( + override fun toJson( writer: JsonWriter, `value`: TestQuery.Data.C, adapterContext: CompositeAdapterContext, - ): Unit { + ) { writer.name("__typename") StringAdapter.toJson(writer, CustomScalarAdapters.Empty, value.__typename) @@ -111,7 +110,7 @@ public object TestQuery_ResponseAdapter { private object OnA : CompositeAdapter { public val RESPONSE_NAMES: List = listOf("__typename", "fieldA1") - public override fun fromJson(reader: JsonReader, adapterContext: CompositeAdapterContext): + override fun fromJson(reader: JsonReader, adapterContext: CompositeAdapterContext): TestQuery.Data.C.OnA { var __typename: String? = null var _fieldA1: String? = null @@ -142,11 +141,11 @@ public object TestQuery_ResponseAdapter { ) } - public override fun toJson( + override fun toJson( writer: JsonWriter, `value`: TestQuery.Data.C.OnA, adapterContext: CompositeAdapterContext, - ): Unit { + ) { writer.name("__typename") StringAdapter.toJson(writer, CustomScalarAdapters.Empty, value.__typename) @@ -162,7 +161,7 @@ public object TestQuery_ResponseAdapter { private object OnB : CompositeAdapter { public val RESPONSE_NAMES: List = listOf("fieldB1") - public override fun fromJson(reader: JsonReader, adapterContext: CompositeAdapterContext): + override fun fromJson(reader: JsonReader, adapterContext: CompositeAdapterContext): TestQuery.Data.C.OnA.OnB { var _fieldB1: String? = null @@ -178,11 +177,11 @@ public object TestQuery_ResponseAdapter { ) } - public override fun toJson( + override fun toJson( writer: JsonWriter, `value`: TestQuery.Data.C.OnA.OnB, adapterContext: CompositeAdapterContext, - ): Unit { + ) { writer.name("fieldB1") NullableStringAdapter.toJson(writer, CustomScalarAdapters.Empty, value.fieldB1) } @@ -192,7 +191,7 @@ public object TestQuery_ResponseAdapter { private object OnB : CompositeAdapter { public val RESPONSE_NAMES: List = listOf("__typename", "fieldB2") - public override fun fromJson(reader: JsonReader, adapterContext: CompositeAdapterContext): + override fun fromJson(reader: JsonReader, adapterContext: CompositeAdapterContext): TestQuery.Data.C.OnB { var __typename: String? = null var _fieldB2: String? = null @@ -223,11 +222,11 @@ public object TestQuery_ResponseAdapter { ) } - public override fun toJson( + override fun toJson( writer: JsonWriter, `value`: TestQuery.Data.C.OnB, adapterContext: CompositeAdapterContext, - ): Unit { + ) { writer.name("__typename") StringAdapter.toJson(writer, CustomScalarAdapters.Empty, value.__typename) @@ -243,7 +242,7 @@ public object TestQuery_ResponseAdapter { private object OnA : CompositeAdapter { public val RESPONSE_NAMES: List = listOf("fieldA2") - public override fun fromJson(reader: JsonReader, adapterContext: CompositeAdapterContext): + override fun fromJson(reader: JsonReader, adapterContext: CompositeAdapterContext): TestQuery.Data.C.OnB.OnA { var _fieldA2: String? = null @@ -259,11 +258,11 @@ public object TestQuery_ResponseAdapter { ) } - public override fun toJson( + override fun toJson( writer: JsonWriter, `value`: TestQuery.Data.C.OnB.OnA, adapterContext: CompositeAdapterContext, - ): Unit { + ) { writer.name("fieldA2") NullableStringAdapter.toJson(writer, CustomScalarAdapters.Empty, value.fieldA2) } diff --git a/libraries/apollo-compiler/src/test/graphql/com/example/fieldset_with_multiple_super/kotlin/responseBased/fieldset_with_multiple_super/TestQuery.kt.expected b/libraries/apollo-compiler/src/test/graphql/com/example/fieldset_with_multiple_super/kotlin/responseBased/fieldset_with_multiple_super/TestQuery.kt.expected index c86fb2aa2b7..2f7a3286b2a 100644 --- a/libraries/apollo-compiler/src/test/graphql/com/example/fieldset_with_multiple_super/kotlin/responseBased/fieldset_with_multiple_super/TestQuery.kt.expected +++ b/libraries/apollo-compiler/src/test/graphql/com/example/fieldset_with_multiple_super/kotlin/responseBased/fieldset_with_multiple_super/TestQuery.kt.expected @@ -18,32 +18,33 @@ import kotlin.Any import kotlin.Boolean import kotlin.Int import kotlin.String -import kotlin.Unit +import kotlin.Suppress +import com.example.fieldset_with_multiple_super.type.Query as CompiledQuery public class TestQuery() : Query { - public override fun equals(other: Any?): Boolean = other != null && other::class == this::class + override fun equals(other: Any?): Boolean = other != null && other::class == this::class - public override fun hashCode(): Int = this::class.hashCode() + override fun hashCode(): Int = this::class.hashCode() - public override fun id(): String = OPERATION_ID + override fun id(): String = OPERATION_ID - public override fun document(): String = OPERATION_DOCUMENT + override fun document(): String = OPERATION_DOCUMENT - public override fun name(): String = OPERATION_NAME + override fun name(): String = OPERATION_NAME - public override fun serializeVariables( + override fun serializeVariables( writer: JsonWriter, customScalarAdapters: CustomScalarAdapters, withBooleanDefaultValues: Boolean, - ): Unit { + ) { // This operation doesn't have any variable } - public override fun adapter(): CompositeAdapter = TestQuery_ResponseAdapter.Data.obj() + override fun adapter(): CompositeAdapter = TestQuery_ResponseAdapter.Data.obj() - public override fun rootField(): CompiledField = CompiledField.Builder( + override fun rootField(): CompiledField = CompiledField.Builder( name = "data", - type = com.example.fieldset_with_multiple_super.type.Query.type + type = CompiledQuery.type ) .selections(selections = TestQuerySelections.__root) .build() @@ -56,46 +57,49 @@ public class TestQuery() : Query { public val __typename: String public companion object { - public fun C.asA() = this as? AC + @Suppress("USELESS_CAST") + public fun C.asA(): AC? = this as? AC - public fun C.asAB() = this as? ABC + @Suppress("USELESS_CAST") + public fun C.asAB(): ABC? = this as? ABC - public fun C.asB() = this as? BC + @Suppress("USELESS_CAST") + public fun C.asB(): BC? = this as? BC } } public sealed interface AC : C { - public override val __typename: String + override val __typename: String public val fieldA1: String? } public sealed interface BC : C { - public override val __typename: String + override val __typename: String public val fieldB2: String? } public data class ABC( - public override val __typename: String, - public override val fieldA1: String?, + override val __typename: String, + override val fieldA1: String?, public val fieldB1: String?, - public override val fieldB2: String?, + override val fieldB2: String?, public val fieldA2: String?, ) : AC, BC public data class OtherC( - public override val __typename: String, + override val __typename: String, ) : C public data class OtherAC( - public override val __typename: String, - public override val fieldA1: String?, + override val __typename: String, + override val fieldA1: String?, ) : AC public data class OtherBC( - public override val __typename: String, - public override val fieldB2: String?, + override val __typename: String, + override val fieldB2: String?, ) : BC } diff --git a/libraries/apollo-compiler/src/test/graphql/com/example/fieldset_with_multiple_super/kotlin/responseBased/fieldset_with_multiple_super/adapter/TestQuery_ResponseAdapter.kt.expected b/libraries/apollo-compiler/src/test/graphql/com/example/fieldset_with_multiple_super/kotlin/responseBased/fieldset_with_multiple_super/adapter/TestQuery_ResponseAdapter.kt.expected index 315125e850d..60c290c4b22 100644 --- a/libraries/apollo-compiler/src/test/graphql/com/example/fieldset_with_multiple_super/kotlin/responseBased/fieldset_with_multiple_super/adapter/TestQuery_ResponseAdapter.kt.expected +++ b/libraries/apollo-compiler/src/test/graphql/com/example/fieldset_with_multiple_super/kotlin/responseBased/fieldset_with_multiple_super/adapter/TestQuery_ResponseAdapter.kt.expected @@ -18,14 +18,13 @@ import com.apollographql.apollo3.api.obj import com.example.fieldset_with_multiple_super.TestQuery import kotlin.String import kotlin.Suppress -import kotlin.Unit import kotlin.collections.List public object TestQuery_ResponseAdapter { public object Data : CompositeAdapter { public val RESPONSE_NAMES: List = listOf("c") - public override fun fromJson(reader: JsonReader, adapterContext: CompositeAdapterContext): + override fun fromJson(reader: JsonReader, adapterContext: CompositeAdapterContext): TestQuery.Data { var _c: TestQuery.Data.C? = null @@ -41,17 +40,17 @@ public object TestQuery_ResponseAdapter { ) } - public override fun toJson( + override fun toJson( writer: JsonWriter, `value`: TestQuery.Data, adapterContext: CompositeAdapterContext, - ): Unit { + ) { writer.name("c") C.obj().nullable().toJson(writer, value.c, adapterContext) } private object C : CompositeAdapter { - public override fun fromJson(reader: JsonReader, adapterContext: CompositeAdapterContext): + override fun fromJson(reader: JsonReader, adapterContext: CompositeAdapterContext): TestQuery.Data.C { val __typename = reader.readTypename() return when(__typename) { @@ -66,11 +65,11 @@ public object TestQuery_ResponseAdapter { } } - public override fun toJson( + override fun toJson( writer: JsonWriter, `value`: TestQuery.Data.C, adapterContext: CompositeAdapterContext, - ): Unit { + ) { when(value) { is TestQuery.Data.ABC -> ABC.toJson(writer, value, adapterContext) is TestQuery.Data.OtherAC -> OtherAC.toJson(writer, value, adapterContext) @@ -119,7 +118,7 @@ public object TestQuery_ResponseAdapter { writer: JsonWriter, `value`: TestQuery.Data.ABC, @Suppress("UNUSED_PARAMETER") adapterContext: CompositeAdapterContext, - ): Unit { + ) { writer.name("__typename") StringAdapter.toJson(writer, CustomScalarAdapters.Empty, value.__typename) @@ -163,7 +162,7 @@ public object TestQuery_ResponseAdapter { writer: JsonWriter, `value`: TestQuery.Data.OtherC, @Suppress("UNUSED_PARAMETER") adapterContext: CompositeAdapterContext, - ): Unit { + ) { writer.name("__typename") StringAdapter.toJson(writer, CustomScalarAdapters.Empty, value.__typename) } @@ -198,7 +197,7 @@ public object TestQuery_ResponseAdapter { writer: JsonWriter, `value`: TestQuery.Data.OtherAC, @Suppress("UNUSED_PARAMETER") adapterContext: CompositeAdapterContext, - ): Unit { + ) { writer.name("__typename") StringAdapter.toJson(writer, CustomScalarAdapters.Empty, value.__typename) @@ -236,7 +235,7 @@ public object TestQuery_ResponseAdapter { writer: JsonWriter, `value`: TestQuery.Data.OtherBC, @Suppress("UNUSED_PARAMETER") adapterContext: CompositeAdapterContext, - ): Unit { + ) { writer.name("__typename") StringAdapter.toJson(writer, CustomScalarAdapters.Empty, value.__typename) diff --git a/libraries/apollo-compiler/src/test/graphql/com/example/fragment_spread_with_include_directive/kotlin/operationBased/fragment_spread_with_include_directive/TestQuery.kt.expected b/libraries/apollo-compiler/src/test/graphql/com/example/fragment_spread_with_include_directive/kotlin/operationBased/fragment_spread_with_include_directive/TestQuery.kt.expected index b2d0245c573..ac4ec2458e0 100644 --- a/libraries/apollo-compiler/src/test/graphql/com/example/fragment_spread_with_include_directive/kotlin/operationBased/fragment_spread_with_include_directive/TestQuery.kt.expected +++ b/libraries/apollo-compiler/src/test/graphql/com/example/fragment_spread_with_include_directive/kotlin/operationBased/fragment_spread_with_include_directive/TestQuery.kt.expected @@ -22,7 +22,7 @@ import com.example.fragment_spread_with_include_directive.fragment.OtherDroidDet import com.example.fragment_spread_with_include_directive.selections.TestQuerySelections import kotlin.Boolean import kotlin.String -import kotlin.Unit +import com.example.fragment_spread_with_include_directive.type.Query as CompiledQuery public data class TestQuery( public val withDetails: Boolean, @@ -31,26 +31,26 @@ public data class TestQuery( public val optionalWithDefaultTrue: Optional = Optional.Absent, public val optionalWithNoDefault: Optional = Optional.Absent, ) : Query { - public override fun id(): String = OPERATION_ID + override fun id(): String = OPERATION_ID - public override fun document(): String = OPERATION_DOCUMENT + override fun document(): String = OPERATION_DOCUMENT - public override fun name(): String = OPERATION_NAME + override fun name(): String = OPERATION_NAME - public override fun serializeVariables( + override fun serializeVariables( writer: JsonWriter, customScalarAdapters: CustomScalarAdapters, withBooleanDefaultValues: Boolean, - ): Unit { + ) { TestQuery_VariablesAdapter.serializeVariables(writer, this, customScalarAdapters, withBooleanDefaultValues) } - public override fun adapter(): CompositeAdapter = TestQuery_ResponseAdapter.Data.obj() + override fun adapter(): CompositeAdapter = TestQuery_ResponseAdapter.Data.obj() - public override fun rootField(): CompiledField = CompiledField.Builder( + override fun rootField(): CompiledField = CompiledField.Builder( name = "data", - type = com.example.fragment_spread_with_include_directive.type.Query.type + type = CompiledQuery.type ) .selections(selections = TestQuerySelections.__root) .build() diff --git a/libraries/apollo-compiler/src/test/graphql/com/example/fragment_spread_with_include_directive/kotlin/operationBased/fragment_spread_with_include_directive/adapter/TestQuery_ResponseAdapter.kt.expected b/libraries/apollo-compiler/src/test/graphql/com/example/fragment_spread_with_include_directive/kotlin/operationBased/fragment_spread_with_include_directive/adapter/TestQuery_ResponseAdapter.kt.expected index 33ea67e76ad..b84fffa28eb 100644 --- a/libraries/apollo-compiler/src/test/graphql/com/example/fragment_spread_with_include_directive/kotlin/operationBased/fragment_spread_with_include_directive/adapter/TestQuery_ResponseAdapter.kt.expected +++ b/libraries/apollo-compiler/src/test/graphql/com/example/fragment_spread_with_include_directive/kotlin/operationBased/fragment_spread_with_include_directive/adapter/TestQuery_ResponseAdapter.kt.expected @@ -26,14 +26,13 @@ import com.example.fragment_spread_with_include_directive.fragment.HumanDetails import com.example.fragment_spread_with_include_directive.fragment.OtherDroidDetails import kotlin.Boolean import kotlin.String -import kotlin.Unit import kotlin.collections.List public object TestQuery_ResponseAdapter { public object Data : CompositeAdapter { public val RESPONSE_NAMES: List = listOf("hero", "getBoolean") - public override fun fromJson(reader: JsonReader, adapterContext: CompositeAdapterContext): + override fun fromJson(reader: JsonReader, adapterContext: CompositeAdapterContext): TestQuery.Data { var _hero: TestQuery.Data.Hero? = null var _getBoolean: Boolean? = null @@ -52,11 +51,11 @@ public object TestQuery_ResponseAdapter { ) } - public override fun toJson( + override fun toJson( writer: JsonWriter, `value`: TestQuery.Data, adapterContext: CompositeAdapterContext, - ): Unit { + ) { writer.name("hero") Hero.obj(true).nullable().toJson(writer, value.hero, adapterContext) @@ -67,7 +66,7 @@ public object TestQuery_ResponseAdapter { private object Hero : CompositeAdapter { public val RESPONSE_NAMES: List = listOf("__typename", "id") - public override fun fromJson(reader: JsonReader, adapterContext: CompositeAdapterContext): + override fun fromJson(reader: JsonReader, adapterContext: CompositeAdapterContext): TestQuery.Data.Hero { var __typename: String? = null var _id: String? = null @@ -122,11 +121,11 @@ public object TestQuery_ResponseAdapter { ) } - public override fun toJson( + override fun toJson( writer: JsonWriter, `value`: TestQuery.Data.Hero, adapterContext: CompositeAdapterContext, - ): Unit { + ) { writer.name("__typename") StringAdapter.toJson(writer, CustomScalarAdapters.Empty, value.__typename) diff --git a/libraries/apollo-compiler/src/test/graphql/com/example/fragment_spread_with_include_directive/kotlin/operationBased/fragment_spread_with_include_directive/adapter/TestQuery_VariablesAdapter.kt.expected b/libraries/apollo-compiler/src/test/graphql/com/example/fragment_spread_with_include_directive/kotlin/operationBased/fragment_spread_with_include_directive/adapter/TestQuery_VariablesAdapter.kt.expected index d7dcb836b78..06b4f82d479 100644 --- a/libraries/apollo-compiler/src/test/graphql/com/example/fragment_spread_with_include_directive/kotlin/operationBased/fragment_spread_with_include_directive/adapter/TestQuery_VariablesAdapter.kt.expected +++ b/libraries/apollo-compiler/src/test/graphql/com/example/fragment_spread_with_include_directive/kotlin/operationBased/fragment_spread_with_include_directive/adapter/TestQuery_VariablesAdapter.kt.expected @@ -15,7 +15,6 @@ import com.apollographql.apollo3.api.present import com.example.fragment_spread_with_include_directive.TestQuery import kotlin.Boolean import kotlin.Suppress -import kotlin.Unit public object TestQuery_VariablesAdapter { @Suppress( @@ -27,7 +26,7 @@ public object TestQuery_VariablesAdapter { `value`: TestQuery, customScalarAdapters: CustomScalarAdapters, withBooleanDefaultValues: Boolean, - ): Unit { + ) { val adapterContext = CompositeAdapterContext.Builder().customScalarAdapters(customScalarAdapters).build() writer.name("withDetails") diff --git a/libraries/apollo-compiler/src/test/graphql/com/example/fragment_spread_with_include_directive/kotlin/operationBased/fragment_spread_with_include_directive/fragment/DroidDetailsImpl.kt.expected b/libraries/apollo-compiler/src/test/graphql/com/example/fragment_spread_with_include_directive/kotlin/operationBased/fragment_spread_with_include_directive/fragment/DroidDetailsImpl.kt.expected index 0782636d643..99a8257ae80 100644 --- a/libraries/apollo-compiler/src/test/graphql/com/example/fragment_spread_with_include_directive/kotlin/operationBased/fragment_spread_with_include_directive/fragment/DroidDetailsImpl.kt.expected +++ b/libraries/apollo-compiler/src/test/graphql/com/example/fragment_spread_with_include_directive/kotlin/operationBased/fragment_spread_with_include_directive/fragment/DroidDetailsImpl.kt.expected @@ -16,25 +16,24 @@ import com.example.fragment_spread_with_include_directive.type.Droid import kotlin.Any import kotlin.Boolean import kotlin.Int -import kotlin.Unit public class DroidDetailsImpl() : Fragment { - public override fun equals(other: Any?): Boolean = other != null && other::class == this::class + override fun equals(other: Any?): Boolean = other != null && other::class == this::class - public override fun hashCode(): Int = this::class.hashCode() + override fun hashCode(): Int = this::class.hashCode() - public override fun serializeVariables( + override fun serializeVariables( writer: JsonWriter, customScalarAdapters: CustomScalarAdapters, withBooleanDefaultValues: Boolean, - ): Unit { + ) { // This fragment doesn't have any variable } - public override fun adapter(): CompositeAdapter = + override fun adapter(): CompositeAdapter = DroidDetailsImpl_ResponseAdapter.DroidDetails.obj() - public override fun rootField(): CompiledField = CompiledField.Builder( + override fun rootField(): CompiledField = CompiledField.Builder( name = "data", type = Droid.type ) diff --git a/libraries/apollo-compiler/src/test/graphql/com/example/fragment_spread_with_include_directive/kotlin/operationBased/fragment_spread_with_include_directive/fragment/DroidDetailsImpl_ResponseAdapter.kt.expected b/libraries/apollo-compiler/src/test/graphql/com/example/fragment_spread_with_include_directive/kotlin/operationBased/fragment_spread_with_include_directive/fragment/DroidDetailsImpl_ResponseAdapter.kt.expected index de6140c1695..1f28f2cfb86 100644 --- a/libraries/apollo-compiler/src/test/graphql/com/example/fragment_spread_with_include_directive/kotlin/operationBased/fragment_spread_with_include_directive/fragment/DroidDetailsImpl_ResponseAdapter.kt.expected +++ b/libraries/apollo-compiler/src/test/graphql/com/example/fragment_spread_with_include_directive/kotlin/operationBased/fragment_spread_with_include_directive/fragment/DroidDetailsImpl_ResponseAdapter.kt.expected @@ -12,7 +12,6 @@ import com.apollographql.apollo3.api.NullableStringAdapter import com.apollographql.apollo3.api.json.JsonReader import com.apollographql.apollo3.api.json.JsonWriter import kotlin.String -import kotlin.Unit import kotlin.collections.List public object DroidDetailsImpl_ResponseAdapter { @@ -20,7 +19,7 @@ public object DroidDetailsImpl_ResponseAdapter { CompositeAdapter { public val RESPONSE_NAMES: List = listOf("primaryFunction") - public override fun fromJson(reader: JsonReader, adapterContext: CompositeAdapterContext): + override fun fromJson(reader: JsonReader, adapterContext: CompositeAdapterContext): com.example.fragment_spread_with_include_directive.fragment.DroidDetails { var _primaryFunction: String? = null @@ -36,11 +35,11 @@ public object DroidDetailsImpl_ResponseAdapter { ) } - public override fun toJson( + override fun toJson( writer: JsonWriter, `value`: com.example.fragment_spread_with_include_directive.fragment.DroidDetails, adapterContext: CompositeAdapterContext, - ): Unit { + ) { writer.name("primaryFunction") NullableStringAdapter.toJson(writer, CustomScalarAdapters.Empty, value.primaryFunction) } diff --git a/libraries/apollo-compiler/src/test/graphql/com/example/fragment_spread_with_include_directive/kotlin/operationBased/fragment_spread_with_include_directive/fragment/HeroDetailsImpl.kt.expected b/libraries/apollo-compiler/src/test/graphql/com/example/fragment_spread_with_include_directive/kotlin/operationBased/fragment_spread_with_include_directive/fragment/HeroDetailsImpl.kt.expected index 7cb0ed987c0..68848127aaf 100644 --- a/libraries/apollo-compiler/src/test/graphql/com/example/fragment_spread_with_include_directive/kotlin/operationBased/fragment_spread_with_include_directive/fragment/HeroDetailsImpl.kt.expected +++ b/libraries/apollo-compiler/src/test/graphql/com/example/fragment_spread_with_include_directive/kotlin/operationBased/fragment_spread_with_include_directive/fragment/HeroDetailsImpl.kt.expected @@ -16,25 +16,24 @@ import com.example.fragment_spread_with_include_directive.type.Character import kotlin.Any import kotlin.Boolean import kotlin.Int -import kotlin.Unit public class HeroDetailsImpl() : Fragment { - public override fun equals(other: Any?): Boolean = other != null && other::class == this::class + override fun equals(other: Any?): Boolean = other != null && other::class == this::class - public override fun hashCode(): Int = this::class.hashCode() + override fun hashCode(): Int = this::class.hashCode() - public override fun serializeVariables( + override fun serializeVariables( writer: JsonWriter, customScalarAdapters: CustomScalarAdapters, withBooleanDefaultValues: Boolean, - ): Unit { + ) { // This fragment doesn't have any variable } - public override fun adapter(): CompositeAdapter = + override fun adapter(): CompositeAdapter = HeroDetailsImpl_ResponseAdapter.HeroDetails.obj() - public override fun rootField(): CompiledField = CompiledField.Builder( + override fun rootField(): CompiledField = CompiledField.Builder( name = "data", type = Character.type ) diff --git a/libraries/apollo-compiler/src/test/graphql/com/example/fragment_spread_with_include_directive/kotlin/operationBased/fragment_spread_with_include_directive/fragment/HeroDetailsImpl_ResponseAdapter.kt.expected b/libraries/apollo-compiler/src/test/graphql/com/example/fragment_spread_with_include_directive/kotlin/operationBased/fragment_spread_with_include_directive/fragment/HeroDetailsImpl_ResponseAdapter.kt.expected index c750398bf3e..da482359d8d 100644 --- a/libraries/apollo-compiler/src/test/graphql/com/example/fragment_spread_with_include_directive/kotlin/operationBased/fragment_spread_with_include_directive/fragment/HeroDetailsImpl_ResponseAdapter.kt.expected +++ b/libraries/apollo-compiler/src/test/graphql/com/example/fragment_spread_with_include_directive/kotlin/operationBased/fragment_spread_with_include_directive/fragment/HeroDetailsImpl_ResponseAdapter.kt.expected @@ -12,7 +12,6 @@ import com.apollographql.apollo3.api.StringAdapter import com.apollographql.apollo3.api.json.JsonReader import com.apollographql.apollo3.api.json.JsonWriter import kotlin.String -import kotlin.Unit import kotlin.collections.List public object HeroDetailsImpl_ResponseAdapter { @@ -20,7 +19,7 @@ public object HeroDetailsImpl_ResponseAdapter { CompositeAdapter { public val RESPONSE_NAMES: List = listOf("name") - public override fun fromJson(reader: JsonReader, adapterContext: CompositeAdapterContext): + override fun fromJson(reader: JsonReader, adapterContext: CompositeAdapterContext): com.example.fragment_spread_with_include_directive.fragment.HeroDetails { var _name: String? = null @@ -36,11 +35,11 @@ public object HeroDetailsImpl_ResponseAdapter { ) } - public override fun toJson( + override fun toJson( writer: JsonWriter, `value`: com.example.fragment_spread_with_include_directive.fragment.HeroDetails, adapterContext: CompositeAdapterContext, - ): Unit { + ) { writer.name("name") StringAdapter.toJson(writer, CustomScalarAdapters.Empty, value.name) } diff --git a/libraries/apollo-compiler/src/test/graphql/com/example/fragment_spread_with_include_directive/kotlin/operationBased/fragment_spread_with_include_directive/fragment/HumanDetailsImpl.kt.expected b/libraries/apollo-compiler/src/test/graphql/com/example/fragment_spread_with_include_directive/kotlin/operationBased/fragment_spread_with_include_directive/fragment/HumanDetailsImpl.kt.expected index 62d8691beaa..70293b010c9 100644 --- a/libraries/apollo-compiler/src/test/graphql/com/example/fragment_spread_with_include_directive/kotlin/operationBased/fragment_spread_with_include_directive/fragment/HumanDetailsImpl.kt.expected +++ b/libraries/apollo-compiler/src/test/graphql/com/example/fragment_spread_with_include_directive/kotlin/operationBased/fragment_spread_with_include_directive/fragment/HumanDetailsImpl.kt.expected @@ -16,25 +16,24 @@ import com.example.fragment_spread_with_include_directive.type.Human import kotlin.Any import kotlin.Boolean import kotlin.Int -import kotlin.Unit public class HumanDetailsImpl() : Fragment { - public override fun equals(other: Any?): Boolean = other != null && other::class == this::class + override fun equals(other: Any?): Boolean = other != null && other::class == this::class - public override fun hashCode(): Int = this::class.hashCode() + override fun hashCode(): Int = this::class.hashCode() - public override fun serializeVariables( + override fun serializeVariables( writer: JsonWriter, customScalarAdapters: CustomScalarAdapters, withBooleanDefaultValues: Boolean, - ): Unit { + ) { // This fragment doesn't have any variable } - public override fun adapter(): CompositeAdapter = + override fun adapter(): CompositeAdapter = HumanDetailsImpl_ResponseAdapter.HumanDetails.obj() - public override fun rootField(): CompiledField = CompiledField.Builder( + override fun rootField(): CompiledField = CompiledField.Builder( name = "data", type = Human.type ) diff --git a/libraries/apollo-compiler/src/test/graphql/com/example/fragment_spread_with_include_directive/kotlin/operationBased/fragment_spread_with_include_directive/fragment/HumanDetailsImpl_ResponseAdapter.kt.expected b/libraries/apollo-compiler/src/test/graphql/com/example/fragment_spread_with_include_directive/kotlin/operationBased/fragment_spread_with_include_directive/fragment/HumanDetailsImpl_ResponseAdapter.kt.expected index 3c63745d974..b600d2ef3bb 100644 --- a/libraries/apollo-compiler/src/test/graphql/com/example/fragment_spread_with_include_directive/kotlin/operationBased/fragment_spread_with_include_directive/fragment/HumanDetailsImpl_ResponseAdapter.kt.expected +++ b/libraries/apollo-compiler/src/test/graphql/com/example/fragment_spread_with_include_directive/kotlin/operationBased/fragment_spread_with_include_directive/fragment/HumanDetailsImpl_ResponseAdapter.kt.expected @@ -12,7 +12,6 @@ import com.apollographql.apollo3.api.NullableStringAdapter import com.apollographql.apollo3.api.json.JsonReader import com.apollographql.apollo3.api.json.JsonWriter import kotlin.String -import kotlin.Unit import kotlin.collections.List public object HumanDetailsImpl_ResponseAdapter { @@ -20,7 +19,7 @@ public object HumanDetailsImpl_ResponseAdapter { CompositeAdapter { public val RESPONSE_NAMES: List = listOf("homePlanet") - public override fun fromJson(reader: JsonReader, adapterContext: CompositeAdapterContext): + override fun fromJson(reader: JsonReader, adapterContext: CompositeAdapterContext): com.example.fragment_spread_with_include_directive.fragment.HumanDetails { var _homePlanet: String? = null @@ -36,11 +35,11 @@ public object HumanDetailsImpl_ResponseAdapter { ) } - public override fun toJson( + override fun toJson( writer: JsonWriter, `value`: com.example.fragment_spread_with_include_directive.fragment.HumanDetails, adapterContext: CompositeAdapterContext, - ): Unit { + ) { writer.name("homePlanet") NullableStringAdapter.toJson(writer, CustomScalarAdapters.Empty, value.homePlanet) } diff --git a/libraries/apollo-compiler/src/test/graphql/com/example/fragment_spread_with_include_directive/kotlin/operationBased/fragment_spread_with_include_directive/fragment/OtherDroidDetailsImpl.kt.expected b/libraries/apollo-compiler/src/test/graphql/com/example/fragment_spread_with_include_directive/kotlin/operationBased/fragment_spread_with_include_directive/fragment/OtherDroidDetailsImpl.kt.expected index 52efb06a5d7..2bbc3ac7c61 100644 --- a/libraries/apollo-compiler/src/test/graphql/com/example/fragment_spread_with_include_directive/kotlin/operationBased/fragment_spread_with_include_directive/fragment/OtherDroidDetailsImpl.kt.expected +++ b/libraries/apollo-compiler/src/test/graphql/com/example/fragment_spread_with_include_directive/kotlin/operationBased/fragment_spread_with_include_directive/fragment/OtherDroidDetailsImpl.kt.expected @@ -16,25 +16,24 @@ import com.example.fragment_spread_with_include_directive.type.Droid import kotlin.Any import kotlin.Boolean import kotlin.Int -import kotlin.Unit public class OtherDroidDetailsImpl() : Fragment { - public override fun equals(other: Any?): Boolean = other != null && other::class == this::class + override fun equals(other: Any?): Boolean = other != null && other::class == this::class - public override fun hashCode(): Int = this::class.hashCode() + override fun hashCode(): Int = this::class.hashCode() - public override fun serializeVariables( + override fun serializeVariables( writer: JsonWriter, customScalarAdapters: CustomScalarAdapters, withBooleanDefaultValues: Boolean, - ): Unit { + ) { // This fragment doesn't have any variable } - public override fun adapter(): CompositeAdapter = + override fun adapter(): CompositeAdapter = OtherDroidDetailsImpl_ResponseAdapter.OtherDroidDetails.obj() - public override fun rootField(): CompiledField = CompiledField.Builder( + override fun rootField(): CompiledField = CompiledField.Builder( name = "data", type = Droid.type ) diff --git a/libraries/apollo-compiler/src/test/graphql/com/example/fragment_spread_with_include_directive/kotlin/operationBased/fragment_spread_with_include_directive/fragment/OtherDroidDetailsImpl_ResponseAdapter.kt.expected b/libraries/apollo-compiler/src/test/graphql/com/example/fragment_spread_with_include_directive/kotlin/operationBased/fragment_spread_with_include_directive/fragment/OtherDroidDetailsImpl_ResponseAdapter.kt.expected index f4f3b089a8d..c30b652ac56 100644 --- a/libraries/apollo-compiler/src/test/graphql/com/example/fragment_spread_with_include_directive/kotlin/operationBased/fragment_spread_with_include_directive/fragment/OtherDroidDetailsImpl_ResponseAdapter.kt.expected +++ b/libraries/apollo-compiler/src/test/graphql/com/example/fragment_spread_with_include_directive/kotlin/operationBased/fragment_spread_with_include_directive/fragment/OtherDroidDetailsImpl_ResponseAdapter.kt.expected @@ -12,7 +12,6 @@ import com.apollographql.apollo3.api.StringAdapter import com.apollographql.apollo3.api.json.JsonReader import com.apollographql.apollo3.api.json.JsonWriter import kotlin.String -import kotlin.Unit import kotlin.collections.List public object OtherDroidDetailsImpl_ResponseAdapter { @@ -21,7 +20,7 @@ public object OtherDroidDetailsImpl_ResponseAdapter { { public val RESPONSE_NAMES: List = listOf("id") - public override fun fromJson(reader: JsonReader, adapterContext: CompositeAdapterContext): + override fun fromJson(reader: JsonReader, adapterContext: CompositeAdapterContext): com.example.fragment_spread_with_include_directive.fragment.OtherDroidDetails { var _id: String? = null @@ -37,11 +36,11 @@ public object OtherDroidDetailsImpl_ResponseAdapter { ) } - public override fun toJson( + override fun toJson( writer: JsonWriter, `value`: com.example.fragment_spread_with_include_directive.fragment.OtherDroidDetails, adapterContext: CompositeAdapterContext, - ): Unit { + ) { writer.name("id") StringAdapter.toJson(writer, CustomScalarAdapters.Empty, value.id) } diff --git a/libraries/apollo-compiler/src/test/graphql/com/example/fragment_spread_with_nested_fields/kotlin/operationBased/fragment_spread_with_nested_fields/TestQuery.kt.expected b/libraries/apollo-compiler/src/test/graphql/com/example/fragment_spread_with_nested_fields/kotlin/operationBased/fragment_spread_with_nested_fields/TestQuery.kt.expected index 857475066dc..9e8488a9a9e 100644 --- a/libraries/apollo-compiler/src/test/graphql/com/example/fragment_spread_with_nested_fields/kotlin/operationBased/fragment_spread_with_nested_fields/TestQuery.kt.expected +++ b/libraries/apollo-compiler/src/test/graphql/com/example/fragment_spread_with_nested_fields/kotlin/operationBased/fragment_spread_with_nested_fields/TestQuery.kt.expected @@ -19,32 +19,32 @@ import kotlin.Any import kotlin.Boolean import kotlin.Int import kotlin.String -import kotlin.Unit +import com.example.fragment_spread_with_nested_fields.type.Query as CompiledQuery public class TestQuery() : Query { - public override fun equals(other: Any?): Boolean = other != null && other::class == this::class + override fun equals(other: Any?): Boolean = other != null && other::class == this::class - public override fun hashCode(): Int = this::class.hashCode() + override fun hashCode(): Int = this::class.hashCode() - public override fun id(): String = OPERATION_ID + override fun id(): String = OPERATION_ID - public override fun document(): String = OPERATION_DOCUMENT + override fun document(): String = OPERATION_DOCUMENT - public override fun name(): String = OPERATION_NAME + override fun name(): String = OPERATION_NAME - public override fun serializeVariables( + override fun serializeVariables( writer: JsonWriter, customScalarAdapters: CustomScalarAdapters, withBooleanDefaultValues: Boolean, - ): Unit { + ) { // This operation doesn't have any variable } - public override fun adapter(): CompositeAdapter = TestQuery_ResponseAdapter.Data.obj() + override fun adapter(): CompositeAdapter = TestQuery_ResponseAdapter.Data.obj() - public override fun rootField(): CompiledField = CompiledField.Builder( + override fun rootField(): CompiledField = CompiledField.Builder( name = "data", - type = com.example.fragment_spread_with_nested_fields.type.Query.type + type = CompiledQuery.type ) .selections(selections = TestQuerySelections.__root) .build() diff --git a/libraries/apollo-compiler/src/test/graphql/com/example/fragment_spread_with_nested_fields/kotlin/operationBased/fragment_spread_with_nested_fields/adapter/TestQuery_ResponseAdapter.kt.expected b/libraries/apollo-compiler/src/test/graphql/com/example/fragment_spread_with_nested_fields/kotlin/operationBased/fragment_spread_with_nested_fields/adapter/TestQuery_ResponseAdapter.kt.expected index 094af04ef6a..da7fc23467f 100644 --- a/libraries/apollo-compiler/src/test/graphql/com/example/fragment_spread_with_nested_fields/kotlin/operationBased/fragment_spread_with_nested_fields/adapter/TestQuery_ResponseAdapter.kt.expected +++ b/libraries/apollo-compiler/src/test/graphql/com/example/fragment_spread_with_nested_fields/kotlin/operationBased/fragment_spread_with_nested_fields/adapter/TestQuery_ResponseAdapter.kt.expected @@ -15,14 +15,13 @@ import com.apollographql.apollo3.api.nullable import com.apollographql.apollo3.api.obj import com.example.fragment_spread_with_nested_fields.TestQuery import kotlin.String -import kotlin.Unit import kotlin.collections.List public object TestQuery_ResponseAdapter { public object Data : CompositeAdapter { public val RESPONSE_NAMES: List = listOf("hero") - public override fun fromJson(reader: JsonReader, adapterContext: CompositeAdapterContext): + override fun fromJson(reader: JsonReader, adapterContext: CompositeAdapterContext): TestQuery.Data { var _hero: TestQuery.Data.Hero? = null @@ -38,11 +37,11 @@ public object TestQuery_ResponseAdapter { ) } - public override fun toJson( + override fun toJson( writer: JsonWriter, `value`: TestQuery.Data, adapterContext: CompositeAdapterContext, - ): Unit { + ) { writer.name("hero") Hero.obj(true).nullable().toJson(writer, value.hero, adapterContext) } @@ -50,7 +49,7 @@ public object TestQuery_ResponseAdapter { private object Hero : CompositeAdapter { public val RESPONSE_NAMES: List = listOf("__typename") - public override fun fromJson(reader: JsonReader, adapterContext: CompositeAdapterContext): + override fun fromJson(reader: JsonReader, adapterContext: CompositeAdapterContext): TestQuery.Data.Hero { var __typename: String? = null @@ -71,11 +70,11 @@ public object TestQuery_ResponseAdapter { ) } - public override fun toJson( + override fun toJson( writer: JsonWriter, `value`: TestQuery.Data.Hero, adapterContext: CompositeAdapterContext, - ): Unit { + ) { writer.name("__typename") StringAdapter.toJson(writer, CustomScalarAdapters.Empty, value.__typename) diff --git a/libraries/apollo-compiler/src/test/graphql/com/example/fragment_spread_with_nested_fields/kotlin/operationBased/fragment_spread_with_nested_fields/fragment/HeroDetailsImpl.kt.expected b/libraries/apollo-compiler/src/test/graphql/com/example/fragment_spread_with_nested_fields/kotlin/operationBased/fragment_spread_with_nested_fields/fragment/HeroDetailsImpl.kt.expected index 0b370976373..910723dfefc 100644 --- a/libraries/apollo-compiler/src/test/graphql/com/example/fragment_spread_with_nested_fields/kotlin/operationBased/fragment_spread_with_nested_fields/fragment/HeroDetailsImpl.kt.expected +++ b/libraries/apollo-compiler/src/test/graphql/com/example/fragment_spread_with_nested_fields/kotlin/operationBased/fragment_spread_with_nested_fields/fragment/HeroDetailsImpl.kt.expected @@ -16,25 +16,24 @@ import com.example.fragment_spread_with_nested_fields.type.Character import kotlin.Any import kotlin.Boolean import kotlin.Int -import kotlin.Unit public class HeroDetailsImpl() : Fragment { - public override fun equals(other: Any?): Boolean = other != null && other::class == this::class + override fun equals(other: Any?): Boolean = other != null && other::class == this::class - public override fun hashCode(): Int = this::class.hashCode() + override fun hashCode(): Int = this::class.hashCode() - public override fun serializeVariables( + override fun serializeVariables( writer: JsonWriter, customScalarAdapters: CustomScalarAdapters, withBooleanDefaultValues: Boolean, - ): Unit { + ) { // This fragment doesn't have any variable } - public override fun adapter(): CompositeAdapter = + override fun adapter(): CompositeAdapter = HeroDetailsImpl_ResponseAdapter.HeroDetails.obj() - public override fun rootField(): CompiledField = CompiledField.Builder( + override fun rootField(): CompiledField = CompiledField.Builder( name = "data", type = Character.type ) diff --git a/libraries/apollo-compiler/src/test/graphql/com/example/fragment_spread_with_nested_fields/kotlin/operationBased/fragment_spread_with_nested_fields/fragment/HeroDetailsImpl_ResponseAdapter.kt.expected b/libraries/apollo-compiler/src/test/graphql/com/example/fragment_spread_with_nested_fields/kotlin/operationBased/fragment_spread_with_nested_fields/fragment/HeroDetailsImpl_ResponseAdapter.kt.expected index d1fbca38dd4..16389e3c35c 100644 --- a/libraries/apollo-compiler/src/test/graphql/com/example/fragment_spread_with_nested_fields/kotlin/operationBased/fragment_spread_with_nested_fields/fragment/HeroDetailsImpl_ResponseAdapter.kt.expected +++ b/libraries/apollo-compiler/src/test/graphql/com/example/fragment_spread_with_nested_fields/kotlin/operationBased/fragment_spread_with_nested_fields/fragment/HeroDetailsImpl_ResponseAdapter.kt.expected @@ -17,7 +17,6 @@ import com.apollographql.apollo3.api.nullable import com.apollographql.apollo3.api.obj import kotlin.Int import kotlin.String -import kotlin.Unit import kotlin.collections.List public object HeroDetailsImpl_ResponseAdapter { @@ -25,7 +24,7 @@ public object HeroDetailsImpl_ResponseAdapter { CompositeAdapter { public val RESPONSE_NAMES: List = listOf("name", "friendsConnection") - public override fun fromJson(reader: JsonReader, adapterContext: CompositeAdapterContext): + override fun fromJson(reader: JsonReader, adapterContext: CompositeAdapterContext): com.example.fragment_spread_with_nested_fields.fragment.HeroDetails { var _name: String? = null var _friendsConnection: com.example.fragment_spread_with_nested_fields.fragment.HeroDetails.FriendsConnection? = null @@ -44,11 +43,11 @@ public object HeroDetailsImpl_ResponseAdapter { ) } - public override fun toJson( + override fun toJson( writer: JsonWriter, `value`: com.example.fragment_spread_with_nested_fields.fragment.HeroDetails, adapterContext: CompositeAdapterContext, - ): Unit { + ) { writer.name("name") StringAdapter.toJson(writer, CustomScalarAdapters.Empty, value.name) @@ -61,7 +60,7 @@ public object HeroDetailsImpl_ResponseAdapter { { public val RESPONSE_NAMES: List = listOf("totalCount", "edges") - public override fun fromJson(reader: JsonReader, adapterContext: CompositeAdapterContext): + override fun fromJson(reader: JsonReader, adapterContext: CompositeAdapterContext): com.example.fragment_spread_with_nested_fields.fragment.HeroDetails.FriendsConnection { var _totalCount: Int? = null var _edges: List? = null @@ -80,11 +79,11 @@ public object HeroDetailsImpl_ResponseAdapter { ) } - public override fun toJson( + override fun toJson( writer: JsonWriter, `value`: com.example.fragment_spread_with_nested_fields.fragment.HeroDetails.FriendsConnection, adapterContext: CompositeAdapterContext, - ): Unit { + ) { writer.name("totalCount") NullableIntAdapter.toJson(writer, CustomScalarAdapters.Empty, value.totalCount) @@ -97,7 +96,7 @@ public object HeroDetailsImpl_ResponseAdapter { { public val RESPONSE_NAMES: List = listOf("node") - public override fun fromJson(reader: JsonReader, adapterContext: CompositeAdapterContext): + override fun fromJson(reader: JsonReader, adapterContext: CompositeAdapterContext): com.example.fragment_spread_with_nested_fields.fragment.HeroDetails.FriendsConnection.Edge { var _node: com.example.fragment_spread_with_nested_fields.fragment.HeroDetails.FriendsConnection.Edge.Node? = null @@ -113,11 +112,11 @@ public object HeroDetailsImpl_ResponseAdapter { ) } - public override fun toJson( + override fun toJson( writer: JsonWriter, `value`: com.example.fragment_spread_with_nested_fields.fragment.HeroDetails.FriendsConnection.Edge, adapterContext: CompositeAdapterContext, - ): Unit { + ) { writer.name("node") Node.obj().nullable().toJson(writer, value.node, adapterContext) } @@ -127,7 +126,7 @@ public object HeroDetailsImpl_ResponseAdapter { { public val RESPONSE_NAMES: List = listOf("name") - public override fun fromJson(reader: JsonReader, adapterContext: CompositeAdapterContext): + override fun fromJson(reader: JsonReader, adapterContext: CompositeAdapterContext): com.example.fragment_spread_with_nested_fields.fragment.HeroDetails.FriendsConnection.Edge.Node { var _name: String? = null @@ -143,11 +142,11 @@ public object HeroDetailsImpl_ResponseAdapter { ) } - public override fun toJson( + override fun toJson( writer: JsonWriter, `value`: com.example.fragment_spread_with_nested_fields.fragment.HeroDetails.FriendsConnection.Edge.Node, adapterContext: CompositeAdapterContext, - ): Unit { + ) { writer.name("name") StringAdapter.toJson(writer, CustomScalarAdapters.Empty, value.name) } diff --git a/libraries/apollo-compiler/src/test/graphql/com/example/fragment_spread_with_nested_fields/kotlin/responseBased/fragment_spread_with_nested_fields/TestQuery.kt.expected b/libraries/apollo-compiler/src/test/graphql/com/example/fragment_spread_with_nested_fields/kotlin/responseBased/fragment_spread_with_nested_fields/TestQuery.kt.expected index 30cf3526921..fa933f4251a 100644 --- a/libraries/apollo-compiler/src/test/graphql/com/example/fragment_spread_with_nested_fields/kotlin/responseBased/fragment_spread_with_nested_fields/TestQuery.kt.expected +++ b/libraries/apollo-compiler/src/test/graphql/com/example/fragment_spread_with_nested_fields/kotlin/responseBased/fragment_spread_with_nested_fields/TestQuery.kt.expected @@ -19,33 +19,34 @@ import kotlin.Any import kotlin.Boolean import kotlin.Int import kotlin.String -import kotlin.Unit +import kotlin.Suppress import kotlin.collections.List +import com.example.fragment_spread_with_nested_fields.type.Query as CompiledQuery public class TestQuery() : Query { - public override fun equals(other: Any?): Boolean = other != null && other::class == this::class + override fun equals(other: Any?): Boolean = other != null && other::class == this::class - public override fun hashCode(): Int = this::class.hashCode() + override fun hashCode(): Int = this::class.hashCode() - public override fun id(): String = OPERATION_ID + override fun id(): String = OPERATION_ID - public override fun document(): String = OPERATION_DOCUMENT + override fun document(): String = OPERATION_DOCUMENT - public override fun name(): String = OPERATION_NAME + override fun name(): String = OPERATION_NAME - public override fun serializeVariables( + override fun serializeVariables( writer: JsonWriter, customScalarAdapters: CustomScalarAdapters, withBooleanDefaultValues: Boolean, - ): Unit { + ) { // This operation doesn't have any variable } - public override fun adapter(): CompositeAdapter = TestQuery_ResponseAdapter.Data.obj() + override fun adapter(): CompositeAdapter = TestQuery_ResponseAdapter.Data.obj() - public override fun rootField(): CompiledField = CompiledField.Builder( + override fun rootField(): CompiledField = CompiledField.Builder( name = "data", - type = com.example.fragment_spread_with_nested_fields.type.Query.type + type = CompiledQuery.type ) .selections(selections = TestQuerySelections.__root) .build() @@ -59,21 +60,21 @@ public class TestQuery() : Query { /** * The name of the character */ - public override val name: String, + override val name: String, /** * The friends of the character exposed as a connection with edges */ - public override val friendsConnection: FriendsConnection, + override val friendsConnection: FriendsConnection, ) : HeroDetails { public data class FriendsConnection( /** * The total number of friends */ - public override val totalCount: Int?, + override val totalCount: Int?, /** * The edges for each of the character's friends. */ - public override val edges: List?, + override val edges: List?, ) : HeroDetails.FriendsConnection { public fun edgesFilterNotNull(): List? = edges?.filterNotNull() @@ -81,19 +82,20 @@ public class TestQuery() : Query { /** * The character represented by this friendship edge */ - public override val node: Node?, + override val node: Node?, ) : HeroDetails.FriendsConnection.Edge { public data class Node( /** * The name of the character */ - public override val name: String, + override val name: String, ) : HeroDetails.FriendsConnection.Edge.Node } } public companion object { - public fun Hero.heroDetails() = this as? HeroDetails + @Suppress("USELESS_CAST") + public fun Hero.heroDetails(): HeroDetails? = this as? HeroDetails } } } diff --git a/libraries/apollo-compiler/src/test/graphql/com/example/fragment_spread_with_nested_fields/kotlin/responseBased/fragment_spread_with_nested_fields/adapter/TestQuery_ResponseAdapter.kt.expected b/libraries/apollo-compiler/src/test/graphql/com/example/fragment_spread_with_nested_fields/kotlin/responseBased/fragment_spread_with_nested_fields/adapter/TestQuery_ResponseAdapter.kt.expected index 213427ee971..6257b6348d0 100644 --- a/libraries/apollo-compiler/src/test/graphql/com/example/fragment_spread_with_nested_fields/kotlin/responseBased/fragment_spread_with_nested_fields/adapter/TestQuery_ResponseAdapter.kt.expected +++ b/libraries/apollo-compiler/src/test/graphql/com/example/fragment_spread_with_nested_fields/kotlin/responseBased/fragment_spread_with_nested_fields/adapter/TestQuery_ResponseAdapter.kt.expected @@ -18,14 +18,13 @@ import com.apollographql.apollo3.api.obj import com.example.fragment_spread_with_nested_fields.TestQuery import kotlin.Int import kotlin.String -import kotlin.Unit import kotlin.collections.List public object TestQuery_ResponseAdapter { public object Data : CompositeAdapter { public val RESPONSE_NAMES: List = listOf("hero") - public override fun fromJson(reader: JsonReader, adapterContext: CompositeAdapterContext): + override fun fromJson(reader: JsonReader, adapterContext: CompositeAdapterContext): TestQuery.Data { var _hero: TestQuery.Data.Hero? = null @@ -41,11 +40,11 @@ public object TestQuery_ResponseAdapter { ) } - public override fun toJson( + override fun toJson( writer: JsonWriter, `value`: TestQuery.Data, adapterContext: CompositeAdapterContext, - ): Unit { + ) { writer.name("hero") Hero.obj().nullable().toJson(writer, value.hero, adapterContext) } @@ -53,7 +52,7 @@ public object TestQuery_ResponseAdapter { private object Hero : CompositeAdapter { public val RESPONSE_NAMES: List = listOf("__typename", "name", "friendsConnection") - public override fun fromJson(reader: JsonReader, adapterContext: CompositeAdapterContext): + override fun fromJson(reader: JsonReader, adapterContext: CompositeAdapterContext): TestQuery.Data.Hero { var __typename: String? = null var _name: String? = null @@ -75,11 +74,11 @@ public object TestQuery_ResponseAdapter { ) } - public override fun toJson( + override fun toJson( writer: JsonWriter, `value`: TestQuery.Data.Hero, adapterContext: CompositeAdapterContext, - ): Unit { + ) { writer.name("__typename") StringAdapter.toJson(writer, CustomScalarAdapters.Empty, value.__typename) @@ -93,7 +92,7 @@ public object TestQuery_ResponseAdapter { private object FriendsConnection : CompositeAdapter { public val RESPONSE_NAMES: List = listOf("totalCount", "edges") - public override fun fromJson(reader: JsonReader, adapterContext: CompositeAdapterContext): + override fun fromJson(reader: JsonReader, adapterContext: CompositeAdapterContext): TestQuery.Data.Hero.FriendsConnection { var _totalCount: Int? = null var _edges: List? = null @@ -112,11 +111,11 @@ public object TestQuery_ResponseAdapter { ) } - public override fun toJson( + override fun toJson( writer: JsonWriter, `value`: TestQuery.Data.Hero.FriendsConnection, adapterContext: CompositeAdapterContext, - ): Unit { + ) { writer.name("totalCount") NullableIntAdapter.toJson(writer, CustomScalarAdapters.Empty, value.totalCount) @@ -127,7 +126,7 @@ public object TestQuery_ResponseAdapter { private object Edge : CompositeAdapter { public val RESPONSE_NAMES: List = listOf("node") - public override fun fromJson(reader: JsonReader, adapterContext: CompositeAdapterContext): + override fun fromJson(reader: JsonReader, adapterContext: CompositeAdapterContext): TestQuery.Data.Hero.FriendsConnection.Edge { var _node: TestQuery.Data.Hero.FriendsConnection.Edge.Node? = null @@ -143,11 +142,11 @@ public object TestQuery_ResponseAdapter { ) } - public override fun toJson( + override fun toJson( writer: JsonWriter, `value`: TestQuery.Data.Hero.FriendsConnection.Edge, adapterContext: CompositeAdapterContext, - ): Unit { + ) { writer.name("node") Node.obj().nullable().toJson(writer, value.node, adapterContext) } @@ -155,8 +154,7 @@ public object TestQuery_ResponseAdapter { private object Node : CompositeAdapter { public val RESPONSE_NAMES: List = listOf("name") - public override fun fromJson(reader: JsonReader, - adapterContext: CompositeAdapterContext): + override fun fromJson(reader: JsonReader, adapterContext: CompositeAdapterContext): TestQuery.Data.Hero.FriendsConnection.Edge.Node { var _name: String? = null @@ -172,11 +170,11 @@ public object TestQuery_ResponseAdapter { ) } - public override fun toJson( + override fun toJson( writer: JsonWriter, `value`: TestQuery.Data.Hero.FriendsConnection.Edge.Node, adapterContext: CompositeAdapterContext, - ): Unit { + ) { writer.name("name") StringAdapter.toJson(writer, CustomScalarAdapters.Empty, value.name) } diff --git a/libraries/apollo-compiler/src/test/graphql/com/example/fragment_spread_with_nested_fields/kotlin/responseBased/fragment_spread_with_nested_fields/fragment/HeroDetailsImpl.kt.expected b/libraries/apollo-compiler/src/test/graphql/com/example/fragment_spread_with_nested_fields/kotlin/responseBased/fragment_spread_with_nested_fields/fragment/HeroDetailsImpl.kt.expected index 8a776157468..d6b27ceaa26 100644 --- a/libraries/apollo-compiler/src/test/graphql/com/example/fragment_spread_with_nested_fields/kotlin/responseBased/fragment_spread_with_nested_fields/fragment/HeroDetailsImpl.kt.expected +++ b/libraries/apollo-compiler/src/test/graphql/com/example/fragment_spread_with_nested_fields/kotlin/responseBased/fragment_spread_with_nested_fields/fragment/HeroDetailsImpl.kt.expected @@ -17,25 +17,24 @@ import kotlin.Any import kotlin.Boolean import kotlin.Int import kotlin.String -import kotlin.Unit import kotlin.collections.List public class HeroDetailsImpl() : Fragment { - public override fun equals(other: Any?): Boolean = other != null && other::class == this::class + override fun equals(other: Any?): Boolean = other != null && other::class == this::class - public override fun hashCode(): Int = this::class.hashCode() + override fun hashCode(): Int = this::class.hashCode() - public override fun serializeVariables( + override fun serializeVariables( writer: JsonWriter, customScalarAdapters: CustomScalarAdapters, withBooleanDefaultValues: Boolean, - ): Unit { + ) { // This fragment doesn't have any variable } - public override fun adapter(): CompositeAdapter = HeroDetailsImpl_ResponseAdapter.Data.obj() + override fun adapter(): CompositeAdapter = HeroDetailsImpl_ResponseAdapter.Data.obj() - public override fun rootField(): CompiledField = CompiledField.Builder( + override fun rootField(): CompiledField = CompiledField.Builder( name = "data", type = Character.type ) @@ -46,21 +45,21 @@ public class HeroDetailsImpl() : Fragment { /** * The name of the character */ - public override val name: String, + override val name: String, /** * The friends of the character exposed as a connection with edges */ - public override val friendsConnection: FriendsConnection, + override val friendsConnection: FriendsConnection, ) : HeroDetails, Fragment.Data { public data class FriendsConnection( /** * The total number of friends */ - public override val totalCount: Int?, + override val totalCount: Int?, /** * The edges for each of the character's friends. */ - public override val edges: List?, + override val edges: List?, ) : HeroDetails.FriendsConnection { public fun edgesFilterNotNull(): List? = edges?.filterNotNull() @@ -68,13 +67,13 @@ public class HeroDetailsImpl() : Fragment { /** * The character represented by this friendship edge */ - public override val node: Node?, + override val node: Node?, ) : HeroDetails.FriendsConnection.Edge { public data class Node( /** * The name of the character */ - public override val name: String, + override val name: String, ) : HeroDetails.FriendsConnection.Edge.Node } } diff --git a/libraries/apollo-compiler/src/test/graphql/com/example/fragment_spread_with_nested_fields/kotlin/responseBased/fragment_spread_with_nested_fields/fragment/HeroDetailsImpl_ResponseAdapter.kt.expected b/libraries/apollo-compiler/src/test/graphql/com/example/fragment_spread_with_nested_fields/kotlin/responseBased/fragment_spread_with_nested_fields/fragment/HeroDetailsImpl_ResponseAdapter.kt.expected index 59f6caa8d9c..5203edbbeaa 100644 --- a/libraries/apollo-compiler/src/test/graphql/com/example/fragment_spread_with_nested_fields/kotlin/responseBased/fragment_spread_with_nested_fields/fragment/HeroDetailsImpl_ResponseAdapter.kt.expected +++ b/libraries/apollo-compiler/src/test/graphql/com/example/fragment_spread_with_nested_fields/kotlin/responseBased/fragment_spread_with_nested_fields/fragment/HeroDetailsImpl_ResponseAdapter.kt.expected @@ -17,14 +17,13 @@ import com.apollographql.apollo3.api.nullable import com.apollographql.apollo3.api.obj import kotlin.Int import kotlin.String -import kotlin.Unit import kotlin.collections.List public object HeroDetailsImpl_ResponseAdapter { public object Data : CompositeAdapter { public val RESPONSE_NAMES: List = listOf("name", "friendsConnection") - public override fun fromJson(reader: JsonReader, adapterContext: CompositeAdapterContext): + override fun fromJson(reader: JsonReader, adapterContext: CompositeAdapterContext): HeroDetailsImpl.Data { var _name: String? = null var _friendsConnection: HeroDetailsImpl.Data.FriendsConnection? = null @@ -43,11 +42,11 @@ public object HeroDetailsImpl_ResponseAdapter { ) } - public override fun toJson( + override fun toJson( writer: JsonWriter, `value`: HeroDetailsImpl.Data, adapterContext: CompositeAdapterContext, - ): Unit { + ) { writer.name("name") StringAdapter.toJson(writer, CustomScalarAdapters.Empty, value.name) @@ -58,7 +57,7 @@ public object HeroDetailsImpl_ResponseAdapter { private object FriendsConnection : CompositeAdapter { public val RESPONSE_NAMES: List = listOf("totalCount", "edges") - public override fun fromJson(reader: JsonReader, adapterContext: CompositeAdapterContext): + override fun fromJson(reader: JsonReader, adapterContext: CompositeAdapterContext): HeroDetailsImpl.Data.FriendsConnection { var _totalCount: Int? = null var _edges: List? = null @@ -77,11 +76,11 @@ public object HeroDetailsImpl_ResponseAdapter { ) } - public override fun toJson( + override fun toJson( writer: JsonWriter, `value`: HeroDetailsImpl.Data.FriendsConnection, adapterContext: CompositeAdapterContext, - ): Unit { + ) { writer.name("totalCount") NullableIntAdapter.toJson(writer, CustomScalarAdapters.Empty, value.totalCount) @@ -92,7 +91,7 @@ public object HeroDetailsImpl_ResponseAdapter { private object Edge : CompositeAdapter { public val RESPONSE_NAMES: List = listOf("node") - public override fun fromJson(reader: JsonReader, adapterContext: CompositeAdapterContext): + override fun fromJson(reader: JsonReader, adapterContext: CompositeAdapterContext): HeroDetailsImpl.Data.FriendsConnection.Edge { var _node: HeroDetailsImpl.Data.FriendsConnection.Edge.Node? = null @@ -108,11 +107,11 @@ public object HeroDetailsImpl_ResponseAdapter { ) } - public override fun toJson( + override fun toJson( writer: JsonWriter, `value`: HeroDetailsImpl.Data.FriendsConnection.Edge, adapterContext: CompositeAdapterContext, - ): Unit { + ) { writer.name("node") Node.obj().nullable().toJson(writer, value.node, adapterContext) } @@ -120,7 +119,7 @@ public object HeroDetailsImpl_ResponseAdapter { private object Node : CompositeAdapter { public val RESPONSE_NAMES: List = listOf("name") - public override fun fromJson(reader: JsonReader, adapterContext: CompositeAdapterContext): + override fun fromJson(reader: JsonReader, adapterContext: CompositeAdapterContext): HeroDetailsImpl.Data.FriendsConnection.Edge.Node { var _name: String? = null @@ -136,11 +135,11 @@ public object HeroDetailsImpl_ResponseAdapter { ) } - public override fun toJson( + override fun toJson( writer: JsonWriter, `value`: HeroDetailsImpl.Data.FriendsConnection.Edge.Node, adapterContext: CompositeAdapterContext, - ): Unit { + ) { writer.name("name") StringAdapter.toJson(writer, CustomScalarAdapters.Empty, value.name) } diff --git a/libraries/apollo-compiler/src/test/graphql/com/example/fragment_used_twice/kotlin/operationBased/fragment_used_twice/TestQuery.kt.expected b/libraries/apollo-compiler/src/test/graphql/com/example/fragment_used_twice/kotlin/operationBased/fragment_used_twice/TestQuery.kt.expected index 4ab7842d0e5..3acaf857206 100644 --- a/libraries/apollo-compiler/src/test/graphql/com/example/fragment_used_twice/kotlin/operationBased/fragment_used_twice/TestQuery.kt.expected +++ b/libraries/apollo-compiler/src/test/graphql/com/example/fragment_used_twice/kotlin/operationBased/fragment_used_twice/TestQuery.kt.expected @@ -20,32 +20,32 @@ import kotlin.Any import kotlin.Boolean import kotlin.Int import kotlin.String -import kotlin.Unit +import com.example.fragment_used_twice.type.Query as CompiledQuery public class TestQuery() : Query { - public override fun equals(other: Any?): Boolean = other != null && other::class == this::class + override fun equals(other: Any?): Boolean = other != null && other::class == this::class - public override fun hashCode(): Int = this::class.hashCode() + override fun hashCode(): Int = this::class.hashCode() - public override fun id(): String = OPERATION_ID + override fun id(): String = OPERATION_ID - public override fun document(): String = OPERATION_DOCUMENT + override fun document(): String = OPERATION_DOCUMENT - public override fun name(): String = OPERATION_NAME + override fun name(): String = OPERATION_NAME - public override fun serializeVariables( + override fun serializeVariables( writer: JsonWriter, customScalarAdapters: CustomScalarAdapters, withBooleanDefaultValues: Boolean, - ): Unit { + ) { // This operation doesn't have any variable } - public override fun adapter(): CompositeAdapter = TestQuery_ResponseAdapter.Data.obj() + override fun adapter(): CompositeAdapter = TestQuery_ResponseAdapter.Data.obj() - public override fun rootField(): CompiledField = CompiledField.Builder( + override fun rootField(): CompiledField = CompiledField.Builder( name = "data", - type = com.example.fragment_used_twice.type.Query.type + type = CompiledQuery.type ) .selections(selections = TestQuerySelections.__root) .build() diff --git a/libraries/apollo-compiler/src/test/graphql/com/example/fragment_used_twice/kotlin/operationBased/fragment_used_twice/adapter/TestQuery_ResponseAdapter.kt.expected b/libraries/apollo-compiler/src/test/graphql/com/example/fragment_used_twice/kotlin/operationBased/fragment_used_twice/adapter/TestQuery_ResponseAdapter.kt.expected index b040751bba9..9417154ba79 100644 --- a/libraries/apollo-compiler/src/test/graphql/com/example/fragment_used_twice/kotlin/operationBased/fragment_used_twice/adapter/TestQuery_ResponseAdapter.kt.expected +++ b/libraries/apollo-compiler/src/test/graphql/com/example/fragment_used_twice/kotlin/operationBased/fragment_used_twice/adapter/TestQuery_ResponseAdapter.kt.expected @@ -18,14 +18,13 @@ import com.apollographql.apollo3.api.possibleTypes import com.example.fragment_used_twice.TestQuery import com.example.fragment_used_twice.fragment.HumanDetails import kotlin.String -import kotlin.Unit import kotlin.collections.List public object TestQuery_ResponseAdapter { public object Data : CompositeAdapter { public val RESPONSE_NAMES: List = listOf("hero") - public override fun fromJson(reader: JsonReader, adapterContext: CompositeAdapterContext): + override fun fromJson(reader: JsonReader, adapterContext: CompositeAdapterContext): TestQuery.Data { var _hero: TestQuery.Data.Hero? = null @@ -41,11 +40,11 @@ public object TestQuery_ResponseAdapter { ) } - public override fun toJson( + override fun toJson( writer: JsonWriter, `value`: TestQuery.Data, adapterContext: CompositeAdapterContext, - ): Unit { + ) { writer.name("hero") Hero.obj(true).nullable().toJson(writer, value.hero, adapterContext) } @@ -53,7 +52,7 @@ public object TestQuery_ResponseAdapter { private object Hero : CompositeAdapter { public val RESPONSE_NAMES: List = listOf("__typename") - public override fun fromJson(reader: JsonReader, adapterContext: CompositeAdapterContext): + override fun fromJson(reader: JsonReader, adapterContext: CompositeAdapterContext): TestQuery.Data.Hero { var __typename: String? = null @@ -86,11 +85,11 @@ public object TestQuery_ResponseAdapter { ) } - public override fun toJson( + override fun toJson( writer: JsonWriter, `value`: TestQuery.Data.Hero, adapterContext: CompositeAdapterContext, - ): Unit { + ) { writer.name("__typename") StringAdapter.toJson(writer, CustomScalarAdapters.Empty, value.__typename) diff --git a/libraries/apollo-compiler/src/test/graphql/com/example/fragment_used_twice/kotlin/operationBased/fragment_used_twice/fragment/CharacterDetailsImpl.kt.expected b/libraries/apollo-compiler/src/test/graphql/com/example/fragment_used_twice/kotlin/operationBased/fragment_used_twice/fragment/CharacterDetailsImpl.kt.expected index 8889892b3f7..90df3114655 100644 --- a/libraries/apollo-compiler/src/test/graphql/com/example/fragment_used_twice/kotlin/operationBased/fragment_used_twice/fragment/CharacterDetailsImpl.kt.expected +++ b/libraries/apollo-compiler/src/test/graphql/com/example/fragment_used_twice/kotlin/operationBased/fragment_used_twice/fragment/CharacterDetailsImpl.kt.expected @@ -16,25 +16,24 @@ import com.example.fragment_used_twice.type.Character import kotlin.Any import kotlin.Boolean import kotlin.Int -import kotlin.Unit public class CharacterDetailsImpl() : Fragment { - public override fun equals(other: Any?): Boolean = other != null && other::class == this::class + override fun equals(other: Any?): Boolean = other != null && other::class == this::class - public override fun hashCode(): Int = this::class.hashCode() + override fun hashCode(): Int = this::class.hashCode() - public override fun serializeVariables( + override fun serializeVariables( writer: JsonWriter, customScalarAdapters: CustomScalarAdapters, withBooleanDefaultValues: Boolean, - ): Unit { + ) { // This fragment doesn't have any variable } - public override fun adapter(): CompositeAdapter = + override fun adapter(): CompositeAdapter = CharacterDetailsImpl_ResponseAdapter.CharacterDetails.obj() - public override fun rootField(): CompiledField = CompiledField.Builder( + override fun rootField(): CompiledField = CompiledField.Builder( name = "data", type = Character.type ) diff --git a/libraries/apollo-compiler/src/test/graphql/com/example/fragment_used_twice/kotlin/operationBased/fragment_used_twice/fragment/CharacterDetailsImpl_ResponseAdapter.kt.expected b/libraries/apollo-compiler/src/test/graphql/com/example/fragment_used_twice/kotlin/operationBased/fragment_used_twice/fragment/CharacterDetailsImpl_ResponseAdapter.kt.expected index f1cac94bdb1..b8d7bd6db98 100644 --- a/libraries/apollo-compiler/src/test/graphql/com/example/fragment_used_twice/kotlin/operationBased/fragment_used_twice/fragment/CharacterDetailsImpl_ResponseAdapter.kt.expected +++ b/libraries/apollo-compiler/src/test/graphql/com/example/fragment_used_twice/kotlin/operationBased/fragment_used_twice/fragment/CharacterDetailsImpl_ResponseAdapter.kt.expected @@ -14,7 +14,6 @@ import com.apollographql.apollo3.api.json.JsonReader import com.apollographql.apollo3.api.json.JsonWriter import kotlin.Any import kotlin.String -import kotlin.Unit import kotlin.collections.List public object CharacterDetailsImpl_ResponseAdapter { @@ -22,7 +21,7 @@ public object CharacterDetailsImpl_ResponseAdapter { CompositeAdapter { public val RESPONSE_NAMES: List = listOf("name", "birthDate") - public override fun fromJson(reader: JsonReader, adapterContext: CompositeAdapterContext): + override fun fromJson(reader: JsonReader, adapterContext: CompositeAdapterContext): com.example.fragment_used_twice.fragment.CharacterDetails { var _name: String? = null var _birthDate: Any? = null @@ -41,11 +40,11 @@ public object CharacterDetailsImpl_ResponseAdapter { ) } - public override fun toJson( + override fun toJson( writer: JsonWriter, `value`: com.example.fragment_used_twice.fragment.CharacterDetails, adapterContext: CompositeAdapterContext, - ): Unit { + ) { writer.name("name") StringAdapter.toJson(writer, CustomScalarAdapters.Empty, value.name) diff --git a/libraries/apollo-compiler/src/test/graphql/com/example/fragment_used_twice/kotlin/operationBased/fragment_used_twice/fragment/HeroDetailsImpl.kt.expected b/libraries/apollo-compiler/src/test/graphql/com/example/fragment_used_twice/kotlin/operationBased/fragment_used_twice/fragment/HeroDetailsImpl.kt.expected index 3df468ffe25..9a2394d25ba 100644 --- a/libraries/apollo-compiler/src/test/graphql/com/example/fragment_used_twice/kotlin/operationBased/fragment_used_twice/fragment/HeroDetailsImpl.kt.expected +++ b/libraries/apollo-compiler/src/test/graphql/com/example/fragment_used_twice/kotlin/operationBased/fragment_used_twice/fragment/HeroDetailsImpl.kt.expected @@ -16,25 +16,24 @@ import com.example.fragment_used_twice.type.Character import kotlin.Any import kotlin.Boolean import kotlin.Int -import kotlin.Unit public class HeroDetailsImpl() : Fragment { - public override fun equals(other: Any?): Boolean = other != null && other::class == this::class + override fun equals(other: Any?): Boolean = other != null && other::class == this::class - public override fun hashCode(): Int = this::class.hashCode() + override fun hashCode(): Int = this::class.hashCode() - public override fun serializeVariables( + override fun serializeVariables( writer: JsonWriter, customScalarAdapters: CustomScalarAdapters, withBooleanDefaultValues: Boolean, - ): Unit { + ) { // This fragment doesn't have any variable } - public override fun adapter(): CompositeAdapter = + override fun adapter(): CompositeAdapter = HeroDetailsImpl_ResponseAdapter.HeroDetails.obj(true) - public override fun rootField(): CompiledField = CompiledField.Builder( + override fun rootField(): CompiledField = CompiledField.Builder( name = "data", type = Character.type ) diff --git a/libraries/apollo-compiler/src/test/graphql/com/example/fragment_used_twice/kotlin/operationBased/fragment_used_twice/fragment/HeroDetailsImpl_ResponseAdapter.kt.expected b/libraries/apollo-compiler/src/test/graphql/com/example/fragment_used_twice/kotlin/operationBased/fragment_used_twice/fragment/HeroDetailsImpl_ResponseAdapter.kt.expected index 4e0e675b86a..7ab9ae954ba 100644 --- a/libraries/apollo-compiler/src/test/graphql/com/example/fragment_used_twice/kotlin/operationBased/fragment_used_twice/fragment/HeroDetailsImpl_ResponseAdapter.kt.expected +++ b/libraries/apollo-compiler/src/test/graphql/com/example/fragment_used_twice/kotlin/operationBased/fragment_used_twice/fragment/HeroDetailsImpl_ResponseAdapter.kt.expected @@ -12,7 +12,6 @@ import com.apollographql.apollo3.api.StringAdapter import com.apollographql.apollo3.api.json.JsonReader import com.apollographql.apollo3.api.json.JsonWriter import kotlin.String -import kotlin.Unit import kotlin.collections.List public object HeroDetailsImpl_ResponseAdapter { @@ -20,7 +19,7 @@ public object HeroDetailsImpl_ResponseAdapter { { public val RESPONSE_NAMES: List = listOf("__typename", "name") - public override fun fromJson(reader: JsonReader, adapterContext: CompositeAdapterContext): + override fun fromJson(reader: JsonReader, adapterContext: CompositeAdapterContext): com.example.fragment_used_twice.fragment.HeroDetails { var __typename: String? = null var _name: String? = null @@ -44,11 +43,11 @@ public object HeroDetailsImpl_ResponseAdapter { ) } - public override fun toJson( + override fun toJson( writer: JsonWriter, `value`: com.example.fragment_used_twice.fragment.HeroDetails, adapterContext: CompositeAdapterContext, - ): Unit { + ) { writer.name("__typename") StringAdapter.toJson(writer, CustomScalarAdapters.Empty, value.__typename) diff --git a/libraries/apollo-compiler/src/test/graphql/com/example/fragment_used_twice/kotlin/operationBased/fragment_used_twice/fragment/HumanDetailsImpl.kt.expected b/libraries/apollo-compiler/src/test/graphql/com/example/fragment_used_twice/kotlin/operationBased/fragment_used_twice/fragment/HumanDetailsImpl.kt.expected index 398cc08503a..d7e46e8ee60 100644 --- a/libraries/apollo-compiler/src/test/graphql/com/example/fragment_used_twice/kotlin/operationBased/fragment_used_twice/fragment/HumanDetailsImpl.kt.expected +++ b/libraries/apollo-compiler/src/test/graphql/com/example/fragment_used_twice/kotlin/operationBased/fragment_used_twice/fragment/HumanDetailsImpl.kt.expected @@ -16,25 +16,24 @@ import com.example.fragment_used_twice.type.Human import kotlin.Any import kotlin.Boolean import kotlin.Int -import kotlin.Unit public class HumanDetailsImpl() : Fragment { - public override fun equals(other: Any?): Boolean = other != null && other::class == this::class + override fun equals(other: Any?): Boolean = other != null && other::class == this::class - public override fun hashCode(): Int = this::class.hashCode() + override fun hashCode(): Int = this::class.hashCode() - public override fun serializeVariables( + override fun serializeVariables( writer: JsonWriter, customScalarAdapters: CustomScalarAdapters, withBooleanDefaultValues: Boolean, - ): Unit { + ) { // This fragment doesn't have any variable } - public override fun adapter(): CompositeAdapter = + override fun adapter(): CompositeAdapter = HumanDetailsImpl_ResponseAdapter.HumanDetails.obj(true) - public override fun rootField(): CompiledField = CompiledField.Builder( + override fun rootField(): CompiledField = CompiledField.Builder( name = "data", type = Human.type ) diff --git a/libraries/apollo-compiler/src/test/graphql/com/example/fragment_used_twice/kotlin/operationBased/fragment_used_twice/fragment/HumanDetailsImpl_ResponseAdapter.kt.expected b/libraries/apollo-compiler/src/test/graphql/com/example/fragment_used_twice/kotlin/operationBased/fragment_used_twice/fragment/HumanDetailsImpl_ResponseAdapter.kt.expected index aef7fad7859..9f0ef8397f1 100644 --- a/libraries/apollo-compiler/src/test/graphql/com/example/fragment_used_twice/kotlin/operationBased/fragment_used_twice/fragment/HumanDetailsImpl_ResponseAdapter.kt.expected +++ b/libraries/apollo-compiler/src/test/graphql/com/example/fragment_used_twice/kotlin/operationBased/fragment_used_twice/fragment/HumanDetailsImpl_ResponseAdapter.kt.expected @@ -12,7 +12,6 @@ import com.apollographql.apollo3.api.StringAdapter import com.apollographql.apollo3.api.json.JsonReader import com.apollographql.apollo3.api.json.JsonWriter import kotlin.String -import kotlin.Unit import kotlin.collections.List public object HumanDetailsImpl_ResponseAdapter { @@ -20,7 +19,7 @@ public object HumanDetailsImpl_ResponseAdapter { CompositeAdapter { public val RESPONSE_NAMES: List = listOf("__typename", "name") - public override fun fromJson(reader: JsonReader, adapterContext: CompositeAdapterContext): + override fun fromJson(reader: JsonReader, adapterContext: CompositeAdapterContext): com.example.fragment_used_twice.fragment.HumanDetails { var __typename: String? = null var _name: String? = null @@ -44,11 +43,11 @@ public object HumanDetailsImpl_ResponseAdapter { ) } - public override fun toJson( + override fun toJson( writer: JsonWriter, `value`: com.example.fragment_used_twice.fragment.HumanDetails, adapterContext: CompositeAdapterContext, - ): Unit { + ) { writer.name("__typename") StringAdapter.toJson(writer, CustomScalarAdapters.Empty, value.__typename) diff --git a/libraries/apollo-compiler/src/test/graphql/com/example/fragment_used_twice/kotlin/responseBased/fragment_used_twice/TestQuery.kt.expected b/libraries/apollo-compiler/src/test/graphql/com/example/fragment_used_twice/kotlin/responseBased/fragment_used_twice/TestQuery.kt.expected index 00ca65d9eac..76aefc686a6 100644 --- a/libraries/apollo-compiler/src/test/graphql/com/example/fragment_used_twice/kotlin/responseBased/fragment_used_twice/TestQuery.kt.expected +++ b/libraries/apollo-compiler/src/test/graphql/com/example/fragment_used_twice/kotlin/responseBased/fragment_used_twice/TestQuery.kt.expected @@ -21,32 +21,33 @@ import kotlin.Any import kotlin.Boolean import kotlin.Int import kotlin.String -import kotlin.Unit +import kotlin.Suppress +import com.example.fragment_used_twice.type.Query as CompiledQuery public class TestQuery() : Query { - public override fun equals(other: Any?): Boolean = other != null && other::class == this::class + override fun equals(other: Any?): Boolean = other != null && other::class == this::class - public override fun hashCode(): Int = this::class.hashCode() + override fun hashCode(): Int = this::class.hashCode() - public override fun id(): String = OPERATION_ID + override fun id(): String = OPERATION_ID - public override fun document(): String = OPERATION_DOCUMENT + override fun document(): String = OPERATION_DOCUMENT - public override fun name(): String = OPERATION_NAME + override fun name(): String = OPERATION_NAME - public override fun serializeVariables( + override fun serializeVariables( writer: JsonWriter, customScalarAdapters: CustomScalarAdapters, withBooleanDefaultValues: Boolean, - ): Unit { + ) { // This operation doesn't have any variable } - public override fun adapter(): CompositeAdapter = TestQuery_ResponseAdapter.Data.obj() + override fun adapter(): CompositeAdapter = TestQuery_ResponseAdapter.Data.obj() - public override fun rootField(): CompiledField = CompiledField.Builder( + override fun rootField(): CompiledField = CompiledField.Builder( name = "data", - type = com.example.fragment_used_twice.type.Query.type + type = CompiledQuery.type ) .selections(selections = TestQuerySelections.__root) .build() @@ -56,50 +57,53 @@ public class TestQuery() : Query { public val hero: Hero?, ) : Query.Data { public sealed interface Hero : HeroDetails { - public override val __typename: String + override val __typename: String /** * The name of the character */ - public override val name: String + override val name: String /** * The date character was born. */ - public override val birthDate: Any + override val birthDate: Any public companion object { - public fun Hero.heroDetails() = this as? HeroDetails + @Suppress("USELESS_CAST") + public fun Hero.heroDetails(): HeroDetails? = this as? HeroDetails - public fun Hero.humanDetails() = this as? HumanDetails + @Suppress("USELESS_CAST") + public fun Hero.humanDetails(): HumanDetails? = this as? HumanDetails - public fun Hero.asHuman() = this as? HumanHero + @Suppress("USELESS_CAST") + public fun Hero.asHuman(): HumanHero? = this as? HumanHero } } public data class HumanHero( - public override val __typename: String, + override val __typename: String, /** * Merged field with multiple descriptions. See parentTypes: 'Character, Human' for more * information */ - public override val name: String, + override val name: String, /** * The date character was born. */ - public override val birthDate: Any, + override val birthDate: Any, ) : Hero, HeroDetails, CharacterHumanDetails public data class OtherHero( - public override val __typename: String, + override val __typename: String, /** * The name of the character */ - public override val name: String, + override val name: String, /** * The date character was born. */ - public override val birthDate: Any, + override val birthDate: Any, ) : Hero, HeroDetails } diff --git a/libraries/apollo-compiler/src/test/graphql/com/example/fragment_used_twice/kotlin/responseBased/fragment_used_twice/adapter/TestQuery_ResponseAdapter.kt.expected b/libraries/apollo-compiler/src/test/graphql/com/example/fragment_used_twice/kotlin/responseBased/fragment_used_twice/adapter/TestQuery_ResponseAdapter.kt.expected index 10994cad8aa..f41daa3f4e1 100644 --- a/libraries/apollo-compiler/src/test/graphql/com/example/fragment_used_twice/kotlin/responseBased/fragment_used_twice/adapter/TestQuery_ResponseAdapter.kt.expected +++ b/libraries/apollo-compiler/src/test/graphql/com/example/fragment_used_twice/kotlin/responseBased/fragment_used_twice/adapter/TestQuery_ResponseAdapter.kt.expected @@ -19,14 +19,13 @@ import com.example.fragment_used_twice.TestQuery import kotlin.Any import kotlin.String import kotlin.Suppress -import kotlin.Unit import kotlin.collections.List public object TestQuery_ResponseAdapter { public object Data : CompositeAdapter { public val RESPONSE_NAMES: List = listOf("hero") - public override fun fromJson(reader: JsonReader, adapterContext: CompositeAdapterContext): + override fun fromJson(reader: JsonReader, adapterContext: CompositeAdapterContext): TestQuery.Data { var _hero: TestQuery.Data.Hero? = null @@ -42,17 +41,17 @@ public object TestQuery_ResponseAdapter { ) } - public override fun toJson( + override fun toJson( writer: JsonWriter, `value`: TestQuery.Data, adapterContext: CompositeAdapterContext, - ): Unit { + ) { writer.name("hero") Hero.obj().nullable().toJson(writer, value.hero, adapterContext) } private object Hero : CompositeAdapter { - public override fun fromJson(reader: JsonReader, adapterContext: CompositeAdapterContext): + override fun fromJson(reader: JsonReader, adapterContext: CompositeAdapterContext): TestQuery.Data.Hero { val __typename = reader.readTypename() return when(__typename) { @@ -63,11 +62,11 @@ public object TestQuery_ResponseAdapter { } } - public override fun toJson( + override fun toJson( writer: JsonWriter, `value`: TestQuery.Data.Hero, adapterContext: CompositeAdapterContext, - ): Unit { + ) { when(value) { is TestQuery.Data.HumanHero -> HumanHero.toJson(writer, value, adapterContext) is TestQuery.Data.OtherHero -> OtherHero.toJson(writer, value, adapterContext) @@ -107,7 +106,7 @@ public object TestQuery_ResponseAdapter { writer: JsonWriter, `value`: TestQuery.Data.HumanHero, @Suppress("UNUSED_PARAMETER") adapterContext: CompositeAdapterContext, - ): Unit { + ) { writer.name("__typename") StringAdapter.toJson(writer, CustomScalarAdapters.Empty, value.__typename) @@ -151,7 +150,7 @@ public object TestQuery_ResponseAdapter { writer: JsonWriter, `value`: TestQuery.Data.OtherHero, @Suppress("UNUSED_PARAMETER") adapterContext: CompositeAdapterContext, - ): Unit { + ) { writer.name("__typename") StringAdapter.toJson(writer, CustomScalarAdapters.Empty, value.__typename) diff --git a/libraries/apollo-compiler/src/test/graphql/com/example/fragment_used_twice/kotlin/responseBased/fragment_used_twice/fragment/CharacterDetailsImpl.kt.expected b/libraries/apollo-compiler/src/test/graphql/com/example/fragment_used_twice/kotlin/responseBased/fragment_used_twice/fragment/CharacterDetailsImpl.kt.expected index 4aaba478e28..f80cf8e09fc 100644 --- a/libraries/apollo-compiler/src/test/graphql/com/example/fragment_used_twice/kotlin/responseBased/fragment_used_twice/fragment/CharacterDetailsImpl.kt.expected +++ b/libraries/apollo-compiler/src/test/graphql/com/example/fragment_used_twice/kotlin/responseBased/fragment_used_twice/fragment/CharacterDetailsImpl.kt.expected @@ -17,25 +17,23 @@ import kotlin.Any import kotlin.Boolean import kotlin.Int import kotlin.String -import kotlin.Unit public class CharacterDetailsImpl() : Fragment { - public override fun equals(other: Any?): Boolean = other != null && other::class == this::class + override fun equals(other: Any?): Boolean = other != null && other::class == this::class - public override fun hashCode(): Int = this::class.hashCode() + override fun hashCode(): Int = this::class.hashCode() - public override fun serializeVariables( + override fun serializeVariables( writer: JsonWriter, customScalarAdapters: CustomScalarAdapters, withBooleanDefaultValues: Boolean, - ): Unit { + ) { // This fragment doesn't have any variable } - public override fun adapter(): CompositeAdapter = - CharacterDetailsImpl_ResponseAdapter.Data.obj() + override fun adapter(): CompositeAdapter = CharacterDetailsImpl_ResponseAdapter.Data.obj() - public override fun rootField(): CompiledField = CompiledField.Builder( + override fun rootField(): CompiledField = CompiledField.Builder( name = "data", type = Character.type ) @@ -46,10 +44,10 @@ public class CharacterDetailsImpl() : Fragment { /** * The name of the character */ - public override val name: String, + override val name: String, /** * The date character was born. */ - public override val birthDate: Any, + override val birthDate: Any, ) : CharacterDetails, Fragment.Data } diff --git a/libraries/apollo-compiler/src/test/graphql/com/example/fragment_used_twice/kotlin/responseBased/fragment_used_twice/fragment/CharacterDetailsImpl_ResponseAdapter.kt.expected b/libraries/apollo-compiler/src/test/graphql/com/example/fragment_used_twice/kotlin/responseBased/fragment_used_twice/fragment/CharacterDetailsImpl_ResponseAdapter.kt.expected index 132708231fa..7280134dd45 100644 --- a/libraries/apollo-compiler/src/test/graphql/com/example/fragment_used_twice/kotlin/responseBased/fragment_used_twice/fragment/CharacterDetailsImpl_ResponseAdapter.kt.expected +++ b/libraries/apollo-compiler/src/test/graphql/com/example/fragment_used_twice/kotlin/responseBased/fragment_used_twice/fragment/CharacterDetailsImpl_ResponseAdapter.kt.expected @@ -14,14 +14,13 @@ import com.apollographql.apollo3.api.json.JsonReader import com.apollographql.apollo3.api.json.JsonWriter import kotlin.Any import kotlin.String -import kotlin.Unit import kotlin.collections.List public object CharacterDetailsImpl_ResponseAdapter { public object Data : CompositeAdapter { public val RESPONSE_NAMES: List = listOf("name", "birthDate") - public override fun fromJson(reader: JsonReader, adapterContext: CompositeAdapterContext): + override fun fromJson(reader: JsonReader, adapterContext: CompositeAdapterContext): CharacterDetailsImpl.Data { var _name: String? = null var _birthDate: Any? = null @@ -40,11 +39,11 @@ public object CharacterDetailsImpl_ResponseAdapter { ) } - public override fun toJson( + override fun toJson( writer: JsonWriter, `value`: CharacterDetailsImpl.Data, adapterContext: CompositeAdapterContext, - ): Unit { + ) { writer.name("name") StringAdapter.toJson(writer, CustomScalarAdapters.Empty, value.name) diff --git a/libraries/apollo-compiler/src/test/graphql/com/example/fragment_used_twice/kotlin/responseBased/fragment_used_twice/fragment/HeroDetails.kt.expected b/libraries/apollo-compiler/src/test/graphql/com/example/fragment_used_twice/kotlin/responseBased/fragment_used_twice/fragment/HeroDetails.kt.expected index 5d4810c6aac..e21dc188254 100644 --- a/libraries/apollo-compiler/src/test/graphql/com/example/fragment_used_twice/kotlin/responseBased/fragment_used_twice/fragment/HeroDetails.kt.expected +++ b/libraries/apollo-compiler/src/test/graphql/com/example/fragment_used_twice/kotlin/responseBased/fragment_used_twice/fragment/HeroDetails.kt.expected @@ -7,6 +7,7 @@ package com.example.fragment_used_twice.fragment import kotlin.Any import kotlin.String +import kotlin.Suppress public interface HeroDetails : CharacterDetails { public val __typename: String @@ -14,14 +15,15 @@ public interface HeroDetails : CharacterDetails { /** * The name of the character */ - public override val name: String + override val name: String /** * The date character was born. */ - public override val birthDate: Any + override val birthDate: Any public companion object { - public fun HeroDetails.characterDetails() = this as? CharacterDetails + @Suppress("USELESS_CAST") + public fun HeroDetails.characterDetails(): CharacterDetails? = this as? CharacterDetails } } diff --git a/libraries/apollo-compiler/src/test/graphql/com/example/fragment_used_twice/kotlin/responseBased/fragment_used_twice/fragment/HeroDetailsImpl.kt.expected b/libraries/apollo-compiler/src/test/graphql/com/example/fragment_used_twice/kotlin/responseBased/fragment_used_twice/fragment/HeroDetailsImpl.kt.expected index 91c0dfc6592..eba01df781b 100644 --- a/libraries/apollo-compiler/src/test/graphql/com/example/fragment_used_twice/kotlin/responseBased/fragment_used_twice/fragment/HeroDetailsImpl.kt.expected +++ b/libraries/apollo-compiler/src/test/graphql/com/example/fragment_used_twice/kotlin/responseBased/fragment_used_twice/fragment/HeroDetailsImpl.kt.expected @@ -17,24 +17,24 @@ import kotlin.Any import kotlin.Boolean import kotlin.Int import kotlin.String -import kotlin.Unit +import kotlin.Suppress public class HeroDetailsImpl() : Fragment { - public override fun equals(other: Any?): Boolean = other != null && other::class == this::class + override fun equals(other: Any?): Boolean = other != null && other::class == this::class - public override fun hashCode(): Int = this::class.hashCode() + override fun hashCode(): Int = this::class.hashCode() - public override fun serializeVariables( + override fun serializeVariables( writer: JsonWriter, customScalarAdapters: CustomScalarAdapters, withBooleanDefaultValues: Boolean, - ): Unit { + ) { // This fragment doesn't have any variable } - public override fun adapter(): CompositeAdapter = HeroDetailsImpl_ResponseAdapter.Data.obj() + override fun adapter(): CompositeAdapter = HeroDetailsImpl_ResponseAdapter.Data.obj() - public override fun rootField(): CompiledField = CompiledField.Builder( + override fun rootField(): CompiledField = CompiledField.Builder( name = "data", type = Character.type ) @@ -42,18 +42,19 @@ public class HeroDetailsImpl() : Fragment { .build() public data class Data( - public override val __typename: String, + override val __typename: String, /** * The name of the character */ - public override val name: String, + override val name: String, /** * The date character was born. */ - public override val birthDate: Any, + override val birthDate: Any, ) : CharacterDetails, HeroDetails, Fragment.Data { public companion object { - public fun Data.characterDetails() = this as? CharacterDetails + @Suppress("USELESS_CAST") + public fun Data.characterDetails(): CharacterDetails? = this as? CharacterDetails } } } diff --git a/libraries/apollo-compiler/src/test/graphql/com/example/fragment_used_twice/kotlin/responseBased/fragment_used_twice/fragment/HeroDetailsImpl_ResponseAdapter.kt.expected b/libraries/apollo-compiler/src/test/graphql/com/example/fragment_used_twice/kotlin/responseBased/fragment_used_twice/fragment/HeroDetailsImpl_ResponseAdapter.kt.expected index 99f053144d1..f5fa2f4b918 100644 --- a/libraries/apollo-compiler/src/test/graphql/com/example/fragment_used_twice/kotlin/responseBased/fragment_used_twice/fragment/HeroDetailsImpl_ResponseAdapter.kt.expected +++ b/libraries/apollo-compiler/src/test/graphql/com/example/fragment_used_twice/kotlin/responseBased/fragment_used_twice/fragment/HeroDetailsImpl_ResponseAdapter.kt.expected @@ -14,14 +14,13 @@ import com.apollographql.apollo3.api.json.JsonReader import com.apollographql.apollo3.api.json.JsonWriter import kotlin.Any import kotlin.String -import kotlin.Unit import kotlin.collections.List public object HeroDetailsImpl_ResponseAdapter { public object Data : CompositeAdapter { public val RESPONSE_NAMES: List = listOf("__typename", "name", "birthDate") - public override fun fromJson(reader: JsonReader, adapterContext: CompositeAdapterContext): + override fun fromJson(reader: JsonReader, adapterContext: CompositeAdapterContext): HeroDetailsImpl.Data { var __typename: String? = null var _name: String? = null @@ -43,11 +42,11 @@ public object HeroDetailsImpl_ResponseAdapter { ) } - public override fun toJson( + override fun toJson( writer: JsonWriter, `value`: HeroDetailsImpl.Data, adapterContext: CompositeAdapterContext, - ): Unit { + ) { writer.name("__typename") StringAdapter.toJson(writer, CustomScalarAdapters.Empty, value.__typename) diff --git a/libraries/apollo-compiler/src/test/graphql/com/example/fragment_used_twice/kotlin/responseBased/fragment_used_twice/fragment/HumanDetails.kt.expected b/libraries/apollo-compiler/src/test/graphql/com/example/fragment_used_twice/kotlin/responseBased/fragment_used_twice/fragment/HumanDetails.kt.expected index a9a101d1ba1..46fcce22ff1 100644 --- a/libraries/apollo-compiler/src/test/graphql/com/example/fragment_used_twice/kotlin/responseBased/fragment_used_twice/fragment/HumanDetails.kt.expected +++ b/libraries/apollo-compiler/src/test/graphql/com/example/fragment_used_twice/kotlin/responseBased/fragment_used_twice/fragment/HumanDetails.kt.expected @@ -7,6 +7,7 @@ package com.example.fragment_used_twice.fragment import kotlin.Any import kotlin.String +import kotlin.Suppress public interface HumanDetails { public val __typename: String @@ -17,23 +18,25 @@ public interface HumanDetails { public val name: String public companion object { - public fun HumanDetails.characterDetails() = this as? CharacterDetails + @Suppress("USELESS_CAST") + public fun HumanDetails.characterDetails(): CharacterDetails? = this as? CharacterDetails - public fun HumanDetails.asCharacter() = this as? CharacterHumanDetails + @Suppress("USELESS_CAST") + public fun HumanDetails.asCharacter(): CharacterHumanDetails? = this as? CharacterHumanDetails } } public interface CharacterHumanDetails : HumanDetails, CharacterDetails { - public override val __typename: String + override val __typename: String /** * Merged field with multiple descriptions. See parentTypes: 'Human, Character' for more * information */ - public override val name: String + override val name: String /** * The date character was born. */ - public override val birthDate: Any + override val birthDate: Any } diff --git a/libraries/apollo-compiler/src/test/graphql/com/example/fragment_used_twice/kotlin/responseBased/fragment_used_twice/fragment/HumanDetailsImpl.kt.expected b/libraries/apollo-compiler/src/test/graphql/com/example/fragment_used_twice/kotlin/responseBased/fragment_used_twice/fragment/HumanDetailsImpl.kt.expected index 2108af3730c..da46109f494 100644 --- a/libraries/apollo-compiler/src/test/graphql/com/example/fragment_used_twice/kotlin/responseBased/fragment_used_twice/fragment/HumanDetailsImpl.kt.expected +++ b/libraries/apollo-compiler/src/test/graphql/com/example/fragment_used_twice/kotlin/responseBased/fragment_used_twice/fragment/HumanDetailsImpl.kt.expected @@ -17,25 +17,24 @@ import kotlin.Any import kotlin.Boolean import kotlin.Int import kotlin.String -import kotlin.Unit +import kotlin.Suppress public class HumanDetailsImpl() : Fragment { - public override fun equals(other: Any?): Boolean = other != null && other::class == this::class + override fun equals(other: Any?): Boolean = other != null && other::class == this::class - public override fun hashCode(): Int = this::class.hashCode() + override fun hashCode(): Int = this::class.hashCode() - public override fun serializeVariables( + override fun serializeVariables( writer: JsonWriter, customScalarAdapters: CustomScalarAdapters, withBooleanDefaultValues: Boolean, - ): Unit { + ) { // This fragment doesn't have any variable } - public override fun adapter(): CompositeAdapter = - HumanDetailsImpl_ResponseAdapter.Data.obj() + override fun adapter(): CompositeAdapter = HumanDetailsImpl_ResponseAdapter.Data.obj() - public override fun rootField(): CompiledField = CompiledField.Builder( + override fun rootField(): CompiledField = CompiledField.Builder( name = "data", type = Human.type ) @@ -43,38 +42,40 @@ public class HumanDetailsImpl() : Fragment { .build() public sealed interface Data : HumanDetails, Fragment.Data { - public override val __typename: String + override val __typename: String /** * What this human calls themselves */ - public override val name: String + override val name: String public companion object { - public fun Data.characterDetails() = this as? CharacterDetails + @Suppress("USELESS_CAST") + public fun Data.characterDetails(): CharacterDetails? = this as? CharacterDetails - public fun Data.asCharacter() = this as? CharacterData + @Suppress("USELESS_CAST") + public fun Data.asCharacter(): CharacterData? = this as? CharacterData } } public data class CharacterData( - public override val __typename: String, + override val __typename: String, /** * Merged field with multiple descriptions. See parentTypes: 'Human, Character' for more * information */ - public override val name: String, + override val name: String, /** * The date character was born. */ - public override val birthDate: Any, + override val birthDate: Any, ) : Data, CharacterDetails, CharacterHumanDetails public data class OtherData( - public override val __typename: String, + override val __typename: String, /** * What this human calls themselves */ - public override val name: String, + override val name: String, ) : Data, HumanDetails } diff --git a/libraries/apollo-compiler/src/test/graphql/com/example/fragment_used_twice/kotlin/responseBased/fragment_used_twice/fragment/HumanDetailsImpl_ResponseAdapter.kt.expected b/libraries/apollo-compiler/src/test/graphql/com/example/fragment_used_twice/kotlin/responseBased/fragment_used_twice/fragment/HumanDetailsImpl_ResponseAdapter.kt.expected index c16e44a00d4..8797fe0e963 100644 --- a/libraries/apollo-compiler/src/test/graphql/com/example/fragment_used_twice/kotlin/responseBased/fragment_used_twice/fragment/HumanDetailsImpl_ResponseAdapter.kt.expected +++ b/libraries/apollo-compiler/src/test/graphql/com/example/fragment_used_twice/kotlin/responseBased/fragment_used_twice/fragment/HumanDetailsImpl_ResponseAdapter.kt.expected @@ -16,12 +16,11 @@ import com.apollographql.apollo3.api.json.readTypename import kotlin.Any import kotlin.String import kotlin.Suppress -import kotlin.Unit import kotlin.collections.List public object HumanDetailsImpl_ResponseAdapter { public object Data : CompositeAdapter { - public override fun fromJson(reader: JsonReader, adapterContext: CompositeAdapterContext): + override fun fromJson(reader: JsonReader, adapterContext: CompositeAdapterContext): HumanDetailsImpl.Data { val __typename = reader.readTypename() return when(__typename) { @@ -32,11 +31,11 @@ public object HumanDetailsImpl_ResponseAdapter { } } - public override fun toJson( + override fun toJson( writer: JsonWriter, `value`: HumanDetailsImpl.Data, adapterContext: CompositeAdapterContext, - ): Unit { + ) { when(value) { is HumanDetailsImpl.CharacterData -> CharacterData.toJson(writer, value, adapterContext) is HumanDetailsImpl.OtherData -> OtherData.toJson(writer, value, adapterContext) @@ -76,7 +75,7 @@ public object HumanDetailsImpl_ResponseAdapter { writer: JsonWriter, `value`: HumanDetailsImpl.CharacterData, @Suppress("UNUSED_PARAMETER") adapterContext: CompositeAdapterContext, - ): Unit { + ) { writer.name("__typename") StringAdapter.toJson(writer, CustomScalarAdapters.Empty, value.__typename) @@ -117,7 +116,7 @@ public object HumanDetailsImpl_ResponseAdapter { writer: JsonWriter, `value`: HumanDetailsImpl.OtherData, @Suppress("UNUSED_PARAMETER") adapterContext: CompositeAdapterContext, - ): Unit { + ) { writer.name("__typename") StringAdapter.toJson(writer, CustomScalarAdapters.Empty, value.__typename) diff --git a/libraries/apollo-compiler/src/test/graphql/com/example/fragment_with_inline_fragment/kotlin/operationBased/fragment_with_inline_fragment/TestQuery.kt.expected b/libraries/apollo-compiler/src/test/graphql/com/example/fragment_with_inline_fragment/kotlin/operationBased/fragment_with_inline_fragment/TestQuery.kt.expected index 62e1c4c9eff..08daa9049db 100644 --- a/libraries/apollo-compiler/src/test/graphql/com/example/fragment_with_inline_fragment/kotlin/operationBased/fragment_with_inline_fragment/TestQuery.kt.expected +++ b/libraries/apollo-compiler/src/test/graphql/com/example/fragment_with_inline_fragment/kotlin/operationBased/fragment_with_inline_fragment/TestQuery.kt.expected @@ -20,33 +20,33 @@ import kotlin.Any import kotlin.Boolean import kotlin.Int import kotlin.String -import kotlin.Unit import kotlin.collections.List +import com.example.fragment_with_inline_fragment.type.Query as CompiledQuery public class TestQuery() : Query { - public override fun equals(other: Any?): Boolean = other != null && other::class == this::class + override fun equals(other: Any?): Boolean = other != null && other::class == this::class - public override fun hashCode(): Int = this::class.hashCode() + override fun hashCode(): Int = this::class.hashCode() - public override fun id(): String = OPERATION_ID + override fun id(): String = OPERATION_ID - public override fun document(): String = OPERATION_DOCUMENT + override fun document(): String = OPERATION_DOCUMENT - public override fun name(): String = OPERATION_NAME + override fun name(): String = OPERATION_NAME - public override fun serializeVariables( + override fun serializeVariables( writer: JsonWriter, customScalarAdapters: CustomScalarAdapters, withBooleanDefaultValues: Boolean, - ): Unit { + ) { // This operation doesn't have any variable } - public override fun adapter(): CompositeAdapter = TestQuery_ResponseAdapter.Data.obj() + override fun adapter(): CompositeAdapter = TestQuery_ResponseAdapter.Data.obj() - public override fun rootField(): CompiledField = CompiledField.Builder( + override fun rootField(): CompiledField = CompiledField.Builder( name = "data", - type = com.example.fragment_with_inline_fragment.type.Query.type + type = CompiledQuery.type ) .selections(selections = TestQuerySelections.__root) .build() diff --git a/libraries/apollo-compiler/src/test/graphql/com/example/fragment_with_inline_fragment/kotlin/operationBased/fragment_with_inline_fragment/adapter/TestQuery_ResponseAdapter.kt.expected b/libraries/apollo-compiler/src/test/graphql/com/example/fragment_with_inline_fragment/kotlin/operationBased/fragment_with_inline_fragment/adapter/TestQuery_ResponseAdapter.kt.expected index 731b8b9aec0..72c2e2fa836 100644 --- a/libraries/apollo-compiler/src/test/graphql/com/example/fragment_with_inline_fragment/kotlin/operationBased/fragment_with_inline_fragment/adapter/TestQuery_ResponseAdapter.kt.expected +++ b/libraries/apollo-compiler/src/test/graphql/com/example/fragment_with_inline_fragment/kotlin/operationBased/fragment_with_inline_fragment/adapter/TestQuery_ResponseAdapter.kt.expected @@ -18,14 +18,13 @@ import com.example.fragment_with_inline_fragment.TestQuery import com.example.fragment_with_inline_fragment.type.Episode import com.example.fragment_with_inline_fragment.type.adapter.Episode_ResponseAdapter import kotlin.String -import kotlin.Unit import kotlin.collections.List public object TestQuery_ResponseAdapter { public object Data : CompositeAdapter { public val RESPONSE_NAMES: List = listOf("hero") - public override fun fromJson(reader: JsonReader, adapterContext: CompositeAdapterContext): + override fun fromJson(reader: JsonReader, adapterContext: CompositeAdapterContext): TestQuery.Data { var _hero: TestQuery.Data.Hero? = null @@ -41,11 +40,11 @@ public object TestQuery_ResponseAdapter { ) } - public override fun toJson( + override fun toJson( writer: JsonWriter, `value`: TestQuery.Data, adapterContext: CompositeAdapterContext, - ): Unit { + ) { writer.name("hero") Hero.obj(true).nullable().toJson(writer, value.hero, adapterContext) } @@ -53,7 +52,7 @@ public object TestQuery_ResponseAdapter { private object Hero : CompositeAdapter { public val RESPONSE_NAMES: List = listOf("__typename", "name", "appearsIn") - public override fun fromJson(reader: JsonReader, adapterContext: CompositeAdapterContext): + override fun fromJson(reader: JsonReader, adapterContext: CompositeAdapterContext): TestQuery.Data.Hero { var __typename: String? = null var _name: String? = null @@ -80,11 +79,11 @@ public object TestQuery_ResponseAdapter { ) } - public override fun toJson( + override fun toJson( writer: JsonWriter, `value`: TestQuery.Data.Hero, adapterContext: CompositeAdapterContext, - ): Unit { + ) { writer.name("__typename") StringAdapter.toJson(writer, CustomScalarAdapters.Empty, value.__typename) diff --git a/libraries/apollo-compiler/src/test/graphql/com/example/fragment_with_inline_fragment/kotlin/operationBased/fragment_with_inline_fragment/fragment/DroidDetailsImpl.kt.expected b/libraries/apollo-compiler/src/test/graphql/com/example/fragment_with_inline_fragment/kotlin/operationBased/fragment_with_inline_fragment/fragment/DroidDetailsImpl.kt.expected index 8865053d252..2d289852397 100644 --- a/libraries/apollo-compiler/src/test/graphql/com/example/fragment_with_inline_fragment/kotlin/operationBased/fragment_with_inline_fragment/fragment/DroidDetailsImpl.kt.expected +++ b/libraries/apollo-compiler/src/test/graphql/com/example/fragment_with_inline_fragment/kotlin/operationBased/fragment_with_inline_fragment/fragment/DroidDetailsImpl.kt.expected @@ -16,25 +16,24 @@ import com.example.fragment_with_inline_fragment.type.Droid import kotlin.Any import kotlin.Boolean import kotlin.Int -import kotlin.Unit public class DroidDetailsImpl() : Fragment { - public override fun equals(other: Any?): Boolean = other != null && other::class == this::class + override fun equals(other: Any?): Boolean = other != null && other::class == this::class - public override fun hashCode(): Int = this::class.hashCode() + override fun hashCode(): Int = this::class.hashCode() - public override fun serializeVariables( + override fun serializeVariables( writer: JsonWriter, customScalarAdapters: CustomScalarAdapters, withBooleanDefaultValues: Boolean, - ): Unit { + ) { // This fragment doesn't have any variable } - public override fun adapter(): CompositeAdapter = + override fun adapter(): CompositeAdapter = DroidDetailsImpl_ResponseAdapter.DroidDetails.obj() - public override fun rootField(): CompiledField = CompiledField.Builder( + override fun rootField(): CompiledField = CompiledField.Builder( name = "data", type = Droid.type ) diff --git a/libraries/apollo-compiler/src/test/graphql/com/example/fragment_with_inline_fragment/kotlin/operationBased/fragment_with_inline_fragment/fragment/DroidDetailsImpl_ResponseAdapter.kt.expected b/libraries/apollo-compiler/src/test/graphql/com/example/fragment_with_inline_fragment/kotlin/operationBased/fragment_with_inline_fragment/fragment/DroidDetailsImpl_ResponseAdapter.kt.expected index bbad96df9a8..47cc8d1cc6f 100644 --- a/libraries/apollo-compiler/src/test/graphql/com/example/fragment_with_inline_fragment/kotlin/operationBased/fragment_with_inline_fragment/fragment/DroidDetailsImpl_ResponseAdapter.kt.expected +++ b/libraries/apollo-compiler/src/test/graphql/com/example/fragment_with_inline_fragment/kotlin/operationBased/fragment_with_inline_fragment/fragment/DroidDetailsImpl_ResponseAdapter.kt.expected @@ -13,7 +13,6 @@ import com.apollographql.apollo3.api.StringAdapter import com.apollographql.apollo3.api.json.JsonReader import com.apollographql.apollo3.api.json.JsonWriter import kotlin.String -import kotlin.Unit import kotlin.collections.List public object DroidDetailsImpl_ResponseAdapter { @@ -21,7 +20,7 @@ public object DroidDetailsImpl_ResponseAdapter { CompositeAdapter { public val RESPONSE_NAMES: List = listOf("name", "primaryFunction") - public override fun fromJson(reader: JsonReader, adapterContext: CompositeAdapterContext): + override fun fromJson(reader: JsonReader, adapterContext: CompositeAdapterContext): com.example.fragment_with_inline_fragment.fragment.DroidDetails { var _name: String? = null var _primaryFunction: String? = null @@ -40,11 +39,11 @@ public object DroidDetailsImpl_ResponseAdapter { ) } - public override fun toJson( + override fun toJson( writer: JsonWriter, `value`: com.example.fragment_with_inline_fragment.fragment.DroidDetails, adapterContext: CompositeAdapterContext, - ): Unit { + ) { writer.name("name") StringAdapter.toJson(writer, CustomScalarAdapters.Empty, value.name) diff --git a/libraries/apollo-compiler/src/test/graphql/com/example/fragment_with_inline_fragment/kotlin/operationBased/fragment_with_inline_fragment/fragment/HeroDetailsImpl.kt.expected b/libraries/apollo-compiler/src/test/graphql/com/example/fragment_with_inline_fragment/kotlin/operationBased/fragment_with_inline_fragment/fragment/HeroDetailsImpl.kt.expected index 734a943bbad..8d19e8222c8 100644 --- a/libraries/apollo-compiler/src/test/graphql/com/example/fragment_with_inline_fragment/kotlin/operationBased/fragment_with_inline_fragment/fragment/HeroDetailsImpl.kt.expected +++ b/libraries/apollo-compiler/src/test/graphql/com/example/fragment_with_inline_fragment/kotlin/operationBased/fragment_with_inline_fragment/fragment/HeroDetailsImpl.kt.expected @@ -16,25 +16,24 @@ import com.example.fragment_with_inline_fragment.type.Character import kotlin.Any import kotlin.Boolean import kotlin.Int -import kotlin.Unit public class HeroDetailsImpl() : Fragment { - public override fun equals(other: Any?): Boolean = other != null && other::class == this::class + override fun equals(other: Any?): Boolean = other != null && other::class == this::class - public override fun hashCode(): Int = this::class.hashCode() + override fun hashCode(): Int = this::class.hashCode() - public override fun serializeVariables( + override fun serializeVariables( writer: JsonWriter, customScalarAdapters: CustomScalarAdapters, withBooleanDefaultValues: Boolean, - ): Unit { + ) { // This fragment doesn't have any variable } - public override fun adapter(): CompositeAdapter = + override fun adapter(): CompositeAdapter = HeroDetailsImpl_ResponseAdapter.HeroDetails.obj(true) - public override fun rootField(): CompiledField = CompiledField.Builder( + override fun rootField(): CompiledField = CompiledField.Builder( name = "data", type = Character.type ) diff --git a/libraries/apollo-compiler/src/test/graphql/com/example/fragment_with_inline_fragment/kotlin/operationBased/fragment_with_inline_fragment/fragment/HeroDetailsImpl_ResponseAdapter.kt.expected b/libraries/apollo-compiler/src/test/graphql/com/example/fragment_with_inline_fragment/kotlin/operationBased/fragment_with_inline_fragment/fragment/HeroDetailsImpl_ResponseAdapter.kt.expected index ed5fe63fe2c..e1143cb4337 100644 --- a/libraries/apollo-compiler/src/test/graphql/com/example/fragment_with_inline_fragment/kotlin/operationBased/fragment_with_inline_fragment/fragment/HeroDetailsImpl_ResponseAdapter.kt.expected +++ b/libraries/apollo-compiler/src/test/graphql/com/example/fragment_with_inline_fragment/kotlin/operationBased/fragment_with_inline_fragment/fragment/HeroDetailsImpl_ResponseAdapter.kt.expected @@ -19,7 +19,6 @@ import com.apollographql.apollo3.api.obj import com.apollographql.apollo3.api.possibleTypes import kotlin.Int import kotlin.String -import kotlin.Unit import kotlin.collections.List public object HeroDetailsImpl_ResponseAdapter { @@ -27,7 +26,7 @@ public object HeroDetailsImpl_ResponseAdapter { CompositeAdapter { public val RESPONSE_NAMES: List = listOf("__typename", "name", "friendsConnection") - public override fun fromJson(reader: JsonReader, adapterContext: CompositeAdapterContext): + override fun fromJson(reader: JsonReader, adapterContext: CompositeAdapterContext): com.example.fragment_with_inline_fragment.fragment.HeroDetails { var __typename: String? = null var _name: String? = null @@ -69,11 +68,11 @@ public object HeroDetailsImpl_ResponseAdapter { ) } - public override fun toJson( + override fun toJson( writer: JsonWriter, `value`: com.example.fragment_with_inline_fragment.fragment.HeroDetails, adapterContext: CompositeAdapterContext, - ): Unit { + ) { writer.name("__typename") StringAdapter.toJson(writer, CustomScalarAdapters.Empty, value.__typename) @@ -99,7 +98,7 @@ public object HeroDetailsImpl_ResponseAdapter { { public val RESPONSE_NAMES: List = listOf("totalCount", "edges") - public override fun fromJson(reader: JsonReader, adapterContext: CompositeAdapterContext): + override fun fromJson(reader: JsonReader, adapterContext: CompositeAdapterContext): com.example.fragment_with_inline_fragment.fragment.HeroDetails.FriendsConnection { var _totalCount: Int? = null var _edges: List? = null @@ -118,11 +117,11 @@ public object HeroDetailsImpl_ResponseAdapter { ) } - public override fun toJson( + override fun toJson( writer: JsonWriter, `value`: com.example.fragment_with_inline_fragment.fragment.HeroDetails.FriendsConnection, adapterContext: CompositeAdapterContext, - ): Unit { + ) { writer.name("totalCount") NullableIntAdapter.toJson(writer, CustomScalarAdapters.Empty, value.totalCount) @@ -135,7 +134,7 @@ public object HeroDetailsImpl_ResponseAdapter { { public val RESPONSE_NAMES: List = listOf("node") - public override fun fromJson(reader: JsonReader, adapterContext: CompositeAdapterContext): + override fun fromJson(reader: JsonReader, adapterContext: CompositeAdapterContext): com.example.fragment_with_inline_fragment.fragment.HeroDetails.FriendsConnection.Edge { var _node: com.example.fragment_with_inline_fragment.fragment.HeroDetails.FriendsConnection.Edge.Node? = null @@ -151,11 +150,11 @@ public object HeroDetailsImpl_ResponseAdapter { ) } - public override fun toJson( + override fun toJson( writer: JsonWriter, `value`: com.example.fragment_with_inline_fragment.fragment.HeroDetails.FriendsConnection.Edge, adapterContext: CompositeAdapterContext, - ): Unit { + ) { writer.name("node") Node.obj().nullable().toJson(writer, value.node, adapterContext) } @@ -165,7 +164,7 @@ public object HeroDetailsImpl_ResponseAdapter { { public val RESPONSE_NAMES: List = listOf("name") - public override fun fromJson(reader: JsonReader, adapterContext: CompositeAdapterContext): + override fun fromJson(reader: JsonReader, adapterContext: CompositeAdapterContext): com.example.fragment_with_inline_fragment.fragment.HeroDetails.FriendsConnection.Edge.Node { var _name: String? = null @@ -181,11 +180,11 @@ public object HeroDetailsImpl_ResponseAdapter { ) } - public override fun toJson( + override fun toJson( writer: JsonWriter, `value`: com.example.fragment_with_inline_fragment.fragment.HeroDetails.FriendsConnection.Edge.Node, adapterContext: CompositeAdapterContext, - ): Unit { + ) { writer.name("name") StringAdapter.toJson(writer, CustomScalarAdapters.Empty, value.name) } @@ -197,7 +196,7 @@ public object HeroDetailsImpl_ResponseAdapter { CompositeAdapter { public val RESPONSE_NAMES: List = listOf("__typename") - public override fun fromJson(reader: JsonReader, adapterContext: CompositeAdapterContext): + override fun fromJson(reader: JsonReader, adapterContext: CompositeAdapterContext): com.example.fragment_with_inline_fragment.fragment.HeroDetails.OnDroid { var __typename: String? = null @@ -218,11 +217,11 @@ public object HeroDetailsImpl_ResponseAdapter { ) } - public override fun toJson( + override fun toJson( writer: JsonWriter, `value`: com.example.fragment_with_inline_fragment.fragment.HeroDetails.OnDroid, adapterContext: CompositeAdapterContext, - ): Unit { + ) { writer.name("__typename") StringAdapter.toJson(writer, CustomScalarAdapters.Empty, value.__typename) diff --git a/libraries/apollo-compiler/src/test/graphql/com/example/fragment_with_inline_fragment/kotlin/operationBased/fragment_with_inline_fragment/fragment/HumanDetailsImpl.kt.expected b/libraries/apollo-compiler/src/test/graphql/com/example/fragment_with_inline_fragment/kotlin/operationBased/fragment_with_inline_fragment/fragment/HumanDetailsImpl.kt.expected index f28e39f7d26..c7631672587 100644 --- a/libraries/apollo-compiler/src/test/graphql/com/example/fragment_with_inline_fragment/kotlin/operationBased/fragment_with_inline_fragment/fragment/HumanDetailsImpl.kt.expected +++ b/libraries/apollo-compiler/src/test/graphql/com/example/fragment_with_inline_fragment/kotlin/operationBased/fragment_with_inline_fragment/fragment/HumanDetailsImpl.kt.expected @@ -16,25 +16,24 @@ import com.example.fragment_with_inline_fragment.type.Human import kotlin.Any import kotlin.Boolean import kotlin.Int -import kotlin.Unit public class HumanDetailsImpl() : Fragment { - public override fun equals(other: Any?): Boolean = other != null && other::class == this::class + override fun equals(other: Any?): Boolean = other != null && other::class == this::class - public override fun hashCode(): Int = this::class.hashCode() + override fun hashCode(): Int = this::class.hashCode() - public override fun serializeVariables( + override fun serializeVariables( writer: JsonWriter, customScalarAdapters: CustomScalarAdapters, withBooleanDefaultValues: Boolean, - ): Unit { + ) { // This fragment doesn't have any variable } - public override fun adapter(): CompositeAdapter = + override fun adapter(): CompositeAdapter = HumanDetailsImpl_ResponseAdapter.HumanDetails.obj() - public override fun rootField(): CompiledField = CompiledField.Builder( + override fun rootField(): CompiledField = CompiledField.Builder( name = "data", type = Human.type ) diff --git a/libraries/apollo-compiler/src/test/graphql/com/example/fragment_with_inline_fragment/kotlin/operationBased/fragment_with_inline_fragment/fragment/HumanDetailsImpl_ResponseAdapter.kt.expected b/libraries/apollo-compiler/src/test/graphql/com/example/fragment_with_inline_fragment/kotlin/operationBased/fragment_with_inline_fragment/fragment/HumanDetailsImpl_ResponseAdapter.kt.expected index 831541bf059..1ec2cd880f8 100644 --- a/libraries/apollo-compiler/src/test/graphql/com/example/fragment_with_inline_fragment/kotlin/operationBased/fragment_with_inline_fragment/fragment/HumanDetailsImpl_ResponseAdapter.kt.expected +++ b/libraries/apollo-compiler/src/test/graphql/com/example/fragment_with_inline_fragment/kotlin/operationBased/fragment_with_inline_fragment/fragment/HumanDetailsImpl_ResponseAdapter.kt.expected @@ -12,7 +12,6 @@ import com.apollographql.apollo3.api.StringAdapter import com.apollographql.apollo3.api.json.JsonReader import com.apollographql.apollo3.api.json.JsonWriter import kotlin.String -import kotlin.Unit import kotlin.collections.List public object HumanDetailsImpl_ResponseAdapter { @@ -20,7 +19,7 @@ public object HumanDetailsImpl_ResponseAdapter { CompositeAdapter { public val RESPONSE_NAMES: List = listOf("name") - public override fun fromJson(reader: JsonReader, adapterContext: CompositeAdapterContext): + override fun fromJson(reader: JsonReader, adapterContext: CompositeAdapterContext): com.example.fragment_with_inline_fragment.fragment.HumanDetails { var _name: String? = null @@ -36,11 +35,11 @@ public object HumanDetailsImpl_ResponseAdapter { ) } - public override fun toJson( + override fun toJson( writer: JsonWriter, `value`: com.example.fragment_with_inline_fragment.fragment.HumanDetails, adapterContext: CompositeAdapterContext, - ): Unit { + ) { writer.name("name") StringAdapter.toJson(writer, CustomScalarAdapters.Empty, value.name) } diff --git a/libraries/apollo-compiler/src/test/graphql/com/example/fragment_with_inline_fragment/kotlin/operationBased/fragment_with_inline_fragment/type/adapter/Episode_ResponseAdapter.kt.expected b/libraries/apollo-compiler/src/test/graphql/com/example/fragment_with_inline_fragment/kotlin/operationBased/fragment_with_inline_fragment/type/adapter/Episode_ResponseAdapter.kt.expected index 9b50b18d6c8..5bf34cfdf86 100644 --- a/libraries/apollo-compiler/src/test/graphql/com/example/fragment_with_inline_fragment/kotlin/operationBased/fragment_with_inline_fragment/type/adapter/Episode_ResponseAdapter.kt.expected +++ b/libraries/apollo-compiler/src/test/graphql/com/example/fragment_with_inline_fragment/kotlin/operationBased/fragment_with_inline_fragment/type/adapter/Episode_ResponseAdapter.kt.expected @@ -10,20 +10,18 @@ import com.apollographql.apollo3.api.CustomScalarAdapters import com.apollographql.apollo3.api.json.JsonReader import com.apollographql.apollo3.api.json.JsonWriter import com.example.fragment_with_inline_fragment.type.Episode -import kotlin.Unit public object Episode_ResponseAdapter : Adapter { - public override fun fromJson(reader: JsonReader, customScalarAdapters: CustomScalarAdapters): - Episode { + override fun fromJson(reader: JsonReader, customScalarAdapters: CustomScalarAdapters): Episode { val rawValue = reader.nextString()!! return Episode.safeValueOf(rawValue) } - public override fun toJson( + override fun toJson( writer: JsonWriter, customScalarAdapters: CustomScalarAdapters, `value`: Episode, - ): Unit { + ) { writer.value(value.rawValue) } } diff --git a/libraries/apollo-compiler/src/test/graphql/com/example/fragment_with_inline_fragment/kotlin/responseBased/fragment_with_inline_fragment/TestQuery.kt.expected b/libraries/apollo-compiler/src/test/graphql/com/example/fragment_with_inline_fragment/kotlin/responseBased/fragment_with_inline_fragment/TestQuery.kt.expected index 0fffe9a8349..02b5fc7f7f5 100644 --- a/libraries/apollo-compiler/src/test/graphql/com/example/fragment_with_inline_fragment/kotlin/responseBased/fragment_with_inline_fragment/TestQuery.kt.expected +++ b/libraries/apollo-compiler/src/test/graphql/com/example/fragment_with_inline_fragment/kotlin/responseBased/fragment_with_inline_fragment/TestQuery.kt.expected @@ -22,33 +22,34 @@ import kotlin.Any import kotlin.Boolean import kotlin.Int import kotlin.String -import kotlin.Unit +import kotlin.Suppress import kotlin.collections.List +import com.example.fragment_with_inline_fragment.type.Query as CompiledQuery public class TestQuery() : Query { - public override fun equals(other: Any?): Boolean = other != null && other::class == this::class + override fun equals(other: Any?): Boolean = other != null && other::class == this::class - public override fun hashCode(): Int = this::class.hashCode() + override fun hashCode(): Int = this::class.hashCode() - public override fun id(): String = OPERATION_ID + override fun id(): String = OPERATION_ID - public override fun document(): String = OPERATION_DOCUMENT + override fun document(): String = OPERATION_DOCUMENT - public override fun name(): String = OPERATION_NAME + override fun name(): String = OPERATION_NAME - public override fun serializeVariables( + override fun serializeVariables( writer: JsonWriter, customScalarAdapters: CustomScalarAdapters, withBooleanDefaultValues: Boolean, - ): Unit { + ) { // This operation doesn't have any variable } - public override fun adapter(): CompositeAdapter = TestQuery_ResponseAdapter.Data.obj() + override fun adapter(): CompositeAdapter = TestQuery_ResponseAdapter.Data.obj() - public override fun rootField(): CompiledField = CompiledField.Builder( + override fun rootField(): CompiledField = CompiledField.Builder( name = "data", - type = com.example.fragment_with_inline_fragment.type.Query.type + type = CompiledQuery.type ) .selections(selections = TestQuerySelections.__root) .build() @@ -58,17 +59,17 @@ public class TestQuery() : Query { public val hero: Hero?, ) : Query.Data { public sealed interface Hero : HeroDetails { - public override val __typename: String + override val __typename: String /** * The name of the character */ - public override val name: String + override val name: String /** * The friends of the character exposed as a connection with edges */ - public override val friendsConnection: FriendsConnection + override val friendsConnection: FriendsConnection /** * The movies this character appears in @@ -79,52 +80,55 @@ public class TestQuery() : Query { /** * The total number of friends */ - public override val totalCount: Int? + override val totalCount: Int? /** * The edges for each of the character's friends. */ - public override val edges: List? + override val edges: List? public sealed interface Edge : HeroDetails.FriendsConnection.Edge { /** * The character represented by this friendship edge */ - public override val node: Node? + override val node: Node? public sealed interface Node : HeroDetails.FriendsConnection.Edge.Node { /** * The name of the character */ - public override val name: String + override val name: String } } } public companion object { - public fun Hero.heroDetails() = this as? HeroDetails + @Suppress("USELESS_CAST") + public fun Hero.heroDetails(): HeroDetails? = this as? HeroDetails - public fun Hero.asHuman() = this as? HumanHero + @Suppress("USELESS_CAST") + public fun Hero.asHuman(): HumanHero? = this as? HumanHero - public fun Hero.asDroid() = this as? DroidHero + @Suppress("USELESS_CAST") + public fun Hero.asDroid(): DroidHero? = this as? DroidHero } } public data class HumanHero( - public override val __typename: String, + override val __typename: String, /** * Merged field with multiple descriptions. See parentTypes: 'Character, Human' for more * information */ - public override val name: String, + override val name: String, /** * The friends of the character exposed as a connection with edges */ - public override val friendsConnection: FriendsConnection, + override val friendsConnection: FriendsConnection, /** * The movies this character appears in */ - public override val appearsIn: List, + override val appearsIn: List, ) : Hero, HumanHeroDetails { public fun appearsInFilterNotNull(): List = appearsIn.filterNotNull() @@ -132,11 +136,11 @@ public class TestQuery() : Query { /** * The total number of friends */ - public override val totalCount: Int?, + override val totalCount: Int?, /** * The edges for each of the character's friends. */ - public override val edges: List?, + override val edges: List?, ) : Hero.FriendsConnection, HumanHeroDetails.FriendsConnection { public fun edgesFilterNotNull(): List? = edges?.filterNotNull() @@ -144,37 +148,37 @@ public class TestQuery() : Query { /** * The character represented by this friendship edge */ - public override val node: Node?, + override val node: Node?, ) : Hero.FriendsConnection.Edge, HumanHeroDetails.FriendsConnection.Edge { public data class Node( /** * The name of the character */ - public override val name: String, + override val name: String, ) : Hero.FriendsConnection.Edge.Node, HumanHeroDetails.FriendsConnection.Edge.Node } } } public data class DroidHero( - public override val __typename: String, + override val __typename: String, /** * Merged field with multiple descriptions. See parentTypes: 'Character, Droid' for more * information */ - public override val name: String, + override val name: String, /** * This droid's primary function */ - public override val primaryFunction: String?, + override val primaryFunction: String?, /** * The friends of the character exposed as a connection with edges */ - public override val friendsConnection: FriendsConnection, + override val friendsConnection: FriendsConnection, /** * The movies this character appears in */ - public override val appearsIn: List, + override val appearsIn: List, ) : Hero, DroidHeroDetails { public fun appearsInFilterNotNull(): List = appearsIn.filterNotNull() @@ -182,11 +186,11 @@ public class TestQuery() : Query { /** * The total number of friends */ - public override val totalCount: Int?, + override val totalCount: Int?, /** * The edges for each of the character's friends. */ - public override val edges: List?, + override val edges: List?, ) : Hero.FriendsConnection, DroidHeroDetails.FriendsConnection { public fun edgesFilterNotNull(): List? = edges?.filterNotNull() @@ -194,32 +198,32 @@ public class TestQuery() : Query { /** * The character represented by this friendship edge */ - public override val node: Node?, + override val node: Node?, ) : Hero.FriendsConnection.Edge, DroidHeroDetails.FriendsConnection.Edge { public data class Node( /** * The name of the character */ - public override val name: String, + override val name: String, ) : Hero.FriendsConnection.Edge.Node, DroidHeroDetails.FriendsConnection.Edge.Node } } } public data class OtherHero( - public override val __typename: String, + override val __typename: String, /** * The name of the character */ - public override val name: String, + override val name: String, /** * The friends of the character exposed as a connection with edges */ - public override val friendsConnection: FriendsConnection, + override val friendsConnection: FriendsConnection, /** * The movies this character appears in */ - public override val appearsIn: List, + override val appearsIn: List, ) : Hero, HeroDetails { public fun appearsInFilterNotNull(): List = appearsIn.filterNotNull() @@ -227,11 +231,11 @@ public class TestQuery() : Query { /** * The total number of friends */ - public override val totalCount: Int?, + override val totalCount: Int?, /** * The edges for each of the character's friends. */ - public override val edges: List?, + override val edges: List?, ) : Hero.FriendsConnection, HeroDetails.FriendsConnection { public fun edgesFilterNotNull(): List? = edges?.filterNotNull() @@ -239,13 +243,13 @@ public class TestQuery() : Query { /** * The character represented by this friendship edge */ - public override val node: Node?, + override val node: Node?, ) : Hero.FriendsConnection.Edge, HeroDetails.FriendsConnection.Edge { public data class Node( /** * The name of the character */ - public override val name: String, + override val name: String, ) : Hero.FriendsConnection.Edge.Node, HeroDetails.FriendsConnection.Edge.Node } } diff --git a/libraries/apollo-compiler/src/test/graphql/com/example/fragment_with_inline_fragment/kotlin/responseBased/fragment_with_inline_fragment/adapter/TestQuery_ResponseAdapter.kt.expected b/libraries/apollo-compiler/src/test/graphql/com/example/fragment_with_inline_fragment/kotlin/responseBased/fragment_with_inline_fragment/adapter/TestQuery_ResponseAdapter.kt.expected index 09077ff366d..6639aecff60 100644 --- a/libraries/apollo-compiler/src/test/graphql/com/example/fragment_with_inline_fragment/kotlin/responseBased/fragment_with_inline_fragment/adapter/TestQuery_ResponseAdapter.kt.expected +++ b/libraries/apollo-compiler/src/test/graphql/com/example/fragment_with_inline_fragment/kotlin/responseBased/fragment_with_inline_fragment/adapter/TestQuery_ResponseAdapter.kt.expected @@ -23,14 +23,13 @@ import com.example.fragment_with_inline_fragment.type.adapter.Episode_ResponseAd import kotlin.Int import kotlin.String import kotlin.Suppress -import kotlin.Unit import kotlin.collections.List public object TestQuery_ResponseAdapter { public object Data : CompositeAdapter { public val RESPONSE_NAMES: List = listOf("hero") - public override fun fromJson(reader: JsonReader, adapterContext: CompositeAdapterContext): + override fun fromJson(reader: JsonReader, adapterContext: CompositeAdapterContext): TestQuery.Data { var _hero: TestQuery.Data.Hero? = null @@ -46,17 +45,17 @@ public object TestQuery_ResponseAdapter { ) } - public override fun toJson( + override fun toJson( writer: JsonWriter, `value`: TestQuery.Data, adapterContext: CompositeAdapterContext, - ): Unit { + ) { writer.name("hero") Hero.obj().nullable().toJson(writer, value.hero, adapterContext) } private object Hero : CompositeAdapter { - public override fun fromJson(reader: JsonReader, adapterContext: CompositeAdapterContext): + override fun fromJson(reader: JsonReader, adapterContext: CompositeAdapterContext): TestQuery.Data.Hero { val __typename = reader.readTypename() return when(__typename) { @@ -69,11 +68,11 @@ public object TestQuery_ResponseAdapter { } } - public override fun toJson( + override fun toJson( writer: JsonWriter, `value`: TestQuery.Data.Hero, adapterContext: CompositeAdapterContext, - ): Unit { + ) { when(value) { is TestQuery.Data.HumanHero -> HumanHero.toJson(writer, value, adapterContext) is TestQuery.Data.DroidHero -> DroidHero.toJson(writer, value, adapterContext) @@ -118,7 +117,7 @@ public object TestQuery_ResponseAdapter { writer: JsonWriter, `value`: TestQuery.Data.HumanHero, @Suppress("UNUSED_PARAMETER") adapterContext: CompositeAdapterContext, - ): Unit { + ) { writer.name("__typename") StringAdapter.toJson(writer, CustomScalarAdapters.Empty, value.__typename) @@ -137,7 +136,7 @@ public object TestQuery_ResponseAdapter { CompositeAdapter { public val RESPONSE_NAMES: List = listOf("totalCount", "edges") - public override fun fromJson(reader: JsonReader, adapterContext: CompositeAdapterContext): + override fun fromJson(reader: JsonReader, adapterContext: CompositeAdapterContext): TestQuery.Data.HumanHero.FriendsConnection { var _totalCount: Int? = null var _edges: List? = null @@ -156,11 +155,11 @@ public object TestQuery_ResponseAdapter { ) } - public override fun toJson( + override fun toJson( writer: JsonWriter, `value`: TestQuery.Data.HumanHero.FriendsConnection, adapterContext: CompositeAdapterContext, - ): Unit { + ) { writer.name("totalCount") NullableIntAdapter.toJson(writer, CustomScalarAdapters.Empty, value.totalCount) @@ -171,7 +170,7 @@ public object TestQuery_ResponseAdapter { private object Edge : CompositeAdapter { public val RESPONSE_NAMES: List = listOf("node") - public override fun fromJson(reader: JsonReader, adapterContext: CompositeAdapterContext): + override fun fromJson(reader: JsonReader, adapterContext: CompositeAdapterContext): TestQuery.Data.HumanHero.FriendsConnection.Edge { var _node: TestQuery.Data.HumanHero.FriendsConnection.Edge.Node? = null @@ -187,11 +186,11 @@ public object TestQuery_ResponseAdapter { ) } - public override fun toJson( + override fun toJson( writer: JsonWriter, `value`: TestQuery.Data.HumanHero.FriendsConnection.Edge, adapterContext: CompositeAdapterContext, - ): Unit { + ) { writer.name("node") Node.obj().nullable().toJson(writer, value.node, adapterContext) } @@ -200,8 +199,7 @@ public object TestQuery_ResponseAdapter { CompositeAdapter { public val RESPONSE_NAMES: List = listOf("name") - public override fun fromJson(reader: JsonReader, - adapterContext: CompositeAdapterContext): + override fun fromJson(reader: JsonReader, adapterContext: CompositeAdapterContext): TestQuery.Data.HumanHero.FriendsConnection.Edge.Node { var _name: String? = null @@ -217,11 +215,11 @@ public object TestQuery_ResponseAdapter { ) } - public override fun toJson( + override fun toJson( writer: JsonWriter, `value`: TestQuery.Data.HumanHero.FriendsConnection.Edge.Node, adapterContext: CompositeAdapterContext, - ): Unit { + ) { writer.name("name") StringAdapter.toJson(writer, CustomScalarAdapters.Empty, value.name) } @@ -269,7 +267,7 @@ public object TestQuery_ResponseAdapter { writer: JsonWriter, `value`: TestQuery.Data.DroidHero, @Suppress("UNUSED_PARAMETER") adapterContext: CompositeAdapterContext, - ): Unit { + ) { writer.name("__typename") StringAdapter.toJson(writer, CustomScalarAdapters.Empty, value.__typename) @@ -291,7 +289,7 @@ public object TestQuery_ResponseAdapter { CompositeAdapter { public val RESPONSE_NAMES: List = listOf("totalCount", "edges") - public override fun fromJson(reader: JsonReader, adapterContext: CompositeAdapterContext): + override fun fromJson(reader: JsonReader, adapterContext: CompositeAdapterContext): TestQuery.Data.DroidHero.FriendsConnection { var _totalCount: Int? = null var _edges: List? = null @@ -310,11 +308,11 @@ public object TestQuery_ResponseAdapter { ) } - public override fun toJson( + override fun toJson( writer: JsonWriter, `value`: TestQuery.Data.DroidHero.FriendsConnection, adapterContext: CompositeAdapterContext, - ): Unit { + ) { writer.name("totalCount") NullableIntAdapter.toJson(writer, CustomScalarAdapters.Empty, value.totalCount) @@ -325,7 +323,7 @@ public object TestQuery_ResponseAdapter { private object Edge : CompositeAdapter { public val RESPONSE_NAMES: List = listOf("node") - public override fun fromJson(reader: JsonReader, adapterContext: CompositeAdapterContext): + override fun fromJson(reader: JsonReader, adapterContext: CompositeAdapterContext): TestQuery.Data.DroidHero.FriendsConnection.Edge { var _node: TestQuery.Data.DroidHero.FriendsConnection.Edge.Node? = null @@ -341,11 +339,11 @@ public object TestQuery_ResponseAdapter { ) } - public override fun toJson( + override fun toJson( writer: JsonWriter, `value`: TestQuery.Data.DroidHero.FriendsConnection.Edge, adapterContext: CompositeAdapterContext, - ): Unit { + ) { writer.name("node") Node.obj().nullable().toJson(writer, value.node, adapterContext) } @@ -354,8 +352,7 @@ public object TestQuery_ResponseAdapter { CompositeAdapter { public val RESPONSE_NAMES: List = listOf("name") - public override fun fromJson(reader: JsonReader, - adapterContext: CompositeAdapterContext): + override fun fromJson(reader: JsonReader, adapterContext: CompositeAdapterContext): TestQuery.Data.DroidHero.FriendsConnection.Edge.Node { var _name: String? = null @@ -371,11 +368,11 @@ public object TestQuery_ResponseAdapter { ) } - public override fun toJson( + override fun toJson( writer: JsonWriter, `value`: TestQuery.Data.DroidHero.FriendsConnection.Edge.Node, adapterContext: CompositeAdapterContext, - ): Unit { + ) { writer.name("name") StringAdapter.toJson(writer, CustomScalarAdapters.Empty, value.name) } @@ -420,7 +417,7 @@ public object TestQuery_ResponseAdapter { writer: JsonWriter, `value`: TestQuery.Data.OtherHero, @Suppress("UNUSED_PARAMETER") adapterContext: CompositeAdapterContext, - ): Unit { + ) { writer.name("__typename") StringAdapter.toJson(writer, CustomScalarAdapters.Empty, value.__typename) @@ -439,7 +436,7 @@ public object TestQuery_ResponseAdapter { CompositeAdapter { public val RESPONSE_NAMES: List = listOf("totalCount", "edges") - public override fun fromJson(reader: JsonReader, adapterContext: CompositeAdapterContext): + override fun fromJson(reader: JsonReader, adapterContext: CompositeAdapterContext): TestQuery.Data.OtherHero.FriendsConnection { var _totalCount: Int? = null var _edges: List? = null @@ -458,11 +455,11 @@ public object TestQuery_ResponseAdapter { ) } - public override fun toJson( + override fun toJson( writer: JsonWriter, `value`: TestQuery.Data.OtherHero.FriendsConnection, adapterContext: CompositeAdapterContext, - ): Unit { + ) { writer.name("totalCount") NullableIntAdapter.toJson(writer, CustomScalarAdapters.Empty, value.totalCount) @@ -473,7 +470,7 @@ public object TestQuery_ResponseAdapter { private object Edge : CompositeAdapter { public val RESPONSE_NAMES: List = listOf("node") - public override fun fromJson(reader: JsonReader, adapterContext: CompositeAdapterContext): + override fun fromJson(reader: JsonReader, adapterContext: CompositeAdapterContext): TestQuery.Data.OtherHero.FriendsConnection.Edge { var _node: TestQuery.Data.OtherHero.FriendsConnection.Edge.Node? = null @@ -489,11 +486,11 @@ public object TestQuery_ResponseAdapter { ) } - public override fun toJson( + override fun toJson( writer: JsonWriter, `value`: TestQuery.Data.OtherHero.FriendsConnection.Edge, adapterContext: CompositeAdapterContext, - ): Unit { + ) { writer.name("node") Node.obj().nullable().toJson(writer, value.node, adapterContext) } @@ -502,8 +499,7 @@ public object TestQuery_ResponseAdapter { CompositeAdapter { public val RESPONSE_NAMES: List = listOf("name") - public override fun fromJson(reader: JsonReader, - adapterContext: CompositeAdapterContext): + override fun fromJson(reader: JsonReader, adapterContext: CompositeAdapterContext): TestQuery.Data.OtherHero.FriendsConnection.Edge.Node { var _name: String? = null @@ -519,11 +515,11 @@ public object TestQuery_ResponseAdapter { ) } - public override fun toJson( + override fun toJson( writer: JsonWriter, `value`: TestQuery.Data.OtherHero.FriendsConnection.Edge.Node, adapterContext: CompositeAdapterContext, - ): Unit { + ) { writer.name("name") StringAdapter.toJson(writer, CustomScalarAdapters.Empty, value.name) } diff --git a/libraries/apollo-compiler/src/test/graphql/com/example/fragment_with_inline_fragment/kotlin/responseBased/fragment_with_inline_fragment/fragment/DroidDetailsImpl.kt.expected b/libraries/apollo-compiler/src/test/graphql/com/example/fragment_with_inline_fragment/kotlin/responseBased/fragment_with_inline_fragment/fragment/DroidDetailsImpl.kt.expected index 475650351d1..1b66c9c2b8a 100644 --- a/libraries/apollo-compiler/src/test/graphql/com/example/fragment_with_inline_fragment/kotlin/responseBased/fragment_with_inline_fragment/fragment/DroidDetailsImpl.kt.expected +++ b/libraries/apollo-compiler/src/test/graphql/com/example/fragment_with_inline_fragment/kotlin/responseBased/fragment_with_inline_fragment/fragment/DroidDetailsImpl.kt.expected @@ -17,25 +17,23 @@ import kotlin.Any import kotlin.Boolean import kotlin.Int import kotlin.String -import kotlin.Unit public class DroidDetailsImpl() : Fragment { - public override fun equals(other: Any?): Boolean = other != null && other::class == this::class + override fun equals(other: Any?): Boolean = other != null && other::class == this::class - public override fun hashCode(): Int = this::class.hashCode() + override fun hashCode(): Int = this::class.hashCode() - public override fun serializeVariables( + override fun serializeVariables( writer: JsonWriter, customScalarAdapters: CustomScalarAdapters, withBooleanDefaultValues: Boolean, - ): Unit { + ) { // This fragment doesn't have any variable } - public override fun adapter(): CompositeAdapter = - DroidDetailsImpl_ResponseAdapter.Data.obj() + override fun adapter(): CompositeAdapter = DroidDetailsImpl_ResponseAdapter.Data.obj() - public override fun rootField(): CompiledField = CompiledField.Builder( + override fun rootField(): CompiledField = CompiledField.Builder( name = "data", type = Droid.type ) @@ -46,10 +44,10 @@ public class DroidDetailsImpl() : Fragment { /** * What others call this droid */ - public override val name: String, + override val name: String, /** * This droid's primary function */ - public override val primaryFunction: String?, + override val primaryFunction: String?, ) : DroidDetails, Fragment.Data } diff --git a/libraries/apollo-compiler/src/test/graphql/com/example/fragment_with_inline_fragment/kotlin/responseBased/fragment_with_inline_fragment/fragment/DroidDetailsImpl_ResponseAdapter.kt.expected b/libraries/apollo-compiler/src/test/graphql/com/example/fragment_with_inline_fragment/kotlin/responseBased/fragment_with_inline_fragment/fragment/DroidDetailsImpl_ResponseAdapter.kt.expected index 929e9eb6b28..c1b67e46425 100644 --- a/libraries/apollo-compiler/src/test/graphql/com/example/fragment_with_inline_fragment/kotlin/responseBased/fragment_with_inline_fragment/fragment/DroidDetailsImpl_ResponseAdapter.kt.expected +++ b/libraries/apollo-compiler/src/test/graphql/com/example/fragment_with_inline_fragment/kotlin/responseBased/fragment_with_inline_fragment/fragment/DroidDetailsImpl_ResponseAdapter.kt.expected @@ -13,14 +13,13 @@ import com.apollographql.apollo3.api.StringAdapter import com.apollographql.apollo3.api.json.JsonReader import com.apollographql.apollo3.api.json.JsonWriter import kotlin.String -import kotlin.Unit import kotlin.collections.List public object DroidDetailsImpl_ResponseAdapter { public object Data : CompositeAdapter { public val RESPONSE_NAMES: List = listOf("name", "primaryFunction") - public override fun fromJson(reader: JsonReader, adapterContext: CompositeAdapterContext): + override fun fromJson(reader: JsonReader, adapterContext: CompositeAdapterContext): DroidDetailsImpl.Data { var _name: String? = null var _primaryFunction: String? = null @@ -39,11 +38,11 @@ public object DroidDetailsImpl_ResponseAdapter { ) } - public override fun toJson( + override fun toJson( writer: JsonWriter, `value`: DroidDetailsImpl.Data, adapterContext: CompositeAdapterContext, - ): Unit { + ) { writer.name("name") StringAdapter.toJson(writer, CustomScalarAdapters.Empty, value.name) diff --git a/libraries/apollo-compiler/src/test/graphql/com/example/fragment_with_inline_fragment/kotlin/responseBased/fragment_with_inline_fragment/fragment/HeroDetails.kt.expected b/libraries/apollo-compiler/src/test/graphql/com/example/fragment_with_inline_fragment/kotlin/responseBased/fragment_with_inline_fragment/fragment/HeroDetails.kt.expected index 2286a07a3d1..c4c68cc8c50 100644 --- a/libraries/apollo-compiler/src/test/graphql/com/example/fragment_with_inline_fragment/kotlin/responseBased/fragment_with_inline_fragment/fragment/HeroDetails.kt.expected +++ b/libraries/apollo-compiler/src/test/graphql/com/example/fragment_with_inline_fragment/kotlin/responseBased/fragment_with_inline_fragment/fragment/HeroDetails.kt.expected @@ -7,6 +7,7 @@ package com.example.fragment_with_inline_fragment.fragment import kotlin.Int import kotlin.String +import kotlin.Suppress import kotlin.collections.List public interface HeroDetails { @@ -49,98 +50,102 @@ public interface HeroDetails { } public companion object { - public fun HeroDetails.humanDetails() = this as? HumanDetails + @Suppress("USELESS_CAST") + public fun HeroDetails.humanDetails(): HumanDetails? = this as? HumanDetails - public fun HeroDetails.droidDetails() = this as? DroidDetails + @Suppress("USELESS_CAST") + public fun HeroDetails.droidDetails(): DroidDetails? = this as? DroidDetails - public fun HeroDetails.asHuman() = this as? HumanHeroDetails + @Suppress("USELESS_CAST") + public fun HeroDetails.asHuman(): HumanHeroDetails? = this as? HumanHeroDetails - public fun HeroDetails.asDroid() = this as? DroidHeroDetails + @Suppress("USELESS_CAST") + public fun HeroDetails.asDroid(): DroidHeroDetails? = this as? DroidHeroDetails } } public interface HumanHeroDetails : HeroDetails, HumanDetails { - public override val __typename: String + override val __typename: String /** * Merged field with multiple descriptions. See parentTypes: 'Human, Character' for more * information */ - public override val name: String + override val name: String /** * The friends of the character exposed as a connection with edges */ - public override val friendsConnection: FriendsConnection + override val friendsConnection: FriendsConnection public interface FriendsConnection : HeroDetails.FriendsConnection { /** * The total number of friends */ - public override val totalCount: Int? + override val totalCount: Int? /** * The edges for each of the character's friends. */ - public override val edges: List? + override val edges: List? public interface Edge : HeroDetails.FriendsConnection.Edge { /** * The character represented by this friendship edge */ - public override val node: Node? + override val node: Node? public interface Node : HeroDetails.FriendsConnection.Edge.Node { /** * The name of the character */ - public override val name: String + override val name: String } } } } public interface DroidHeroDetails : HeroDetails, DroidDetails { - public override val __typename: String + override val __typename: String /** * Merged field with multiple descriptions. See parentTypes: 'Droid, Character' for more * information */ - public override val name: String + override val name: String /** * This droid's primary function */ - public override val primaryFunction: String? + override val primaryFunction: String? /** * The friends of the character exposed as a connection with edges */ - public override val friendsConnection: FriendsConnection + override val friendsConnection: FriendsConnection public interface FriendsConnection : HeroDetails.FriendsConnection { /** * The total number of friends */ - public override val totalCount: Int? + override val totalCount: Int? /** * The edges for each of the character's friends. */ - public override val edges: List? + override val edges: List? public interface Edge : HeroDetails.FriendsConnection.Edge { /** * The character represented by this friendship edge */ - public override val node: Node? + override val node: Node? public interface Node : HeroDetails.FriendsConnection.Edge.Node { /** * The name of the character */ - public override val name: String + override val name: String } } } diff --git a/libraries/apollo-compiler/src/test/graphql/com/example/fragment_with_inline_fragment/kotlin/responseBased/fragment_with_inline_fragment/fragment/HeroDetailsImpl.kt.expected b/libraries/apollo-compiler/src/test/graphql/com/example/fragment_with_inline_fragment/kotlin/responseBased/fragment_with_inline_fragment/fragment/HeroDetailsImpl.kt.expected index 55080e8229f..497f47f4e12 100644 --- a/libraries/apollo-compiler/src/test/graphql/com/example/fragment_with_inline_fragment/kotlin/responseBased/fragment_with_inline_fragment/fragment/HeroDetailsImpl.kt.expected +++ b/libraries/apollo-compiler/src/test/graphql/com/example/fragment_with_inline_fragment/kotlin/responseBased/fragment_with_inline_fragment/fragment/HeroDetailsImpl.kt.expected @@ -17,25 +17,25 @@ import kotlin.Any import kotlin.Boolean import kotlin.Int import kotlin.String -import kotlin.Unit +import kotlin.Suppress import kotlin.collections.List public class HeroDetailsImpl() : Fragment { - public override fun equals(other: Any?): Boolean = other != null && other::class == this::class + override fun equals(other: Any?): Boolean = other != null && other::class == this::class - public override fun hashCode(): Int = this::class.hashCode() + override fun hashCode(): Int = this::class.hashCode() - public override fun serializeVariables( + override fun serializeVariables( writer: JsonWriter, customScalarAdapters: CustomScalarAdapters, withBooleanDefaultValues: Boolean, - ): Unit { + ) { // This fragment doesn't have any variable } - public override fun adapter(): CompositeAdapter = HeroDetailsImpl_ResponseAdapter.Data.obj() + override fun adapter(): CompositeAdapter = HeroDetailsImpl_ResponseAdapter.Data.obj() - public override fun rootField(): CompiledField = CompiledField.Builder( + override fun rootField(): CompiledField = CompiledField.Builder( name = "data", type = Character.type ) @@ -43,76 +43,80 @@ public class HeroDetailsImpl() : Fragment { .build() public sealed interface Data : HeroDetails, Fragment.Data { - public override val __typename: String + override val __typename: String /** * The name of the character */ - public override val name: String + override val name: String /** * The friends of the character exposed as a connection with edges */ - public override val friendsConnection: FriendsConnection + override val friendsConnection: FriendsConnection public sealed interface FriendsConnection : HeroDetails.FriendsConnection { /** * The total number of friends */ - public override val totalCount: Int? + override val totalCount: Int? /** * The edges for each of the character's friends. */ - public override val edges: List? + override val edges: List? public sealed interface Edge : HeroDetails.FriendsConnection.Edge { /** * The character represented by this friendship edge */ - public override val node: Node? + override val node: Node? public sealed interface Node : HeroDetails.FriendsConnection.Edge.Node { /** * The name of the character */ - public override val name: String + override val name: String } } } public companion object { - public fun Data.humanDetails() = this as? HumanDetails + @Suppress("USELESS_CAST") + public fun Data.humanDetails(): HumanDetails? = this as? HumanDetails - public fun Data.droidDetails() = this as? DroidDetails + @Suppress("USELESS_CAST") + public fun Data.droidDetails(): DroidDetails? = this as? DroidDetails - public fun Data.asHuman() = this as? HumanData + @Suppress("USELESS_CAST") + public fun Data.asHuman(): HumanData? = this as? HumanData - public fun Data.asDroid() = this as? DroidData + @Suppress("USELESS_CAST") + public fun Data.asDroid(): DroidData? = this as? DroidData } } public data class HumanData( - public override val __typename: String, + override val __typename: String, /** * Merged field with multiple descriptions. See parentTypes: 'Human, Character' for more * information */ - public override val name: String, + override val name: String, /** * The friends of the character exposed as a connection with edges */ - public override val friendsConnection: FriendsConnection, + override val friendsConnection: FriendsConnection, ) : Data, HumanDetails, HumanHeroDetails { public data class FriendsConnection( /** * The total number of friends */ - public override val totalCount: Int?, + override val totalCount: Int?, /** * The edges for each of the character's friends. */ - public override val edges: List?, + override val edges: List?, ) : Data.FriendsConnection, HumanHeroDetails.FriendsConnection { public fun edgesFilterNotNull(): List? = edges?.filterNotNull() @@ -120,43 +124,43 @@ public class HeroDetailsImpl() : Fragment { /** * The character represented by this friendship edge */ - public override val node: Node?, + override val node: Node?, ) : Data.FriendsConnection.Edge, HumanHeroDetails.FriendsConnection.Edge { public data class Node( /** * The name of the character */ - public override val name: String, + override val name: String, ) : Data.FriendsConnection.Edge.Node, HumanHeroDetails.FriendsConnection.Edge.Node } } } public data class DroidData( - public override val __typename: String, + override val __typename: String, /** * Merged field with multiple descriptions. See parentTypes: 'Droid, Character' for more * information */ - public override val name: String, + override val name: String, /** * This droid's primary function */ - public override val primaryFunction: String?, + override val primaryFunction: String?, /** * The friends of the character exposed as a connection with edges */ - public override val friendsConnection: FriendsConnection, + override val friendsConnection: FriendsConnection, ) : Data, DroidDetails, DroidHeroDetails { public data class FriendsConnection( /** * The total number of friends */ - public override val totalCount: Int?, + override val totalCount: Int?, /** * The edges for each of the character's friends. */ - public override val edges: List?, + override val edges: List?, ) : Data.FriendsConnection, DroidHeroDetails.FriendsConnection { public fun edgesFilterNotNull(): List? = edges?.filterNotNull() @@ -164,38 +168,38 @@ public class HeroDetailsImpl() : Fragment { /** * The character represented by this friendship edge */ - public override val node: Node?, + override val node: Node?, ) : Data.FriendsConnection.Edge, DroidHeroDetails.FriendsConnection.Edge { public data class Node( /** * The name of the character */ - public override val name: String, + override val name: String, ) : Data.FriendsConnection.Edge.Node, DroidHeroDetails.FriendsConnection.Edge.Node } } } public data class OtherData( - public override val __typename: String, + override val __typename: String, /** * The name of the character */ - public override val name: String, + override val name: String, /** * The friends of the character exposed as a connection with edges */ - public override val friendsConnection: FriendsConnection, + override val friendsConnection: FriendsConnection, ) : Data, HeroDetails { public data class FriendsConnection( /** * The total number of friends */ - public override val totalCount: Int?, + override val totalCount: Int?, /** * The edges for each of the character's friends. */ - public override val edges: List?, + override val edges: List?, ) : Data.FriendsConnection, HeroDetails.FriendsConnection { public fun edgesFilterNotNull(): List? = edges?.filterNotNull() @@ -203,13 +207,13 @@ public class HeroDetailsImpl() : Fragment { /** * The character represented by this friendship edge */ - public override val node: Node?, + override val node: Node?, ) : Data.FriendsConnection.Edge, HeroDetails.FriendsConnection.Edge { public data class Node( /** * The name of the character */ - public override val name: String, + override val name: String, ) : Data.FriendsConnection.Edge.Node, HeroDetails.FriendsConnection.Edge.Node } } diff --git a/libraries/apollo-compiler/src/test/graphql/com/example/fragment_with_inline_fragment/kotlin/responseBased/fragment_with_inline_fragment/fragment/HeroDetailsImpl_ResponseAdapter.kt.expected b/libraries/apollo-compiler/src/test/graphql/com/example/fragment_with_inline_fragment/kotlin/responseBased/fragment_with_inline_fragment/fragment/HeroDetailsImpl_ResponseAdapter.kt.expected index 0e4895f21f5..11b91a58f04 100644 --- a/libraries/apollo-compiler/src/test/graphql/com/example/fragment_with_inline_fragment/kotlin/responseBased/fragment_with_inline_fragment/fragment/HeroDetailsImpl_ResponseAdapter.kt.expected +++ b/libraries/apollo-compiler/src/test/graphql/com/example/fragment_with_inline_fragment/kotlin/responseBased/fragment_with_inline_fragment/fragment/HeroDetailsImpl_ResponseAdapter.kt.expected @@ -20,12 +20,11 @@ import com.apollographql.apollo3.api.obj import kotlin.Int import kotlin.String import kotlin.Suppress -import kotlin.Unit import kotlin.collections.List public object HeroDetailsImpl_ResponseAdapter { public object Data : CompositeAdapter { - public override fun fromJson(reader: JsonReader, adapterContext: CompositeAdapterContext): + override fun fromJson(reader: JsonReader, adapterContext: CompositeAdapterContext): HeroDetailsImpl.Data { val __typename = reader.readTypename() return when(__typename) { @@ -38,11 +37,11 @@ public object HeroDetailsImpl_ResponseAdapter { } } - public override fun toJson( + override fun toJson( writer: JsonWriter, `value`: HeroDetailsImpl.Data, adapterContext: CompositeAdapterContext, - ): Unit { + ) { when(value) { is HeroDetailsImpl.HumanData -> HumanData.toJson(writer, value, adapterContext) is HeroDetailsImpl.DroidData -> DroidData.toJson(writer, value, adapterContext) @@ -83,7 +82,7 @@ public object HeroDetailsImpl_ResponseAdapter { writer: JsonWriter, `value`: HeroDetailsImpl.HumanData, @Suppress("UNUSED_PARAMETER") adapterContext: CompositeAdapterContext, - ): Unit { + ) { writer.name("__typename") StringAdapter.toJson(writer, CustomScalarAdapters.Empty, value.__typename) @@ -98,7 +97,7 @@ public object HeroDetailsImpl_ResponseAdapter { { public val RESPONSE_NAMES: List = listOf("totalCount", "edges") - public override fun fromJson(reader: JsonReader, adapterContext: CompositeAdapterContext): + override fun fromJson(reader: JsonReader, adapterContext: CompositeAdapterContext): HeroDetailsImpl.HumanData.FriendsConnection { var _totalCount: Int? = null var _edges: List? = null @@ -117,11 +116,11 @@ public object HeroDetailsImpl_ResponseAdapter { ) } - public override fun toJson( + override fun toJson( writer: JsonWriter, `value`: HeroDetailsImpl.HumanData.FriendsConnection, adapterContext: CompositeAdapterContext, - ): Unit { + ) { writer.name("totalCount") NullableIntAdapter.toJson(writer, CustomScalarAdapters.Empty, value.totalCount) @@ -132,7 +131,7 @@ public object HeroDetailsImpl_ResponseAdapter { private object Edge : CompositeAdapter { public val RESPONSE_NAMES: List = listOf("node") - public override fun fromJson(reader: JsonReader, adapterContext: CompositeAdapterContext): + override fun fromJson(reader: JsonReader, adapterContext: CompositeAdapterContext): HeroDetailsImpl.HumanData.FriendsConnection.Edge { var _node: HeroDetailsImpl.HumanData.FriendsConnection.Edge.Node? = null @@ -148,11 +147,11 @@ public object HeroDetailsImpl_ResponseAdapter { ) } - public override fun toJson( + override fun toJson( writer: JsonWriter, `value`: HeroDetailsImpl.HumanData.FriendsConnection.Edge, adapterContext: CompositeAdapterContext, - ): Unit { + ) { writer.name("node") Node.obj().nullable().toJson(writer, value.node, adapterContext) } @@ -161,7 +160,7 @@ public object HeroDetailsImpl_ResponseAdapter { CompositeAdapter { public val RESPONSE_NAMES: List = listOf("name") - public override fun fromJson(reader: JsonReader, adapterContext: CompositeAdapterContext): + override fun fromJson(reader: JsonReader, adapterContext: CompositeAdapterContext): HeroDetailsImpl.HumanData.FriendsConnection.Edge.Node { var _name: String? = null @@ -177,11 +176,11 @@ public object HeroDetailsImpl_ResponseAdapter { ) } - public override fun toJson( + override fun toJson( writer: JsonWriter, `value`: HeroDetailsImpl.HumanData.FriendsConnection.Edge.Node, adapterContext: CompositeAdapterContext, - ): Unit { + ) { writer.name("name") StringAdapter.toJson(writer, CustomScalarAdapters.Empty, value.name) } @@ -226,7 +225,7 @@ public object HeroDetailsImpl_ResponseAdapter { writer: JsonWriter, `value`: HeroDetailsImpl.DroidData, @Suppress("UNUSED_PARAMETER") adapterContext: CompositeAdapterContext, - ): Unit { + ) { writer.name("__typename") StringAdapter.toJson(writer, CustomScalarAdapters.Empty, value.__typename) @@ -244,7 +243,7 @@ public object HeroDetailsImpl_ResponseAdapter { { public val RESPONSE_NAMES: List = listOf("totalCount", "edges") - public override fun fromJson(reader: JsonReader, adapterContext: CompositeAdapterContext): + override fun fromJson(reader: JsonReader, adapterContext: CompositeAdapterContext): HeroDetailsImpl.DroidData.FriendsConnection { var _totalCount: Int? = null var _edges: List? = null @@ -263,11 +262,11 @@ public object HeroDetailsImpl_ResponseAdapter { ) } - public override fun toJson( + override fun toJson( writer: JsonWriter, `value`: HeroDetailsImpl.DroidData.FriendsConnection, adapterContext: CompositeAdapterContext, - ): Unit { + ) { writer.name("totalCount") NullableIntAdapter.toJson(writer, CustomScalarAdapters.Empty, value.totalCount) @@ -278,7 +277,7 @@ public object HeroDetailsImpl_ResponseAdapter { private object Edge : CompositeAdapter { public val RESPONSE_NAMES: List = listOf("node") - public override fun fromJson(reader: JsonReader, adapterContext: CompositeAdapterContext): + override fun fromJson(reader: JsonReader, adapterContext: CompositeAdapterContext): HeroDetailsImpl.DroidData.FriendsConnection.Edge { var _node: HeroDetailsImpl.DroidData.FriendsConnection.Edge.Node? = null @@ -294,11 +293,11 @@ public object HeroDetailsImpl_ResponseAdapter { ) } - public override fun toJson( + override fun toJson( writer: JsonWriter, `value`: HeroDetailsImpl.DroidData.FriendsConnection.Edge, adapterContext: CompositeAdapterContext, - ): Unit { + ) { writer.name("node") Node.obj().nullable().toJson(writer, value.node, adapterContext) } @@ -307,7 +306,7 @@ public object HeroDetailsImpl_ResponseAdapter { CompositeAdapter { public val RESPONSE_NAMES: List = listOf("name") - public override fun fromJson(reader: JsonReader, adapterContext: CompositeAdapterContext): + override fun fromJson(reader: JsonReader, adapterContext: CompositeAdapterContext): HeroDetailsImpl.DroidData.FriendsConnection.Edge.Node { var _name: String? = null @@ -323,11 +322,11 @@ public object HeroDetailsImpl_ResponseAdapter { ) } - public override fun toJson( + override fun toJson( writer: JsonWriter, `value`: HeroDetailsImpl.DroidData.FriendsConnection.Edge.Node, adapterContext: CompositeAdapterContext, - ): Unit { + ) { writer.name("name") StringAdapter.toJson(writer, CustomScalarAdapters.Empty, value.name) } @@ -368,7 +367,7 @@ public object HeroDetailsImpl_ResponseAdapter { writer: JsonWriter, `value`: HeroDetailsImpl.OtherData, @Suppress("UNUSED_PARAMETER") adapterContext: CompositeAdapterContext, - ): Unit { + ) { writer.name("__typename") StringAdapter.toJson(writer, CustomScalarAdapters.Empty, value.__typename) @@ -383,7 +382,7 @@ public object HeroDetailsImpl_ResponseAdapter { { public val RESPONSE_NAMES: List = listOf("totalCount", "edges") - public override fun fromJson(reader: JsonReader, adapterContext: CompositeAdapterContext): + override fun fromJson(reader: JsonReader, adapterContext: CompositeAdapterContext): HeroDetailsImpl.OtherData.FriendsConnection { var _totalCount: Int? = null var _edges: List? = null @@ -402,11 +401,11 @@ public object HeroDetailsImpl_ResponseAdapter { ) } - public override fun toJson( + override fun toJson( writer: JsonWriter, `value`: HeroDetailsImpl.OtherData.FriendsConnection, adapterContext: CompositeAdapterContext, - ): Unit { + ) { writer.name("totalCount") NullableIntAdapter.toJson(writer, CustomScalarAdapters.Empty, value.totalCount) @@ -417,7 +416,7 @@ public object HeroDetailsImpl_ResponseAdapter { private object Edge : CompositeAdapter { public val RESPONSE_NAMES: List = listOf("node") - public override fun fromJson(reader: JsonReader, adapterContext: CompositeAdapterContext): + override fun fromJson(reader: JsonReader, adapterContext: CompositeAdapterContext): HeroDetailsImpl.OtherData.FriendsConnection.Edge { var _node: HeroDetailsImpl.OtherData.FriendsConnection.Edge.Node? = null @@ -433,11 +432,11 @@ public object HeroDetailsImpl_ResponseAdapter { ) } - public override fun toJson( + override fun toJson( writer: JsonWriter, `value`: HeroDetailsImpl.OtherData.FriendsConnection.Edge, adapterContext: CompositeAdapterContext, - ): Unit { + ) { writer.name("node") Node.obj().nullable().toJson(writer, value.node, adapterContext) } @@ -446,7 +445,7 @@ public object HeroDetailsImpl_ResponseAdapter { CompositeAdapter { public val RESPONSE_NAMES: List = listOf("name") - public override fun fromJson(reader: JsonReader, adapterContext: CompositeAdapterContext): + override fun fromJson(reader: JsonReader, adapterContext: CompositeAdapterContext): HeroDetailsImpl.OtherData.FriendsConnection.Edge.Node { var _name: String? = null @@ -462,11 +461,11 @@ public object HeroDetailsImpl_ResponseAdapter { ) } - public override fun toJson( + override fun toJson( writer: JsonWriter, `value`: HeroDetailsImpl.OtherData.FriendsConnection.Edge.Node, adapterContext: CompositeAdapterContext, - ): Unit { + ) { writer.name("name") StringAdapter.toJson(writer, CustomScalarAdapters.Empty, value.name) } diff --git a/libraries/apollo-compiler/src/test/graphql/com/example/fragment_with_inline_fragment/kotlin/responseBased/fragment_with_inline_fragment/fragment/HumanDetailsImpl.kt.expected b/libraries/apollo-compiler/src/test/graphql/com/example/fragment_with_inline_fragment/kotlin/responseBased/fragment_with_inline_fragment/fragment/HumanDetailsImpl.kt.expected index c1c89b9a59c..cefe40feefb 100644 --- a/libraries/apollo-compiler/src/test/graphql/com/example/fragment_with_inline_fragment/kotlin/responseBased/fragment_with_inline_fragment/fragment/HumanDetailsImpl.kt.expected +++ b/libraries/apollo-compiler/src/test/graphql/com/example/fragment_with_inline_fragment/kotlin/responseBased/fragment_with_inline_fragment/fragment/HumanDetailsImpl.kt.expected @@ -17,25 +17,23 @@ import kotlin.Any import kotlin.Boolean import kotlin.Int import kotlin.String -import kotlin.Unit public class HumanDetailsImpl() : Fragment { - public override fun equals(other: Any?): Boolean = other != null && other::class == this::class + override fun equals(other: Any?): Boolean = other != null && other::class == this::class - public override fun hashCode(): Int = this::class.hashCode() + override fun hashCode(): Int = this::class.hashCode() - public override fun serializeVariables( + override fun serializeVariables( writer: JsonWriter, customScalarAdapters: CustomScalarAdapters, withBooleanDefaultValues: Boolean, - ): Unit { + ) { // This fragment doesn't have any variable } - public override fun adapter(): CompositeAdapter = - HumanDetailsImpl_ResponseAdapter.Data.obj() + override fun adapter(): CompositeAdapter = HumanDetailsImpl_ResponseAdapter.Data.obj() - public override fun rootField(): CompiledField = CompiledField.Builder( + override fun rootField(): CompiledField = CompiledField.Builder( name = "data", type = Human.type ) @@ -46,6 +44,6 @@ public class HumanDetailsImpl() : Fragment { /** * What this human calls themselves */ - public override val name: String, + override val name: String, ) : HumanDetails, Fragment.Data } diff --git a/libraries/apollo-compiler/src/test/graphql/com/example/fragment_with_inline_fragment/kotlin/responseBased/fragment_with_inline_fragment/fragment/HumanDetailsImpl_ResponseAdapter.kt.expected b/libraries/apollo-compiler/src/test/graphql/com/example/fragment_with_inline_fragment/kotlin/responseBased/fragment_with_inline_fragment/fragment/HumanDetailsImpl_ResponseAdapter.kt.expected index d402bfad88c..e9db1a0b84a 100644 --- a/libraries/apollo-compiler/src/test/graphql/com/example/fragment_with_inline_fragment/kotlin/responseBased/fragment_with_inline_fragment/fragment/HumanDetailsImpl_ResponseAdapter.kt.expected +++ b/libraries/apollo-compiler/src/test/graphql/com/example/fragment_with_inline_fragment/kotlin/responseBased/fragment_with_inline_fragment/fragment/HumanDetailsImpl_ResponseAdapter.kt.expected @@ -12,14 +12,13 @@ import com.apollographql.apollo3.api.StringAdapter import com.apollographql.apollo3.api.json.JsonReader import com.apollographql.apollo3.api.json.JsonWriter import kotlin.String -import kotlin.Unit import kotlin.collections.List public object HumanDetailsImpl_ResponseAdapter { public object Data : CompositeAdapter { public val RESPONSE_NAMES: List = listOf("name") - public override fun fromJson(reader: JsonReader, adapterContext: CompositeAdapterContext): + override fun fromJson(reader: JsonReader, adapterContext: CompositeAdapterContext): HumanDetailsImpl.Data { var _name: String? = null @@ -35,11 +34,11 @@ public object HumanDetailsImpl_ResponseAdapter { ) } - public override fun toJson( + override fun toJson( writer: JsonWriter, `value`: HumanDetailsImpl.Data, adapterContext: CompositeAdapterContext, - ): Unit { + ) { writer.name("name") StringAdapter.toJson(writer, CustomScalarAdapters.Empty, value.name) } diff --git a/libraries/apollo-compiler/src/test/graphql/com/example/fragment_with_inline_fragment/kotlin/responseBased/fragment_with_inline_fragment/type/adapter/Episode_ResponseAdapter.kt.expected b/libraries/apollo-compiler/src/test/graphql/com/example/fragment_with_inline_fragment/kotlin/responseBased/fragment_with_inline_fragment/type/adapter/Episode_ResponseAdapter.kt.expected index 9b50b18d6c8..5bf34cfdf86 100644 --- a/libraries/apollo-compiler/src/test/graphql/com/example/fragment_with_inline_fragment/kotlin/responseBased/fragment_with_inline_fragment/type/adapter/Episode_ResponseAdapter.kt.expected +++ b/libraries/apollo-compiler/src/test/graphql/com/example/fragment_with_inline_fragment/kotlin/responseBased/fragment_with_inline_fragment/type/adapter/Episode_ResponseAdapter.kt.expected @@ -10,20 +10,18 @@ import com.apollographql.apollo3.api.CustomScalarAdapters import com.apollographql.apollo3.api.json.JsonReader import com.apollographql.apollo3.api.json.JsonWriter import com.example.fragment_with_inline_fragment.type.Episode -import kotlin.Unit public object Episode_ResponseAdapter : Adapter { - public override fun fromJson(reader: JsonReader, customScalarAdapters: CustomScalarAdapters): - Episode { + override fun fromJson(reader: JsonReader, customScalarAdapters: CustomScalarAdapters): Episode { val rawValue = reader.nextString()!! return Episode.safeValueOf(rawValue) } - public override fun toJson( + override fun toJson( writer: JsonWriter, customScalarAdapters: CustomScalarAdapters, `value`: Episode, - ): Unit { + ) { writer.value(value.rawValue) } } diff --git a/libraries/apollo-compiler/src/test/graphql/com/example/fragment_with_multiple_fieldsets/kotlin/operationBased/fragment_with_multiple_fieldsets/TestQuery.kt.expected b/libraries/apollo-compiler/src/test/graphql/com/example/fragment_with_multiple_fieldsets/kotlin/operationBased/fragment_with_multiple_fieldsets/TestQuery.kt.expected index 004a541a494..64d2a7a6d47 100644 --- a/libraries/apollo-compiler/src/test/graphql/com/example/fragment_with_multiple_fieldsets/kotlin/operationBased/fragment_with_multiple_fieldsets/TestQuery.kt.expected +++ b/libraries/apollo-compiler/src/test/graphql/com/example/fragment_with_multiple_fieldsets/kotlin/operationBased/fragment_with_multiple_fieldsets/TestQuery.kt.expected @@ -19,32 +19,32 @@ import kotlin.Any import kotlin.Boolean import kotlin.Int import kotlin.String -import kotlin.Unit +import com.example.fragment_with_multiple_fieldsets.type.Query as CompiledQuery public class TestQuery() : Query { - public override fun equals(other: Any?): Boolean = other != null && other::class == this::class + override fun equals(other: Any?): Boolean = other != null && other::class == this::class - public override fun hashCode(): Int = this::class.hashCode() + override fun hashCode(): Int = this::class.hashCode() - public override fun id(): String = OPERATION_ID + override fun id(): String = OPERATION_ID - public override fun document(): String = OPERATION_DOCUMENT + override fun document(): String = OPERATION_DOCUMENT - public override fun name(): String = OPERATION_NAME + override fun name(): String = OPERATION_NAME - public override fun serializeVariables( + override fun serializeVariables( writer: JsonWriter, customScalarAdapters: CustomScalarAdapters, withBooleanDefaultValues: Boolean, - ): Unit { + ) { // This operation doesn't have any variable } - public override fun adapter(): CompositeAdapter = TestQuery_ResponseAdapter.Data.obj() + override fun adapter(): CompositeAdapter = TestQuery_ResponseAdapter.Data.obj() - public override fun rootField(): CompiledField = CompiledField.Builder( + override fun rootField(): CompiledField = CompiledField.Builder( name = "data", - type = com.example.fragment_with_multiple_fieldsets.type.Query.type + type = CompiledQuery.type ) .selections(selections = TestQuerySelections.__root) .build() diff --git a/libraries/apollo-compiler/src/test/graphql/com/example/fragment_with_multiple_fieldsets/kotlin/operationBased/fragment_with_multiple_fieldsets/adapter/TestQuery_ResponseAdapter.kt.expected b/libraries/apollo-compiler/src/test/graphql/com/example/fragment_with_multiple_fieldsets/kotlin/operationBased/fragment_with_multiple_fieldsets/adapter/TestQuery_ResponseAdapter.kt.expected index 74a30cfd051..9ba062b78c9 100644 --- a/libraries/apollo-compiler/src/test/graphql/com/example/fragment_with_multiple_fieldsets/kotlin/operationBased/fragment_with_multiple_fieldsets/adapter/TestQuery_ResponseAdapter.kt.expected +++ b/libraries/apollo-compiler/src/test/graphql/com/example/fragment_with_multiple_fieldsets/kotlin/operationBased/fragment_with_multiple_fieldsets/adapter/TestQuery_ResponseAdapter.kt.expected @@ -15,14 +15,13 @@ import com.apollographql.apollo3.api.nullable import com.apollographql.apollo3.api.obj import com.example.fragment_with_multiple_fieldsets.TestQuery import kotlin.String -import kotlin.Unit import kotlin.collections.List public object TestQuery_ResponseAdapter { public object Data : CompositeAdapter { public val RESPONSE_NAMES: List = listOf("i") - public override fun fromJson(reader: JsonReader, adapterContext: CompositeAdapterContext): + override fun fromJson(reader: JsonReader, adapterContext: CompositeAdapterContext): TestQuery.Data { var _i: TestQuery.Data.I? = null @@ -38,11 +37,11 @@ public object TestQuery_ResponseAdapter { ) } - public override fun toJson( + override fun toJson( writer: JsonWriter, `value`: TestQuery.Data, adapterContext: CompositeAdapterContext, - ): Unit { + ) { writer.name("i") I.obj(true).nullable().toJson(writer, value.i, adapterContext) } @@ -50,7 +49,7 @@ public object TestQuery_ResponseAdapter { private object I : CompositeAdapter { public val RESPONSE_NAMES: List = listOf("__typename") - public override fun fromJson(reader: JsonReader, adapterContext: CompositeAdapterContext): + override fun fromJson(reader: JsonReader, adapterContext: CompositeAdapterContext): TestQuery.Data.I { var __typename: String? = null @@ -71,11 +70,11 @@ public object TestQuery_ResponseAdapter { ) } - public override fun toJson( + override fun toJson( writer: JsonWriter, `value`: TestQuery.Data.I, adapterContext: CompositeAdapterContext, - ): Unit { + ) { writer.name("__typename") StringAdapter.toJson(writer, CustomScalarAdapters.Empty, value.__typename) diff --git a/libraries/apollo-compiler/src/test/graphql/com/example/fragment_with_multiple_fieldsets/kotlin/operationBased/fragment_with_multiple_fieldsets/fragment/IFragmentImpl.kt.expected b/libraries/apollo-compiler/src/test/graphql/com/example/fragment_with_multiple_fieldsets/kotlin/operationBased/fragment_with_multiple_fieldsets/fragment/IFragmentImpl.kt.expected index a0ddc3fb1ba..9de1d61c48a 100644 --- a/libraries/apollo-compiler/src/test/graphql/com/example/fragment_with_multiple_fieldsets/kotlin/operationBased/fragment_with_multiple_fieldsets/fragment/IFragmentImpl.kt.expected +++ b/libraries/apollo-compiler/src/test/graphql/com/example/fragment_with_multiple_fieldsets/kotlin/operationBased/fragment_with_multiple_fieldsets/fragment/IFragmentImpl.kt.expected @@ -16,25 +16,24 @@ import com.example.fragment_with_multiple_fieldsets.type.I import kotlin.Any import kotlin.Boolean import kotlin.Int -import kotlin.Unit public class IFragmentImpl() : Fragment { - public override fun equals(other: Any?): Boolean = other != null && other::class == this::class + override fun equals(other: Any?): Boolean = other != null && other::class == this::class - public override fun hashCode(): Int = this::class.hashCode() + override fun hashCode(): Int = this::class.hashCode() - public override fun serializeVariables( + override fun serializeVariables( writer: JsonWriter, customScalarAdapters: CustomScalarAdapters, withBooleanDefaultValues: Boolean, - ): Unit { + ) { // This fragment doesn't have any variable } - public override fun adapter(): CompositeAdapter = + override fun adapter(): CompositeAdapter = IFragmentImpl_ResponseAdapter.IFragment.obj(true) - public override fun rootField(): CompiledField = CompiledField.Builder( + override fun rootField(): CompiledField = CompiledField.Builder( name = "data", type = I.type ) diff --git a/libraries/apollo-compiler/src/test/graphql/com/example/fragment_with_multiple_fieldsets/kotlin/operationBased/fragment_with_multiple_fieldsets/fragment/IFragmentImpl_ResponseAdapter.kt.expected b/libraries/apollo-compiler/src/test/graphql/com/example/fragment_with_multiple_fieldsets/kotlin/operationBased/fragment_with_multiple_fieldsets/fragment/IFragmentImpl_ResponseAdapter.kt.expected index 97ca980f4fc..da0ac156037 100644 --- a/libraries/apollo-compiler/src/test/graphql/com/example/fragment_with_multiple_fieldsets/kotlin/operationBased/fragment_with_multiple_fieldsets/fragment/IFragmentImpl_ResponseAdapter.kt.expected +++ b/libraries/apollo-compiler/src/test/graphql/com/example/fragment_with_multiple_fieldsets/kotlin/operationBased/fragment_with_multiple_fieldsets/fragment/IFragmentImpl_ResponseAdapter.kt.expected @@ -15,7 +15,6 @@ import com.apollographql.apollo3.api.json.JsonReader import com.apollographql.apollo3.api.json.JsonWriter import com.apollographql.apollo3.api.possibleTypes import kotlin.String -import kotlin.Unit import kotlin.collections.List public object IFragmentImpl_ResponseAdapter { @@ -23,7 +22,7 @@ public object IFragmentImpl_ResponseAdapter { CompositeAdapter { public val RESPONSE_NAMES: List = listOf("__typename") - public override fun fromJson(reader: JsonReader, adapterContext: CompositeAdapterContext): + override fun fromJson(reader: JsonReader, adapterContext: CompositeAdapterContext): com.example.fragment_with_multiple_fieldsets.fragment.IFragment { var __typename: String? = null @@ -51,11 +50,11 @@ public object IFragmentImpl_ResponseAdapter { ) } - public override fun toJson( + override fun toJson( writer: JsonWriter, `value`: com.example.fragment_with_multiple_fieldsets.fragment.IFragment, adapterContext: CompositeAdapterContext, - ): Unit { + ) { writer.name("__typename") StringAdapter.toJson(writer, CustomScalarAdapters.Empty, value.__typename) @@ -69,7 +68,7 @@ public object IFragmentImpl_ResponseAdapter { CompositeAdapter { public val RESPONSE_NAMES: List = listOf("fieldA") - public override fun fromJson(reader: JsonReader, adapterContext: CompositeAdapterContext): + override fun fromJson(reader: JsonReader, adapterContext: CompositeAdapterContext): com.example.fragment_with_multiple_fieldsets.fragment.IFragment.OnA { var _fieldA: String? = null @@ -85,11 +84,11 @@ public object IFragmentImpl_ResponseAdapter { ) } - public override fun toJson( + override fun toJson( writer: JsonWriter, `value`: com.example.fragment_with_multiple_fieldsets.fragment.IFragment.OnA, adapterContext: CompositeAdapterContext, - ): Unit { + ) { writer.name("fieldA") NullableStringAdapter.toJson(writer, CustomScalarAdapters.Empty, value.fieldA) } diff --git a/libraries/apollo-compiler/src/test/graphql/com/example/fragment_with_multiple_fieldsets/kotlin/responseBased/fragment_with_multiple_fieldsets/TestQuery.kt.expected b/libraries/apollo-compiler/src/test/graphql/com/example/fragment_with_multiple_fieldsets/kotlin/responseBased/fragment_with_multiple_fieldsets/TestQuery.kt.expected index fac2f946cf9..489968a7d5a 100644 --- a/libraries/apollo-compiler/src/test/graphql/com/example/fragment_with_multiple_fieldsets/kotlin/responseBased/fragment_with_multiple_fieldsets/TestQuery.kt.expected +++ b/libraries/apollo-compiler/src/test/graphql/com/example/fragment_with_multiple_fieldsets/kotlin/responseBased/fragment_with_multiple_fieldsets/TestQuery.kt.expected @@ -20,32 +20,33 @@ import kotlin.Any import kotlin.Boolean import kotlin.Int import kotlin.String -import kotlin.Unit +import kotlin.Suppress +import com.example.fragment_with_multiple_fieldsets.type.Query as CompiledQuery public class TestQuery() : Query { - public override fun equals(other: Any?): Boolean = other != null && other::class == this::class + override fun equals(other: Any?): Boolean = other != null && other::class == this::class - public override fun hashCode(): Int = this::class.hashCode() + override fun hashCode(): Int = this::class.hashCode() - public override fun id(): String = OPERATION_ID + override fun id(): String = OPERATION_ID - public override fun document(): String = OPERATION_DOCUMENT + override fun document(): String = OPERATION_DOCUMENT - public override fun name(): String = OPERATION_NAME + override fun name(): String = OPERATION_NAME - public override fun serializeVariables( + override fun serializeVariables( writer: JsonWriter, customScalarAdapters: CustomScalarAdapters, withBooleanDefaultValues: Boolean, - ): Unit { + ) { // This operation doesn't have any variable } - public override fun adapter(): CompositeAdapter = TestQuery_ResponseAdapter.Data.obj() + override fun adapter(): CompositeAdapter = TestQuery_ResponseAdapter.Data.obj() - public override fun rootField(): CompiledField = CompiledField.Builder( + override fun rootField(): CompiledField = CompiledField.Builder( name = "data", - type = com.example.fragment_with_multiple_fieldsets.type.Query.type + type = CompiledQuery.type ) .selections(selections = TestQuerySelections.__root) .build() @@ -55,22 +56,24 @@ public class TestQuery() : Query { public val i: I?, ) : Query.Data { public sealed interface I : IFragment { - public override val __typename: String + override val __typename: String public companion object { - public fun I.iFragment() = this as? IFragment + @Suppress("USELESS_CAST") + public fun I.iFragment(): IFragment? = this as? IFragment - public fun I.asA() = this as? AI + @Suppress("USELESS_CAST") + public fun I.asA(): AI? = this as? AI } } public data class AI( - public override val __typename: String, - public override val fieldA: String?, + override val __typename: String, + override val fieldA: String?, ) : I, AIFragment public data class OtherI( - public override val __typename: String, + override val __typename: String, ) : I, IFragment } diff --git a/libraries/apollo-compiler/src/test/graphql/com/example/fragment_with_multiple_fieldsets/kotlin/responseBased/fragment_with_multiple_fieldsets/adapter/TestQuery_ResponseAdapter.kt.expected b/libraries/apollo-compiler/src/test/graphql/com/example/fragment_with_multiple_fieldsets/kotlin/responseBased/fragment_with_multiple_fieldsets/adapter/TestQuery_ResponseAdapter.kt.expected index a9510a156fb..198f2c6efc8 100644 --- a/libraries/apollo-compiler/src/test/graphql/com/example/fragment_with_multiple_fieldsets/kotlin/responseBased/fragment_with_multiple_fieldsets/adapter/TestQuery_ResponseAdapter.kt.expected +++ b/libraries/apollo-compiler/src/test/graphql/com/example/fragment_with_multiple_fieldsets/kotlin/responseBased/fragment_with_multiple_fieldsets/adapter/TestQuery_ResponseAdapter.kt.expected @@ -18,14 +18,13 @@ import com.apollographql.apollo3.api.obj import com.example.fragment_with_multiple_fieldsets.TestQuery import kotlin.String import kotlin.Suppress -import kotlin.Unit import kotlin.collections.List public object TestQuery_ResponseAdapter { public object Data : CompositeAdapter { public val RESPONSE_NAMES: List = listOf("i") - public override fun fromJson(reader: JsonReader, adapterContext: CompositeAdapterContext): + override fun fromJson(reader: JsonReader, adapterContext: CompositeAdapterContext): TestQuery.Data { var _i: TestQuery.Data.I? = null @@ -41,17 +40,17 @@ public object TestQuery_ResponseAdapter { ) } - public override fun toJson( + override fun toJson( writer: JsonWriter, `value`: TestQuery.Data, adapterContext: CompositeAdapterContext, - ): Unit { + ) { writer.name("i") I.obj().nullable().toJson(writer, value.i, adapterContext) } private object I : CompositeAdapter { - public override fun fromJson(reader: JsonReader, adapterContext: CompositeAdapterContext): + override fun fromJson(reader: JsonReader, adapterContext: CompositeAdapterContext): TestQuery.Data.I { val __typename = reader.readTypename() return when(__typename) { @@ -62,11 +61,11 @@ public object TestQuery_ResponseAdapter { } } - public override fun toJson( + override fun toJson( writer: JsonWriter, `value`: TestQuery.Data.I, adapterContext: CompositeAdapterContext, - ): Unit { + ) { when(value) { is TestQuery.Data.AI -> AI.toJson(writer, value, adapterContext) is TestQuery.Data.OtherI -> OtherI.toJson(writer, value, adapterContext) @@ -103,7 +102,7 @@ public object TestQuery_ResponseAdapter { writer: JsonWriter, `value`: TestQuery.Data.AI, @Suppress("UNUSED_PARAMETER") adapterContext: CompositeAdapterContext, - ): Unit { + ) { writer.name("__typename") StringAdapter.toJson(writer, CustomScalarAdapters.Empty, value.__typename) @@ -138,7 +137,7 @@ public object TestQuery_ResponseAdapter { writer: JsonWriter, `value`: TestQuery.Data.OtherI, @Suppress("UNUSED_PARAMETER") adapterContext: CompositeAdapterContext, - ): Unit { + ) { writer.name("__typename") StringAdapter.toJson(writer, CustomScalarAdapters.Empty, value.__typename) } diff --git a/libraries/apollo-compiler/src/test/graphql/com/example/fragment_with_multiple_fieldsets/kotlin/responseBased/fragment_with_multiple_fieldsets/fragment/IFragment.kt.expected b/libraries/apollo-compiler/src/test/graphql/com/example/fragment_with_multiple_fieldsets/kotlin/responseBased/fragment_with_multiple_fieldsets/fragment/IFragment.kt.expected index 80f9f7ac7cb..afb5fdcc32c 100644 --- a/libraries/apollo-compiler/src/test/graphql/com/example/fragment_with_multiple_fieldsets/kotlin/responseBased/fragment_with_multiple_fieldsets/fragment/IFragment.kt.expected +++ b/libraries/apollo-compiler/src/test/graphql/com/example/fragment_with_multiple_fieldsets/kotlin/responseBased/fragment_with_multiple_fieldsets/fragment/IFragment.kt.expected @@ -6,17 +6,19 @@ package com.example.fragment_with_multiple_fieldsets.fragment import kotlin.String +import kotlin.Suppress public interface IFragment { public val __typename: String public companion object { - public fun IFragment.asA() = this as? AIFragment + @Suppress("USELESS_CAST") + public fun IFragment.asA(): AIFragment? = this as? AIFragment } } public interface AIFragment : IFragment { - public override val __typename: String + override val __typename: String public val fieldA: String? } diff --git a/libraries/apollo-compiler/src/test/graphql/com/example/fragment_with_multiple_fieldsets/kotlin/responseBased/fragment_with_multiple_fieldsets/fragment/IFragmentImpl.kt.expected b/libraries/apollo-compiler/src/test/graphql/com/example/fragment_with_multiple_fieldsets/kotlin/responseBased/fragment_with_multiple_fieldsets/fragment/IFragmentImpl.kt.expected index 11f667d7e4c..7a05af57886 100644 --- a/libraries/apollo-compiler/src/test/graphql/com/example/fragment_with_multiple_fieldsets/kotlin/responseBased/fragment_with_multiple_fieldsets/fragment/IFragmentImpl.kt.expected +++ b/libraries/apollo-compiler/src/test/graphql/com/example/fragment_with_multiple_fieldsets/kotlin/responseBased/fragment_with_multiple_fieldsets/fragment/IFragmentImpl.kt.expected @@ -17,24 +17,24 @@ import kotlin.Any import kotlin.Boolean import kotlin.Int import kotlin.String -import kotlin.Unit +import kotlin.Suppress public class IFragmentImpl() : Fragment { - public override fun equals(other: Any?): Boolean = other != null && other::class == this::class + override fun equals(other: Any?): Boolean = other != null && other::class == this::class - public override fun hashCode(): Int = this::class.hashCode() + override fun hashCode(): Int = this::class.hashCode() - public override fun serializeVariables( + override fun serializeVariables( writer: JsonWriter, customScalarAdapters: CustomScalarAdapters, withBooleanDefaultValues: Boolean, - ): Unit { + ) { // This fragment doesn't have any variable } - public override fun adapter(): CompositeAdapter = IFragmentImpl_ResponseAdapter.Data.obj() + override fun adapter(): CompositeAdapter = IFragmentImpl_ResponseAdapter.Data.obj() - public override fun rootField(): CompiledField = CompiledField.Builder( + override fun rootField(): CompiledField = CompiledField.Builder( name = "data", type = I.type ) @@ -42,19 +42,20 @@ public class IFragmentImpl() : Fragment { .build() public sealed interface Data : IFragment, Fragment.Data { - public override val __typename: String + override val __typename: String public companion object { - public fun Data.asA() = this as? AData + @Suppress("USELESS_CAST") + public fun Data.asA(): AData? = this as? AData } } public data class AData( - public override val __typename: String, - public override val fieldA: String?, + override val __typename: String, + override val fieldA: String?, ) : Data, AIFragment public data class OtherData( - public override val __typename: String, + override val __typename: String, ) : Data, IFragment } diff --git a/libraries/apollo-compiler/src/test/graphql/com/example/fragment_with_multiple_fieldsets/kotlin/responseBased/fragment_with_multiple_fieldsets/fragment/IFragmentImpl_ResponseAdapter.kt.expected b/libraries/apollo-compiler/src/test/graphql/com/example/fragment_with_multiple_fieldsets/kotlin/responseBased/fragment_with_multiple_fieldsets/fragment/IFragmentImpl_ResponseAdapter.kt.expected index 8c7d60ce9cf..2c23f22597d 100644 --- a/libraries/apollo-compiler/src/test/graphql/com/example/fragment_with_multiple_fieldsets/kotlin/responseBased/fragment_with_multiple_fieldsets/fragment/IFragmentImpl_ResponseAdapter.kt.expected +++ b/libraries/apollo-compiler/src/test/graphql/com/example/fragment_with_multiple_fieldsets/kotlin/responseBased/fragment_with_multiple_fieldsets/fragment/IFragmentImpl_ResponseAdapter.kt.expected @@ -15,12 +15,11 @@ import com.apollographql.apollo3.api.json.JsonWriter import com.apollographql.apollo3.api.json.readTypename import kotlin.String import kotlin.Suppress -import kotlin.Unit import kotlin.collections.List public object IFragmentImpl_ResponseAdapter { public object Data : CompositeAdapter { - public override fun fromJson(reader: JsonReader, adapterContext: CompositeAdapterContext): + override fun fromJson(reader: JsonReader, adapterContext: CompositeAdapterContext): IFragmentImpl.Data { val __typename = reader.readTypename() return when(__typename) { @@ -31,11 +30,11 @@ public object IFragmentImpl_ResponseAdapter { } } - public override fun toJson( + override fun toJson( writer: JsonWriter, `value`: IFragmentImpl.Data, adapterContext: CompositeAdapterContext, - ): Unit { + ) { when(value) { is IFragmentImpl.AData -> AData.toJson(writer, value, adapterContext) is IFragmentImpl.OtherData -> OtherData.toJson(writer, value, adapterContext) @@ -72,7 +71,7 @@ public object IFragmentImpl_ResponseAdapter { writer: JsonWriter, `value`: IFragmentImpl.AData, @Suppress("UNUSED_PARAMETER") adapterContext: CompositeAdapterContext, - ): Unit { + ) { writer.name("__typename") StringAdapter.toJson(writer, CustomScalarAdapters.Empty, value.__typename) @@ -107,7 +106,7 @@ public object IFragmentImpl_ResponseAdapter { writer: JsonWriter, `value`: IFragmentImpl.OtherData, @Suppress("UNUSED_PARAMETER") adapterContext: CompositeAdapterContext, - ): Unit { + ) { writer.name("__typename") StringAdapter.toJson(writer, CustomScalarAdapters.Empty, value.__typename) } diff --git a/libraries/apollo-compiler/src/test/graphql/com/example/fragments_same_type_condition/kotlin/operationBased/fragments_same_type_condition/TestQuery.kt.expected b/libraries/apollo-compiler/src/test/graphql/com/example/fragments_same_type_condition/kotlin/operationBased/fragments_same_type_condition/TestQuery.kt.expected index e704d9e2318..869b73eb04d 100644 --- a/libraries/apollo-compiler/src/test/graphql/com/example/fragments_same_type_condition/kotlin/operationBased/fragments_same_type_condition/TestQuery.kt.expected +++ b/libraries/apollo-compiler/src/test/graphql/com/example/fragments_same_type_condition/kotlin/operationBased/fragments_same_type_condition/TestQuery.kt.expected @@ -20,32 +20,32 @@ import kotlin.Any import kotlin.Boolean import kotlin.Int import kotlin.String -import kotlin.Unit +import com.example.fragments_same_type_condition.type.Query as CompiledQuery public class TestQuery() : Query { - public override fun equals(other: Any?): Boolean = other != null && other::class == this::class + override fun equals(other: Any?): Boolean = other != null && other::class == this::class - public override fun hashCode(): Int = this::class.hashCode() + override fun hashCode(): Int = this::class.hashCode() - public override fun id(): String = OPERATION_ID + override fun id(): String = OPERATION_ID - public override fun document(): String = OPERATION_DOCUMENT + override fun document(): String = OPERATION_DOCUMENT - public override fun name(): String = OPERATION_NAME + override fun name(): String = OPERATION_NAME - public override fun serializeVariables( + override fun serializeVariables( writer: JsonWriter, customScalarAdapters: CustomScalarAdapters, withBooleanDefaultValues: Boolean, - ): Unit { + ) { // This operation doesn't have any variable } - public override fun adapter(): CompositeAdapter = TestQuery_ResponseAdapter.Data.obj() + override fun adapter(): CompositeAdapter = TestQuery_ResponseAdapter.Data.obj() - public override fun rootField(): CompiledField = CompiledField.Builder( + override fun rootField(): CompiledField = CompiledField.Builder( name = "data", - type = com.example.fragments_same_type_condition.type.Query.type + type = CompiledQuery.type ) .selections(selections = TestQuerySelections.__root) .build() diff --git a/libraries/apollo-compiler/src/test/graphql/com/example/fragments_same_type_condition/kotlin/operationBased/fragments_same_type_condition/adapter/TestQuery_ResponseAdapter.kt.expected b/libraries/apollo-compiler/src/test/graphql/com/example/fragments_same_type_condition/kotlin/operationBased/fragments_same_type_condition/adapter/TestQuery_ResponseAdapter.kt.expected index 887534221d5..0846a0b60b3 100644 --- a/libraries/apollo-compiler/src/test/graphql/com/example/fragments_same_type_condition/kotlin/operationBased/fragments_same_type_condition/adapter/TestQuery_ResponseAdapter.kt.expected +++ b/libraries/apollo-compiler/src/test/graphql/com/example/fragments_same_type_condition/kotlin/operationBased/fragments_same_type_condition/adapter/TestQuery_ResponseAdapter.kt.expected @@ -19,14 +19,13 @@ import com.example.fragments_same_type_condition.TestQuery import com.example.fragments_same_type_condition.fragment.DroidDetails1 import com.example.fragments_same_type_condition.fragment.DroidDetails2 import kotlin.String -import kotlin.Unit import kotlin.collections.List public object TestQuery_ResponseAdapter { public object Data : CompositeAdapter { public val RESPONSE_NAMES: List = listOf("hero") - public override fun fromJson(reader: JsonReader, adapterContext: CompositeAdapterContext): + override fun fromJson(reader: JsonReader, adapterContext: CompositeAdapterContext): TestQuery.Data { var _hero: TestQuery.Data.Hero? = null @@ -42,11 +41,11 @@ public object TestQuery_ResponseAdapter { ) } - public override fun toJson( + override fun toJson( writer: JsonWriter, `value`: TestQuery.Data, adapterContext: CompositeAdapterContext, - ): Unit { + ) { writer.name("hero") Hero.obj(true).nullable().toJson(writer, value.hero, adapterContext) } @@ -54,7 +53,7 @@ public object TestQuery_ResponseAdapter { private object Hero : CompositeAdapter { public val RESPONSE_NAMES: List = listOf("__typename") - public override fun fromJson(reader: JsonReader, adapterContext: CompositeAdapterContext): + override fun fromJson(reader: JsonReader, adapterContext: CompositeAdapterContext): TestQuery.Data.Hero { var __typename: String? = null @@ -90,11 +89,11 @@ public object TestQuery_ResponseAdapter { ) } - public override fun toJson( + override fun toJson( writer: JsonWriter, `value`: TestQuery.Data.Hero, adapterContext: CompositeAdapterContext, - ): Unit { + ) { writer.name("__typename") StringAdapter.toJson(writer, CustomScalarAdapters.Empty, value.__typename) diff --git a/libraries/apollo-compiler/src/test/graphql/com/example/fragments_same_type_condition/kotlin/operationBased/fragments_same_type_condition/fragment/DroidDetails1Impl.kt.expected b/libraries/apollo-compiler/src/test/graphql/com/example/fragments_same_type_condition/kotlin/operationBased/fragments_same_type_condition/fragment/DroidDetails1Impl.kt.expected index a9bac2ab57c..555098ae888 100644 --- a/libraries/apollo-compiler/src/test/graphql/com/example/fragments_same_type_condition/kotlin/operationBased/fragments_same_type_condition/fragment/DroidDetails1Impl.kt.expected +++ b/libraries/apollo-compiler/src/test/graphql/com/example/fragments_same_type_condition/kotlin/operationBased/fragments_same_type_condition/fragment/DroidDetails1Impl.kt.expected @@ -16,25 +16,24 @@ import com.example.fragments_same_type_condition.type.Droid import kotlin.Any import kotlin.Boolean import kotlin.Int -import kotlin.Unit public class DroidDetails1Impl() : Fragment { - public override fun equals(other: Any?): Boolean = other != null && other::class == this::class + override fun equals(other: Any?): Boolean = other != null && other::class == this::class - public override fun hashCode(): Int = this::class.hashCode() + override fun hashCode(): Int = this::class.hashCode() - public override fun serializeVariables( + override fun serializeVariables( writer: JsonWriter, customScalarAdapters: CustomScalarAdapters, withBooleanDefaultValues: Boolean, - ): Unit { + ) { // This fragment doesn't have any variable } - public override fun adapter(): CompositeAdapter = + override fun adapter(): CompositeAdapter = DroidDetails1Impl_ResponseAdapter.DroidDetails1.obj() - public override fun rootField(): CompiledField = CompiledField.Builder( + override fun rootField(): CompiledField = CompiledField.Builder( name = "data", type = Droid.type ) diff --git a/libraries/apollo-compiler/src/test/graphql/com/example/fragments_same_type_condition/kotlin/operationBased/fragments_same_type_condition/fragment/DroidDetails1Impl_ResponseAdapter.kt.expected b/libraries/apollo-compiler/src/test/graphql/com/example/fragments_same_type_condition/kotlin/operationBased/fragments_same_type_condition/fragment/DroidDetails1Impl_ResponseAdapter.kt.expected index 1caab01d186..65d8964901d 100644 --- a/libraries/apollo-compiler/src/test/graphql/com/example/fragments_same_type_condition/kotlin/operationBased/fragments_same_type_condition/fragment/DroidDetails1Impl_ResponseAdapter.kt.expected +++ b/libraries/apollo-compiler/src/test/graphql/com/example/fragments_same_type_condition/kotlin/operationBased/fragments_same_type_condition/fragment/DroidDetails1Impl_ResponseAdapter.kt.expected @@ -12,7 +12,6 @@ import com.apollographql.apollo3.api.StringAdapter import com.apollographql.apollo3.api.json.JsonReader import com.apollographql.apollo3.api.json.JsonWriter import kotlin.String -import kotlin.Unit import kotlin.collections.List public object DroidDetails1Impl_ResponseAdapter { @@ -20,7 +19,7 @@ public object DroidDetails1Impl_ResponseAdapter { CompositeAdapter { public val RESPONSE_NAMES: List = listOf("name") - public override fun fromJson(reader: JsonReader, adapterContext: CompositeAdapterContext): + override fun fromJson(reader: JsonReader, adapterContext: CompositeAdapterContext): com.example.fragments_same_type_condition.fragment.DroidDetails1 { var _name: String? = null @@ -36,11 +35,11 @@ public object DroidDetails1Impl_ResponseAdapter { ) } - public override fun toJson( + override fun toJson( writer: JsonWriter, `value`: com.example.fragments_same_type_condition.fragment.DroidDetails1, adapterContext: CompositeAdapterContext, - ): Unit { + ) { writer.name("name") StringAdapter.toJson(writer, CustomScalarAdapters.Empty, value.name) } diff --git a/libraries/apollo-compiler/src/test/graphql/com/example/fragments_same_type_condition/kotlin/operationBased/fragments_same_type_condition/fragment/DroidDetails2Impl.kt.expected b/libraries/apollo-compiler/src/test/graphql/com/example/fragments_same_type_condition/kotlin/operationBased/fragments_same_type_condition/fragment/DroidDetails2Impl.kt.expected index 8acf5aa1c91..5ee3f0cbaed 100644 --- a/libraries/apollo-compiler/src/test/graphql/com/example/fragments_same_type_condition/kotlin/operationBased/fragments_same_type_condition/fragment/DroidDetails2Impl.kt.expected +++ b/libraries/apollo-compiler/src/test/graphql/com/example/fragments_same_type_condition/kotlin/operationBased/fragments_same_type_condition/fragment/DroidDetails2Impl.kt.expected @@ -16,25 +16,24 @@ import com.example.fragments_same_type_condition.type.Droid import kotlin.Any import kotlin.Boolean import kotlin.Int -import kotlin.Unit public class DroidDetails2Impl() : Fragment { - public override fun equals(other: Any?): Boolean = other != null && other::class == this::class + override fun equals(other: Any?): Boolean = other != null && other::class == this::class - public override fun hashCode(): Int = this::class.hashCode() + override fun hashCode(): Int = this::class.hashCode() - public override fun serializeVariables( + override fun serializeVariables( writer: JsonWriter, customScalarAdapters: CustomScalarAdapters, withBooleanDefaultValues: Boolean, - ): Unit { + ) { // This fragment doesn't have any variable } - public override fun adapter(): CompositeAdapter = + override fun adapter(): CompositeAdapter = DroidDetails2Impl_ResponseAdapter.DroidDetails2.obj() - public override fun rootField(): CompiledField = CompiledField.Builder( + override fun rootField(): CompiledField = CompiledField.Builder( name = "data", type = Droid.type ) diff --git a/libraries/apollo-compiler/src/test/graphql/com/example/fragments_same_type_condition/kotlin/operationBased/fragments_same_type_condition/fragment/DroidDetails2Impl_ResponseAdapter.kt.expected b/libraries/apollo-compiler/src/test/graphql/com/example/fragments_same_type_condition/kotlin/operationBased/fragments_same_type_condition/fragment/DroidDetails2Impl_ResponseAdapter.kt.expected index 7b2e311fa04..bc34a2698f8 100644 --- a/libraries/apollo-compiler/src/test/graphql/com/example/fragments_same_type_condition/kotlin/operationBased/fragments_same_type_condition/fragment/DroidDetails2Impl_ResponseAdapter.kt.expected +++ b/libraries/apollo-compiler/src/test/graphql/com/example/fragments_same_type_condition/kotlin/operationBased/fragments_same_type_condition/fragment/DroidDetails2Impl_ResponseAdapter.kt.expected @@ -12,7 +12,6 @@ import com.apollographql.apollo3.api.NullableStringAdapter import com.apollographql.apollo3.api.json.JsonReader import com.apollographql.apollo3.api.json.JsonWriter import kotlin.String -import kotlin.Unit import kotlin.collections.List public object DroidDetails2Impl_ResponseAdapter { @@ -20,7 +19,7 @@ public object DroidDetails2Impl_ResponseAdapter { CompositeAdapter { public val RESPONSE_NAMES: List = listOf("primaryFunction") - public override fun fromJson(reader: JsonReader, adapterContext: CompositeAdapterContext): + override fun fromJson(reader: JsonReader, adapterContext: CompositeAdapterContext): com.example.fragments_same_type_condition.fragment.DroidDetails2 { var _primaryFunction: String? = null @@ -36,11 +35,11 @@ public object DroidDetails2Impl_ResponseAdapter { ) } - public override fun toJson( + override fun toJson( writer: JsonWriter, `value`: com.example.fragments_same_type_condition.fragment.DroidDetails2, adapterContext: CompositeAdapterContext, - ): Unit { + ) { writer.name("primaryFunction") NullableStringAdapter.toJson(writer, CustomScalarAdapters.Empty, value.primaryFunction) } diff --git a/libraries/apollo-compiler/src/test/graphql/com/example/fragments_same_type_condition/kotlin/responseBased/fragments_same_type_condition/TestQuery.kt.expected b/libraries/apollo-compiler/src/test/graphql/com/example/fragments_same_type_condition/kotlin/responseBased/fragments_same_type_condition/TestQuery.kt.expected index 848f6fef8d1..628c01f45fa 100644 --- a/libraries/apollo-compiler/src/test/graphql/com/example/fragments_same_type_condition/kotlin/responseBased/fragments_same_type_condition/TestQuery.kt.expected +++ b/libraries/apollo-compiler/src/test/graphql/com/example/fragments_same_type_condition/kotlin/responseBased/fragments_same_type_condition/TestQuery.kt.expected @@ -20,32 +20,33 @@ import kotlin.Any import kotlin.Boolean import kotlin.Int import kotlin.String -import kotlin.Unit +import kotlin.Suppress +import com.example.fragments_same_type_condition.type.Query as CompiledQuery public class TestQuery() : Query { - public override fun equals(other: Any?): Boolean = other != null && other::class == this::class + override fun equals(other: Any?): Boolean = other != null && other::class == this::class - public override fun hashCode(): Int = this::class.hashCode() + override fun hashCode(): Int = this::class.hashCode() - public override fun id(): String = OPERATION_ID + override fun id(): String = OPERATION_ID - public override fun document(): String = OPERATION_DOCUMENT + override fun document(): String = OPERATION_DOCUMENT - public override fun name(): String = OPERATION_NAME + override fun name(): String = OPERATION_NAME - public override fun serializeVariables( + override fun serializeVariables( writer: JsonWriter, customScalarAdapters: CustomScalarAdapters, withBooleanDefaultValues: Boolean, - ): Unit { + ) { // This operation doesn't have any variable } - public override fun adapter(): CompositeAdapter = TestQuery_ResponseAdapter.Data.obj() + override fun adapter(): CompositeAdapter = TestQuery_ResponseAdapter.Data.obj() - public override fun rootField(): CompiledField = CompiledField.Builder( + override fun rootField(): CompiledField = CompiledField.Builder( name = "data", - type = com.example.fragments_same_type_condition.type.Query.type + type = CompiledQuery.type ) .selections(selections = TestQuerySelections.__root) .build() @@ -58,28 +59,31 @@ public class TestQuery() : Query { public val __typename: String public companion object { - public fun Hero.droidDetails1() = this as? DroidDetails1 + @Suppress("USELESS_CAST") + public fun Hero.droidDetails1(): DroidDetails1? = this as? DroidDetails1 - public fun Hero.droidDetails2() = this as? DroidDetails2 + @Suppress("USELESS_CAST") + public fun Hero.droidDetails2(): DroidDetails2? = this as? DroidDetails2 - public fun Hero.asDroid() = this as? DroidHero + @Suppress("USELESS_CAST") + public fun Hero.asDroid(): DroidHero? = this as? DroidHero } } public data class DroidHero( - public override val __typename: String, + override val __typename: String, /** * What others call this droid */ - public override val name: String, + override val name: String, /** * This droid's primary function */ - public override val primaryFunction: String?, + override val primaryFunction: String?, ) : Hero, DroidDetails1, DroidDetails2 public data class OtherHero( - public override val __typename: String, + override val __typename: String, ) : Hero } diff --git a/libraries/apollo-compiler/src/test/graphql/com/example/fragments_same_type_condition/kotlin/responseBased/fragments_same_type_condition/adapter/TestQuery_ResponseAdapter.kt.expected b/libraries/apollo-compiler/src/test/graphql/com/example/fragments_same_type_condition/kotlin/responseBased/fragments_same_type_condition/adapter/TestQuery_ResponseAdapter.kt.expected index 7b3ecf9e786..eb1ba8f735f 100644 --- a/libraries/apollo-compiler/src/test/graphql/com/example/fragments_same_type_condition/kotlin/responseBased/fragments_same_type_condition/adapter/TestQuery_ResponseAdapter.kt.expected +++ b/libraries/apollo-compiler/src/test/graphql/com/example/fragments_same_type_condition/kotlin/responseBased/fragments_same_type_condition/adapter/TestQuery_ResponseAdapter.kt.expected @@ -18,14 +18,13 @@ import com.apollographql.apollo3.api.obj import com.example.fragments_same_type_condition.TestQuery import kotlin.String import kotlin.Suppress -import kotlin.Unit import kotlin.collections.List public object TestQuery_ResponseAdapter { public object Data : CompositeAdapter { public val RESPONSE_NAMES: List = listOf("hero") - public override fun fromJson(reader: JsonReader, adapterContext: CompositeAdapterContext): + override fun fromJson(reader: JsonReader, adapterContext: CompositeAdapterContext): TestQuery.Data { var _hero: TestQuery.Data.Hero? = null @@ -41,17 +40,17 @@ public object TestQuery_ResponseAdapter { ) } - public override fun toJson( + override fun toJson( writer: JsonWriter, `value`: TestQuery.Data, adapterContext: CompositeAdapterContext, - ): Unit { + ) { writer.name("hero") Hero.obj().nullable().toJson(writer, value.hero, adapterContext) } private object Hero : CompositeAdapter { - public override fun fromJson(reader: JsonReader, adapterContext: CompositeAdapterContext): + override fun fromJson(reader: JsonReader, adapterContext: CompositeAdapterContext): TestQuery.Data.Hero { val __typename = reader.readTypename() return when(__typename) { @@ -62,11 +61,11 @@ public object TestQuery_ResponseAdapter { } } - public override fun toJson( + override fun toJson( writer: JsonWriter, `value`: TestQuery.Data.Hero, adapterContext: CompositeAdapterContext, - ): Unit { + ) { when(value) { is TestQuery.Data.DroidHero -> DroidHero.toJson(writer, value, adapterContext) is TestQuery.Data.OtherHero -> OtherHero.toJson(writer, value, adapterContext) @@ -106,7 +105,7 @@ public object TestQuery_ResponseAdapter { writer: JsonWriter, `value`: TestQuery.Data.DroidHero, @Suppress("UNUSED_PARAMETER") adapterContext: CompositeAdapterContext, - ): Unit { + ) { writer.name("__typename") StringAdapter.toJson(writer, CustomScalarAdapters.Empty, value.__typename) @@ -144,7 +143,7 @@ public object TestQuery_ResponseAdapter { writer: JsonWriter, `value`: TestQuery.Data.OtherHero, @Suppress("UNUSED_PARAMETER") adapterContext: CompositeAdapterContext, - ): Unit { + ) { writer.name("__typename") StringAdapter.toJson(writer, CustomScalarAdapters.Empty, value.__typename) } diff --git a/libraries/apollo-compiler/src/test/graphql/com/example/fragments_same_type_condition/kotlin/responseBased/fragments_same_type_condition/fragment/DroidDetails1Impl.kt.expected b/libraries/apollo-compiler/src/test/graphql/com/example/fragments_same_type_condition/kotlin/responseBased/fragments_same_type_condition/fragment/DroidDetails1Impl.kt.expected index 94386daca68..669a5c41f7d 100644 --- a/libraries/apollo-compiler/src/test/graphql/com/example/fragments_same_type_condition/kotlin/responseBased/fragments_same_type_condition/fragment/DroidDetails1Impl.kt.expected +++ b/libraries/apollo-compiler/src/test/graphql/com/example/fragments_same_type_condition/kotlin/responseBased/fragments_same_type_condition/fragment/DroidDetails1Impl.kt.expected @@ -17,25 +17,23 @@ import kotlin.Any import kotlin.Boolean import kotlin.Int import kotlin.String -import kotlin.Unit public class DroidDetails1Impl() : Fragment { - public override fun equals(other: Any?): Boolean = other != null && other::class == this::class + override fun equals(other: Any?): Boolean = other != null && other::class == this::class - public override fun hashCode(): Int = this::class.hashCode() + override fun hashCode(): Int = this::class.hashCode() - public override fun serializeVariables( + override fun serializeVariables( writer: JsonWriter, customScalarAdapters: CustomScalarAdapters, withBooleanDefaultValues: Boolean, - ): Unit { + ) { // This fragment doesn't have any variable } - public override fun adapter(): CompositeAdapter = - DroidDetails1Impl_ResponseAdapter.Data.obj() + override fun adapter(): CompositeAdapter = DroidDetails1Impl_ResponseAdapter.Data.obj() - public override fun rootField(): CompiledField = CompiledField.Builder( + override fun rootField(): CompiledField = CompiledField.Builder( name = "data", type = Droid.type ) @@ -46,6 +44,6 @@ public class DroidDetails1Impl() : Fragment { /** * What others call this droid */ - public override val name: String, + override val name: String, ) : DroidDetails1, Fragment.Data } diff --git a/libraries/apollo-compiler/src/test/graphql/com/example/fragments_same_type_condition/kotlin/responseBased/fragments_same_type_condition/fragment/DroidDetails1Impl_ResponseAdapter.kt.expected b/libraries/apollo-compiler/src/test/graphql/com/example/fragments_same_type_condition/kotlin/responseBased/fragments_same_type_condition/fragment/DroidDetails1Impl_ResponseAdapter.kt.expected index 5e65ba67dfa..a38d58a91b7 100644 --- a/libraries/apollo-compiler/src/test/graphql/com/example/fragments_same_type_condition/kotlin/responseBased/fragments_same_type_condition/fragment/DroidDetails1Impl_ResponseAdapter.kt.expected +++ b/libraries/apollo-compiler/src/test/graphql/com/example/fragments_same_type_condition/kotlin/responseBased/fragments_same_type_condition/fragment/DroidDetails1Impl_ResponseAdapter.kt.expected @@ -12,14 +12,13 @@ import com.apollographql.apollo3.api.StringAdapter import com.apollographql.apollo3.api.json.JsonReader import com.apollographql.apollo3.api.json.JsonWriter import kotlin.String -import kotlin.Unit import kotlin.collections.List public object DroidDetails1Impl_ResponseAdapter { public object Data : CompositeAdapter { public val RESPONSE_NAMES: List = listOf("name") - public override fun fromJson(reader: JsonReader, adapterContext: CompositeAdapterContext): + override fun fromJson(reader: JsonReader, adapterContext: CompositeAdapterContext): DroidDetails1Impl.Data { var _name: String? = null @@ -35,11 +34,11 @@ public object DroidDetails1Impl_ResponseAdapter { ) } - public override fun toJson( + override fun toJson( writer: JsonWriter, `value`: DroidDetails1Impl.Data, adapterContext: CompositeAdapterContext, - ): Unit { + ) { writer.name("name") StringAdapter.toJson(writer, CustomScalarAdapters.Empty, value.name) } diff --git a/libraries/apollo-compiler/src/test/graphql/com/example/fragments_same_type_condition/kotlin/responseBased/fragments_same_type_condition/fragment/DroidDetails2Impl.kt.expected b/libraries/apollo-compiler/src/test/graphql/com/example/fragments_same_type_condition/kotlin/responseBased/fragments_same_type_condition/fragment/DroidDetails2Impl.kt.expected index 9c89538bfa2..ddd07a1ab4a 100644 --- a/libraries/apollo-compiler/src/test/graphql/com/example/fragments_same_type_condition/kotlin/responseBased/fragments_same_type_condition/fragment/DroidDetails2Impl.kt.expected +++ b/libraries/apollo-compiler/src/test/graphql/com/example/fragments_same_type_condition/kotlin/responseBased/fragments_same_type_condition/fragment/DroidDetails2Impl.kt.expected @@ -17,25 +17,23 @@ import kotlin.Any import kotlin.Boolean import kotlin.Int import kotlin.String -import kotlin.Unit public class DroidDetails2Impl() : Fragment { - public override fun equals(other: Any?): Boolean = other != null && other::class == this::class + override fun equals(other: Any?): Boolean = other != null && other::class == this::class - public override fun hashCode(): Int = this::class.hashCode() + override fun hashCode(): Int = this::class.hashCode() - public override fun serializeVariables( + override fun serializeVariables( writer: JsonWriter, customScalarAdapters: CustomScalarAdapters, withBooleanDefaultValues: Boolean, - ): Unit { + ) { // This fragment doesn't have any variable } - public override fun adapter(): CompositeAdapter = - DroidDetails2Impl_ResponseAdapter.Data.obj() + override fun adapter(): CompositeAdapter = DroidDetails2Impl_ResponseAdapter.Data.obj() - public override fun rootField(): CompiledField = CompiledField.Builder( + override fun rootField(): CompiledField = CompiledField.Builder( name = "data", type = Droid.type ) @@ -46,6 +44,6 @@ public class DroidDetails2Impl() : Fragment { /** * This droid's primary function */ - public override val primaryFunction: String?, + override val primaryFunction: String?, ) : DroidDetails2, Fragment.Data } diff --git a/libraries/apollo-compiler/src/test/graphql/com/example/fragments_same_type_condition/kotlin/responseBased/fragments_same_type_condition/fragment/DroidDetails2Impl_ResponseAdapter.kt.expected b/libraries/apollo-compiler/src/test/graphql/com/example/fragments_same_type_condition/kotlin/responseBased/fragments_same_type_condition/fragment/DroidDetails2Impl_ResponseAdapter.kt.expected index 4c48f232e48..dc6493c8e17 100644 --- a/libraries/apollo-compiler/src/test/graphql/com/example/fragments_same_type_condition/kotlin/responseBased/fragments_same_type_condition/fragment/DroidDetails2Impl_ResponseAdapter.kt.expected +++ b/libraries/apollo-compiler/src/test/graphql/com/example/fragments_same_type_condition/kotlin/responseBased/fragments_same_type_condition/fragment/DroidDetails2Impl_ResponseAdapter.kt.expected @@ -12,14 +12,13 @@ import com.apollographql.apollo3.api.NullableStringAdapter import com.apollographql.apollo3.api.json.JsonReader import com.apollographql.apollo3.api.json.JsonWriter import kotlin.String -import kotlin.Unit import kotlin.collections.List public object DroidDetails2Impl_ResponseAdapter { public object Data : CompositeAdapter { public val RESPONSE_NAMES: List = listOf("primaryFunction") - public override fun fromJson(reader: JsonReader, adapterContext: CompositeAdapterContext): + override fun fromJson(reader: JsonReader, adapterContext: CompositeAdapterContext): DroidDetails2Impl.Data { var _primaryFunction: String? = null @@ -35,11 +34,11 @@ public object DroidDetails2Impl_ResponseAdapter { ) } - public override fun toJson( + override fun toJson( writer: JsonWriter, `value`: DroidDetails2Impl.Data, adapterContext: CompositeAdapterContext, - ): Unit { + ) { writer.name("primaryFunction") NullableStringAdapter.toJson(writer, CustomScalarAdapters.Empty, value.primaryFunction) } diff --git a/libraries/apollo-compiler/src/test/graphql/com/example/fragments_with_defer_and_include_directives/kotlin/operationBased/fragments_with_defer_and_include_directives/InlineMultipleWithDefer.kt.expected b/libraries/apollo-compiler/src/test/graphql/com/example/fragments_with_defer_and_include_directives/kotlin/operationBased/fragments_with_defer_and_include_directives/InlineMultipleWithDefer.kt.expected index 0150c096be8..402f8b21c52 100644 --- a/libraries/apollo-compiler/src/test/graphql/com/example/fragments_with_defer_and_include_directives/kotlin/operationBased/fragments_with_defer_and_include_directives/InlineMultipleWithDefer.kt.expected +++ b/libraries/apollo-compiler/src/test/graphql/com/example/fragments_with_defer_and_include_directives/kotlin/operationBased/fragments_with_defer_and_include_directives/InlineMultipleWithDefer.kt.expected @@ -18,33 +18,33 @@ import kotlin.Any import kotlin.Boolean import kotlin.Int import kotlin.String -import kotlin.Unit +import com.example.fragments_with_defer_and_include_directives.type.Query as CompiledQuery public class InlineMultipleWithDefer() : Query { - public override fun equals(other: Any?): Boolean = other != null && other::class == this::class + override fun equals(other: Any?): Boolean = other != null && other::class == this::class - public override fun hashCode(): Int = this::class.hashCode() + override fun hashCode(): Int = this::class.hashCode() - public override fun id(): String = OPERATION_ID + override fun id(): String = OPERATION_ID - public override fun document(): String = OPERATION_DOCUMENT + override fun document(): String = OPERATION_DOCUMENT - public override fun name(): String = OPERATION_NAME + override fun name(): String = OPERATION_NAME - public override fun serializeVariables( + override fun serializeVariables( writer: JsonWriter, customScalarAdapters: CustomScalarAdapters, withBooleanDefaultValues: Boolean, - ): Unit { + ) { // This operation doesn't have any variable } - public override fun adapter(): CompositeAdapter = + override fun adapter(): CompositeAdapter = InlineMultipleWithDefer_ResponseAdapter.Data.obj() - public override fun rootField(): CompiledField = CompiledField.Builder( + override fun rootField(): CompiledField = CompiledField.Builder( name = "data", - type = com.example.fragments_with_defer_and_include_directives.type.Query.type + type = CompiledQuery.type ) .selections(selections = InlineMultipleWithDeferSelections.__root) .build() diff --git a/libraries/apollo-compiler/src/test/graphql/com/example/fragments_with_defer_and_include_directives/kotlin/operationBased/fragments_with_defer_and_include_directives/InlineMultipleWithDeferAndInclude.kt.expected b/libraries/apollo-compiler/src/test/graphql/com/example/fragments_with_defer_and_include_directives/kotlin/operationBased/fragments_with_defer_and_include_directives/InlineMultipleWithDeferAndInclude.kt.expected index 537ceaa17ee..a3828575800 100644 --- a/libraries/apollo-compiler/src/test/graphql/com/example/fragments_with_defer_and_include_directives/kotlin/operationBased/fragments_with_defer_and_include_directives/InlineMultipleWithDeferAndInclude.kt.expected +++ b/libraries/apollo-compiler/src/test/graphql/com/example/fragments_with_defer_and_include_directives/kotlin/operationBased/fragments_with_defer_and_include_directives/InlineMultipleWithDeferAndInclude.kt.expected @@ -17,7 +17,7 @@ import com.example.fragments_with_defer_and_include_directives.adapter.InlineMul import com.example.fragments_with_defer_and_include_directives.selections.InlineMultipleWithDeferAndIncludeSelections import kotlin.Boolean import kotlin.String -import kotlin.Unit +import com.example.fragments_with_defer_and_include_directives.type.Query as CompiledQuery public data class InlineMultipleWithDeferAndInclude( public val cond1: Boolean, @@ -25,27 +25,27 @@ public data class InlineMultipleWithDeferAndInclude( public val cond3: Boolean, public val cond4: Boolean, ) : Query { - public override fun id(): String = OPERATION_ID + override fun id(): String = OPERATION_ID - public override fun document(): String = OPERATION_DOCUMENT + override fun document(): String = OPERATION_DOCUMENT - public override fun name(): String = OPERATION_NAME + override fun name(): String = OPERATION_NAME - public override fun serializeVariables( + override fun serializeVariables( writer: JsonWriter, customScalarAdapters: CustomScalarAdapters, withBooleanDefaultValues: Boolean, - ): Unit { + ) { InlineMultipleWithDeferAndInclude_VariablesAdapter.serializeVariables(writer, this, customScalarAdapters, withBooleanDefaultValues) } - public override fun adapter(): CompositeAdapter = + override fun adapter(): CompositeAdapter = InlineMultipleWithDeferAndInclude_ResponseAdapter.Data.obj() - public override fun rootField(): CompiledField = CompiledField.Builder( + override fun rootField(): CompiledField = CompiledField.Builder( name = "data", - type = com.example.fragments_with_defer_and_include_directives.type.Query.type + type = CompiledQuery.type ) .selections(selections = InlineMultipleWithDeferAndIncludeSelections.__root) .build() diff --git a/libraries/apollo-compiler/src/test/graphql/com/example/fragments_with_defer_and_include_directives/kotlin/operationBased/fragments_with_defer_and_include_directives/InlineMultipleWithDeferWithIf.kt.expected b/libraries/apollo-compiler/src/test/graphql/com/example/fragments_with_defer_and_include_directives/kotlin/operationBased/fragments_with_defer_and_include_directives/InlineMultipleWithDeferWithIf.kt.expected index 8ceabedbed2..c16f3f0f307 100644 --- a/libraries/apollo-compiler/src/test/graphql/com/example/fragments_with_defer_and_include_directives/kotlin/operationBased/fragments_with_defer_and_include_directives/InlineMultipleWithDeferWithIf.kt.expected +++ b/libraries/apollo-compiler/src/test/graphql/com/example/fragments_with_defer_and_include_directives/kotlin/operationBased/fragments_with_defer_and_include_directives/InlineMultipleWithDeferWithIf.kt.expected @@ -17,32 +17,32 @@ import com.example.fragments_with_defer_and_include_directives.adapter.InlineMul import com.example.fragments_with_defer_and_include_directives.selections.InlineMultipleWithDeferWithIfSelections import kotlin.Boolean import kotlin.String -import kotlin.Unit +import com.example.fragments_with_defer_and_include_directives.type.Query as CompiledQuery public data class InlineMultipleWithDeferWithIf( public val cond: Boolean, ) : Query { - public override fun id(): String = OPERATION_ID + override fun id(): String = OPERATION_ID - public override fun document(): String = OPERATION_DOCUMENT + override fun document(): String = OPERATION_DOCUMENT - public override fun name(): String = OPERATION_NAME + override fun name(): String = OPERATION_NAME - public override fun serializeVariables( + override fun serializeVariables( writer: JsonWriter, customScalarAdapters: CustomScalarAdapters, withBooleanDefaultValues: Boolean, - ): Unit { + ) { InlineMultipleWithDeferWithIf_VariablesAdapter.serializeVariables(writer, this, customScalarAdapters, withBooleanDefaultValues) } - public override fun adapter(): CompositeAdapter = + override fun adapter(): CompositeAdapter = InlineMultipleWithDeferWithIf_ResponseAdapter.Data.obj() - public override fun rootField(): CompiledField = CompiledField.Builder( + override fun rootField(): CompiledField = CompiledField.Builder( name = "data", - type = com.example.fragments_with_defer_and_include_directives.type.Query.type + type = CompiledQuery.type ) .selections(selections = InlineMultipleWithDeferWithIfSelections.__root) .build() diff --git a/libraries/apollo-compiler/src/test/graphql/com/example/fragments_with_defer_and_include_directives/kotlin/operationBased/fragments_with_defer_and_include_directives/InlineSingleWithDefer.kt.expected b/libraries/apollo-compiler/src/test/graphql/com/example/fragments_with_defer_and_include_directives/kotlin/operationBased/fragments_with_defer_and_include_directives/InlineSingleWithDefer.kt.expected index cccb6407454..1519c15471a 100644 --- a/libraries/apollo-compiler/src/test/graphql/com/example/fragments_with_defer_and_include_directives/kotlin/operationBased/fragments_with_defer_and_include_directives/InlineSingleWithDefer.kt.expected +++ b/libraries/apollo-compiler/src/test/graphql/com/example/fragments_with_defer_and_include_directives/kotlin/operationBased/fragments_with_defer_and_include_directives/InlineSingleWithDefer.kt.expected @@ -18,33 +18,32 @@ import kotlin.Any import kotlin.Boolean import kotlin.Int import kotlin.String -import kotlin.Unit +import com.example.fragments_with_defer_and_include_directives.type.Query as CompiledQuery public class InlineSingleWithDefer() : Query { - public override fun equals(other: Any?): Boolean = other != null && other::class == this::class + override fun equals(other: Any?): Boolean = other != null && other::class == this::class - public override fun hashCode(): Int = this::class.hashCode() + override fun hashCode(): Int = this::class.hashCode() - public override fun id(): String = OPERATION_ID + override fun id(): String = OPERATION_ID - public override fun document(): String = OPERATION_DOCUMENT + override fun document(): String = OPERATION_DOCUMENT - public override fun name(): String = OPERATION_NAME + override fun name(): String = OPERATION_NAME - public override fun serializeVariables( + override fun serializeVariables( writer: JsonWriter, customScalarAdapters: CustomScalarAdapters, withBooleanDefaultValues: Boolean, - ): Unit { + ) { // This operation doesn't have any variable } - public override fun adapter(): CompositeAdapter = - InlineSingleWithDefer_ResponseAdapter.Data.obj() + override fun adapter(): CompositeAdapter = InlineSingleWithDefer_ResponseAdapter.Data.obj() - public override fun rootField(): CompiledField = CompiledField.Builder( + override fun rootField(): CompiledField = CompiledField.Builder( name = "data", - type = com.example.fragments_with_defer_and_include_directives.type.Query.type + type = CompiledQuery.type ) .selections(selections = InlineSingleWithDeferSelections.__root) .build() diff --git a/libraries/apollo-compiler/src/test/graphql/com/example/fragments_with_defer_and_include_directives/kotlin/operationBased/fragments_with_defer_and_include_directives/SpreadMultipleWithDefer.kt.expected b/libraries/apollo-compiler/src/test/graphql/com/example/fragments_with_defer_and_include_directives/kotlin/operationBased/fragments_with_defer_and_include_directives/SpreadMultipleWithDefer.kt.expected index c02366f714a..f4d327e61b4 100644 --- a/libraries/apollo-compiler/src/test/graphql/com/example/fragments_with_defer_and_include_directives/kotlin/operationBased/fragments_with_defer_and_include_directives/SpreadMultipleWithDefer.kt.expected +++ b/libraries/apollo-compiler/src/test/graphql/com/example/fragments_with_defer_and_include_directives/kotlin/operationBased/fragments_with_defer_and_include_directives/SpreadMultipleWithDefer.kt.expected @@ -19,33 +19,33 @@ import kotlin.Any import kotlin.Boolean import kotlin.Int import kotlin.String -import kotlin.Unit +import com.example.fragments_with_defer_and_include_directives.type.Query as CompiledQuery public class SpreadMultipleWithDefer() : Query { - public override fun equals(other: Any?): Boolean = other != null && other::class == this::class + override fun equals(other: Any?): Boolean = other != null && other::class == this::class - public override fun hashCode(): Int = this::class.hashCode() + override fun hashCode(): Int = this::class.hashCode() - public override fun id(): String = OPERATION_ID + override fun id(): String = OPERATION_ID - public override fun document(): String = OPERATION_DOCUMENT + override fun document(): String = OPERATION_DOCUMENT - public override fun name(): String = OPERATION_NAME + override fun name(): String = OPERATION_NAME - public override fun serializeVariables( + override fun serializeVariables( writer: JsonWriter, customScalarAdapters: CustomScalarAdapters, withBooleanDefaultValues: Boolean, - ): Unit { + ) { // This operation doesn't have any variable } - public override fun adapter(): CompositeAdapter = + override fun adapter(): CompositeAdapter = SpreadMultipleWithDefer_ResponseAdapter.Data.obj() - public override fun rootField(): CompiledField = CompiledField.Builder( + override fun rootField(): CompiledField = CompiledField.Builder( name = "data", - type = com.example.fragments_with_defer_and_include_directives.type.Query.type + type = CompiledQuery.type ) .selections(selections = SpreadMultipleWithDeferSelections.__root) .build() diff --git a/libraries/apollo-compiler/src/test/graphql/com/example/fragments_with_defer_and_include_directives/kotlin/operationBased/fragments_with_defer_and_include_directives/SpreadMultipleWithDeferAndInclude.kt.expected b/libraries/apollo-compiler/src/test/graphql/com/example/fragments_with_defer_and_include_directives/kotlin/operationBased/fragments_with_defer_and_include_directives/SpreadMultipleWithDeferAndInclude.kt.expected index f6afe02649a..e7dc6519949 100644 --- a/libraries/apollo-compiler/src/test/graphql/com/example/fragments_with_defer_and_include_directives/kotlin/operationBased/fragments_with_defer_and_include_directives/SpreadMultipleWithDeferAndInclude.kt.expected +++ b/libraries/apollo-compiler/src/test/graphql/com/example/fragments_with_defer_and_include_directives/kotlin/operationBased/fragments_with_defer_and_include_directives/SpreadMultipleWithDeferAndInclude.kt.expected @@ -18,7 +18,7 @@ import com.example.fragments_with_defer_and_include_directives.fragment.DroidDet import com.example.fragments_with_defer_and_include_directives.selections.SpreadMultipleWithDeferAndIncludeSelections import kotlin.Boolean import kotlin.String -import kotlin.Unit +import com.example.fragments_with_defer_and_include_directives.type.Query as CompiledQuery public data class SpreadMultipleWithDeferAndInclude( public val cond1: Boolean, @@ -26,27 +26,27 @@ public data class SpreadMultipleWithDeferAndInclude( public val cond3: Boolean, public val cond4: Boolean, ) : Query { - public override fun id(): String = OPERATION_ID + override fun id(): String = OPERATION_ID - public override fun document(): String = OPERATION_DOCUMENT + override fun document(): String = OPERATION_DOCUMENT - public override fun name(): String = OPERATION_NAME + override fun name(): String = OPERATION_NAME - public override fun serializeVariables( + override fun serializeVariables( writer: JsonWriter, customScalarAdapters: CustomScalarAdapters, withBooleanDefaultValues: Boolean, - ): Unit { + ) { SpreadMultipleWithDeferAndInclude_VariablesAdapter.serializeVariables(writer, this, customScalarAdapters, withBooleanDefaultValues) } - public override fun adapter(): CompositeAdapter = + override fun adapter(): CompositeAdapter = SpreadMultipleWithDeferAndInclude_ResponseAdapter.Data.obj() - public override fun rootField(): CompiledField = CompiledField.Builder( + override fun rootField(): CompiledField = CompiledField.Builder( name = "data", - type = com.example.fragments_with_defer_and_include_directives.type.Query.type + type = CompiledQuery.type ) .selections(selections = SpreadMultipleWithDeferAndIncludeSelections.__root) .build() diff --git a/libraries/apollo-compiler/src/test/graphql/com/example/fragments_with_defer_and_include_directives/kotlin/operationBased/fragments_with_defer_and_include_directives/SpreadMultipleWithDeferWithIf.kt.expected b/libraries/apollo-compiler/src/test/graphql/com/example/fragments_with_defer_and_include_directives/kotlin/operationBased/fragments_with_defer_and_include_directives/SpreadMultipleWithDeferWithIf.kt.expected index fbeb5f8be92..d056ef7a703 100644 --- a/libraries/apollo-compiler/src/test/graphql/com/example/fragments_with_defer_and_include_directives/kotlin/operationBased/fragments_with_defer_and_include_directives/SpreadMultipleWithDeferWithIf.kt.expected +++ b/libraries/apollo-compiler/src/test/graphql/com/example/fragments_with_defer_and_include_directives/kotlin/operationBased/fragments_with_defer_and_include_directives/SpreadMultipleWithDeferWithIf.kt.expected @@ -20,32 +20,32 @@ import com.example.fragments_with_defer_and_include_directives.fragment.Characte import com.example.fragments_with_defer_and_include_directives.selections.SpreadMultipleWithDeferWithIfSelections import kotlin.Boolean import kotlin.String -import kotlin.Unit +import com.example.fragments_with_defer_and_include_directives.type.Query as CompiledQuery public data class SpreadMultipleWithDeferWithIf( public val cond: Boolean, ) : Query { - public override fun id(): String = OPERATION_ID + override fun id(): String = OPERATION_ID - public override fun document(): String = OPERATION_DOCUMENT + override fun document(): String = OPERATION_DOCUMENT - public override fun name(): String = OPERATION_NAME + override fun name(): String = OPERATION_NAME - public override fun serializeVariables( + override fun serializeVariables( writer: JsonWriter, customScalarAdapters: CustomScalarAdapters, withBooleanDefaultValues: Boolean, - ): Unit { + ) { SpreadMultipleWithDeferWithIf_VariablesAdapter.serializeVariables(writer, this, customScalarAdapters, withBooleanDefaultValues) } - public override fun adapter(): CompositeAdapter = + override fun adapter(): CompositeAdapter = SpreadMultipleWithDeferWithIf_ResponseAdapter.Data.obj() - public override fun rootField(): CompiledField = CompiledField.Builder( + override fun rootField(): CompiledField = CompiledField.Builder( name = "data", - type = com.example.fragments_with_defer_and_include_directives.type.Query.type + type = CompiledQuery.type ) .selections(selections = SpreadMultipleWithDeferWithIfSelections.__root) .build() diff --git a/libraries/apollo-compiler/src/test/graphql/com/example/fragments_with_defer_and_include_directives/kotlin/operationBased/fragments_with_defer_and_include_directives/SpreadSingleWithDefer.kt.expected b/libraries/apollo-compiler/src/test/graphql/com/example/fragments_with_defer_and_include_directives/kotlin/operationBased/fragments_with_defer_and_include_directives/SpreadSingleWithDefer.kt.expected index 4cb84596941..24db94326f8 100644 --- a/libraries/apollo-compiler/src/test/graphql/com/example/fragments_with_defer_and_include_directives/kotlin/operationBased/fragments_with_defer_and_include_directives/SpreadSingleWithDefer.kt.expected +++ b/libraries/apollo-compiler/src/test/graphql/com/example/fragments_with_defer_and_include_directives/kotlin/operationBased/fragments_with_defer_and_include_directives/SpreadSingleWithDefer.kt.expected @@ -19,33 +19,32 @@ import kotlin.Any import kotlin.Boolean import kotlin.Int import kotlin.String -import kotlin.Unit +import com.example.fragments_with_defer_and_include_directives.type.Query as CompiledQuery public class SpreadSingleWithDefer() : Query { - public override fun equals(other: Any?): Boolean = other != null && other::class == this::class + override fun equals(other: Any?): Boolean = other != null && other::class == this::class - public override fun hashCode(): Int = this::class.hashCode() + override fun hashCode(): Int = this::class.hashCode() - public override fun id(): String = OPERATION_ID + override fun id(): String = OPERATION_ID - public override fun document(): String = OPERATION_DOCUMENT + override fun document(): String = OPERATION_DOCUMENT - public override fun name(): String = OPERATION_NAME + override fun name(): String = OPERATION_NAME - public override fun serializeVariables( + override fun serializeVariables( writer: JsonWriter, customScalarAdapters: CustomScalarAdapters, withBooleanDefaultValues: Boolean, - ): Unit { + ) { // This operation doesn't have any variable } - public override fun adapter(): CompositeAdapter = - SpreadSingleWithDefer_ResponseAdapter.Data.obj() + override fun adapter(): CompositeAdapter = SpreadSingleWithDefer_ResponseAdapter.Data.obj() - public override fun rootField(): CompiledField = CompiledField.Builder( + override fun rootField(): CompiledField = CompiledField.Builder( name = "data", - type = com.example.fragments_with_defer_and_include_directives.type.Query.type + type = CompiledQuery.type ) .selections(selections = SpreadSingleWithDeferSelections.__root) .build() diff --git a/libraries/apollo-compiler/src/test/graphql/com/example/fragments_with_defer_and_include_directives/kotlin/operationBased/fragments_with_defer_and_include_directives/adapter/InlineMultipleWithDeferAndInclude_ResponseAdapter.kt.expected b/libraries/apollo-compiler/src/test/graphql/com/example/fragments_with_defer_and_include_directives/kotlin/operationBased/fragments_with_defer_and_include_directives/adapter/InlineMultipleWithDeferAndInclude_ResponseAdapter.kt.expected index 2b81aae927a..2a83b2ea388 100644 --- a/libraries/apollo-compiler/src/test/graphql/com/example/fragments_with_defer_and_include_directives/kotlin/operationBased/fragments_with_defer_and_include_directives/adapter/InlineMultipleWithDeferAndInclude_ResponseAdapter.kt.expected +++ b/libraries/apollo-compiler/src/test/graphql/com/example/fragments_with_defer_and_include_directives/kotlin/operationBased/fragments_with_defer_and_include_directives/adapter/InlineMultipleWithDeferAndInclude_ResponseAdapter.kt.expected @@ -21,14 +21,13 @@ import com.apollographql.apollo3.api.possibleTypes import com.apollographql.apollo3.api.variable import com.example.fragments_with_defer_and_include_directives.InlineMultipleWithDeferAndInclude import kotlin.String -import kotlin.Unit import kotlin.collections.List public object InlineMultipleWithDeferAndInclude_ResponseAdapter { public object Data : CompositeAdapter { public val RESPONSE_NAMES: List = listOf("hero") - public override fun fromJson(reader: JsonReader, adapterContext: CompositeAdapterContext): + override fun fromJson(reader: JsonReader, adapterContext: CompositeAdapterContext): InlineMultipleWithDeferAndInclude.Data { var _hero: InlineMultipleWithDeferAndInclude.Data.Hero? = null @@ -44,11 +43,11 @@ public object InlineMultipleWithDeferAndInclude_ResponseAdapter { ) } - public override fun toJson( + override fun toJson( writer: JsonWriter, `value`: InlineMultipleWithDeferAndInclude.Data, adapterContext: CompositeAdapterContext, - ): Unit { + ) { writer.name("hero") Hero.obj(true).nullable().toJson(writer, value.hero, adapterContext) } @@ -56,7 +55,7 @@ public object InlineMultipleWithDeferAndInclude_ResponseAdapter { private object Hero : CompositeAdapter { public val RESPONSE_NAMES: List = listOf("__typename") - public override fun fromJson(reader: JsonReader, adapterContext: CompositeAdapterContext): + override fun fromJson(reader: JsonReader, adapterContext: CompositeAdapterContext): InlineMultipleWithDeferAndInclude.Data.Hero { var __typename: String? = null @@ -125,11 +124,11 @@ public object InlineMultipleWithDeferAndInclude_ResponseAdapter { ) } - public override fun toJson( + override fun toJson( writer: JsonWriter, `value`: InlineMultipleWithDeferAndInclude.Data.Hero, adapterContext: CompositeAdapterContext, - ): Unit { + ) { writer.name("__typename") StringAdapter.toJson(writer, CustomScalarAdapters.Empty, value.__typename) @@ -168,7 +167,7 @@ public object InlineMultipleWithDeferAndInclude_ResponseAdapter { CompositeAdapter { public val RESPONSE_NAMES: List = listOf("name") - public override fun fromJson(reader: JsonReader, adapterContext: CompositeAdapterContext): + override fun fromJson(reader: JsonReader, adapterContext: CompositeAdapterContext): InlineMultipleWithDeferAndInclude.Data.Hero.OnDroidIfCond1 { var _name: String? = null @@ -184,11 +183,11 @@ public object InlineMultipleWithDeferAndInclude_ResponseAdapter { ) } - public override fun toJson( + override fun toJson( writer: JsonWriter, `value`: InlineMultipleWithDeferAndInclude.Data.Hero.OnDroidIfCond1, adapterContext: CompositeAdapterContext, - ): Unit { + ) { writer.name("name") StringAdapter.toJson(writer, CustomScalarAdapters.Empty, value.name) } @@ -198,7 +197,7 @@ public object InlineMultipleWithDeferAndInclude_ResponseAdapter { CompositeAdapter { public val RESPONSE_NAMES: List = listOf("id") - public override fun fromJson(reader: JsonReader, adapterContext: CompositeAdapterContext): + override fun fromJson(reader: JsonReader, adapterContext: CompositeAdapterContext): InlineMultipleWithDeferAndInclude.Data.Hero.OnDroidIfNotCond2 { var _id: String? = null @@ -214,11 +213,11 @@ public object InlineMultipleWithDeferAndInclude_ResponseAdapter { ) } - public override fun toJson( + override fun toJson( writer: JsonWriter, `value`: InlineMultipleWithDeferAndInclude.Data.Hero.OnDroidIfNotCond2, adapterContext: CompositeAdapterContext, - ): Unit { + ) { writer.name("id") StringAdapter.toJson(writer, CustomScalarAdapters.Empty, value.id) } @@ -228,7 +227,7 @@ public object InlineMultipleWithDeferAndInclude_ResponseAdapter { CompositeAdapter { public val RESPONSE_NAMES: List = listOf("name") - public override fun fromJson(reader: JsonReader, adapterContext: CompositeAdapterContext): + override fun fromJson(reader: JsonReader, adapterContext: CompositeAdapterContext): InlineMultipleWithDeferAndInclude.Data.Hero.OnDroidDeferE_first { var _name: String? = null @@ -244,11 +243,11 @@ public object InlineMultipleWithDeferAndInclude_ResponseAdapter { ) } - public override fun toJson( + override fun toJson( writer: JsonWriter, `value`: InlineMultipleWithDeferAndInclude.Data.Hero.OnDroidDeferE_first, adapterContext: CompositeAdapterContext, - ): Unit { + ) { writer.name("name") StringAdapter.toJson(writer, CustomScalarAdapters.Empty, value.name) } @@ -258,7 +257,7 @@ public object InlineMultipleWithDeferAndInclude_ResponseAdapter { CompositeAdapter { public val RESPONSE_NAMES: List = listOf("id") - public override fun fromJson(reader: JsonReader, adapterContext: CompositeAdapterContext): + override fun fromJson(reader: JsonReader, adapterContext: CompositeAdapterContext): InlineMultipleWithDeferAndInclude.Data.Hero.OnDroidDeferE_second { var _id: String? = null @@ -274,11 +273,11 @@ public object InlineMultipleWithDeferAndInclude_ResponseAdapter { ) } - public override fun toJson( + override fun toJson( writer: JsonWriter, `value`: InlineMultipleWithDeferAndInclude.Data.Hero.OnDroidDeferE_second, adapterContext: CompositeAdapterContext, - ): Unit { + ) { writer.name("id") StringAdapter.toJson(writer, CustomScalarAdapters.Empty, value.id) } @@ -288,7 +287,7 @@ public object InlineMultipleWithDeferAndInclude_ResponseAdapter { CompositeAdapter { public val RESPONSE_NAMES: List = listOf("name") - public override fun fromJson(reader: JsonReader, adapterContext: CompositeAdapterContext): + override fun fromJson(reader: JsonReader, adapterContext: CompositeAdapterContext): InlineMultipleWithDeferAndInclude.Data.Hero.OnDroidDeferE_third { var _name: String? = null @@ -304,11 +303,11 @@ public object InlineMultipleWithDeferAndInclude_ResponseAdapter { ) } - public override fun toJson( + override fun toJson( writer: JsonWriter, `value`: InlineMultipleWithDeferAndInclude.Data.Hero.OnDroidDeferE_third, adapterContext: CompositeAdapterContext, - ): Unit { + ) { writer.name("name") StringAdapter.toJson(writer, CustomScalarAdapters.Empty, value.name) } @@ -318,7 +317,7 @@ public object InlineMultipleWithDeferAndInclude_ResponseAdapter { CompositeAdapter { public val RESPONSE_NAMES: List = listOf("id") - public override fun fromJson(reader: JsonReader, adapterContext: CompositeAdapterContext): + override fun fromJson(reader: JsonReader, adapterContext: CompositeAdapterContext): InlineMultipleWithDeferAndInclude.Data.Hero.OnDroidDeferE_fourth { var _id: String? = null @@ -334,11 +333,11 @@ public object InlineMultipleWithDeferAndInclude_ResponseAdapter { ) } - public override fun toJson( + override fun toJson( writer: JsonWriter, `value`: InlineMultipleWithDeferAndInclude.Data.Hero.OnDroidDeferE_fourth, adapterContext: CompositeAdapterContext, - ): Unit { + ) { writer.name("id") StringAdapter.toJson(writer, CustomScalarAdapters.Empty, value.id) } diff --git a/libraries/apollo-compiler/src/test/graphql/com/example/fragments_with_defer_and_include_directives/kotlin/operationBased/fragments_with_defer_and_include_directives/adapter/InlineMultipleWithDeferAndInclude_VariablesAdapter.kt.expected b/libraries/apollo-compiler/src/test/graphql/com/example/fragments_with_defer_and_include_directives/kotlin/operationBased/fragments_with_defer_and_include_directives/adapter/InlineMultipleWithDeferAndInclude_VariablesAdapter.kt.expected index 1d9b8484526..6b2c437d21b 100644 --- a/libraries/apollo-compiler/src/test/graphql/com/example/fragments_with_defer_and_include_directives/kotlin/operationBased/fragments_with_defer_and_include_directives/adapter/InlineMultipleWithDeferAndInclude_VariablesAdapter.kt.expected +++ b/libraries/apollo-compiler/src/test/graphql/com/example/fragments_with_defer_and_include_directives/kotlin/operationBased/fragments_with_defer_and_include_directives/adapter/InlineMultipleWithDeferAndInclude_VariablesAdapter.kt.expected @@ -12,7 +12,6 @@ import com.apollographql.apollo3.api.json.JsonWriter import com.example.fragments_with_defer_and_include_directives.InlineMultipleWithDeferAndInclude import kotlin.Boolean import kotlin.Suppress -import kotlin.Unit public object InlineMultipleWithDeferAndInclude_VariablesAdapter { @Suppress( @@ -24,7 +23,7 @@ public object InlineMultipleWithDeferAndInclude_VariablesAdapter { `value`: InlineMultipleWithDeferAndInclude, customScalarAdapters: CustomScalarAdapters, withBooleanDefaultValues: Boolean, - ): Unit { + ) { val adapterContext = CompositeAdapterContext.Builder().customScalarAdapters(customScalarAdapters).build() writer.name("cond1") diff --git a/libraries/apollo-compiler/src/test/graphql/com/example/fragments_with_defer_and_include_directives/kotlin/operationBased/fragments_with_defer_and_include_directives/adapter/InlineMultipleWithDeferWithIf_ResponseAdapter.kt.expected b/libraries/apollo-compiler/src/test/graphql/com/example/fragments_with_defer_and_include_directives/kotlin/operationBased/fragments_with_defer_and_include_directives/adapter/InlineMultipleWithDeferWithIf_ResponseAdapter.kt.expected index b5bb5573436..6a0bbde15f3 100644 --- a/libraries/apollo-compiler/src/test/graphql/com/example/fragments_with_defer_and_include_directives/kotlin/operationBased/fragments_with_defer_and_include_directives/adapter/InlineMultipleWithDeferWithIf_ResponseAdapter.kt.expected +++ b/libraries/apollo-compiler/src/test/graphql/com/example/fragments_with_defer_and_include_directives/kotlin/operationBased/fragments_with_defer_and_include_directives/adapter/InlineMultipleWithDeferWithIf_ResponseAdapter.kt.expected @@ -20,14 +20,13 @@ import com.apollographql.apollo3.api.or import com.apollographql.apollo3.api.variable import com.example.fragments_with_defer_and_include_directives.InlineMultipleWithDeferWithIf import kotlin.String -import kotlin.Unit import kotlin.collections.List public object InlineMultipleWithDeferWithIf_ResponseAdapter { public object Data : CompositeAdapter { public val RESPONSE_NAMES: List = listOf("hero") - public override fun fromJson(reader: JsonReader, adapterContext: CompositeAdapterContext): + override fun fromJson(reader: JsonReader, adapterContext: CompositeAdapterContext): InlineMultipleWithDeferWithIf.Data { var _hero: InlineMultipleWithDeferWithIf.Data.Hero? = null @@ -43,11 +42,11 @@ public object InlineMultipleWithDeferWithIf_ResponseAdapter { ) } - public override fun toJson( + override fun toJson( writer: JsonWriter, `value`: InlineMultipleWithDeferWithIf.Data, adapterContext: CompositeAdapterContext, - ): Unit { + ) { writer.name("hero") Hero.obj(true).nullable().toJson(writer, value.hero, adapterContext) } @@ -55,7 +54,7 @@ public object InlineMultipleWithDeferWithIf_ResponseAdapter { private object Hero : CompositeAdapter { public val RESPONSE_NAMES: List = listOf("__typename") - public override fun fromJson(reader: JsonReader, adapterContext: CompositeAdapterContext): + override fun fromJson(reader: JsonReader, adapterContext: CompositeAdapterContext): InlineMultipleWithDeferWithIf.Data.Hero { var __typename: String? = null @@ -93,11 +92,11 @@ public object InlineMultipleWithDeferWithIf_ResponseAdapter { ) } - public override fun toJson( + override fun toJson( writer: JsonWriter, `value`: InlineMultipleWithDeferWithIf.Data.Hero, adapterContext: CompositeAdapterContext, - ): Unit { + ) { writer.name("__typename") StringAdapter.toJson(writer, CustomScalarAdapters.Empty, value.__typename) @@ -119,7 +118,7 @@ public object InlineMultipleWithDeferWithIf_ResponseAdapter { CompositeAdapter { public val RESPONSE_NAMES: List = listOf("id") - public override fun fromJson(reader: JsonReader, adapterContext: CompositeAdapterContext): + override fun fromJson(reader: JsonReader, adapterContext: CompositeAdapterContext): InlineMultipleWithDeferWithIf.Data.Hero.OnCharacter { var _id: String? = null @@ -135,11 +134,11 @@ public object InlineMultipleWithDeferWithIf_ResponseAdapter { ) } - public override fun toJson( + override fun toJson( writer: JsonWriter, `value`: InlineMultipleWithDeferWithIf.Data.Hero.OnCharacter, adapterContext: CompositeAdapterContext, - ): Unit { + ) { writer.name("id") StringAdapter.toJson(writer, CustomScalarAdapters.Empty, value.id) } @@ -149,7 +148,7 @@ public object InlineMultipleWithDeferWithIf_ResponseAdapter { CompositeAdapter { public val RESPONSE_NAMES: List = listOf("name") - public override fun fromJson(reader: JsonReader, adapterContext: CompositeAdapterContext): + override fun fromJson(reader: JsonReader, adapterContext: CompositeAdapterContext): InlineMultipleWithDeferWithIf.Data.Hero.OnCharacterDeferF_second { var _name: String? = null @@ -165,11 +164,11 @@ public object InlineMultipleWithDeferWithIf_ResponseAdapter { ) } - public override fun toJson( + override fun toJson( writer: JsonWriter, `value`: InlineMultipleWithDeferWithIf.Data.Hero.OnCharacterDeferF_second, adapterContext: CompositeAdapterContext, - ): Unit { + ) { writer.name("name") StringAdapter.toJson(writer, CustomScalarAdapters.Empty, value.name) } @@ -179,7 +178,7 @@ public object InlineMultipleWithDeferWithIf_ResponseAdapter { CompositeAdapter { public val RESPONSE_NAMES: List = listOf("name") - public override fun fromJson(reader: JsonReader, adapterContext: CompositeAdapterContext): + override fun fromJson(reader: JsonReader, adapterContext: CompositeAdapterContext): InlineMultipleWithDeferWithIf.Data.Hero.OnCharacterDeferF_third { var _name: String? = null @@ -195,11 +194,11 @@ public object InlineMultipleWithDeferWithIf_ResponseAdapter { ) } - public override fun toJson( + override fun toJson( writer: JsonWriter, `value`: InlineMultipleWithDeferWithIf.Data.Hero.OnCharacterDeferF_third, adapterContext: CompositeAdapterContext, - ): Unit { + ) { writer.name("name") StringAdapter.toJson(writer, CustomScalarAdapters.Empty, value.name) } diff --git a/libraries/apollo-compiler/src/test/graphql/com/example/fragments_with_defer_and_include_directives/kotlin/operationBased/fragments_with_defer_and_include_directives/adapter/InlineMultipleWithDeferWithIf_VariablesAdapter.kt.expected b/libraries/apollo-compiler/src/test/graphql/com/example/fragments_with_defer_and_include_directives/kotlin/operationBased/fragments_with_defer_and_include_directives/adapter/InlineMultipleWithDeferWithIf_VariablesAdapter.kt.expected index b1f9030762c..1383b80c72f 100644 --- a/libraries/apollo-compiler/src/test/graphql/com/example/fragments_with_defer_and_include_directives/kotlin/operationBased/fragments_with_defer_and_include_directives/adapter/InlineMultipleWithDeferWithIf_VariablesAdapter.kt.expected +++ b/libraries/apollo-compiler/src/test/graphql/com/example/fragments_with_defer_and_include_directives/kotlin/operationBased/fragments_with_defer_and_include_directives/adapter/InlineMultipleWithDeferWithIf_VariablesAdapter.kt.expected @@ -12,7 +12,6 @@ import com.apollographql.apollo3.api.json.JsonWriter import com.example.fragments_with_defer_and_include_directives.InlineMultipleWithDeferWithIf import kotlin.Boolean import kotlin.Suppress -import kotlin.Unit public object InlineMultipleWithDeferWithIf_VariablesAdapter { @Suppress( @@ -24,7 +23,7 @@ public object InlineMultipleWithDeferWithIf_VariablesAdapter { `value`: InlineMultipleWithDeferWithIf, customScalarAdapters: CustomScalarAdapters, withBooleanDefaultValues: Boolean, - ): Unit { + ) { val adapterContext = CompositeAdapterContext.Builder().customScalarAdapters(customScalarAdapters).build() writer.name("cond") diff --git a/libraries/apollo-compiler/src/test/graphql/com/example/fragments_with_defer_and_include_directives/kotlin/operationBased/fragments_with_defer_and_include_directives/adapter/InlineMultipleWithDefer_ResponseAdapter.kt.expected b/libraries/apollo-compiler/src/test/graphql/com/example/fragments_with_defer_and_include_directives/kotlin/operationBased/fragments_with_defer_and_include_directives/adapter/InlineMultipleWithDefer_ResponseAdapter.kt.expected index 027ca7cc297..40bc03637ad 100644 --- a/libraries/apollo-compiler/src/test/graphql/com/example/fragments_with_defer_and_include_directives/kotlin/operationBased/fragments_with_defer_and_include_directives/adapter/InlineMultipleWithDefer_ResponseAdapter.kt.expected +++ b/libraries/apollo-compiler/src/test/graphql/com/example/fragments_with_defer_and_include_directives/kotlin/operationBased/fragments_with_defer_and_include_directives/adapter/InlineMultipleWithDefer_ResponseAdapter.kt.expected @@ -19,14 +19,13 @@ import com.apollographql.apollo3.api.obj import com.apollographql.apollo3.api.possibleTypes import com.example.fragments_with_defer_and_include_directives.InlineMultipleWithDefer import kotlin.String -import kotlin.Unit import kotlin.collections.List public object InlineMultipleWithDefer_ResponseAdapter { public object Data : CompositeAdapter { public val RESPONSE_NAMES: List = listOf("hero") - public override fun fromJson(reader: JsonReader, adapterContext: CompositeAdapterContext): + override fun fromJson(reader: JsonReader, adapterContext: CompositeAdapterContext): InlineMultipleWithDefer.Data { var _hero: InlineMultipleWithDefer.Data.Hero? = null @@ -42,11 +41,11 @@ public object InlineMultipleWithDefer_ResponseAdapter { ) } - public override fun toJson( + override fun toJson( writer: JsonWriter, `value`: InlineMultipleWithDefer.Data, adapterContext: CompositeAdapterContext, - ): Unit { + ) { writer.name("hero") Hero.obj(true).nullable().toJson(writer, value.hero, adapterContext) } @@ -54,7 +53,7 @@ public object InlineMultipleWithDefer_ResponseAdapter { private object Hero : CompositeAdapter { public val RESPONSE_NAMES: List = listOf("__typename") - public override fun fromJson(reader: JsonReader, adapterContext: CompositeAdapterContext): + override fun fromJson(reader: JsonReader, adapterContext: CompositeAdapterContext): InlineMultipleWithDefer.Data.Hero { var __typename: String? = null @@ -91,11 +90,11 @@ public object InlineMultipleWithDefer_ResponseAdapter { ) } - public override fun toJson( + override fun toJson( writer: JsonWriter, `value`: InlineMultipleWithDefer.Data.Hero, adapterContext: CompositeAdapterContext, - ): Unit { + ) { writer.name("__typename") StringAdapter.toJson(writer, CustomScalarAdapters.Empty, value.__typename) @@ -114,7 +113,7 @@ public object InlineMultipleWithDefer_ResponseAdapter { CompositeAdapter { public val RESPONSE_NAMES: List = listOf("name") - public override fun fromJson(reader: JsonReader, adapterContext: CompositeAdapterContext): + override fun fromJson(reader: JsonReader, adapterContext: CompositeAdapterContext): InlineMultipleWithDefer.Data.Hero.OnDroidDeferD_first { var _name: String? = null @@ -130,11 +129,11 @@ public object InlineMultipleWithDefer_ResponseAdapter { ) } - public override fun toJson( + override fun toJson( writer: JsonWriter, `value`: InlineMultipleWithDefer.Data.Hero.OnDroidDeferD_first, adapterContext: CompositeAdapterContext, - ): Unit { + ) { writer.name("name") StringAdapter.toJson(writer, CustomScalarAdapters.Empty, value.name) } @@ -144,7 +143,7 @@ public object InlineMultipleWithDefer_ResponseAdapter { CompositeAdapter { public val RESPONSE_NAMES: List = listOf("id") - public override fun fromJson(reader: JsonReader, adapterContext: CompositeAdapterContext): + override fun fromJson(reader: JsonReader, adapterContext: CompositeAdapterContext): InlineMultipleWithDefer.Data.Hero.OnDroidDeferD_second { var _id: String? = null @@ -160,11 +159,11 @@ public object InlineMultipleWithDefer_ResponseAdapter { ) } - public override fun toJson( + override fun toJson( writer: JsonWriter, `value`: InlineMultipleWithDefer.Data.Hero.OnDroidDeferD_second, adapterContext: CompositeAdapterContext, - ): Unit { + ) { writer.name("id") StringAdapter.toJson(writer, CustomScalarAdapters.Empty, value.id) } diff --git a/libraries/apollo-compiler/src/test/graphql/com/example/fragments_with_defer_and_include_directives/kotlin/operationBased/fragments_with_defer_and_include_directives/adapter/InlineSingleWithDefer_ResponseAdapter.kt.expected b/libraries/apollo-compiler/src/test/graphql/com/example/fragments_with_defer_and_include_directives/kotlin/operationBased/fragments_with_defer_and_include_directives/adapter/InlineSingleWithDefer_ResponseAdapter.kt.expected index 67338cd7b04..ce7d78d465e 100644 --- a/libraries/apollo-compiler/src/test/graphql/com/example/fragments_with_defer_and_include_directives/kotlin/operationBased/fragments_with_defer_and_include_directives/adapter/InlineSingleWithDefer_ResponseAdapter.kt.expected +++ b/libraries/apollo-compiler/src/test/graphql/com/example/fragments_with_defer_and_include_directives/kotlin/operationBased/fragments_with_defer_and_include_directives/adapter/InlineSingleWithDefer_ResponseAdapter.kt.expected @@ -19,14 +19,13 @@ import com.apollographql.apollo3.api.obj import com.apollographql.apollo3.api.possibleTypes import com.example.fragments_with_defer_and_include_directives.InlineSingleWithDefer import kotlin.String -import kotlin.Unit import kotlin.collections.List public object InlineSingleWithDefer_ResponseAdapter { public object Data : CompositeAdapter { public val RESPONSE_NAMES: List = listOf("hero") - public override fun fromJson(reader: JsonReader, adapterContext: CompositeAdapterContext): + override fun fromJson(reader: JsonReader, adapterContext: CompositeAdapterContext): InlineSingleWithDefer.Data { var _hero: InlineSingleWithDefer.Data.Hero? = null @@ -42,11 +41,11 @@ public object InlineSingleWithDefer_ResponseAdapter { ) } - public override fun toJson( + override fun toJson( writer: JsonWriter, `value`: InlineSingleWithDefer.Data, adapterContext: CompositeAdapterContext, - ): Unit { + ) { writer.name("hero") Hero.obj(true).nullable().toJson(writer, value.hero, adapterContext) } @@ -54,7 +53,7 @@ public object InlineSingleWithDefer_ResponseAdapter { private object Hero : CompositeAdapter { public val RESPONSE_NAMES: List = listOf("__typename") - public override fun fromJson(reader: JsonReader, adapterContext: CompositeAdapterContext): + override fun fromJson(reader: JsonReader, adapterContext: CompositeAdapterContext): InlineSingleWithDefer.Data.Hero { var __typename: String? = null @@ -83,11 +82,11 @@ public object InlineSingleWithDefer_ResponseAdapter { ) } - public override fun toJson( + override fun toJson( writer: JsonWriter, `value`: InlineSingleWithDefer.Data.Hero, adapterContext: CompositeAdapterContext, - ): Unit { + ) { writer.name("__typename") StringAdapter.toJson(writer, CustomScalarAdapters.Empty, value.__typename) @@ -100,7 +99,7 @@ public object InlineSingleWithDefer_ResponseAdapter { private object OnDroid : CompositeAdapter { public val RESPONSE_NAMES: List = listOf("name") - public override fun fromJson(reader: JsonReader, adapterContext: CompositeAdapterContext): + override fun fromJson(reader: JsonReader, adapterContext: CompositeAdapterContext): InlineSingleWithDefer.Data.Hero.OnDroid { var _name: String? = null @@ -116,11 +115,11 @@ public object InlineSingleWithDefer_ResponseAdapter { ) } - public override fun toJson( + override fun toJson( writer: JsonWriter, `value`: InlineSingleWithDefer.Data.Hero.OnDroid, adapterContext: CompositeAdapterContext, - ): Unit { + ) { writer.name("name") StringAdapter.toJson(writer, CustomScalarAdapters.Empty, value.name) } diff --git a/libraries/apollo-compiler/src/test/graphql/com/example/fragments_with_defer_and_include_directives/kotlin/operationBased/fragments_with_defer_and_include_directives/adapter/SpreadMultipleWithDeferAndInclude_ResponseAdapter.kt.expected b/libraries/apollo-compiler/src/test/graphql/com/example/fragments_with_defer_and_include_directives/kotlin/operationBased/fragments_with_defer_and_include_directives/adapter/SpreadMultipleWithDeferAndInclude_ResponseAdapter.kt.expected index c4dcd5f0392..0edd1860972 100644 --- a/libraries/apollo-compiler/src/test/graphql/com/example/fragments_with_defer_and_include_directives/kotlin/operationBased/fragments_with_defer_and_include_directives/adapter/SpreadMultipleWithDeferAndInclude_ResponseAdapter.kt.expected +++ b/libraries/apollo-compiler/src/test/graphql/com/example/fragments_with_defer_and_include_directives/kotlin/operationBased/fragments_with_defer_and_include_directives/adapter/SpreadMultipleWithDeferAndInclude_ResponseAdapter.kt.expected @@ -23,14 +23,13 @@ import com.apollographql.apollo3.api.variable import com.example.fragments_with_defer_and_include_directives.SpreadMultipleWithDeferAndInclude import com.example.fragments_with_defer_and_include_directives.fragment.DroidDetails import kotlin.String -import kotlin.Unit import kotlin.collections.List public object SpreadMultipleWithDeferAndInclude_ResponseAdapter { public object Data : CompositeAdapter { public val RESPONSE_NAMES: List = listOf("hero") - public override fun fromJson(reader: JsonReader, adapterContext: CompositeAdapterContext): + override fun fromJson(reader: JsonReader, adapterContext: CompositeAdapterContext): SpreadMultipleWithDeferAndInclude.Data { var _hero: SpreadMultipleWithDeferAndInclude.Data.Hero? = null @@ -46,11 +45,11 @@ public object SpreadMultipleWithDeferAndInclude_ResponseAdapter { ) } - public override fun toJson( + override fun toJson( writer: JsonWriter, `value`: SpreadMultipleWithDeferAndInclude.Data, adapterContext: CompositeAdapterContext, - ): Unit { + ) { writer.name("hero") Hero.obj(true).nullable().toJson(writer, value.hero, adapterContext) } @@ -58,7 +57,7 @@ public object SpreadMultipleWithDeferAndInclude_ResponseAdapter { private object Hero : CompositeAdapter { public val RESPONSE_NAMES: List = listOf("__typename") - public override fun fromJson(reader: JsonReader, adapterContext: CompositeAdapterContext): + override fun fromJson(reader: JsonReader, adapterContext: CompositeAdapterContext): SpreadMultipleWithDeferAndInclude.Data.Hero { var __typename: String? = null @@ -87,11 +86,11 @@ public object SpreadMultipleWithDeferAndInclude_ResponseAdapter { ) } - public override fun toJson( + override fun toJson( writer: JsonWriter, `value`: SpreadMultipleWithDeferAndInclude.Data.Hero, adapterContext: CompositeAdapterContext, - ): Unit { + ) { writer.name("__typename") StringAdapter.toJson(writer, CustomScalarAdapters.Empty, value.__typename) diff --git a/libraries/apollo-compiler/src/test/graphql/com/example/fragments_with_defer_and_include_directives/kotlin/operationBased/fragments_with_defer_and_include_directives/adapter/SpreadMultipleWithDeferAndInclude_VariablesAdapter.kt.expected b/libraries/apollo-compiler/src/test/graphql/com/example/fragments_with_defer_and_include_directives/kotlin/operationBased/fragments_with_defer_and_include_directives/adapter/SpreadMultipleWithDeferAndInclude_VariablesAdapter.kt.expected index c1e3466f37e..c2a11f3684f 100644 --- a/libraries/apollo-compiler/src/test/graphql/com/example/fragments_with_defer_and_include_directives/kotlin/operationBased/fragments_with_defer_and_include_directives/adapter/SpreadMultipleWithDeferAndInclude_VariablesAdapter.kt.expected +++ b/libraries/apollo-compiler/src/test/graphql/com/example/fragments_with_defer_and_include_directives/kotlin/operationBased/fragments_with_defer_and_include_directives/adapter/SpreadMultipleWithDeferAndInclude_VariablesAdapter.kt.expected @@ -12,7 +12,6 @@ import com.apollographql.apollo3.api.json.JsonWriter import com.example.fragments_with_defer_and_include_directives.SpreadMultipleWithDeferAndInclude import kotlin.Boolean import kotlin.Suppress -import kotlin.Unit public object SpreadMultipleWithDeferAndInclude_VariablesAdapter { @Suppress( @@ -24,7 +23,7 @@ public object SpreadMultipleWithDeferAndInclude_VariablesAdapter { `value`: SpreadMultipleWithDeferAndInclude, customScalarAdapters: CustomScalarAdapters, withBooleanDefaultValues: Boolean, - ): Unit { + ) { val adapterContext = CompositeAdapterContext.Builder().customScalarAdapters(customScalarAdapters).build() writer.name("cond1") diff --git a/libraries/apollo-compiler/src/test/graphql/com/example/fragments_with_defer_and_include_directives/kotlin/operationBased/fragments_with_defer_and_include_directives/adapter/SpreadMultipleWithDeferWithIf_ResponseAdapter.kt.expected b/libraries/apollo-compiler/src/test/graphql/com/example/fragments_with_defer_and_include_directives/kotlin/operationBased/fragments_with_defer_and_include_directives/adapter/SpreadMultipleWithDeferWithIf_ResponseAdapter.kt.expected index 0cf5bf90a68..2ccb4396fb7 100644 --- a/libraries/apollo-compiler/src/test/graphql/com/example/fragments_with_defer_and_include_directives/kotlin/operationBased/fragments_with_defer_and_include_directives/adapter/SpreadMultipleWithDeferWithIf_ResponseAdapter.kt.expected +++ b/libraries/apollo-compiler/src/test/graphql/com/example/fragments_with_defer_and_include_directives/kotlin/operationBased/fragments_with_defer_and_include_directives/adapter/SpreadMultipleWithDeferWithIf_ResponseAdapter.kt.expected @@ -25,14 +25,13 @@ import com.example.fragments_with_defer_and_include_directives.fragment.Characte import com.example.fragments_with_defer_and_include_directives.fragment.CharacterDetails2 import com.example.fragments_with_defer_and_include_directives.fragment.CharacterDetails3 import kotlin.String -import kotlin.Unit import kotlin.collections.List public object SpreadMultipleWithDeferWithIf_ResponseAdapter { public object Data : CompositeAdapter { public val RESPONSE_NAMES: List = listOf("hero") - public override fun fromJson(reader: JsonReader, adapterContext: CompositeAdapterContext): + override fun fromJson(reader: JsonReader, adapterContext: CompositeAdapterContext): SpreadMultipleWithDeferWithIf.Data { var _hero: SpreadMultipleWithDeferWithIf.Data.Hero? = null @@ -48,11 +47,11 @@ public object SpreadMultipleWithDeferWithIf_ResponseAdapter { ) } - public override fun toJson( + override fun toJson( writer: JsonWriter, `value`: SpreadMultipleWithDeferWithIf.Data, adapterContext: CompositeAdapterContext, - ): Unit { + ) { writer.name("hero") Hero.obj(true).nullable().toJson(writer, value.hero, adapterContext) } @@ -60,7 +59,7 @@ public object SpreadMultipleWithDeferWithIf_ResponseAdapter { private object Hero : CompositeAdapter { public val RESPONSE_NAMES: List = listOf("__typename") - public override fun fromJson(reader: JsonReader, adapterContext: CompositeAdapterContext): + override fun fromJson(reader: JsonReader, adapterContext: CompositeAdapterContext): SpreadMultipleWithDeferWithIf.Data.Hero { var __typename: String? = null @@ -105,11 +104,11 @@ public object SpreadMultipleWithDeferWithIf_ResponseAdapter { ) } - public override fun toJson( + override fun toJson( writer: JsonWriter, `value`: SpreadMultipleWithDeferWithIf.Data.Hero, adapterContext: CompositeAdapterContext, - ): Unit { + ) { writer.name("__typename") StringAdapter.toJson(writer, CustomScalarAdapters.Empty, value.__typename) diff --git a/libraries/apollo-compiler/src/test/graphql/com/example/fragments_with_defer_and_include_directives/kotlin/operationBased/fragments_with_defer_and_include_directives/adapter/SpreadMultipleWithDeferWithIf_VariablesAdapter.kt.expected b/libraries/apollo-compiler/src/test/graphql/com/example/fragments_with_defer_and_include_directives/kotlin/operationBased/fragments_with_defer_and_include_directives/adapter/SpreadMultipleWithDeferWithIf_VariablesAdapter.kt.expected index 3da821a7050..279affda2b1 100644 --- a/libraries/apollo-compiler/src/test/graphql/com/example/fragments_with_defer_and_include_directives/kotlin/operationBased/fragments_with_defer_and_include_directives/adapter/SpreadMultipleWithDeferWithIf_VariablesAdapter.kt.expected +++ b/libraries/apollo-compiler/src/test/graphql/com/example/fragments_with_defer_and_include_directives/kotlin/operationBased/fragments_with_defer_and_include_directives/adapter/SpreadMultipleWithDeferWithIf_VariablesAdapter.kt.expected @@ -12,7 +12,6 @@ import com.apollographql.apollo3.api.json.JsonWriter import com.example.fragments_with_defer_and_include_directives.SpreadMultipleWithDeferWithIf import kotlin.Boolean import kotlin.Suppress -import kotlin.Unit public object SpreadMultipleWithDeferWithIf_VariablesAdapter { @Suppress( @@ -24,7 +23,7 @@ public object SpreadMultipleWithDeferWithIf_VariablesAdapter { `value`: SpreadMultipleWithDeferWithIf, customScalarAdapters: CustomScalarAdapters, withBooleanDefaultValues: Boolean, - ): Unit { + ) { val adapterContext = CompositeAdapterContext.Builder().customScalarAdapters(customScalarAdapters).build() writer.name("cond") diff --git a/libraries/apollo-compiler/src/test/graphql/com/example/fragments_with_defer_and_include_directives/kotlin/operationBased/fragments_with_defer_and_include_directives/adapter/SpreadMultipleWithDefer_ResponseAdapter.kt.expected b/libraries/apollo-compiler/src/test/graphql/com/example/fragments_with_defer_and_include_directives/kotlin/operationBased/fragments_with_defer_and_include_directives/adapter/SpreadMultipleWithDefer_ResponseAdapter.kt.expected index 2ff6c5eb9fc..4de4128e2d8 100644 --- a/libraries/apollo-compiler/src/test/graphql/com/example/fragments_with_defer_and_include_directives/kotlin/operationBased/fragments_with_defer_and_include_directives/adapter/SpreadMultipleWithDefer_ResponseAdapter.kt.expected +++ b/libraries/apollo-compiler/src/test/graphql/com/example/fragments_with_defer_and_include_directives/kotlin/operationBased/fragments_with_defer_and_include_directives/adapter/SpreadMultipleWithDefer_ResponseAdapter.kt.expected @@ -21,14 +21,13 @@ import com.apollographql.apollo3.api.possibleTypes import com.example.fragments_with_defer_and_include_directives.SpreadMultipleWithDefer import com.example.fragments_with_defer_and_include_directives.fragment.DroidDetails import kotlin.String -import kotlin.Unit import kotlin.collections.List public object SpreadMultipleWithDefer_ResponseAdapter { public object Data : CompositeAdapter { public val RESPONSE_NAMES: List = listOf("hero") - public override fun fromJson(reader: JsonReader, adapterContext: CompositeAdapterContext): + override fun fromJson(reader: JsonReader, adapterContext: CompositeAdapterContext): SpreadMultipleWithDefer.Data { var _hero: SpreadMultipleWithDefer.Data.Hero? = null @@ -44,11 +43,11 @@ public object SpreadMultipleWithDefer_ResponseAdapter { ) } - public override fun toJson( + override fun toJson( writer: JsonWriter, `value`: SpreadMultipleWithDefer.Data, adapterContext: CompositeAdapterContext, - ): Unit { + ) { writer.name("hero") Hero.obj(true).nullable().toJson(writer, value.hero, adapterContext) } @@ -56,7 +55,7 @@ public object SpreadMultipleWithDefer_ResponseAdapter { private object Hero : CompositeAdapter { public val RESPONSE_NAMES: List = listOf("__typename") - public override fun fromJson(reader: JsonReader, adapterContext: CompositeAdapterContext): + override fun fromJson(reader: JsonReader, adapterContext: CompositeAdapterContext): SpreadMultipleWithDefer.Data.Hero { var __typename: String? = null @@ -85,11 +84,11 @@ public object SpreadMultipleWithDefer_ResponseAdapter { ) } - public override fun toJson( + override fun toJson( writer: JsonWriter, `value`: SpreadMultipleWithDefer.Data.Hero, adapterContext: CompositeAdapterContext, - ): Unit { + ) { writer.name("__typename") StringAdapter.toJson(writer, CustomScalarAdapters.Empty, value.__typename) diff --git a/libraries/apollo-compiler/src/test/graphql/com/example/fragments_with_defer_and_include_directives/kotlin/operationBased/fragments_with_defer_and_include_directives/adapter/SpreadSingleWithDefer_ResponseAdapter.kt.expected b/libraries/apollo-compiler/src/test/graphql/com/example/fragments_with_defer_and_include_directives/kotlin/operationBased/fragments_with_defer_and_include_directives/adapter/SpreadSingleWithDefer_ResponseAdapter.kt.expected index 4c0da155770..90292e3a0a7 100644 --- a/libraries/apollo-compiler/src/test/graphql/com/example/fragments_with_defer_and_include_directives/kotlin/operationBased/fragments_with_defer_and_include_directives/adapter/SpreadSingleWithDefer_ResponseAdapter.kt.expected +++ b/libraries/apollo-compiler/src/test/graphql/com/example/fragments_with_defer_and_include_directives/kotlin/operationBased/fragments_with_defer_and_include_directives/adapter/SpreadSingleWithDefer_ResponseAdapter.kt.expected @@ -20,14 +20,13 @@ import com.apollographql.apollo3.api.possibleTypes import com.example.fragments_with_defer_and_include_directives.SpreadSingleWithDefer import com.example.fragments_with_defer_and_include_directives.fragment.DroidDetails import kotlin.String -import kotlin.Unit import kotlin.collections.List public object SpreadSingleWithDefer_ResponseAdapter { public object Data : CompositeAdapter { public val RESPONSE_NAMES: List = listOf("hero") - public override fun fromJson(reader: JsonReader, adapterContext: CompositeAdapterContext): + override fun fromJson(reader: JsonReader, adapterContext: CompositeAdapterContext): SpreadSingleWithDefer.Data { var _hero: SpreadSingleWithDefer.Data.Hero? = null @@ -43,11 +42,11 @@ public object SpreadSingleWithDefer_ResponseAdapter { ) } - public override fun toJson( + override fun toJson( writer: JsonWriter, `value`: SpreadSingleWithDefer.Data, adapterContext: CompositeAdapterContext, - ): Unit { + ) { writer.name("hero") Hero.obj(true).nullable().toJson(writer, value.hero, adapterContext) } @@ -55,7 +54,7 @@ public object SpreadSingleWithDefer_ResponseAdapter { private object Hero : CompositeAdapter { public val RESPONSE_NAMES: List = listOf("__typename") - public override fun fromJson(reader: JsonReader, adapterContext: CompositeAdapterContext): + override fun fromJson(reader: JsonReader, adapterContext: CompositeAdapterContext): SpreadSingleWithDefer.Data.Hero { var __typename: String? = null @@ -84,11 +83,11 @@ public object SpreadSingleWithDefer_ResponseAdapter { ) } - public override fun toJson( + override fun toJson( writer: JsonWriter, `value`: SpreadSingleWithDefer.Data.Hero, adapterContext: CompositeAdapterContext, - ): Unit { + ) { writer.name("__typename") StringAdapter.toJson(writer, CustomScalarAdapters.Empty, value.__typename) diff --git a/libraries/apollo-compiler/src/test/graphql/com/example/fragments_with_defer_and_include_directives/kotlin/operationBased/fragments_with_defer_and_include_directives/fragment/CharacterDetails2Impl.kt.expected b/libraries/apollo-compiler/src/test/graphql/com/example/fragments_with_defer_and_include_directives/kotlin/operationBased/fragments_with_defer_and_include_directives/fragment/CharacterDetails2Impl.kt.expected index dae0a528d49..04002c8379d 100644 --- a/libraries/apollo-compiler/src/test/graphql/com/example/fragments_with_defer_and_include_directives/kotlin/operationBased/fragments_with_defer_and_include_directives/fragment/CharacterDetails2Impl.kt.expected +++ b/libraries/apollo-compiler/src/test/graphql/com/example/fragments_with_defer_and_include_directives/kotlin/operationBased/fragments_with_defer_and_include_directives/fragment/CharacterDetails2Impl.kt.expected @@ -16,25 +16,24 @@ import com.example.fragments_with_defer_and_include_directives.type.Droid import kotlin.Any import kotlin.Boolean import kotlin.Int -import kotlin.Unit public class CharacterDetails2Impl() : Fragment { - public override fun equals(other: Any?): Boolean = other != null && other::class == this::class + override fun equals(other: Any?): Boolean = other != null && other::class == this::class - public override fun hashCode(): Int = this::class.hashCode() + override fun hashCode(): Int = this::class.hashCode() - public override fun serializeVariables( + override fun serializeVariables( writer: JsonWriter, customScalarAdapters: CustomScalarAdapters, withBooleanDefaultValues: Boolean, - ): Unit { + ) { // This fragment doesn't have any variable } - public override fun adapter(): CompositeAdapter = + override fun adapter(): CompositeAdapter = CharacterDetails2Impl_ResponseAdapter.CharacterDetails2.obj() - public override fun rootField(): CompiledField = CompiledField.Builder( + override fun rootField(): CompiledField = CompiledField.Builder( name = "data", type = Droid.type ) diff --git a/libraries/apollo-compiler/src/test/graphql/com/example/fragments_with_defer_and_include_directives/kotlin/operationBased/fragments_with_defer_and_include_directives/fragment/CharacterDetails2Impl_ResponseAdapter.kt.expected b/libraries/apollo-compiler/src/test/graphql/com/example/fragments_with_defer_and_include_directives/kotlin/operationBased/fragments_with_defer_and_include_directives/fragment/CharacterDetails2Impl_ResponseAdapter.kt.expected index d4d293c670f..e0b240bfb60 100644 --- a/libraries/apollo-compiler/src/test/graphql/com/example/fragments_with_defer_and_include_directives/kotlin/operationBased/fragments_with_defer_and_include_directives/fragment/CharacterDetails2Impl_ResponseAdapter.kt.expected +++ b/libraries/apollo-compiler/src/test/graphql/com/example/fragments_with_defer_and_include_directives/kotlin/operationBased/fragments_with_defer_and_include_directives/fragment/CharacterDetails2Impl_ResponseAdapter.kt.expected @@ -12,7 +12,6 @@ import com.apollographql.apollo3.api.StringAdapter import com.apollographql.apollo3.api.json.JsonReader import com.apollographql.apollo3.api.json.JsonWriter import kotlin.String -import kotlin.Unit import kotlin.collections.List public object CharacterDetails2Impl_ResponseAdapter { @@ -21,7 +20,7 @@ public object CharacterDetails2Impl_ResponseAdapter { { public val RESPONSE_NAMES: List = listOf("id") - public override fun fromJson(reader: JsonReader, adapterContext: CompositeAdapterContext): + override fun fromJson(reader: JsonReader, adapterContext: CompositeAdapterContext): com.example.fragments_with_defer_and_include_directives.fragment.CharacterDetails2 { var _id: String? = null @@ -37,11 +36,11 @@ public object CharacterDetails2Impl_ResponseAdapter { ) } - public override fun toJson( + override fun toJson( writer: JsonWriter, `value`: com.example.fragments_with_defer_and_include_directives.fragment.CharacterDetails2, adapterContext: CompositeAdapterContext, - ): Unit { + ) { writer.name("id") StringAdapter.toJson(writer, CustomScalarAdapters.Empty, value.id) } diff --git a/libraries/apollo-compiler/src/test/graphql/com/example/fragments_with_defer_and_include_directives/kotlin/operationBased/fragments_with_defer_and_include_directives/fragment/CharacterDetails3Impl.kt.expected b/libraries/apollo-compiler/src/test/graphql/com/example/fragments_with_defer_and_include_directives/kotlin/operationBased/fragments_with_defer_and_include_directives/fragment/CharacterDetails3Impl.kt.expected index 79b8d256685..52d5463058c 100644 --- a/libraries/apollo-compiler/src/test/graphql/com/example/fragments_with_defer_and_include_directives/kotlin/operationBased/fragments_with_defer_and_include_directives/fragment/CharacterDetails3Impl.kt.expected +++ b/libraries/apollo-compiler/src/test/graphql/com/example/fragments_with_defer_and_include_directives/kotlin/operationBased/fragments_with_defer_and_include_directives/fragment/CharacterDetails3Impl.kt.expected @@ -16,25 +16,24 @@ import com.example.fragments_with_defer_and_include_directives.type.Droid import kotlin.Any import kotlin.Boolean import kotlin.Int -import kotlin.Unit public class CharacterDetails3Impl() : Fragment { - public override fun equals(other: Any?): Boolean = other != null && other::class == this::class + override fun equals(other: Any?): Boolean = other != null && other::class == this::class - public override fun hashCode(): Int = this::class.hashCode() + override fun hashCode(): Int = this::class.hashCode() - public override fun serializeVariables( + override fun serializeVariables( writer: JsonWriter, customScalarAdapters: CustomScalarAdapters, withBooleanDefaultValues: Boolean, - ): Unit { + ) { // This fragment doesn't have any variable } - public override fun adapter(): CompositeAdapter = + override fun adapter(): CompositeAdapter = CharacterDetails3Impl_ResponseAdapter.CharacterDetails3.obj() - public override fun rootField(): CompiledField = CompiledField.Builder( + override fun rootField(): CompiledField = CompiledField.Builder( name = "data", type = Droid.type ) diff --git a/libraries/apollo-compiler/src/test/graphql/com/example/fragments_with_defer_and_include_directives/kotlin/operationBased/fragments_with_defer_and_include_directives/fragment/CharacterDetails3Impl_ResponseAdapter.kt.expected b/libraries/apollo-compiler/src/test/graphql/com/example/fragments_with_defer_and_include_directives/kotlin/operationBased/fragments_with_defer_and_include_directives/fragment/CharacterDetails3Impl_ResponseAdapter.kt.expected index 579eeb87673..1d820273717 100644 --- a/libraries/apollo-compiler/src/test/graphql/com/example/fragments_with_defer_and_include_directives/kotlin/operationBased/fragments_with_defer_and_include_directives/fragment/CharacterDetails3Impl_ResponseAdapter.kt.expected +++ b/libraries/apollo-compiler/src/test/graphql/com/example/fragments_with_defer_and_include_directives/kotlin/operationBased/fragments_with_defer_and_include_directives/fragment/CharacterDetails3Impl_ResponseAdapter.kt.expected @@ -13,7 +13,6 @@ import com.apollographql.apollo3.api.json.JsonReader import com.apollographql.apollo3.api.json.JsonWriter import kotlin.Any import kotlin.String -import kotlin.Unit import kotlin.collections.List public object CharacterDetails3Impl_ResponseAdapter { @@ -22,7 +21,7 @@ public object CharacterDetails3Impl_ResponseAdapter { { public val RESPONSE_NAMES: List = listOf("birthDate") - public override fun fromJson(reader: JsonReader, adapterContext: CompositeAdapterContext): + override fun fromJson(reader: JsonReader, adapterContext: CompositeAdapterContext): com.example.fragments_with_defer_and_include_directives.fragment.CharacterDetails3 { var _birthDate: Any? = null @@ -38,11 +37,11 @@ public object CharacterDetails3Impl_ResponseAdapter { ) } - public override fun toJson( + override fun toJson( writer: JsonWriter, `value`: com.example.fragments_with_defer_and_include_directives.fragment.CharacterDetails3, adapterContext: CompositeAdapterContext, - ): Unit { + ) { writer.name("birthDate") AnyAdapter.toJson(writer, CustomScalarAdapters.Empty, value.birthDate) } diff --git a/libraries/apollo-compiler/src/test/graphql/com/example/fragments_with_defer_and_include_directives/kotlin/operationBased/fragments_with_defer_and_include_directives/fragment/CharacterDetailsImpl.kt.expected b/libraries/apollo-compiler/src/test/graphql/com/example/fragments_with_defer_and_include_directives/kotlin/operationBased/fragments_with_defer_and_include_directives/fragment/CharacterDetailsImpl.kt.expected index 8603660e86c..fe0dc865852 100644 --- a/libraries/apollo-compiler/src/test/graphql/com/example/fragments_with_defer_and_include_directives/kotlin/operationBased/fragments_with_defer_and_include_directives/fragment/CharacterDetailsImpl.kt.expected +++ b/libraries/apollo-compiler/src/test/graphql/com/example/fragments_with_defer_and_include_directives/kotlin/operationBased/fragments_with_defer_and_include_directives/fragment/CharacterDetailsImpl.kt.expected @@ -16,25 +16,24 @@ import com.example.fragments_with_defer_and_include_directives.type.Droid import kotlin.Any import kotlin.Boolean import kotlin.Int -import kotlin.Unit public class CharacterDetailsImpl() : Fragment { - public override fun equals(other: Any?): Boolean = other != null && other::class == this::class + override fun equals(other: Any?): Boolean = other != null && other::class == this::class - public override fun hashCode(): Int = this::class.hashCode() + override fun hashCode(): Int = this::class.hashCode() - public override fun serializeVariables( + override fun serializeVariables( writer: JsonWriter, customScalarAdapters: CustomScalarAdapters, withBooleanDefaultValues: Boolean, - ): Unit { + ) { // This fragment doesn't have any variable } - public override fun adapter(): CompositeAdapter = + override fun adapter(): CompositeAdapter = CharacterDetailsImpl_ResponseAdapter.CharacterDetails.obj() - public override fun rootField(): CompiledField = CompiledField.Builder( + override fun rootField(): CompiledField = CompiledField.Builder( name = "data", type = Droid.type ) diff --git a/libraries/apollo-compiler/src/test/graphql/com/example/fragments_with_defer_and_include_directives/kotlin/operationBased/fragments_with_defer_and_include_directives/fragment/CharacterDetailsImpl_ResponseAdapter.kt.expected b/libraries/apollo-compiler/src/test/graphql/com/example/fragments_with_defer_and_include_directives/kotlin/operationBased/fragments_with_defer_and_include_directives/fragment/CharacterDetailsImpl_ResponseAdapter.kt.expected index 130e18cfb7f..cbecad9596c 100644 --- a/libraries/apollo-compiler/src/test/graphql/com/example/fragments_with_defer_and_include_directives/kotlin/operationBased/fragments_with_defer_and_include_directives/fragment/CharacterDetailsImpl_ResponseAdapter.kt.expected +++ b/libraries/apollo-compiler/src/test/graphql/com/example/fragments_with_defer_and_include_directives/kotlin/operationBased/fragments_with_defer_and_include_directives/fragment/CharacterDetailsImpl_ResponseAdapter.kt.expected @@ -12,7 +12,6 @@ import com.apollographql.apollo3.api.StringAdapter import com.apollographql.apollo3.api.json.JsonReader import com.apollographql.apollo3.api.json.JsonWriter import kotlin.String -import kotlin.Unit import kotlin.collections.List public object CharacterDetailsImpl_ResponseAdapter { @@ -21,7 +20,7 @@ public object CharacterDetailsImpl_ResponseAdapter { { public val RESPONSE_NAMES: List = listOf("name") - public override fun fromJson(reader: JsonReader, adapterContext: CompositeAdapterContext): + override fun fromJson(reader: JsonReader, adapterContext: CompositeAdapterContext): com.example.fragments_with_defer_and_include_directives.fragment.CharacterDetails { var _name: String? = null @@ -37,11 +36,11 @@ public object CharacterDetailsImpl_ResponseAdapter { ) } - public override fun toJson( + override fun toJson( writer: JsonWriter, `value`: com.example.fragments_with_defer_and_include_directives.fragment.CharacterDetails, adapterContext: CompositeAdapterContext, - ): Unit { + ) { writer.name("name") StringAdapter.toJson(writer, CustomScalarAdapters.Empty, value.name) } diff --git a/libraries/apollo-compiler/src/test/graphql/com/example/fragments_with_defer_and_include_directives/kotlin/operationBased/fragments_with_defer_and_include_directives/fragment/DroidDetailsImpl.kt.expected b/libraries/apollo-compiler/src/test/graphql/com/example/fragments_with_defer_and_include_directives/kotlin/operationBased/fragments_with_defer_and_include_directives/fragment/DroidDetailsImpl.kt.expected index 5395207c11d..62d90d8a914 100644 --- a/libraries/apollo-compiler/src/test/graphql/com/example/fragments_with_defer_and_include_directives/kotlin/operationBased/fragments_with_defer_and_include_directives/fragment/DroidDetailsImpl.kt.expected +++ b/libraries/apollo-compiler/src/test/graphql/com/example/fragments_with_defer_and_include_directives/kotlin/operationBased/fragments_with_defer_and_include_directives/fragment/DroidDetailsImpl.kt.expected @@ -16,25 +16,24 @@ import com.example.fragments_with_defer_and_include_directives.type.Droid import kotlin.Any import kotlin.Boolean import kotlin.Int -import kotlin.Unit public class DroidDetailsImpl() : Fragment { - public override fun equals(other: Any?): Boolean = other != null && other::class == this::class + override fun equals(other: Any?): Boolean = other != null && other::class == this::class - public override fun hashCode(): Int = this::class.hashCode() + override fun hashCode(): Int = this::class.hashCode() - public override fun serializeVariables( + override fun serializeVariables( writer: JsonWriter, customScalarAdapters: CustomScalarAdapters, withBooleanDefaultValues: Boolean, - ): Unit { + ) { // This fragment doesn't have any variable } - public override fun adapter(): CompositeAdapter = + override fun adapter(): CompositeAdapter = DroidDetailsImpl_ResponseAdapter.DroidDetails.obj() - public override fun rootField(): CompiledField = CompiledField.Builder( + override fun rootField(): CompiledField = CompiledField.Builder( name = "data", type = Droid.type ) diff --git a/libraries/apollo-compiler/src/test/graphql/com/example/fragments_with_defer_and_include_directives/kotlin/operationBased/fragments_with_defer_and_include_directives/fragment/DroidDetailsImpl_ResponseAdapter.kt.expected b/libraries/apollo-compiler/src/test/graphql/com/example/fragments_with_defer_and_include_directives/kotlin/operationBased/fragments_with_defer_and_include_directives/fragment/DroidDetailsImpl_ResponseAdapter.kt.expected index 77e12180d73..a7eb04cbb03 100644 --- a/libraries/apollo-compiler/src/test/graphql/com/example/fragments_with_defer_and_include_directives/kotlin/operationBased/fragments_with_defer_and_include_directives/fragment/DroidDetailsImpl_ResponseAdapter.kt.expected +++ b/libraries/apollo-compiler/src/test/graphql/com/example/fragments_with_defer_and_include_directives/kotlin/operationBased/fragments_with_defer_and_include_directives/fragment/DroidDetailsImpl_ResponseAdapter.kt.expected @@ -12,7 +12,6 @@ import com.apollographql.apollo3.api.StringAdapter import com.apollographql.apollo3.api.json.JsonReader import com.apollographql.apollo3.api.json.JsonWriter import kotlin.String -import kotlin.Unit import kotlin.collections.List public object DroidDetailsImpl_ResponseAdapter { @@ -21,7 +20,7 @@ public object DroidDetailsImpl_ResponseAdapter { { public val RESPONSE_NAMES: List = listOf("name") - public override fun fromJson(reader: JsonReader, adapterContext: CompositeAdapterContext): + override fun fromJson(reader: JsonReader, adapterContext: CompositeAdapterContext): com.example.fragments_with_defer_and_include_directives.fragment.DroidDetails { var _name: String? = null @@ -37,11 +36,11 @@ public object DroidDetailsImpl_ResponseAdapter { ) } - public override fun toJson( + override fun toJson( writer: JsonWriter, `value`: com.example.fragments_with_defer_and_include_directives.fragment.DroidDetails, adapterContext: CompositeAdapterContext, - ): Unit { + ) { writer.name("name") StringAdapter.toJson(writer, CustomScalarAdapters.Empty, value.name) } diff --git a/libraries/apollo-compiler/src/test/graphql/com/example/fragments_with_type_condition/kotlin/operationBased/fragments_with_type_condition/TestQuery.kt.expected b/libraries/apollo-compiler/src/test/graphql/com/example/fragments_with_type_condition/kotlin/operationBased/fragments_with_type_condition/TestQuery.kt.expected index 96fbd8b76af..f3c7a09d186 100644 --- a/libraries/apollo-compiler/src/test/graphql/com/example/fragments_with_type_condition/kotlin/operationBased/fragments_with_type_condition/TestQuery.kt.expected +++ b/libraries/apollo-compiler/src/test/graphql/com/example/fragments_with_type_condition/kotlin/operationBased/fragments_with_type_condition/TestQuery.kt.expected @@ -20,32 +20,32 @@ import kotlin.Any import kotlin.Boolean import kotlin.Int import kotlin.String -import kotlin.Unit +import com.example.fragments_with_type_condition.type.Query as CompiledQuery public class TestQuery() : Query { - public override fun equals(other: Any?): Boolean = other != null && other::class == this::class + override fun equals(other: Any?): Boolean = other != null && other::class == this::class - public override fun hashCode(): Int = this::class.hashCode() + override fun hashCode(): Int = this::class.hashCode() - public override fun id(): String = OPERATION_ID + override fun id(): String = OPERATION_ID - public override fun document(): String = OPERATION_DOCUMENT + override fun document(): String = OPERATION_DOCUMENT - public override fun name(): String = OPERATION_NAME + override fun name(): String = OPERATION_NAME - public override fun serializeVariables( + override fun serializeVariables( writer: JsonWriter, customScalarAdapters: CustomScalarAdapters, withBooleanDefaultValues: Boolean, - ): Unit { + ) { // This operation doesn't have any variable } - public override fun adapter(): CompositeAdapter = TestQuery_ResponseAdapter.Data.obj() + override fun adapter(): CompositeAdapter = TestQuery_ResponseAdapter.Data.obj() - public override fun rootField(): CompiledField = CompiledField.Builder( + override fun rootField(): CompiledField = CompiledField.Builder( name = "data", - type = com.example.fragments_with_type_condition.type.Query.type + type = CompiledQuery.type ) .selections(selections = TestQuerySelections.__root) .build() diff --git a/libraries/apollo-compiler/src/test/graphql/com/example/fragments_with_type_condition/kotlin/operationBased/fragments_with_type_condition/adapter/TestQuery_ResponseAdapter.kt.expected b/libraries/apollo-compiler/src/test/graphql/com/example/fragments_with_type_condition/kotlin/operationBased/fragments_with_type_condition/adapter/TestQuery_ResponseAdapter.kt.expected index e116e8be3d3..a328eb238a5 100644 --- a/libraries/apollo-compiler/src/test/graphql/com/example/fragments_with_type_condition/kotlin/operationBased/fragments_with_type_condition/adapter/TestQuery_ResponseAdapter.kt.expected +++ b/libraries/apollo-compiler/src/test/graphql/com/example/fragments_with_type_condition/kotlin/operationBased/fragments_with_type_condition/adapter/TestQuery_ResponseAdapter.kt.expected @@ -19,14 +19,13 @@ import com.example.fragments_with_type_condition.TestQuery import com.example.fragments_with_type_condition.fragment.DroidDetails import com.example.fragments_with_type_condition.fragment.HumanDetails import kotlin.String -import kotlin.Unit import kotlin.collections.List public object TestQuery_ResponseAdapter { public object Data : CompositeAdapter { public val RESPONSE_NAMES: List = listOf("r2", "luke") - public override fun fromJson(reader: JsonReader, adapterContext: CompositeAdapterContext): + override fun fromJson(reader: JsonReader, adapterContext: CompositeAdapterContext): TestQuery.Data { var _r2: TestQuery.Data.R2? = null var _luke: TestQuery.Data.Luke? = null @@ -45,11 +44,11 @@ public object TestQuery_ResponseAdapter { ) } - public override fun toJson( + override fun toJson( writer: JsonWriter, `value`: TestQuery.Data, adapterContext: CompositeAdapterContext, - ): Unit { + ) { writer.name("r2") R2.obj(true).nullable().toJson(writer, value.r2, adapterContext) @@ -60,7 +59,7 @@ public object TestQuery_ResponseAdapter { private object R2 : CompositeAdapter { public val RESPONSE_NAMES: List = listOf("__typename") - public override fun fromJson(reader: JsonReader, adapterContext: CompositeAdapterContext): + override fun fromJson(reader: JsonReader, adapterContext: CompositeAdapterContext): TestQuery.Data.R2 { var __typename: String? = null @@ -96,11 +95,11 @@ public object TestQuery_ResponseAdapter { ) } - public override fun toJson( + override fun toJson( writer: JsonWriter, `value`: TestQuery.Data.R2, adapterContext: CompositeAdapterContext, - ): Unit { + ) { writer.name("__typename") StringAdapter.toJson(writer, CustomScalarAdapters.Empty, value.__typename) @@ -119,7 +118,7 @@ public object TestQuery_ResponseAdapter { private object Luke : CompositeAdapter { public val RESPONSE_NAMES: List = listOf("__typename") - public override fun fromJson(reader: JsonReader, adapterContext: CompositeAdapterContext): + override fun fromJson(reader: JsonReader, adapterContext: CompositeAdapterContext): TestQuery.Data.Luke { var __typename: String? = null @@ -155,11 +154,11 @@ public object TestQuery_ResponseAdapter { ) } - public override fun toJson( + override fun toJson( writer: JsonWriter, `value`: TestQuery.Data.Luke, adapterContext: CompositeAdapterContext, - ): Unit { + ) { writer.name("__typename") StringAdapter.toJson(writer, CustomScalarAdapters.Empty, value.__typename) diff --git a/libraries/apollo-compiler/src/test/graphql/com/example/fragments_with_type_condition/kotlin/operationBased/fragments_with_type_condition/fragment/DroidDetailsImpl.kt.expected b/libraries/apollo-compiler/src/test/graphql/com/example/fragments_with_type_condition/kotlin/operationBased/fragments_with_type_condition/fragment/DroidDetailsImpl.kt.expected index 1f0c35ea0ed..00aee1bb353 100644 --- a/libraries/apollo-compiler/src/test/graphql/com/example/fragments_with_type_condition/kotlin/operationBased/fragments_with_type_condition/fragment/DroidDetailsImpl.kt.expected +++ b/libraries/apollo-compiler/src/test/graphql/com/example/fragments_with_type_condition/kotlin/operationBased/fragments_with_type_condition/fragment/DroidDetailsImpl.kt.expected @@ -16,25 +16,24 @@ import com.example.fragments_with_type_condition.type.Droid import kotlin.Any import kotlin.Boolean import kotlin.Int -import kotlin.Unit public class DroidDetailsImpl() : Fragment { - public override fun equals(other: Any?): Boolean = other != null && other::class == this::class + override fun equals(other: Any?): Boolean = other != null && other::class == this::class - public override fun hashCode(): Int = this::class.hashCode() + override fun hashCode(): Int = this::class.hashCode() - public override fun serializeVariables( + override fun serializeVariables( writer: JsonWriter, customScalarAdapters: CustomScalarAdapters, withBooleanDefaultValues: Boolean, - ): Unit { + ) { // This fragment doesn't have any variable } - public override fun adapter(): CompositeAdapter = + override fun adapter(): CompositeAdapter = DroidDetailsImpl_ResponseAdapter.DroidDetails.obj() - public override fun rootField(): CompiledField = CompiledField.Builder( + override fun rootField(): CompiledField = CompiledField.Builder( name = "data", type = Droid.type ) diff --git a/libraries/apollo-compiler/src/test/graphql/com/example/fragments_with_type_condition/kotlin/operationBased/fragments_with_type_condition/fragment/DroidDetailsImpl_ResponseAdapter.kt.expected b/libraries/apollo-compiler/src/test/graphql/com/example/fragments_with_type_condition/kotlin/operationBased/fragments_with_type_condition/fragment/DroidDetailsImpl_ResponseAdapter.kt.expected index 5e599cbe806..d1f3247b451 100644 --- a/libraries/apollo-compiler/src/test/graphql/com/example/fragments_with_type_condition/kotlin/operationBased/fragments_with_type_condition/fragment/DroidDetailsImpl_ResponseAdapter.kt.expected +++ b/libraries/apollo-compiler/src/test/graphql/com/example/fragments_with_type_condition/kotlin/operationBased/fragments_with_type_condition/fragment/DroidDetailsImpl_ResponseAdapter.kt.expected @@ -13,7 +13,6 @@ import com.apollographql.apollo3.api.StringAdapter import com.apollographql.apollo3.api.json.JsonReader import com.apollographql.apollo3.api.json.JsonWriter import kotlin.String -import kotlin.Unit import kotlin.collections.List public object DroidDetailsImpl_ResponseAdapter { @@ -21,7 +20,7 @@ public object DroidDetailsImpl_ResponseAdapter { CompositeAdapter { public val RESPONSE_NAMES: List = listOf("name", "primaryFunction") - public override fun fromJson(reader: JsonReader, adapterContext: CompositeAdapterContext): + override fun fromJson(reader: JsonReader, adapterContext: CompositeAdapterContext): com.example.fragments_with_type_condition.fragment.DroidDetails { var _name: String? = null var _primaryFunction: String? = null @@ -40,11 +39,11 @@ public object DroidDetailsImpl_ResponseAdapter { ) } - public override fun toJson( + override fun toJson( writer: JsonWriter, `value`: com.example.fragments_with_type_condition.fragment.DroidDetails, adapterContext: CompositeAdapterContext, - ): Unit { + ) { writer.name("name") StringAdapter.toJson(writer, CustomScalarAdapters.Empty, value.name) diff --git a/libraries/apollo-compiler/src/test/graphql/com/example/fragments_with_type_condition/kotlin/operationBased/fragments_with_type_condition/fragment/HumanDetailsImpl.kt.expected b/libraries/apollo-compiler/src/test/graphql/com/example/fragments_with_type_condition/kotlin/operationBased/fragments_with_type_condition/fragment/HumanDetailsImpl.kt.expected index a4b762c92d9..07f9f01a90f 100644 --- a/libraries/apollo-compiler/src/test/graphql/com/example/fragments_with_type_condition/kotlin/operationBased/fragments_with_type_condition/fragment/HumanDetailsImpl.kt.expected +++ b/libraries/apollo-compiler/src/test/graphql/com/example/fragments_with_type_condition/kotlin/operationBased/fragments_with_type_condition/fragment/HumanDetailsImpl.kt.expected @@ -16,25 +16,24 @@ import com.example.fragments_with_type_condition.type.Human import kotlin.Any import kotlin.Boolean import kotlin.Int -import kotlin.Unit public class HumanDetailsImpl() : Fragment { - public override fun equals(other: Any?): Boolean = other != null && other::class == this::class + override fun equals(other: Any?): Boolean = other != null && other::class == this::class - public override fun hashCode(): Int = this::class.hashCode() + override fun hashCode(): Int = this::class.hashCode() - public override fun serializeVariables( + override fun serializeVariables( writer: JsonWriter, customScalarAdapters: CustomScalarAdapters, withBooleanDefaultValues: Boolean, - ): Unit { + ) { // This fragment doesn't have any variable } - public override fun adapter(): CompositeAdapter = + override fun adapter(): CompositeAdapter = HumanDetailsImpl_ResponseAdapter.HumanDetails.obj() - public override fun rootField(): CompiledField = CompiledField.Builder( + override fun rootField(): CompiledField = CompiledField.Builder( name = "data", type = Human.type ) diff --git a/libraries/apollo-compiler/src/test/graphql/com/example/fragments_with_type_condition/kotlin/operationBased/fragments_with_type_condition/fragment/HumanDetailsImpl_ResponseAdapter.kt.expected b/libraries/apollo-compiler/src/test/graphql/com/example/fragments_with_type_condition/kotlin/operationBased/fragments_with_type_condition/fragment/HumanDetailsImpl_ResponseAdapter.kt.expected index 53b391f21c8..d769326a8dc 100644 --- a/libraries/apollo-compiler/src/test/graphql/com/example/fragments_with_type_condition/kotlin/operationBased/fragments_with_type_condition/fragment/HumanDetailsImpl_ResponseAdapter.kt.expected +++ b/libraries/apollo-compiler/src/test/graphql/com/example/fragments_with_type_condition/kotlin/operationBased/fragments_with_type_condition/fragment/HumanDetailsImpl_ResponseAdapter.kt.expected @@ -14,7 +14,6 @@ import com.apollographql.apollo3.api.json.JsonReader import com.apollographql.apollo3.api.json.JsonWriter import kotlin.Double import kotlin.String -import kotlin.Unit import kotlin.collections.List public object HumanDetailsImpl_ResponseAdapter { @@ -22,7 +21,7 @@ public object HumanDetailsImpl_ResponseAdapter { CompositeAdapter { public val RESPONSE_NAMES: List = listOf("name", "height") - public override fun fromJson(reader: JsonReader, adapterContext: CompositeAdapterContext): + override fun fromJson(reader: JsonReader, adapterContext: CompositeAdapterContext): com.example.fragments_with_type_condition.fragment.HumanDetails { var _name: String? = null var _height: Double? = null @@ -41,11 +40,11 @@ public object HumanDetailsImpl_ResponseAdapter { ) } - public override fun toJson( + override fun toJson( writer: JsonWriter, `value`: com.example.fragments_with_type_condition.fragment.HumanDetails, adapterContext: CompositeAdapterContext, - ): Unit { + ) { writer.name("name") StringAdapter.toJson(writer, CustomScalarAdapters.Empty, value.name) diff --git a/libraries/apollo-compiler/src/test/graphql/com/example/fragments_with_type_condition/kotlin/responseBased/fragments_with_type_condition/TestQuery.kt.expected b/libraries/apollo-compiler/src/test/graphql/com/example/fragments_with_type_condition/kotlin/responseBased/fragments_with_type_condition/TestQuery.kt.expected index 1914b6d84c3..56cb40c6b06 100644 --- a/libraries/apollo-compiler/src/test/graphql/com/example/fragments_with_type_condition/kotlin/responseBased/fragments_with_type_condition/TestQuery.kt.expected +++ b/libraries/apollo-compiler/src/test/graphql/com/example/fragments_with_type_condition/kotlin/responseBased/fragments_with_type_condition/TestQuery.kt.expected @@ -21,32 +21,33 @@ import kotlin.Boolean import kotlin.Double import kotlin.Int import kotlin.String -import kotlin.Unit +import kotlin.Suppress +import com.example.fragments_with_type_condition.type.Query as CompiledQuery public class TestQuery() : Query { - public override fun equals(other: Any?): Boolean = other != null && other::class == this::class + override fun equals(other: Any?): Boolean = other != null && other::class == this::class - public override fun hashCode(): Int = this::class.hashCode() + override fun hashCode(): Int = this::class.hashCode() - public override fun id(): String = OPERATION_ID + override fun id(): String = OPERATION_ID - public override fun document(): String = OPERATION_DOCUMENT + override fun document(): String = OPERATION_DOCUMENT - public override fun name(): String = OPERATION_NAME + override fun name(): String = OPERATION_NAME - public override fun serializeVariables( + override fun serializeVariables( writer: JsonWriter, customScalarAdapters: CustomScalarAdapters, withBooleanDefaultValues: Boolean, - ): Unit { + ) { // This operation doesn't have any variable } - public override fun adapter(): CompositeAdapter = TestQuery_ResponseAdapter.Data.obj() + override fun adapter(): CompositeAdapter = TestQuery_ResponseAdapter.Data.obj() - public override fun rootField(): CompiledField = CompiledField.Builder( + override fun rootField(): CompiledField = CompiledField.Builder( name = "data", - type = com.example.fragments_with_type_condition.type.Query.type + type = CompiledQuery.type ) .selections(selections = TestQuerySelections.__root) .build() @@ -60,84 +61,92 @@ public class TestQuery() : Query { public val __typename: String public companion object { - public fun R2.humanDetails() = this as? HumanDetails + @Suppress("USELESS_CAST") + public fun R2.humanDetails(): HumanDetails? = this as? HumanDetails - public fun R2.droidDetails() = this as? DroidDetails + @Suppress("USELESS_CAST") + public fun R2.droidDetails(): DroidDetails? = this as? DroidDetails - public fun R2.asHuman() = this as? HumanR2 + @Suppress("USELESS_CAST") + public fun R2.asHuman(): HumanR2? = this as? HumanR2 - public fun R2.asDroid() = this as? DroidR2 + @Suppress("USELESS_CAST") + public fun R2.asDroid(): DroidR2? = this as? DroidR2 } } public data class HumanR2( - public override val __typename: String, + override val __typename: String, /** * What this human calls themselves */ - public override val name: String, + override val name: String, /** * Height in the preferred unit, default is meters */ - public override val height: Double?, + override val height: Double?, ) : R2, HumanDetails public data class DroidR2( - public override val __typename: String, + override val __typename: String, /** * What others call this droid */ - public override val name: String, + override val name: String, /** * This droid's primary function */ - public override val primaryFunction: String?, + override val primaryFunction: String?, ) : R2, DroidDetails public data class OtherR2( - public override val __typename: String, + override val __typename: String, ) : R2 public sealed interface Luke { public val __typename: String public companion object { - public fun Luke.humanDetails() = this as? HumanDetails + @Suppress("USELESS_CAST") + public fun Luke.humanDetails(): HumanDetails? = this as? HumanDetails - public fun Luke.droidDetails() = this as? DroidDetails + @Suppress("USELESS_CAST") + public fun Luke.droidDetails(): DroidDetails? = this as? DroidDetails - public fun Luke.asHuman() = this as? HumanLuke + @Suppress("USELESS_CAST") + public fun Luke.asHuman(): HumanLuke? = this as? HumanLuke - public fun Luke.asDroid() = this as? DroidLuke + @Suppress("USELESS_CAST") + public fun Luke.asDroid(): DroidLuke? = this as? DroidLuke } } public data class HumanLuke( - public override val __typename: String, + override val __typename: String, /** * What this human calls themselves */ - public override val name: String, + override val name: String, /** * Height in the preferred unit, default is meters */ - public override val height: Double?, + override val height: Double?, ) : Luke, HumanDetails public data class DroidLuke( - public override val __typename: String, + override val __typename: String, /** * What others call this droid */ - public override val name: String, + override val name: String, /** * This droid's primary function */ - public override val primaryFunction: String?, + override val primaryFunction: String?, ) : Luke, DroidDetails public data class OtherLuke( - public override val __typename: String, + override val __typename: String, ) : Luke } diff --git a/libraries/apollo-compiler/src/test/graphql/com/example/fragments_with_type_condition/kotlin/responseBased/fragments_with_type_condition/adapter/TestQuery_ResponseAdapter.kt.expected b/libraries/apollo-compiler/src/test/graphql/com/example/fragments_with_type_condition/kotlin/responseBased/fragments_with_type_condition/adapter/TestQuery_ResponseAdapter.kt.expected index 6bea16ba477..4aeb0861045 100644 --- a/libraries/apollo-compiler/src/test/graphql/com/example/fragments_with_type_condition/kotlin/responseBased/fragments_with_type_condition/adapter/TestQuery_ResponseAdapter.kt.expected +++ b/libraries/apollo-compiler/src/test/graphql/com/example/fragments_with_type_condition/kotlin/responseBased/fragments_with_type_condition/adapter/TestQuery_ResponseAdapter.kt.expected @@ -20,14 +20,13 @@ import com.example.fragments_with_type_condition.TestQuery import kotlin.Double import kotlin.String import kotlin.Suppress -import kotlin.Unit import kotlin.collections.List public object TestQuery_ResponseAdapter { public object Data : CompositeAdapter { public val RESPONSE_NAMES: List = listOf("r2", "luke") - public override fun fromJson(reader: JsonReader, adapterContext: CompositeAdapterContext): + override fun fromJson(reader: JsonReader, adapterContext: CompositeAdapterContext): TestQuery.Data { var _r2: TestQuery.Data.R2? = null var _luke: TestQuery.Data.Luke? = null @@ -46,11 +45,11 @@ public object TestQuery_ResponseAdapter { ) } - public override fun toJson( + override fun toJson( writer: JsonWriter, `value`: TestQuery.Data, adapterContext: CompositeAdapterContext, - ): Unit { + ) { writer.name("r2") R2.obj().nullable().toJson(writer, value.r2, adapterContext) @@ -59,7 +58,7 @@ public object TestQuery_ResponseAdapter { } private object R2 : CompositeAdapter { - public override fun fromJson(reader: JsonReader, adapterContext: CompositeAdapterContext): + override fun fromJson(reader: JsonReader, adapterContext: CompositeAdapterContext): TestQuery.Data.R2 { val __typename = reader.readTypename() return when(__typename) { @@ -72,11 +71,11 @@ public object TestQuery_ResponseAdapter { } } - public override fun toJson( + override fun toJson( writer: JsonWriter, `value`: TestQuery.Data.R2, adapterContext: CompositeAdapterContext, - ): Unit { + ) { when(value) { is TestQuery.Data.HumanR2 -> HumanR2.toJson(writer, value, adapterContext) is TestQuery.Data.DroidR2 -> DroidR2.toJson(writer, value, adapterContext) @@ -117,7 +116,7 @@ public object TestQuery_ResponseAdapter { writer: JsonWriter, `value`: TestQuery.Data.HumanR2, @Suppress("UNUSED_PARAMETER") adapterContext: CompositeAdapterContext, - ): Unit { + ) { writer.name("__typename") StringAdapter.toJson(writer, CustomScalarAdapters.Empty, value.__typename) @@ -161,7 +160,7 @@ public object TestQuery_ResponseAdapter { writer: JsonWriter, `value`: TestQuery.Data.DroidR2, @Suppress("UNUSED_PARAMETER") adapterContext: CompositeAdapterContext, - ): Unit { + ) { writer.name("__typename") StringAdapter.toJson(writer, CustomScalarAdapters.Empty, value.__typename) @@ -199,14 +198,14 @@ public object TestQuery_ResponseAdapter { writer: JsonWriter, `value`: TestQuery.Data.OtherR2, @Suppress("UNUSED_PARAMETER") adapterContext: CompositeAdapterContext, - ): Unit { + ) { writer.name("__typename") StringAdapter.toJson(writer, CustomScalarAdapters.Empty, value.__typename) } } private object Luke : CompositeAdapter { - public override fun fromJson(reader: JsonReader, adapterContext: CompositeAdapterContext): + override fun fromJson(reader: JsonReader, adapterContext: CompositeAdapterContext): TestQuery.Data.Luke { val __typename = reader.readTypename() return when(__typename) { @@ -219,11 +218,11 @@ public object TestQuery_ResponseAdapter { } } - public override fun toJson( + override fun toJson( writer: JsonWriter, `value`: TestQuery.Data.Luke, adapterContext: CompositeAdapterContext, - ): Unit { + ) { when(value) { is TestQuery.Data.HumanLuke -> HumanLuke.toJson(writer, value, adapterContext) is TestQuery.Data.DroidLuke -> DroidLuke.toJson(writer, value, adapterContext) @@ -264,7 +263,7 @@ public object TestQuery_ResponseAdapter { writer: JsonWriter, `value`: TestQuery.Data.HumanLuke, @Suppress("UNUSED_PARAMETER") adapterContext: CompositeAdapterContext, - ): Unit { + ) { writer.name("__typename") StringAdapter.toJson(writer, CustomScalarAdapters.Empty, value.__typename) @@ -308,7 +307,7 @@ public object TestQuery_ResponseAdapter { writer: JsonWriter, `value`: TestQuery.Data.DroidLuke, @Suppress("UNUSED_PARAMETER") adapterContext: CompositeAdapterContext, - ): Unit { + ) { writer.name("__typename") StringAdapter.toJson(writer, CustomScalarAdapters.Empty, value.__typename) @@ -346,7 +345,7 @@ public object TestQuery_ResponseAdapter { writer: JsonWriter, `value`: TestQuery.Data.OtherLuke, @Suppress("UNUSED_PARAMETER") adapterContext: CompositeAdapterContext, - ): Unit { + ) { writer.name("__typename") StringAdapter.toJson(writer, CustomScalarAdapters.Empty, value.__typename) } diff --git a/libraries/apollo-compiler/src/test/graphql/com/example/fragments_with_type_condition/kotlin/responseBased/fragments_with_type_condition/fragment/DroidDetailsImpl.kt.expected b/libraries/apollo-compiler/src/test/graphql/com/example/fragments_with_type_condition/kotlin/responseBased/fragments_with_type_condition/fragment/DroidDetailsImpl.kt.expected index 5d3aed43e5a..f817621988c 100644 --- a/libraries/apollo-compiler/src/test/graphql/com/example/fragments_with_type_condition/kotlin/responseBased/fragments_with_type_condition/fragment/DroidDetailsImpl.kt.expected +++ b/libraries/apollo-compiler/src/test/graphql/com/example/fragments_with_type_condition/kotlin/responseBased/fragments_with_type_condition/fragment/DroidDetailsImpl.kt.expected @@ -17,25 +17,23 @@ import kotlin.Any import kotlin.Boolean import kotlin.Int import kotlin.String -import kotlin.Unit public class DroidDetailsImpl() : Fragment { - public override fun equals(other: Any?): Boolean = other != null && other::class == this::class + override fun equals(other: Any?): Boolean = other != null && other::class == this::class - public override fun hashCode(): Int = this::class.hashCode() + override fun hashCode(): Int = this::class.hashCode() - public override fun serializeVariables( + override fun serializeVariables( writer: JsonWriter, customScalarAdapters: CustomScalarAdapters, withBooleanDefaultValues: Boolean, - ): Unit { + ) { // This fragment doesn't have any variable } - public override fun adapter(): CompositeAdapter = - DroidDetailsImpl_ResponseAdapter.Data.obj() + override fun adapter(): CompositeAdapter = DroidDetailsImpl_ResponseAdapter.Data.obj() - public override fun rootField(): CompiledField = CompiledField.Builder( + override fun rootField(): CompiledField = CompiledField.Builder( name = "data", type = Droid.type ) @@ -46,10 +44,10 @@ public class DroidDetailsImpl() : Fragment { /** * What others call this droid */ - public override val name: String, + override val name: String, /** * This droid's primary function */ - public override val primaryFunction: String?, + override val primaryFunction: String?, ) : DroidDetails, Fragment.Data } diff --git a/libraries/apollo-compiler/src/test/graphql/com/example/fragments_with_type_condition/kotlin/responseBased/fragments_with_type_condition/fragment/DroidDetailsImpl_ResponseAdapter.kt.expected b/libraries/apollo-compiler/src/test/graphql/com/example/fragments_with_type_condition/kotlin/responseBased/fragments_with_type_condition/fragment/DroidDetailsImpl_ResponseAdapter.kt.expected index 02d898539e6..82df612bc19 100644 --- a/libraries/apollo-compiler/src/test/graphql/com/example/fragments_with_type_condition/kotlin/responseBased/fragments_with_type_condition/fragment/DroidDetailsImpl_ResponseAdapter.kt.expected +++ b/libraries/apollo-compiler/src/test/graphql/com/example/fragments_with_type_condition/kotlin/responseBased/fragments_with_type_condition/fragment/DroidDetailsImpl_ResponseAdapter.kt.expected @@ -13,14 +13,13 @@ import com.apollographql.apollo3.api.StringAdapter import com.apollographql.apollo3.api.json.JsonReader import com.apollographql.apollo3.api.json.JsonWriter import kotlin.String -import kotlin.Unit import kotlin.collections.List public object DroidDetailsImpl_ResponseAdapter { public object Data : CompositeAdapter { public val RESPONSE_NAMES: List = listOf("name", "primaryFunction") - public override fun fromJson(reader: JsonReader, adapterContext: CompositeAdapterContext): + override fun fromJson(reader: JsonReader, adapterContext: CompositeAdapterContext): DroidDetailsImpl.Data { var _name: String? = null var _primaryFunction: String? = null @@ -39,11 +38,11 @@ public object DroidDetailsImpl_ResponseAdapter { ) } - public override fun toJson( + override fun toJson( writer: JsonWriter, `value`: DroidDetailsImpl.Data, adapterContext: CompositeAdapterContext, - ): Unit { + ) { writer.name("name") StringAdapter.toJson(writer, CustomScalarAdapters.Empty, value.name) diff --git a/libraries/apollo-compiler/src/test/graphql/com/example/fragments_with_type_condition/kotlin/responseBased/fragments_with_type_condition/fragment/HumanDetailsImpl.kt.expected b/libraries/apollo-compiler/src/test/graphql/com/example/fragments_with_type_condition/kotlin/responseBased/fragments_with_type_condition/fragment/HumanDetailsImpl.kt.expected index d5f166b6793..dcf331189cc 100644 --- a/libraries/apollo-compiler/src/test/graphql/com/example/fragments_with_type_condition/kotlin/responseBased/fragments_with_type_condition/fragment/HumanDetailsImpl.kt.expected +++ b/libraries/apollo-compiler/src/test/graphql/com/example/fragments_with_type_condition/kotlin/responseBased/fragments_with_type_condition/fragment/HumanDetailsImpl.kt.expected @@ -18,25 +18,23 @@ import kotlin.Boolean import kotlin.Double import kotlin.Int import kotlin.String -import kotlin.Unit public class HumanDetailsImpl() : Fragment { - public override fun equals(other: Any?): Boolean = other != null && other::class == this::class + override fun equals(other: Any?): Boolean = other != null && other::class == this::class - public override fun hashCode(): Int = this::class.hashCode() + override fun hashCode(): Int = this::class.hashCode() - public override fun serializeVariables( + override fun serializeVariables( writer: JsonWriter, customScalarAdapters: CustomScalarAdapters, withBooleanDefaultValues: Boolean, - ): Unit { + ) { // This fragment doesn't have any variable } - public override fun adapter(): CompositeAdapter = - HumanDetailsImpl_ResponseAdapter.Data.obj() + override fun adapter(): CompositeAdapter = HumanDetailsImpl_ResponseAdapter.Data.obj() - public override fun rootField(): CompiledField = CompiledField.Builder( + override fun rootField(): CompiledField = CompiledField.Builder( name = "data", type = Human.type ) @@ -47,10 +45,10 @@ public class HumanDetailsImpl() : Fragment { /** * What this human calls themselves */ - public override val name: String, + override val name: String, /** * Height in the preferred unit, default is meters */ - public override val height: Double?, + override val height: Double?, ) : HumanDetails, Fragment.Data } diff --git a/libraries/apollo-compiler/src/test/graphql/com/example/fragments_with_type_condition/kotlin/responseBased/fragments_with_type_condition/fragment/HumanDetailsImpl_ResponseAdapter.kt.expected b/libraries/apollo-compiler/src/test/graphql/com/example/fragments_with_type_condition/kotlin/responseBased/fragments_with_type_condition/fragment/HumanDetailsImpl_ResponseAdapter.kt.expected index 70f7f83ba77..5ef0c7df14f 100644 --- a/libraries/apollo-compiler/src/test/graphql/com/example/fragments_with_type_condition/kotlin/responseBased/fragments_with_type_condition/fragment/HumanDetailsImpl_ResponseAdapter.kt.expected +++ b/libraries/apollo-compiler/src/test/graphql/com/example/fragments_with_type_condition/kotlin/responseBased/fragments_with_type_condition/fragment/HumanDetailsImpl_ResponseAdapter.kt.expected @@ -14,14 +14,13 @@ import com.apollographql.apollo3.api.json.JsonReader import com.apollographql.apollo3.api.json.JsonWriter import kotlin.Double import kotlin.String -import kotlin.Unit import kotlin.collections.List public object HumanDetailsImpl_ResponseAdapter { public object Data : CompositeAdapter { public val RESPONSE_NAMES: List = listOf("name", "height") - public override fun fromJson(reader: JsonReader, adapterContext: CompositeAdapterContext): + override fun fromJson(reader: JsonReader, adapterContext: CompositeAdapterContext): HumanDetailsImpl.Data { var _name: String? = null var _height: Double? = null @@ -40,11 +39,11 @@ public object HumanDetailsImpl_ResponseAdapter { ) } - public override fun toJson( + override fun toJson( writer: JsonWriter, `value`: HumanDetailsImpl.Data, adapterContext: CompositeAdapterContext, - ): Unit { + ) { writer.name("name") StringAdapter.toJson(writer, CustomScalarAdapters.Empty, value.name) diff --git a/libraries/apollo-compiler/src/test/graphql/com/example/hero_details/kotlin/responseBased/hero_details/HeroDetails.kt.expected b/libraries/apollo-compiler/src/test/graphql/com/example/hero_details/kotlin/responseBased/hero_details/HeroDetails.kt.expected index 086519c9424..2bfea540961 100644 --- a/libraries/apollo-compiler/src/test/graphql/com/example/hero_details/kotlin/responseBased/hero_details/HeroDetails.kt.expected +++ b/libraries/apollo-compiler/src/test/graphql/com/example/hero_details/kotlin/responseBased/hero_details/HeroDetails.kt.expected @@ -19,33 +19,33 @@ import kotlin.Any import kotlin.Boolean import kotlin.Int import kotlin.String -import kotlin.Unit import kotlin.collections.List +import com.example.hero_details.type.Query as CompiledQuery public class HeroDetails() : Query { - public override fun equals(other: Any?): Boolean = other != null && other::class == this::class + override fun equals(other: Any?): Boolean = other != null && other::class == this::class - public override fun hashCode(): Int = this::class.hashCode() + override fun hashCode(): Int = this::class.hashCode() - public override fun id(): String = OPERATION_ID + override fun id(): String = OPERATION_ID - public override fun document(): String = OPERATION_DOCUMENT + override fun document(): String = OPERATION_DOCUMENT - public override fun name(): String = OPERATION_NAME + override fun name(): String = OPERATION_NAME - public override fun serializeVariables( + override fun serializeVariables( writer: JsonWriter, customScalarAdapters: CustomScalarAdapters, withBooleanDefaultValues: Boolean, - ): Unit { + ) { // This operation doesn't have any variable } - public override fun adapter(): CompositeAdapter = HeroDetails_ResponseAdapter.Data.obj() + override fun adapter(): CompositeAdapter = HeroDetails_ResponseAdapter.Data.obj() - public override fun rootField(): CompiledField = CompiledField.Builder( + override fun rootField(): CompiledField = CompiledField.Builder( name = "data", - type = com.example.hero_details.type.Query.type + type = CompiledQuery.type ) .selections(selections = HeroDetailsSelections.__root) .build() diff --git a/libraries/apollo-compiler/src/test/graphql/com/example/hero_details/kotlin/responseBased/hero_details/adapter/HeroDetails_ResponseAdapter.kt.expected b/libraries/apollo-compiler/src/test/graphql/com/example/hero_details/kotlin/responseBased/hero_details/adapter/HeroDetails_ResponseAdapter.kt.expected index cafbaaaeb4f..ac82e3df4f1 100644 --- a/libraries/apollo-compiler/src/test/graphql/com/example/hero_details/kotlin/responseBased/hero_details/adapter/HeroDetails_ResponseAdapter.kt.expected +++ b/libraries/apollo-compiler/src/test/graphql/com/example/hero_details/kotlin/responseBased/hero_details/adapter/HeroDetails_ResponseAdapter.kt.expected @@ -20,14 +20,13 @@ import com.example.hero_details.type.Hero_type import com.example.hero_details.type.adapter.Hero_type_ResponseAdapter import kotlin.Int import kotlin.String -import kotlin.Unit import kotlin.collections.List public object HeroDetails_ResponseAdapter { public object Data : CompositeAdapter { public val RESPONSE_NAMES: List = listOf("hero") - public override fun fromJson(reader: JsonReader, adapterContext: CompositeAdapterContext): + override fun fromJson(reader: JsonReader, adapterContext: CompositeAdapterContext): HeroDetails.Data { var _hero: HeroDetails.Data.Hero? = null @@ -43,11 +42,11 @@ public object HeroDetails_ResponseAdapter { ) } - public override fun toJson( + override fun toJson( writer: JsonWriter, `value`: HeroDetails.Data, adapterContext: CompositeAdapterContext, - ): Unit { + ) { writer.name("hero") Hero.obj().nullable().toJson(writer, value.hero, adapterContext) } @@ -55,7 +54,7 @@ public object HeroDetails_ResponseAdapter { private object Hero : CompositeAdapter { public val RESPONSE_NAMES: List = listOf("type", "name", "friendsConnection") - public override fun fromJson(reader: JsonReader, adapterContext: CompositeAdapterContext): + override fun fromJson(reader: JsonReader, adapterContext: CompositeAdapterContext): HeroDetails.Data.Hero { var _type: Hero_type? = null var _name: String? = null @@ -77,11 +76,11 @@ public object HeroDetails_ResponseAdapter { ) } - public override fun toJson( + override fun toJson( writer: JsonWriter, `value`: HeroDetails.Data.Hero, adapterContext: CompositeAdapterContext, - ): Unit { + ) { writer.name("type") Hero_type_ResponseAdapter.toJson(writer, CustomScalarAdapters.Empty, value.type) @@ -95,7 +94,7 @@ public object HeroDetails_ResponseAdapter { private object FriendsConnection : CompositeAdapter { public val RESPONSE_NAMES: List = listOf("totalCount", "edges") - public override fun fromJson(reader: JsonReader, adapterContext: CompositeAdapterContext): + override fun fromJson(reader: JsonReader, adapterContext: CompositeAdapterContext): HeroDetails.Data.Hero.FriendsConnection { var _totalCount: Int? = null var _edges: List? = null @@ -114,11 +113,11 @@ public object HeroDetails_ResponseAdapter { ) } - public override fun toJson( + override fun toJson( writer: JsonWriter, `value`: HeroDetails.Data.Hero.FriendsConnection, adapterContext: CompositeAdapterContext, - ): Unit { + ) { writer.name("totalCount") NullableIntAdapter.toJson(writer, CustomScalarAdapters.Empty, value.totalCount) @@ -129,7 +128,7 @@ public object HeroDetails_ResponseAdapter { private object Edge : CompositeAdapter { public val RESPONSE_NAMES: List = listOf("node") - public override fun fromJson(reader: JsonReader, adapterContext: CompositeAdapterContext): + override fun fromJson(reader: JsonReader, adapterContext: CompositeAdapterContext): HeroDetails.Data.Hero.FriendsConnection.Edge { var _node: HeroDetails.Data.Hero.FriendsConnection.Edge.Node? = null @@ -145,11 +144,11 @@ public object HeroDetails_ResponseAdapter { ) } - public override fun toJson( + override fun toJson( writer: JsonWriter, `value`: HeroDetails.Data.Hero.FriendsConnection.Edge, adapterContext: CompositeAdapterContext, - ): Unit { + ) { writer.name("node") Node.obj().nullable().toJson(writer, value.node, adapterContext) } @@ -158,8 +157,7 @@ public object HeroDetails_ResponseAdapter { { public val RESPONSE_NAMES: List = listOf("name") - public override fun fromJson(reader: JsonReader, - adapterContext: CompositeAdapterContext): + override fun fromJson(reader: JsonReader, adapterContext: CompositeAdapterContext): HeroDetails.Data.Hero.FriendsConnection.Edge.Node { var _name: String? = null @@ -175,11 +173,11 @@ public object HeroDetails_ResponseAdapter { ) } - public override fun toJson( + override fun toJson( writer: JsonWriter, `value`: HeroDetails.Data.Hero.FriendsConnection.Edge.Node, adapterContext: CompositeAdapterContext, - ): Unit { + ) { writer.name("name") StringAdapter.toJson(writer, CustomScalarAdapters.Empty, value.name) } diff --git a/libraries/apollo-compiler/src/test/graphql/com/example/hero_details/kotlin/responseBased/hero_details/type/adapter/hero_type_ResponseAdapter.kt.expected b/libraries/apollo-compiler/src/test/graphql/com/example/hero_details/kotlin/responseBased/hero_details/type/adapter/hero_type_ResponseAdapter.kt.expected index 7a28dd53509..9e9d952afab 100644 --- a/libraries/apollo-compiler/src/test/graphql/com/example/hero_details/kotlin/responseBased/hero_details/type/adapter/hero_type_ResponseAdapter.kt.expected +++ b/libraries/apollo-compiler/src/test/graphql/com/example/hero_details/kotlin/responseBased/hero_details/type/adapter/hero_type_ResponseAdapter.kt.expected @@ -10,20 +10,18 @@ import com.apollographql.apollo3.api.CustomScalarAdapters import com.apollographql.apollo3.api.json.JsonReader import com.apollographql.apollo3.api.json.JsonWriter import com.example.hero_details.type.Hero_type -import kotlin.Unit public object Hero_type_ResponseAdapter : Adapter { - public override fun fromJson(reader: JsonReader, customScalarAdapters: CustomScalarAdapters): - Hero_type { + override fun fromJson(reader: JsonReader, customScalarAdapters: CustomScalarAdapters): Hero_type { val rawValue = reader.nextString()!! return Hero_type.safeValueOf(rawValue) } - public override fun toJson( + override fun toJson( writer: JsonWriter, customScalarAdapters: CustomScalarAdapters, `value`: Hero_type, - ): Unit { + ) { writer.value(value.rawValue) } } diff --git a/libraries/apollo-compiler/src/test/graphql/com/example/hero_details_semantic_naming/kotlin/responseBased/hero_details_semantic_naming/HeroDetailsQuery.kt.expected b/libraries/apollo-compiler/src/test/graphql/com/example/hero_details_semantic_naming/kotlin/responseBased/hero_details_semantic_naming/HeroDetailsQuery.kt.expected index 5298174df98..7c0e7be7749 100644 --- a/libraries/apollo-compiler/src/test/graphql/com/example/hero_details_semantic_naming/kotlin/responseBased/hero_details_semantic_naming/HeroDetailsQuery.kt.expected +++ b/libraries/apollo-compiler/src/test/graphql/com/example/hero_details_semantic_naming/kotlin/responseBased/hero_details_semantic_naming/HeroDetailsQuery.kt.expected @@ -18,34 +18,33 @@ import kotlin.Any import kotlin.Boolean import kotlin.Int import kotlin.String -import kotlin.Unit import kotlin.collections.List +import com.example.hero_details_semantic_naming.type.Query as CompiledQuery public class HeroDetailsQuery() : Query { - public override fun equals(other: Any?): Boolean = other != null && other::class == this::class + override fun equals(other: Any?): Boolean = other != null && other::class == this::class - public override fun hashCode(): Int = this::class.hashCode() + override fun hashCode(): Int = this::class.hashCode() - public override fun id(): String = OPERATION_ID + override fun id(): String = OPERATION_ID - public override fun document(): String = OPERATION_DOCUMENT + override fun document(): String = OPERATION_DOCUMENT - public override fun name(): String = OPERATION_NAME + override fun name(): String = OPERATION_NAME - public override fun serializeVariables( + override fun serializeVariables( writer: JsonWriter, customScalarAdapters: CustomScalarAdapters, withBooleanDefaultValues: Boolean, - ): Unit { + ) { // This operation doesn't have any variable } - public override fun adapter(): CompositeAdapter = - HeroDetailsQuery_ResponseAdapter.Data.obj() + override fun adapter(): CompositeAdapter = HeroDetailsQuery_ResponseAdapter.Data.obj() - public override fun rootField(): CompiledField = CompiledField.Builder( + override fun rootField(): CompiledField = CompiledField.Builder( name = "data", - type = com.example.hero_details_semantic_naming.type.Query.type + type = CompiledQuery.type ) .selections(selections = HeroDetailsQuerySelections.__root) .build() diff --git a/libraries/apollo-compiler/src/test/graphql/com/example/hero_details_semantic_naming/kotlin/responseBased/hero_details_semantic_naming/adapter/HeroDetailsQuery_ResponseAdapter.kt.expected b/libraries/apollo-compiler/src/test/graphql/com/example/hero_details_semantic_naming/kotlin/responseBased/hero_details_semantic_naming/adapter/HeroDetailsQuery_ResponseAdapter.kt.expected index 04e88d047f2..a387be859c1 100644 --- a/libraries/apollo-compiler/src/test/graphql/com/example/hero_details_semantic_naming/kotlin/responseBased/hero_details_semantic_naming/adapter/HeroDetailsQuery_ResponseAdapter.kt.expected +++ b/libraries/apollo-compiler/src/test/graphql/com/example/hero_details_semantic_naming/kotlin/responseBased/hero_details_semantic_naming/adapter/HeroDetailsQuery_ResponseAdapter.kt.expected @@ -18,14 +18,13 @@ import com.apollographql.apollo3.api.obj import com.example.hero_details_semantic_naming.HeroDetailsQuery import kotlin.Int import kotlin.String -import kotlin.Unit import kotlin.collections.List public object HeroDetailsQuery_ResponseAdapter { public object Data : CompositeAdapter { public val RESPONSE_NAMES: List = listOf("hero") - public override fun fromJson(reader: JsonReader, adapterContext: CompositeAdapterContext): + override fun fromJson(reader: JsonReader, adapterContext: CompositeAdapterContext): HeroDetailsQuery.Data { var _hero: HeroDetailsQuery.Data.Hero? = null @@ -41,11 +40,11 @@ public object HeroDetailsQuery_ResponseAdapter { ) } - public override fun toJson( + override fun toJson( writer: JsonWriter, `value`: HeroDetailsQuery.Data, adapterContext: CompositeAdapterContext, - ): Unit { + ) { writer.name("hero") Hero.obj().nullable().toJson(writer, value.hero, adapterContext) } @@ -53,7 +52,7 @@ public object HeroDetailsQuery_ResponseAdapter { private object Hero : CompositeAdapter { public val RESPONSE_NAMES: List = listOf("name", "friendsConnection") - public override fun fromJson(reader: JsonReader, adapterContext: CompositeAdapterContext): + override fun fromJson(reader: JsonReader, adapterContext: CompositeAdapterContext): HeroDetailsQuery.Data.Hero { var _name: String? = null var _friendsConnection: HeroDetailsQuery.Data.Hero.FriendsConnection? = null @@ -72,11 +71,11 @@ public object HeroDetailsQuery_ResponseAdapter { ) } - public override fun toJson( + override fun toJson( writer: JsonWriter, `value`: HeroDetailsQuery.Data.Hero, adapterContext: CompositeAdapterContext, - ): Unit { + ) { writer.name("name") StringAdapter.toJson(writer, CustomScalarAdapters.Empty, value.name) @@ -88,7 +87,7 @@ public object HeroDetailsQuery_ResponseAdapter { CompositeAdapter { public val RESPONSE_NAMES: List = listOf("totalCount", "edges") - public override fun fromJson(reader: JsonReader, adapterContext: CompositeAdapterContext): + override fun fromJson(reader: JsonReader, adapterContext: CompositeAdapterContext): HeroDetailsQuery.Data.Hero.FriendsConnection { var _totalCount: Int? = null var _edges: List? = null @@ -107,11 +106,11 @@ public object HeroDetailsQuery_ResponseAdapter { ) } - public override fun toJson( + override fun toJson( writer: JsonWriter, `value`: HeroDetailsQuery.Data.Hero.FriendsConnection, adapterContext: CompositeAdapterContext, - ): Unit { + ) { writer.name("totalCount") NullableIntAdapter.toJson(writer, CustomScalarAdapters.Empty, value.totalCount) @@ -122,7 +121,7 @@ public object HeroDetailsQuery_ResponseAdapter { private object Edge : CompositeAdapter { public val RESPONSE_NAMES: List = listOf("node") - public override fun fromJson(reader: JsonReader, adapterContext: CompositeAdapterContext): + override fun fromJson(reader: JsonReader, adapterContext: CompositeAdapterContext): HeroDetailsQuery.Data.Hero.FriendsConnection.Edge { var _node: HeroDetailsQuery.Data.Hero.FriendsConnection.Edge.Node? = null @@ -138,11 +137,11 @@ public object HeroDetailsQuery_ResponseAdapter { ) } - public override fun toJson( + override fun toJson( writer: JsonWriter, `value`: HeroDetailsQuery.Data.Hero.FriendsConnection.Edge, adapterContext: CompositeAdapterContext, - ): Unit { + ) { writer.name("node") Node.obj().nullable().toJson(writer, value.node, adapterContext) } @@ -151,8 +150,7 @@ public object HeroDetailsQuery_ResponseAdapter { CompositeAdapter { public val RESPONSE_NAMES: List = listOf("name") - public override fun fromJson(reader: JsonReader, - adapterContext: CompositeAdapterContext): + override fun fromJson(reader: JsonReader, adapterContext: CompositeAdapterContext): HeroDetailsQuery.Data.Hero.FriendsConnection.Edge.Node { var _name: String? = null @@ -168,11 +166,11 @@ public object HeroDetailsQuery_ResponseAdapter { ) } - public override fun toJson( + override fun toJson( writer: JsonWriter, `value`: HeroDetailsQuery.Data.Hero.FriendsConnection.Edge.Node, adapterContext: CompositeAdapterContext, - ): Unit { + ) { writer.name("name") StringAdapter.toJson(writer, CustomScalarAdapters.Empty, value.name) } diff --git a/libraries/apollo-compiler/src/test/graphql/com/example/hero_name/kotlin/operationBased/hero_name/TestQuery.kt.expected b/libraries/apollo-compiler/src/test/graphql/com/example/hero_name/kotlin/operationBased/hero_name/TestQuery.kt.expected index 7bc645eaa1b..98dfeec0446 100644 --- a/libraries/apollo-compiler/src/test/graphql/com/example/hero_name/kotlin/operationBased/hero_name/TestQuery.kt.expected +++ b/libraries/apollo-compiler/src/test/graphql/com/example/hero_name/kotlin/operationBased/hero_name/TestQuery.kt.expected @@ -18,32 +18,32 @@ import kotlin.Any import kotlin.Boolean import kotlin.Int import kotlin.String -import kotlin.Unit +import com.example.hero_name.type.Query as CompiledQuery public class TestQuery() : Query { - public override fun equals(other: Any?): Boolean = other != null && other::class == this::class + override fun equals(other: Any?): Boolean = other != null && other::class == this::class - public override fun hashCode(): Int = this::class.hashCode() + override fun hashCode(): Int = this::class.hashCode() - public override fun id(): String = OPERATION_ID + override fun id(): String = OPERATION_ID - public override fun document(): String = OPERATION_DOCUMENT + override fun document(): String = OPERATION_DOCUMENT - public override fun name(): String = OPERATION_NAME + override fun name(): String = OPERATION_NAME - public override fun serializeVariables( + override fun serializeVariables( writer: JsonWriter, customScalarAdapters: CustomScalarAdapters, withBooleanDefaultValues: Boolean, - ): Unit { + ) { // This operation doesn't have any variable } - public override fun adapter(): CompositeAdapter = TestQuery_ResponseAdapter.Data.obj() + override fun adapter(): CompositeAdapter = TestQuery_ResponseAdapter.Data.obj() - public override fun rootField(): CompiledField = CompiledField.Builder( + override fun rootField(): CompiledField = CompiledField.Builder( name = "data", - type = com.example.hero_name.type.Query.type + type = CompiledQuery.type ) .selections(selections = TestQuerySelections.__root) .build() diff --git a/libraries/apollo-compiler/src/test/graphql/com/example/hero_name/kotlin/operationBased/hero_name/adapter/TestQuery_ResponseAdapter.kt.expected b/libraries/apollo-compiler/src/test/graphql/com/example/hero_name/kotlin/operationBased/hero_name/adapter/TestQuery_ResponseAdapter.kt.expected index 983a8913522..fc75d99c76c 100644 --- a/libraries/apollo-compiler/src/test/graphql/com/example/hero_name/kotlin/operationBased/hero_name/adapter/TestQuery_ResponseAdapter.kt.expected +++ b/libraries/apollo-compiler/src/test/graphql/com/example/hero_name/kotlin/operationBased/hero_name/adapter/TestQuery_ResponseAdapter.kt.expected @@ -20,14 +20,13 @@ import com.apollographql.apollo3.api.possibleTypes import com.example.hero_name.TestQuery import kotlin.Any import kotlin.String -import kotlin.Unit import kotlin.collections.List public object TestQuery_ResponseAdapter { public object Data : CompositeAdapter { public val RESPONSE_NAMES: List = listOf("hero") - public override fun fromJson(reader: JsonReader, adapterContext: CompositeAdapterContext): + override fun fromJson(reader: JsonReader, adapterContext: CompositeAdapterContext): TestQuery.Data { var _hero: TestQuery.Data.Hero? = null @@ -43,11 +42,11 @@ public object TestQuery_ResponseAdapter { ) } - public override fun toJson( + override fun toJson( writer: JsonWriter, `value`: TestQuery.Data, adapterContext: CompositeAdapterContext, - ): Unit { + ) { writer.name("hero") Hero.obj(true).nullable().toJson(writer, value.hero, adapterContext) } @@ -55,7 +54,7 @@ public object TestQuery_ResponseAdapter { private object Hero : CompositeAdapter { public val RESPONSE_NAMES: List = listOf("__typename", "name", "birthDate") - public override fun fromJson(reader: JsonReader, adapterContext: CompositeAdapterContext): + override fun fromJson(reader: JsonReader, adapterContext: CompositeAdapterContext): TestQuery.Data.Hero { var __typename: String? = null var _name: String? = null @@ -89,11 +88,11 @@ public object TestQuery_ResponseAdapter { ) } - public override fun toJson( + override fun toJson( writer: JsonWriter, `value`: TestQuery.Data.Hero, adapterContext: CompositeAdapterContext, - ): Unit { + ) { writer.name("__typename") StringAdapter.toJson(writer, CustomScalarAdapters.Empty, value.__typename) @@ -112,7 +111,7 @@ public object TestQuery_ResponseAdapter { private object OnDroid : CompositeAdapter { public val RESPONSE_NAMES: List = listOf("primaryFunction") - public override fun fromJson(reader: JsonReader, adapterContext: CompositeAdapterContext): + override fun fromJson(reader: JsonReader, adapterContext: CompositeAdapterContext): TestQuery.Data.Hero.OnDroid { var _primaryFunction: String? = null @@ -128,11 +127,11 @@ public object TestQuery_ResponseAdapter { ) } - public override fun toJson( + override fun toJson( writer: JsonWriter, `value`: TestQuery.Data.Hero.OnDroid, adapterContext: CompositeAdapterContext, - ): Unit { + ) { writer.name("primaryFunction") NullableStringAdapter.toJson(writer, CustomScalarAdapters.Empty, value.primaryFunction) } diff --git a/libraries/apollo-compiler/src/test/graphql/com/example/hero_name/kotlin/responseBased/hero_name/TestQuery.kt.expected b/libraries/apollo-compiler/src/test/graphql/com/example/hero_name/kotlin/responseBased/hero_name/TestQuery.kt.expected index b27cfb06b33..f1a0161b04a 100644 --- a/libraries/apollo-compiler/src/test/graphql/com/example/hero_name/kotlin/responseBased/hero_name/TestQuery.kt.expected +++ b/libraries/apollo-compiler/src/test/graphql/com/example/hero_name/kotlin/responseBased/hero_name/TestQuery.kt.expected @@ -18,32 +18,33 @@ import kotlin.Any import kotlin.Boolean import kotlin.Int import kotlin.String -import kotlin.Unit +import kotlin.Suppress +import com.example.hero_name.type.Query as CompiledQuery public class TestQuery() : Query { - public override fun equals(other: Any?): Boolean = other != null && other::class == this::class + override fun equals(other: Any?): Boolean = other != null && other::class == this::class - public override fun hashCode(): Int = this::class.hashCode() + override fun hashCode(): Int = this::class.hashCode() - public override fun id(): String = OPERATION_ID + override fun id(): String = OPERATION_ID - public override fun document(): String = OPERATION_DOCUMENT + override fun document(): String = OPERATION_DOCUMENT - public override fun name(): String = OPERATION_NAME + override fun name(): String = OPERATION_NAME - public override fun serializeVariables( + override fun serializeVariables( writer: JsonWriter, customScalarAdapters: CustomScalarAdapters, withBooleanDefaultValues: Boolean, - ): Unit { + ) { // This operation doesn't have any variable } - public override fun adapter(): CompositeAdapter = TestQuery_ResponseAdapter.Data.obj() + override fun adapter(): CompositeAdapter = TestQuery_ResponseAdapter.Data.obj() - public override fun rootField(): CompiledField = CompiledField.Builder( + override fun rootField(): CompiledField = CompiledField.Builder( name = "data", - type = com.example.hero_name.type.Query.type + type = CompiledQuery.type ) .selections(selections = TestQuerySelections.__root) .build() @@ -66,20 +67,21 @@ public class TestQuery() : Query { public val birthDate: Any public companion object { - public fun Hero.asDroid() = this as? DroidHero + @Suppress("USELESS_CAST") + public fun Hero.asDroid(): DroidHero? = this as? DroidHero } } public data class DroidHero( - public override val __typename: String, + override val __typename: String, /** * The name of the character */ - public override val name: String, + override val name: String, /** * The date character was born. */ - public override val birthDate: Any, + override val birthDate: Any, /** * This droid's primary function */ @@ -87,15 +89,15 @@ public class TestQuery() : Query { ) : Hero public data class OtherHero( - public override val __typename: String, + override val __typename: String, /** * The name of the character */ - public override val name: String, + override val name: String, /** * The date character was born. */ - public override val birthDate: Any, + override val birthDate: Any, ) : Hero } diff --git a/libraries/apollo-compiler/src/test/graphql/com/example/hero_name/kotlin/responseBased/hero_name/adapter/TestQuery_ResponseAdapter.kt.expected b/libraries/apollo-compiler/src/test/graphql/com/example/hero_name/kotlin/responseBased/hero_name/adapter/TestQuery_ResponseAdapter.kt.expected index b1f330325a6..6174fa66d10 100644 --- a/libraries/apollo-compiler/src/test/graphql/com/example/hero_name/kotlin/responseBased/hero_name/adapter/TestQuery_ResponseAdapter.kt.expected +++ b/libraries/apollo-compiler/src/test/graphql/com/example/hero_name/kotlin/responseBased/hero_name/adapter/TestQuery_ResponseAdapter.kt.expected @@ -20,14 +20,13 @@ import com.example.hero_name.TestQuery import kotlin.Any import kotlin.String import kotlin.Suppress -import kotlin.Unit import kotlin.collections.List public object TestQuery_ResponseAdapter { public object Data : CompositeAdapter { public val RESPONSE_NAMES: List = listOf("hero") - public override fun fromJson(reader: JsonReader, adapterContext: CompositeAdapterContext): + override fun fromJson(reader: JsonReader, adapterContext: CompositeAdapterContext): TestQuery.Data { var _hero: TestQuery.Data.Hero? = null @@ -43,17 +42,17 @@ public object TestQuery_ResponseAdapter { ) } - public override fun toJson( + override fun toJson( writer: JsonWriter, `value`: TestQuery.Data, adapterContext: CompositeAdapterContext, - ): Unit { + ) { writer.name("hero") Hero.obj().nullable().toJson(writer, value.hero, adapterContext) } private object Hero : CompositeAdapter { - public override fun fromJson(reader: JsonReader, adapterContext: CompositeAdapterContext): + override fun fromJson(reader: JsonReader, adapterContext: CompositeAdapterContext): TestQuery.Data.Hero { val __typename = reader.readTypename() return when(__typename) { @@ -64,11 +63,11 @@ public object TestQuery_ResponseAdapter { } } - public override fun toJson( + override fun toJson( writer: JsonWriter, `value`: TestQuery.Data.Hero, adapterContext: CompositeAdapterContext, - ): Unit { + ) { when(value) { is TestQuery.Data.DroidHero -> DroidHero.toJson(writer, value, adapterContext) is TestQuery.Data.OtherHero -> OtherHero.toJson(writer, value, adapterContext) @@ -112,7 +111,7 @@ public object TestQuery_ResponseAdapter { writer: JsonWriter, `value`: TestQuery.Data.DroidHero, @Suppress("UNUSED_PARAMETER") adapterContext: CompositeAdapterContext, - ): Unit { + ) { writer.name("__typename") StringAdapter.toJson(writer, CustomScalarAdapters.Empty, value.__typename) @@ -159,7 +158,7 @@ public object TestQuery_ResponseAdapter { writer: JsonWriter, `value`: TestQuery.Data.OtherHero, @Suppress("UNUSED_PARAMETER") adapterContext: CompositeAdapterContext, - ): Unit { + ) { writer.name("__typename") StringAdapter.toJson(writer, CustomScalarAdapters.Empty, value.__typename) diff --git a/libraries/apollo-compiler/src/test/graphql/com/example/hero_name_query_long_name/kotlin/responseBased/hero_name_query_long_name/TestQueryWithAVeryAVeryAVeryAVeryAVeryAVeryAVeryAVeryAVeryAVeryAVeryAVeryAVeryLongName.kt.expected b/libraries/apollo-compiler/src/test/graphql/com/example/hero_name_query_long_name/kotlin/responseBased/hero_name_query_long_name/TestQueryWithAVeryAVeryAVeryAVeryAVeryAVeryAVeryAVeryAVeryAVeryAVeryAVeryAVeryLongName.kt.expected index cd591d3847f..42d0de5e600 100644 --- a/libraries/apollo-compiler/src/test/graphql/com/example/hero_name_query_long_name/kotlin/responseBased/hero_name_query_long_name/TestQueryWithAVeryAVeryAVeryAVeryAVeryAVeryAVeryAVeryAVeryAVeryAVeryAVeryAVeryLongName.kt.expected +++ b/libraries/apollo-compiler/src/test/graphql/com/example/hero_name_query_long_name/kotlin/responseBased/hero_name_query_long_name/TestQueryWithAVeryAVeryAVeryAVeryAVeryAVeryAVeryAVeryAVeryAVeryAVeryAVeryAVeryLongName.kt.expected @@ -19,7 +19,7 @@ import com.example.hero_name_query_long_name.selections.TestQueryWithAVeryAVeryA import com.example.hero_name_query_long_name.type.Episode import kotlin.Boolean import kotlin.String -import kotlin.Unit +import com.example.hero_name_query_long_name.type.Query as CompiledQuery public data class TestQueryWithAVeryAVeryAVeryAVeryAVeryAVeryAVeryAVeryAVeryAVeryAVeryAVeryAVeryLongName( @@ -29,27 +29,27 @@ public data class ) : Query { - public override fun id(): String = OPERATION_ID + override fun id(): String = OPERATION_ID - public override fun document(): String = OPERATION_DOCUMENT + override fun document(): String = OPERATION_DOCUMENT - public override fun name(): String = OPERATION_NAME + override fun name(): String = OPERATION_NAME - public override fun serializeVariables( + override fun serializeVariables( writer: JsonWriter, customScalarAdapters: CustomScalarAdapters, withBooleanDefaultValues: Boolean, - ): Unit { + ) { TestQueryWithAVeryAVeryAVeryAVeryAVeryAVeryAVeryAVeryAVeryAVeryAVeryAVeryAVeryLongName_VariablesAdapter.serializeVariables(writer, this, customScalarAdapters, withBooleanDefaultValues) } - public override fun adapter(): CompositeAdapter = + override fun adapter(): CompositeAdapter = TestQueryWithAVeryAVeryAVeryAVeryAVeryAVeryAVeryAVeryAVeryAVeryAVeryAVeryAVeryLongName_ResponseAdapter.Data.obj() - public override fun rootField(): CompiledField = CompiledField.Builder( + override fun rootField(): CompiledField = CompiledField.Builder( name = "data", - type = com.example.hero_name_query_long_name.type.Query.type + type = CompiledQuery.type ) .selections(selections = TestQueryWithAVeryAVeryAVeryAVeryAVeryAVeryAVeryAVeryAVeryAVeryAVeryAVeryAVeryLongNameSelections.__root) .build() diff --git a/libraries/apollo-compiler/src/test/graphql/com/example/hero_name_query_long_name/kotlin/responseBased/hero_name_query_long_name/adapter/TestQueryWithAVeryAVeryAVeryAVeryAVeryAVeryAVeryAVeryAVeryAVeryAVeryAVeryAVeryLongName_ResponseAdapter.kt.expected b/libraries/apollo-compiler/src/test/graphql/com/example/hero_name_query_long_name/kotlin/responseBased/hero_name_query_long_name/adapter/TestQueryWithAVeryAVeryAVeryAVeryAVeryAVeryAVeryAVeryAVeryAVeryAVeryAVeryAVeryLongName_ResponseAdapter.kt.expected index 20a4bdec6d4..1ef30d32eb5 100644 --- a/libraries/apollo-compiler/src/test/graphql/com/example/hero_name_query_long_name/kotlin/responseBased/hero_name_query_long_name/adapter/TestQueryWithAVeryAVeryAVeryAVeryAVeryAVeryAVeryAVeryAVeryAVeryAVeryAVeryAVeryLongName_ResponseAdapter.kt.expected +++ b/libraries/apollo-compiler/src/test/graphql/com/example/hero_name_query_long_name/kotlin/responseBased/hero_name_query_long_name/adapter/TestQueryWithAVeryAVeryAVeryAVeryAVeryAVeryAVeryAVeryAVeryAVeryAVeryAVeryAVeryLongName_ResponseAdapter.kt.expected @@ -15,7 +15,6 @@ import com.apollographql.apollo3.api.nullable import com.apollographql.apollo3.api.obj import com.example.hero_name_query_long_name.TestQueryWithAVeryAVeryAVeryAVeryAVeryAVeryAVeryAVeryAVeryAVeryAVeryAVeryAVeryLongName import kotlin.String -import kotlin.Unit import kotlin.collections.List public object @@ -26,7 +25,7 @@ public object { public val RESPONSE_NAMES: List = listOf("heroAVeryAVeryAVeryAVeryAVeryAVeryAV") - public override fun fromJson(reader: JsonReader, adapterContext: CompositeAdapterContext): + override fun fromJson(reader: JsonReader, adapterContext: CompositeAdapterContext): TestQueryWithAVeryAVeryAVeryAVeryAVeryAVeryAVeryAVeryAVeryAVeryAVeryAVeryAVeryLongName.Data { var _heroAVeryAVeryAVeryAVeryAVeryAVeryAV: TestQueryWithAVeryAVeryAVeryAVeryAVeryAVeryAVeryAVeryAVeryAVeryAVeryAVeryAVeryLongName.Data.HeroAVeryAVeryAVeryAVeryAVeryAVeryAV? = null @@ -42,11 +41,11 @@ public object ) } - public override fun toJson( + override fun toJson( writer: JsonWriter, `value`: TestQueryWithAVeryAVeryAVeryAVeryAVeryAVeryAVeryAVeryAVeryAVeryAVeryAVeryAVeryLongName.Data, adapterContext: CompositeAdapterContext, - ): Unit { + ) { writer.name("heroAVeryAVeryAVeryAVeryAVeryAVeryAV") HeroAVeryAVeryAVeryAVeryAVeryAVeryAV.obj().nullable().toJson(writer, value.heroAVeryAVeryAVeryAVeryAVeryAVeryAV, adapterContext) @@ -58,7 +57,7 @@ public object public val RESPONSE_NAMES: List = listOf("nameAVeryAVeryAVeryAVeryAVeryAVeryAVeryAVeryAVeryAVeryAVeryAVeryAVeryAVeryAVeryLongName") - public override fun fromJson(reader: JsonReader, adapterContext: CompositeAdapterContext): + override fun fromJson(reader: JsonReader, adapterContext: CompositeAdapterContext): TestQueryWithAVeryAVeryAVeryAVeryAVeryAVeryAVeryAVeryAVeryAVeryAVeryAVeryAVeryLongName.Data.HeroAVeryAVeryAVeryAVeryAVeryAVeryAV { var _nameAVeryAVeryAVeryAVeryAVeryAVeryAVeryAVeryAVeryAVeryAVeryAVeryAVeryAVeryAVeryLongName: String? = null @@ -74,11 +73,11 @@ public object ) } - public override fun toJson( + override fun toJson( writer: JsonWriter, `value`: TestQueryWithAVeryAVeryAVeryAVeryAVeryAVeryAVeryAVeryAVeryAVeryAVeryAVeryAVeryLongName.Data.HeroAVeryAVeryAVeryAVeryAVeryAVeryAV, adapterContext: CompositeAdapterContext, - ): Unit { + ) { writer.name("nameAVeryAVeryAVeryAVeryAVeryAVeryAVeryAVeryAVeryAVeryAVeryAVeryAVeryAVeryAVeryLongName") StringAdapter.toJson(writer, CustomScalarAdapters.Empty, value.nameAVeryAVeryAVeryAVeryAVeryAVeryAVeryAVeryAVeryAVeryAVeryAVeryAVeryAVeryAVeryLongName) diff --git a/libraries/apollo-compiler/src/test/graphql/com/example/hero_name_query_long_name/kotlin/responseBased/hero_name_query_long_name/adapter/TestQueryWithAVeryAVeryAVeryAVeryAVeryAVeryAVeryAVeryAVeryAVeryAVeryAVeryAVeryLongName_VariablesAdapter.kt.expected b/libraries/apollo-compiler/src/test/graphql/com/example/hero_name_query_long_name/kotlin/responseBased/hero_name_query_long_name/adapter/TestQueryWithAVeryAVeryAVeryAVeryAVeryAVeryAVeryAVeryAVeryAVeryAVeryAVeryAVeryLongName_VariablesAdapter.kt.expected index 0cd317eaccb..aec633f80ca 100644 --- a/libraries/apollo-compiler/src/test/graphql/com/example/hero_name_query_long_name/kotlin/responseBased/hero_name_query_long_name/adapter/TestQueryWithAVeryAVeryAVeryAVeryAVeryAVeryAVeryAVeryAVeryAVeryAVeryAVeryAVeryLongName_VariablesAdapter.kt.expected +++ b/libraries/apollo-compiler/src/test/graphql/com/example/hero_name_query_long_name/kotlin/responseBased/hero_name_query_long_name/adapter/TestQueryWithAVeryAVeryAVeryAVeryAVeryAVeryAVeryAVeryAVeryAVeryAVeryAVeryAVeryLongName_VariablesAdapter.kt.expected @@ -15,7 +15,6 @@ import com.example.hero_name_query_long_name.TestQueryWithAVeryAVeryAVeryAVeryAV import com.example.hero_name_query_long_name.type.adapter.Episode_ResponseAdapter import kotlin.Boolean import kotlin.Suppress -import kotlin.Unit public object TestQueryWithAVeryAVeryAVeryAVeryAVeryAVeryAVeryAVeryAVeryAVeryAVeryAVeryAVeryLongName_VariablesAdapter @@ -29,7 +28,7 @@ public object `value`: TestQueryWithAVeryAVeryAVeryAVeryAVeryAVeryAVeryAVeryAVeryAVeryAVeryAVeryAVeryLongName, customScalarAdapters: CustomScalarAdapters, withBooleanDefaultValues: Boolean, - ): Unit { + ) { val adapterContext = CompositeAdapterContext.Builder().customScalarAdapters(customScalarAdapters).build() if diff --git a/libraries/apollo-compiler/src/test/graphql/com/example/hero_name_query_long_name/kotlin/responseBased/hero_name_query_long_name/type/adapter/Episode_ResponseAdapter.kt.expected b/libraries/apollo-compiler/src/test/graphql/com/example/hero_name_query_long_name/kotlin/responseBased/hero_name_query_long_name/type/adapter/Episode_ResponseAdapter.kt.expected index 0be221f6516..511cfdb115e 100644 --- a/libraries/apollo-compiler/src/test/graphql/com/example/hero_name_query_long_name/kotlin/responseBased/hero_name_query_long_name/type/adapter/Episode_ResponseAdapter.kt.expected +++ b/libraries/apollo-compiler/src/test/graphql/com/example/hero_name_query_long_name/kotlin/responseBased/hero_name_query_long_name/type/adapter/Episode_ResponseAdapter.kt.expected @@ -10,20 +10,18 @@ import com.apollographql.apollo3.api.CustomScalarAdapters import com.apollographql.apollo3.api.json.JsonReader import com.apollographql.apollo3.api.json.JsonWriter import com.example.hero_name_query_long_name.type.Episode -import kotlin.Unit public object Episode_ResponseAdapter : Adapter { - public override fun fromJson(reader: JsonReader, customScalarAdapters: CustomScalarAdapters): - Episode { + override fun fromJson(reader: JsonReader, customScalarAdapters: CustomScalarAdapters): Episode { val rawValue = reader.nextString()!! return Episode.safeValueOf(rawValue) } - public override fun toJson( + override fun toJson( writer: JsonWriter, customScalarAdapters: CustomScalarAdapters, `value`: Episode, - ): Unit { + ) { writer.value(value.rawValue) } } diff --git a/libraries/apollo-compiler/src/test/graphql/com/example/hero_with_review/kotlin/responseBased/hero_with_review/TestQuery.kt.expected b/libraries/apollo-compiler/src/test/graphql/com/example/hero_with_review/kotlin/responseBased/hero_with_review/TestQuery.kt.expected index 861278355ed..30e3cc3a620 100644 --- a/libraries/apollo-compiler/src/test/graphql/com/example/hero_with_review/kotlin/responseBased/hero_with_review/TestQuery.kt.expected +++ b/libraries/apollo-compiler/src/test/graphql/com/example/hero_with_review/kotlin/responseBased/hero_with_review/TestQuery.kt.expected @@ -19,31 +19,31 @@ import com.example.hero_with_review.type.Episode import kotlin.Boolean import kotlin.Int import kotlin.String -import kotlin.Unit +import com.example.hero_with_review.type.Mutation as CompiledMutation public data class TestQuery( public val ep: Episode, ) : Mutation { - public override fun id(): String = OPERATION_ID + override fun id(): String = OPERATION_ID - public override fun document(): String = OPERATION_DOCUMENT + override fun document(): String = OPERATION_DOCUMENT - public override fun name(): String = OPERATION_NAME + override fun name(): String = OPERATION_NAME - public override fun serializeVariables( + override fun serializeVariables( writer: JsonWriter, customScalarAdapters: CustomScalarAdapters, withBooleanDefaultValues: Boolean, - ): Unit { + ) { TestQuery_VariablesAdapter.serializeVariables(writer, this, customScalarAdapters, withBooleanDefaultValues) } - public override fun adapter(): CompositeAdapter = TestQuery_ResponseAdapter.Data.obj() + override fun adapter(): CompositeAdapter = TestQuery_ResponseAdapter.Data.obj() - public override fun rootField(): CompiledField = CompiledField.Builder( + override fun rootField(): CompiledField = CompiledField.Builder( name = "data", - type = com.example.hero_with_review.type.Mutation.type + type = CompiledMutation.type ) .selections(selections = TestQuerySelections.__root) .build() diff --git a/libraries/apollo-compiler/src/test/graphql/com/example/hero_with_review/kotlin/responseBased/hero_with_review/adapter/TestQuery_ResponseAdapter.kt.expected b/libraries/apollo-compiler/src/test/graphql/com/example/hero_with_review/kotlin/responseBased/hero_with_review/adapter/TestQuery_ResponseAdapter.kt.expected index 5f874e3c030..8f18ae35393 100644 --- a/libraries/apollo-compiler/src/test/graphql/com/example/hero_with_review/kotlin/responseBased/hero_with_review/adapter/TestQuery_ResponseAdapter.kt.expected +++ b/libraries/apollo-compiler/src/test/graphql/com/example/hero_with_review/kotlin/responseBased/hero_with_review/adapter/TestQuery_ResponseAdapter.kt.expected @@ -17,14 +17,13 @@ import com.apollographql.apollo3.api.obj import com.example.hero_with_review.TestQuery import kotlin.Int import kotlin.String -import kotlin.Unit import kotlin.collections.List public object TestQuery_ResponseAdapter { public object Data : CompositeAdapter { public val RESPONSE_NAMES: List = listOf("createReview") - public override fun fromJson(reader: JsonReader, adapterContext: CompositeAdapterContext): + override fun fromJson(reader: JsonReader, adapterContext: CompositeAdapterContext): TestQuery.Data { var _createReview: TestQuery.Data.CreateReview? = null @@ -40,11 +39,11 @@ public object TestQuery_ResponseAdapter { ) } - public override fun toJson( + override fun toJson( writer: JsonWriter, `value`: TestQuery.Data, adapterContext: CompositeAdapterContext, - ): Unit { + ) { writer.name("createReview") CreateReview.obj().nullable().toJson(writer, value.createReview, adapterContext) } @@ -52,7 +51,7 @@ public object TestQuery_ResponseAdapter { private object CreateReview : CompositeAdapter { public val RESPONSE_NAMES: List = listOf("stars", "commentary") - public override fun fromJson(reader: JsonReader, adapterContext: CompositeAdapterContext): + override fun fromJson(reader: JsonReader, adapterContext: CompositeAdapterContext): TestQuery.Data.CreateReview { var _stars: Int? = null var _commentary: String? = null @@ -71,11 +70,11 @@ public object TestQuery_ResponseAdapter { ) } - public override fun toJson( + override fun toJson( writer: JsonWriter, `value`: TestQuery.Data.CreateReview, adapterContext: CompositeAdapterContext, - ): Unit { + ) { writer.name("stars") IntAdapter.toJson(writer, CustomScalarAdapters.Empty, value.stars) diff --git a/libraries/apollo-compiler/src/test/graphql/com/example/hero_with_review/kotlin/responseBased/hero_with_review/adapter/TestQuery_VariablesAdapter.kt.expected b/libraries/apollo-compiler/src/test/graphql/com/example/hero_with_review/kotlin/responseBased/hero_with_review/adapter/TestQuery_VariablesAdapter.kt.expected index ed6d7c5d788..b69dc8085e7 100644 --- a/libraries/apollo-compiler/src/test/graphql/com/example/hero_with_review/kotlin/responseBased/hero_with_review/adapter/TestQuery_VariablesAdapter.kt.expected +++ b/libraries/apollo-compiler/src/test/graphql/com/example/hero_with_review/kotlin/responseBased/hero_with_review/adapter/TestQuery_VariablesAdapter.kt.expected @@ -12,7 +12,6 @@ import com.example.hero_with_review.TestQuery import com.example.hero_with_review.type.adapter.Episode_ResponseAdapter import kotlin.Boolean import kotlin.Suppress -import kotlin.Unit public object TestQuery_VariablesAdapter { @Suppress( @@ -24,7 +23,7 @@ public object TestQuery_VariablesAdapter { `value`: TestQuery, customScalarAdapters: CustomScalarAdapters, withBooleanDefaultValues: Boolean, - ): Unit { + ) { val adapterContext = CompositeAdapterContext.Builder().customScalarAdapters(customScalarAdapters).build() writer.name("ep") diff --git a/libraries/apollo-compiler/src/test/graphql/com/example/hero_with_review/kotlin/responseBased/hero_with_review/type/adapter/Episode_ResponseAdapter.kt.expected b/libraries/apollo-compiler/src/test/graphql/com/example/hero_with_review/kotlin/responseBased/hero_with_review/type/adapter/Episode_ResponseAdapter.kt.expected index af52d156c4c..26ed8c1b542 100644 --- a/libraries/apollo-compiler/src/test/graphql/com/example/hero_with_review/kotlin/responseBased/hero_with_review/type/adapter/Episode_ResponseAdapter.kt.expected +++ b/libraries/apollo-compiler/src/test/graphql/com/example/hero_with_review/kotlin/responseBased/hero_with_review/type/adapter/Episode_ResponseAdapter.kt.expected @@ -10,20 +10,18 @@ import com.apollographql.apollo3.api.CustomScalarAdapters import com.apollographql.apollo3.api.json.JsonReader import com.apollographql.apollo3.api.json.JsonWriter import com.example.hero_with_review.type.Episode -import kotlin.Unit public object Episode_ResponseAdapter : Adapter { - public override fun fromJson(reader: JsonReader, customScalarAdapters: CustomScalarAdapters): - Episode { + override fun fromJson(reader: JsonReader, customScalarAdapters: CustomScalarAdapters): Episode { val rawValue = reader.nextString()!! return Episode.safeValueOf(rawValue) } - public override fun toJson( + override fun toJson( writer: JsonWriter, customScalarAdapters: CustomScalarAdapters, `value`: Episode, - ): Unit { + ) { writer.value(value.rawValue) } } diff --git a/libraries/apollo-compiler/src/test/graphql/com/example/inline_fragment_for_non_optional_field/kotlin/operationBased/inline_fragment_for_non_optional_field/TestQuery.kt.expected b/libraries/apollo-compiler/src/test/graphql/com/example/inline_fragment_for_non_optional_field/kotlin/operationBased/inline_fragment_for_non_optional_field/TestQuery.kt.expected index 087e625185c..6a7b96b011e 100644 --- a/libraries/apollo-compiler/src/test/graphql/com/example/inline_fragment_for_non_optional_field/kotlin/operationBased/inline_fragment_for_non_optional_field/TestQuery.kt.expected +++ b/libraries/apollo-compiler/src/test/graphql/com/example/inline_fragment_for_non_optional_field/kotlin/operationBased/inline_fragment_for_non_optional_field/TestQuery.kt.expected @@ -19,32 +19,32 @@ import kotlin.Boolean import kotlin.Double import kotlin.Int import kotlin.String -import kotlin.Unit +import com.example.inline_fragment_for_non_optional_field.type.Query as CompiledQuery public class TestQuery() : Query { - public override fun equals(other: Any?): Boolean = other != null && other::class == this::class + override fun equals(other: Any?): Boolean = other != null && other::class == this::class - public override fun hashCode(): Int = this::class.hashCode() + override fun hashCode(): Int = this::class.hashCode() - public override fun id(): String = OPERATION_ID + override fun id(): String = OPERATION_ID - public override fun document(): String = OPERATION_DOCUMENT + override fun document(): String = OPERATION_DOCUMENT - public override fun name(): String = OPERATION_NAME + override fun name(): String = OPERATION_NAME - public override fun serializeVariables( + override fun serializeVariables( writer: JsonWriter, customScalarAdapters: CustomScalarAdapters, withBooleanDefaultValues: Boolean, - ): Unit { + ) { // This operation doesn't have any variable } - public override fun adapter(): CompositeAdapter = TestQuery_ResponseAdapter.Data.obj() + override fun adapter(): CompositeAdapter = TestQuery_ResponseAdapter.Data.obj() - public override fun rootField(): CompiledField = CompiledField.Builder( + override fun rootField(): CompiledField = CompiledField.Builder( name = "data", - type = com.example.inline_fragment_for_non_optional_field.type.Query.type + type = CompiledQuery.type ) .selections(selections = TestQuerySelections.__root) .build() diff --git a/libraries/apollo-compiler/src/test/graphql/com/example/inline_fragment_for_non_optional_field/kotlin/operationBased/inline_fragment_for_non_optional_field/adapter/TestQuery_ResponseAdapter.kt.expected b/libraries/apollo-compiler/src/test/graphql/com/example/inline_fragment_for_non_optional_field/kotlin/operationBased/inline_fragment_for_non_optional_field/adapter/TestQuery_ResponseAdapter.kt.expected index 7a4df85b019..054560a4093 100644 --- a/libraries/apollo-compiler/src/test/graphql/com/example/inline_fragment_for_non_optional_field/kotlin/operationBased/inline_fragment_for_non_optional_field/adapter/TestQuery_ResponseAdapter.kt.expected +++ b/libraries/apollo-compiler/src/test/graphql/com/example/inline_fragment_for_non_optional_field/kotlin/operationBased/inline_fragment_for_non_optional_field/adapter/TestQuery_ResponseAdapter.kt.expected @@ -18,14 +18,13 @@ import com.apollographql.apollo3.api.possibleTypes import com.example.inline_fragment_for_non_optional_field.TestQuery import kotlin.Double import kotlin.String -import kotlin.Unit import kotlin.collections.List public object TestQuery_ResponseAdapter { public object Data : CompositeAdapter { public val RESPONSE_NAMES: List = listOf("nonOptionalHero") - public override fun fromJson(reader: JsonReader, adapterContext: CompositeAdapterContext): + override fun fromJson(reader: JsonReader, adapterContext: CompositeAdapterContext): TestQuery.Data { var _nonOptionalHero: TestQuery.Data.NonOptionalHero? = null @@ -41,11 +40,11 @@ public object TestQuery_ResponseAdapter { ) } - public override fun toJson( + override fun toJson( writer: JsonWriter, `value`: TestQuery.Data, adapterContext: CompositeAdapterContext, - ): Unit { + ) { writer.name("nonOptionalHero") NonOptionalHero.obj(true).toJson(writer, value.nonOptionalHero, adapterContext) } @@ -53,7 +52,7 @@ public object TestQuery_ResponseAdapter { private object NonOptionalHero : CompositeAdapter { public val RESPONSE_NAMES: List = listOf("__typename", "name") - public override fun fromJson(reader: JsonReader, adapterContext: CompositeAdapterContext): + override fun fromJson(reader: JsonReader, adapterContext: CompositeAdapterContext): TestQuery.Data.NonOptionalHero { var __typename: String? = null var _name: String? = null @@ -84,11 +83,11 @@ public object TestQuery_ResponseAdapter { ) } - public override fun toJson( + override fun toJson( writer: JsonWriter, `value`: TestQuery.Data.NonOptionalHero, adapterContext: CompositeAdapterContext, - ): Unit { + ) { writer.name("__typename") StringAdapter.toJson(writer, CustomScalarAdapters.Empty, value.__typename) @@ -104,7 +103,7 @@ public object TestQuery_ResponseAdapter { private object OnHuman : CompositeAdapter { public val RESPONSE_NAMES: List = listOf("height") - public override fun fromJson(reader: JsonReader, adapterContext: CompositeAdapterContext): + override fun fromJson(reader: JsonReader, adapterContext: CompositeAdapterContext): TestQuery.Data.NonOptionalHero.OnHuman { var _height: Double? = null @@ -120,11 +119,11 @@ public object TestQuery_ResponseAdapter { ) } - public override fun toJson( + override fun toJson( writer: JsonWriter, `value`: TestQuery.Data.NonOptionalHero.OnHuman, adapterContext: CompositeAdapterContext, - ): Unit { + ) { writer.name("height") NullableDoubleAdapter.toJson(writer, CustomScalarAdapters.Empty, value.height) } diff --git a/libraries/apollo-compiler/src/test/graphql/com/example/inline_fragment_for_non_optional_field/kotlin/responseBased/inline_fragment_for_non_optional_field/TestQuery.kt.expected b/libraries/apollo-compiler/src/test/graphql/com/example/inline_fragment_for_non_optional_field/kotlin/responseBased/inline_fragment_for_non_optional_field/TestQuery.kt.expected index 79e7067e4bc..42bb8f06f31 100644 --- a/libraries/apollo-compiler/src/test/graphql/com/example/inline_fragment_for_non_optional_field/kotlin/responseBased/inline_fragment_for_non_optional_field/TestQuery.kt.expected +++ b/libraries/apollo-compiler/src/test/graphql/com/example/inline_fragment_for_non_optional_field/kotlin/responseBased/inline_fragment_for_non_optional_field/TestQuery.kt.expected @@ -19,32 +19,33 @@ import kotlin.Boolean import kotlin.Double import kotlin.Int import kotlin.String -import kotlin.Unit +import kotlin.Suppress +import com.example.inline_fragment_for_non_optional_field.type.Query as CompiledQuery public class TestQuery() : Query { - public override fun equals(other: Any?): Boolean = other != null && other::class == this::class + override fun equals(other: Any?): Boolean = other != null && other::class == this::class - public override fun hashCode(): Int = this::class.hashCode() + override fun hashCode(): Int = this::class.hashCode() - public override fun id(): String = OPERATION_ID + override fun id(): String = OPERATION_ID - public override fun document(): String = OPERATION_DOCUMENT + override fun document(): String = OPERATION_DOCUMENT - public override fun name(): String = OPERATION_NAME + override fun name(): String = OPERATION_NAME - public override fun serializeVariables( + override fun serializeVariables( writer: JsonWriter, customScalarAdapters: CustomScalarAdapters, withBooleanDefaultValues: Boolean, - ): Unit { + ) { // This operation doesn't have any variable } - public override fun adapter(): CompositeAdapter = TestQuery_ResponseAdapter.Data.obj() + override fun adapter(): CompositeAdapter = TestQuery_ResponseAdapter.Data.obj() - public override fun rootField(): CompiledField = CompiledField.Builder( + override fun rootField(): CompiledField = CompiledField.Builder( name = "data", - type = com.example.inline_fragment_for_non_optional_field.type.Query.type + type = CompiledQuery.type ) .selections(selections = TestQuerySelections.__root) .build() @@ -62,16 +63,17 @@ public class TestQuery() : Query { public val name: String public companion object { - public fun NonOptionalHero.asHuman() = this as? HumanNonOptionalHero + @Suppress("USELESS_CAST") + public fun NonOptionalHero.asHuman(): HumanNonOptionalHero? = this as? HumanNonOptionalHero } } public data class HumanNonOptionalHero( - public override val __typename: String, + override val __typename: String, /** * The name of the character */ - public override val name: String, + override val name: String, /** * Height in the preferred unit, default is meters */ @@ -79,11 +81,11 @@ public class TestQuery() : Query { ) : NonOptionalHero public data class OtherNonOptionalHero( - public override val __typename: String, + override val __typename: String, /** * The name of the character */ - public override val name: String, + override val name: String, ) : NonOptionalHero } diff --git a/libraries/apollo-compiler/src/test/graphql/com/example/inline_fragment_for_non_optional_field/kotlin/responseBased/inline_fragment_for_non_optional_field/adapter/TestQuery_ResponseAdapter.kt.expected b/libraries/apollo-compiler/src/test/graphql/com/example/inline_fragment_for_non_optional_field/kotlin/responseBased/inline_fragment_for_non_optional_field/adapter/TestQuery_ResponseAdapter.kt.expected index 3603b67c8bc..e8fb9955539 100644 --- a/libraries/apollo-compiler/src/test/graphql/com/example/inline_fragment_for_non_optional_field/kotlin/responseBased/inline_fragment_for_non_optional_field/adapter/TestQuery_ResponseAdapter.kt.expected +++ b/libraries/apollo-compiler/src/test/graphql/com/example/inline_fragment_for_non_optional_field/kotlin/responseBased/inline_fragment_for_non_optional_field/adapter/TestQuery_ResponseAdapter.kt.expected @@ -18,14 +18,13 @@ import com.example.inline_fragment_for_non_optional_field.TestQuery import kotlin.Double import kotlin.String import kotlin.Suppress -import kotlin.Unit import kotlin.collections.List public object TestQuery_ResponseAdapter { public object Data : CompositeAdapter { public val RESPONSE_NAMES: List = listOf("nonOptionalHero") - public override fun fromJson(reader: JsonReader, adapterContext: CompositeAdapterContext): + override fun fromJson(reader: JsonReader, adapterContext: CompositeAdapterContext): TestQuery.Data { var _nonOptionalHero: TestQuery.Data.NonOptionalHero? = null @@ -41,17 +40,17 @@ public object TestQuery_ResponseAdapter { ) } - public override fun toJson( + override fun toJson( writer: JsonWriter, `value`: TestQuery.Data, adapterContext: CompositeAdapterContext, - ): Unit { + ) { writer.name("nonOptionalHero") NonOptionalHero.obj().toJson(writer, value.nonOptionalHero, adapterContext) } private object NonOptionalHero : CompositeAdapter { - public override fun fromJson(reader: JsonReader, adapterContext: CompositeAdapterContext): + override fun fromJson(reader: JsonReader, adapterContext: CompositeAdapterContext): TestQuery.Data.NonOptionalHero { val __typename = reader.readTypename() return when(__typename) { @@ -62,11 +61,11 @@ public object TestQuery_ResponseAdapter { } } - public override fun toJson( + override fun toJson( writer: JsonWriter, `value`: TestQuery.Data.NonOptionalHero, adapterContext: CompositeAdapterContext, - ): Unit { + ) { when(value) { is TestQuery.Data.HumanNonOptionalHero -> HumanNonOptionalHero.toJson(writer, value, adapterContext) @@ -108,7 +107,7 @@ public object TestQuery_ResponseAdapter { writer: JsonWriter, `value`: TestQuery.Data.HumanNonOptionalHero, @Suppress("UNUSED_PARAMETER") adapterContext: CompositeAdapterContext, - ): Unit { + ) { writer.name("__typename") StringAdapter.toJson(writer, CustomScalarAdapters.Empty, value.__typename) @@ -149,7 +148,7 @@ public object TestQuery_ResponseAdapter { writer: JsonWriter, `value`: TestQuery.Data.OtherNonOptionalHero, @Suppress("UNUSED_PARAMETER") adapterContext: CompositeAdapterContext, - ): Unit { + ) { writer.name("__typename") StringAdapter.toJson(writer, CustomScalarAdapters.Empty, value.__typename) diff --git a/libraries/apollo-compiler/src/test/graphql/com/example/inline_fragment_inside_inline_fragment/kotlin/operationBased/inline_fragment_inside_inline_fragment/TestQuery.kt.expected b/libraries/apollo-compiler/src/test/graphql/com/example/inline_fragment_inside_inline_fragment/kotlin/operationBased/inline_fragment_inside_inline_fragment/TestQuery.kt.expected index fb7a9cf6e08..9a7654469ba 100644 --- a/libraries/apollo-compiler/src/test/graphql/com/example/inline_fragment_inside_inline_fragment/kotlin/operationBased/inline_fragment_inside_inline_fragment/TestQuery.kt.expected +++ b/libraries/apollo-compiler/src/test/graphql/com/example/inline_fragment_inside_inline_fragment/kotlin/operationBased/inline_fragment_inside_inline_fragment/TestQuery.kt.expected @@ -18,33 +18,33 @@ import kotlin.Any import kotlin.Boolean import kotlin.Int import kotlin.String -import kotlin.Unit import kotlin.collections.List +import com.example.inline_fragment_inside_inline_fragment.type.Query as CompiledQuery public class TestQuery() : Query { - public override fun equals(other: Any?): Boolean = other != null && other::class == this::class + override fun equals(other: Any?): Boolean = other != null && other::class == this::class - public override fun hashCode(): Int = this::class.hashCode() + override fun hashCode(): Int = this::class.hashCode() - public override fun id(): String = OPERATION_ID + override fun id(): String = OPERATION_ID - public override fun document(): String = OPERATION_DOCUMENT + override fun document(): String = OPERATION_DOCUMENT - public override fun name(): String = OPERATION_NAME + override fun name(): String = OPERATION_NAME - public override fun serializeVariables( + override fun serializeVariables( writer: JsonWriter, customScalarAdapters: CustomScalarAdapters, withBooleanDefaultValues: Boolean, - ): Unit { + ) { // This operation doesn't have any variable } - public override fun adapter(): CompositeAdapter = TestQuery_ResponseAdapter.Data.obj() + override fun adapter(): CompositeAdapter = TestQuery_ResponseAdapter.Data.obj() - public override fun rootField(): CompiledField = CompiledField.Builder( + override fun rootField(): CompiledField = CompiledField.Builder( name = "data", - type = com.example.inline_fragment_inside_inline_fragment.type.Query.type + type = CompiledQuery.type ) .selections(selections = TestQuerySelections.__root) .build() diff --git a/libraries/apollo-compiler/src/test/graphql/com/example/inline_fragment_inside_inline_fragment/kotlin/operationBased/inline_fragment_inside_inline_fragment/adapter/TestQuery_ResponseAdapter.kt.expected b/libraries/apollo-compiler/src/test/graphql/com/example/inline_fragment_inside_inline_fragment/kotlin/operationBased/inline_fragment_inside_inline_fragment/adapter/TestQuery_ResponseAdapter.kt.expected index 69314d1df55..7677ad1c2f8 100644 --- a/libraries/apollo-compiler/src/test/graphql/com/example/inline_fragment_inside_inline_fragment/kotlin/operationBased/inline_fragment_inside_inline_fragment/adapter/TestQuery_ResponseAdapter.kt.expected +++ b/libraries/apollo-compiler/src/test/graphql/com/example/inline_fragment_inside_inline_fragment/kotlin/operationBased/inline_fragment_inside_inline_fragment/adapter/TestQuery_ResponseAdapter.kt.expected @@ -19,14 +19,13 @@ import com.apollographql.apollo3.api.obj import com.apollographql.apollo3.api.possibleTypes import com.example.inline_fragment_inside_inline_fragment.TestQuery import kotlin.String -import kotlin.Unit import kotlin.collections.List public object TestQuery_ResponseAdapter { public object Data : CompositeAdapter { public val RESPONSE_NAMES: List = listOf("search") - public override fun fromJson(reader: JsonReader, adapterContext: CompositeAdapterContext): + override fun fromJson(reader: JsonReader, adapterContext: CompositeAdapterContext): TestQuery.Data { var _search: List? = null @@ -42,11 +41,11 @@ public object TestQuery_ResponseAdapter { ) } - public override fun toJson( + override fun toJson( writer: JsonWriter, `value`: TestQuery.Data, adapterContext: CompositeAdapterContext, - ): Unit { + ) { writer.name("search") Search.obj(true).nullable().list().nullable().toJson(writer, value.search, adapterContext) } @@ -54,7 +53,7 @@ public object TestQuery_ResponseAdapter { private object Search : CompositeAdapter { public val RESPONSE_NAMES: List = listOf("__typename") - public override fun fromJson(reader: JsonReader, adapterContext: CompositeAdapterContext): + override fun fromJson(reader: JsonReader, adapterContext: CompositeAdapterContext): TestQuery.Data.Search { var __typename: String? = null @@ -82,11 +81,11 @@ public object TestQuery_ResponseAdapter { ) } - public override fun toJson( + override fun toJson( writer: JsonWriter, `value`: TestQuery.Data.Search, adapterContext: CompositeAdapterContext, - ): Unit { + ) { writer.name("__typename") StringAdapter.toJson(writer, CustomScalarAdapters.Empty, value.__typename) @@ -99,7 +98,7 @@ public object TestQuery_ResponseAdapter { private object OnCharacter : CompositeAdapter { public val RESPONSE_NAMES: List = listOf("__typename", "name") - public override fun fromJson(reader: JsonReader, adapterContext: CompositeAdapterContext): + override fun fromJson(reader: JsonReader, adapterContext: CompositeAdapterContext): TestQuery.Data.Search.OnCharacter { var __typename: String? = null var _name: String? = null @@ -138,11 +137,11 @@ public object TestQuery_ResponseAdapter { ) } - public override fun toJson( + override fun toJson( writer: JsonWriter, `value`: TestQuery.Data.Search.OnCharacter, adapterContext: CompositeAdapterContext, - ): Unit { + ) { writer.name("__typename") StringAdapter.toJson(writer, CustomScalarAdapters.Empty, value.__typename) @@ -163,7 +162,7 @@ public object TestQuery_ResponseAdapter { private object OnHuman : CompositeAdapter { public val RESPONSE_NAMES: List = listOf("homePlanet") - public override fun fromJson(reader: JsonReader, adapterContext: CompositeAdapterContext): + override fun fromJson(reader: JsonReader, adapterContext: CompositeAdapterContext): TestQuery.Data.Search.OnCharacter.OnHuman { var _homePlanet: String? = null @@ -179,11 +178,11 @@ public object TestQuery_ResponseAdapter { ) } - public override fun toJson( + override fun toJson( writer: JsonWriter, `value`: TestQuery.Data.Search.OnCharacter.OnHuman, adapterContext: CompositeAdapterContext, - ): Unit { + ) { writer.name("homePlanet") NullableStringAdapter.toJson(writer, CustomScalarAdapters.Empty, value.homePlanet) } @@ -192,7 +191,7 @@ public object TestQuery_ResponseAdapter { private object OnDroid : CompositeAdapter { public val RESPONSE_NAMES: List = listOf("primaryFunction") - public override fun fromJson(reader: JsonReader, adapterContext: CompositeAdapterContext): + override fun fromJson(reader: JsonReader, adapterContext: CompositeAdapterContext): TestQuery.Data.Search.OnCharacter.OnDroid { var _primaryFunction: String? = null @@ -208,11 +207,11 @@ public object TestQuery_ResponseAdapter { ) } - public override fun toJson( + override fun toJson( writer: JsonWriter, `value`: TestQuery.Data.Search.OnCharacter.OnDroid, adapterContext: CompositeAdapterContext, - ): Unit { + ) { writer.name("primaryFunction") NullableStringAdapter.toJson(writer, CustomScalarAdapters.Empty, value.primaryFunction) } diff --git a/libraries/apollo-compiler/src/test/graphql/com/example/inline_fragment_inside_inline_fragment/kotlin/responseBased/inline_fragment_inside_inline_fragment/TestQuery.kt.expected b/libraries/apollo-compiler/src/test/graphql/com/example/inline_fragment_inside_inline_fragment/kotlin/responseBased/inline_fragment_inside_inline_fragment/TestQuery.kt.expected index f5fe9a966bc..e2d30e837cc 100644 --- a/libraries/apollo-compiler/src/test/graphql/com/example/inline_fragment_inside_inline_fragment/kotlin/responseBased/inline_fragment_inside_inline_fragment/TestQuery.kt.expected +++ b/libraries/apollo-compiler/src/test/graphql/com/example/inline_fragment_inside_inline_fragment/kotlin/responseBased/inline_fragment_inside_inline_fragment/TestQuery.kt.expected @@ -18,33 +18,34 @@ import kotlin.Any import kotlin.Boolean import kotlin.Int import kotlin.String -import kotlin.Unit +import kotlin.Suppress import kotlin.collections.List +import com.example.inline_fragment_inside_inline_fragment.type.Query as CompiledQuery public class TestQuery() : Query { - public override fun equals(other: Any?): Boolean = other != null && other::class == this::class + override fun equals(other: Any?): Boolean = other != null && other::class == this::class - public override fun hashCode(): Int = this::class.hashCode() + override fun hashCode(): Int = this::class.hashCode() - public override fun id(): String = OPERATION_ID + override fun id(): String = OPERATION_ID - public override fun document(): String = OPERATION_DOCUMENT + override fun document(): String = OPERATION_DOCUMENT - public override fun name(): String = OPERATION_NAME + override fun name(): String = OPERATION_NAME - public override fun serializeVariables( + override fun serializeVariables( writer: JsonWriter, customScalarAdapters: CustomScalarAdapters, withBooleanDefaultValues: Boolean, - ): Unit { + ) { // This operation doesn't have any variable } - public override fun adapter(): CompositeAdapter = TestQuery_ResponseAdapter.Data.obj() + override fun adapter(): CompositeAdapter = TestQuery_ResponseAdapter.Data.obj() - public override fun rootField(): CompiledField = CompiledField.Builder( + override fun rootField(): CompiledField = CompiledField.Builder( name = "data", - type = com.example.inline_fragment_inside_inline_fragment.type.Query.type + type = CompiledQuery.type ) .selections(selections = TestQuerySelections.__root) .build() @@ -56,7 +57,7 @@ public class TestQuery() : Query { public fun searchFilterNotNull(): List? = search?.filterNotNull() public sealed interface CharacterSearch : Search { - public override val __typename: String + override val __typename: String /** * The name of the character @@ -68,20 +69,23 @@ public class TestQuery() : Query { public val __typename: String public companion object { - public fun Search.asCharacter() = this as? CharacterSearch + @Suppress("USELESS_CAST") + public fun Search.asCharacter(): CharacterSearch? = this as? CharacterSearch - public fun Search.asCharacterHuman() = this as? CharacterHumanSearch + @Suppress("USELESS_CAST") + public fun Search.asCharacterHuman(): CharacterHumanSearch? = this as? CharacterHumanSearch - public fun Search.asCharacterDroid() = this as? CharacterDroidSearch + @Suppress("USELESS_CAST") + public fun Search.asCharacterDroid(): CharacterDroidSearch? = this as? CharacterDroidSearch } } public data class CharacterHumanSearch( - public override val __typename: String, + override val __typename: String, /** * The name of the character */ - public override val name: String, + override val name: String, /** * The home planet of the human, or null if unknown */ @@ -89,11 +93,11 @@ public class TestQuery() : Query { ) : CharacterSearch public data class CharacterDroidSearch( - public override val __typename: String, + override val __typename: String, /** * The name of the character */ - public override val name: String, + override val name: String, /** * This droid's primary function */ @@ -101,7 +105,7 @@ public class TestQuery() : Query { ) : CharacterSearch public data class OtherSearch( - public override val __typename: String, + override val __typename: String, ) : Search } diff --git a/libraries/apollo-compiler/src/test/graphql/com/example/inline_fragment_inside_inline_fragment/kotlin/responseBased/inline_fragment_inside_inline_fragment/adapter/TestQuery_ResponseAdapter.kt.expected b/libraries/apollo-compiler/src/test/graphql/com/example/inline_fragment_inside_inline_fragment/kotlin/responseBased/inline_fragment_inside_inline_fragment/adapter/TestQuery_ResponseAdapter.kt.expected index 60d889fe20d..fe6851ec851 100644 --- a/libraries/apollo-compiler/src/test/graphql/com/example/inline_fragment_inside_inline_fragment/kotlin/responseBased/inline_fragment_inside_inline_fragment/adapter/TestQuery_ResponseAdapter.kt.expected +++ b/libraries/apollo-compiler/src/test/graphql/com/example/inline_fragment_inside_inline_fragment/kotlin/responseBased/inline_fragment_inside_inline_fragment/adapter/TestQuery_ResponseAdapter.kt.expected @@ -19,14 +19,13 @@ import com.apollographql.apollo3.api.obj import com.example.inline_fragment_inside_inline_fragment.TestQuery import kotlin.String import kotlin.Suppress -import kotlin.Unit import kotlin.collections.List public object TestQuery_ResponseAdapter { public object Data : CompositeAdapter { public val RESPONSE_NAMES: List = listOf("search") - public override fun fromJson(reader: JsonReader, adapterContext: CompositeAdapterContext): + override fun fromJson(reader: JsonReader, adapterContext: CompositeAdapterContext): TestQuery.Data { var _search: List? = null @@ -42,17 +41,17 @@ public object TestQuery_ResponseAdapter { ) } - public override fun toJson( + override fun toJson( writer: JsonWriter, `value`: TestQuery.Data, adapterContext: CompositeAdapterContext, - ): Unit { + ) { writer.name("search") Search.obj().nullable().list().nullable().toJson(writer, value.search, adapterContext) } private object Search : CompositeAdapter { - public override fun fromJson(reader: JsonReader, adapterContext: CompositeAdapterContext): + override fun fromJson(reader: JsonReader, adapterContext: CompositeAdapterContext): TestQuery.Data.Search { val __typename = reader.readTypename() return when(__typename) { @@ -65,11 +64,11 @@ public object TestQuery_ResponseAdapter { } } - public override fun toJson( + override fun toJson( writer: JsonWriter, `value`: TestQuery.Data.Search, adapterContext: CompositeAdapterContext, - ): Unit { + ) { when(value) { is TestQuery.Data.CharacterHumanSearch -> CharacterHumanSearch.toJson(writer, value, adapterContext) @@ -112,7 +111,7 @@ public object TestQuery_ResponseAdapter { writer: JsonWriter, `value`: TestQuery.Data.CharacterHumanSearch, @Suppress("UNUSED_PARAMETER") adapterContext: CompositeAdapterContext, - ): Unit { + ) { writer.name("__typename") StringAdapter.toJson(writer, CustomScalarAdapters.Empty, value.__typename) @@ -156,7 +155,7 @@ public object TestQuery_ResponseAdapter { writer: JsonWriter, `value`: TestQuery.Data.CharacterDroidSearch, @Suppress("UNUSED_PARAMETER") adapterContext: CompositeAdapterContext, - ): Unit { + ) { writer.name("__typename") StringAdapter.toJson(writer, CustomScalarAdapters.Empty, value.__typename) @@ -194,7 +193,7 @@ public object TestQuery_ResponseAdapter { writer: JsonWriter, `value`: TestQuery.Data.OtherSearch, @Suppress("UNUSED_PARAMETER") adapterContext: CompositeAdapterContext, - ): Unit { + ) { writer.name("__typename") StringAdapter.toJson(writer, CustomScalarAdapters.Empty, value.__typename) } diff --git a/libraries/apollo-compiler/src/test/graphql/com/example/inline_fragment_intersection/kotlin/operationBased/inline_fragment_intersection/TestOperation.kt.expected b/libraries/apollo-compiler/src/test/graphql/com/example/inline_fragment_intersection/kotlin/operationBased/inline_fragment_intersection/TestOperation.kt.expected index faec821cecf..402e85c0e6c 100644 --- a/libraries/apollo-compiler/src/test/graphql/com/example/inline_fragment_intersection/kotlin/operationBased/inline_fragment_intersection/TestOperation.kt.expected +++ b/libraries/apollo-compiler/src/test/graphql/com/example/inline_fragment_intersection/kotlin/operationBased/inline_fragment_intersection/TestOperation.kt.expected @@ -20,33 +20,33 @@ import kotlin.Boolean import kotlin.Double import kotlin.Int import kotlin.String -import kotlin.Unit import kotlin.collections.List +import com.example.inline_fragment_intersection.type.Query as CompiledQuery public class TestOperation() : Query { - public override fun equals(other: Any?): Boolean = other != null && other::class == this::class + override fun equals(other: Any?): Boolean = other != null && other::class == this::class - public override fun hashCode(): Int = this::class.hashCode() + override fun hashCode(): Int = this::class.hashCode() - public override fun id(): String = OPERATION_ID + override fun id(): String = OPERATION_ID - public override fun document(): String = OPERATION_DOCUMENT + override fun document(): String = OPERATION_DOCUMENT - public override fun name(): String = OPERATION_NAME + override fun name(): String = OPERATION_NAME - public override fun serializeVariables( + override fun serializeVariables( writer: JsonWriter, customScalarAdapters: CustomScalarAdapters, withBooleanDefaultValues: Boolean, - ): Unit { + ) { // This operation doesn't have any variable } - public override fun adapter(): CompositeAdapter = TestOperation_ResponseAdapter.Data.obj() + override fun adapter(): CompositeAdapter = TestOperation_ResponseAdapter.Data.obj() - public override fun rootField(): CompiledField = CompiledField.Builder( + override fun rootField(): CompiledField = CompiledField.Builder( name = "data", - type = com.example.inline_fragment_intersection.type.Query.type + type = CompiledQuery.type ) .selections(selections = TestOperationSelections.__root) .build() diff --git a/libraries/apollo-compiler/src/test/graphql/com/example/inline_fragment_intersection/kotlin/operationBased/inline_fragment_intersection/adapter/TestOperation_ResponseAdapter.kt.expected b/libraries/apollo-compiler/src/test/graphql/com/example/inline_fragment_intersection/kotlin/operationBased/inline_fragment_intersection/adapter/TestOperation_ResponseAdapter.kt.expected index be3bdc7e2f5..9632b3b5c0a 100644 --- a/libraries/apollo-compiler/src/test/graphql/com/example/inline_fragment_intersection/kotlin/operationBased/inline_fragment_intersection/adapter/TestOperation_ResponseAdapter.kt.expected +++ b/libraries/apollo-compiler/src/test/graphql/com/example/inline_fragment_intersection/kotlin/operationBased/inline_fragment_intersection/adapter/TestOperation_ResponseAdapter.kt.expected @@ -24,14 +24,13 @@ import com.example.inline_fragment_intersection.type.adapter.Race_ResponseAdapte import kotlin.Boolean import kotlin.Double import kotlin.String -import kotlin.Unit import kotlin.collections.List public object TestOperation_ResponseAdapter { public object Data : CompositeAdapter { public val RESPONSE_NAMES: List = listOf("random") - public override fun fromJson(reader: JsonReader, adapterContext: CompositeAdapterContext): + override fun fromJson(reader: JsonReader, adapterContext: CompositeAdapterContext): TestOperation.Data { var _random: TestOperation.Data.Random? = null @@ -47,11 +46,11 @@ public object TestOperation_ResponseAdapter { ) } - public override fun toJson( + override fun toJson( writer: JsonWriter, `value`: TestOperation.Data, adapterContext: CompositeAdapterContext, - ): Unit { + ) { writer.name("random") Random.obj(true).toJson(writer, value.random, adapterContext) } @@ -59,7 +58,7 @@ public object TestOperation_ResponseAdapter { private object Random : CompositeAdapter { public val RESPONSE_NAMES: List = listOf("__typename") - public override fun fromJson(reader: JsonReader, adapterContext: CompositeAdapterContext): + override fun fromJson(reader: JsonReader, adapterContext: CompositeAdapterContext): TestOperation.Data.Random { var __typename: String? = null @@ -95,11 +94,11 @@ public object TestOperation_ResponseAdapter { ) } - public override fun toJson( + override fun toJson( writer: JsonWriter, `value`: TestOperation.Data.Random, adapterContext: CompositeAdapterContext, - ): Unit { + ) { writer.name("__typename") StringAdapter.toJson(writer, CustomScalarAdapters.Empty, value.__typename) @@ -117,7 +116,7 @@ public object TestOperation_ResponseAdapter { private object OnBeing : CompositeAdapter { public val RESPONSE_NAMES: List = listOf("__typename", "name", "friends") - public override fun fromJson(reader: JsonReader, adapterContext: CompositeAdapterContext): + override fun fromJson(reader: JsonReader, adapterContext: CompositeAdapterContext): TestOperation.Data.Random.OnBeing { var __typename: String? = null var _name: String? = null @@ -151,11 +150,11 @@ public object TestOperation_ResponseAdapter { ) } - public override fun toJson( + override fun toJson( writer: JsonWriter, `value`: TestOperation.Data.Random.OnBeing, adapterContext: CompositeAdapterContext, - ): Unit { + ) { writer.name("__typename") StringAdapter.toJson(writer, CustomScalarAdapters.Empty, value.__typename) @@ -174,7 +173,7 @@ public object TestOperation_ResponseAdapter { private object Friend : CompositeAdapter { public val RESPONSE_NAMES: List = listOf("__typename", "name") - public override fun fromJson(reader: JsonReader, adapterContext: CompositeAdapterContext): + override fun fromJson(reader: JsonReader, adapterContext: CompositeAdapterContext): TestOperation.Data.Random.OnBeing.Friend { var __typename: String? = null var _name: String? = null @@ -205,11 +204,11 @@ public object TestOperation_ResponseAdapter { ) } - public override fun toJson( + override fun toJson( writer: JsonWriter, `value`: TestOperation.Data.Random.OnBeing.Friend, adapterContext: CompositeAdapterContext, - ): Unit { + ) { writer.name("__typename") StringAdapter.toJson(writer, CustomScalarAdapters.Empty, value.__typename) @@ -226,8 +225,7 @@ public object TestOperation_ResponseAdapter { CompositeAdapter { public val RESPONSE_NAMES: List = listOf("lifeExpectancy") - public override fun fromJson(reader: JsonReader, - adapterContext: CompositeAdapterContext): + override fun fromJson(reader: JsonReader, adapterContext: CompositeAdapterContext): TestOperation.Data.Random.OnBeing.Friend.OnWookie { var _lifeExpectancy: Double? = null @@ -243,11 +241,11 @@ public object TestOperation_ResponseAdapter { ) } - public override fun toJson( + override fun toJson( writer: JsonWriter, `value`: TestOperation.Data.Random.OnBeing.Friend.OnWookie, adapterContext: CompositeAdapterContext, - ): Unit { + ) { writer.name("lifeExpectancy") NullableDoubleAdapter.toJson(writer, CustomScalarAdapters.Empty, value.lifeExpectancy) } @@ -257,7 +255,7 @@ public object TestOperation_ResponseAdapter { private object OnHuman : CompositeAdapter { public val RESPONSE_NAMES: List = listOf("profilePictureUrl", "friends") - public override fun fromJson(reader: JsonReader, adapterContext: CompositeAdapterContext): + override fun fromJson(reader: JsonReader, adapterContext: CompositeAdapterContext): TestOperation.Data.Random.OnBeing.OnHuman { var _profilePictureUrl: String? = null var _friends: List? = null @@ -276,11 +274,11 @@ public object TestOperation_ResponseAdapter { ) } - public override fun toJson( + override fun toJson( writer: JsonWriter, `value`: TestOperation.Data.Random.OnBeing.OnHuman, adapterContext: CompositeAdapterContext, - ): Unit { + ) { writer.name("profilePictureUrl") NullableStringAdapter.toJson(writer, CustomScalarAdapters.Empty, value.profilePictureUrl) @@ -293,8 +291,7 @@ public object TestOperation_ResponseAdapter { { public val RESPONSE_NAMES: List = listOf("__typename", "isFamous") - public override fun fromJson(reader: JsonReader, - adapterContext: CompositeAdapterContext): + override fun fromJson(reader: JsonReader, adapterContext: CompositeAdapterContext): TestOperation.Data.Random.OnBeing.OnHuman.Friend { var __typename: String? = null var _isFamous: Boolean? = null @@ -325,11 +322,11 @@ public object TestOperation_ResponseAdapter { ) } - public override fun toJson( + override fun toJson( writer: JsonWriter, `value`: TestOperation.Data.Random.OnBeing.OnHuman.Friend, adapterContext: CompositeAdapterContext, - ): Unit { + ) { writer.name("__typename") StringAdapter.toJson(writer, CustomScalarAdapters.Empty, value.__typename) @@ -346,8 +343,7 @@ public object TestOperation_ResponseAdapter { CompositeAdapter { public val RESPONSE_NAMES: List = listOf("race") - public override fun fromJson(reader: JsonReader, - adapterContext: CompositeAdapterContext): + override fun fromJson(reader: JsonReader, adapterContext: CompositeAdapterContext): TestOperation.Data.Random.OnBeing.OnHuman.Friend.OnWookie { var _race: Race? = null @@ -363,11 +359,11 @@ public object TestOperation_ResponseAdapter { ) } - public override fun toJson( + override fun toJson( writer: JsonWriter, `value`: TestOperation.Data.Random.OnBeing.OnHuman.Friend.OnWookie, adapterContext: CompositeAdapterContext, - ): Unit { + ) { writer.name("race") Race_ResponseAdapter.toJson(writer, CustomScalarAdapters.Empty, value.race) } @@ -379,7 +375,7 @@ public object TestOperation_ResponseAdapter { private object OnWookie : CompositeAdapter { public val RESPONSE_NAMES: List = listOf("race", "friends") - public override fun fromJson(reader: JsonReader, adapterContext: CompositeAdapterContext): + override fun fromJson(reader: JsonReader, adapterContext: CompositeAdapterContext): TestOperation.Data.Random.OnWookie { var _race: Race? = null var _friends: List? = null @@ -398,11 +394,11 @@ public object TestOperation_ResponseAdapter { ) } - public override fun toJson( + override fun toJson( writer: JsonWriter, `value`: TestOperation.Data.Random.OnWookie, adapterContext: CompositeAdapterContext, - ): Unit { + ) { writer.name("race") Race_ResponseAdapter.toJson(writer, CustomScalarAdapters.Empty, value.race) @@ -413,7 +409,7 @@ public object TestOperation_ResponseAdapter { private object Friend : CompositeAdapter { public val RESPONSE_NAMES: List = listOf("lifeExpectancy") - public override fun fromJson(reader: JsonReader, adapterContext: CompositeAdapterContext): + override fun fromJson(reader: JsonReader, adapterContext: CompositeAdapterContext): TestOperation.Data.Random.OnWookie.Friend { var _lifeExpectancy: Double? = null @@ -429,11 +425,11 @@ public object TestOperation_ResponseAdapter { ) } - public override fun toJson( + override fun toJson( writer: JsonWriter, `value`: TestOperation.Data.Random.OnWookie.Friend, adapterContext: CompositeAdapterContext, - ): Unit { + ) { writer.name("lifeExpectancy") NullableDoubleAdapter.toJson(writer, CustomScalarAdapters.Empty, value.lifeExpectancy) } diff --git a/libraries/apollo-compiler/src/test/graphql/com/example/inline_fragment_intersection/kotlin/operationBased/inline_fragment_intersection/type/adapter/Race_ResponseAdapter.kt.expected b/libraries/apollo-compiler/src/test/graphql/com/example/inline_fragment_intersection/kotlin/operationBased/inline_fragment_intersection/type/adapter/Race_ResponseAdapter.kt.expected index 6005c8a7a63..31cdbe28745 100644 --- a/libraries/apollo-compiler/src/test/graphql/com/example/inline_fragment_intersection/kotlin/operationBased/inline_fragment_intersection/type/adapter/Race_ResponseAdapter.kt.expected +++ b/libraries/apollo-compiler/src/test/graphql/com/example/inline_fragment_intersection/kotlin/operationBased/inline_fragment_intersection/type/adapter/Race_ResponseAdapter.kt.expected @@ -10,20 +10,18 @@ import com.apollographql.apollo3.api.CustomScalarAdapters import com.apollographql.apollo3.api.json.JsonReader import com.apollographql.apollo3.api.json.JsonWriter import com.example.inline_fragment_intersection.type.Race -import kotlin.Unit public object Race_ResponseAdapter : Adapter { - public override fun fromJson(reader: JsonReader, customScalarAdapters: CustomScalarAdapters): - Race { + override fun fromJson(reader: JsonReader, customScalarAdapters: CustomScalarAdapters): Race { val rawValue = reader.nextString()!! return Race.safeValueOf(rawValue) } - public override fun toJson( + override fun toJson( writer: JsonWriter, customScalarAdapters: CustomScalarAdapters, `value`: Race, - ): Unit { + ) { writer.value(value.rawValue) } } diff --git a/libraries/apollo-compiler/src/test/graphql/com/example/inline_fragment_intersection/kotlin/responseBased/inline_fragment_intersection/TestOperation.kt.expected b/libraries/apollo-compiler/src/test/graphql/com/example/inline_fragment_intersection/kotlin/responseBased/inline_fragment_intersection/TestOperation.kt.expected index 5c7c7756ea5..e1f938ef666 100644 --- a/libraries/apollo-compiler/src/test/graphql/com/example/inline_fragment_intersection/kotlin/responseBased/inline_fragment_intersection/TestOperation.kt.expected +++ b/libraries/apollo-compiler/src/test/graphql/com/example/inline_fragment_intersection/kotlin/responseBased/inline_fragment_intersection/TestOperation.kt.expected @@ -20,33 +20,34 @@ import kotlin.Boolean import kotlin.Double import kotlin.Int import kotlin.String -import kotlin.Unit +import kotlin.Suppress import kotlin.collections.List +import com.example.inline_fragment_intersection.type.Query as CompiledQuery public class TestOperation() : Query { - public override fun equals(other: Any?): Boolean = other != null && other::class == this::class + override fun equals(other: Any?): Boolean = other != null && other::class == this::class - public override fun hashCode(): Int = this::class.hashCode() + override fun hashCode(): Int = this::class.hashCode() - public override fun id(): String = OPERATION_ID + override fun id(): String = OPERATION_ID - public override fun document(): String = OPERATION_DOCUMENT + override fun document(): String = OPERATION_DOCUMENT - public override fun name(): String = OPERATION_NAME + override fun name(): String = OPERATION_NAME - public override fun serializeVariables( + override fun serializeVariables( writer: JsonWriter, customScalarAdapters: CustomScalarAdapters, withBooleanDefaultValues: Boolean, - ): Unit { + ) { // This operation doesn't have any variable } - public override fun adapter(): CompositeAdapter = TestOperation_ResponseAdapter.Data.obj() + override fun adapter(): CompositeAdapter = TestOperation_ResponseAdapter.Data.obj() - public override fun rootField(): CompiledField = CompiledField.Builder( + override fun rootField(): CompiledField = CompiledField.Builder( name = "data", - type = com.example.inline_fragment_intersection.type.Query.type + type = CompiledQuery.type ) .selections(selections = TestOperationSelections.__root) .build() @@ -56,7 +57,7 @@ public class TestOperation() : Query { public val random: Random, ) : Query.Data { public sealed interface BeingRandom : Random { - public override val __typename: String + override val __typename: String public val name: String @@ -68,21 +69,22 @@ public class TestOperation() : Query { public val name: String public companion object { - public fun Friend.asWookie() = this as? WookieFriend + @Suppress("USELESS_CAST") + public fun Friend.asWookie(): WookieFriend? = this as? WookieFriend } } public sealed interface WookieFriend : Friend { - public override val __typename: String + override val __typename: String - public override val name: String + override val name: String public val lifeExpectancy: Double? } } public sealed interface WookieRandom : Random { - public override val __typename: String + override val __typename: String public val race: Race @@ -97,82 +99,88 @@ public class TestOperation() : Query { public val __typename: String public companion object { - public fun Random.asBeing() = this as? BeingRandom + @Suppress("USELESS_CAST") + public fun Random.asBeing(): BeingRandom? = this as? BeingRandom - public fun Random.asBeingHuman() = this as? BeingHumanRandom + @Suppress("USELESS_CAST") + public fun Random.asBeingHuman(): BeingHumanRandom? = this as? BeingHumanRandom - public fun Random.asWookie() = this as? WookieRandom + @Suppress("USELESS_CAST") + public fun Random.asWookie(): WookieRandom? = this as? WookieRandom - public fun Random.asBeingWookie() = this as? BeingWookieRandom + @Suppress("USELESS_CAST") + public fun Random.asBeingWookie(): BeingWookieRandom? = this as? BeingWookieRandom } } public data class BeingHumanRandom( - public override val __typename: String, - public override val name: String, - public override val friends: List, + override val __typename: String, + override val name: String, + override val friends: List, public val profilePictureUrl: String?, ) : BeingRandom { public sealed interface Friend : BeingRandom.Friend { - public override val __typename: String + override val __typename: String - public override val name: String + override val name: String public val isFamous: Boolean? public companion object { - public fun Friend.asWookie() = this as? WookieFriend + @Suppress("USELESS_CAST") + public fun Friend.asWookie(): WookieFriend? = this as? WookieFriend } } public data class WookieFriend( - public override val __typename: String, - public override val name: String, - public override val lifeExpectancy: Double?, - public override val isFamous: Boolean?, + override val __typename: String, + override val name: String, + override val lifeExpectancy: Double?, + override val isFamous: Boolean?, public val race: Race, ) : Friend, BeingRandom.WookieFriend public data class OtherFriend( - public override val __typename: String, - public override val name: String, - public override val isFamous: Boolean?, + override val __typename: String, + override val name: String, + override val isFamous: Boolean?, ) : Friend, BeingRandom.Friend } public data class BeingWookieRandom( - public override val __typename: String, - public override val name: String, - public override val friends: List, - public override val race: Race, + override val __typename: String, + override val name: String, + override val friends: List, + override val race: Race, ) : BeingRandom, WookieRandom { public sealed interface Friend : BeingRandom.Friend, WookieRandom.Friend { - public override val __typename: String + override val __typename: String - public override val name: String + override val name: String - public override val lifeExpectancy: Double? + override val lifeExpectancy: Double? public companion object { - public fun Friend.asWookie() = this as? WookieFriend + @Suppress("USELESS_CAST") + public fun Friend.asWookie(): WookieFriend? = this as? WookieFriend } } public data class WookieFriend( - public override val __typename: String, - public override val name: String, - public override val lifeExpectancy: Double?, + override val __typename: String, + override val name: String, + override val lifeExpectancy: Double?, ) : Friend, BeingRandom.WookieFriend, WookieRandom.Friend public data class OtherFriend( - public override val __typename: String, - public override val name: String, - public override val lifeExpectancy: Double?, + override val __typename: String, + override val name: String, + override val lifeExpectancy: Double?, ) : Friend, BeingRandom.Friend, WookieRandom.Friend } public data class OtherRandom( - public override val __typename: String, + override val __typename: String, ) : Random } diff --git a/libraries/apollo-compiler/src/test/graphql/com/example/inline_fragment_intersection/kotlin/responseBased/inline_fragment_intersection/adapter/TestOperation_ResponseAdapter.kt.expected b/libraries/apollo-compiler/src/test/graphql/com/example/inline_fragment_intersection/kotlin/responseBased/inline_fragment_intersection/adapter/TestOperation_ResponseAdapter.kt.expected index f1509dc230e..0aaa5488c67 100644 --- a/libraries/apollo-compiler/src/test/graphql/com/example/inline_fragment_intersection/kotlin/responseBased/inline_fragment_intersection/adapter/TestOperation_ResponseAdapter.kt.expected +++ b/libraries/apollo-compiler/src/test/graphql/com/example/inline_fragment_intersection/kotlin/responseBased/inline_fragment_intersection/adapter/TestOperation_ResponseAdapter.kt.expected @@ -24,14 +24,13 @@ import kotlin.Boolean import kotlin.Double import kotlin.String import kotlin.Suppress -import kotlin.Unit import kotlin.collections.List public object TestOperation_ResponseAdapter { public object Data : CompositeAdapter { public val RESPONSE_NAMES: List = listOf("random") - public override fun fromJson(reader: JsonReader, adapterContext: CompositeAdapterContext): + override fun fromJson(reader: JsonReader, adapterContext: CompositeAdapterContext): TestOperation.Data { var _random: TestOperation.Data.Random? = null @@ -47,17 +46,17 @@ public object TestOperation_ResponseAdapter { ) } - public override fun toJson( + override fun toJson( writer: JsonWriter, `value`: TestOperation.Data, adapterContext: CompositeAdapterContext, - ): Unit { + ) { writer.name("random") Random.obj().toJson(writer, value.random, adapterContext) } private object Random : CompositeAdapter { - public override fun fromJson(reader: JsonReader, adapterContext: CompositeAdapterContext): + override fun fromJson(reader: JsonReader, adapterContext: CompositeAdapterContext): TestOperation.Data.Random { val __typename = reader.readTypename() return when(__typename) { @@ -70,11 +69,11 @@ public object TestOperation_ResponseAdapter { } } - public override fun toJson( + override fun toJson( writer: JsonWriter, `value`: TestOperation.Data.Random, adapterContext: CompositeAdapterContext, - ): Unit { + ) { when(value) { is TestOperation.Data.BeingHumanRandom -> BeingHumanRandom.toJson(writer, value, adapterContext) @@ -121,7 +120,7 @@ public object TestOperation_ResponseAdapter { writer: JsonWriter, `value`: TestOperation.Data.BeingHumanRandom, @Suppress("UNUSED_PARAMETER") adapterContext: CompositeAdapterContext, - ): Unit { + ) { writer.name("__typename") StringAdapter.toJson(writer, CustomScalarAdapters.Empty, value.__typename) @@ -136,7 +135,7 @@ public object TestOperation_ResponseAdapter { } private object Friend : CompositeAdapter { - public override fun fromJson(reader: JsonReader, adapterContext: CompositeAdapterContext): + override fun fromJson(reader: JsonReader, adapterContext: CompositeAdapterContext): TestOperation.Data.BeingHumanRandom.Friend { val __typename = reader.readTypename() return when(__typename) { @@ -147,11 +146,11 @@ public object TestOperation_ResponseAdapter { } } - public override fun toJson( + override fun toJson( writer: JsonWriter, `value`: TestOperation.Data.BeingHumanRandom.Friend, adapterContext: CompositeAdapterContext, - ): Unit { + ) { when(value) { is TestOperation.Data.BeingHumanRandom.WookieFriend -> WookieFriend.toJson(writer, value, adapterContext) @@ -200,7 +199,7 @@ public object TestOperation_ResponseAdapter { writer: JsonWriter, `value`: TestOperation.Data.BeingHumanRandom.WookieFriend, @Suppress("UNUSED_PARAMETER") adapterContext: CompositeAdapterContext, - ): Unit { + ) { writer.name("__typename") StringAdapter.toJson(writer, CustomScalarAdapters.Empty, value.__typename) @@ -250,7 +249,7 @@ public object TestOperation_ResponseAdapter { writer: JsonWriter, `value`: TestOperation.Data.BeingHumanRandom.OtherFriend, @Suppress("UNUSED_PARAMETER") adapterContext: CompositeAdapterContext, - ): Unit { + ) { writer.name("__typename") StringAdapter.toJson(writer, CustomScalarAdapters.Empty, value.__typename) @@ -298,7 +297,7 @@ public object TestOperation_ResponseAdapter { writer: JsonWriter, `value`: TestOperation.Data.BeingWookieRandom, @Suppress("UNUSED_PARAMETER") adapterContext: CompositeAdapterContext, - ): Unit { + ) { writer.name("__typename") StringAdapter.toJson(writer, CustomScalarAdapters.Empty, value.__typename) @@ -313,7 +312,7 @@ public object TestOperation_ResponseAdapter { } private object Friend : CompositeAdapter { - public override fun fromJson(reader: JsonReader, adapterContext: CompositeAdapterContext): + override fun fromJson(reader: JsonReader, adapterContext: CompositeAdapterContext): TestOperation.Data.BeingWookieRandom.Friend { val __typename = reader.readTypename() return when(__typename) { @@ -324,11 +323,11 @@ public object TestOperation_ResponseAdapter { } } - public override fun toJson( + override fun toJson( writer: JsonWriter, `value`: TestOperation.Data.BeingWookieRandom.Friend, adapterContext: CompositeAdapterContext, - ): Unit { + ) { when(value) { is TestOperation.Data.BeingWookieRandom.WookieFriend -> WookieFriend.toJson(writer, value, adapterContext) @@ -370,7 +369,7 @@ public object TestOperation_ResponseAdapter { writer: JsonWriter, `value`: TestOperation.Data.BeingWookieRandom.WookieFriend, @Suppress("UNUSED_PARAMETER") adapterContext: CompositeAdapterContext, - ): Unit { + ) { writer.name("__typename") StringAdapter.toJson(writer, CustomScalarAdapters.Empty, value.__typename) @@ -414,7 +413,7 @@ public object TestOperation_ResponseAdapter { writer: JsonWriter, `value`: TestOperation.Data.BeingWookieRandom.OtherFriend, @Suppress("UNUSED_PARAMETER") adapterContext: CompositeAdapterContext, - ): Unit { + ) { writer.name("__typename") StringAdapter.toJson(writer, CustomScalarAdapters.Empty, value.__typename) @@ -453,7 +452,7 @@ public object TestOperation_ResponseAdapter { writer: JsonWriter, `value`: TestOperation.Data.OtherRandom, @Suppress("UNUSED_PARAMETER") adapterContext: CompositeAdapterContext, - ): Unit { + ) { writer.name("__typename") StringAdapter.toJson(writer, CustomScalarAdapters.Empty, value.__typename) } diff --git a/libraries/apollo-compiler/src/test/graphql/com/example/inline_fragment_intersection/kotlin/responseBased/inline_fragment_intersection/type/adapter/Race_ResponseAdapter.kt.expected b/libraries/apollo-compiler/src/test/graphql/com/example/inline_fragment_intersection/kotlin/responseBased/inline_fragment_intersection/type/adapter/Race_ResponseAdapter.kt.expected index 6005c8a7a63..31cdbe28745 100644 --- a/libraries/apollo-compiler/src/test/graphql/com/example/inline_fragment_intersection/kotlin/responseBased/inline_fragment_intersection/type/adapter/Race_ResponseAdapter.kt.expected +++ b/libraries/apollo-compiler/src/test/graphql/com/example/inline_fragment_intersection/kotlin/responseBased/inline_fragment_intersection/type/adapter/Race_ResponseAdapter.kt.expected @@ -10,20 +10,18 @@ import com.apollographql.apollo3.api.CustomScalarAdapters import com.apollographql.apollo3.api.json.JsonReader import com.apollographql.apollo3.api.json.JsonWriter import com.example.inline_fragment_intersection.type.Race -import kotlin.Unit public object Race_ResponseAdapter : Adapter { - public override fun fromJson(reader: JsonReader, customScalarAdapters: CustomScalarAdapters): - Race { + override fun fromJson(reader: JsonReader, customScalarAdapters: CustomScalarAdapters): Race { val rawValue = reader.nextString()!! return Race.safeValueOf(rawValue) } - public override fun toJson( + override fun toJson( writer: JsonWriter, customScalarAdapters: CustomScalarAdapters, `value`: Race, - ): Unit { + ) { writer.value(value.rawValue) } } diff --git a/libraries/apollo-compiler/src/test/graphql/com/example/inline_fragment_merge_fields/kotlin/operationBased/inline_fragment_merge_fields/TestQuery.kt.expected b/libraries/apollo-compiler/src/test/graphql/com/example/inline_fragment_merge_fields/kotlin/operationBased/inline_fragment_merge_fields/TestQuery.kt.expected index ec3d0668e5f..57132fece25 100644 --- a/libraries/apollo-compiler/src/test/graphql/com/example/inline_fragment_merge_fields/kotlin/operationBased/inline_fragment_merge_fields/TestQuery.kt.expected +++ b/libraries/apollo-compiler/src/test/graphql/com/example/inline_fragment_merge_fields/kotlin/operationBased/inline_fragment_merge_fields/TestQuery.kt.expected @@ -18,33 +18,33 @@ import kotlin.Any import kotlin.Boolean import kotlin.Int import kotlin.String -import kotlin.Unit import kotlin.collections.List +import com.example.inline_fragment_merge_fields.type.Query as CompiledQuery public class TestQuery() : Query { - public override fun equals(other: Any?): Boolean = other != null && other::class == this::class + override fun equals(other: Any?): Boolean = other != null && other::class == this::class - public override fun hashCode(): Int = this::class.hashCode() + override fun hashCode(): Int = this::class.hashCode() - public override fun id(): String = OPERATION_ID + override fun id(): String = OPERATION_ID - public override fun document(): String = OPERATION_DOCUMENT + override fun document(): String = OPERATION_DOCUMENT - public override fun name(): String = OPERATION_NAME + override fun name(): String = OPERATION_NAME - public override fun serializeVariables( + override fun serializeVariables( writer: JsonWriter, customScalarAdapters: CustomScalarAdapters, withBooleanDefaultValues: Boolean, - ): Unit { + ) { // This operation doesn't have any variable } - public override fun adapter(): CompositeAdapter = TestQuery_ResponseAdapter.Data.obj() + override fun adapter(): CompositeAdapter = TestQuery_ResponseAdapter.Data.obj() - public override fun rootField(): CompiledField = CompiledField.Builder( + override fun rootField(): CompiledField = CompiledField.Builder( name = "data", - type = com.example.inline_fragment_merge_fields.type.Query.type + type = CompiledQuery.type ) .selections(selections = TestQuerySelections.__root) .build() diff --git a/libraries/apollo-compiler/src/test/graphql/com/example/inline_fragment_merge_fields/kotlin/operationBased/inline_fragment_merge_fields/adapter/TestQuery_ResponseAdapter.kt.expected b/libraries/apollo-compiler/src/test/graphql/com/example/inline_fragment_merge_fields/kotlin/operationBased/inline_fragment_merge_fields/adapter/TestQuery_ResponseAdapter.kt.expected index fc56ebc0d40..f72a955a1d0 100644 --- a/libraries/apollo-compiler/src/test/graphql/com/example/inline_fragment_merge_fields/kotlin/operationBased/inline_fragment_merge_fields/adapter/TestQuery_ResponseAdapter.kt.expected +++ b/libraries/apollo-compiler/src/test/graphql/com/example/inline_fragment_merge_fields/kotlin/operationBased/inline_fragment_merge_fields/adapter/TestQuery_ResponseAdapter.kt.expected @@ -18,14 +18,13 @@ import com.apollographql.apollo3.api.obj import com.example.inline_fragment_merge_fields.TestQuery import kotlin.Any import kotlin.String -import kotlin.Unit import kotlin.collections.List public object TestQuery_ResponseAdapter { public object Data : CompositeAdapter { public val RESPONSE_NAMES: List = listOf("hero") - public override fun fromJson(reader: JsonReader, adapterContext: CompositeAdapterContext): + override fun fromJson(reader: JsonReader, adapterContext: CompositeAdapterContext): TestQuery.Data { var _hero: TestQuery.Data.Hero? = null @@ -41,11 +40,11 @@ public object TestQuery_ResponseAdapter { ) } - public override fun toJson( + override fun toJson( writer: JsonWriter, `value`: TestQuery.Data, adapterContext: CompositeAdapterContext, - ): Unit { + ) { writer.name("hero") Hero.obj(true).nullable().toJson(writer, value.hero, adapterContext) } @@ -53,7 +52,7 @@ public object TestQuery_ResponseAdapter { private object Hero : CompositeAdapter { public val RESPONSE_NAMES: List = listOf("__typename", "name", "friendsConnection") - public override fun fromJson(reader: JsonReader, adapterContext: CompositeAdapterContext): + override fun fromJson(reader: JsonReader, adapterContext: CompositeAdapterContext): TestQuery.Data.Hero { var __typename: String? = null var _name: String? = null @@ -80,11 +79,11 @@ public object TestQuery_ResponseAdapter { ) } - public override fun toJson( + override fun toJson( writer: JsonWriter, `value`: TestQuery.Data.Hero, adapterContext: CompositeAdapterContext, - ): Unit { + ) { writer.name("__typename") StringAdapter.toJson(writer, CustomScalarAdapters.Empty, value.__typename) @@ -101,7 +100,7 @@ public object TestQuery_ResponseAdapter { private object FriendsConnection : CompositeAdapter { public val RESPONSE_NAMES: List = listOf("edges") - public override fun fromJson(reader: JsonReader, adapterContext: CompositeAdapterContext): + override fun fromJson(reader: JsonReader, adapterContext: CompositeAdapterContext): TestQuery.Data.Hero.FriendsConnection { var _edges: List? = null @@ -117,11 +116,11 @@ public object TestQuery_ResponseAdapter { ) } - public override fun toJson( + override fun toJson( writer: JsonWriter, `value`: TestQuery.Data.Hero.FriendsConnection, adapterContext: CompositeAdapterContext, - ): Unit { + ) { writer.name("edges") Edge.obj().nullable().list().nullable().toJson(writer, value.edges, adapterContext) } @@ -129,7 +128,7 @@ public object TestQuery_ResponseAdapter { private object Edge : CompositeAdapter { public val RESPONSE_NAMES: List = listOf("node") - public override fun fromJson(reader: JsonReader, adapterContext: CompositeAdapterContext): + override fun fromJson(reader: JsonReader, adapterContext: CompositeAdapterContext): TestQuery.Data.Hero.FriendsConnection.Edge { var _node: TestQuery.Data.Hero.FriendsConnection.Edge.Node? = null @@ -145,11 +144,11 @@ public object TestQuery_ResponseAdapter { ) } - public override fun toJson( + override fun toJson( writer: JsonWriter, `value`: TestQuery.Data.Hero.FriendsConnection.Edge, adapterContext: CompositeAdapterContext, - ): Unit { + ) { writer.name("node") Node.obj().nullable().toJson(writer, value.node, adapterContext) } @@ -157,8 +156,7 @@ public object TestQuery_ResponseAdapter { private object Node : CompositeAdapter { public val RESPONSE_NAMES: List = listOf("name") - public override fun fromJson(reader: JsonReader, - adapterContext: CompositeAdapterContext): + override fun fromJson(reader: JsonReader, adapterContext: CompositeAdapterContext): TestQuery.Data.Hero.FriendsConnection.Edge.Node { var _name: String? = null @@ -174,11 +172,11 @@ public object TestQuery_ResponseAdapter { ) } - public override fun toJson( + override fun toJson( writer: JsonWriter, `value`: TestQuery.Data.Hero.FriendsConnection.Edge.Node, adapterContext: CompositeAdapterContext, - ): Unit { + ) { writer.name("name") StringAdapter.toJson(writer, CustomScalarAdapters.Empty, value.name) } @@ -189,7 +187,7 @@ public object TestQuery_ResponseAdapter { private object OnCharacter : CompositeAdapter { public val RESPONSE_NAMES: List = listOf("name", "profileLink", "friendsConnection") - public override fun fromJson(reader: JsonReader, adapterContext: CompositeAdapterContext): + override fun fromJson(reader: JsonReader, adapterContext: CompositeAdapterContext): TestQuery.Data.Hero.OnCharacter { var _name: String? = null var _profileLink: Any? = null @@ -211,11 +209,11 @@ public object TestQuery_ResponseAdapter { ) } - public override fun toJson( + override fun toJson( writer: JsonWriter, `value`: TestQuery.Data.Hero.OnCharacter, adapterContext: CompositeAdapterContext, - ): Unit { + ) { writer.name("name") StringAdapter.toJson(writer, CustomScalarAdapters.Empty, value.name) @@ -230,7 +228,7 @@ public object TestQuery_ResponseAdapter { CompositeAdapter { public val RESPONSE_NAMES: List = listOf("edges") - public override fun fromJson(reader: JsonReader, adapterContext: CompositeAdapterContext): + override fun fromJson(reader: JsonReader, adapterContext: CompositeAdapterContext): TestQuery.Data.Hero.OnCharacter.FriendsConnection { var _edges: List? = null @@ -246,11 +244,11 @@ public object TestQuery_ResponseAdapter { ) } - public override fun toJson( + override fun toJson( writer: JsonWriter, `value`: TestQuery.Data.Hero.OnCharacter.FriendsConnection, adapterContext: CompositeAdapterContext, - ): Unit { + ) { writer.name("edges") Edge.obj().nullable().list().nullable().toJson(writer, value.edges, adapterContext) } @@ -259,8 +257,7 @@ public object TestQuery_ResponseAdapter { CompositeAdapter { public val RESPONSE_NAMES: List = listOf("node") - public override fun fromJson(reader: JsonReader, - adapterContext: CompositeAdapterContext): + override fun fromJson(reader: JsonReader, adapterContext: CompositeAdapterContext): TestQuery.Data.Hero.OnCharacter.FriendsConnection.Edge { var _node: TestQuery.Data.Hero.OnCharacter.FriendsConnection.Edge.Node? = null @@ -276,11 +273,11 @@ public object TestQuery_ResponseAdapter { ) } - public override fun toJson( + override fun toJson( writer: JsonWriter, `value`: TestQuery.Data.Hero.OnCharacter.FriendsConnection.Edge, adapterContext: CompositeAdapterContext, - ): Unit { + ) { writer.name("node") Node.obj().nullable().toJson(writer, value.node, adapterContext) } @@ -289,8 +286,7 @@ public object TestQuery_ResponseAdapter { CompositeAdapter { public val RESPONSE_NAMES: List = listOf("name") - public override fun fromJson(reader: JsonReader, - adapterContext: CompositeAdapterContext): + override fun fromJson(reader: JsonReader, adapterContext: CompositeAdapterContext): TestQuery.Data.Hero.OnCharacter.FriendsConnection.Edge.Node { var _name: String? = null @@ -306,11 +302,11 @@ public object TestQuery_ResponseAdapter { ) } - public override fun toJson( + override fun toJson( writer: JsonWriter, `value`: TestQuery.Data.Hero.OnCharacter.FriendsConnection.Edge.Node, adapterContext: CompositeAdapterContext, - ): Unit { + ) { writer.name("name") StringAdapter.toJson(writer, CustomScalarAdapters.Empty, value.name) } diff --git a/libraries/apollo-compiler/src/test/graphql/com/example/inline_fragment_merge_fields/kotlin/responseBased/inline_fragment_merge_fields/TestQuery.kt.expected b/libraries/apollo-compiler/src/test/graphql/com/example/inline_fragment_merge_fields/kotlin/responseBased/inline_fragment_merge_fields/TestQuery.kt.expected index 35af68924cc..9edb4f1ff8b 100644 --- a/libraries/apollo-compiler/src/test/graphql/com/example/inline_fragment_merge_fields/kotlin/responseBased/inline_fragment_merge_fields/TestQuery.kt.expected +++ b/libraries/apollo-compiler/src/test/graphql/com/example/inline_fragment_merge_fields/kotlin/responseBased/inline_fragment_merge_fields/TestQuery.kt.expected @@ -18,33 +18,33 @@ import kotlin.Any import kotlin.Boolean import kotlin.Int import kotlin.String -import kotlin.Unit import kotlin.collections.List +import com.example.inline_fragment_merge_fields.type.Query as CompiledQuery public class TestQuery() : Query { - public override fun equals(other: Any?): Boolean = other != null && other::class == this::class + override fun equals(other: Any?): Boolean = other != null && other::class == this::class - public override fun hashCode(): Int = this::class.hashCode() + override fun hashCode(): Int = this::class.hashCode() - public override fun id(): String = OPERATION_ID + override fun id(): String = OPERATION_ID - public override fun document(): String = OPERATION_DOCUMENT + override fun document(): String = OPERATION_DOCUMENT - public override fun name(): String = OPERATION_NAME + override fun name(): String = OPERATION_NAME - public override fun serializeVariables( + override fun serializeVariables( writer: JsonWriter, customScalarAdapters: CustomScalarAdapters, withBooleanDefaultValues: Boolean, - ): Unit { + ) { // This operation doesn't have any variable } - public override fun adapter(): CompositeAdapter = TestQuery_ResponseAdapter.Data.obj() + override fun adapter(): CompositeAdapter = TestQuery_ResponseAdapter.Data.obj() - public override fun rootField(): CompiledField = CompiledField.Builder( + override fun rootField(): CompiledField = CompiledField.Builder( name = "data", - type = com.example.inline_fragment_merge_fields.type.Query.type + type = CompiledQuery.type ) .selections(selections = TestQuerySelections.__root) .build() diff --git a/libraries/apollo-compiler/src/test/graphql/com/example/inline_fragment_merge_fields/kotlin/responseBased/inline_fragment_merge_fields/adapter/TestQuery_ResponseAdapter.kt.expected b/libraries/apollo-compiler/src/test/graphql/com/example/inline_fragment_merge_fields/kotlin/responseBased/inline_fragment_merge_fields/adapter/TestQuery_ResponseAdapter.kt.expected index 1a984e6ae19..0e19c55c0be 100644 --- a/libraries/apollo-compiler/src/test/graphql/com/example/inline_fragment_merge_fields/kotlin/responseBased/inline_fragment_merge_fields/adapter/TestQuery_ResponseAdapter.kt.expected +++ b/libraries/apollo-compiler/src/test/graphql/com/example/inline_fragment_merge_fields/kotlin/responseBased/inline_fragment_merge_fields/adapter/TestQuery_ResponseAdapter.kt.expected @@ -18,14 +18,13 @@ import com.apollographql.apollo3.api.obj import com.example.inline_fragment_merge_fields.TestQuery import kotlin.Any import kotlin.String -import kotlin.Unit import kotlin.collections.List public object TestQuery_ResponseAdapter { public object Data : CompositeAdapter { public val RESPONSE_NAMES: List = listOf("hero") - public override fun fromJson(reader: JsonReader, adapterContext: CompositeAdapterContext): + override fun fromJson(reader: JsonReader, adapterContext: CompositeAdapterContext): TestQuery.Data { var _hero: TestQuery.Data.Hero? = null @@ -41,11 +40,11 @@ public object TestQuery_ResponseAdapter { ) } - public override fun toJson( + override fun toJson( writer: JsonWriter, `value`: TestQuery.Data, adapterContext: CompositeAdapterContext, - ): Unit { + ) { writer.name("hero") Hero.obj().nullable().toJson(writer, value.hero, adapterContext) } @@ -54,7 +53,7 @@ public object TestQuery_ResponseAdapter { public val RESPONSE_NAMES: List = listOf("__typename", "name", "friendsConnection", "profileLink") - public override fun fromJson(reader: JsonReader, adapterContext: CompositeAdapterContext): + override fun fromJson(reader: JsonReader, adapterContext: CompositeAdapterContext): TestQuery.Data.Hero { var __typename: String? = null var _name: String? = null @@ -79,11 +78,11 @@ public object TestQuery_ResponseAdapter { ) } - public override fun toJson( + override fun toJson( writer: JsonWriter, `value`: TestQuery.Data.Hero, adapterContext: CompositeAdapterContext, - ): Unit { + ) { writer.name("__typename") StringAdapter.toJson(writer, CustomScalarAdapters.Empty, value.__typename) @@ -100,7 +99,7 @@ public object TestQuery_ResponseAdapter { private object FriendsConnection : CompositeAdapter { public val RESPONSE_NAMES: List = listOf("edges") - public override fun fromJson(reader: JsonReader, adapterContext: CompositeAdapterContext): + override fun fromJson(reader: JsonReader, adapterContext: CompositeAdapterContext): TestQuery.Data.Hero.FriendsConnection { var _edges: List? = null @@ -116,11 +115,11 @@ public object TestQuery_ResponseAdapter { ) } - public override fun toJson( + override fun toJson( writer: JsonWriter, `value`: TestQuery.Data.Hero.FriendsConnection, adapterContext: CompositeAdapterContext, - ): Unit { + ) { writer.name("edges") Edge.obj().nullable().list().nullable().toJson(writer, value.edges, adapterContext) } @@ -128,7 +127,7 @@ public object TestQuery_ResponseAdapter { private object Edge : CompositeAdapter { public val RESPONSE_NAMES: List = listOf("node") - public override fun fromJson(reader: JsonReader, adapterContext: CompositeAdapterContext): + override fun fromJson(reader: JsonReader, adapterContext: CompositeAdapterContext): TestQuery.Data.Hero.FriendsConnection.Edge { var _node: TestQuery.Data.Hero.FriendsConnection.Edge.Node? = null @@ -144,11 +143,11 @@ public object TestQuery_ResponseAdapter { ) } - public override fun toJson( + override fun toJson( writer: JsonWriter, `value`: TestQuery.Data.Hero.FriendsConnection.Edge, adapterContext: CompositeAdapterContext, - ): Unit { + ) { writer.name("node") Node.obj().nullable().toJson(writer, value.node, adapterContext) } @@ -156,8 +155,7 @@ public object TestQuery_ResponseAdapter { private object Node : CompositeAdapter { public val RESPONSE_NAMES: List = listOf("name") - public override fun fromJson(reader: JsonReader, - adapterContext: CompositeAdapterContext): + override fun fromJson(reader: JsonReader, adapterContext: CompositeAdapterContext): TestQuery.Data.Hero.FriendsConnection.Edge.Node { var _name: String? = null @@ -173,11 +171,11 @@ public object TestQuery_ResponseAdapter { ) } - public override fun toJson( + override fun toJson( writer: JsonWriter, `value`: TestQuery.Data.Hero.FriendsConnection.Edge.Node, adapterContext: CompositeAdapterContext, - ): Unit { + ) { writer.name("name") StringAdapter.toJson(writer, CustomScalarAdapters.Empty, value.name) } diff --git a/libraries/apollo-compiler/src/test/graphql/com/example/inline_fragment_simple/kotlin/operationBased/inline_fragment_simple/TestQuery.kt.expected b/libraries/apollo-compiler/src/test/graphql/com/example/inline_fragment_simple/kotlin/operationBased/inline_fragment_simple/TestQuery.kt.expected index 02f259c87df..ef023c6dbfc 100644 --- a/libraries/apollo-compiler/src/test/graphql/com/example/inline_fragment_simple/kotlin/operationBased/inline_fragment_simple/TestQuery.kt.expected +++ b/libraries/apollo-compiler/src/test/graphql/com/example/inline_fragment_simple/kotlin/operationBased/inline_fragment_simple/TestQuery.kt.expected @@ -19,32 +19,32 @@ import kotlin.Boolean import kotlin.Double import kotlin.Int import kotlin.String -import kotlin.Unit +import com.example.inline_fragment_simple.type.Query as CompiledQuery public class TestQuery() : Query { - public override fun equals(other: Any?): Boolean = other != null && other::class == this::class + override fun equals(other: Any?): Boolean = other != null && other::class == this::class - public override fun hashCode(): Int = this::class.hashCode() + override fun hashCode(): Int = this::class.hashCode() - public override fun id(): String = OPERATION_ID + override fun id(): String = OPERATION_ID - public override fun document(): String = OPERATION_DOCUMENT + override fun document(): String = OPERATION_DOCUMENT - public override fun name(): String = OPERATION_NAME + override fun name(): String = OPERATION_NAME - public override fun serializeVariables( + override fun serializeVariables( writer: JsonWriter, customScalarAdapters: CustomScalarAdapters, withBooleanDefaultValues: Boolean, - ): Unit { + ) { // This operation doesn't have any variable } - public override fun adapter(): CompositeAdapter = TestQuery_ResponseAdapter.Data.obj() + override fun adapter(): CompositeAdapter = TestQuery_ResponseAdapter.Data.obj() - public override fun rootField(): CompiledField = CompiledField.Builder( + override fun rootField(): CompiledField = CompiledField.Builder( name = "data", - type = com.example.inline_fragment_simple.type.Query.type + type = CompiledQuery.type ) .selections(selections = TestQuerySelections.__root) .build() diff --git a/libraries/apollo-compiler/src/test/graphql/com/example/inline_fragment_simple/kotlin/operationBased/inline_fragment_simple/adapter/TestQuery_ResponseAdapter.kt.expected b/libraries/apollo-compiler/src/test/graphql/com/example/inline_fragment_simple/kotlin/operationBased/inline_fragment_simple/adapter/TestQuery_ResponseAdapter.kt.expected index 0cb2a013542..13781071c3c 100644 --- a/libraries/apollo-compiler/src/test/graphql/com/example/inline_fragment_simple/kotlin/operationBased/inline_fragment_simple/adapter/TestQuery_ResponseAdapter.kt.expected +++ b/libraries/apollo-compiler/src/test/graphql/com/example/inline_fragment_simple/kotlin/operationBased/inline_fragment_simple/adapter/TestQuery_ResponseAdapter.kt.expected @@ -19,14 +19,13 @@ import com.apollographql.apollo3.api.possibleTypes import com.example.inline_fragment_simple.TestQuery import kotlin.Double import kotlin.String -import kotlin.Unit import kotlin.collections.List public object TestQuery_ResponseAdapter { public object Data : CompositeAdapter { public val RESPONSE_NAMES: List = listOf("hero") - public override fun fromJson(reader: JsonReader, adapterContext: CompositeAdapterContext): + override fun fromJson(reader: JsonReader, adapterContext: CompositeAdapterContext): TestQuery.Data { var _hero: TestQuery.Data.Hero? = null @@ -42,11 +41,11 @@ public object TestQuery_ResponseAdapter { ) } - public override fun toJson( + override fun toJson( writer: JsonWriter, `value`: TestQuery.Data, adapterContext: CompositeAdapterContext, - ): Unit { + ) { writer.name("hero") Hero.obj(true).nullable().toJson(writer, value.hero, adapterContext) } @@ -54,7 +53,7 @@ public object TestQuery_ResponseAdapter { private object Hero : CompositeAdapter { public val RESPONSE_NAMES: List = listOf("__typename") - public override fun fromJson(reader: JsonReader, adapterContext: CompositeAdapterContext): + override fun fromJson(reader: JsonReader, adapterContext: CompositeAdapterContext): TestQuery.Data.Hero { var __typename: String? = null @@ -82,11 +81,11 @@ public object TestQuery_ResponseAdapter { ) } - public override fun toJson( + override fun toJson( writer: JsonWriter, `value`: TestQuery.Data.Hero, adapterContext: CompositeAdapterContext, - ): Unit { + ) { writer.name("__typename") StringAdapter.toJson(writer, CustomScalarAdapters.Empty, value.__typename) @@ -99,7 +98,7 @@ public object TestQuery_ResponseAdapter { private object OnHuman : CompositeAdapter { public val RESPONSE_NAMES: List = listOf("height") - public override fun fromJson(reader: JsonReader, adapterContext: CompositeAdapterContext): + override fun fromJson(reader: JsonReader, adapterContext: CompositeAdapterContext): TestQuery.Data.Hero.OnHuman { var _height: Double? = null @@ -115,11 +114,11 @@ public object TestQuery_ResponseAdapter { ) } - public override fun toJson( + override fun toJson( writer: JsonWriter, `value`: TestQuery.Data.Hero.OnHuman, adapterContext: CompositeAdapterContext, - ): Unit { + ) { writer.name("height") NullableDoubleAdapter.toJson(writer, CustomScalarAdapters.Empty, value.height) } diff --git a/libraries/apollo-compiler/src/test/graphql/com/example/inline_fragment_simple/kotlin/responseBased/inline_fragment_simple/TestQuery.kt.expected b/libraries/apollo-compiler/src/test/graphql/com/example/inline_fragment_simple/kotlin/responseBased/inline_fragment_simple/TestQuery.kt.expected index 8e9cb0c5a41..63e08962d62 100644 --- a/libraries/apollo-compiler/src/test/graphql/com/example/inline_fragment_simple/kotlin/responseBased/inline_fragment_simple/TestQuery.kt.expected +++ b/libraries/apollo-compiler/src/test/graphql/com/example/inline_fragment_simple/kotlin/responseBased/inline_fragment_simple/TestQuery.kt.expected @@ -19,32 +19,33 @@ import kotlin.Boolean import kotlin.Double import kotlin.Int import kotlin.String -import kotlin.Unit +import kotlin.Suppress +import com.example.inline_fragment_simple.type.Query as CompiledQuery public class TestQuery() : Query { - public override fun equals(other: Any?): Boolean = other != null && other::class == this::class + override fun equals(other: Any?): Boolean = other != null && other::class == this::class - public override fun hashCode(): Int = this::class.hashCode() + override fun hashCode(): Int = this::class.hashCode() - public override fun id(): String = OPERATION_ID + override fun id(): String = OPERATION_ID - public override fun document(): String = OPERATION_DOCUMENT + override fun document(): String = OPERATION_DOCUMENT - public override fun name(): String = OPERATION_NAME + override fun name(): String = OPERATION_NAME - public override fun serializeVariables( + override fun serializeVariables( writer: JsonWriter, customScalarAdapters: CustomScalarAdapters, withBooleanDefaultValues: Boolean, - ): Unit { + ) { // This operation doesn't have any variable } - public override fun adapter(): CompositeAdapter = TestQuery_ResponseAdapter.Data.obj() + override fun adapter(): CompositeAdapter = TestQuery_ResponseAdapter.Data.obj() - public override fun rootField(): CompiledField = CompiledField.Builder( + override fun rootField(): CompiledField = CompiledField.Builder( name = "data", - type = com.example.inline_fragment_simple.type.Query.type + type = CompiledQuery.type ) .selections(selections = TestQuerySelections.__root) .build() @@ -57,12 +58,13 @@ public class TestQuery() : Query { public val __typename: String public companion object { - public fun Hero.asHuman() = this as? HumanHero + @Suppress("USELESS_CAST") + public fun Hero.asHuman(): HumanHero? = this as? HumanHero } } public data class HumanHero( - public override val __typename: String, + override val __typename: String, /** * Height in the preferred unit, default is meters */ @@ -70,7 +72,7 @@ public class TestQuery() : Query { ) : Hero public data class OtherHero( - public override val __typename: String, + override val __typename: String, ) : Hero } diff --git a/libraries/apollo-compiler/src/test/graphql/com/example/inline_fragment_simple/kotlin/responseBased/inline_fragment_simple/adapter/TestQuery_ResponseAdapter.kt.expected b/libraries/apollo-compiler/src/test/graphql/com/example/inline_fragment_simple/kotlin/responseBased/inline_fragment_simple/adapter/TestQuery_ResponseAdapter.kt.expected index 2585ba9cf2f..57aebe0a49f 100644 --- a/libraries/apollo-compiler/src/test/graphql/com/example/inline_fragment_simple/kotlin/responseBased/inline_fragment_simple/adapter/TestQuery_ResponseAdapter.kt.expected +++ b/libraries/apollo-compiler/src/test/graphql/com/example/inline_fragment_simple/kotlin/responseBased/inline_fragment_simple/adapter/TestQuery_ResponseAdapter.kt.expected @@ -19,14 +19,13 @@ import com.example.inline_fragment_simple.TestQuery import kotlin.Double import kotlin.String import kotlin.Suppress -import kotlin.Unit import kotlin.collections.List public object TestQuery_ResponseAdapter { public object Data : CompositeAdapter { public val RESPONSE_NAMES: List = listOf("hero") - public override fun fromJson(reader: JsonReader, adapterContext: CompositeAdapterContext): + override fun fromJson(reader: JsonReader, adapterContext: CompositeAdapterContext): TestQuery.Data { var _hero: TestQuery.Data.Hero? = null @@ -42,17 +41,17 @@ public object TestQuery_ResponseAdapter { ) } - public override fun toJson( + override fun toJson( writer: JsonWriter, `value`: TestQuery.Data, adapterContext: CompositeAdapterContext, - ): Unit { + ) { writer.name("hero") Hero.obj().nullable().toJson(writer, value.hero, adapterContext) } private object Hero : CompositeAdapter { - public override fun fromJson(reader: JsonReader, adapterContext: CompositeAdapterContext): + override fun fromJson(reader: JsonReader, adapterContext: CompositeAdapterContext): TestQuery.Data.Hero { val __typename = reader.readTypename() return when(__typename) { @@ -63,11 +62,11 @@ public object TestQuery_ResponseAdapter { } } - public override fun toJson( + override fun toJson( writer: JsonWriter, `value`: TestQuery.Data.Hero, adapterContext: CompositeAdapterContext, - ): Unit { + ) { when(value) { is TestQuery.Data.HumanHero -> HumanHero.toJson(writer, value, adapterContext) is TestQuery.Data.OtherHero -> OtherHero.toJson(writer, value, adapterContext) @@ -104,7 +103,7 @@ public object TestQuery_ResponseAdapter { writer: JsonWriter, `value`: TestQuery.Data.HumanHero, @Suppress("UNUSED_PARAMETER") adapterContext: CompositeAdapterContext, - ): Unit { + ) { writer.name("__typename") StringAdapter.toJson(writer, CustomScalarAdapters.Empty, value.__typename) @@ -139,7 +138,7 @@ public object TestQuery_ResponseAdapter { writer: JsonWriter, `value`: TestQuery.Data.OtherHero, @Suppress("UNUSED_PARAMETER") adapterContext: CompositeAdapterContext, - ): Unit { + ) { writer.name("__typename") StringAdapter.toJson(writer, CustomScalarAdapters.Empty, value.__typename) } diff --git a/libraries/apollo-compiler/src/test/graphql/com/example/inline_fragment_type_coercion/kotlin/operationBased/inline_fragment_type_coercion/TestQuery.kt.expected b/libraries/apollo-compiler/src/test/graphql/com/example/inline_fragment_type_coercion/kotlin/operationBased/inline_fragment_type_coercion/TestQuery.kt.expected index e52fdc7eaf3..99e2684e407 100644 --- a/libraries/apollo-compiler/src/test/graphql/com/example/inline_fragment_type_coercion/kotlin/operationBased/inline_fragment_type_coercion/TestQuery.kt.expected +++ b/libraries/apollo-compiler/src/test/graphql/com/example/inline_fragment_type_coercion/kotlin/operationBased/inline_fragment_type_coercion/TestQuery.kt.expected @@ -18,32 +18,32 @@ import kotlin.Any import kotlin.Boolean import kotlin.Int import kotlin.String -import kotlin.Unit +import com.example.inline_fragment_type_coercion.type.Query as CompiledQuery public class TestQuery() : Query { - public override fun equals(other: Any?): Boolean = other != null && other::class == this::class + override fun equals(other: Any?): Boolean = other != null && other::class == this::class - public override fun hashCode(): Int = this::class.hashCode() + override fun hashCode(): Int = this::class.hashCode() - public override fun id(): String = OPERATION_ID + override fun id(): String = OPERATION_ID - public override fun document(): String = OPERATION_DOCUMENT + override fun document(): String = OPERATION_DOCUMENT - public override fun name(): String = OPERATION_NAME + override fun name(): String = OPERATION_NAME - public override fun serializeVariables( + override fun serializeVariables( writer: JsonWriter, customScalarAdapters: CustomScalarAdapters, withBooleanDefaultValues: Boolean, - ): Unit { + ) { // This operation doesn't have any variable } - public override fun adapter(): CompositeAdapter = TestQuery_ResponseAdapter.Data.obj() + override fun adapter(): CompositeAdapter = TestQuery_ResponseAdapter.Data.obj() - public override fun rootField(): CompiledField = CompiledField.Builder( + override fun rootField(): CompiledField = CompiledField.Builder( name = "data", - type = com.example.inline_fragment_type_coercion.type.Query.type + type = CompiledQuery.type ) .selections(selections = TestQuerySelections.__root) .build() diff --git a/libraries/apollo-compiler/src/test/graphql/com/example/inline_fragment_type_coercion/kotlin/operationBased/inline_fragment_type_coercion/adapter/TestQuery_ResponseAdapter.kt.expected b/libraries/apollo-compiler/src/test/graphql/com/example/inline_fragment_type_coercion/kotlin/operationBased/inline_fragment_type_coercion/adapter/TestQuery_ResponseAdapter.kt.expected index 1b206002e8b..3dc3a1b3c92 100644 --- a/libraries/apollo-compiler/src/test/graphql/com/example/inline_fragment_type_coercion/kotlin/operationBased/inline_fragment_type_coercion/adapter/TestQuery_ResponseAdapter.kt.expected +++ b/libraries/apollo-compiler/src/test/graphql/com/example/inline_fragment_type_coercion/kotlin/operationBased/inline_fragment_type_coercion/adapter/TestQuery_ResponseAdapter.kt.expected @@ -17,14 +17,13 @@ import com.apollographql.apollo3.api.obj import com.apollographql.apollo3.api.possibleTypes import com.example.inline_fragment_type_coercion.TestQuery import kotlin.String -import kotlin.Unit import kotlin.collections.List public object TestQuery_ResponseAdapter { public object Data : CompositeAdapter { public val RESPONSE_NAMES: List = listOf("foo") - public override fun fromJson(reader: JsonReader, adapterContext: CompositeAdapterContext): + override fun fromJson(reader: JsonReader, adapterContext: CompositeAdapterContext): TestQuery.Data { var _foo: TestQuery.Data.Foo? = null @@ -40,11 +39,11 @@ public object TestQuery_ResponseAdapter { ) } - public override fun toJson( + override fun toJson( writer: JsonWriter, `value`: TestQuery.Data, adapterContext: CompositeAdapterContext, - ): Unit { + ) { writer.name("foo") Foo.obj(true).nullable().toJson(writer, value.foo, adapterContext) } @@ -52,7 +51,7 @@ public object TestQuery_ResponseAdapter { private object Foo : CompositeAdapter { public val RESPONSE_NAMES: List = listOf("__typename", "foo") - public override fun fromJson(reader: JsonReader, adapterContext: CompositeAdapterContext): + override fun fromJson(reader: JsonReader, adapterContext: CompositeAdapterContext): TestQuery.Data.Foo { var __typename: String? = null var _foo: String? = null @@ -83,11 +82,11 @@ public object TestQuery_ResponseAdapter { ) } - public override fun toJson( + override fun toJson( writer: JsonWriter, `value`: TestQuery.Data.Foo, adapterContext: CompositeAdapterContext, - ): Unit { + ) { writer.name("__typename") StringAdapter.toJson(writer, CustomScalarAdapters.Empty, value.__typename) @@ -103,7 +102,7 @@ public object TestQuery_ResponseAdapter { private object OnBar : CompositeAdapter { public val RESPONSE_NAMES: List = listOf("bar") - public override fun fromJson(reader: JsonReader, adapterContext: CompositeAdapterContext): + override fun fromJson(reader: JsonReader, adapterContext: CompositeAdapterContext): TestQuery.Data.Foo.OnBar { var _bar: String? = null @@ -119,11 +118,11 @@ public object TestQuery_ResponseAdapter { ) } - public override fun toJson( + override fun toJson( writer: JsonWriter, `value`: TestQuery.Data.Foo.OnBar, adapterContext: CompositeAdapterContext, - ): Unit { + ) { writer.name("bar") StringAdapter.toJson(writer, CustomScalarAdapters.Empty, value.bar) } diff --git a/libraries/apollo-compiler/src/test/graphql/com/example/inline_fragment_type_coercion/kotlin/responseBased/inline_fragment_type_coercion/TestQuery.kt.expected b/libraries/apollo-compiler/src/test/graphql/com/example/inline_fragment_type_coercion/kotlin/responseBased/inline_fragment_type_coercion/TestQuery.kt.expected index 625cdccc7f3..8d2c5437e96 100644 --- a/libraries/apollo-compiler/src/test/graphql/com/example/inline_fragment_type_coercion/kotlin/responseBased/inline_fragment_type_coercion/TestQuery.kt.expected +++ b/libraries/apollo-compiler/src/test/graphql/com/example/inline_fragment_type_coercion/kotlin/responseBased/inline_fragment_type_coercion/TestQuery.kt.expected @@ -18,32 +18,33 @@ import kotlin.Any import kotlin.Boolean import kotlin.Int import kotlin.String -import kotlin.Unit +import kotlin.Suppress +import com.example.inline_fragment_type_coercion.type.Query as CompiledQuery public class TestQuery() : Query { - public override fun equals(other: Any?): Boolean = other != null && other::class == this::class + override fun equals(other: Any?): Boolean = other != null && other::class == this::class - public override fun hashCode(): Int = this::class.hashCode() + override fun hashCode(): Int = this::class.hashCode() - public override fun id(): String = OPERATION_ID + override fun id(): String = OPERATION_ID - public override fun document(): String = OPERATION_DOCUMENT + override fun document(): String = OPERATION_DOCUMENT - public override fun name(): String = OPERATION_NAME + override fun name(): String = OPERATION_NAME - public override fun serializeVariables( + override fun serializeVariables( writer: JsonWriter, customScalarAdapters: CustomScalarAdapters, withBooleanDefaultValues: Boolean, - ): Unit { + ) { // This operation doesn't have any variable } - public override fun adapter(): CompositeAdapter = TestQuery_ResponseAdapter.Data.obj() + override fun adapter(): CompositeAdapter = TestQuery_ResponseAdapter.Data.obj() - public override fun rootField(): CompiledField = CompiledField.Builder( + override fun rootField(): CompiledField = CompiledField.Builder( name = "data", - type = com.example.inline_fragment_type_coercion.type.Query.type + type = CompiledQuery.type ) .selections(selections = TestQuerySelections.__root) .build() @@ -61,19 +62,20 @@ public class TestQuery() : Query { public val foo: String public companion object { - public fun Foo.asBar() = this as? BarFoo + @Suppress("USELESS_CAST") + public fun Foo.asBar(): BarFoo? = this as? BarFoo } } public data class BarFoo( - public override val __typename: String, - public override val foo: String, + override val __typename: String, + override val foo: String, public val bar: String, ) : Foo public data class OtherFoo( - public override val __typename: String, - public override val foo: String, + override val __typename: String, + override val foo: String, ) : Foo } diff --git a/libraries/apollo-compiler/src/test/graphql/com/example/inline_fragment_type_coercion/kotlin/responseBased/inline_fragment_type_coercion/adapter/TestQuery_ResponseAdapter.kt.expected b/libraries/apollo-compiler/src/test/graphql/com/example/inline_fragment_type_coercion/kotlin/responseBased/inline_fragment_type_coercion/adapter/TestQuery_ResponseAdapter.kt.expected index b2206959dd1..18595aa3376 100644 --- a/libraries/apollo-compiler/src/test/graphql/com/example/inline_fragment_type_coercion/kotlin/responseBased/inline_fragment_type_coercion/adapter/TestQuery_ResponseAdapter.kt.expected +++ b/libraries/apollo-compiler/src/test/graphql/com/example/inline_fragment_type_coercion/kotlin/responseBased/inline_fragment_type_coercion/adapter/TestQuery_ResponseAdapter.kt.expected @@ -17,14 +17,13 @@ import com.apollographql.apollo3.api.obj import com.example.inline_fragment_type_coercion.TestQuery import kotlin.String import kotlin.Suppress -import kotlin.Unit import kotlin.collections.List public object TestQuery_ResponseAdapter { public object Data : CompositeAdapter { public val RESPONSE_NAMES: List = listOf("foo") - public override fun fromJson(reader: JsonReader, adapterContext: CompositeAdapterContext): + override fun fromJson(reader: JsonReader, adapterContext: CompositeAdapterContext): TestQuery.Data { var _foo: TestQuery.Data.Foo? = null @@ -40,17 +39,17 @@ public object TestQuery_ResponseAdapter { ) } - public override fun toJson( + override fun toJson( writer: JsonWriter, `value`: TestQuery.Data, adapterContext: CompositeAdapterContext, - ): Unit { + ) { writer.name("foo") Foo.obj().nullable().toJson(writer, value.foo, adapterContext) } private object Foo : CompositeAdapter { - public override fun fromJson(reader: JsonReader, adapterContext: CompositeAdapterContext): + override fun fromJson(reader: JsonReader, adapterContext: CompositeAdapterContext): TestQuery.Data.Foo { val __typename = reader.readTypename() return when(__typename) { @@ -61,11 +60,11 @@ public object TestQuery_ResponseAdapter { } } - public override fun toJson( + override fun toJson( writer: JsonWriter, `value`: TestQuery.Data.Foo, adapterContext: CompositeAdapterContext, - ): Unit { + ) { when(value) { is TestQuery.Data.BarFoo -> BarFoo.toJson(writer, value, adapterContext) is TestQuery.Data.OtherFoo -> OtherFoo.toJson(writer, value, adapterContext) @@ -105,7 +104,7 @@ public object TestQuery_ResponseAdapter { writer: JsonWriter, `value`: TestQuery.Data.BarFoo, @Suppress("UNUSED_PARAMETER") adapterContext: CompositeAdapterContext, - ): Unit { + ) { writer.name("__typename") StringAdapter.toJson(writer, CustomScalarAdapters.Empty, value.__typename) @@ -146,7 +145,7 @@ public object TestQuery_ResponseAdapter { writer: JsonWriter, `value`: TestQuery.Data.OtherFoo, @Suppress("UNUSED_PARAMETER") adapterContext: CompositeAdapterContext, - ): Unit { + ) { writer.name("__typename") StringAdapter.toJson(writer, CustomScalarAdapters.Empty, value.__typename) diff --git a/libraries/apollo-compiler/src/test/graphql/com/example/inline_fragment_with_include_directive/kotlin/operationBased/inline_fragment_with_include_directive/TestQuery.kt.expected b/libraries/apollo-compiler/src/test/graphql/com/example/inline_fragment_with_include_directive/kotlin/operationBased/inline_fragment_with_include_directive/TestQuery.kt.expected index 972128c804f..7be2468aec3 100644 --- a/libraries/apollo-compiler/src/test/graphql/com/example/inline_fragment_with_include_directive/kotlin/operationBased/inline_fragment_with_include_directive/TestQuery.kt.expected +++ b/libraries/apollo-compiler/src/test/graphql/com/example/inline_fragment_with_include_directive/kotlin/operationBased/inline_fragment_with_include_directive/TestQuery.kt.expected @@ -17,32 +17,32 @@ import com.example.inline_fragment_with_include_directive.adapter.TestQuery_Vari import com.example.inline_fragment_with_include_directive.selections.TestQuerySelections import kotlin.Boolean import kotlin.String -import kotlin.Unit +import com.example.inline_fragment_with_include_directive.type.Query as CompiledQuery public data class TestQuery( public val withDetails: Boolean, public val skipHumanDetails: Boolean, ) : Query { - public override fun id(): String = OPERATION_ID + override fun id(): String = OPERATION_ID - public override fun document(): String = OPERATION_DOCUMENT + override fun document(): String = OPERATION_DOCUMENT - public override fun name(): String = OPERATION_NAME + override fun name(): String = OPERATION_NAME - public override fun serializeVariables( + override fun serializeVariables( writer: JsonWriter, customScalarAdapters: CustomScalarAdapters, withBooleanDefaultValues: Boolean, - ): Unit { + ) { TestQuery_VariablesAdapter.serializeVariables(writer, this, customScalarAdapters, withBooleanDefaultValues) } - public override fun adapter(): CompositeAdapter = TestQuery_ResponseAdapter.Data.obj() + override fun adapter(): CompositeAdapter = TestQuery_ResponseAdapter.Data.obj() - public override fun rootField(): CompiledField = CompiledField.Builder( + override fun rootField(): CompiledField = CompiledField.Builder( name = "data", - type = com.example.inline_fragment_with_include_directive.type.Query.type + type = CompiledQuery.type ) .selections(selections = TestQuerySelections.__root) .build() diff --git a/libraries/apollo-compiler/src/test/graphql/com/example/inline_fragment_with_include_directive/kotlin/operationBased/inline_fragment_with_include_directive/adapter/TestQuery_ResponseAdapter.kt.expected b/libraries/apollo-compiler/src/test/graphql/com/example/inline_fragment_with_include_directive/kotlin/operationBased/inline_fragment_with_include_directive/adapter/TestQuery_ResponseAdapter.kt.expected index 1595ef767c8..743ce5bd69f 100644 --- a/libraries/apollo-compiler/src/test/graphql/com/example/inline_fragment_with_include_directive/kotlin/operationBased/inline_fragment_with_include_directive/adapter/TestQuery_ResponseAdapter.kt.expected +++ b/libraries/apollo-compiler/src/test/graphql/com/example/inline_fragment_with_include_directive/kotlin/operationBased/inline_fragment_with_include_directive/adapter/TestQuery_ResponseAdapter.kt.expected @@ -21,14 +21,13 @@ import com.apollographql.apollo3.api.possibleTypes import com.apollographql.apollo3.api.variable import com.example.inline_fragment_with_include_directive.TestQuery import kotlin.String -import kotlin.Unit import kotlin.collections.List public object TestQuery_ResponseAdapter { public object Data : CompositeAdapter { public val RESPONSE_NAMES: List = listOf("hero") - public override fun fromJson(reader: JsonReader, adapterContext: CompositeAdapterContext): + override fun fromJson(reader: JsonReader, adapterContext: CompositeAdapterContext): TestQuery.Data { var _hero: TestQuery.Data.Hero? = null @@ -44,11 +43,11 @@ public object TestQuery_ResponseAdapter { ) } - public override fun toJson( + override fun toJson( writer: JsonWriter, `value`: TestQuery.Data, adapterContext: CompositeAdapterContext, - ): Unit { + ) { writer.name("hero") Hero.obj(true).nullable().toJson(writer, value.hero, adapterContext) } @@ -56,7 +55,7 @@ public object TestQuery_ResponseAdapter { private object Hero : CompositeAdapter { public val RESPONSE_NAMES: List = listOf("__typename", "id") - public override fun fromJson(reader: JsonReader, adapterContext: CompositeAdapterContext): + override fun fromJson(reader: JsonReader, adapterContext: CompositeAdapterContext): TestQuery.Data.Hero { var __typename: String? = null var _id: String? = null @@ -103,11 +102,11 @@ public object TestQuery_ResponseAdapter { ) } - public override fun toJson( + override fun toJson( writer: JsonWriter, `value`: TestQuery.Data.Hero, adapterContext: CompositeAdapterContext, - ): Unit { + ) { writer.name("__typename") StringAdapter.toJson(writer, CustomScalarAdapters.Empty, value.__typename) @@ -133,7 +132,7 @@ public object TestQuery_ResponseAdapter { private object OnHuman : CompositeAdapter { public val RESPONSE_NAMES: List = listOf("name", "homePlanet") - public override fun fromJson(reader: JsonReader, adapterContext: CompositeAdapterContext): + override fun fromJson(reader: JsonReader, adapterContext: CompositeAdapterContext): TestQuery.Data.Hero.OnHuman { var _name: String? = null var _homePlanet: String? = null @@ -152,11 +151,11 @@ public object TestQuery_ResponseAdapter { ) } - public override fun toJson( + override fun toJson( writer: JsonWriter, `value`: TestQuery.Data.Hero.OnHuman, adapterContext: CompositeAdapterContext, - ): Unit { + ) { writer.name("name") StringAdapter.toJson(writer, CustomScalarAdapters.Empty, value.name) @@ -168,7 +167,7 @@ public object TestQuery_ResponseAdapter { private object OnDroid : CompositeAdapter { public val RESPONSE_NAMES: List = listOf("name", "primaryFunction") - public override fun fromJson(reader: JsonReader, adapterContext: CompositeAdapterContext): + override fun fromJson(reader: JsonReader, adapterContext: CompositeAdapterContext): TestQuery.Data.Hero.OnDroid { var _name: String? = null var _primaryFunction: String? = null @@ -187,11 +186,11 @@ public object TestQuery_ResponseAdapter { ) } - public override fun toJson( + override fun toJson( writer: JsonWriter, `value`: TestQuery.Data.Hero.OnDroid, adapterContext: CompositeAdapterContext, - ): Unit { + ) { writer.name("name") StringAdapter.toJson(writer, CustomScalarAdapters.Empty, value.name) @@ -203,7 +202,7 @@ public object TestQuery_ResponseAdapter { private object OnCharacter : CompositeAdapter { public val RESPONSE_NAMES: List = listOf("name") - public override fun fromJson(reader: JsonReader, adapterContext: CompositeAdapterContext): + override fun fromJson(reader: JsonReader, adapterContext: CompositeAdapterContext): TestQuery.Data.Hero.OnCharacter { var _name: String? = null @@ -219,11 +218,11 @@ public object TestQuery_ResponseAdapter { ) } - public override fun toJson( + override fun toJson( writer: JsonWriter, `value`: TestQuery.Data.Hero.OnCharacter, adapterContext: CompositeAdapterContext, - ): Unit { + ) { writer.name("name") StringAdapter.toJson(writer, CustomScalarAdapters.Empty, value.name) } diff --git a/libraries/apollo-compiler/src/test/graphql/com/example/inline_fragment_with_include_directive/kotlin/operationBased/inline_fragment_with_include_directive/adapter/TestQuery_VariablesAdapter.kt.expected b/libraries/apollo-compiler/src/test/graphql/com/example/inline_fragment_with_include_directive/kotlin/operationBased/inline_fragment_with_include_directive/adapter/TestQuery_VariablesAdapter.kt.expected index fdff83b9cce..ad34834aa7a 100644 --- a/libraries/apollo-compiler/src/test/graphql/com/example/inline_fragment_with_include_directive/kotlin/operationBased/inline_fragment_with_include_directive/adapter/TestQuery_VariablesAdapter.kt.expected +++ b/libraries/apollo-compiler/src/test/graphql/com/example/inline_fragment_with_include_directive/kotlin/operationBased/inline_fragment_with_include_directive/adapter/TestQuery_VariablesAdapter.kt.expected @@ -12,7 +12,6 @@ import com.apollographql.apollo3.api.json.JsonWriter import com.example.inline_fragment_with_include_directive.TestQuery import kotlin.Boolean import kotlin.Suppress -import kotlin.Unit public object TestQuery_VariablesAdapter { @Suppress( @@ -24,7 +23,7 @@ public object TestQuery_VariablesAdapter { `value`: TestQuery, customScalarAdapters: CustomScalarAdapters, withBooleanDefaultValues: Boolean, - ): Unit { + ) { val adapterContext = CompositeAdapterContext.Builder().customScalarAdapters(customScalarAdapters).build() writer.name("withDetails") diff --git a/libraries/apollo-compiler/src/test/graphql/com/example/inline_fragments_with_friends/kotlin/operationBased/inline_fragments_with_friends/TestQuery.kt.expected b/libraries/apollo-compiler/src/test/graphql/com/example/inline_fragments_with_friends/kotlin/operationBased/inline_fragments_with_friends/TestQuery.kt.expected index 23bf730ffa4..c16a7cc9dba 100644 --- a/libraries/apollo-compiler/src/test/graphql/com/example/inline_fragments_with_friends/kotlin/operationBased/inline_fragments_with_friends/TestQuery.kt.expected +++ b/libraries/apollo-compiler/src/test/graphql/com/example/inline_fragments_with_friends/kotlin/operationBased/inline_fragments_with_friends/TestQuery.kt.expected @@ -20,33 +20,33 @@ import kotlin.Boolean import kotlin.Double import kotlin.Int import kotlin.String -import kotlin.Unit import kotlin.collections.List +import com.example.inline_fragments_with_friends.type.Query as CompiledQuery public class TestQuery() : Query { - public override fun equals(other: Any?): Boolean = other != null && other::class == this::class + override fun equals(other: Any?): Boolean = other != null && other::class == this::class - public override fun hashCode(): Int = this::class.hashCode() + override fun hashCode(): Int = this::class.hashCode() - public override fun id(): String = OPERATION_ID + override fun id(): String = OPERATION_ID - public override fun document(): String = OPERATION_DOCUMENT + override fun document(): String = OPERATION_DOCUMENT - public override fun name(): String = OPERATION_NAME + override fun name(): String = OPERATION_NAME - public override fun serializeVariables( + override fun serializeVariables( writer: JsonWriter, customScalarAdapters: CustomScalarAdapters, withBooleanDefaultValues: Boolean, - ): Unit { + ) { // This operation doesn't have any variable } - public override fun adapter(): CompositeAdapter = TestQuery_ResponseAdapter.Data.obj() + override fun adapter(): CompositeAdapter = TestQuery_ResponseAdapter.Data.obj() - public override fun rootField(): CompiledField = CompiledField.Builder( + override fun rootField(): CompiledField = CompiledField.Builder( name = "data", - type = com.example.inline_fragments_with_friends.type.Query.type + type = CompiledQuery.type ) .selections(selections = TestQuerySelections.__root) .build() diff --git a/libraries/apollo-compiler/src/test/graphql/com/example/inline_fragments_with_friends/kotlin/operationBased/inline_fragments_with_friends/adapter/TestQuery_ResponseAdapter.kt.expected b/libraries/apollo-compiler/src/test/graphql/com/example/inline_fragments_with_friends/kotlin/operationBased/inline_fragments_with_friends/adapter/TestQuery_ResponseAdapter.kt.expected index 142d6a0b43c..29e5d8faeb7 100644 --- a/libraries/apollo-compiler/src/test/graphql/com/example/inline_fragments_with_friends/kotlin/operationBased/inline_fragments_with_friends/adapter/TestQuery_ResponseAdapter.kt.expected +++ b/libraries/apollo-compiler/src/test/graphql/com/example/inline_fragments_with_friends/kotlin/operationBased/inline_fragments_with_friends/adapter/TestQuery_ResponseAdapter.kt.expected @@ -23,14 +23,13 @@ import com.example.inline_fragments_with_friends.type.Episode import com.example.inline_fragments_with_friends.type.adapter.Episode_ResponseAdapter import kotlin.Double import kotlin.String -import kotlin.Unit import kotlin.collections.List public object TestQuery_ResponseAdapter { public object Data : CompositeAdapter { public val RESPONSE_NAMES: List = listOf("hero") - public override fun fromJson(reader: JsonReader, adapterContext: CompositeAdapterContext): + override fun fromJson(reader: JsonReader, adapterContext: CompositeAdapterContext): TestQuery.Data { var _hero: TestQuery.Data.Hero? = null @@ -46,11 +45,11 @@ public object TestQuery_ResponseAdapter { ) } - public override fun toJson( + override fun toJson( writer: JsonWriter, `value`: TestQuery.Data, adapterContext: CompositeAdapterContext, - ): Unit { + ) { writer.name("hero") Hero.obj(true).nullable().toJson(writer, value.hero, adapterContext) } @@ -58,7 +57,7 @@ public object TestQuery_ResponseAdapter { private object Hero : CompositeAdapter { public val RESPONSE_NAMES: List = listOf("__typename", "name") - public override fun fromJson(reader: JsonReader, adapterContext: CompositeAdapterContext): + override fun fromJson(reader: JsonReader, adapterContext: CompositeAdapterContext): TestQuery.Data.Hero { var __typename: String? = null var _name: String? = null @@ -97,11 +96,11 @@ public object TestQuery_ResponseAdapter { ) } - public override fun toJson( + override fun toJson( writer: JsonWriter, `value`: TestQuery.Data.Hero, adapterContext: CompositeAdapterContext, - ): Unit { + ) { writer.name("__typename") StringAdapter.toJson(writer, CustomScalarAdapters.Empty, value.__typename) @@ -122,7 +121,7 @@ public object TestQuery_ResponseAdapter { private object OnHuman : CompositeAdapter { public val RESPONSE_NAMES: List = listOf("height", "friends") - public override fun fromJson(reader: JsonReader, adapterContext: CompositeAdapterContext): + override fun fromJson(reader: JsonReader, adapterContext: CompositeAdapterContext): TestQuery.Data.Hero.OnHuman { var _height: Double? = null var _friends: List? = null @@ -141,11 +140,11 @@ public object TestQuery_ResponseAdapter { ) } - public override fun toJson( + override fun toJson( writer: JsonWriter, `value`: TestQuery.Data.Hero.OnHuman, adapterContext: CompositeAdapterContext, - ): Unit { + ) { writer.name("height") NullableDoubleAdapter.toJson(writer, CustomScalarAdapters.Empty, value.height) @@ -156,7 +155,7 @@ public object TestQuery_ResponseAdapter { private object Friend : CompositeAdapter { public val RESPONSE_NAMES: List = listOf("appearsIn") - public override fun fromJson(reader: JsonReader, adapterContext: CompositeAdapterContext): + override fun fromJson(reader: JsonReader, adapterContext: CompositeAdapterContext): TestQuery.Data.Hero.OnHuman.Friend { var _appearsIn: List? = null @@ -172,11 +171,11 @@ public object TestQuery_ResponseAdapter { ) } - public override fun toJson( + override fun toJson( writer: JsonWriter, `value`: TestQuery.Data.Hero.OnHuman.Friend, adapterContext: CompositeAdapterContext, - ): Unit { + ) { writer.name("appearsIn") Episode_ResponseAdapter.nullable().list().toJson(writer, CustomScalarAdapters.Empty, value.appearsIn) @@ -187,7 +186,7 @@ public object TestQuery_ResponseAdapter { private object OnDroid : CompositeAdapter { public val RESPONSE_NAMES: List = listOf("primaryFunction", "friends") - public override fun fromJson(reader: JsonReader, adapterContext: CompositeAdapterContext): + override fun fromJson(reader: JsonReader, adapterContext: CompositeAdapterContext): TestQuery.Data.Hero.OnDroid { var _primaryFunction: String? = null var _friends: List? = null @@ -206,11 +205,11 @@ public object TestQuery_ResponseAdapter { ) } - public override fun toJson( + override fun toJson( writer: JsonWriter, `value`: TestQuery.Data.Hero.OnDroid, adapterContext: CompositeAdapterContext, - ): Unit { + ) { writer.name("primaryFunction") NullableStringAdapter.toJson(writer, CustomScalarAdapters.Empty, value.primaryFunction) @@ -221,7 +220,7 @@ public object TestQuery_ResponseAdapter { private object Friend : CompositeAdapter { public val RESPONSE_NAMES: List = listOf("id") - public override fun fromJson(reader: JsonReader, adapterContext: CompositeAdapterContext): + override fun fromJson(reader: JsonReader, adapterContext: CompositeAdapterContext): TestQuery.Data.Hero.OnDroid.Friend { var _id: String? = null @@ -237,11 +236,11 @@ public object TestQuery_ResponseAdapter { ) } - public override fun toJson( + override fun toJson( writer: JsonWriter, `value`: TestQuery.Data.Hero.OnDroid.Friend, adapterContext: CompositeAdapterContext, - ): Unit { + ) { writer.name("id") StringAdapter.toJson(writer, CustomScalarAdapters.Empty, value.id) } diff --git a/libraries/apollo-compiler/src/test/graphql/com/example/inline_fragments_with_friends/kotlin/operationBased/inline_fragments_with_friends/type/adapter/Episode_ResponseAdapter.kt.expected b/libraries/apollo-compiler/src/test/graphql/com/example/inline_fragments_with_friends/kotlin/operationBased/inline_fragments_with_friends/type/adapter/Episode_ResponseAdapter.kt.expected index 042562e070e..7b7fadaa606 100644 --- a/libraries/apollo-compiler/src/test/graphql/com/example/inline_fragments_with_friends/kotlin/operationBased/inline_fragments_with_friends/type/adapter/Episode_ResponseAdapter.kt.expected +++ b/libraries/apollo-compiler/src/test/graphql/com/example/inline_fragments_with_friends/kotlin/operationBased/inline_fragments_with_friends/type/adapter/Episode_ResponseAdapter.kt.expected @@ -10,20 +10,18 @@ import com.apollographql.apollo3.api.CustomScalarAdapters import com.apollographql.apollo3.api.json.JsonReader import com.apollographql.apollo3.api.json.JsonWriter import com.example.inline_fragments_with_friends.type.Episode -import kotlin.Unit public object Episode_ResponseAdapter : Adapter { - public override fun fromJson(reader: JsonReader, customScalarAdapters: CustomScalarAdapters): - Episode { + override fun fromJson(reader: JsonReader, customScalarAdapters: CustomScalarAdapters): Episode { val rawValue = reader.nextString()!! return Episode.safeValueOf(rawValue) } - public override fun toJson( + override fun toJson( writer: JsonWriter, customScalarAdapters: CustomScalarAdapters, `value`: Episode, - ): Unit { + ) { writer.value(value.rawValue) } } diff --git a/libraries/apollo-compiler/src/test/graphql/com/example/inline_fragments_with_friends/kotlin/responseBased/inline_fragments_with_friends/TestQuery.kt.expected b/libraries/apollo-compiler/src/test/graphql/com/example/inline_fragments_with_friends/kotlin/responseBased/inline_fragments_with_friends/TestQuery.kt.expected index 94d36b890b0..16e44c732e5 100644 --- a/libraries/apollo-compiler/src/test/graphql/com/example/inline_fragments_with_friends/kotlin/responseBased/inline_fragments_with_friends/TestQuery.kt.expected +++ b/libraries/apollo-compiler/src/test/graphql/com/example/inline_fragments_with_friends/kotlin/responseBased/inline_fragments_with_friends/TestQuery.kt.expected @@ -20,33 +20,34 @@ import kotlin.Boolean import kotlin.Double import kotlin.Int import kotlin.String -import kotlin.Unit +import kotlin.Suppress import kotlin.collections.List +import com.example.inline_fragments_with_friends.type.Query as CompiledQuery public class TestQuery() : Query { - public override fun equals(other: Any?): Boolean = other != null && other::class == this::class + override fun equals(other: Any?): Boolean = other != null && other::class == this::class - public override fun hashCode(): Int = this::class.hashCode() + override fun hashCode(): Int = this::class.hashCode() - public override fun id(): String = OPERATION_ID + override fun id(): String = OPERATION_ID - public override fun document(): String = OPERATION_DOCUMENT + override fun document(): String = OPERATION_DOCUMENT - public override fun name(): String = OPERATION_NAME + override fun name(): String = OPERATION_NAME - public override fun serializeVariables( + override fun serializeVariables( writer: JsonWriter, customScalarAdapters: CustomScalarAdapters, withBooleanDefaultValues: Boolean, - ): Unit { + ) { // This operation doesn't have any variable } - public override fun adapter(): CompositeAdapter = TestQuery_ResponseAdapter.Data.obj() + override fun adapter(): CompositeAdapter = TestQuery_ResponseAdapter.Data.obj() - public override fun rootField(): CompiledField = CompiledField.Builder( + override fun rootField(): CompiledField = CompiledField.Builder( name = "data", - type = com.example.inline_fragments_with_friends.type.Query.type + type = CompiledQuery.type ) .selections(selections = TestQuerySelections.__root) .build() @@ -64,18 +65,20 @@ public class TestQuery() : Query { public val name: String public companion object { - public fun Hero.asHuman() = this as? HumanHero + @Suppress("USELESS_CAST") + public fun Hero.asHuman(): HumanHero? = this as? HumanHero - public fun Hero.asDroid() = this as? DroidHero + @Suppress("USELESS_CAST") + public fun Hero.asDroid(): DroidHero? = this as? DroidHero } } public data class HumanHero( - public override val __typename: String, + override val __typename: String, /** * The name of the character */ - public override val name: String, + override val name: String, /** * Height in the preferred unit, default is meters */ @@ -98,11 +101,11 @@ public class TestQuery() : Query { } public data class DroidHero( - public override val __typename: String, + override val __typename: String, /** * The name of the character */ - public override val name: String, + override val name: String, /** * This droid's primary function */ @@ -123,11 +126,11 @@ public class TestQuery() : Query { } public data class OtherHero( - public override val __typename: String, + override val __typename: String, /** * The name of the character */ - public override val name: String, + override val name: String, ) : Hero } diff --git a/libraries/apollo-compiler/src/test/graphql/com/example/inline_fragments_with_friends/kotlin/responseBased/inline_fragments_with_friends/adapter/TestQuery_ResponseAdapter.kt.expected b/libraries/apollo-compiler/src/test/graphql/com/example/inline_fragments_with_friends/kotlin/responseBased/inline_fragments_with_friends/adapter/TestQuery_ResponseAdapter.kt.expected index 09cf7701349..d287ba02a44 100644 --- a/libraries/apollo-compiler/src/test/graphql/com/example/inline_fragments_with_friends/kotlin/responseBased/inline_fragments_with_friends/adapter/TestQuery_ResponseAdapter.kt.expected +++ b/libraries/apollo-compiler/src/test/graphql/com/example/inline_fragments_with_friends/kotlin/responseBased/inline_fragments_with_friends/adapter/TestQuery_ResponseAdapter.kt.expected @@ -23,14 +23,13 @@ import com.example.inline_fragments_with_friends.type.adapter.Episode_ResponseAd import kotlin.Double import kotlin.String import kotlin.Suppress -import kotlin.Unit import kotlin.collections.List public object TestQuery_ResponseAdapter { public object Data : CompositeAdapter { public val RESPONSE_NAMES: List = listOf("hero") - public override fun fromJson(reader: JsonReader, adapterContext: CompositeAdapterContext): + override fun fromJson(reader: JsonReader, adapterContext: CompositeAdapterContext): TestQuery.Data { var _hero: TestQuery.Data.Hero? = null @@ -46,17 +45,17 @@ public object TestQuery_ResponseAdapter { ) } - public override fun toJson( + override fun toJson( writer: JsonWriter, `value`: TestQuery.Data, adapterContext: CompositeAdapterContext, - ): Unit { + ) { writer.name("hero") Hero.obj().nullable().toJson(writer, value.hero, adapterContext) } private object Hero : CompositeAdapter { - public override fun fromJson(reader: JsonReader, adapterContext: CompositeAdapterContext): + override fun fromJson(reader: JsonReader, adapterContext: CompositeAdapterContext): TestQuery.Data.Hero { val __typename = reader.readTypename() return when(__typename) { @@ -69,11 +68,11 @@ public object TestQuery_ResponseAdapter { } } - public override fun toJson( + override fun toJson( writer: JsonWriter, `value`: TestQuery.Data.Hero, adapterContext: CompositeAdapterContext, - ): Unit { + ) { when(value) { is TestQuery.Data.HumanHero -> HumanHero.toJson(writer, value, adapterContext) is TestQuery.Data.DroidHero -> DroidHero.toJson(writer, value, adapterContext) @@ -117,7 +116,7 @@ public object TestQuery_ResponseAdapter { writer: JsonWriter, `value`: TestQuery.Data.HumanHero, @Suppress("UNUSED_PARAMETER") adapterContext: CompositeAdapterContext, - ): Unit { + ) { writer.name("__typename") StringAdapter.toJson(writer, CustomScalarAdapters.Empty, value.__typename) @@ -134,7 +133,7 @@ public object TestQuery_ResponseAdapter { private object Friend : CompositeAdapter { public val RESPONSE_NAMES: List = listOf("appearsIn") - public override fun fromJson(reader: JsonReader, adapterContext: CompositeAdapterContext): + override fun fromJson(reader: JsonReader, adapterContext: CompositeAdapterContext): TestQuery.Data.HumanHero.Friend { var _appearsIn: List? = null @@ -150,11 +149,11 @@ public object TestQuery_ResponseAdapter { ) } - public override fun toJson( + override fun toJson( writer: JsonWriter, `value`: TestQuery.Data.HumanHero.Friend, adapterContext: CompositeAdapterContext, - ): Unit { + ) { writer.name("appearsIn") Episode_ResponseAdapter.nullable().list().toJson(writer, CustomScalarAdapters.Empty, value.appearsIn) @@ -198,7 +197,7 @@ public object TestQuery_ResponseAdapter { writer: JsonWriter, `value`: TestQuery.Data.DroidHero, @Suppress("UNUSED_PARAMETER") adapterContext: CompositeAdapterContext, - ): Unit { + ) { writer.name("__typename") StringAdapter.toJson(writer, CustomScalarAdapters.Empty, value.__typename) @@ -215,7 +214,7 @@ public object TestQuery_ResponseAdapter { private object Friend : CompositeAdapter { public val RESPONSE_NAMES: List = listOf("id") - public override fun fromJson(reader: JsonReader, adapterContext: CompositeAdapterContext): + override fun fromJson(reader: JsonReader, adapterContext: CompositeAdapterContext): TestQuery.Data.DroidHero.Friend { var _id: String? = null @@ -231,11 +230,11 @@ public object TestQuery_ResponseAdapter { ) } - public override fun toJson( + override fun toJson( writer: JsonWriter, `value`: TestQuery.Data.DroidHero.Friend, adapterContext: CompositeAdapterContext, - ): Unit { + ) { writer.name("id") StringAdapter.toJson(writer, CustomScalarAdapters.Empty, value.id) } @@ -271,7 +270,7 @@ public object TestQuery_ResponseAdapter { writer: JsonWriter, `value`: TestQuery.Data.OtherHero, @Suppress("UNUSED_PARAMETER") adapterContext: CompositeAdapterContext, - ): Unit { + ) { writer.name("__typename") StringAdapter.toJson(writer, CustomScalarAdapters.Empty, value.__typename) diff --git a/libraries/apollo-compiler/src/test/graphql/com/example/inline_fragments_with_friends/kotlin/responseBased/inline_fragments_with_friends/type/adapter/Episode_ResponseAdapter.kt.expected b/libraries/apollo-compiler/src/test/graphql/com/example/inline_fragments_with_friends/kotlin/responseBased/inline_fragments_with_friends/type/adapter/Episode_ResponseAdapter.kt.expected index 042562e070e..7b7fadaa606 100644 --- a/libraries/apollo-compiler/src/test/graphql/com/example/inline_fragments_with_friends/kotlin/responseBased/inline_fragments_with_friends/type/adapter/Episode_ResponseAdapter.kt.expected +++ b/libraries/apollo-compiler/src/test/graphql/com/example/inline_fragments_with_friends/kotlin/responseBased/inline_fragments_with_friends/type/adapter/Episode_ResponseAdapter.kt.expected @@ -10,20 +10,18 @@ import com.apollographql.apollo3.api.CustomScalarAdapters import com.apollographql.apollo3.api.json.JsonReader import com.apollographql.apollo3.api.json.JsonWriter import com.example.inline_fragments_with_friends.type.Episode -import kotlin.Unit public object Episode_ResponseAdapter : Adapter { - public override fun fromJson(reader: JsonReader, customScalarAdapters: CustomScalarAdapters): - Episode { + override fun fromJson(reader: JsonReader, customScalarAdapters: CustomScalarAdapters): Episode { val rawValue = reader.nextString()!! return Episode.safeValueOf(rawValue) } - public override fun toJson( + override fun toJson( writer: JsonWriter, customScalarAdapters: CustomScalarAdapters, `value`: Episode, - ): Unit { + ) { writer.value(value.rawValue) } } diff --git a/libraries/apollo-compiler/src/test/graphql/com/example/input_object_type/kotlin/responseBased/input_object_type/TestQuery.kt.expected b/libraries/apollo-compiler/src/test/graphql/com/example/input_object_type/kotlin/responseBased/input_object_type/TestQuery.kt.expected index ca84885dbb1..2a35e48b8b1 100644 --- a/libraries/apollo-compiler/src/test/graphql/com/example/input_object_type/kotlin/responseBased/input_object_type/TestQuery.kt.expected +++ b/libraries/apollo-compiler/src/test/graphql/com/example/input_object_type/kotlin/responseBased/input_object_type/TestQuery.kt.expected @@ -20,32 +20,32 @@ import com.example.input_object_type.type.ReviewInput import kotlin.Boolean import kotlin.Int import kotlin.String -import kotlin.Unit +import com.example.input_object_type.type.Mutation as CompiledMutation public data class TestQuery( public val ep: Episode, public val review: ReviewInput, ) : Mutation { - public override fun id(): String = OPERATION_ID + override fun id(): String = OPERATION_ID - public override fun document(): String = OPERATION_DOCUMENT + override fun document(): String = OPERATION_DOCUMENT - public override fun name(): String = OPERATION_NAME + override fun name(): String = OPERATION_NAME - public override fun serializeVariables( + override fun serializeVariables( writer: JsonWriter, customScalarAdapters: CustomScalarAdapters, withBooleanDefaultValues: Boolean, - ): Unit { + ) { TestQuery_VariablesAdapter.serializeVariables(writer, this, customScalarAdapters, withBooleanDefaultValues) } - public override fun adapter(): CompositeAdapter = TestQuery_ResponseAdapter.Data.obj() + override fun adapter(): CompositeAdapter = TestQuery_ResponseAdapter.Data.obj() - public override fun rootField(): CompiledField = CompiledField.Builder( + override fun rootField(): CompiledField = CompiledField.Builder( name = "data", - type = com.example.input_object_type.type.Mutation.type + type = CompiledMutation.type ) .selections(selections = TestQuerySelections.__root) .build() diff --git a/libraries/apollo-compiler/src/test/graphql/com/example/input_object_type/kotlin/responseBased/input_object_type/adapter/TestQuery_ResponseAdapter.kt.expected b/libraries/apollo-compiler/src/test/graphql/com/example/input_object_type/kotlin/responseBased/input_object_type/adapter/TestQuery_ResponseAdapter.kt.expected index f78d646de2b..b5d67d69a3a 100644 --- a/libraries/apollo-compiler/src/test/graphql/com/example/input_object_type/kotlin/responseBased/input_object_type/adapter/TestQuery_ResponseAdapter.kt.expected +++ b/libraries/apollo-compiler/src/test/graphql/com/example/input_object_type/kotlin/responseBased/input_object_type/adapter/TestQuery_ResponseAdapter.kt.expected @@ -16,14 +16,13 @@ import com.apollographql.apollo3.api.obj import com.example.input_object_type.TestQuery import kotlin.Int import kotlin.String -import kotlin.Unit import kotlin.collections.List public object TestQuery_ResponseAdapter { public object Data : CompositeAdapter { public val RESPONSE_NAMES: List = listOf("createReview") - public override fun fromJson(reader: JsonReader, adapterContext: CompositeAdapterContext): + override fun fromJson(reader: JsonReader, adapterContext: CompositeAdapterContext): TestQuery.Data { var _createReview: TestQuery.Data.CreateReview? = null @@ -39,11 +38,11 @@ public object TestQuery_ResponseAdapter { ) } - public override fun toJson( + override fun toJson( writer: JsonWriter, `value`: TestQuery.Data, adapterContext: CompositeAdapterContext, - ): Unit { + ) { writer.name("createReview") CreateReview.obj().nullable().toJson(writer, value.createReview, adapterContext) } @@ -51,7 +50,7 @@ public object TestQuery_ResponseAdapter { private object CreateReview : CompositeAdapter { public val RESPONSE_NAMES: List = listOf("stars", "commentary") - public override fun fromJson(reader: JsonReader, adapterContext: CompositeAdapterContext): + override fun fromJson(reader: JsonReader, adapterContext: CompositeAdapterContext): TestQuery.Data.CreateReview { var _stars: Int? = null var _commentary: String? = null @@ -70,11 +69,11 @@ public object TestQuery_ResponseAdapter { ) } - public override fun toJson( + override fun toJson( writer: JsonWriter, `value`: TestQuery.Data.CreateReview, adapterContext: CompositeAdapterContext, - ): Unit { + ) { writer.name("stars") IntAdapter.toJson(writer, CustomScalarAdapters.Empty, value.stars) diff --git a/libraries/apollo-compiler/src/test/graphql/com/example/input_object_type/kotlin/responseBased/input_object_type/adapter/TestQuery_VariablesAdapter.kt.expected b/libraries/apollo-compiler/src/test/graphql/com/example/input_object_type/kotlin/responseBased/input_object_type/adapter/TestQuery_VariablesAdapter.kt.expected index c4d19974fdd..151cfb56432 100644 --- a/libraries/apollo-compiler/src/test/graphql/com/example/input_object_type/kotlin/responseBased/input_object_type/adapter/TestQuery_VariablesAdapter.kt.expected +++ b/libraries/apollo-compiler/src/test/graphql/com/example/input_object_type/kotlin/responseBased/input_object_type/adapter/TestQuery_VariablesAdapter.kt.expected @@ -14,7 +14,6 @@ import com.example.input_object_type.type.adapter.Episode_ResponseAdapter import com.example.input_object_type.type.adapter.ReviewInput_InputAdapter import kotlin.Boolean import kotlin.Suppress -import kotlin.Unit public object TestQuery_VariablesAdapter { @Suppress( @@ -26,7 +25,7 @@ public object TestQuery_VariablesAdapter { `value`: TestQuery, customScalarAdapters: CustomScalarAdapters, withBooleanDefaultValues: Boolean, - ): Unit { + ) { val adapterContext = CompositeAdapterContext.Builder().customScalarAdapters(customScalarAdapters).build() writer.name("ep") diff --git a/libraries/apollo-compiler/src/test/graphql/com/example/input_object_type/kotlin/responseBased/input_object_type/type/adapter/ColorInput_InputAdapter.kt.expected b/libraries/apollo-compiler/src/test/graphql/com/example/input_object_type/kotlin/responseBased/input_object_type/type/adapter/ColorInput_InputAdapter.kt.expected index f7307efa258..5a94004fd02 100644 --- a/libraries/apollo-compiler/src/test/graphql/com/example/input_object_type/kotlin/responseBased/input_object_type/type/adapter/ColorInput_InputAdapter.kt.expected +++ b/libraries/apollo-compiler/src/test/graphql/com/example/input_object_type/kotlin/responseBased/input_object_type/type/adapter/ColorInput_InputAdapter.kt.expected @@ -19,17 +19,16 @@ import com.apollographql.apollo3.api.obj import com.apollographql.apollo3.api.present import com.example.input_object_type.type.ColorInput import kotlin.IllegalStateException -import kotlin.Unit public object ColorInput_InputAdapter : CompositeAdapter { - public override fun fromJson(reader: JsonReader, adapterContext: CompositeAdapterContext): - ColorInput = throw IllegalStateException("Input type used in output position") + override fun fromJson(reader: JsonReader, adapterContext: CompositeAdapterContext): ColorInput = + throw IllegalStateException("Input type used in output position") - public override fun toJson( + override fun toJson( writer: JsonWriter, `value`: ColorInput, adapterContext: CompositeAdapterContext, - ): Unit { + ) { if (value.red is Optional.Present) { writer.name("red") IntAdapter.present().toJson(writer, CustomScalarAdapters.Empty, value.red) diff --git a/libraries/apollo-compiler/src/test/graphql/com/example/input_object_type/kotlin/responseBased/input_object_type/type/adapter/Episode_ResponseAdapter.kt.expected b/libraries/apollo-compiler/src/test/graphql/com/example/input_object_type/kotlin/responseBased/input_object_type/type/adapter/Episode_ResponseAdapter.kt.expected index aa8be64f6a2..50f4abec08b 100644 --- a/libraries/apollo-compiler/src/test/graphql/com/example/input_object_type/kotlin/responseBased/input_object_type/type/adapter/Episode_ResponseAdapter.kt.expected +++ b/libraries/apollo-compiler/src/test/graphql/com/example/input_object_type/kotlin/responseBased/input_object_type/type/adapter/Episode_ResponseAdapter.kt.expected @@ -10,20 +10,18 @@ import com.apollographql.apollo3.api.CustomScalarAdapters import com.apollographql.apollo3.api.json.JsonReader import com.apollographql.apollo3.api.json.JsonWriter import com.example.input_object_type.type.Episode -import kotlin.Unit public object Episode_ResponseAdapter : Adapter { - public override fun fromJson(reader: JsonReader, customScalarAdapters: CustomScalarAdapters): - Episode { + override fun fromJson(reader: JsonReader, customScalarAdapters: CustomScalarAdapters): Episode { val rawValue = reader.nextString()!! return Episode.safeValueOf(rawValue) } - public override fun toJson( + override fun toJson( writer: JsonWriter, customScalarAdapters: CustomScalarAdapters, `value`: Episode, - ): Unit { + ) { writer.value(value.rawValue) } } diff --git a/libraries/apollo-compiler/src/test/graphql/com/example/input_object_type/kotlin/responseBased/input_object_type/type/adapter/ReviewInput_InputAdapter.kt.expected b/libraries/apollo-compiler/src/test/graphql/com/example/input_object_type/kotlin/responseBased/input_object_type/type/adapter/ReviewInput_InputAdapter.kt.expected index 0cd73602f68..7018cad0086 100644 --- a/libraries/apollo-compiler/src/test/graphql/com/example/input_object_type/kotlin/responseBased/input_object_type/type/adapter/ReviewInput_InputAdapter.kt.expected +++ b/libraries/apollo-compiler/src/test/graphql/com/example/input_object_type/kotlin/responseBased/input_object_type/type/adapter/ReviewInput_InputAdapter.kt.expected @@ -19,19 +19,19 @@ import com.apollographql.apollo3.api.nullable import com.apollographql.apollo3.api.obj import com.apollographql.apollo3.api.present import com.example.input_object_type.type.ReviewInput -import java.util.Date import kotlin.IllegalStateException -import kotlin.Unit +import com.example.input_object_type.type.Date as TypeDate +import java.util.Date as UtilDate public object ReviewInput_InputAdapter : CompositeAdapter { - public override fun fromJson(reader: JsonReader, adapterContext: CompositeAdapterContext): - ReviewInput = throw IllegalStateException("Input type used in output position") + override fun fromJson(reader: JsonReader, adapterContext: CompositeAdapterContext): ReviewInput = + throw IllegalStateException("Input type used in output position") - public override fun toJson( + override fun toJson( writer: JsonWriter, `value`: ReviewInput, adapterContext: CompositeAdapterContext, - ): Unit { + ) { writer.name("stars") IntAdapter.toJson(writer, CustomScalarAdapters.Empty, value.stars) if (value.nullableIntFieldWithDefaultValue is Optional.Present) { @@ -63,12 +63,12 @@ public object ReviewInput_InputAdapter : CompositeAdapter { } if (value.listOfCustomScalar is Optional.Present) { writer.name("listOfCustomScalar") - adapterContext.customScalarAdapters.responseAdapterFor(com.example.input_object_type.type.Date.type).nullable().list().nullable().present().toJson(writer, + adapterContext.customScalarAdapters.responseAdapterFor(TypeDate.type).nullable().list().nullable().present().toJson(writer, CustomScalarAdapters.Empty, value.listOfCustomScalar) } if (value.customScalar is Optional.Present) { writer.name("customScalar") - adapterContext.customScalarAdapters.responseAdapterFor(com.example.input_object_type.type.Date.type).nullable().present().toJson(writer, + adapterContext.customScalarAdapters.responseAdapterFor(TypeDate.type).nullable().present().toJson(writer, CustomScalarAdapters.Empty, value.customScalar) } if (value.listOfEnums is Optional.Present) { @@ -116,7 +116,7 @@ public object ReviewInput_InputAdapter : CompositeAdapter { } if (value.listOfListOfCustom is Optional.Present) { writer.name("listOfListOfCustom") - adapterContext.customScalarAdapters.responseAdapterFor(com.example.input_object_type.type.Date.type).list().list().nullable().present().toJson(writer, + adapterContext.customScalarAdapters.responseAdapterFor(TypeDate.type).list().list().nullable().present().toJson(writer, CustomScalarAdapters.Empty, value.listOfListOfCustom) } if (value.listOfListOfObject is Optional.Present) { diff --git a/libraries/apollo-compiler/src/test/graphql/com/example/input_object_type/kotlin/responseBased/input_object_type/type/adapter/ReviewRefInput_InputAdapter.kt.expected b/libraries/apollo-compiler/src/test/graphql/com/example/input_object_type/kotlin/responseBased/input_object_type/type/adapter/ReviewRefInput_InputAdapter.kt.expected index 5a194350f0e..b85a32efae3 100644 --- a/libraries/apollo-compiler/src/test/graphql/com/example/input_object_type/kotlin/responseBased/input_object_type/type/adapter/ReviewRefInput_InputAdapter.kt.expected +++ b/libraries/apollo-compiler/src/test/graphql/com/example/input_object_type/kotlin/responseBased/input_object_type/type/adapter/ReviewRefInput_InputAdapter.kt.expected @@ -15,17 +15,16 @@ import com.apollographql.apollo3.api.obj import com.apollographql.apollo3.api.present import com.example.input_object_type.type.ReviewRefInput import kotlin.IllegalStateException -import kotlin.Unit public object ReviewRefInput_InputAdapter : CompositeAdapter { - public override fun fromJson(reader: JsonReader, adapterContext: CompositeAdapterContext): - ReviewRefInput = throw IllegalStateException("Input type used in output position") + override fun fromJson(reader: JsonReader, adapterContext: CompositeAdapterContext): ReviewRefInput + = throw IllegalStateException("Input type used in output position") - public override fun toJson( + override fun toJson( writer: JsonWriter, `value`: ReviewRefInput, adapterContext: CompositeAdapterContext, - ): Unit { + ) { if (value.reviewInput is Optional.Present) { writer.name("reviewInput") ReviewInput_InputAdapter.obj().nullable().present().toJson(writer, value.reviewInput, diff --git a/libraries/apollo-compiler/src/test/graphql/com/example/input_object_variable_and_argument/kotlin/responseBased/input_object_variable_and_argument/TestQuery.kt.expected b/libraries/apollo-compiler/src/test/graphql/com/example/input_object_variable_and_argument/kotlin/responseBased/input_object_variable_and_argument/TestQuery.kt.expected index 23407f54217..9dbe9b54b78 100644 --- a/libraries/apollo-compiler/src/test/graphql/com/example/input_object_variable_and_argument/kotlin/responseBased/input_object_variable_and_argument/TestQuery.kt.expected +++ b/libraries/apollo-compiler/src/test/graphql/com/example/input_object_variable_and_argument/kotlin/responseBased/input_object_variable_and_argument/TestQuery.kt.expected @@ -21,33 +21,33 @@ import kotlin.Boolean import kotlin.Double import kotlin.Int import kotlin.String -import kotlin.Unit +import com.example.input_object_variable_and_argument.type.Query as CompiledQuery public data class TestQuery( public val episode: Optional = Optional.Absent, public val stars: Int, public val greenValue: Double, ) : Query { - public override fun id(): String = OPERATION_ID + override fun id(): String = OPERATION_ID - public override fun document(): String = OPERATION_DOCUMENT + override fun document(): String = OPERATION_DOCUMENT - public override fun name(): String = OPERATION_NAME + override fun name(): String = OPERATION_NAME - public override fun serializeVariables( + override fun serializeVariables( writer: JsonWriter, customScalarAdapters: CustomScalarAdapters, withBooleanDefaultValues: Boolean, - ): Unit { + ) { TestQuery_VariablesAdapter.serializeVariables(writer, this, customScalarAdapters, withBooleanDefaultValues) } - public override fun adapter(): CompositeAdapter = TestQuery_ResponseAdapter.Data.obj() + override fun adapter(): CompositeAdapter = TestQuery_ResponseAdapter.Data.obj() - public override fun rootField(): CompiledField = CompiledField.Builder( + override fun rootField(): CompiledField = CompiledField.Builder( name = "data", - type = com.example.input_object_variable_and_argument.type.Query.type + type = CompiledQuery.type ) .selections(selections = TestQuerySelections.__root) .build() diff --git a/libraries/apollo-compiler/src/test/graphql/com/example/input_object_variable_and_argument/kotlin/responseBased/input_object_variable_and_argument/adapter/TestQuery_ResponseAdapter.kt.expected b/libraries/apollo-compiler/src/test/graphql/com/example/input_object_variable_and_argument/kotlin/responseBased/input_object_variable_and_argument/adapter/TestQuery_ResponseAdapter.kt.expected index 9167fe9c27a..11896c034e7 100644 --- a/libraries/apollo-compiler/src/test/graphql/com/example/input_object_variable_and_argument/kotlin/responseBased/input_object_variable_and_argument/adapter/TestQuery_ResponseAdapter.kt.expected +++ b/libraries/apollo-compiler/src/test/graphql/com/example/input_object_variable_and_argument/kotlin/responseBased/input_object_variable_and_argument/adapter/TestQuery_ResponseAdapter.kt.expected @@ -17,14 +17,13 @@ import com.apollographql.apollo3.api.obj import com.example.input_object_variable_and_argument.TestQuery import kotlin.Double import kotlin.String -import kotlin.Unit import kotlin.collections.List public object TestQuery_ResponseAdapter { public object Data : CompositeAdapter { public val RESPONSE_NAMES: List = listOf("heroWithReview") - public override fun fromJson(reader: JsonReader, adapterContext: CompositeAdapterContext): + override fun fromJson(reader: JsonReader, adapterContext: CompositeAdapterContext): TestQuery.Data { var _heroWithReview: TestQuery.Data.HeroWithReview? = null @@ -40,11 +39,11 @@ public object TestQuery_ResponseAdapter { ) } - public override fun toJson( + override fun toJson( writer: JsonWriter, `value`: TestQuery.Data, adapterContext: CompositeAdapterContext, - ): Unit { + ) { writer.name("heroWithReview") HeroWithReview.obj().nullable().toJson(writer, value.heroWithReview, adapterContext) } @@ -52,7 +51,7 @@ public object TestQuery_ResponseAdapter { private object HeroWithReview : CompositeAdapter { public val RESPONSE_NAMES: List = listOf("name", "height") - public override fun fromJson(reader: JsonReader, adapterContext: CompositeAdapterContext): + override fun fromJson(reader: JsonReader, adapterContext: CompositeAdapterContext): TestQuery.Data.HeroWithReview { var _name: String? = null var _height: Double? = null @@ -71,11 +70,11 @@ public object TestQuery_ResponseAdapter { ) } - public override fun toJson( + override fun toJson( writer: JsonWriter, `value`: TestQuery.Data.HeroWithReview, adapterContext: CompositeAdapterContext, - ): Unit { + ) { writer.name("name") StringAdapter.toJson(writer, CustomScalarAdapters.Empty, value.name) diff --git a/libraries/apollo-compiler/src/test/graphql/com/example/input_object_variable_and_argument/kotlin/responseBased/input_object_variable_and_argument/adapter/TestQuery_VariablesAdapter.kt.expected b/libraries/apollo-compiler/src/test/graphql/com/example/input_object_variable_and_argument/kotlin/responseBased/input_object_variable_and_argument/adapter/TestQuery_VariablesAdapter.kt.expected index 6ed4cd07089..61e366f2122 100644 --- a/libraries/apollo-compiler/src/test/graphql/com/example/input_object_variable_and_argument/kotlin/responseBased/input_object_variable_and_argument/adapter/TestQuery_VariablesAdapter.kt.expected +++ b/libraries/apollo-compiler/src/test/graphql/com/example/input_object_variable_and_argument/kotlin/responseBased/input_object_variable_and_argument/adapter/TestQuery_VariablesAdapter.kt.expected @@ -17,7 +17,6 @@ import com.example.input_object_variable_and_argument.TestQuery import com.example.input_object_variable_and_argument.type.adapter.Episode_ResponseAdapter import kotlin.Boolean import kotlin.Suppress -import kotlin.Unit public object TestQuery_VariablesAdapter { @Suppress( @@ -29,7 +28,7 @@ public object TestQuery_VariablesAdapter { `value`: TestQuery, customScalarAdapters: CustomScalarAdapters, withBooleanDefaultValues: Boolean, - ): Unit { + ) { val adapterContext = CompositeAdapterContext.Builder().customScalarAdapters(customScalarAdapters).build() if (value.episode is Optional.Present) { diff --git a/libraries/apollo-compiler/src/test/graphql/com/example/input_object_variable_and_argument/kotlin/responseBased/input_object_variable_and_argument/type/adapter/Episode_ResponseAdapter.kt.expected b/libraries/apollo-compiler/src/test/graphql/com/example/input_object_variable_and_argument/kotlin/responseBased/input_object_variable_and_argument/type/adapter/Episode_ResponseAdapter.kt.expected index 30084d90cac..eaeb2b49213 100644 --- a/libraries/apollo-compiler/src/test/graphql/com/example/input_object_variable_and_argument/kotlin/responseBased/input_object_variable_and_argument/type/adapter/Episode_ResponseAdapter.kt.expected +++ b/libraries/apollo-compiler/src/test/graphql/com/example/input_object_variable_and_argument/kotlin/responseBased/input_object_variable_and_argument/type/adapter/Episode_ResponseAdapter.kt.expected @@ -10,20 +10,18 @@ import com.apollographql.apollo3.api.CustomScalarAdapters import com.apollographql.apollo3.api.json.JsonReader import com.apollographql.apollo3.api.json.JsonWriter import com.example.input_object_variable_and_argument.type.Episode -import kotlin.Unit public object Episode_ResponseAdapter : Adapter { - public override fun fromJson(reader: JsonReader, customScalarAdapters: CustomScalarAdapters): - Episode { + override fun fromJson(reader: JsonReader, customScalarAdapters: CustomScalarAdapters): Episode { val rawValue = reader.nextString()!! return Episode.safeValueOf(rawValue) } - public override fun toJson( + override fun toJson( writer: JsonWriter, customScalarAdapters: CustomScalarAdapters, `value`: Episode, - ): Unit { + ) { writer.value(value.rawValue) } } diff --git a/libraries/apollo-compiler/src/test/graphql/com/example/interface_always_nested/kotlin/operationBased/interface_always_nested/TestQuery.kt.expected b/libraries/apollo-compiler/src/test/graphql/com/example/interface_always_nested/kotlin/operationBased/interface_always_nested/TestQuery.kt.expected index 3db8f1ec57c..dc563af5f76 100644 --- a/libraries/apollo-compiler/src/test/graphql/com/example/interface_always_nested/kotlin/operationBased/interface_always_nested/TestQuery.kt.expected +++ b/libraries/apollo-compiler/src/test/graphql/com/example/interface_always_nested/kotlin/operationBased/interface_always_nested/TestQuery.kt.expected @@ -18,32 +18,32 @@ import kotlin.Any import kotlin.Boolean import kotlin.Int import kotlin.String -import kotlin.Unit +import com.example.interface_always_nested.type.Query as CompiledQuery public class TestQuery() : Query { - public override fun equals(other: Any?): Boolean = other != null && other::class == this::class + override fun equals(other: Any?): Boolean = other != null && other::class == this::class - public override fun hashCode(): Int = this::class.hashCode() + override fun hashCode(): Int = this::class.hashCode() - public override fun id(): String = OPERATION_ID + override fun id(): String = OPERATION_ID - public override fun document(): String = OPERATION_DOCUMENT + override fun document(): String = OPERATION_DOCUMENT - public override fun name(): String = OPERATION_NAME + override fun name(): String = OPERATION_NAME - public override fun serializeVariables( + override fun serializeVariables( writer: JsonWriter, customScalarAdapters: CustomScalarAdapters, withBooleanDefaultValues: Boolean, - ): Unit { + ) { // This operation doesn't have any variable } - public override fun adapter(): CompositeAdapter = TestQuery_ResponseAdapter.Data.obj() + override fun adapter(): CompositeAdapter = TestQuery_ResponseAdapter.Data.obj() - public override fun rootField(): CompiledField = CompiledField.Builder( + override fun rootField(): CompiledField = CompiledField.Builder( name = "data", - type = com.example.interface_always_nested.type.Query.type + type = CompiledQuery.type ) .selections(selections = TestQuerySelections.__root) .build() diff --git a/libraries/apollo-compiler/src/test/graphql/com/example/interface_always_nested/kotlin/operationBased/interface_always_nested/adapter/TestQuery_ResponseAdapter.kt.expected b/libraries/apollo-compiler/src/test/graphql/com/example/interface_always_nested/kotlin/operationBased/interface_always_nested/adapter/TestQuery_ResponseAdapter.kt.expected index 485c0c607df..42df8851884 100644 --- a/libraries/apollo-compiler/src/test/graphql/com/example/interface_always_nested/kotlin/operationBased/interface_always_nested/adapter/TestQuery_ResponseAdapter.kt.expected +++ b/libraries/apollo-compiler/src/test/graphql/com/example/interface_always_nested/kotlin/operationBased/interface_always_nested/adapter/TestQuery_ResponseAdapter.kt.expected @@ -18,14 +18,13 @@ import com.apollographql.apollo3.api.obj import com.apollographql.apollo3.api.possibleTypes import com.example.interface_always_nested.TestQuery import kotlin.String -import kotlin.Unit import kotlin.collections.List public object TestQuery_ResponseAdapter { public object Data : CompositeAdapter { public val RESPONSE_NAMES: List = listOf("root") - public override fun fromJson(reader: JsonReader, adapterContext: CompositeAdapterContext): + override fun fromJson(reader: JsonReader, adapterContext: CompositeAdapterContext): TestQuery.Data { var _root: TestQuery.Data.Root? = null @@ -41,11 +40,11 @@ public object TestQuery_ResponseAdapter { ) } - public override fun toJson( + override fun toJson( writer: JsonWriter, `value`: TestQuery.Data, adapterContext: CompositeAdapterContext, - ): Unit { + ) { writer.name("root") Root.obj(true).nullable().toJson(writer, value.root, adapterContext) } @@ -53,7 +52,7 @@ public object TestQuery_ResponseAdapter { private object Root : CompositeAdapter { public val RESPONSE_NAMES: List = listOf("__typename") - public override fun fromJson(reader: JsonReader, adapterContext: CompositeAdapterContext): + override fun fromJson(reader: JsonReader, adapterContext: CompositeAdapterContext): TestQuery.Data.Root { var __typename: String? = null @@ -81,11 +80,11 @@ public object TestQuery_ResponseAdapter { ) } - public override fun toJson( + override fun toJson( writer: JsonWriter, `value`: TestQuery.Data.Root, adapterContext: CompositeAdapterContext, - ): Unit { + ) { writer.name("__typename") StringAdapter.toJson(writer, CustomScalarAdapters.Empty, value.__typename) @@ -98,7 +97,7 @@ public object TestQuery_ResponseAdapter { private object OnA : CompositeAdapter { public val RESPONSE_NAMES: List = listOf("__typename", "fieldA1") - public override fun fromJson(reader: JsonReader, adapterContext: CompositeAdapterContext): + override fun fromJson(reader: JsonReader, adapterContext: CompositeAdapterContext): TestQuery.Data.Root.OnA { var __typename: String? = null var _fieldA1: String? = null @@ -129,11 +128,11 @@ public object TestQuery_ResponseAdapter { ) } - public override fun toJson( + override fun toJson( writer: JsonWriter, `value`: TestQuery.Data.Root.OnA, adapterContext: CompositeAdapterContext, - ): Unit { + ) { writer.name("__typename") StringAdapter.toJson(writer, CustomScalarAdapters.Empty, value.__typename) @@ -149,7 +148,7 @@ public object TestQuery_ResponseAdapter { private object OnB : CompositeAdapter { public val RESPONSE_NAMES: List = listOf("fieldB1") - public override fun fromJson(reader: JsonReader, adapterContext: CompositeAdapterContext): + override fun fromJson(reader: JsonReader, adapterContext: CompositeAdapterContext): TestQuery.Data.Root.OnA.OnB { var _fieldB1: String? = null @@ -165,11 +164,11 @@ public object TestQuery_ResponseAdapter { ) } - public override fun toJson( + override fun toJson( writer: JsonWriter, `value`: TestQuery.Data.Root.OnA.OnB, adapterContext: CompositeAdapterContext, - ): Unit { + ) { writer.name("fieldB1") NullableStringAdapter.toJson(writer, CustomScalarAdapters.Empty, value.fieldB1) } diff --git a/libraries/apollo-compiler/src/test/graphql/com/example/interface_always_nested/kotlin/responseBased/interface_always_nested/TestQuery.kt.expected b/libraries/apollo-compiler/src/test/graphql/com/example/interface_always_nested/kotlin/responseBased/interface_always_nested/TestQuery.kt.expected index ca4ce02862b..541d722437e 100644 --- a/libraries/apollo-compiler/src/test/graphql/com/example/interface_always_nested/kotlin/responseBased/interface_always_nested/TestQuery.kt.expected +++ b/libraries/apollo-compiler/src/test/graphql/com/example/interface_always_nested/kotlin/responseBased/interface_always_nested/TestQuery.kt.expected @@ -18,32 +18,33 @@ import kotlin.Any import kotlin.Boolean import kotlin.Int import kotlin.String -import kotlin.Unit +import kotlin.Suppress +import com.example.interface_always_nested.type.Query as CompiledQuery public class TestQuery() : Query { - public override fun equals(other: Any?): Boolean = other != null && other::class == this::class + override fun equals(other: Any?): Boolean = other != null && other::class == this::class - public override fun hashCode(): Int = this::class.hashCode() + override fun hashCode(): Int = this::class.hashCode() - public override fun id(): String = OPERATION_ID + override fun id(): String = OPERATION_ID - public override fun document(): String = OPERATION_DOCUMENT + override fun document(): String = OPERATION_DOCUMENT - public override fun name(): String = OPERATION_NAME + override fun name(): String = OPERATION_NAME - public override fun serializeVariables( + override fun serializeVariables( writer: JsonWriter, customScalarAdapters: CustomScalarAdapters, withBooleanDefaultValues: Boolean, - ): Unit { + ) { // This operation doesn't have any variable } - public override fun adapter(): CompositeAdapter = TestQuery_ResponseAdapter.Data.obj() + override fun adapter(): CompositeAdapter = TestQuery_ResponseAdapter.Data.obj() - public override fun rootField(): CompiledField = CompiledField.Builder( + override fun rootField(): CompiledField = CompiledField.Builder( name = "data", - type = com.example.interface_always_nested.type.Query.type + type = CompiledQuery.type ) .selections(selections = TestQuerySelections.__root) .build() @@ -56,31 +57,33 @@ public class TestQuery() : Query { public val __typename: String public companion object { - public fun Root.asA() = this as? ARoot + @Suppress("USELESS_CAST") + public fun Root.asA(): ARoot? = this as? ARoot - public fun Root.asAB() = this as? ABRoot + @Suppress("USELESS_CAST") + public fun Root.asAB(): ABRoot? = this as? ABRoot } } public sealed interface ARoot : Root { - public override val __typename: String + override val __typename: String public val fieldA1: String? } public data class ABRoot( - public override val __typename: String, - public override val fieldA1: String?, + override val __typename: String, + override val fieldA1: String?, public val fieldB1: String?, ) : ARoot public data class OtherRoot( - public override val __typename: String, + override val __typename: String, ) : Root public data class OtherARoot( - public override val __typename: String, - public override val fieldA1: String?, + override val __typename: String, + override val fieldA1: String?, ) : ARoot } diff --git a/libraries/apollo-compiler/src/test/graphql/com/example/interface_always_nested/kotlin/responseBased/interface_always_nested/adapter/TestQuery_ResponseAdapter.kt.expected b/libraries/apollo-compiler/src/test/graphql/com/example/interface_always_nested/kotlin/responseBased/interface_always_nested/adapter/TestQuery_ResponseAdapter.kt.expected index 6d206c81555..e4ce88cf029 100644 --- a/libraries/apollo-compiler/src/test/graphql/com/example/interface_always_nested/kotlin/responseBased/interface_always_nested/adapter/TestQuery_ResponseAdapter.kt.expected +++ b/libraries/apollo-compiler/src/test/graphql/com/example/interface_always_nested/kotlin/responseBased/interface_always_nested/adapter/TestQuery_ResponseAdapter.kt.expected @@ -18,14 +18,13 @@ import com.apollographql.apollo3.api.obj import com.example.interface_always_nested.TestQuery import kotlin.String import kotlin.Suppress -import kotlin.Unit import kotlin.collections.List public object TestQuery_ResponseAdapter { public object Data : CompositeAdapter { public val RESPONSE_NAMES: List = listOf("root") - public override fun fromJson(reader: JsonReader, adapterContext: CompositeAdapterContext): + override fun fromJson(reader: JsonReader, adapterContext: CompositeAdapterContext): TestQuery.Data { var _root: TestQuery.Data.Root? = null @@ -41,17 +40,17 @@ public object TestQuery_ResponseAdapter { ) } - public override fun toJson( + override fun toJson( writer: JsonWriter, `value`: TestQuery.Data, adapterContext: CompositeAdapterContext, - ): Unit { + ) { writer.name("root") Root.obj().nullable().toJson(writer, value.root, adapterContext) } private object Root : CompositeAdapter { - public override fun fromJson(reader: JsonReader, adapterContext: CompositeAdapterContext): + override fun fromJson(reader: JsonReader, adapterContext: CompositeAdapterContext): TestQuery.Data.Root { val __typename = reader.readTypename() return when(__typename) { @@ -64,11 +63,11 @@ public object TestQuery_ResponseAdapter { } } - public override fun toJson( + override fun toJson( writer: JsonWriter, `value`: TestQuery.Data.Root, adapterContext: CompositeAdapterContext, - ): Unit { + ) { when(value) { is TestQuery.Data.ABRoot -> ABRoot.toJson(writer, value, adapterContext) is TestQuery.Data.OtherARoot -> OtherARoot.toJson(writer, value, adapterContext) @@ -109,7 +108,7 @@ public object TestQuery_ResponseAdapter { writer: JsonWriter, `value`: TestQuery.Data.ABRoot, @Suppress("UNUSED_PARAMETER") adapterContext: CompositeAdapterContext, - ): Unit { + ) { writer.name("__typename") StringAdapter.toJson(writer, CustomScalarAdapters.Empty, value.__typename) @@ -147,7 +146,7 @@ public object TestQuery_ResponseAdapter { writer: JsonWriter, `value`: TestQuery.Data.OtherRoot, @Suppress("UNUSED_PARAMETER") adapterContext: CompositeAdapterContext, - ): Unit { + ) { writer.name("__typename") StringAdapter.toJson(writer, CustomScalarAdapters.Empty, value.__typename) } @@ -182,7 +181,7 @@ public object TestQuery_ResponseAdapter { writer: JsonWriter, `value`: TestQuery.Data.OtherARoot, @Suppress("UNUSED_PARAMETER") adapterContext: CompositeAdapterContext, - ): Unit { + ) { writer.name("__typename") StringAdapter.toJson(writer, CustomScalarAdapters.Empty, value.__typename) diff --git a/libraries/apollo-compiler/src/test/graphql/com/example/interface_on_interface/kotlin/operationBased/interface_on_interface/GetHuman.kt.expected b/libraries/apollo-compiler/src/test/graphql/com/example/interface_on_interface/kotlin/operationBased/interface_on_interface/GetHuman.kt.expected index 3440834345f..d48ede3a6cd 100644 --- a/libraries/apollo-compiler/src/test/graphql/com/example/interface_on_interface/kotlin/operationBased/interface_on_interface/GetHuman.kt.expected +++ b/libraries/apollo-compiler/src/test/graphql/com/example/interface_on_interface/kotlin/operationBased/interface_on_interface/GetHuman.kt.expected @@ -19,32 +19,32 @@ import kotlin.Boolean import kotlin.Double import kotlin.Int import kotlin.String -import kotlin.Unit +import com.example.interface_on_interface.type.Query as CompiledQuery public class GetHuman() : Query { - public override fun equals(other: Any?): Boolean = other != null && other::class == this::class + override fun equals(other: Any?): Boolean = other != null && other::class == this::class - public override fun hashCode(): Int = this::class.hashCode() + override fun hashCode(): Int = this::class.hashCode() - public override fun id(): String = OPERATION_ID + override fun id(): String = OPERATION_ID - public override fun document(): String = OPERATION_DOCUMENT + override fun document(): String = OPERATION_DOCUMENT - public override fun name(): String = OPERATION_NAME + override fun name(): String = OPERATION_NAME - public override fun serializeVariables( + override fun serializeVariables( writer: JsonWriter, customScalarAdapters: CustomScalarAdapters, withBooleanDefaultValues: Boolean, - ): Unit { + ) { // This operation doesn't have any variable } - public override fun adapter(): CompositeAdapter = GetHuman_ResponseAdapter.Data.obj() + override fun adapter(): CompositeAdapter = GetHuman_ResponseAdapter.Data.obj() - public override fun rootField(): CompiledField = CompiledField.Builder( + override fun rootField(): CompiledField = CompiledField.Builder( name = "data", - type = com.example.interface_on_interface.type.Query.type + type = CompiledQuery.type ) .selections(selections = GetHumanSelections.__root) .build() diff --git a/libraries/apollo-compiler/src/test/graphql/com/example/interface_on_interface/kotlin/operationBased/interface_on_interface/adapter/GetHuman_ResponseAdapter.kt.expected b/libraries/apollo-compiler/src/test/graphql/com/example/interface_on_interface/kotlin/operationBased/interface_on_interface/adapter/GetHuman_ResponseAdapter.kt.expected index 1ee2ef82c05..5e469be16ca 100644 --- a/libraries/apollo-compiler/src/test/graphql/com/example/interface_on_interface/kotlin/operationBased/interface_on_interface/adapter/GetHuman_ResponseAdapter.kt.expected +++ b/libraries/apollo-compiler/src/test/graphql/com/example/interface_on_interface/kotlin/operationBased/interface_on_interface/adapter/GetHuman_ResponseAdapter.kt.expected @@ -18,14 +18,13 @@ import com.apollographql.apollo3.api.possibleTypes import com.example.interface_on_interface.GetHuman import kotlin.Double import kotlin.String -import kotlin.Unit import kotlin.collections.List public object GetHuman_ResponseAdapter { public object Data : CompositeAdapter { public val RESPONSE_NAMES: List = listOf("human", "node") - public override fun fromJson(reader: JsonReader, adapterContext: CompositeAdapterContext): + override fun fromJson(reader: JsonReader, adapterContext: CompositeAdapterContext): GetHuman.Data { var _human: GetHuman.Data.Human? = null var _node: GetHuman.Data.Node? = null @@ -44,11 +43,11 @@ public object GetHuman_ResponseAdapter { ) } - public override fun toJson( + override fun toJson( writer: JsonWriter, `value`: GetHuman.Data, adapterContext: CompositeAdapterContext, - ): Unit { + ) { writer.name("human") Human.obj().toJson(writer, value.human, adapterContext) @@ -59,7 +58,7 @@ public object GetHuman_ResponseAdapter { private object Human : CompositeAdapter { public val RESPONSE_NAMES: List = listOf("id", "name", "height") - public override fun fromJson(reader: JsonReader, adapterContext: CompositeAdapterContext): + override fun fromJson(reader: JsonReader, adapterContext: CompositeAdapterContext): GetHuman.Data.Human { var _id: String? = null var _name: String? = null @@ -81,11 +80,11 @@ public object GetHuman_ResponseAdapter { ) } - public override fun toJson( + override fun toJson( writer: JsonWriter, `value`: GetHuman.Data.Human, adapterContext: CompositeAdapterContext, - ): Unit { + ) { writer.name("id") StringAdapter.toJson(writer, CustomScalarAdapters.Empty, value.id) @@ -100,7 +99,7 @@ public object GetHuman_ResponseAdapter { private object Node : CompositeAdapter { public val RESPONSE_NAMES: List = listOf("__typename") - public override fun fromJson(reader: JsonReader, adapterContext: CompositeAdapterContext): + override fun fromJson(reader: JsonReader, adapterContext: CompositeAdapterContext): GetHuman.Data.Node { var __typename: String? = null @@ -128,11 +127,11 @@ public object GetHuman_ResponseAdapter { ) } - public override fun toJson( + override fun toJson( writer: JsonWriter, `value`: GetHuman.Data.Node, adapterContext: CompositeAdapterContext, - ): Unit { + ) { writer.name("__typename") StringAdapter.toJson(writer, CustomScalarAdapters.Empty, value.__typename) @@ -145,7 +144,7 @@ public object GetHuman_ResponseAdapter { private object OnHuman : CompositeAdapter { public val RESPONSE_NAMES: List = listOf("height") - public override fun fromJson(reader: JsonReader, adapterContext: CompositeAdapterContext): + override fun fromJson(reader: JsonReader, adapterContext: CompositeAdapterContext): GetHuman.Data.Node.OnHuman { var _height: Double? = null @@ -161,11 +160,11 @@ public object GetHuman_ResponseAdapter { ) } - public override fun toJson( + override fun toJson( writer: JsonWriter, `value`: GetHuman.Data.Node.OnHuman, adapterContext: CompositeAdapterContext, - ): Unit { + ) { writer.name("height") DoubleAdapter.toJson(writer, CustomScalarAdapters.Empty, value.height) } diff --git a/libraries/apollo-compiler/src/test/graphql/com/example/interface_on_interface/kotlin/responseBased/interface_on_interface/GetHuman.kt.expected b/libraries/apollo-compiler/src/test/graphql/com/example/interface_on_interface/kotlin/responseBased/interface_on_interface/GetHuman.kt.expected index 4040a82087d..9b82e65119e 100644 --- a/libraries/apollo-compiler/src/test/graphql/com/example/interface_on_interface/kotlin/responseBased/interface_on_interface/GetHuman.kt.expected +++ b/libraries/apollo-compiler/src/test/graphql/com/example/interface_on_interface/kotlin/responseBased/interface_on_interface/GetHuman.kt.expected @@ -19,32 +19,33 @@ import kotlin.Boolean import kotlin.Double import kotlin.Int import kotlin.String -import kotlin.Unit +import kotlin.Suppress +import com.example.interface_on_interface.type.Query as CompiledQuery public class GetHuman() : Query { - public override fun equals(other: Any?): Boolean = other != null && other::class == this::class + override fun equals(other: Any?): Boolean = other != null && other::class == this::class - public override fun hashCode(): Int = this::class.hashCode() + override fun hashCode(): Int = this::class.hashCode() - public override fun id(): String = OPERATION_ID + override fun id(): String = OPERATION_ID - public override fun document(): String = OPERATION_DOCUMENT + override fun document(): String = OPERATION_DOCUMENT - public override fun name(): String = OPERATION_NAME + override fun name(): String = OPERATION_NAME - public override fun serializeVariables( + override fun serializeVariables( writer: JsonWriter, customScalarAdapters: CustomScalarAdapters, withBooleanDefaultValues: Boolean, - ): Unit { + ) { // This operation doesn't have any variable } - public override fun adapter(): CompositeAdapter = GetHuman_ResponseAdapter.Data.obj() + override fun adapter(): CompositeAdapter = GetHuman_ResponseAdapter.Data.obj() - public override fun rootField(): CompiledField = CompiledField.Builder( + override fun rootField(): CompiledField = CompiledField.Builder( name = "data", - type = com.example.interface_on_interface.type.Query.type + type = CompiledQuery.type ) .selections(selections = GetHumanSelections.__root) .build() @@ -64,17 +65,18 @@ public class GetHuman() : Query { public val __typename: String public companion object { - public fun Node.asHuman() = this as? HumanNode + @Suppress("USELESS_CAST") + public fun Node.asHuman(): HumanNode? = this as? HumanNode } } public data class HumanNode( - public override val __typename: String, + override val __typename: String, public val height: Double, ) : Node public data class OtherNode( - public override val __typename: String, + override val __typename: String, ) : Node } diff --git a/libraries/apollo-compiler/src/test/graphql/com/example/interface_on_interface/kotlin/responseBased/interface_on_interface/adapter/GetHuman_ResponseAdapter.kt.expected b/libraries/apollo-compiler/src/test/graphql/com/example/interface_on_interface/kotlin/responseBased/interface_on_interface/adapter/GetHuman_ResponseAdapter.kt.expected index c73a8de7763..afba1874287 100644 --- a/libraries/apollo-compiler/src/test/graphql/com/example/interface_on_interface/kotlin/responseBased/interface_on_interface/adapter/GetHuman_ResponseAdapter.kt.expected +++ b/libraries/apollo-compiler/src/test/graphql/com/example/interface_on_interface/kotlin/responseBased/interface_on_interface/adapter/GetHuman_ResponseAdapter.kt.expected @@ -18,14 +18,13 @@ import com.example.interface_on_interface.GetHuman import kotlin.Double import kotlin.String import kotlin.Suppress -import kotlin.Unit import kotlin.collections.List public object GetHuman_ResponseAdapter { public object Data : CompositeAdapter { public val RESPONSE_NAMES: List = listOf("human", "node") - public override fun fromJson(reader: JsonReader, adapterContext: CompositeAdapterContext): + override fun fromJson(reader: JsonReader, adapterContext: CompositeAdapterContext): GetHuman.Data { var _human: GetHuman.Data.Human? = null var _node: GetHuman.Data.Node? = null @@ -44,11 +43,11 @@ public object GetHuman_ResponseAdapter { ) } - public override fun toJson( + override fun toJson( writer: JsonWriter, `value`: GetHuman.Data, adapterContext: CompositeAdapterContext, - ): Unit { + ) { writer.name("human") Human.obj().toJson(writer, value.human, adapterContext) @@ -59,7 +58,7 @@ public object GetHuman_ResponseAdapter { private object Human : CompositeAdapter { public val RESPONSE_NAMES: List = listOf("id", "name", "height") - public override fun fromJson(reader: JsonReader, adapterContext: CompositeAdapterContext): + override fun fromJson(reader: JsonReader, adapterContext: CompositeAdapterContext): GetHuman.Data.Human { var _id: String? = null var _name: String? = null @@ -81,11 +80,11 @@ public object GetHuman_ResponseAdapter { ) } - public override fun toJson( + override fun toJson( writer: JsonWriter, `value`: GetHuman.Data.Human, adapterContext: CompositeAdapterContext, - ): Unit { + ) { writer.name("id") StringAdapter.toJson(writer, CustomScalarAdapters.Empty, value.id) @@ -98,7 +97,7 @@ public object GetHuman_ResponseAdapter { } private object Node : CompositeAdapter { - public override fun fromJson(reader: JsonReader, adapterContext: CompositeAdapterContext): + override fun fromJson(reader: JsonReader, adapterContext: CompositeAdapterContext): GetHuman.Data.Node { val __typename = reader.readTypename() return when(__typename) { @@ -109,11 +108,11 @@ public object GetHuman_ResponseAdapter { } } - public override fun toJson( + override fun toJson( writer: JsonWriter, `value`: GetHuman.Data.Node, adapterContext: CompositeAdapterContext, - ): Unit { + ) { when(value) { is GetHuman.Data.HumanNode -> HumanNode.toJson(writer, value, adapterContext) is GetHuman.Data.OtherNode -> OtherNode.toJson(writer, value, adapterContext) @@ -150,7 +149,7 @@ public object GetHuman_ResponseAdapter { writer: JsonWriter, `value`: GetHuman.Data.HumanNode, @Suppress("UNUSED_PARAMETER") adapterContext: CompositeAdapterContext, - ): Unit { + ) { writer.name("__typename") StringAdapter.toJson(writer, CustomScalarAdapters.Empty, value.__typename) @@ -185,7 +184,7 @@ public object GetHuman_ResponseAdapter { writer: JsonWriter, `value`: GetHuman.Data.OtherNode, @Suppress("UNUSED_PARAMETER") adapterContext: CompositeAdapterContext, - ): Unit { + ) { writer.name("__typename") StringAdapter.toJson(writer, CustomScalarAdapters.Empty, value.__typename) } diff --git a/libraries/apollo-compiler/src/test/graphql/com/example/introspection_query/kotlin/responseBased/introspection_query/TestQuery.kt.expected b/libraries/apollo-compiler/src/test/graphql/com/example/introspection_query/kotlin/responseBased/introspection_query/TestQuery.kt.expected index bd4bb349de0..d68732b9a21 100644 --- a/libraries/apollo-compiler/src/test/graphql/com/example/introspection_query/kotlin/responseBased/introspection_query/TestQuery.kt.expected +++ b/libraries/apollo-compiler/src/test/graphql/com/example/introspection_query/kotlin/responseBased/introspection_query/TestQuery.kt.expected @@ -19,33 +19,33 @@ import kotlin.Any import kotlin.Boolean import kotlin.Int import kotlin.String -import kotlin.Unit import kotlin.collections.List +import com.example.introspection_query.type.Query as CompiledQuery public class TestQuery() : Query { - public override fun equals(other: Any?): Boolean = other != null && other::class == this::class + override fun equals(other: Any?): Boolean = other != null && other::class == this::class - public override fun hashCode(): Int = this::class.hashCode() + override fun hashCode(): Int = this::class.hashCode() - public override fun id(): String = OPERATION_ID + override fun id(): String = OPERATION_ID - public override fun document(): String = OPERATION_DOCUMENT + override fun document(): String = OPERATION_DOCUMENT - public override fun name(): String = OPERATION_NAME + override fun name(): String = OPERATION_NAME - public override fun serializeVariables( + override fun serializeVariables( writer: JsonWriter, customScalarAdapters: CustomScalarAdapters, withBooleanDefaultValues: Boolean, - ): Unit { + ) { // This operation doesn't have any variable } - public override fun adapter(): CompositeAdapter = TestQuery_ResponseAdapter.Data.obj() + override fun adapter(): CompositeAdapter = TestQuery_ResponseAdapter.Data.obj() - public override fun rootField(): CompiledField = CompiledField.Builder( + override fun rootField(): CompiledField = CompiledField.Builder( name = "data", - type = com.example.introspection_query.type.Query.type + type = CompiledQuery.type ) .selections(selections = TestQuerySelections.__root) .build() diff --git a/libraries/apollo-compiler/src/test/graphql/com/example/introspection_query/kotlin/responseBased/introspection_query/adapter/TestQuery_ResponseAdapter.kt.expected b/libraries/apollo-compiler/src/test/graphql/com/example/introspection_query/kotlin/responseBased/introspection_query/adapter/TestQuery_ResponseAdapter.kt.expected index df728860998..26ce19d290b 100644 --- a/libraries/apollo-compiler/src/test/graphql/com/example/introspection_query/kotlin/responseBased/introspection_query/adapter/TestQuery_ResponseAdapter.kt.expected +++ b/libraries/apollo-compiler/src/test/graphql/com/example/introspection_query/kotlin/responseBased/introspection_query/adapter/TestQuery_ResponseAdapter.kt.expected @@ -17,14 +17,13 @@ import com.example.introspection_query.TestQuery import com.example.introspection_query.type.__TypeKind import com.example.introspection_query.type.adapter.__TypeKind_ResponseAdapter import kotlin.String -import kotlin.Unit import kotlin.collections.List public object TestQuery_ResponseAdapter { public object Data : CompositeAdapter { public val RESPONSE_NAMES: List = listOf("__schema", "__type") - public override fun fromJson(reader: JsonReader, adapterContext: CompositeAdapterContext): + override fun fromJson(reader: JsonReader, adapterContext: CompositeAdapterContext): TestQuery.Data { var ___schema: TestQuery.Data.__Schema? = null var ___type: TestQuery.Data.__Type? = null @@ -43,11 +42,11 @@ public object TestQuery_ResponseAdapter { ) } - public override fun toJson( + override fun toJson( writer: JsonWriter, `value`: TestQuery.Data, adapterContext: CompositeAdapterContext, - ): Unit { + ) { writer.name("__schema") __Schema.obj().toJson(writer, value.__schema, adapterContext) @@ -58,7 +57,7 @@ public object TestQuery_ResponseAdapter { private object __Schema : CompositeAdapter { public val RESPONSE_NAMES: List = listOf("queryType", "types") - public override fun fromJson(reader: JsonReader, adapterContext: CompositeAdapterContext): + override fun fromJson(reader: JsonReader, adapterContext: CompositeAdapterContext): TestQuery.Data.__Schema { var _queryType: TestQuery.Data.__Schema.QueryType? = null var _types: List? = null @@ -77,11 +76,11 @@ public object TestQuery_ResponseAdapter { ) } - public override fun toJson( + override fun toJson( writer: JsonWriter, `value`: TestQuery.Data.__Schema, adapterContext: CompositeAdapterContext, - ): Unit { + ) { writer.name("queryType") QueryType.obj().toJson(writer, value.queryType, adapterContext) @@ -92,7 +91,7 @@ public object TestQuery_ResponseAdapter { private object QueryType : CompositeAdapter { public val RESPONSE_NAMES: List = listOf("name") - public override fun fromJson(reader: JsonReader, adapterContext: CompositeAdapterContext): + override fun fromJson(reader: JsonReader, adapterContext: CompositeAdapterContext): TestQuery.Data.__Schema.QueryType { var _name: String? = null @@ -108,11 +107,11 @@ public object TestQuery_ResponseAdapter { ) } - public override fun toJson( + override fun toJson( writer: JsonWriter, `value`: TestQuery.Data.__Schema.QueryType, adapterContext: CompositeAdapterContext, - ): Unit { + ) { writer.name("name") NullableStringAdapter.toJson(writer, CustomScalarAdapters.Empty, value.name) } @@ -121,7 +120,7 @@ public object TestQuery_ResponseAdapter { private object Type : CompositeAdapter { public val RESPONSE_NAMES: List = listOf("name") - public override fun fromJson(reader: JsonReader, adapterContext: CompositeAdapterContext): + override fun fromJson(reader: JsonReader, adapterContext: CompositeAdapterContext): TestQuery.Data.__Schema.Type { var _name: String? = null @@ -137,11 +136,11 @@ public object TestQuery_ResponseAdapter { ) } - public override fun toJson( + override fun toJson( writer: JsonWriter, `value`: TestQuery.Data.__Schema.Type, adapterContext: CompositeAdapterContext, - ): Unit { + ) { writer.name("name") NullableStringAdapter.toJson(writer, CustomScalarAdapters.Empty, value.name) } @@ -151,7 +150,7 @@ public object TestQuery_ResponseAdapter { private object __Type : CompositeAdapter { public val RESPONSE_NAMES: List = listOf("name", "kind") - public override fun fromJson(reader: JsonReader, adapterContext: CompositeAdapterContext): + override fun fromJson(reader: JsonReader, adapterContext: CompositeAdapterContext): TestQuery.Data.__Type { var _name: String? = null var _kind: __TypeKind? = null @@ -170,11 +169,11 @@ public object TestQuery_ResponseAdapter { ) } - public override fun toJson( + override fun toJson( writer: JsonWriter, `value`: TestQuery.Data.__Type, adapterContext: CompositeAdapterContext, - ): Unit { + ) { writer.name("name") NullableStringAdapter.toJson(writer, CustomScalarAdapters.Empty, value.name) diff --git a/libraries/apollo-compiler/src/test/graphql/com/example/introspection_query/kotlin/responseBased/introspection_query/type/adapter/__TypeKind_ResponseAdapter.kt.expected b/libraries/apollo-compiler/src/test/graphql/com/example/introspection_query/kotlin/responseBased/introspection_query/type/adapter/__TypeKind_ResponseAdapter.kt.expected index ff34ede0169..4d6c04c8831 100644 --- a/libraries/apollo-compiler/src/test/graphql/com/example/introspection_query/kotlin/responseBased/introspection_query/type/adapter/__TypeKind_ResponseAdapter.kt.expected +++ b/libraries/apollo-compiler/src/test/graphql/com/example/introspection_query/kotlin/responseBased/introspection_query/type/adapter/__TypeKind_ResponseAdapter.kt.expected @@ -10,20 +10,19 @@ import com.apollographql.apollo3.api.CustomScalarAdapters import com.apollographql.apollo3.api.json.JsonReader import com.apollographql.apollo3.api.json.JsonWriter import com.example.introspection_query.type.__TypeKind -import kotlin.Unit public object __TypeKind_ResponseAdapter : Adapter<__TypeKind> { - public override fun fromJson(reader: JsonReader, customScalarAdapters: CustomScalarAdapters): + override fun fromJson(reader: JsonReader, customScalarAdapters: CustomScalarAdapters): __TypeKind { val rawValue = reader.nextString()!! return __TypeKind.safeValueOf(rawValue) } - public override fun toJson( + override fun toJson( writer: JsonWriter, customScalarAdapters: CustomScalarAdapters, `value`: __TypeKind, - ): Unit { + ) { writer.value(value.rawValue) } } diff --git a/libraries/apollo-compiler/src/test/graphql/com/example/java8annotation/kotlin/responseBased/java8annotation/LoginBarber.kt.expected b/libraries/apollo-compiler/src/test/graphql/com/example/java8annotation/kotlin/responseBased/java8annotation/LoginBarber.kt.expected index 7939e70da36..db1c0e69f32 100644 --- a/libraries/apollo-compiler/src/test/graphql/com/example/java8annotation/kotlin/responseBased/java8annotation/LoginBarber.kt.expected +++ b/libraries/apollo-compiler/src/test/graphql/com/example/java8annotation/kotlin/responseBased/java8annotation/LoginBarber.kt.expected @@ -18,31 +18,31 @@ import com.example.java8annotation.selections.LoginBarberSelections import com.example.java8annotation.type.Login import kotlin.Boolean import kotlin.String -import kotlin.Unit +import com.example.java8annotation.type.Mutation as CompiledMutation public data class LoginBarber( public val input: Login, ) : Mutation { - public override fun id(): String = OPERATION_ID + override fun id(): String = OPERATION_ID - public override fun document(): String = OPERATION_DOCUMENT + override fun document(): String = OPERATION_DOCUMENT - public override fun name(): String = OPERATION_NAME + override fun name(): String = OPERATION_NAME - public override fun serializeVariables( + override fun serializeVariables( writer: JsonWriter, customScalarAdapters: CustomScalarAdapters, withBooleanDefaultValues: Boolean, - ): Unit { + ) { LoginBarber_VariablesAdapter.serializeVariables(writer, this, customScalarAdapters, withBooleanDefaultValues) } - public override fun adapter(): CompositeAdapter = LoginBarber_ResponseAdapter.Data.obj() + override fun adapter(): CompositeAdapter = LoginBarber_ResponseAdapter.Data.obj() - public override fun rootField(): CompiledField = CompiledField.Builder( + override fun rootField(): CompiledField = CompiledField.Builder( name = "data", - type = com.example.java8annotation.type.Mutation.type + type = CompiledMutation.type ) .selections(selections = LoginBarberSelections.__root) .build() diff --git a/libraries/apollo-compiler/src/test/graphql/com/example/java8annotation/kotlin/responseBased/java8annotation/adapter/LoginBarber_ResponseAdapter.kt.expected b/libraries/apollo-compiler/src/test/graphql/com/example/java8annotation/kotlin/responseBased/java8annotation/adapter/LoginBarber_ResponseAdapter.kt.expected index cf84fd0a568..904ea726692 100644 --- a/libraries/apollo-compiler/src/test/graphql/com/example/java8annotation/kotlin/responseBased/java8annotation/adapter/LoginBarber_ResponseAdapter.kt.expected +++ b/libraries/apollo-compiler/src/test/graphql/com/example/java8annotation/kotlin/responseBased/java8annotation/adapter/LoginBarber_ResponseAdapter.kt.expected @@ -14,14 +14,13 @@ import com.apollographql.apollo3.api.json.JsonWriter import com.apollographql.apollo3.api.obj import com.example.java8annotation.LoginBarber import kotlin.String -import kotlin.Unit import kotlin.collections.List public object LoginBarber_ResponseAdapter { public object Data : CompositeAdapter { public val RESPONSE_NAMES: List = listOf("login") - public override fun fromJson(reader: JsonReader, adapterContext: CompositeAdapterContext): + override fun fromJson(reader: JsonReader, adapterContext: CompositeAdapterContext): LoginBarber.Data { var _login: LoginBarber.Data.Login? = null @@ -37,11 +36,11 @@ public object LoginBarber_ResponseAdapter { ) } - public override fun toJson( + override fun toJson( writer: JsonWriter, `value`: LoginBarber.Data, adapterContext: CompositeAdapterContext, - ): Unit { + ) { writer.name("login") Login.obj().toJson(writer, value.login, adapterContext) } @@ -49,7 +48,7 @@ public object LoginBarber_ResponseAdapter { private object Login : CompositeAdapter { public val RESPONSE_NAMES: List = listOf("response") - public override fun fromJson(reader: JsonReader, adapterContext: CompositeAdapterContext): + override fun fromJson(reader: JsonReader, adapterContext: CompositeAdapterContext): LoginBarber.Data.Login { var _response: String? = null @@ -65,11 +64,11 @@ public object LoginBarber_ResponseAdapter { ) } - public override fun toJson( + override fun toJson( writer: JsonWriter, `value`: LoginBarber.Data.Login, adapterContext: CompositeAdapterContext, - ): Unit { + ) { writer.name("response") StringAdapter.toJson(writer, CustomScalarAdapters.Empty, value.response) } diff --git a/libraries/apollo-compiler/src/test/graphql/com/example/java8annotation/kotlin/responseBased/java8annotation/adapter/LoginBarber_VariablesAdapter.kt.expected b/libraries/apollo-compiler/src/test/graphql/com/example/java8annotation/kotlin/responseBased/java8annotation/adapter/LoginBarber_VariablesAdapter.kt.expected index ac438b03ad4..ca2e4c433af 100644 --- a/libraries/apollo-compiler/src/test/graphql/com/example/java8annotation/kotlin/responseBased/java8annotation/adapter/LoginBarber_VariablesAdapter.kt.expected +++ b/libraries/apollo-compiler/src/test/graphql/com/example/java8annotation/kotlin/responseBased/java8annotation/adapter/LoginBarber_VariablesAdapter.kt.expected @@ -13,7 +13,6 @@ import com.example.java8annotation.LoginBarber import com.example.java8annotation.type.adapter.Login_InputAdapter import kotlin.Boolean import kotlin.Suppress -import kotlin.Unit public object LoginBarber_VariablesAdapter { @Suppress( @@ -25,7 +24,7 @@ public object LoginBarber_VariablesAdapter { `value`: LoginBarber, customScalarAdapters: CustomScalarAdapters, withBooleanDefaultValues: Boolean, - ): Unit { + ) { val adapterContext = CompositeAdapterContext.Builder().customScalarAdapters(customScalarAdapters).build() writer.name("input") diff --git a/libraries/apollo-compiler/src/test/graphql/com/example/java8annotation/kotlin/responseBased/java8annotation/type/adapter/Login_InputAdapter.kt.expected b/libraries/apollo-compiler/src/test/graphql/com/example/java8annotation/kotlin/responseBased/java8annotation/type/adapter/Login_InputAdapter.kt.expected index e7b715f09bc..8eebfbf3e65 100644 --- a/libraries/apollo-compiler/src/test/graphql/com/example/java8annotation/kotlin/responseBased/java8annotation/type/adapter/Login_InputAdapter.kt.expected +++ b/libraries/apollo-compiler/src/test/graphql/com/example/java8annotation/kotlin/responseBased/java8annotation/type/adapter/Login_InputAdapter.kt.expected @@ -13,17 +13,16 @@ import com.apollographql.apollo3.api.json.JsonReader import com.apollographql.apollo3.api.json.JsonWriter import com.example.java8annotation.type.Login import kotlin.IllegalStateException -import kotlin.Unit public object Login_InputAdapter : CompositeAdapter { - public override fun fromJson(reader: JsonReader, adapterContext: CompositeAdapterContext): Login = - throw IllegalStateException("Input type used in output position") + override fun fromJson(reader: JsonReader, adapterContext: CompositeAdapterContext): Login = throw + IllegalStateException("Input type used in output position") - public override fun toJson( + override fun toJson( writer: JsonWriter, `value`: Login, adapterContext: CompositeAdapterContext, - ): Unit { + ) { writer.name("email") StringAdapter.toJson(writer, CustomScalarAdapters.Empty, value.email) } diff --git a/libraries/apollo-compiler/src/test/graphql/com/example/java_android_annotations/kotlin/responseBased/java_android_annotations/MyQuery.kt.expected b/libraries/apollo-compiler/src/test/graphql/com/example/java_android_annotations/kotlin/responseBased/java_android_annotations/MyQuery.kt.expected index 79ac15f2cb3..8358e230994 100644 --- a/libraries/apollo-compiler/src/test/graphql/com/example/java_android_annotations/kotlin/responseBased/java_android_annotations/MyQuery.kt.expected +++ b/libraries/apollo-compiler/src/test/graphql/com/example/java_android_annotations/kotlin/responseBased/java_android_annotations/MyQuery.kt.expected @@ -20,8 +20,8 @@ import com.example.java_android_annotations.type.MyInput import kotlin.Boolean import kotlin.Int import kotlin.String -import kotlin.Unit import kotlin.collections.List +import com.example.java_android_annotations.type.Query as CompiledQuery public data class MyQuery( public val nullableInt: Optional = Optional.Absent, @@ -31,26 +31,26 @@ public data class MyQuery( public val nonNullableInput: MyInput, public val nonNullableInputWithDefault: Optional = Optional.Absent, ) : Query { - public override fun id(): String = OPERATION_ID + override fun id(): String = OPERATION_ID - public override fun document(): String = OPERATION_DOCUMENT + override fun document(): String = OPERATION_DOCUMENT - public override fun name(): String = OPERATION_NAME + override fun name(): String = OPERATION_NAME - public override fun serializeVariables( + override fun serializeVariables( writer: JsonWriter, customScalarAdapters: CustomScalarAdapters, withBooleanDefaultValues: Boolean, - ): Unit { + ) { MyQuery_VariablesAdapter.serializeVariables(writer, this, customScalarAdapters, withBooleanDefaultValues) } - public override fun adapter(): CompositeAdapter = MyQuery_ResponseAdapter.Data.obj() + override fun adapter(): CompositeAdapter = MyQuery_ResponseAdapter.Data.obj() - public override fun rootField(): CompiledField = CompiledField.Builder( + override fun rootField(): CompiledField = CompiledField.Builder( name = "data", - type = com.example.java_android_annotations.type.Query.type + type = CompiledQuery.type ) .selections(selections = MyQuerySelections.__root) .build() diff --git a/libraries/apollo-compiler/src/test/graphql/com/example/java_android_annotations/kotlin/responseBased/java_android_annotations/adapter/MyQuery_ResponseAdapter.kt.expected b/libraries/apollo-compiler/src/test/graphql/com/example/java_android_annotations/kotlin/responseBased/java_android_annotations/adapter/MyQuery_ResponseAdapter.kt.expected index 8b69bd0924f..6ba60e3478e 100644 --- a/libraries/apollo-compiler/src/test/graphql/com/example/java_android_annotations/kotlin/responseBased/java_android_annotations/adapter/MyQuery_ResponseAdapter.kt.expected +++ b/libraries/apollo-compiler/src/test/graphql/com/example/java_android_annotations/kotlin/responseBased/java_android_annotations/adapter/MyQuery_ResponseAdapter.kt.expected @@ -20,7 +20,6 @@ import com.apollographql.apollo3.api.obj import com.example.java_android_annotations.MyQuery import kotlin.Int import kotlin.String -import kotlin.Unit import kotlin.collections.List public object MyQuery_ResponseAdapter { @@ -29,7 +28,7 @@ public object MyQuery_ResponseAdapter { "nullableMyType", "nonNullableMyType", "nullableListOfNullableString", "nullableListOfNonNullableString") - public override fun fromJson(reader: JsonReader, adapterContext: CompositeAdapterContext): + override fun fromJson(reader: JsonReader, adapterContext: CompositeAdapterContext): MyQuery.Data { var _nullableInt: Int? = null var _nonNullableInt: Int? = null @@ -60,11 +59,11 @@ public object MyQuery_ResponseAdapter { ) } - public override fun toJson( + override fun toJson( writer: JsonWriter, `value`: MyQuery.Data, adapterContext: CompositeAdapterContext, - ): Unit { + ) { writer.name("nullableInt") NullableIntAdapter.toJson(writer, CustomScalarAdapters.Empty, value.nullableInt) @@ -89,7 +88,7 @@ public object MyQuery_ResponseAdapter { private object NullableMyType : CompositeAdapter { public val RESPONSE_NAMES: List = listOf("nullableInt", "nonNullableInt") - public override fun fromJson(reader: JsonReader, adapterContext: CompositeAdapterContext): + override fun fromJson(reader: JsonReader, adapterContext: CompositeAdapterContext): MyQuery.Data.NullableMyType { var _nullableInt: Int? = null var _nonNullableInt: Int? = null @@ -108,11 +107,11 @@ public object MyQuery_ResponseAdapter { ) } - public override fun toJson( + override fun toJson( writer: JsonWriter, `value`: MyQuery.Data.NullableMyType, adapterContext: CompositeAdapterContext, - ): Unit { + ) { writer.name("nullableInt") NullableIntAdapter.toJson(writer, CustomScalarAdapters.Empty, value.nullableInt) @@ -124,7 +123,7 @@ public object MyQuery_ResponseAdapter { private object NonNullableMyType : CompositeAdapter { public val RESPONSE_NAMES: List = listOf("nullableInt", "nonNullableInt") - public override fun fromJson(reader: JsonReader, adapterContext: CompositeAdapterContext): + override fun fromJson(reader: JsonReader, adapterContext: CompositeAdapterContext): MyQuery.Data.NonNullableMyType { var _nullableInt: Int? = null var _nonNullableInt: Int? = null @@ -143,11 +142,11 @@ public object MyQuery_ResponseAdapter { ) } - public override fun toJson( + override fun toJson( writer: JsonWriter, `value`: MyQuery.Data.NonNullableMyType, adapterContext: CompositeAdapterContext, - ): Unit { + ) { writer.name("nullableInt") NullableIntAdapter.toJson(writer, CustomScalarAdapters.Empty, value.nullableInt) diff --git a/libraries/apollo-compiler/src/test/graphql/com/example/java_android_annotations/kotlin/responseBased/java_android_annotations/adapter/MyQuery_VariablesAdapter.kt.expected b/libraries/apollo-compiler/src/test/graphql/com/example/java_android_annotations/kotlin/responseBased/java_android_annotations/adapter/MyQuery_VariablesAdapter.kt.expected index e475fa94c19..69b2db4715b 100644 --- a/libraries/apollo-compiler/src/test/graphql/com/example/java_android_annotations/kotlin/responseBased/java_android_annotations/adapter/MyQuery_VariablesAdapter.kt.expected +++ b/libraries/apollo-compiler/src/test/graphql/com/example/java_android_annotations/kotlin/responseBased/java_android_annotations/adapter/MyQuery_VariablesAdapter.kt.expected @@ -18,7 +18,6 @@ import com.example.java_android_annotations.MyQuery import com.example.java_android_annotations.type.adapter.MyInput_InputAdapter import kotlin.Boolean import kotlin.Suppress -import kotlin.Unit public object MyQuery_VariablesAdapter { @Suppress( @@ -30,7 +29,7 @@ public object MyQuery_VariablesAdapter { `value`: MyQuery, customScalarAdapters: CustomScalarAdapters, withBooleanDefaultValues: Boolean, - ): Unit { + ) { val adapterContext = CompositeAdapterContext.Builder().customScalarAdapters(customScalarAdapters).build() if (value.nullableInt is Optional.Present) { diff --git a/libraries/apollo-compiler/src/test/graphql/com/example/java_android_annotations/kotlin/responseBased/java_android_annotations/type/adapter/MyInput_InputAdapter.kt.expected b/libraries/apollo-compiler/src/test/graphql/com/example/java_android_annotations/kotlin/responseBased/java_android_annotations/type/adapter/MyInput_InputAdapter.kt.expected index 1f6dd433461..1022e47e362 100644 --- a/libraries/apollo-compiler/src/test/graphql/com/example/java_android_annotations/kotlin/responseBased/java_android_annotations/type/adapter/MyInput_InputAdapter.kt.expected +++ b/libraries/apollo-compiler/src/test/graphql/com/example/java_android_annotations/kotlin/responseBased/java_android_annotations/type/adapter/MyInput_InputAdapter.kt.expected @@ -16,17 +16,16 @@ import com.apollographql.apollo3.api.json.JsonWriter import com.apollographql.apollo3.api.present import com.example.java_android_annotations.type.MyInput import kotlin.IllegalStateException -import kotlin.Unit public object MyInput_InputAdapter : CompositeAdapter { - public override fun fromJson(reader: JsonReader, adapterContext: CompositeAdapterContext): MyInput - = throw IllegalStateException("Input type used in output position") + override fun fromJson(reader: JsonReader, adapterContext: CompositeAdapterContext): MyInput = + throw IllegalStateException("Input type used in output position") - public override fun toJson( + override fun toJson( writer: JsonWriter, `value`: MyInput, adapterContext: CompositeAdapterContext, - ): Unit { + ) { if (value.nullableInt is Optional.Present) { writer.name("nullableInt") NullableIntAdapter.present().toJson(writer, CustomScalarAdapters.Empty, value.nullableInt) diff --git a/libraries/apollo-compiler/src/test/graphql/com/example/java_apollo_optionals/kotlin/responseBased/java_apollo_optionals/MyQuery.kt.expected b/libraries/apollo-compiler/src/test/graphql/com/example/java_apollo_optionals/kotlin/responseBased/java_apollo_optionals/MyQuery.kt.expected index d3ba9542f71..2c7fb6b0d84 100644 --- a/libraries/apollo-compiler/src/test/graphql/com/example/java_apollo_optionals/kotlin/responseBased/java_apollo_optionals/MyQuery.kt.expected +++ b/libraries/apollo-compiler/src/test/graphql/com/example/java_apollo_optionals/kotlin/responseBased/java_apollo_optionals/MyQuery.kt.expected @@ -20,8 +20,8 @@ import com.example.java_apollo_optionals.type.MyInput import kotlin.Boolean import kotlin.Int import kotlin.String -import kotlin.Unit import kotlin.collections.List +import com.example.java_apollo_optionals.type.Query as CompiledQuery public data class MyQuery( public val nullableInt: Optional = Optional.Absent, @@ -31,26 +31,26 @@ public data class MyQuery( public val nonNullableInput: MyInput, public val nonNullableInputWithDefault: Optional = Optional.Absent, ) : Query { - public override fun id(): String = OPERATION_ID + override fun id(): String = OPERATION_ID - public override fun document(): String = OPERATION_DOCUMENT + override fun document(): String = OPERATION_DOCUMENT - public override fun name(): String = OPERATION_NAME + override fun name(): String = OPERATION_NAME - public override fun serializeVariables( + override fun serializeVariables( writer: JsonWriter, customScalarAdapters: CustomScalarAdapters, withBooleanDefaultValues: Boolean, - ): Unit { + ) { MyQuery_VariablesAdapter.serializeVariables(writer, this, customScalarAdapters, withBooleanDefaultValues) } - public override fun adapter(): CompositeAdapter = MyQuery_ResponseAdapter.Data.obj() + override fun adapter(): CompositeAdapter = MyQuery_ResponseAdapter.Data.obj() - public override fun rootField(): CompiledField = CompiledField.Builder( + override fun rootField(): CompiledField = CompiledField.Builder( name = "data", - type = com.example.java_apollo_optionals.type.Query.type + type = CompiledQuery.type ) .selections(selections = MyQuerySelections.__root) .build() diff --git a/libraries/apollo-compiler/src/test/graphql/com/example/java_apollo_optionals/kotlin/responseBased/java_apollo_optionals/adapter/MyQuery_ResponseAdapter.kt.expected b/libraries/apollo-compiler/src/test/graphql/com/example/java_apollo_optionals/kotlin/responseBased/java_apollo_optionals/adapter/MyQuery_ResponseAdapter.kt.expected index 58fcc6de461..65f78249fbb 100644 --- a/libraries/apollo-compiler/src/test/graphql/com/example/java_apollo_optionals/kotlin/responseBased/java_apollo_optionals/adapter/MyQuery_ResponseAdapter.kt.expected +++ b/libraries/apollo-compiler/src/test/graphql/com/example/java_apollo_optionals/kotlin/responseBased/java_apollo_optionals/adapter/MyQuery_ResponseAdapter.kt.expected @@ -20,7 +20,6 @@ import com.apollographql.apollo3.api.obj import com.example.java_apollo_optionals.MyQuery import kotlin.Int import kotlin.String -import kotlin.Unit import kotlin.collections.List public object MyQuery_ResponseAdapter { @@ -29,7 +28,7 @@ public object MyQuery_ResponseAdapter { "nullableMyType", "nonNullableMyType", "nullableListOfNullableString", "nullableListOfNonNullableString") - public override fun fromJson(reader: JsonReader, adapterContext: CompositeAdapterContext): + override fun fromJson(reader: JsonReader, adapterContext: CompositeAdapterContext): MyQuery.Data { var _nullableInt: Int? = null var _nonNullableInt: Int? = null @@ -60,11 +59,11 @@ public object MyQuery_ResponseAdapter { ) } - public override fun toJson( + override fun toJson( writer: JsonWriter, `value`: MyQuery.Data, adapterContext: CompositeAdapterContext, - ): Unit { + ) { writer.name("nullableInt") NullableIntAdapter.toJson(writer, CustomScalarAdapters.Empty, value.nullableInt) @@ -89,7 +88,7 @@ public object MyQuery_ResponseAdapter { private object NullableMyType : CompositeAdapter { public val RESPONSE_NAMES: List = listOf("nullableInt", "nonNullableInt") - public override fun fromJson(reader: JsonReader, adapterContext: CompositeAdapterContext): + override fun fromJson(reader: JsonReader, adapterContext: CompositeAdapterContext): MyQuery.Data.NullableMyType { var _nullableInt: Int? = null var _nonNullableInt: Int? = null @@ -108,11 +107,11 @@ public object MyQuery_ResponseAdapter { ) } - public override fun toJson( + override fun toJson( writer: JsonWriter, `value`: MyQuery.Data.NullableMyType, adapterContext: CompositeAdapterContext, - ): Unit { + ) { writer.name("nullableInt") NullableIntAdapter.toJson(writer, CustomScalarAdapters.Empty, value.nullableInt) @@ -124,7 +123,7 @@ public object MyQuery_ResponseAdapter { private object NonNullableMyType : CompositeAdapter { public val RESPONSE_NAMES: List = listOf("nullableInt", "nonNullableInt") - public override fun fromJson(reader: JsonReader, adapterContext: CompositeAdapterContext): + override fun fromJson(reader: JsonReader, adapterContext: CompositeAdapterContext): MyQuery.Data.NonNullableMyType { var _nullableInt: Int? = null var _nonNullableInt: Int? = null @@ -143,11 +142,11 @@ public object MyQuery_ResponseAdapter { ) } - public override fun toJson( + override fun toJson( writer: JsonWriter, `value`: MyQuery.Data.NonNullableMyType, adapterContext: CompositeAdapterContext, - ): Unit { + ) { writer.name("nullableInt") NullableIntAdapter.toJson(writer, CustomScalarAdapters.Empty, value.nullableInt) diff --git a/libraries/apollo-compiler/src/test/graphql/com/example/java_apollo_optionals/kotlin/responseBased/java_apollo_optionals/adapter/MyQuery_VariablesAdapter.kt.expected b/libraries/apollo-compiler/src/test/graphql/com/example/java_apollo_optionals/kotlin/responseBased/java_apollo_optionals/adapter/MyQuery_VariablesAdapter.kt.expected index 11fe7c3ead1..0ed3570b6af 100644 --- a/libraries/apollo-compiler/src/test/graphql/com/example/java_apollo_optionals/kotlin/responseBased/java_apollo_optionals/adapter/MyQuery_VariablesAdapter.kt.expected +++ b/libraries/apollo-compiler/src/test/graphql/com/example/java_apollo_optionals/kotlin/responseBased/java_apollo_optionals/adapter/MyQuery_VariablesAdapter.kt.expected @@ -18,7 +18,6 @@ import com.example.java_apollo_optionals.MyQuery import com.example.java_apollo_optionals.type.adapter.MyInput_InputAdapter import kotlin.Boolean import kotlin.Suppress -import kotlin.Unit public object MyQuery_VariablesAdapter { @Suppress( @@ -30,7 +29,7 @@ public object MyQuery_VariablesAdapter { `value`: MyQuery, customScalarAdapters: CustomScalarAdapters, withBooleanDefaultValues: Boolean, - ): Unit { + ) { val adapterContext = CompositeAdapterContext.Builder().customScalarAdapters(customScalarAdapters).build() if (value.nullableInt is Optional.Present) { diff --git a/libraries/apollo-compiler/src/test/graphql/com/example/java_apollo_optionals/kotlin/responseBased/java_apollo_optionals/type/adapter/MyInput_InputAdapter.kt.expected b/libraries/apollo-compiler/src/test/graphql/com/example/java_apollo_optionals/kotlin/responseBased/java_apollo_optionals/type/adapter/MyInput_InputAdapter.kt.expected index 5d490f849a6..490a6bea334 100644 --- a/libraries/apollo-compiler/src/test/graphql/com/example/java_apollo_optionals/kotlin/responseBased/java_apollo_optionals/type/adapter/MyInput_InputAdapter.kt.expected +++ b/libraries/apollo-compiler/src/test/graphql/com/example/java_apollo_optionals/kotlin/responseBased/java_apollo_optionals/type/adapter/MyInput_InputAdapter.kt.expected @@ -16,17 +16,16 @@ import com.apollographql.apollo3.api.json.JsonWriter import com.apollographql.apollo3.api.present import com.example.java_apollo_optionals.type.MyInput import kotlin.IllegalStateException -import kotlin.Unit public object MyInput_InputAdapter : CompositeAdapter { - public override fun fromJson(reader: JsonReader, adapterContext: CompositeAdapterContext): MyInput - = throw IllegalStateException("Input type used in output position") + override fun fromJson(reader: JsonReader, adapterContext: CompositeAdapterContext): MyInput = + throw IllegalStateException("Input type used in output position") - public override fun toJson( + override fun toJson( writer: JsonWriter, `value`: MyInput, adapterContext: CompositeAdapterContext, - ): Unit { + ) { if (value.nullableInt is Optional.Present) { writer.name("nullableInt") NullableIntAdapter.present().toJson(writer, CustomScalarAdapters.Empty, value.nullableInt) diff --git a/libraries/apollo-compiler/src/test/graphql/com/example/java_guava_optionals/kotlin/responseBased/java_guava_optionals/MyQuery.kt.expected b/libraries/apollo-compiler/src/test/graphql/com/example/java_guava_optionals/kotlin/responseBased/java_guava_optionals/MyQuery.kt.expected index 0f9cfd25d47..c892fc37f84 100644 --- a/libraries/apollo-compiler/src/test/graphql/com/example/java_guava_optionals/kotlin/responseBased/java_guava_optionals/MyQuery.kt.expected +++ b/libraries/apollo-compiler/src/test/graphql/com/example/java_guava_optionals/kotlin/responseBased/java_guava_optionals/MyQuery.kt.expected @@ -20,8 +20,8 @@ import com.example.java_guava_optionals.type.MyInput import kotlin.Boolean import kotlin.Int import kotlin.String -import kotlin.Unit import kotlin.collections.List +import com.example.java_guava_optionals.type.Query as CompiledQuery public data class MyQuery( public val nullableInt: Optional = Optional.Absent, @@ -31,26 +31,26 @@ public data class MyQuery( public val nonNullableInput: MyInput, public val nonNullableInputWithDefault: Optional = Optional.Absent, ) : Query { - public override fun id(): String = OPERATION_ID + override fun id(): String = OPERATION_ID - public override fun document(): String = OPERATION_DOCUMENT + override fun document(): String = OPERATION_DOCUMENT - public override fun name(): String = OPERATION_NAME + override fun name(): String = OPERATION_NAME - public override fun serializeVariables( + override fun serializeVariables( writer: JsonWriter, customScalarAdapters: CustomScalarAdapters, withBooleanDefaultValues: Boolean, - ): Unit { + ) { MyQuery_VariablesAdapter.serializeVariables(writer, this, customScalarAdapters, withBooleanDefaultValues) } - public override fun adapter(): CompositeAdapter = MyQuery_ResponseAdapter.Data.obj() + override fun adapter(): CompositeAdapter = MyQuery_ResponseAdapter.Data.obj() - public override fun rootField(): CompiledField = CompiledField.Builder( + override fun rootField(): CompiledField = CompiledField.Builder( name = "data", - type = com.example.java_guava_optionals.type.Query.type + type = CompiledQuery.type ) .selections(selections = MyQuerySelections.__root) .build() diff --git a/libraries/apollo-compiler/src/test/graphql/com/example/java_guava_optionals/kotlin/responseBased/java_guava_optionals/adapter/MyQuery_ResponseAdapter.kt.expected b/libraries/apollo-compiler/src/test/graphql/com/example/java_guava_optionals/kotlin/responseBased/java_guava_optionals/adapter/MyQuery_ResponseAdapter.kt.expected index 479a34018bf..1e4eb974722 100644 --- a/libraries/apollo-compiler/src/test/graphql/com/example/java_guava_optionals/kotlin/responseBased/java_guava_optionals/adapter/MyQuery_ResponseAdapter.kt.expected +++ b/libraries/apollo-compiler/src/test/graphql/com/example/java_guava_optionals/kotlin/responseBased/java_guava_optionals/adapter/MyQuery_ResponseAdapter.kt.expected @@ -20,7 +20,6 @@ import com.apollographql.apollo3.api.obj import com.example.java_guava_optionals.MyQuery import kotlin.Int import kotlin.String -import kotlin.Unit import kotlin.collections.List public object MyQuery_ResponseAdapter { @@ -29,7 +28,7 @@ public object MyQuery_ResponseAdapter { "nullableMyType", "nonNullableMyType", "nullableListOfNullableString", "nullableListOfNonNullableString") - public override fun fromJson(reader: JsonReader, adapterContext: CompositeAdapterContext): + override fun fromJson(reader: JsonReader, adapterContext: CompositeAdapterContext): MyQuery.Data { var _nullableInt: Int? = null var _nonNullableInt: Int? = null @@ -60,11 +59,11 @@ public object MyQuery_ResponseAdapter { ) } - public override fun toJson( + override fun toJson( writer: JsonWriter, `value`: MyQuery.Data, adapterContext: CompositeAdapterContext, - ): Unit { + ) { writer.name("nullableInt") NullableIntAdapter.toJson(writer, CustomScalarAdapters.Empty, value.nullableInt) @@ -89,7 +88,7 @@ public object MyQuery_ResponseAdapter { private object NullableMyType : CompositeAdapter { public val RESPONSE_NAMES: List = listOf("nullableInt", "nonNullableInt") - public override fun fromJson(reader: JsonReader, adapterContext: CompositeAdapterContext): + override fun fromJson(reader: JsonReader, adapterContext: CompositeAdapterContext): MyQuery.Data.NullableMyType { var _nullableInt: Int? = null var _nonNullableInt: Int? = null @@ -108,11 +107,11 @@ public object MyQuery_ResponseAdapter { ) } - public override fun toJson( + override fun toJson( writer: JsonWriter, `value`: MyQuery.Data.NullableMyType, adapterContext: CompositeAdapterContext, - ): Unit { + ) { writer.name("nullableInt") NullableIntAdapter.toJson(writer, CustomScalarAdapters.Empty, value.nullableInt) @@ -124,7 +123,7 @@ public object MyQuery_ResponseAdapter { private object NonNullableMyType : CompositeAdapter { public val RESPONSE_NAMES: List = listOf("nullableInt", "nonNullableInt") - public override fun fromJson(reader: JsonReader, adapterContext: CompositeAdapterContext): + override fun fromJson(reader: JsonReader, adapterContext: CompositeAdapterContext): MyQuery.Data.NonNullableMyType { var _nullableInt: Int? = null var _nonNullableInt: Int? = null @@ -143,11 +142,11 @@ public object MyQuery_ResponseAdapter { ) } - public override fun toJson( + override fun toJson( writer: JsonWriter, `value`: MyQuery.Data.NonNullableMyType, adapterContext: CompositeAdapterContext, - ): Unit { + ) { writer.name("nullableInt") NullableIntAdapter.toJson(writer, CustomScalarAdapters.Empty, value.nullableInt) diff --git a/libraries/apollo-compiler/src/test/graphql/com/example/java_guava_optionals/kotlin/responseBased/java_guava_optionals/adapter/MyQuery_VariablesAdapter.kt.expected b/libraries/apollo-compiler/src/test/graphql/com/example/java_guava_optionals/kotlin/responseBased/java_guava_optionals/adapter/MyQuery_VariablesAdapter.kt.expected index 53b1d687ee1..dc7f2c3bb3a 100644 --- a/libraries/apollo-compiler/src/test/graphql/com/example/java_guava_optionals/kotlin/responseBased/java_guava_optionals/adapter/MyQuery_VariablesAdapter.kt.expected +++ b/libraries/apollo-compiler/src/test/graphql/com/example/java_guava_optionals/kotlin/responseBased/java_guava_optionals/adapter/MyQuery_VariablesAdapter.kt.expected @@ -18,7 +18,6 @@ import com.example.java_guava_optionals.MyQuery import com.example.java_guava_optionals.type.adapter.MyInput_InputAdapter import kotlin.Boolean import kotlin.Suppress -import kotlin.Unit public object MyQuery_VariablesAdapter { @Suppress( @@ -30,7 +29,7 @@ public object MyQuery_VariablesAdapter { `value`: MyQuery, customScalarAdapters: CustomScalarAdapters, withBooleanDefaultValues: Boolean, - ): Unit { + ) { val adapterContext = CompositeAdapterContext.Builder().customScalarAdapters(customScalarAdapters).build() if (value.nullableInt is Optional.Present) { diff --git a/libraries/apollo-compiler/src/test/graphql/com/example/java_guava_optionals/kotlin/responseBased/java_guava_optionals/type/adapter/MyInput_InputAdapter.kt.expected b/libraries/apollo-compiler/src/test/graphql/com/example/java_guava_optionals/kotlin/responseBased/java_guava_optionals/type/adapter/MyInput_InputAdapter.kt.expected index 85abea98467..ab3cc0bc2bf 100644 --- a/libraries/apollo-compiler/src/test/graphql/com/example/java_guava_optionals/kotlin/responseBased/java_guava_optionals/type/adapter/MyInput_InputAdapter.kt.expected +++ b/libraries/apollo-compiler/src/test/graphql/com/example/java_guava_optionals/kotlin/responseBased/java_guava_optionals/type/adapter/MyInput_InputAdapter.kt.expected @@ -16,17 +16,16 @@ import com.apollographql.apollo3.api.json.JsonWriter import com.apollographql.apollo3.api.present import com.example.java_guava_optionals.type.MyInput import kotlin.IllegalStateException -import kotlin.Unit public object MyInput_InputAdapter : CompositeAdapter { - public override fun fromJson(reader: JsonReader, adapterContext: CompositeAdapterContext): MyInput - = throw IllegalStateException("Input type used in output position") + override fun fromJson(reader: JsonReader, adapterContext: CompositeAdapterContext): MyInput = + throw IllegalStateException("Input type used in output position") - public override fun toJson( + override fun toJson( writer: JsonWriter, `value`: MyInput, adapterContext: CompositeAdapterContext, - ): Unit { + ) { if (value.nullableInt is Optional.Present) { writer.name("nullableInt") NullableIntAdapter.present().toJson(writer, CustomScalarAdapters.Empty, value.nullableInt) diff --git a/libraries/apollo-compiler/src/test/graphql/com/example/java_hashcode/kotlin/responseBased/java_hashcode/TestQuery.kt.expected b/libraries/apollo-compiler/src/test/graphql/com/example/java_hashcode/kotlin/responseBased/java_hashcode/TestQuery.kt.expected index 15d20de4db9..c29468a6658 100644 --- a/libraries/apollo-compiler/src/test/graphql/com/example/java_hashcode/kotlin/responseBased/java_hashcode/TestQuery.kt.expected +++ b/libraries/apollo-compiler/src/test/graphql/com/example/java_hashcode/kotlin/responseBased/java_hashcode/TestQuery.kt.expected @@ -18,32 +18,32 @@ import kotlin.Any import kotlin.Boolean import kotlin.Int import kotlin.String -import kotlin.Unit +import com.example.java_hashcode.type.Query as CompiledQuery public class TestQuery() : Query { - public override fun equals(other: Any?): Boolean = other != null && other::class == this::class + override fun equals(other: Any?): Boolean = other != null && other::class == this::class - public override fun hashCode(): Int = this::class.hashCode() + override fun hashCode(): Int = this::class.hashCode() - public override fun id(): String = OPERATION_ID + override fun id(): String = OPERATION_ID - public override fun document(): String = OPERATION_DOCUMENT + override fun document(): String = OPERATION_DOCUMENT - public override fun name(): String = OPERATION_NAME + override fun name(): String = OPERATION_NAME - public override fun serializeVariables( + override fun serializeVariables( writer: JsonWriter, customScalarAdapters: CustomScalarAdapters, withBooleanDefaultValues: Boolean, - ): Unit { + ) { // This operation doesn't have any variable } - public override fun adapter(): CompositeAdapter = TestQuery_ResponseAdapter.Data.obj() + override fun adapter(): CompositeAdapter = TestQuery_ResponseAdapter.Data.obj() - public override fun rootField(): CompiledField = CompiledField.Builder( + override fun rootField(): CompiledField = CompiledField.Builder( name = "data", - type = com.example.java_hashcode.type.Query.type + type = CompiledQuery.type ) .selections(selections = TestQuerySelections.__root) .build() diff --git a/libraries/apollo-compiler/src/test/graphql/com/example/java_hashcode/kotlin/responseBased/java_hashcode/adapter/TestQuery_ResponseAdapter.kt.expected b/libraries/apollo-compiler/src/test/graphql/com/example/java_hashcode/kotlin/responseBased/java_hashcode/adapter/TestQuery_ResponseAdapter.kt.expected index 11bb8522ef8..0608c760b0d 100644 --- a/libraries/apollo-compiler/src/test/graphql/com/example/java_hashcode/kotlin/responseBased/java_hashcode/adapter/TestQuery_ResponseAdapter.kt.expected +++ b/libraries/apollo-compiler/src/test/graphql/com/example/java_hashcode/kotlin/responseBased/java_hashcode/adapter/TestQuery_ResponseAdapter.kt.expected @@ -14,14 +14,13 @@ import com.apollographql.apollo3.api.json.JsonWriter import com.example.java_hashcode.TestQuery import kotlin.Int import kotlin.String -import kotlin.Unit import kotlin.collections.List public object TestQuery_ResponseAdapter { public object Data : CompositeAdapter { public val RESPONSE_NAMES: List = listOf("h") - public override fun fromJson(reader: JsonReader, adapterContext: CompositeAdapterContext): + override fun fromJson(reader: JsonReader, adapterContext: CompositeAdapterContext): TestQuery.Data { var _h: Int? = null @@ -37,11 +36,11 @@ public object TestQuery_ResponseAdapter { ) } - public override fun toJson( + override fun toJson( writer: JsonWriter, `value`: TestQuery.Data, adapterContext: CompositeAdapterContext, - ): Unit { + ) { writer.name("h") NullableIntAdapter.toJson(writer, CustomScalarAdapters.Empty, value.h) } diff --git a/libraries/apollo-compiler/src/test/graphql/com/example/java_java_optionals/kotlin/responseBased/java_java_optionals/MyQuery.kt.expected b/libraries/apollo-compiler/src/test/graphql/com/example/java_java_optionals/kotlin/responseBased/java_java_optionals/MyQuery.kt.expected index ddfc3b06478..63aa31060ae 100644 --- a/libraries/apollo-compiler/src/test/graphql/com/example/java_java_optionals/kotlin/responseBased/java_java_optionals/MyQuery.kt.expected +++ b/libraries/apollo-compiler/src/test/graphql/com/example/java_java_optionals/kotlin/responseBased/java_java_optionals/MyQuery.kt.expected @@ -20,8 +20,8 @@ import com.example.java_java_optionals.type.MyInput import kotlin.Boolean import kotlin.Int import kotlin.String -import kotlin.Unit import kotlin.collections.List +import com.example.java_java_optionals.type.Query as CompiledQuery public data class MyQuery( public val nullableInt: Optional = Optional.Absent, @@ -31,26 +31,26 @@ public data class MyQuery( public val nonNullableInput: MyInput, public val nonNullableInputWithDefault: Optional = Optional.Absent, ) : Query { - public override fun id(): String = OPERATION_ID + override fun id(): String = OPERATION_ID - public override fun document(): String = OPERATION_DOCUMENT + override fun document(): String = OPERATION_DOCUMENT - public override fun name(): String = OPERATION_NAME + override fun name(): String = OPERATION_NAME - public override fun serializeVariables( + override fun serializeVariables( writer: JsonWriter, customScalarAdapters: CustomScalarAdapters, withBooleanDefaultValues: Boolean, - ): Unit { + ) { MyQuery_VariablesAdapter.serializeVariables(writer, this, customScalarAdapters, withBooleanDefaultValues) } - public override fun adapter(): CompositeAdapter = MyQuery_ResponseAdapter.Data.obj() + override fun adapter(): CompositeAdapter = MyQuery_ResponseAdapter.Data.obj() - public override fun rootField(): CompiledField = CompiledField.Builder( + override fun rootField(): CompiledField = CompiledField.Builder( name = "data", - type = com.example.java_java_optionals.type.Query.type + type = CompiledQuery.type ) .selections(selections = MyQuerySelections.__root) .build() diff --git a/libraries/apollo-compiler/src/test/graphql/com/example/java_java_optionals/kotlin/responseBased/java_java_optionals/adapter/MyQuery_ResponseAdapter.kt.expected b/libraries/apollo-compiler/src/test/graphql/com/example/java_java_optionals/kotlin/responseBased/java_java_optionals/adapter/MyQuery_ResponseAdapter.kt.expected index 128ddcb573f..715b1f262c2 100644 --- a/libraries/apollo-compiler/src/test/graphql/com/example/java_java_optionals/kotlin/responseBased/java_java_optionals/adapter/MyQuery_ResponseAdapter.kt.expected +++ b/libraries/apollo-compiler/src/test/graphql/com/example/java_java_optionals/kotlin/responseBased/java_java_optionals/adapter/MyQuery_ResponseAdapter.kt.expected @@ -20,7 +20,6 @@ import com.apollographql.apollo3.api.obj import com.example.java_java_optionals.MyQuery import kotlin.Int import kotlin.String -import kotlin.Unit import kotlin.collections.List public object MyQuery_ResponseAdapter { @@ -29,7 +28,7 @@ public object MyQuery_ResponseAdapter { "nullableMyType", "nonNullableMyType", "nullableListOfNullableString", "nullableListOfNonNullableString") - public override fun fromJson(reader: JsonReader, adapterContext: CompositeAdapterContext): + override fun fromJson(reader: JsonReader, adapterContext: CompositeAdapterContext): MyQuery.Data { var _nullableInt: Int? = null var _nonNullableInt: Int? = null @@ -60,11 +59,11 @@ public object MyQuery_ResponseAdapter { ) } - public override fun toJson( + override fun toJson( writer: JsonWriter, `value`: MyQuery.Data, adapterContext: CompositeAdapterContext, - ): Unit { + ) { writer.name("nullableInt") NullableIntAdapter.toJson(writer, CustomScalarAdapters.Empty, value.nullableInt) @@ -89,7 +88,7 @@ public object MyQuery_ResponseAdapter { private object NullableMyType : CompositeAdapter { public val RESPONSE_NAMES: List = listOf("nullableInt", "nonNullableInt") - public override fun fromJson(reader: JsonReader, adapterContext: CompositeAdapterContext): + override fun fromJson(reader: JsonReader, adapterContext: CompositeAdapterContext): MyQuery.Data.NullableMyType { var _nullableInt: Int? = null var _nonNullableInt: Int? = null @@ -108,11 +107,11 @@ public object MyQuery_ResponseAdapter { ) } - public override fun toJson( + override fun toJson( writer: JsonWriter, `value`: MyQuery.Data.NullableMyType, adapterContext: CompositeAdapterContext, - ): Unit { + ) { writer.name("nullableInt") NullableIntAdapter.toJson(writer, CustomScalarAdapters.Empty, value.nullableInt) @@ -124,7 +123,7 @@ public object MyQuery_ResponseAdapter { private object NonNullableMyType : CompositeAdapter { public val RESPONSE_NAMES: List = listOf("nullableInt", "nonNullableInt") - public override fun fromJson(reader: JsonReader, adapterContext: CompositeAdapterContext): + override fun fromJson(reader: JsonReader, adapterContext: CompositeAdapterContext): MyQuery.Data.NonNullableMyType { var _nullableInt: Int? = null var _nonNullableInt: Int? = null @@ -143,11 +142,11 @@ public object MyQuery_ResponseAdapter { ) } - public override fun toJson( + override fun toJson( writer: JsonWriter, `value`: MyQuery.Data.NonNullableMyType, adapterContext: CompositeAdapterContext, - ): Unit { + ) { writer.name("nullableInt") NullableIntAdapter.toJson(writer, CustomScalarAdapters.Empty, value.nullableInt) diff --git a/libraries/apollo-compiler/src/test/graphql/com/example/java_java_optionals/kotlin/responseBased/java_java_optionals/adapter/MyQuery_VariablesAdapter.kt.expected b/libraries/apollo-compiler/src/test/graphql/com/example/java_java_optionals/kotlin/responseBased/java_java_optionals/adapter/MyQuery_VariablesAdapter.kt.expected index 74c9d812010..40a390f95b7 100644 --- a/libraries/apollo-compiler/src/test/graphql/com/example/java_java_optionals/kotlin/responseBased/java_java_optionals/adapter/MyQuery_VariablesAdapter.kt.expected +++ b/libraries/apollo-compiler/src/test/graphql/com/example/java_java_optionals/kotlin/responseBased/java_java_optionals/adapter/MyQuery_VariablesAdapter.kt.expected @@ -18,7 +18,6 @@ import com.example.java_java_optionals.MyQuery import com.example.java_java_optionals.type.adapter.MyInput_InputAdapter import kotlin.Boolean import kotlin.Suppress -import kotlin.Unit public object MyQuery_VariablesAdapter { @Suppress( @@ -30,7 +29,7 @@ public object MyQuery_VariablesAdapter { `value`: MyQuery, customScalarAdapters: CustomScalarAdapters, withBooleanDefaultValues: Boolean, - ): Unit { + ) { val adapterContext = CompositeAdapterContext.Builder().customScalarAdapters(customScalarAdapters).build() if (value.nullableInt is Optional.Present) { diff --git a/libraries/apollo-compiler/src/test/graphql/com/example/java_java_optionals/kotlin/responseBased/java_java_optionals/type/adapter/MyInput_InputAdapter.kt.expected b/libraries/apollo-compiler/src/test/graphql/com/example/java_java_optionals/kotlin/responseBased/java_java_optionals/type/adapter/MyInput_InputAdapter.kt.expected index faa9329508f..d2c97c94a9b 100644 --- a/libraries/apollo-compiler/src/test/graphql/com/example/java_java_optionals/kotlin/responseBased/java_java_optionals/type/adapter/MyInput_InputAdapter.kt.expected +++ b/libraries/apollo-compiler/src/test/graphql/com/example/java_java_optionals/kotlin/responseBased/java_java_optionals/type/adapter/MyInput_InputAdapter.kt.expected @@ -16,17 +16,16 @@ import com.apollographql.apollo3.api.json.JsonWriter import com.apollographql.apollo3.api.present import com.example.java_java_optionals.type.MyInput import kotlin.IllegalStateException -import kotlin.Unit public object MyInput_InputAdapter : CompositeAdapter { - public override fun fromJson(reader: JsonReader, adapterContext: CompositeAdapterContext): MyInput - = throw IllegalStateException("Input type used in output position") + override fun fromJson(reader: JsonReader, adapterContext: CompositeAdapterContext): MyInput = + throw IllegalStateException("Input type used in output position") - public override fun toJson( + override fun toJson( writer: JsonWriter, `value`: MyInput, adapterContext: CompositeAdapterContext, - ): Unit { + ) { if (value.nullableInt is Optional.Present) { writer.name("nullableInt") NullableIntAdapter.present().toJson(writer, CustomScalarAdapters.Empty, value.nullableInt) diff --git a/libraries/apollo-compiler/src/test/graphql/com/example/java_jetbrains_annotations/kotlin/responseBased/java_jetbrains_annotations/MyQuery.kt.expected b/libraries/apollo-compiler/src/test/graphql/com/example/java_jetbrains_annotations/kotlin/responseBased/java_jetbrains_annotations/MyQuery.kt.expected index e4eabc07e9a..32542c8110d 100644 --- a/libraries/apollo-compiler/src/test/graphql/com/example/java_jetbrains_annotations/kotlin/responseBased/java_jetbrains_annotations/MyQuery.kt.expected +++ b/libraries/apollo-compiler/src/test/graphql/com/example/java_jetbrains_annotations/kotlin/responseBased/java_jetbrains_annotations/MyQuery.kt.expected @@ -20,8 +20,8 @@ import com.example.java_jetbrains_annotations.type.MyInput import kotlin.Boolean import kotlin.Int import kotlin.String -import kotlin.Unit import kotlin.collections.List +import com.example.java_jetbrains_annotations.type.Query as CompiledQuery public data class MyQuery( public val nullableInt: Optional = Optional.Absent, @@ -31,26 +31,26 @@ public data class MyQuery( public val nonNullableInput: MyInput, public val nonNullableInputWithDefault: Optional = Optional.Absent, ) : Query { - public override fun id(): String = OPERATION_ID + override fun id(): String = OPERATION_ID - public override fun document(): String = OPERATION_DOCUMENT + override fun document(): String = OPERATION_DOCUMENT - public override fun name(): String = OPERATION_NAME + override fun name(): String = OPERATION_NAME - public override fun serializeVariables( + override fun serializeVariables( writer: JsonWriter, customScalarAdapters: CustomScalarAdapters, withBooleanDefaultValues: Boolean, - ): Unit { + ) { MyQuery_VariablesAdapter.serializeVariables(writer, this, customScalarAdapters, withBooleanDefaultValues) } - public override fun adapter(): CompositeAdapter = MyQuery_ResponseAdapter.Data.obj() + override fun adapter(): CompositeAdapter = MyQuery_ResponseAdapter.Data.obj() - public override fun rootField(): CompiledField = CompiledField.Builder( + override fun rootField(): CompiledField = CompiledField.Builder( name = "data", - type = com.example.java_jetbrains_annotations.type.Query.type + type = CompiledQuery.type ) .selections(selections = MyQuerySelections.__root) .build() diff --git a/libraries/apollo-compiler/src/test/graphql/com/example/java_jetbrains_annotations/kotlin/responseBased/java_jetbrains_annotations/adapter/MyQuery_ResponseAdapter.kt.expected b/libraries/apollo-compiler/src/test/graphql/com/example/java_jetbrains_annotations/kotlin/responseBased/java_jetbrains_annotations/adapter/MyQuery_ResponseAdapter.kt.expected index 818bae91c69..44eb5045f41 100644 --- a/libraries/apollo-compiler/src/test/graphql/com/example/java_jetbrains_annotations/kotlin/responseBased/java_jetbrains_annotations/adapter/MyQuery_ResponseAdapter.kt.expected +++ b/libraries/apollo-compiler/src/test/graphql/com/example/java_jetbrains_annotations/kotlin/responseBased/java_jetbrains_annotations/adapter/MyQuery_ResponseAdapter.kt.expected @@ -20,7 +20,6 @@ import com.apollographql.apollo3.api.obj import com.example.java_jetbrains_annotations.MyQuery import kotlin.Int import kotlin.String -import kotlin.Unit import kotlin.collections.List public object MyQuery_ResponseAdapter { @@ -29,7 +28,7 @@ public object MyQuery_ResponseAdapter { "nullableMyType", "nonNullableMyType", "nullableListOfNullableString", "nullableListOfNonNullableString") - public override fun fromJson(reader: JsonReader, adapterContext: CompositeAdapterContext): + override fun fromJson(reader: JsonReader, adapterContext: CompositeAdapterContext): MyQuery.Data { var _nullableInt: Int? = null var _nonNullableInt: Int? = null @@ -60,11 +59,11 @@ public object MyQuery_ResponseAdapter { ) } - public override fun toJson( + override fun toJson( writer: JsonWriter, `value`: MyQuery.Data, adapterContext: CompositeAdapterContext, - ): Unit { + ) { writer.name("nullableInt") NullableIntAdapter.toJson(writer, CustomScalarAdapters.Empty, value.nullableInt) @@ -89,7 +88,7 @@ public object MyQuery_ResponseAdapter { private object NullableMyType : CompositeAdapter { public val RESPONSE_NAMES: List = listOf("nullableInt", "nonNullableInt") - public override fun fromJson(reader: JsonReader, adapterContext: CompositeAdapterContext): + override fun fromJson(reader: JsonReader, adapterContext: CompositeAdapterContext): MyQuery.Data.NullableMyType { var _nullableInt: Int? = null var _nonNullableInt: Int? = null @@ -108,11 +107,11 @@ public object MyQuery_ResponseAdapter { ) } - public override fun toJson( + override fun toJson( writer: JsonWriter, `value`: MyQuery.Data.NullableMyType, adapterContext: CompositeAdapterContext, - ): Unit { + ) { writer.name("nullableInt") NullableIntAdapter.toJson(writer, CustomScalarAdapters.Empty, value.nullableInt) @@ -124,7 +123,7 @@ public object MyQuery_ResponseAdapter { private object NonNullableMyType : CompositeAdapter { public val RESPONSE_NAMES: List = listOf("nullableInt", "nonNullableInt") - public override fun fromJson(reader: JsonReader, adapterContext: CompositeAdapterContext): + override fun fromJson(reader: JsonReader, adapterContext: CompositeAdapterContext): MyQuery.Data.NonNullableMyType { var _nullableInt: Int? = null var _nonNullableInt: Int? = null @@ -143,11 +142,11 @@ public object MyQuery_ResponseAdapter { ) } - public override fun toJson( + override fun toJson( writer: JsonWriter, `value`: MyQuery.Data.NonNullableMyType, adapterContext: CompositeAdapterContext, - ): Unit { + ) { writer.name("nullableInt") NullableIntAdapter.toJson(writer, CustomScalarAdapters.Empty, value.nullableInt) diff --git a/libraries/apollo-compiler/src/test/graphql/com/example/java_jetbrains_annotations/kotlin/responseBased/java_jetbrains_annotations/adapter/MyQuery_VariablesAdapter.kt.expected b/libraries/apollo-compiler/src/test/graphql/com/example/java_jetbrains_annotations/kotlin/responseBased/java_jetbrains_annotations/adapter/MyQuery_VariablesAdapter.kt.expected index 34cc6dd668e..51f6a97e194 100644 --- a/libraries/apollo-compiler/src/test/graphql/com/example/java_jetbrains_annotations/kotlin/responseBased/java_jetbrains_annotations/adapter/MyQuery_VariablesAdapter.kt.expected +++ b/libraries/apollo-compiler/src/test/graphql/com/example/java_jetbrains_annotations/kotlin/responseBased/java_jetbrains_annotations/adapter/MyQuery_VariablesAdapter.kt.expected @@ -18,7 +18,6 @@ import com.example.java_jetbrains_annotations.MyQuery import com.example.java_jetbrains_annotations.type.adapter.MyInput_InputAdapter import kotlin.Boolean import kotlin.Suppress -import kotlin.Unit public object MyQuery_VariablesAdapter { @Suppress( @@ -30,7 +29,7 @@ public object MyQuery_VariablesAdapter { `value`: MyQuery, customScalarAdapters: CustomScalarAdapters, withBooleanDefaultValues: Boolean, - ): Unit { + ) { val adapterContext = CompositeAdapterContext.Builder().customScalarAdapters(customScalarAdapters).build() if (value.nullableInt is Optional.Present) { diff --git a/libraries/apollo-compiler/src/test/graphql/com/example/java_jetbrains_annotations/kotlin/responseBased/java_jetbrains_annotations/type/adapter/MyInput_InputAdapter.kt.expected b/libraries/apollo-compiler/src/test/graphql/com/example/java_jetbrains_annotations/kotlin/responseBased/java_jetbrains_annotations/type/adapter/MyInput_InputAdapter.kt.expected index a6639a9997c..2340154326f 100644 --- a/libraries/apollo-compiler/src/test/graphql/com/example/java_jetbrains_annotations/kotlin/responseBased/java_jetbrains_annotations/type/adapter/MyInput_InputAdapter.kt.expected +++ b/libraries/apollo-compiler/src/test/graphql/com/example/java_jetbrains_annotations/kotlin/responseBased/java_jetbrains_annotations/type/adapter/MyInput_InputAdapter.kt.expected @@ -16,17 +16,16 @@ import com.apollographql.apollo3.api.json.JsonWriter import com.apollographql.apollo3.api.present import com.example.java_jetbrains_annotations.type.MyInput import kotlin.IllegalStateException -import kotlin.Unit public object MyInput_InputAdapter : CompositeAdapter { - public override fun fromJson(reader: JsonReader, adapterContext: CompositeAdapterContext): MyInput - = throw IllegalStateException("Input type used in output position") + override fun fromJson(reader: JsonReader, adapterContext: CompositeAdapterContext): MyInput = + throw IllegalStateException("Input type used in output position") - public override fun toJson( + override fun toJson( writer: JsonWriter, `value`: MyInput, adapterContext: CompositeAdapterContext, - ): Unit { + ) { if (value.nullableInt is Optional.Present) { writer.name("nullableInt") NullableIntAdapter.present().toJson(writer, CustomScalarAdapters.Empty, value.nullableInt) diff --git a/libraries/apollo-compiler/src/test/graphql/com/example/java_jsr305_annotations/kotlin/responseBased/java_jsr305_annotations/MyQuery.kt.expected b/libraries/apollo-compiler/src/test/graphql/com/example/java_jsr305_annotations/kotlin/responseBased/java_jsr305_annotations/MyQuery.kt.expected index 4fb6fcda8f1..7eee992cd8d 100644 --- a/libraries/apollo-compiler/src/test/graphql/com/example/java_jsr305_annotations/kotlin/responseBased/java_jsr305_annotations/MyQuery.kt.expected +++ b/libraries/apollo-compiler/src/test/graphql/com/example/java_jsr305_annotations/kotlin/responseBased/java_jsr305_annotations/MyQuery.kt.expected @@ -20,8 +20,8 @@ import com.example.java_jsr305_annotations.type.MyInput import kotlin.Boolean import kotlin.Int import kotlin.String -import kotlin.Unit import kotlin.collections.List +import com.example.java_jsr305_annotations.type.Query as CompiledQuery public data class MyQuery( public val nullableInt: Optional = Optional.Absent, @@ -31,26 +31,26 @@ public data class MyQuery( public val nonNullableInput: MyInput, public val nonNullableInputWithDefault: Optional = Optional.Absent, ) : Query { - public override fun id(): String = OPERATION_ID + override fun id(): String = OPERATION_ID - public override fun document(): String = OPERATION_DOCUMENT + override fun document(): String = OPERATION_DOCUMENT - public override fun name(): String = OPERATION_NAME + override fun name(): String = OPERATION_NAME - public override fun serializeVariables( + override fun serializeVariables( writer: JsonWriter, customScalarAdapters: CustomScalarAdapters, withBooleanDefaultValues: Boolean, - ): Unit { + ) { MyQuery_VariablesAdapter.serializeVariables(writer, this, customScalarAdapters, withBooleanDefaultValues) } - public override fun adapter(): CompositeAdapter = MyQuery_ResponseAdapter.Data.obj() + override fun adapter(): CompositeAdapter = MyQuery_ResponseAdapter.Data.obj() - public override fun rootField(): CompiledField = CompiledField.Builder( + override fun rootField(): CompiledField = CompiledField.Builder( name = "data", - type = com.example.java_jsr305_annotations.type.Query.type + type = CompiledQuery.type ) .selections(selections = MyQuerySelections.__root) .build() diff --git a/libraries/apollo-compiler/src/test/graphql/com/example/java_jsr305_annotations/kotlin/responseBased/java_jsr305_annotations/adapter/MyQuery_ResponseAdapter.kt.expected b/libraries/apollo-compiler/src/test/graphql/com/example/java_jsr305_annotations/kotlin/responseBased/java_jsr305_annotations/adapter/MyQuery_ResponseAdapter.kt.expected index 0269ec8ef6d..71fb7dbcd6e 100644 --- a/libraries/apollo-compiler/src/test/graphql/com/example/java_jsr305_annotations/kotlin/responseBased/java_jsr305_annotations/adapter/MyQuery_ResponseAdapter.kt.expected +++ b/libraries/apollo-compiler/src/test/graphql/com/example/java_jsr305_annotations/kotlin/responseBased/java_jsr305_annotations/adapter/MyQuery_ResponseAdapter.kt.expected @@ -20,7 +20,6 @@ import com.apollographql.apollo3.api.obj import com.example.java_jsr305_annotations.MyQuery import kotlin.Int import kotlin.String -import kotlin.Unit import kotlin.collections.List public object MyQuery_ResponseAdapter { @@ -29,7 +28,7 @@ public object MyQuery_ResponseAdapter { "nullableMyType", "nonNullableMyType", "nullableListOfNullableString", "nullableListOfNonNullableString") - public override fun fromJson(reader: JsonReader, adapterContext: CompositeAdapterContext): + override fun fromJson(reader: JsonReader, adapterContext: CompositeAdapterContext): MyQuery.Data { var _nullableInt: Int? = null var _nonNullableInt: Int? = null @@ -60,11 +59,11 @@ public object MyQuery_ResponseAdapter { ) } - public override fun toJson( + override fun toJson( writer: JsonWriter, `value`: MyQuery.Data, adapterContext: CompositeAdapterContext, - ): Unit { + ) { writer.name("nullableInt") NullableIntAdapter.toJson(writer, CustomScalarAdapters.Empty, value.nullableInt) @@ -89,7 +88,7 @@ public object MyQuery_ResponseAdapter { private object NullableMyType : CompositeAdapter { public val RESPONSE_NAMES: List = listOf("nullableInt", "nonNullableInt") - public override fun fromJson(reader: JsonReader, adapterContext: CompositeAdapterContext): + override fun fromJson(reader: JsonReader, adapterContext: CompositeAdapterContext): MyQuery.Data.NullableMyType { var _nullableInt: Int? = null var _nonNullableInt: Int? = null @@ -108,11 +107,11 @@ public object MyQuery_ResponseAdapter { ) } - public override fun toJson( + override fun toJson( writer: JsonWriter, `value`: MyQuery.Data.NullableMyType, adapterContext: CompositeAdapterContext, - ): Unit { + ) { writer.name("nullableInt") NullableIntAdapter.toJson(writer, CustomScalarAdapters.Empty, value.nullableInt) @@ -124,7 +123,7 @@ public object MyQuery_ResponseAdapter { private object NonNullableMyType : CompositeAdapter { public val RESPONSE_NAMES: List = listOf("nullableInt", "nonNullableInt") - public override fun fromJson(reader: JsonReader, adapterContext: CompositeAdapterContext): + override fun fromJson(reader: JsonReader, adapterContext: CompositeAdapterContext): MyQuery.Data.NonNullableMyType { var _nullableInt: Int? = null var _nonNullableInt: Int? = null @@ -143,11 +142,11 @@ public object MyQuery_ResponseAdapter { ) } - public override fun toJson( + override fun toJson( writer: JsonWriter, `value`: MyQuery.Data.NonNullableMyType, adapterContext: CompositeAdapterContext, - ): Unit { + ) { writer.name("nullableInt") NullableIntAdapter.toJson(writer, CustomScalarAdapters.Empty, value.nullableInt) diff --git a/libraries/apollo-compiler/src/test/graphql/com/example/java_jsr305_annotations/kotlin/responseBased/java_jsr305_annotations/adapter/MyQuery_VariablesAdapter.kt.expected b/libraries/apollo-compiler/src/test/graphql/com/example/java_jsr305_annotations/kotlin/responseBased/java_jsr305_annotations/adapter/MyQuery_VariablesAdapter.kt.expected index 59c4f0465a4..7a6cce7da6f 100644 --- a/libraries/apollo-compiler/src/test/graphql/com/example/java_jsr305_annotations/kotlin/responseBased/java_jsr305_annotations/adapter/MyQuery_VariablesAdapter.kt.expected +++ b/libraries/apollo-compiler/src/test/graphql/com/example/java_jsr305_annotations/kotlin/responseBased/java_jsr305_annotations/adapter/MyQuery_VariablesAdapter.kt.expected @@ -18,7 +18,6 @@ import com.example.java_jsr305_annotations.MyQuery import com.example.java_jsr305_annotations.type.adapter.MyInput_InputAdapter import kotlin.Boolean import kotlin.Suppress -import kotlin.Unit public object MyQuery_VariablesAdapter { @Suppress( @@ -30,7 +29,7 @@ public object MyQuery_VariablesAdapter { `value`: MyQuery, customScalarAdapters: CustomScalarAdapters, withBooleanDefaultValues: Boolean, - ): Unit { + ) { val adapterContext = CompositeAdapterContext.Builder().customScalarAdapters(customScalarAdapters).build() if (value.nullableInt is Optional.Present) { diff --git a/libraries/apollo-compiler/src/test/graphql/com/example/java_jsr305_annotations/kotlin/responseBased/java_jsr305_annotations/type/adapter/MyInput_InputAdapter.kt.expected b/libraries/apollo-compiler/src/test/graphql/com/example/java_jsr305_annotations/kotlin/responseBased/java_jsr305_annotations/type/adapter/MyInput_InputAdapter.kt.expected index a0d19f22261..fe6dadd0975 100644 --- a/libraries/apollo-compiler/src/test/graphql/com/example/java_jsr305_annotations/kotlin/responseBased/java_jsr305_annotations/type/adapter/MyInput_InputAdapter.kt.expected +++ b/libraries/apollo-compiler/src/test/graphql/com/example/java_jsr305_annotations/kotlin/responseBased/java_jsr305_annotations/type/adapter/MyInput_InputAdapter.kt.expected @@ -16,17 +16,16 @@ import com.apollographql.apollo3.api.json.JsonWriter import com.apollographql.apollo3.api.present import com.example.java_jsr305_annotations.type.MyInput import kotlin.IllegalStateException -import kotlin.Unit public object MyInput_InputAdapter : CompositeAdapter { - public override fun fromJson(reader: JsonReader, adapterContext: CompositeAdapterContext): MyInput - = throw IllegalStateException("Input type used in output position") + override fun fromJson(reader: JsonReader, adapterContext: CompositeAdapterContext): MyInput = + throw IllegalStateException("Input type used in output position") - public override fun toJson( + override fun toJson( writer: JsonWriter, `value`: MyInput, adapterContext: CompositeAdapterContext, - ): Unit { + ) { if (value.nullableInt is Optional.Present) { writer.name("nullableInt") NullableIntAdapter.present().toJson(writer, CustomScalarAdapters.Empty, value.nullableInt) diff --git a/libraries/apollo-compiler/src/test/graphql/com/example/java_primitive_types/kotlin/responseBased/java_primitive_types/JavaPrimitiveQuery.kt.expected b/libraries/apollo-compiler/src/test/graphql/com/example/java_primitive_types/kotlin/responseBased/java_primitive_types/JavaPrimitiveQuery.kt.expected index 84492785ec3..03f85245984 100644 --- a/libraries/apollo-compiler/src/test/graphql/com/example/java_primitive_types/kotlin/responseBased/java_primitive_types/JavaPrimitiveQuery.kt.expected +++ b/libraries/apollo-compiler/src/test/graphql/com/example/java_primitive_types/kotlin/responseBased/java_primitive_types/JavaPrimitiveQuery.kt.expected @@ -20,7 +20,7 @@ import com.example.java_primitive_types.type.MyInput import kotlin.Boolean import kotlin.Int import kotlin.String -import kotlin.Unit +import com.example.java_primitive_types.type.Query as CompiledQuery public data class JavaPrimitiveQuery( public val nullableInt: Optional = Optional.Absent, @@ -30,27 +30,26 @@ public data class JavaPrimitiveQuery( public val nonNullableInput: MyInput, public val nonNullableInputWithDefault: Optional = Optional.Absent, ) : Query { - public override fun id(): String = OPERATION_ID + override fun id(): String = OPERATION_ID - public override fun document(): String = OPERATION_DOCUMENT + override fun document(): String = OPERATION_DOCUMENT - public override fun name(): String = OPERATION_NAME + override fun name(): String = OPERATION_NAME - public override fun serializeVariables( + override fun serializeVariables( writer: JsonWriter, customScalarAdapters: CustomScalarAdapters, withBooleanDefaultValues: Boolean, - ): Unit { + ) { JavaPrimitiveQuery_VariablesAdapter.serializeVariables(writer, this, customScalarAdapters, withBooleanDefaultValues) } - public override fun adapter(): CompositeAdapter = - JavaPrimitiveQuery_ResponseAdapter.Data.obj() + override fun adapter(): CompositeAdapter = JavaPrimitiveQuery_ResponseAdapter.Data.obj() - public override fun rootField(): CompiledField = CompiledField.Builder( + override fun rootField(): CompiledField = CompiledField.Builder( name = "data", - type = com.example.java_primitive_types.type.Query.type + type = CompiledQuery.type ) .selections(selections = JavaPrimitiveQuerySelections.__root) .build() diff --git a/libraries/apollo-compiler/src/test/graphql/com/example/java_primitive_types/kotlin/responseBased/java_primitive_types/adapter/JavaPrimitiveQuery_ResponseAdapter.kt.expected b/libraries/apollo-compiler/src/test/graphql/com/example/java_primitive_types/kotlin/responseBased/java_primitive_types/adapter/JavaPrimitiveQuery_ResponseAdapter.kt.expected index 61ba67bf8f0..ddf38e4eb5b 100644 --- a/libraries/apollo-compiler/src/test/graphql/com/example/java_primitive_types/kotlin/responseBased/java_primitive_types/adapter/JavaPrimitiveQuery_ResponseAdapter.kt.expected +++ b/libraries/apollo-compiler/src/test/graphql/com/example/java_primitive_types/kotlin/responseBased/java_primitive_types/adapter/JavaPrimitiveQuery_ResponseAdapter.kt.expected @@ -17,7 +17,6 @@ import com.apollographql.apollo3.api.obj import com.example.java_primitive_types.JavaPrimitiveQuery import kotlin.Int import kotlin.String -import kotlin.Unit import kotlin.collections.List public object JavaPrimitiveQuery_ResponseAdapter { @@ -25,7 +24,7 @@ public object JavaPrimitiveQuery_ResponseAdapter { public val RESPONSE_NAMES: List = listOf("nullableInt", "nonNullableInt", "nullableMyType", "nonNullableMyType") - public override fun fromJson(reader: JsonReader, adapterContext: CompositeAdapterContext): + override fun fromJson(reader: JsonReader, adapterContext: CompositeAdapterContext): JavaPrimitiveQuery.Data { var _nullableInt: Int? = null var _nonNullableInt: Int? = null @@ -50,11 +49,11 @@ public object JavaPrimitiveQuery_ResponseAdapter { ) } - public override fun toJson( + override fun toJson( writer: JsonWriter, `value`: JavaPrimitiveQuery.Data, adapterContext: CompositeAdapterContext, - ): Unit { + ) { writer.name("nullableInt") NullableIntAdapter.toJson(writer, CustomScalarAdapters.Empty, value.nullableInt) @@ -71,7 +70,7 @@ public object JavaPrimitiveQuery_ResponseAdapter { private object NullableMyType : CompositeAdapter { public val RESPONSE_NAMES: List = listOf("nullableInt", "nonNullableInt") - public override fun fromJson(reader: JsonReader, adapterContext: CompositeAdapterContext): + override fun fromJson(reader: JsonReader, adapterContext: CompositeAdapterContext): JavaPrimitiveQuery.Data.NullableMyType { var _nullableInt: Int? = null var _nonNullableInt: Int? = null @@ -90,11 +89,11 @@ public object JavaPrimitiveQuery_ResponseAdapter { ) } - public override fun toJson( + override fun toJson( writer: JsonWriter, `value`: JavaPrimitiveQuery.Data.NullableMyType, adapterContext: CompositeAdapterContext, - ): Unit { + ) { writer.name("nullableInt") NullableIntAdapter.toJson(writer, CustomScalarAdapters.Empty, value.nullableInt) @@ -106,7 +105,7 @@ public object JavaPrimitiveQuery_ResponseAdapter { private object NonNullableMyType : CompositeAdapter { public val RESPONSE_NAMES: List = listOf("nullableInt", "nonNullableInt") - public override fun fromJson(reader: JsonReader, adapterContext: CompositeAdapterContext): + override fun fromJson(reader: JsonReader, adapterContext: CompositeAdapterContext): JavaPrimitiveQuery.Data.NonNullableMyType { var _nullableInt: Int? = null var _nonNullableInt: Int? = null @@ -125,11 +124,11 @@ public object JavaPrimitiveQuery_ResponseAdapter { ) } - public override fun toJson( + override fun toJson( writer: JsonWriter, `value`: JavaPrimitiveQuery.Data.NonNullableMyType, adapterContext: CompositeAdapterContext, - ): Unit { + ) { writer.name("nullableInt") NullableIntAdapter.toJson(writer, CustomScalarAdapters.Empty, value.nullableInt) diff --git a/libraries/apollo-compiler/src/test/graphql/com/example/java_primitive_types/kotlin/responseBased/java_primitive_types/adapter/JavaPrimitiveQuery_VariablesAdapter.kt.expected b/libraries/apollo-compiler/src/test/graphql/com/example/java_primitive_types/kotlin/responseBased/java_primitive_types/adapter/JavaPrimitiveQuery_VariablesAdapter.kt.expected index 9a86077bf61..8d32ca43087 100644 --- a/libraries/apollo-compiler/src/test/graphql/com/example/java_primitive_types/kotlin/responseBased/java_primitive_types/adapter/JavaPrimitiveQuery_VariablesAdapter.kt.expected +++ b/libraries/apollo-compiler/src/test/graphql/com/example/java_primitive_types/kotlin/responseBased/java_primitive_types/adapter/JavaPrimitiveQuery_VariablesAdapter.kt.expected @@ -18,7 +18,6 @@ import com.example.java_primitive_types.JavaPrimitiveQuery import com.example.java_primitive_types.type.adapter.MyInput_InputAdapter import kotlin.Boolean import kotlin.Suppress -import kotlin.Unit public object JavaPrimitiveQuery_VariablesAdapter { @Suppress( @@ -30,7 +29,7 @@ public object JavaPrimitiveQuery_VariablesAdapter { `value`: JavaPrimitiveQuery, customScalarAdapters: CustomScalarAdapters, withBooleanDefaultValues: Boolean, - ): Unit { + ) { val adapterContext = CompositeAdapterContext.Builder().customScalarAdapters(customScalarAdapters).build() if (value.nullableInt is Optional.Present) { diff --git a/libraries/apollo-compiler/src/test/graphql/com/example/java_primitive_types/kotlin/responseBased/java_primitive_types/type/adapter/MyInput_InputAdapter.kt.expected b/libraries/apollo-compiler/src/test/graphql/com/example/java_primitive_types/kotlin/responseBased/java_primitive_types/type/adapter/MyInput_InputAdapter.kt.expected index 7e6706c1b47..e1c73fdd94e 100644 --- a/libraries/apollo-compiler/src/test/graphql/com/example/java_primitive_types/kotlin/responseBased/java_primitive_types/type/adapter/MyInput_InputAdapter.kt.expected +++ b/libraries/apollo-compiler/src/test/graphql/com/example/java_primitive_types/kotlin/responseBased/java_primitive_types/type/adapter/MyInput_InputAdapter.kt.expected @@ -16,17 +16,16 @@ import com.apollographql.apollo3.api.json.JsonWriter import com.apollographql.apollo3.api.present import com.example.java_primitive_types.type.MyInput import kotlin.IllegalStateException -import kotlin.Unit public object MyInput_InputAdapter : CompositeAdapter { - public override fun fromJson(reader: JsonReader, adapterContext: CompositeAdapterContext): MyInput - = throw IllegalStateException("Input type used in output position") + override fun fromJson(reader: JsonReader, adapterContext: CompositeAdapterContext): MyInput = + throw IllegalStateException("Input type used in output position") - public override fun toJson( + override fun toJson( writer: JsonWriter, `value`: MyInput, adapterContext: CompositeAdapterContext, - ): Unit { + ) { if (value.nullableInt is Optional.Present) { writer.name("nullableInt") NullableIntAdapter.present().toJson(writer, CustomScalarAdapters.Empty, value.nullableInt) diff --git a/libraries/apollo-compiler/src/test/graphql/com/example/measurements b/libraries/apollo-compiler/src/test/graphql/com/example/measurements index 65f6be0385f..49832823c63 100644 --- a/libraries/apollo-compiler/src/test/graphql/com/example/measurements +++ b/libraries/apollo-compiler/src/test/graphql/com/example/measurements @@ -2,239 +2,239 @@ // If you updated the codegen and test fixtures, you should commit this file too. Test: Total LOC: -aggregate-all 191281 -aggregate-kotlin-responseBased 60067 -aggregate-kotlin-operationBased 40622 +aggregate-all 191026 +aggregate-kotlin-responseBased 60021 +aggregate-kotlin-operationBased 40413 aggregate-kotlin-compat 0 aggregate-java-operationBased 90592 java-operationBased-fragments_with_defer_and_include_directives 5552 -kotlin-operationBased-fragments_with_defer_and_include_directives 3477 +kotlin-operationBased-fragments_with_defer_and_include_directives 3455 java-operationBased-data_builders 2933 kotlin-responseBased-fragment_with_inline_fragment 2391 java-operationBased-mutation_create_review 2379 -kotlin-responseBased-data_builders 2256 +kotlin-responseBased-data_builders 2265 java-operationBased-fragment_with_inline_fragment 2227 -kotlin-operationBased-data_builders 1920 +kotlin-operationBased-data_builders 1916 java-operationBased-nested_named_fragments 1868 java-operationBased-union_inline_fragments 1633 java-operationBased-fragment_spread_with_include_directive 1625 java-operationBased-unique_type_name 1623 -kotlin-responseBased-nested_named_fragments 1600 java-operationBased-inline_fragment_intersection 1599 +kotlin-responseBased-nested_named_fragments 1599 java-operationBased-input_object_type 1596 java-operationBased-mutation_create_review_semantic_naming 1579 java-operationBased-root_query_fragment_with_nested_fragments 1565 java-operationBased-named_fragment_delegate 1466 java-operationBased-simple_fragment 1465 -kotlin-responseBased-mutation_create_review 1383 +kotlin-responseBased-mutation_create_review 1378 java-operationBased-named_fragment_with_variables 1367 -kotlin-responseBased-named_fragment_delegate 1347 -kotlin-responseBased-unique_type_name 1319 +kotlin-responseBased-named_fragment_delegate 1344 +kotlin-responseBased-unique_type_name 1314 java-operationBased-nested_conditional_inline 1297 java-operationBased-fragment_used_twice 1278 java-operationBased-multiple_fragments 1265 -kotlin-operationBased-fragment_with_inline_fragment 1264 +kotlin-operationBased-fragment_with_inline_fragment 1255 java-operationBased-nested_field_with_multiple_fieldsets 1255 kotlin-responseBased-root_query_fragment_with_nested_fragments 1249 -kotlin-operationBased-nested_named_fragments 1237 +kotlin-operationBased-nested_named_fragments 1229 java-operationBased-two_heroes_with_friends 1212 java-operationBased-inline_fragment_merge_fields 1209 -kotlin-responseBased-inline_fragment_intersection 1189 +kotlin-responseBased-inline_fragment_intersection 1194 java-operationBased-named_fragment_inside_inline_fragment 1162 +kotlin-responseBased-simple_fragment 1159 java-operationBased-fragments_with_type_condition 1157 -kotlin-responseBased-simple_fragment 1152 java-operationBased-target_name 1134 -kotlin-responseBased-fragment_used_twice 1127 -kotlin-operationBased-union_inline_fragments 1114 -kotlin-operationBased-inline_fragment_intersection 1113 -kotlin-operationBased-fragment_spread_with_include_directive 1099 -kotlin-responseBased-union_inline_fragments 1097 +kotlin-responseBased-fragment_used_twice 1132 +kotlin-operationBased-inline_fragment_intersection 1107 +kotlin-operationBased-union_inline_fragments 1105 +kotlin-responseBased-union_inline_fragments 1099 java-operationBased-root_query_inline_fragment 1096 java-operationBased-java_jetbrains_annotations 1091 +kotlin-operationBased-fragment_spread_with_include_directive 1089 java-operationBased-java_android_annotations 1088 java-operationBased-java_jsr305_annotations 1088 -kotlin-operationBased-unique_type_name 1080 -kotlin-responseBased-fragments_with_type_condition 1076 +kotlin-responseBased-fragments_with_type_condition 1078 +kotlin-operationBased-unique_type_name 1074 java-operationBased-java_guava_optionals 1072 java-operationBased-java_java_optionals 1072 java-operationBased-java_apollo_optionals 1071 -kotlin-responseBased-multiple_fragments 1046 +kotlin-responseBased-multiple_fragments 1052 java-operationBased-simple_fragment_with_inline_fragments 1046 java-operationBased-inline_fragments_with_friends 1038 -kotlin-operationBased-root_query_fragment_with_nested_fragments 1038 -kotlin-responseBased-named_fragment_with_variables 1032 +kotlin-operationBased-root_query_fragment_with_nested_fragments 1031 java-operationBased-fragment_spread_with_nested_fields 1030 +kotlin-responseBased-named_fragment_with_variables 1028 +kotlin-responseBased-simple_fragment_with_inline_fragments 1027 java-operationBased-operationbased2_ex8 1026 -kotlin-responseBased-simple_fragment_with_inline_fragments 1020 -kotlin-responseBased-nested_conditional_inline 1017 +kotlin-responseBased-nested_conditional_inline 1018 java-operationBased-java_primitive_types 1015 -kotlin-operationBased-simple_fragment 1011 -kotlin-operationBased-named_fragment_delegate 994 +kotlin-operationBased-simple_fragment 1009 +kotlin-operationBased-named_fragment_delegate 989 java-operationBased-decapitalized_fields 975 java-operationBased-fragments_same_type_condition 951 java-operationBased-simple_union 949 -kotlin-responseBased-operationbased2_ex8 935 +kotlin-responseBased-operationbased2_ex8 941 java-operationBased-deprecated_merged_field 929 java-operationBased-hero_details 919 java-operationBased-not_all_combinations_are_needed 919 java-operationBased-fieldset_with_multiple_super 901 java-operationBased-simple_inline_fragment 901 java-operationBased-inline_fragment_with_include_directive 898 -kotlin-responseBased-input_object_type 895 -kotlin-operationBased-nested_conditional_inline 892 java-operationBased-introspection_query 890 -kotlin-operationBased-named_fragment_with_variables 889 -kotlin-responseBased-mutation_create_review_semantic_naming 881 -kotlin-operationBased-fragment_used_twice 879 +kotlin-responseBased-input_object_type 889 +kotlin-operationBased-nested_conditional_inline 886 +kotlin-operationBased-named_fragment_with_variables 880 +kotlin-responseBased-mutation_create_review_semantic_naming 874 +kotlin-operationBased-fragment_used_twice 872 java-operationBased-test_inline 865 java-operationBased-union_fragment 863 -kotlin-responseBased-fragment_spread_with_nested_fields 857 +kotlin-responseBased-fragment_spread_with_nested_fields 855 java-operationBased-inline_fragment_inside_inline_fragment 854 -kotlin-operationBased-multiple_fragments 839 -kotlin-responseBased-nested_field_with_multiple_fieldsets 824 +kotlin-operationBased-multiple_fragments 832 +kotlin-responseBased-nested_field_with_multiple_fieldsets 828 java-operationBased-named_fragment_without_implementation 822 -kotlin-operationBased-fragments_with_type_condition 815 -kotlin-operationBased-nested_field_with_multiple_fieldsets 806 +kotlin-operationBased-fragments_with_type_condition 810 +kotlin-operationBased-nested_field_with_multiple_fieldsets 801 java-operationBased-fragment_with_multiple_fieldsets 787 java-operationBased-hero_details_semantic_naming 783 -kotlin-operationBased-inline_fragment_merge_fields 783 java-operationBased-operationbased2_ex7 782 -kotlin-operationBased-named_fragment_inside_inline_fragment 781 -kotlin-responseBased-two_heroes_with_friends 781 +kotlin-operationBased-inline_fragment_merge_fields 779 +kotlin-responseBased-two_heroes_with_friends 778 java-operationBased-suppressed_warnings 775 -kotlin-responseBased-target_name 768 +kotlin-operationBased-named_fragment_inside_inline_fragment 774 +kotlin-responseBased-target_name 766 +kotlin-responseBased-deprecated_merged_field 764 java-operationBased-path_vs_flat_accessors 762 -kotlin-responseBased-named_fragment_inside_inline_fragment 760 -kotlin-responseBased-deprecated_merged_field 758 kotlin-responseBased-inline_fragments_with_friends 757 -kotlin-operationBased-root_query_inline_fragment 757 +kotlin-responseBased-named_fragment_inside_inline_fragment 754 +kotlin-operationBased-root_query_inline_fragment 754 kotlin-responseBased-simple_union 747 -kotlin-operationBased-target_name 743 java-operationBased-reserved_keywords 741 +kotlin-operationBased-target_name 739 java-operationBased-typename_always_first 738 -kotlin-responseBased-root_query_inline_fragment 731 -kotlin-responseBased-fragments_same_type_condition 722 +kotlin-responseBased-root_query_inline_fragment 730 +kotlin-responseBased-fragments_same_type_condition 719 java-operationBased-interface_on_interface 714 -kotlin-operationBased-inline_fragments_with_friends 709 +kotlin-operationBased-inline_fragments_with_friends 706 java-operationBased-root_query_fragment 701 -kotlin-operationBased-simple_fragment_with_inline_fragments 700 java-operationBased-input_object_variable_and_argument 698 -kotlin-operationBased-fragment_spread_with_nested_fields 687 +kotlin-operationBased-simple_fragment_with_inline_fragments 697 +kotlin-operationBased-fragment_spread_with_nested_fields 684 java-operationBased-monomorphic 671 -kotlin-operationBased-operationbased2_ex8 671 java-operationBased-interface_always_nested 669 +kotlin-operationBased-operationbased2_ex8 668 java-operationBased-deprecation 660 -kotlin-operationBased-fragments_same_type_condition 654 -kotlin-operationBased-simple_union 651 java-operationBased-capitalized_fields 650 +kotlin-operationBased-fragments_same_type_condition 649 java-operationBased-recursive_selection 647 +kotlin-operationBased-simple_union 646 +kotlin-responseBased-fragment_with_multiple_fieldsets 643 kotlin-responseBased-union_fragment 643 java-operationBased-hero_with_review 640 -kotlin-responseBased-fragment_with_multiple_fieldsets 639 -kotlin-responseBased-test_inline 637 -kotlin-operationBased-decapitalized_fields 635 -kotlin-operationBased-deprecated_merged_field 627 -kotlin-responseBased-named_fragment_without_implementation 627 -kotlin-operationBased-not_all_combinations_are_needed 624 +kotlin-responseBased-test_inline 640 +kotlin-operationBased-decapitalized_fields 632 +kotlin-responseBased-named_fragment_without_implementation 631 +kotlin-operationBased-deprecated_merged_field 624 java-operationBased-field_with_include_directive 621 java-operationBased-hero_name_query_long_name 621 -kotlin-operationBased-union_fragment 619 -kotlin-responseBased-hero_details 618 +kotlin-operationBased-not_all_combinations_are_needed 621 java-operationBased-custom_scalar_type 615 -kotlin-operationBased-inline_fragment_inside_inline_fragment 615 -kotlin-operationBased-inline_fragment_with_include_directive 614 +kotlin-operationBased-union_fragment 615 +kotlin-responseBased-hero_details 614 +kotlin-operationBased-inline_fragment_inside_inline_fragment 614 java-operationBased-variable_default_value 613 -kotlin-responseBased-inline_fragment_merge_fields 611 +kotlin-operationBased-inline_fragment_with_include_directive 612 java-operationBased-hero_name 610 -kotlin-operationBased-fieldset_with_multiple_super 608 -kotlin-responseBased-inline_fragment_inside_inline_fragment 606 -kotlin-operationBased-named_fragment_without_implementation 601 -kotlin-operationBased-simple_inline_fragment 601 -kotlin-responseBased-java_android_annotations 600 -kotlin-responseBased-java_apollo_optionals 600 -kotlin-responseBased-java_guava_optionals 600 -kotlin-responseBased-java_java_optionals 600 -kotlin-responseBased-java_jetbrains_annotations 600 -kotlin-responseBased-java_jsr305_annotations 600 -kotlin-responseBased-operationbased2_ex7 596 -kotlin-responseBased-decapitalized_fields 595 +kotlin-responseBased-inline_fragment_inside_inline_fragment 609 +kotlin-responseBased-inline_fragment_merge_fields 609 +kotlin-operationBased-fieldset_with_multiple_super 607 +kotlin-operationBased-simple_inline_fragment 600 +kotlin-responseBased-operationbased2_ex7 599 +kotlin-operationBased-named_fragment_without_implementation 598 +kotlin-responseBased-java_android_annotations 597 +kotlin-responseBased-java_apollo_optionals 597 +kotlin-responseBased-java_guava_optionals 597 +kotlin-responseBased-java_java_optionals 597 +kotlin-responseBased-java_jetbrains_annotations 597 +kotlin-responseBased-java_jsr305_annotations 597 java-operationBased-java8annotation 595 -kotlin-responseBased-not_all_combinations_are_needed 594 +kotlin-responseBased-not_all_combinations_are_needed 595 +kotlin-responseBased-decapitalized_fields 593 +kotlin-responseBased-fieldset_with_multiple_super 593 +kotlin-responseBased-simple_inline_fragment 593 java-operationBased-optional 592 -kotlin-responseBased-simple_inline_fragment 591 -kotlin-responseBased-fieldset_with_multiple_super 590 java-operationBased-enum_field 581 java-operationBased-inline_fragment_for_non_optional_field 579 -kotlin-responseBased-introspection_query 579 +kotlin-responseBased-introspection_query 577 java-operationBased-inline_fragment_type_coercion 573 -kotlin-operationBased-test_inline 569 java-operationBased-two_heroes_unique 568 -kotlin-responseBased-reserved_keywords 566 -kotlin-responseBased-java_primitive_types 565 +kotlin-responseBased-reserved_keywords 567 +kotlin-operationBased-test_inline 567 +kotlin-responseBased-java_primitive_types 561 java-operationBased-inline_fragment_simple 557 -kotlin-responseBased-path_vs_flat_accessors 541 -kotlin-operationBased-reserved_keywords 541 -kotlin-responseBased-hero_details_semantic_naming 533 -kotlin-operationBased-fragment_with_multiple_fieldsets 532 -kotlin-responseBased-input_object_variable_and_argument 530 -kotlin-responseBased-root_query_fragment 528 +kotlin-responseBased-path_vs_flat_accessors 544 +kotlin-operationBased-reserved_keywords 540 +kotlin-responseBased-hero_details_semantic_naming 530 +kotlin-operationBased-fragment_with_multiple_fieldsets 529 +kotlin-responseBased-input_object_variable_and_argument 526 +kotlin-responseBased-root_query_fragment 526 +kotlin-responseBased-typename_always_first 523 java-operationBased-starships 522 -kotlin-operationBased-operationbased2_ex7 521 -kotlin-responseBased-typename_always_first 521 -kotlin-responseBased-interface_on_interface 518 -kotlin-operationBased-path_vs_flat_accessors 515 -kotlin-operationBased-typename_always_first 513 -kotlin-responseBased-suppressed_warnings 512 +kotlin-operationBased-operationbased2_ex7 520 +kotlin-responseBased-interface_on_interface 519 +kotlin-operationBased-path_vs_flat_accessors 514 +kotlin-operationBased-typename_always_first 512 java-operationBased-antlr_tokens 509 +kotlin-responseBased-suppressed_warnings 507 java-operationBased-subscriptions 505 -kotlin-responseBased-hero_name 495 -kotlin-responseBased-hero_with_review 495 -kotlin-operationBased-interface_on_interface 494 -kotlin-responseBased-deprecation 492 -kotlin-responseBased-hero_name_query_long_name 486 -kotlin-responseBased-interface_always_nested 486 +kotlin-responseBased-hero_name 496 +kotlin-operationBased-interface_on_interface 493 +kotlin-responseBased-hero_with_review 491 +kotlin-responseBased-deprecation 488 +kotlin-responseBased-interface_always_nested 488 java-operationBased-arguments_hardcoded 484 -kotlin-operationBased-root_query_fragment 480 +kotlin-responseBased-hero_name_query_long_name 482 +kotlin-operationBased-root_query_fragment 477 kotlin-responseBased-custom_scalar_type 475 -kotlin-operationBased-interface_always_nested 462 java-operationBased-merged_include 462 java-operationBased-operation_id_generator 462 -kotlin-operationBased-monomorphic 458 -kotlin-responseBased-variable_default_value 455 -kotlin-responseBased-monomorphic 454 +kotlin-operationBased-interface_always_nested 461 +kotlin-operationBased-monomorphic 457 +kotlin-responseBased-monomorphic 456 java-operationBased-enums_as_sealed 453 -kotlin-responseBased-inline_fragment_for_non_optional_field 452 +kotlin-responseBased-inline_fragment_for_non_optional_field 453 +kotlin-responseBased-variable_default_value 451 java-operationBased-case_sensitive_enum 450 java-operationBased-nonnull 443 -kotlin-operationBased-hero_name 440 -kotlin-operationBased-capitalized_fields 439 -kotlin-responseBased-enum_field 438 -kotlin-responseBased-field_with_include_directive 438 -kotlin-responseBased-optional 436 +kotlin-operationBased-hero_name 439 +kotlin-operationBased-capitalized_fields 438 +kotlin-responseBased-field_with_include_directive 436 java-operationBased-companion 435 -kotlin-responseBased-inline_fragment_type_coercion 433 -kotlin-responseBased-recursive_selection 426 -kotlin-responseBased-inline_fragment_simple 416 -kotlin-operationBased-inline_fragment_for_non_optional_field 411 -kotlin-responseBased-capitalized_fields 401 -kotlin-operationBased-inline_fragment_type_coercion 400 -kotlin-responseBased-two_heroes_unique 396 -kotlin-operationBased-inline_fragment_simple 392 -kotlin-responseBased-java8annotation 386 -kotlin-responseBased-starships 385 -kotlin-responseBased-antlr_tokens 384 -kotlin-responseBased-subscriptions 373 -kotlin-responseBased-arguments_hardcoded 368 -kotlin-responseBased-enums_as_sealed 353 +kotlin-responseBased-enum_field 434 +kotlin-responseBased-inline_fragment_type_coercion 434 +kotlin-responseBased-optional 433 +kotlin-responseBased-recursive_selection 425 +kotlin-responseBased-inline_fragment_simple 417 +kotlin-operationBased-inline_fragment_for_non_optional_field 410 +kotlin-responseBased-capitalized_fields 400 +kotlin-operationBased-inline_fragment_type_coercion 399 +kotlin-responseBased-two_heroes_unique 395 +kotlin-operationBased-inline_fragment_simple 391 +kotlin-responseBased-java8annotation 383 +kotlin-responseBased-starships 383 +kotlin-responseBased-antlr_tokens 382 +kotlin-responseBased-subscriptions 370 +kotlin-responseBased-arguments_hardcoded 367 +kotlin-responseBased-enums_as_sealed 350 java-operationBased-java_hashcode 331 -kotlin-responseBased-operation_id_generator 331 -kotlin-responseBased-merged_include 329 -kotlin-responseBased-big_query 323 -kotlin-responseBased-case_sensitive_enum 323 -kotlin-responseBased-nonnull 315 -kotlin-operationBased-companion 308 -kotlin-responseBased-java_hashcode 247 +kotlin-responseBased-operation_id_generator 330 +kotlin-responseBased-merged_include 328 +kotlin-responseBased-big_query 322 +kotlin-responseBased-case_sensitive_enum 320 +kotlin-responseBased-nonnull 314 +kotlin-operationBased-companion 307 +kotlin-responseBased-java_hashcode 246 kotlin-responseBased-__schema 128 java-operationBased-__schema 103 kotlin-responseBased-empty 91 diff --git a/libraries/apollo-compiler/src/test/graphql/com/example/merged_include/kotlin/responseBased/merged_include/TestQuery.kt.expected b/libraries/apollo-compiler/src/test/graphql/com/example/merged_include/kotlin/responseBased/merged_include/TestQuery.kt.expected index 5119e4cb2dd..d0a35c459e1 100644 --- a/libraries/apollo-compiler/src/test/graphql/com/example/merged_include/kotlin/responseBased/merged_include/TestQuery.kt.expected +++ b/libraries/apollo-compiler/src/test/graphql/com/example/merged_include/kotlin/responseBased/merged_include/TestQuery.kt.expected @@ -18,32 +18,32 @@ import kotlin.Any import kotlin.Boolean import kotlin.Int import kotlin.String -import kotlin.Unit +import com.example.merged_include.type.Query as CompiledQuery public class TestQuery() : Query { - public override fun equals(other: Any?): Boolean = other != null && other::class == this::class + override fun equals(other: Any?): Boolean = other != null && other::class == this::class - public override fun hashCode(): Int = this::class.hashCode() + override fun hashCode(): Int = this::class.hashCode() - public override fun id(): String = OPERATION_ID + override fun id(): String = OPERATION_ID - public override fun document(): String = OPERATION_DOCUMENT + override fun document(): String = OPERATION_DOCUMENT - public override fun name(): String = OPERATION_NAME + override fun name(): String = OPERATION_NAME - public override fun serializeVariables( + override fun serializeVariables( writer: JsonWriter, customScalarAdapters: CustomScalarAdapters, withBooleanDefaultValues: Boolean, - ): Unit { + ) { // This operation doesn't have any variable } - public override fun adapter(): CompositeAdapter = TestQuery_ResponseAdapter.Data.obj() + override fun adapter(): CompositeAdapter = TestQuery_ResponseAdapter.Data.obj() - public override fun rootField(): CompiledField = CompiledField.Builder( + override fun rootField(): CompiledField = CompiledField.Builder( name = "data", - type = com.example.merged_include.type.Query.type + type = CompiledQuery.type ) .selections(selections = TestQuerySelections.__root) .build() diff --git a/libraries/apollo-compiler/src/test/graphql/com/example/merged_include/kotlin/responseBased/merged_include/adapter/TestQuery_ResponseAdapter.kt.expected b/libraries/apollo-compiler/src/test/graphql/com/example/merged_include/kotlin/responseBased/merged_include/adapter/TestQuery_ResponseAdapter.kt.expected index a4e78aa8d20..dd7bc22089e 100644 --- a/libraries/apollo-compiler/src/test/graphql/com/example/merged_include/kotlin/responseBased/merged_include/adapter/TestQuery_ResponseAdapter.kt.expected +++ b/libraries/apollo-compiler/src/test/graphql/com/example/merged_include/kotlin/responseBased/merged_include/adapter/TestQuery_ResponseAdapter.kt.expected @@ -15,14 +15,13 @@ import com.apollographql.apollo3.api.nullable import com.apollographql.apollo3.api.obj import com.example.merged_include.TestQuery import kotlin.String -import kotlin.Unit import kotlin.collections.List public object TestQuery_ResponseAdapter { public object Data : CompositeAdapter { public val RESPONSE_NAMES: List = listOf("hero") - public override fun fromJson(reader: JsonReader, adapterContext: CompositeAdapterContext): + override fun fromJson(reader: JsonReader, adapterContext: CompositeAdapterContext): TestQuery.Data { var _hero: TestQuery.Data.Hero? = null @@ -38,11 +37,11 @@ public object TestQuery_ResponseAdapter { ) } - public override fun toJson( + override fun toJson( writer: JsonWriter, `value`: TestQuery.Data, adapterContext: CompositeAdapterContext, - ): Unit { + ) { writer.name("hero") Hero.obj().nullable().toJson(writer, value.hero, adapterContext) } @@ -50,7 +49,7 @@ public object TestQuery_ResponseAdapter { private object Hero : CompositeAdapter { public val RESPONSE_NAMES: List = listOf("name", "id") - public override fun fromJson(reader: JsonReader, adapterContext: CompositeAdapterContext): + override fun fromJson(reader: JsonReader, adapterContext: CompositeAdapterContext): TestQuery.Data.Hero { var _name: String? = null var _id: String? = null @@ -69,11 +68,11 @@ public object TestQuery_ResponseAdapter { ) } - public override fun toJson( + override fun toJson( writer: JsonWriter, `value`: TestQuery.Data.Hero, adapterContext: CompositeAdapterContext, - ): Unit { + ) { writer.name("name") StringAdapter.toJson(writer, CustomScalarAdapters.Empty, value.name) diff --git a/libraries/apollo-compiler/src/test/graphql/com/example/monomorphic/kotlin/operationBased/monomorphic/TestQuery.kt.expected b/libraries/apollo-compiler/src/test/graphql/com/example/monomorphic/kotlin/operationBased/monomorphic/TestQuery.kt.expected index 47f1ba1cc27..d0f6d48564d 100644 --- a/libraries/apollo-compiler/src/test/graphql/com/example/monomorphic/kotlin/operationBased/monomorphic/TestQuery.kt.expected +++ b/libraries/apollo-compiler/src/test/graphql/com/example/monomorphic/kotlin/operationBased/monomorphic/TestQuery.kt.expected @@ -18,32 +18,32 @@ import kotlin.Any import kotlin.Boolean import kotlin.Int import kotlin.String -import kotlin.Unit +import com.example.monomorphic.type.Query as CompiledQuery public class TestQuery() : Query { - public override fun equals(other: Any?): Boolean = other != null && other::class == this::class + override fun equals(other: Any?): Boolean = other != null && other::class == this::class - public override fun hashCode(): Int = this::class.hashCode() + override fun hashCode(): Int = this::class.hashCode() - public override fun id(): String = OPERATION_ID + override fun id(): String = OPERATION_ID - public override fun document(): String = OPERATION_DOCUMENT + override fun document(): String = OPERATION_DOCUMENT - public override fun name(): String = OPERATION_NAME + override fun name(): String = OPERATION_NAME - public override fun serializeVariables( + override fun serializeVariables( writer: JsonWriter, customScalarAdapters: CustomScalarAdapters, withBooleanDefaultValues: Boolean, - ): Unit { + ) { // This operation doesn't have any variable } - public override fun adapter(): CompositeAdapter = TestQuery_ResponseAdapter.Data.obj() + override fun adapter(): CompositeAdapter = TestQuery_ResponseAdapter.Data.obj() - public override fun rootField(): CompiledField = CompiledField.Builder( + override fun rootField(): CompiledField = CompiledField.Builder( name = "data", - type = com.example.monomorphic.type.Query.type + type = CompiledQuery.type ) .selections(selections = TestQuerySelections.__root) .build() diff --git a/libraries/apollo-compiler/src/test/graphql/com/example/monomorphic/kotlin/operationBased/monomorphic/adapter/TestQuery_ResponseAdapter.kt.expected b/libraries/apollo-compiler/src/test/graphql/com/example/monomorphic/kotlin/operationBased/monomorphic/adapter/TestQuery_ResponseAdapter.kt.expected index 8e0d3869040..2501b44fe1d 100644 --- a/libraries/apollo-compiler/src/test/graphql/com/example/monomorphic/kotlin/operationBased/monomorphic/adapter/TestQuery_ResponseAdapter.kt.expected +++ b/libraries/apollo-compiler/src/test/graphql/com/example/monomorphic/kotlin/operationBased/monomorphic/adapter/TestQuery_ResponseAdapter.kt.expected @@ -14,14 +14,13 @@ import com.apollographql.apollo3.api.json.JsonWriter import com.apollographql.apollo3.api.obj import com.example.monomorphic.TestQuery import kotlin.String -import kotlin.Unit import kotlin.collections.List public object TestQuery_ResponseAdapter { public object Data : CompositeAdapter { public val RESPONSE_NAMES: List = listOf("cat") - public override fun fromJson(reader: JsonReader, adapterContext: CompositeAdapterContext): + override fun fromJson(reader: JsonReader, adapterContext: CompositeAdapterContext): TestQuery.Data { var _cat: TestQuery.Data.Cat? = null @@ -37,11 +36,11 @@ public object TestQuery_ResponseAdapter { ) } - public override fun toJson( + override fun toJson( writer: JsonWriter, `value`: TestQuery.Data, adapterContext: CompositeAdapterContext, - ): Unit { + ) { writer.name("cat") Cat.obj(true).toJson(writer, value.cat, adapterContext) } @@ -49,7 +48,7 @@ public object TestQuery_ResponseAdapter { private object Cat : CompositeAdapter { public val RESPONSE_NAMES: List = listOf("__typename") - public override fun fromJson(reader: JsonReader, adapterContext: CompositeAdapterContext): + override fun fromJson(reader: JsonReader, adapterContext: CompositeAdapterContext): TestQuery.Data.Cat { var __typename: String? = null @@ -70,11 +69,11 @@ public object TestQuery_ResponseAdapter { ) } - public override fun toJson( + override fun toJson( writer: JsonWriter, `value`: TestQuery.Data.Cat, adapterContext: CompositeAdapterContext, - ): Unit { + ) { writer.name("__typename") StringAdapter.toJson(writer, CustomScalarAdapters.Empty, value.__typename) @@ -85,7 +84,7 @@ public object TestQuery_ResponseAdapter { private object OnNode : CompositeAdapter { public val RESPONSE_NAMES: List = listOf("__typename") - public override fun fromJson(reader: JsonReader, adapterContext: CompositeAdapterContext): + override fun fromJson(reader: JsonReader, adapterContext: CompositeAdapterContext): TestQuery.Data.Cat.OnNode { var __typename: String? = null @@ -106,11 +105,11 @@ public object TestQuery_ResponseAdapter { ) } - public override fun toJson( + override fun toJson( writer: JsonWriter, `value`: TestQuery.Data.Cat.OnNode, adapterContext: CompositeAdapterContext, - ): Unit { + ) { writer.name("__typename") StringAdapter.toJson(writer, CustomScalarAdapters.Empty, value.__typename) @@ -121,7 +120,7 @@ public object TestQuery_ResponseAdapter { private object OnAnimal : CompositeAdapter { public val RESPONSE_NAMES: List = listOf("species") - public override fun fromJson(reader: JsonReader, adapterContext: CompositeAdapterContext): + override fun fromJson(reader: JsonReader, adapterContext: CompositeAdapterContext): TestQuery.Data.Cat.OnNode.OnAnimal { var _species: String? = null @@ -137,11 +136,11 @@ public object TestQuery_ResponseAdapter { ) } - public override fun toJson( + override fun toJson( writer: JsonWriter, `value`: TestQuery.Data.Cat.OnNode.OnAnimal, adapterContext: CompositeAdapterContext, - ): Unit { + ) { writer.name("species") StringAdapter.toJson(writer, CustomScalarAdapters.Empty, value.species) } diff --git a/libraries/apollo-compiler/src/test/graphql/com/example/monomorphic/kotlin/responseBased/monomorphic/TestQuery.kt.expected b/libraries/apollo-compiler/src/test/graphql/com/example/monomorphic/kotlin/responseBased/monomorphic/TestQuery.kt.expected index b8615272459..06268b47f30 100644 --- a/libraries/apollo-compiler/src/test/graphql/com/example/monomorphic/kotlin/responseBased/monomorphic/TestQuery.kt.expected +++ b/libraries/apollo-compiler/src/test/graphql/com/example/monomorphic/kotlin/responseBased/monomorphic/TestQuery.kt.expected @@ -18,32 +18,33 @@ import kotlin.Any import kotlin.Boolean import kotlin.Int import kotlin.String -import kotlin.Unit +import kotlin.Suppress +import com.example.monomorphic.type.Query as CompiledQuery public class TestQuery() : Query { - public override fun equals(other: Any?): Boolean = other != null && other::class == this::class + override fun equals(other: Any?): Boolean = other != null && other::class == this::class - public override fun hashCode(): Int = this::class.hashCode() + override fun hashCode(): Int = this::class.hashCode() - public override fun id(): String = OPERATION_ID + override fun id(): String = OPERATION_ID - public override fun document(): String = OPERATION_DOCUMENT + override fun document(): String = OPERATION_DOCUMENT - public override fun name(): String = OPERATION_NAME + override fun name(): String = OPERATION_NAME - public override fun serializeVariables( + override fun serializeVariables( writer: JsonWriter, customScalarAdapters: CustomScalarAdapters, withBooleanDefaultValues: Boolean, - ): Unit { + ) { // This operation doesn't have any variable } - public override fun adapter(): CompositeAdapter = TestQuery_ResponseAdapter.Data.obj() + override fun adapter(): CompositeAdapter = TestQuery_ResponseAdapter.Data.obj() - public override fun rootField(): CompiledField = CompiledField.Builder( + override fun rootField(): CompiledField = CompiledField.Builder( name = "data", - type = com.example.monomorphic.type.Query.type + type = CompiledQuery.type ) .selections(selections = TestQuerySelections.__root) .build() @@ -56,23 +57,25 @@ public class TestQuery() : Query { public val __typename: String public companion object { - public fun Cat.asNode() = this as? NodeCat + @Suppress("USELESS_CAST") + public fun Cat.asNode(): NodeCat? = this as? NodeCat - public fun Cat.asNodeAnimal() = this as? AnimalNodeCat + @Suppress("USELESS_CAST") + public fun Cat.asNodeAnimal(): AnimalNodeCat? = this as? AnimalNodeCat } } public sealed interface NodeCat : Cat { - public override val __typename: String + override val __typename: String } public data class AnimalNodeCat( - public override val __typename: String, + override val __typename: String, public val species: String, ) : NodeCat public data class OtherCat( - public override val __typename: String, + override val __typename: String, ) : Cat } diff --git a/libraries/apollo-compiler/src/test/graphql/com/example/monomorphic/kotlin/responseBased/monomorphic/adapter/TestQuery_ResponseAdapter.kt.expected b/libraries/apollo-compiler/src/test/graphql/com/example/monomorphic/kotlin/responseBased/monomorphic/adapter/TestQuery_ResponseAdapter.kt.expected index 892b84b53d2..83380f7079c 100644 --- a/libraries/apollo-compiler/src/test/graphql/com/example/monomorphic/kotlin/responseBased/monomorphic/adapter/TestQuery_ResponseAdapter.kt.expected +++ b/libraries/apollo-compiler/src/test/graphql/com/example/monomorphic/kotlin/responseBased/monomorphic/adapter/TestQuery_ResponseAdapter.kt.expected @@ -16,14 +16,13 @@ import com.apollographql.apollo3.api.obj import com.example.monomorphic.TestQuery import kotlin.String import kotlin.Suppress -import kotlin.Unit import kotlin.collections.List public object TestQuery_ResponseAdapter { public object Data : CompositeAdapter { public val RESPONSE_NAMES: List = listOf("cat") - public override fun fromJson(reader: JsonReader, adapterContext: CompositeAdapterContext): + override fun fromJson(reader: JsonReader, adapterContext: CompositeAdapterContext): TestQuery.Data { var _cat: TestQuery.Data.Cat? = null @@ -39,17 +38,17 @@ public object TestQuery_ResponseAdapter { ) } - public override fun toJson( + override fun toJson( writer: JsonWriter, `value`: TestQuery.Data, adapterContext: CompositeAdapterContext, - ): Unit { + ) { writer.name("cat") Cat.obj().toJson(writer, value.cat, adapterContext) } private object Cat : CompositeAdapter { - public override fun fromJson(reader: JsonReader, adapterContext: CompositeAdapterContext): + override fun fromJson(reader: JsonReader, adapterContext: CompositeAdapterContext): TestQuery.Data.Cat { val __typename = reader.readTypename() return when(__typename) { @@ -60,11 +59,11 @@ public object TestQuery_ResponseAdapter { } } - public override fun toJson( + override fun toJson( writer: JsonWriter, `value`: TestQuery.Data.Cat, adapterContext: CompositeAdapterContext, - ): Unit { + ) { when(value) { is TestQuery.Data.AnimalNodeCat -> AnimalNodeCat.toJson(writer, value, adapterContext) is TestQuery.Data.OtherCat -> OtherCat.toJson(writer, value, adapterContext) @@ -101,7 +100,7 @@ public object TestQuery_ResponseAdapter { writer: JsonWriter, `value`: TestQuery.Data.AnimalNodeCat, @Suppress("UNUSED_PARAMETER") adapterContext: CompositeAdapterContext, - ): Unit { + ) { writer.name("__typename") StringAdapter.toJson(writer, CustomScalarAdapters.Empty, value.__typename) @@ -136,7 +135,7 @@ public object TestQuery_ResponseAdapter { writer: JsonWriter, `value`: TestQuery.Data.OtherCat, @Suppress("UNUSED_PARAMETER") adapterContext: CompositeAdapterContext, - ): Unit { + ) { writer.name("__typename") StringAdapter.toJson(writer, CustomScalarAdapters.Empty, value.__typename) } diff --git a/libraries/apollo-compiler/src/test/graphql/com/example/multiple_fragments/kotlin/operationBased/multiple_fragments/TestQuery.kt.expected b/libraries/apollo-compiler/src/test/graphql/com/example/multiple_fragments/kotlin/operationBased/multiple_fragments/TestQuery.kt.expected index 4e832976357..5adc66a8197 100644 --- a/libraries/apollo-compiler/src/test/graphql/com/example/multiple_fragments/kotlin/operationBased/multiple_fragments/TestQuery.kt.expected +++ b/libraries/apollo-compiler/src/test/graphql/com/example/multiple_fragments/kotlin/operationBased/multiple_fragments/TestQuery.kt.expected @@ -19,32 +19,32 @@ import kotlin.Any import kotlin.Boolean import kotlin.Int import kotlin.String -import kotlin.Unit +import com.example.multiple_fragments.type.Query as CompiledQuery public class TestQuery() : Query { - public override fun equals(other: Any?): Boolean = other != null && other::class == this::class + override fun equals(other: Any?): Boolean = other != null && other::class == this::class - public override fun hashCode(): Int = this::class.hashCode() + override fun hashCode(): Int = this::class.hashCode() - public override fun id(): String = OPERATION_ID + override fun id(): String = OPERATION_ID - public override fun document(): String = OPERATION_DOCUMENT + override fun document(): String = OPERATION_DOCUMENT - public override fun name(): String = OPERATION_NAME + override fun name(): String = OPERATION_NAME - public override fun serializeVariables( + override fun serializeVariables( writer: JsonWriter, customScalarAdapters: CustomScalarAdapters, withBooleanDefaultValues: Boolean, - ): Unit { + ) { // This operation doesn't have any variable } - public override fun adapter(): CompositeAdapter = TestQuery_ResponseAdapter.Data.obj() + override fun adapter(): CompositeAdapter = TestQuery_ResponseAdapter.Data.obj() - public override fun rootField(): CompiledField = CompiledField.Builder( + override fun rootField(): CompiledField = CompiledField.Builder( name = "data", - type = com.example.multiple_fragments.type.Query.type + type = CompiledQuery.type ) .selections(selections = TestQuerySelections.__root) .build() diff --git a/libraries/apollo-compiler/src/test/graphql/com/example/multiple_fragments/kotlin/operationBased/multiple_fragments/adapter/TestQuery_ResponseAdapter.kt.expected b/libraries/apollo-compiler/src/test/graphql/com/example/multiple_fragments/kotlin/operationBased/multiple_fragments/adapter/TestQuery_ResponseAdapter.kt.expected index 20ed3f6d98e..d5a8afc52c0 100644 --- a/libraries/apollo-compiler/src/test/graphql/com/example/multiple_fragments/kotlin/operationBased/multiple_fragments/adapter/TestQuery_ResponseAdapter.kt.expected +++ b/libraries/apollo-compiler/src/test/graphql/com/example/multiple_fragments/kotlin/operationBased/multiple_fragments/adapter/TestQuery_ResponseAdapter.kt.expected @@ -15,14 +15,13 @@ import com.apollographql.apollo3.api.nullable import com.apollographql.apollo3.api.obj import com.example.multiple_fragments.TestQuery import kotlin.String -import kotlin.Unit import kotlin.collections.List public object TestQuery_ResponseAdapter { public object Data : CompositeAdapter { public val RESPONSE_NAMES: List = listOf("a") - public override fun fromJson(reader: JsonReader, adapterContext: CompositeAdapterContext): + override fun fromJson(reader: JsonReader, adapterContext: CompositeAdapterContext): TestQuery.Data { var _a: TestQuery.Data.A? = null @@ -38,11 +37,11 @@ public object TestQuery_ResponseAdapter { ) } - public override fun toJson( + override fun toJson( writer: JsonWriter, `value`: TestQuery.Data, adapterContext: CompositeAdapterContext, - ): Unit { + ) { writer.name("a") A.obj(true).nullable().toJson(writer, value.a, adapterContext) } @@ -50,7 +49,7 @@ public object TestQuery_ResponseAdapter { private object A : CompositeAdapter { public val RESPONSE_NAMES: List = listOf("__typename") - public override fun fromJson(reader: JsonReader, adapterContext: CompositeAdapterContext): + override fun fromJson(reader: JsonReader, adapterContext: CompositeAdapterContext): TestQuery.Data.A { var __typename: String? = null @@ -71,11 +70,11 @@ public object TestQuery_ResponseAdapter { ) } - public override fun toJson( + override fun toJson( writer: JsonWriter, `value`: TestQuery.Data.A, adapterContext: CompositeAdapterContext, - ): Unit { + ) { writer.name("__typename") StringAdapter.toJson(writer, CustomScalarAdapters.Empty, value.__typename) diff --git a/libraries/apollo-compiler/src/test/graphql/com/example/multiple_fragments/kotlin/operationBased/multiple_fragments/fragment/AFragmentImpl.kt.expected b/libraries/apollo-compiler/src/test/graphql/com/example/multiple_fragments/kotlin/operationBased/multiple_fragments/fragment/AFragmentImpl.kt.expected index bd5c6a88702..f59c17ca4bb 100644 --- a/libraries/apollo-compiler/src/test/graphql/com/example/multiple_fragments/kotlin/operationBased/multiple_fragments/fragment/AFragmentImpl.kt.expected +++ b/libraries/apollo-compiler/src/test/graphql/com/example/multiple_fragments/kotlin/operationBased/multiple_fragments/fragment/AFragmentImpl.kt.expected @@ -16,25 +16,24 @@ import com.example.multiple_fragments.type.A import kotlin.Any import kotlin.Boolean import kotlin.Int -import kotlin.Unit public class AFragmentImpl() : Fragment { - public override fun equals(other: Any?): Boolean = other != null && other::class == this::class + override fun equals(other: Any?): Boolean = other != null && other::class == this::class - public override fun hashCode(): Int = this::class.hashCode() + override fun hashCode(): Int = this::class.hashCode() - public override fun serializeVariables( + override fun serializeVariables( writer: JsonWriter, customScalarAdapters: CustomScalarAdapters, withBooleanDefaultValues: Boolean, - ): Unit { + ) { // This fragment doesn't have any variable } - public override fun adapter(): CompositeAdapter = + override fun adapter(): CompositeAdapter = AFragmentImpl_ResponseAdapter.AFragment.obj() - public override fun rootField(): CompiledField = CompiledField.Builder( + override fun rootField(): CompiledField = CompiledField.Builder( name = "data", type = A.type ) diff --git a/libraries/apollo-compiler/src/test/graphql/com/example/multiple_fragments/kotlin/operationBased/multiple_fragments/fragment/AFragmentImpl_ResponseAdapter.kt.expected b/libraries/apollo-compiler/src/test/graphql/com/example/multiple_fragments/kotlin/operationBased/multiple_fragments/fragment/AFragmentImpl_ResponseAdapter.kt.expected index 0da22ba5483..f8d38a38b7f 100644 --- a/libraries/apollo-compiler/src/test/graphql/com/example/multiple_fragments/kotlin/operationBased/multiple_fragments/fragment/AFragmentImpl_ResponseAdapter.kt.expected +++ b/libraries/apollo-compiler/src/test/graphql/com/example/multiple_fragments/kotlin/operationBased/multiple_fragments/fragment/AFragmentImpl_ResponseAdapter.kt.expected @@ -16,14 +16,13 @@ import com.apollographql.apollo3.api.nullable import com.apollographql.apollo3.api.obj import com.apollographql.apollo3.api.possibleTypes import kotlin.String -import kotlin.Unit import kotlin.collections.List public object AFragmentImpl_ResponseAdapter { public object AFragment : CompositeAdapter { public val RESPONSE_NAMES: List = listOf("node") - public override fun fromJson(reader: JsonReader, adapterContext: CompositeAdapterContext): + override fun fromJson(reader: JsonReader, adapterContext: CompositeAdapterContext): com.example.multiple_fragments.fragment.AFragment { var _node: com.example.multiple_fragments.fragment.AFragment.Node? = null @@ -39,11 +38,11 @@ public object AFragmentImpl_ResponseAdapter { ) } - public override fun toJson( + override fun toJson( writer: JsonWriter, `value`: com.example.multiple_fragments.fragment.AFragment, adapterContext: CompositeAdapterContext, - ): Unit { + ) { writer.name("node") Node.obj(true).nullable().toJson(writer, value.node, adapterContext) } @@ -51,7 +50,7 @@ public object AFragmentImpl_ResponseAdapter { private object Node : CompositeAdapter { public val RESPONSE_NAMES: List = listOf("__typename") - public override fun fromJson(reader: JsonReader, adapterContext: CompositeAdapterContext): + override fun fromJson(reader: JsonReader, adapterContext: CompositeAdapterContext): com.example.multiple_fragments.fragment.AFragment.Node { var __typename: String? = null @@ -87,11 +86,11 @@ public object AFragmentImpl_ResponseAdapter { ) } - public override fun toJson( + override fun toJson( writer: JsonWriter, `value`: com.example.multiple_fragments.fragment.AFragment.Node, adapterContext: CompositeAdapterContext, - ): Unit { + ) { writer.name("__typename") StringAdapter.toJson(writer, CustomScalarAdapters.Empty, value.__typename) diff --git a/libraries/apollo-compiler/src/test/graphql/com/example/multiple_fragments/kotlin/operationBased/multiple_fragments/fragment/Fragment1Impl.kt.expected b/libraries/apollo-compiler/src/test/graphql/com/example/multiple_fragments/kotlin/operationBased/multiple_fragments/fragment/Fragment1Impl.kt.expected index b9ea71507a9..3338c4e349e 100644 --- a/libraries/apollo-compiler/src/test/graphql/com/example/multiple_fragments/kotlin/operationBased/multiple_fragments/fragment/Fragment1Impl.kt.expected +++ b/libraries/apollo-compiler/src/test/graphql/com/example/multiple_fragments/kotlin/operationBased/multiple_fragments/fragment/Fragment1Impl.kt.expected @@ -16,25 +16,24 @@ import com.example.multiple_fragments.type.ANode import kotlin.Any import kotlin.Boolean import kotlin.Int -import kotlin.Unit public class Fragment1Impl() : Fragment { - public override fun equals(other: Any?): Boolean = other != null && other::class == this::class + override fun equals(other: Any?): Boolean = other != null && other::class == this::class - public override fun hashCode(): Int = this::class.hashCode() + override fun hashCode(): Int = this::class.hashCode() - public override fun serializeVariables( + override fun serializeVariables( writer: JsonWriter, customScalarAdapters: CustomScalarAdapters, withBooleanDefaultValues: Boolean, - ): Unit { + ) { // This fragment doesn't have any variable } - public override fun adapter(): CompositeAdapter = + override fun adapter(): CompositeAdapter = Fragment1Impl_ResponseAdapter.Fragment1.obj() - public override fun rootField(): CompiledField = CompiledField.Builder( + override fun rootField(): CompiledField = CompiledField.Builder( name = "data", type = ANode.type ) diff --git a/libraries/apollo-compiler/src/test/graphql/com/example/multiple_fragments/kotlin/operationBased/multiple_fragments/fragment/Fragment1Impl_ResponseAdapter.kt.expected b/libraries/apollo-compiler/src/test/graphql/com/example/multiple_fragments/kotlin/operationBased/multiple_fragments/fragment/Fragment1Impl_ResponseAdapter.kt.expected index 898399448f1..55e5c0ea8d3 100644 --- a/libraries/apollo-compiler/src/test/graphql/com/example/multiple_fragments/kotlin/operationBased/multiple_fragments/fragment/Fragment1Impl_ResponseAdapter.kt.expected +++ b/libraries/apollo-compiler/src/test/graphql/com/example/multiple_fragments/kotlin/operationBased/multiple_fragments/fragment/Fragment1Impl_ResponseAdapter.kt.expected @@ -12,14 +12,13 @@ import com.apollographql.apollo3.api.NullableStringAdapter import com.apollographql.apollo3.api.json.JsonReader import com.apollographql.apollo3.api.json.JsonWriter import kotlin.String -import kotlin.Unit import kotlin.collections.List public object Fragment1Impl_ResponseAdapter { public object Fragment1 : CompositeAdapter { public val RESPONSE_NAMES: List = listOf("field1") - public override fun fromJson(reader: JsonReader, adapterContext: CompositeAdapterContext): + override fun fromJson(reader: JsonReader, adapterContext: CompositeAdapterContext): com.example.multiple_fragments.fragment.Fragment1 { var _field1: String? = null @@ -35,11 +34,11 @@ public object Fragment1Impl_ResponseAdapter { ) } - public override fun toJson( + override fun toJson( writer: JsonWriter, `value`: com.example.multiple_fragments.fragment.Fragment1, adapterContext: CompositeAdapterContext, - ): Unit { + ) { writer.name("field1") NullableStringAdapter.toJson(writer, CustomScalarAdapters.Empty, value.field1) } diff --git a/libraries/apollo-compiler/src/test/graphql/com/example/multiple_fragments/kotlin/operationBased/multiple_fragments/fragment/Fragment2Impl.kt.expected b/libraries/apollo-compiler/src/test/graphql/com/example/multiple_fragments/kotlin/operationBased/multiple_fragments/fragment/Fragment2Impl.kt.expected index 40bb7ddd120..289479c2811 100644 --- a/libraries/apollo-compiler/src/test/graphql/com/example/multiple_fragments/kotlin/operationBased/multiple_fragments/fragment/Fragment2Impl.kt.expected +++ b/libraries/apollo-compiler/src/test/graphql/com/example/multiple_fragments/kotlin/operationBased/multiple_fragments/fragment/Fragment2Impl.kt.expected @@ -16,25 +16,24 @@ import com.example.multiple_fragments.type.ANode import kotlin.Any import kotlin.Boolean import kotlin.Int -import kotlin.Unit public class Fragment2Impl() : Fragment { - public override fun equals(other: Any?): Boolean = other != null && other::class == this::class + override fun equals(other: Any?): Boolean = other != null && other::class == this::class - public override fun hashCode(): Int = this::class.hashCode() + override fun hashCode(): Int = this::class.hashCode() - public override fun serializeVariables( + override fun serializeVariables( writer: JsonWriter, customScalarAdapters: CustomScalarAdapters, withBooleanDefaultValues: Boolean, - ): Unit { + ) { // This fragment doesn't have any variable } - public override fun adapter(): CompositeAdapter = + override fun adapter(): CompositeAdapter = Fragment2Impl_ResponseAdapter.Fragment2.obj() - public override fun rootField(): CompiledField = CompiledField.Builder( + override fun rootField(): CompiledField = CompiledField.Builder( name = "data", type = ANode.type ) diff --git a/libraries/apollo-compiler/src/test/graphql/com/example/multiple_fragments/kotlin/operationBased/multiple_fragments/fragment/Fragment2Impl_ResponseAdapter.kt.expected b/libraries/apollo-compiler/src/test/graphql/com/example/multiple_fragments/kotlin/operationBased/multiple_fragments/fragment/Fragment2Impl_ResponseAdapter.kt.expected index 2cfd73a986d..e45cb9eedb8 100644 --- a/libraries/apollo-compiler/src/test/graphql/com/example/multiple_fragments/kotlin/operationBased/multiple_fragments/fragment/Fragment2Impl_ResponseAdapter.kt.expected +++ b/libraries/apollo-compiler/src/test/graphql/com/example/multiple_fragments/kotlin/operationBased/multiple_fragments/fragment/Fragment2Impl_ResponseAdapter.kt.expected @@ -12,14 +12,13 @@ import com.apollographql.apollo3.api.NullableStringAdapter import com.apollographql.apollo3.api.json.JsonReader import com.apollographql.apollo3.api.json.JsonWriter import kotlin.String -import kotlin.Unit import kotlin.collections.List public object Fragment2Impl_ResponseAdapter { public object Fragment2 : CompositeAdapter { public val RESPONSE_NAMES: List = listOf("field2") - public override fun fromJson(reader: JsonReader, adapterContext: CompositeAdapterContext): + override fun fromJson(reader: JsonReader, adapterContext: CompositeAdapterContext): com.example.multiple_fragments.fragment.Fragment2 { var _field2: String? = null @@ -35,11 +34,11 @@ public object Fragment2Impl_ResponseAdapter { ) } - public override fun toJson( + override fun toJson( writer: JsonWriter, `value`: com.example.multiple_fragments.fragment.Fragment2, adapterContext: CompositeAdapterContext, - ): Unit { + ) { writer.name("field2") NullableStringAdapter.toJson(writer, CustomScalarAdapters.Empty, value.field2) } diff --git a/libraries/apollo-compiler/src/test/graphql/com/example/multiple_fragments/kotlin/responseBased/multiple_fragments/TestQuery.kt.expected b/libraries/apollo-compiler/src/test/graphql/com/example/multiple_fragments/kotlin/responseBased/multiple_fragments/TestQuery.kt.expected index d8a9257e864..cbc28ce0455 100644 --- a/libraries/apollo-compiler/src/test/graphql/com/example/multiple_fragments/kotlin/responseBased/multiple_fragments/TestQuery.kt.expected +++ b/libraries/apollo-compiler/src/test/graphql/com/example/multiple_fragments/kotlin/responseBased/multiple_fragments/TestQuery.kt.expected @@ -21,32 +21,33 @@ import kotlin.Any import kotlin.Boolean import kotlin.Int import kotlin.String -import kotlin.Unit +import kotlin.Suppress +import com.example.multiple_fragments.type.Query as CompiledQuery public class TestQuery() : Query { - public override fun equals(other: Any?): Boolean = other != null && other::class == this::class + override fun equals(other: Any?): Boolean = other != null && other::class == this::class - public override fun hashCode(): Int = this::class.hashCode() + override fun hashCode(): Int = this::class.hashCode() - public override fun id(): String = OPERATION_ID + override fun id(): String = OPERATION_ID - public override fun document(): String = OPERATION_DOCUMENT + override fun document(): String = OPERATION_DOCUMENT - public override fun name(): String = OPERATION_NAME + override fun name(): String = OPERATION_NAME - public override fun serializeVariables( + override fun serializeVariables( writer: JsonWriter, customScalarAdapters: CustomScalarAdapters, withBooleanDefaultValues: Boolean, - ): Unit { + ) { // This operation doesn't have any variable } - public override fun adapter(): CompositeAdapter = TestQuery_ResponseAdapter.Data.obj() + override fun adapter(): CompositeAdapter = TestQuery_ResponseAdapter.Data.obj() - public override fun rootField(): CompiledField = CompiledField.Builder( + override fun rootField(): CompiledField = CompiledField.Builder( name = "data", - type = com.example.multiple_fragments.type.Query.type + type = CompiledQuery.type ) .selections(selections = TestQuerySelections.__root) .build() @@ -57,32 +58,36 @@ public class TestQuery() : Query { ) : Query.Data { public data class A( public val __typename: String, - public override val node: Node?, + override val node: Node?, ) : AFragment { public sealed interface Node : AFragment.Node { - public override val __typename: String + override val __typename: String public companion object { - public fun Node.fragment1() = this as? Fragment1 + @Suppress("USELESS_CAST") + public fun Node.fragment1(): Fragment1? = this as? Fragment1 - public fun Node.fragment2() = this as? Fragment2 + @Suppress("USELESS_CAST") + public fun Node.fragment2(): Fragment2? = this as? Fragment2 - public fun Node.asANode() = this as? ANodeNode + @Suppress("USELESS_CAST") + public fun Node.asANode(): ANodeNode? = this as? ANodeNode } } public data class ANodeNode( - public override val __typename: String, - public override val field1: String?, - public override val field2: String?, + override val __typename: String, + override val field1: String?, + override val field2: String?, ) : Node, Fragment1, Fragment2, AFragment.ANodeNode public data class OtherNode( - public override val __typename: String, + override val __typename: String, ) : Node, AFragment.Node public companion object { - public fun A.aFragment() = this as? AFragment + @Suppress("USELESS_CAST") + public fun A.aFragment(): AFragment? = this as? AFragment } } } diff --git a/libraries/apollo-compiler/src/test/graphql/com/example/multiple_fragments/kotlin/responseBased/multiple_fragments/adapter/TestQuery_ResponseAdapter.kt.expected b/libraries/apollo-compiler/src/test/graphql/com/example/multiple_fragments/kotlin/responseBased/multiple_fragments/adapter/TestQuery_ResponseAdapter.kt.expected index 1c23d47b5ec..697caecfad9 100644 --- a/libraries/apollo-compiler/src/test/graphql/com/example/multiple_fragments/kotlin/responseBased/multiple_fragments/adapter/TestQuery_ResponseAdapter.kt.expected +++ b/libraries/apollo-compiler/src/test/graphql/com/example/multiple_fragments/kotlin/responseBased/multiple_fragments/adapter/TestQuery_ResponseAdapter.kt.expected @@ -18,14 +18,13 @@ import com.apollographql.apollo3.api.obj import com.example.multiple_fragments.TestQuery import kotlin.String import kotlin.Suppress -import kotlin.Unit import kotlin.collections.List public object TestQuery_ResponseAdapter { public object Data : CompositeAdapter { public val RESPONSE_NAMES: List = listOf("a") - public override fun fromJson(reader: JsonReader, adapterContext: CompositeAdapterContext): + override fun fromJson(reader: JsonReader, adapterContext: CompositeAdapterContext): TestQuery.Data { var _a: TestQuery.Data.A? = null @@ -41,11 +40,11 @@ public object TestQuery_ResponseAdapter { ) } - public override fun toJson( + override fun toJson( writer: JsonWriter, `value`: TestQuery.Data, adapterContext: CompositeAdapterContext, - ): Unit { + ) { writer.name("a") A.obj().nullable().toJson(writer, value.a, adapterContext) } @@ -53,7 +52,7 @@ public object TestQuery_ResponseAdapter { private object A : CompositeAdapter { public val RESPONSE_NAMES: List = listOf("__typename", "node") - public override fun fromJson(reader: JsonReader, adapterContext: CompositeAdapterContext): + override fun fromJson(reader: JsonReader, adapterContext: CompositeAdapterContext): TestQuery.Data.A { var __typename: String? = null var _node: TestQuery.Data.A.Node? = null @@ -72,11 +71,11 @@ public object TestQuery_ResponseAdapter { ) } - public override fun toJson( + override fun toJson( writer: JsonWriter, `value`: TestQuery.Data.A, adapterContext: CompositeAdapterContext, - ): Unit { + ) { writer.name("__typename") StringAdapter.toJson(writer, CustomScalarAdapters.Empty, value.__typename) @@ -85,7 +84,7 @@ public object TestQuery_ResponseAdapter { } private object Node : CompositeAdapter { - public override fun fromJson(reader: JsonReader, adapterContext: CompositeAdapterContext): + override fun fromJson(reader: JsonReader, adapterContext: CompositeAdapterContext): TestQuery.Data.A.Node { val __typename = reader.readTypename() return when(__typename) { @@ -96,11 +95,11 @@ public object TestQuery_ResponseAdapter { } } - public override fun toJson( + override fun toJson( writer: JsonWriter, `value`: TestQuery.Data.A.Node, adapterContext: CompositeAdapterContext, - ): Unit { + ) { when(value) { is TestQuery.Data.A.ANodeNode -> ANodeNode.toJson(writer, value, adapterContext) is TestQuery.Data.A.OtherNode -> OtherNode.toJson(writer, value, adapterContext) @@ -140,7 +139,7 @@ public object TestQuery_ResponseAdapter { writer: JsonWriter, `value`: TestQuery.Data.A.ANodeNode, @Suppress("UNUSED_PARAMETER") adapterContext: CompositeAdapterContext, - ): Unit { + ) { writer.name("__typename") StringAdapter.toJson(writer, CustomScalarAdapters.Empty, value.__typename) @@ -178,7 +177,7 @@ public object TestQuery_ResponseAdapter { writer: JsonWriter, `value`: TestQuery.Data.A.OtherNode, @Suppress("UNUSED_PARAMETER") adapterContext: CompositeAdapterContext, - ): Unit { + ) { writer.name("__typename") StringAdapter.toJson(writer, CustomScalarAdapters.Empty, value.__typename) } diff --git a/libraries/apollo-compiler/src/test/graphql/com/example/multiple_fragments/kotlin/responseBased/multiple_fragments/fragment/AFragment.kt.expected b/libraries/apollo-compiler/src/test/graphql/com/example/multiple_fragments/kotlin/responseBased/multiple_fragments/fragment/AFragment.kt.expected index f1c7fd16a37..47e421824e7 100644 --- a/libraries/apollo-compiler/src/test/graphql/com/example/multiple_fragments/kotlin/responseBased/multiple_fragments/fragment/AFragment.kt.expected +++ b/libraries/apollo-compiler/src/test/graphql/com/example/multiple_fragments/kotlin/responseBased/multiple_fragments/fragment/AFragment.kt.expected @@ -6,6 +6,7 @@ package com.example.multiple_fragments.fragment import kotlin.String +import kotlin.Suppress public interface AFragment { public val node: Node? @@ -14,19 +15,22 @@ public interface AFragment { public val __typename: String public companion object { - public fun Node.fragment1() = this as? Fragment1 + @Suppress("USELESS_CAST") + public fun Node.fragment1(): Fragment1? = this as? Fragment1 - public fun Node.fragment2() = this as? Fragment2 + @Suppress("USELESS_CAST") + public fun Node.fragment2(): Fragment2? = this as? Fragment2 - public fun Node.asANode() = this as? ANodeNode + @Suppress("USELESS_CAST") + public fun Node.asANode(): ANodeNode? = this as? ANodeNode } } public interface ANodeNode : Node, Fragment1, Fragment2 { - public override val __typename: String + override val __typename: String - public override val field1: String? + override val field1: String? - public override val field2: String? + override val field2: String? } } diff --git a/libraries/apollo-compiler/src/test/graphql/com/example/multiple_fragments/kotlin/responseBased/multiple_fragments/fragment/AFragmentImpl.kt.expected b/libraries/apollo-compiler/src/test/graphql/com/example/multiple_fragments/kotlin/responseBased/multiple_fragments/fragment/AFragmentImpl.kt.expected index 4750057da2a..c530887cac1 100644 --- a/libraries/apollo-compiler/src/test/graphql/com/example/multiple_fragments/kotlin/responseBased/multiple_fragments/fragment/AFragmentImpl.kt.expected +++ b/libraries/apollo-compiler/src/test/graphql/com/example/multiple_fragments/kotlin/responseBased/multiple_fragments/fragment/AFragmentImpl.kt.expected @@ -17,24 +17,24 @@ import kotlin.Any import kotlin.Boolean import kotlin.Int import kotlin.String -import kotlin.Unit +import kotlin.Suppress public class AFragmentImpl() : Fragment { - public override fun equals(other: Any?): Boolean = other != null && other::class == this::class + override fun equals(other: Any?): Boolean = other != null && other::class == this::class - public override fun hashCode(): Int = this::class.hashCode() + override fun hashCode(): Int = this::class.hashCode() - public override fun serializeVariables( + override fun serializeVariables( writer: JsonWriter, customScalarAdapters: CustomScalarAdapters, withBooleanDefaultValues: Boolean, - ): Unit { + ) { // This fragment doesn't have any variable } - public override fun adapter(): CompositeAdapter = AFragmentImpl_ResponseAdapter.Data.obj() + override fun adapter(): CompositeAdapter = AFragmentImpl_ResponseAdapter.Data.obj() - public override fun rootField(): CompiledField = CompiledField.Builder( + override fun rootField(): CompiledField = CompiledField.Builder( name = "data", type = A.type ) @@ -42,28 +42,31 @@ public class AFragmentImpl() : Fragment { .build() public data class Data( - public override val node: Node?, + override val node: Node?, ) : AFragment, Fragment.Data { public sealed interface Node : AFragment.Node { - public override val __typename: String + override val __typename: String public companion object { - public fun Node.fragment1() = this as? Fragment1 + @Suppress("USELESS_CAST") + public fun Node.fragment1(): Fragment1? = this as? Fragment1 - public fun Node.fragment2() = this as? Fragment2 + @Suppress("USELESS_CAST") + public fun Node.fragment2(): Fragment2? = this as? Fragment2 - public fun Node.asANode() = this as? ANodeNode + @Suppress("USELESS_CAST") + public fun Node.asANode(): ANodeNode? = this as? ANodeNode } } public data class ANodeNode( - public override val __typename: String, - public override val field1: String?, - public override val field2: String?, + override val __typename: String, + override val field1: String?, + override val field2: String?, ) : Node, Fragment1, Fragment2, AFragment.ANodeNode public data class OtherNode( - public override val __typename: String, + override val __typename: String, ) : Node, AFragment.Node } } diff --git a/libraries/apollo-compiler/src/test/graphql/com/example/multiple_fragments/kotlin/responseBased/multiple_fragments/fragment/AFragmentImpl_ResponseAdapter.kt.expected b/libraries/apollo-compiler/src/test/graphql/com/example/multiple_fragments/kotlin/responseBased/multiple_fragments/fragment/AFragmentImpl_ResponseAdapter.kt.expected index 39f04b80e5b..013d000447c 100644 --- a/libraries/apollo-compiler/src/test/graphql/com/example/multiple_fragments/kotlin/responseBased/multiple_fragments/fragment/AFragmentImpl_ResponseAdapter.kt.expected +++ b/libraries/apollo-compiler/src/test/graphql/com/example/multiple_fragments/kotlin/responseBased/multiple_fragments/fragment/AFragmentImpl_ResponseAdapter.kt.expected @@ -17,14 +17,13 @@ import com.apollographql.apollo3.api.nullable import com.apollographql.apollo3.api.obj import kotlin.String import kotlin.Suppress -import kotlin.Unit import kotlin.collections.List public object AFragmentImpl_ResponseAdapter { public object Data : CompositeAdapter { public val RESPONSE_NAMES: List = listOf("node") - public override fun fromJson(reader: JsonReader, adapterContext: CompositeAdapterContext): + override fun fromJson(reader: JsonReader, adapterContext: CompositeAdapterContext): AFragmentImpl.Data { var _node: AFragmentImpl.Data.Node? = null @@ -40,17 +39,17 @@ public object AFragmentImpl_ResponseAdapter { ) } - public override fun toJson( + override fun toJson( writer: JsonWriter, `value`: AFragmentImpl.Data, adapterContext: CompositeAdapterContext, - ): Unit { + ) { writer.name("node") Node.obj().nullable().toJson(writer, value.node, adapterContext) } private object Node : CompositeAdapter { - public override fun fromJson(reader: JsonReader, adapterContext: CompositeAdapterContext): + override fun fromJson(reader: JsonReader, adapterContext: CompositeAdapterContext): AFragmentImpl.Data.Node { val __typename = reader.readTypename() return when(__typename) { @@ -61,11 +60,11 @@ public object AFragmentImpl_ResponseAdapter { } } - public override fun toJson( + override fun toJson( writer: JsonWriter, `value`: AFragmentImpl.Data.Node, adapterContext: CompositeAdapterContext, - ): Unit { + ) { when(value) { is AFragmentImpl.Data.ANodeNode -> ANodeNode.toJson(writer, value, adapterContext) is AFragmentImpl.Data.OtherNode -> OtherNode.toJson(writer, value, adapterContext) @@ -105,7 +104,7 @@ public object AFragmentImpl_ResponseAdapter { writer: JsonWriter, `value`: AFragmentImpl.Data.ANodeNode, @Suppress("UNUSED_PARAMETER") adapterContext: CompositeAdapterContext, - ): Unit { + ) { writer.name("__typename") StringAdapter.toJson(writer, CustomScalarAdapters.Empty, value.__typename) @@ -143,7 +142,7 @@ public object AFragmentImpl_ResponseAdapter { writer: JsonWriter, `value`: AFragmentImpl.Data.OtherNode, @Suppress("UNUSED_PARAMETER") adapterContext: CompositeAdapterContext, - ): Unit { + ) { writer.name("__typename") StringAdapter.toJson(writer, CustomScalarAdapters.Empty, value.__typename) } diff --git a/libraries/apollo-compiler/src/test/graphql/com/example/multiple_fragments/kotlin/responseBased/multiple_fragments/fragment/Fragment1Impl.kt.expected b/libraries/apollo-compiler/src/test/graphql/com/example/multiple_fragments/kotlin/responseBased/multiple_fragments/fragment/Fragment1Impl.kt.expected index e2164bdb0d6..0541115083b 100644 --- a/libraries/apollo-compiler/src/test/graphql/com/example/multiple_fragments/kotlin/responseBased/multiple_fragments/fragment/Fragment1Impl.kt.expected +++ b/libraries/apollo-compiler/src/test/graphql/com/example/multiple_fragments/kotlin/responseBased/multiple_fragments/fragment/Fragment1Impl.kt.expected @@ -17,24 +17,23 @@ import kotlin.Any import kotlin.Boolean import kotlin.Int import kotlin.String -import kotlin.Unit public class Fragment1Impl() : Fragment { - public override fun equals(other: Any?): Boolean = other != null && other::class == this::class + override fun equals(other: Any?): Boolean = other != null && other::class == this::class - public override fun hashCode(): Int = this::class.hashCode() + override fun hashCode(): Int = this::class.hashCode() - public override fun serializeVariables( + override fun serializeVariables( writer: JsonWriter, customScalarAdapters: CustomScalarAdapters, withBooleanDefaultValues: Boolean, - ): Unit { + ) { // This fragment doesn't have any variable } - public override fun adapter(): CompositeAdapter = Fragment1Impl_ResponseAdapter.Data.obj() + override fun adapter(): CompositeAdapter = Fragment1Impl_ResponseAdapter.Data.obj() - public override fun rootField(): CompiledField = CompiledField.Builder( + override fun rootField(): CompiledField = CompiledField.Builder( name = "data", type = ANode.type ) @@ -42,6 +41,6 @@ public class Fragment1Impl() : Fragment { .build() public data class Data( - public override val field1: String?, + override val field1: String?, ) : Fragment1, Fragment.Data } diff --git a/libraries/apollo-compiler/src/test/graphql/com/example/multiple_fragments/kotlin/responseBased/multiple_fragments/fragment/Fragment1Impl_ResponseAdapter.kt.expected b/libraries/apollo-compiler/src/test/graphql/com/example/multiple_fragments/kotlin/responseBased/multiple_fragments/fragment/Fragment1Impl_ResponseAdapter.kt.expected index b1e67f37d3a..1bfc7aee272 100644 --- a/libraries/apollo-compiler/src/test/graphql/com/example/multiple_fragments/kotlin/responseBased/multiple_fragments/fragment/Fragment1Impl_ResponseAdapter.kt.expected +++ b/libraries/apollo-compiler/src/test/graphql/com/example/multiple_fragments/kotlin/responseBased/multiple_fragments/fragment/Fragment1Impl_ResponseAdapter.kt.expected @@ -12,14 +12,13 @@ import com.apollographql.apollo3.api.NullableStringAdapter import com.apollographql.apollo3.api.json.JsonReader import com.apollographql.apollo3.api.json.JsonWriter import kotlin.String -import kotlin.Unit import kotlin.collections.List public object Fragment1Impl_ResponseAdapter { public object Data : CompositeAdapter { public val RESPONSE_NAMES: List = listOf("field1") - public override fun fromJson(reader: JsonReader, adapterContext: CompositeAdapterContext): + override fun fromJson(reader: JsonReader, adapterContext: CompositeAdapterContext): Fragment1Impl.Data { var _field1: String? = null @@ -35,11 +34,11 @@ public object Fragment1Impl_ResponseAdapter { ) } - public override fun toJson( + override fun toJson( writer: JsonWriter, `value`: Fragment1Impl.Data, adapterContext: CompositeAdapterContext, - ): Unit { + ) { writer.name("field1") NullableStringAdapter.toJson(writer, CustomScalarAdapters.Empty, value.field1) } diff --git a/libraries/apollo-compiler/src/test/graphql/com/example/multiple_fragments/kotlin/responseBased/multiple_fragments/fragment/Fragment2Impl.kt.expected b/libraries/apollo-compiler/src/test/graphql/com/example/multiple_fragments/kotlin/responseBased/multiple_fragments/fragment/Fragment2Impl.kt.expected index 8dc93e0374f..784727a7a73 100644 --- a/libraries/apollo-compiler/src/test/graphql/com/example/multiple_fragments/kotlin/responseBased/multiple_fragments/fragment/Fragment2Impl.kt.expected +++ b/libraries/apollo-compiler/src/test/graphql/com/example/multiple_fragments/kotlin/responseBased/multiple_fragments/fragment/Fragment2Impl.kt.expected @@ -17,24 +17,23 @@ import kotlin.Any import kotlin.Boolean import kotlin.Int import kotlin.String -import kotlin.Unit public class Fragment2Impl() : Fragment { - public override fun equals(other: Any?): Boolean = other != null && other::class == this::class + override fun equals(other: Any?): Boolean = other != null && other::class == this::class - public override fun hashCode(): Int = this::class.hashCode() + override fun hashCode(): Int = this::class.hashCode() - public override fun serializeVariables( + override fun serializeVariables( writer: JsonWriter, customScalarAdapters: CustomScalarAdapters, withBooleanDefaultValues: Boolean, - ): Unit { + ) { // This fragment doesn't have any variable } - public override fun adapter(): CompositeAdapter = Fragment2Impl_ResponseAdapter.Data.obj() + override fun adapter(): CompositeAdapter = Fragment2Impl_ResponseAdapter.Data.obj() - public override fun rootField(): CompiledField = CompiledField.Builder( + override fun rootField(): CompiledField = CompiledField.Builder( name = "data", type = ANode.type ) @@ -42,6 +41,6 @@ public class Fragment2Impl() : Fragment { .build() public data class Data( - public override val field2: String?, + override val field2: String?, ) : Fragment2, Fragment.Data } diff --git a/libraries/apollo-compiler/src/test/graphql/com/example/multiple_fragments/kotlin/responseBased/multiple_fragments/fragment/Fragment2Impl_ResponseAdapter.kt.expected b/libraries/apollo-compiler/src/test/graphql/com/example/multiple_fragments/kotlin/responseBased/multiple_fragments/fragment/Fragment2Impl_ResponseAdapter.kt.expected index 663c643d9d1..53cf40bf427 100644 --- a/libraries/apollo-compiler/src/test/graphql/com/example/multiple_fragments/kotlin/responseBased/multiple_fragments/fragment/Fragment2Impl_ResponseAdapter.kt.expected +++ b/libraries/apollo-compiler/src/test/graphql/com/example/multiple_fragments/kotlin/responseBased/multiple_fragments/fragment/Fragment2Impl_ResponseAdapter.kt.expected @@ -12,14 +12,13 @@ import com.apollographql.apollo3.api.NullableStringAdapter import com.apollographql.apollo3.api.json.JsonReader import com.apollographql.apollo3.api.json.JsonWriter import kotlin.String -import kotlin.Unit import kotlin.collections.List public object Fragment2Impl_ResponseAdapter { public object Data : CompositeAdapter { public val RESPONSE_NAMES: List = listOf("field2") - public override fun fromJson(reader: JsonReader, adapterContext: CompositeAdapterContext): + override fun fromJson(reader: JsonReader, adapterContext: CompositeAdapterContext): Fragment2Impl.Data { var _field2: String? = null @@ -35,11 +34,11 @@ public object Fragment2Impl_ResponseAdapter { ) } - public override fun toJson( + override fun toJson( writer: JsonWriter, `value`: Fragment2Impl.Data, adapterContext: CompositeAdapterContext, - ): Unit { + ) { writer.name("field2") NullableStringAdapter.toJson(writer, CustomScalarAdapters.Empty, value.field2) } diff --git a/libraries/apollo-compiler/src/test/graphql/com/example/mutation_create_review/kotlin/responseBased/mutation_create_review/CreateReviewForEpisode.kt.expected b/libraries/apollo-compiler/src/test/graphql/com/example/mutation_create_review/kotlin/responseBased/mutation_create_review/CreateReviewForEpisode.kt.expected index 53c923672da..fc93171134b 100644 --- a/libraries/apollo-compiler/src/test/graphql/com/example/mutation_create_review/kotlin/responseBased/mutation_create_review/CreateReviewForEpisode.kt.expected +++ b/libraries/apollo-compiler/src/test/graphql/com/example/mutation_create_review/kotlin/responseBased/mutation_create_review/CreateReviewForEpisode.kt.expected @@ -29,32 +29,32 @@ import kotlin.Int import kotlin.String import kotlin.Unit import kotlin.collections.List +import com.example.mutation_create_review.type.Mutation as CompiledMutation internal data class CreateReviewForEpisode( public val ep: Episode, public val review: ReviewInput, ) : Mutation { - public override fun id(): String = OPERATION_ID + override fun id(): String = OPERATION_ID - public override fun document(): String = OPERATION_DOCUMENT + override fun document(): String = OPERATION_DOCUMENT - public override fun name(): String = OPERATION_NAME + override fun name(): String = OPERATION_NAME - public override fun serializeVariables( + override fun serializeVariables( writer: JsonWriter, customScalarAdapters: CustomScalarAdapters, withBooleanDefaultValues: Boolean, - ): Unit { + ) { CreateReviewForEpisode_VariablesAdapter.serializeVariables(writer, this, customScalarAdapters, withBooleanDefaultValues) } - public override fun adapter(): CompositeAdapter = - CreateReviewForEpisode_ResponseAdapter.Data.obj() + override fun adapter(): CompositeAdapter = CreateReviewForEpisode_ResponseAdapter.Data.obj() - public override fun rootField(): CompiledField = CompiledField.Builder( + override fun rootField(): CompiledField = CompiledField.Builder( name = "data", - type = com.example.mutation_create_review.type.Mutation.type + type = CompiledMutation.type ) .selections(selections = CreateReviewForEpisodeSelections.__root) .build() @@ -127,7 +127,7 @@ internal data class CreateReviewForEpisode( public fun Data(resolver: FakeResolver = DefaultFakeResolver(__Schema.all), block: MutationBuilder.() -> Unit = {}): Data = buildData( - com.example.mutation_create_review.type.Mutation, + CompiledMutation, block, CreateReviewForEpisode_ResponseAdapter.Data, CreateReviewForEpisodeSelections.__root, diff --git a/libraries/apollo-compiler/src/test/graphql/com/example/mutation_create_review/kotlin/responseBased/mutation_create_review/adapter/CreateReviewForEpisode_ResponseAdapter.kt.expected b/libraries/apollo-compiler/src/test/graphql/com/example/mutation_create_review/kotlin/responseBased/mutation_create_review/adapter/CreateReviewForEpisode_ResponseAdapter.kt.expected index 4b498574d54..a45ce2d9262 100644 --- a/libraries/apollo-compiler/src/test/graphql/com/example/mutation_create_review/kotlin/responseBased/mutation_create_review/adapter/CreateReviewForEpisode_ResponseAdapter.kt.expected +++ b/libraries/apollo-compiler/src/test/graphql/com/example/mutation_create_review/kotlin/responseBased/mutation_create_review/adapter/CreateReviewForEpisode_ResponseAdapter.kt.expected @@ -17,17 +17,17 @@ import com.apollographql.apollo3.api.obj import com.example.mutation_create_review.CreateReviewForEpisode import com.example.mutation_create_review.type.Episode import com.example.mutation_create_review.type.adapter.Episode_ResponseAdapter -import java.util.Date import kotlin.Int import kotlin.String -import kotlin.Unit import kotlin.collections.List +import com.example.mutation_create_review.type.Date as TypeDate +import java.util.Date as UtilDate internal object CreateReviewForEpisode_ResponseAdapter { public object Data : CompositeAdapter { public val RESPONSE_NAMES: List = listOf("createReview") - public override fun fromJson(reader: JsonReader, adapterContext: CompositeAdapterContext): + override fun fromJson(reader: JsonReader, adapterContext: CompositeAdapterContext): CreateReviewForEpisode.Data { var _createReview: CreateReviewForEpisode.Data.CreateReview? = null @@ -43,11 +43,11 @@ internal object CreateReviewForEpisode_ResponseAdapter { ) } - public override fun toJson( + override fun toJson( writer: JsonWriter, `value`: CreateReviewForEpisode.Data, adapterContext: CompositeAdapterContext, - ): Unit { + ) { writer.name("createReview") CreateReview.obj().nullable().toJson(writer, value.createReview, adapterContext) } @@ -56,13 +56,13 @@ internal object CreateReviewForEpisode_ResponseAdapter { public val RESPONSE_NAMES: List = listOf("stars", "commentary", "listOfListOfString", "listOfListOfEnum", "listOfListOfCustom", "listOfListOfObject") - public override fun fromJson(reader: JsonReader, adapterContext: CompositeAdapterContext): + override fun fromJson(reader: JsonReader, adapterContext: CompositeAdapterContext): CreateReviewForEpisode.Data.CreateReview { var _stars: Int? = null var _commentary: String? = null var _listOfListOfString: List>? = null var _listOfListOfEnum: List>? = null - var _listOfListOfCustom: List>? = null + var _listOfListOfCustom: List>? = null var _listOfListOfObject: List>? = null while (true) { @@ -71,7 +71,7 @@ internal object CreateReviewForEpisode_ResponseAdapter { 1 -> _commentary = com.example.MyStringAdapter().nullable().fromJson(reader, CustomScalarAdapters.Empty) 2 -> _listOfListOfString = com.example.MyStringAdapter().list().list().nullable().fromJson(reader, CustomScalarAdapters.Empty) 3 -> _listOfListOfEnum = Episode_ResponseAdapter.list().list().nullable().fromJson(reader, CustomScalarAdapters.Empty) - 4 -> _listOfListOfCustom = adapterContext.customScalarAdapters.responseAdapterFor(com.example.mutation_create_review.type.Date.type).list().list().nullable().fromJson(reader, CustomScalarAdapters.Empty) + 4 -> _listOfListOfCustom = adapterContext.customScalarAdapters.responseAdapterFor(TypeDate.type).list().list().nullable().fromJson(reader, CustomScalarAdapters.Empty) 5 -> _listOfListOfObject = ListOfListOfObject.obj().list().list().nullable().fromJson(reader, adapterContext) else -> break } @@ -87,11 +87,11 @@ internal object CreateReviewForEpisode_ResponseAdapter { ) } - public override fun toJson( + override fun toJson( writer: JsonWriter, `value`: CreateReviewForEpisode.Data.CreateReview, adapterContext: CompositeAdapterContext, - ): Unit { + ) { writer.name("stars") IntAdapter.toJson(writer, CustomScalarAdapters.Empty, value.stars) @@ -108,7 +108,7 @@ internal object CreateReviewForEpisode_ResponseAdapter { value.listOfListOfEnum) writer.name("listOfListOfCustom") - adapterContext.customScalarAdapters.responseAdapterFor(com.example.mutation_create_review.type.Date.type).list().list().nullable().toJson(writer, + adapterContext.customScalarAdapters.responseAdapterFor(TypeDate.type).list().list().nullable().toJson(writer, CustomScalarAdapters.Empty, value.listOfListOfCustom) writer.name("listOfListOfObject") @@ -120,7 +120,7 @@ internal object CreateReviewForEpisode_ResponseAdapter { CompositeAdapter { public val RESPONSE_NAMES: List = listOf("name") - public override fun fromJson(reader: JsonReader, adapterContext: CompositeAdapterContext): + override fun fromJson(reader: JsonReader, adapterContext: CompositeAdapterContext): CreateReviewForEpisode.Data.CreateReview.ListOfListOfObject { var _name: String? = null @@ -136,11 +136,11 @@ internal object CreateReviewForEpisode_ResponseAdapter { ) } - public override fun toJson( + override fun toJson( writer: JsonWriter, `value`: CreateReviewForEpisode.Data.CreateReview.ListOfListOfObject, adapterContext: CompositeAdapterContext, - ): Unit { + ) { writer.name("name") com.example.MyStringAdapter().toJson(writer, CustomScalarAdapters.Empty, value.name) } diff --git a/libraries/apollo-compiler/src/test/graphql/com/example/mutation_create_review/kotlin/responseBased/mutation_create_review/adapter/CreateReviewForEpisode_VariablesAdapter.kt.expected b/libraries/apollo-compiler/src/test/graphql/com/example/mutation_create_review/kotlin/responseBased/mutation_create_review/adapter/CreateReviewForEpisode_VariablesAdapter.kt.expected index cd3e6371ace..7a5a65232d3 100644 --- a/libraries/apollo-compiler/src/test/graphql/com/example/mutation_create_review/kotlin/responseBased/mutation_create_review/adapter/CreateReviewForEpisode_VariablesAdapter.kt.expected +++ b/libraries/apollo-compiler/src/test/graphql/com/example/mutation_create_review/kotlin/responseBased/mutation_create_review/adapter/CreateReviewForEpisode_VariablesAdapter.kt.expected @@ -14,7 +14,6 @@ import com.example.mutation_create_review.type.adapter.Episode_ResponseAdapter import com.example.mutation_create_review.type.adapter.ReviewInput_InputAdapter import kotlin.Boolean import kotlin.Suppress -import kotlin.Unit internal object CreateReviewForEpisode_VariablesAdapter { @Suppress( @@ -26,7 +25,7 @@ internal object CreateReviewForEpisode_VariablesAdapter { `value`: CreateReviewForEpisode, customScalarAdapters: CustomScalarAdapters, withBooleanDefaultValues: Boolean, - ): Unit { + ) { val adapterContext = CompositeAdapterContext.Builder().customScalarAdapters(customScalarAdapters).build() writer.name("ep") diff --git a/libraries/apollo-compiler/src/test/graphql/com/example/mutation_create_review/kotlin/responseBased/mutation_create_review/type/Character.kt.expected b/libraries/apollo-compiler/src/test/graphql/com/example/mutation_create_review/kotlin/responseBased/mutation_create_review/type/Character.kt.expected index 78da824d537..052d5def459 100644 --- a/libraries/apollo-compiler/src/test/graphql/com/example/mutation_create_review/kotlin/responseBased/mutation_create_review/type/Character.kt.expected +++ b/libraries/apollo-compiler/src/test/graphql/com/example/mutation_create_review/kotlin/responseBased/mutation_create_review/type/Character.kt.expected @@ -23,8 +23,8 @@ internal class Character { public companion object : BuilderFactory { public val type: InterfaceType = InterfaceType.Builder(name = "Character").build() - public override fun newBuilder(customScalarAdapters: CustomScalarAdapters): - OtherCharacterBuilder = OtherCharacterBuilder(customScalarAdapters) + override fun newBuilder(customScalarAdapters: CustomScalarAdapters): OtherCharacterBuilder = + OtherCharacterBuilder(customScalarAdapters) } } @@ -35,7 +35,7 @@ internal class OtherCharacterBuilder( ) : ObjectBuilder(customScalarAdapters) { public var name: String by BuilderProperty(com.example.MyStringAdapter()) - public override fun build(): OtherCharacterMap = OtherCharacterMap(__fields) + override fun build(): OtherCharacterMap = OtherCharacterMap(__fields) } internal class OtherCharacterMap( diff --git a/libraries/apollo-compiler/src/test/graphql/com/example/mutation_create_review/kotlin/responseBased/mutation_create_review/type/Droid.kt.expected b/libraries/apollo-compiler/src/test/graphql/com/example/mutation_create_review/kotlin/responseBased/mutation_create_review/type/Droid.kt.expected index 8c02899af4d..d0430a7a332 100644 --- a/libraries/apollo-compiler/src/test/graphql/com/example/mutation_create_review/kotlin/responseBased/mutation_create_review/type/Droid.kt.expected +++ b/libraries/apollo-compiler/src/test/graphql/com/example/mutation_create_review/kotlin/responseBased/mutation_create_review/type/Droid.kt.expected @@ -24,7 +24,7 @@ internal class Droid { public val type: ObjectType = ObjectType.Builder(name = "Droid").interfaces(listOf(Character.type)).build() - public override fun newBuilder(customScalarAdapters: CustomScalarAdapters): DroidBuilder = + override fun newBuilder(customScalarAdapters: CustomScalarAdapters): DroidBuilder = DroidBuilder(customScalarAdapters) } } @@ -37,7 +37,7 @@ internal class DroidBuilder( init { __typename = "Droid"} - public override fun build(): DroidMap = DroidMap(__fields) + override fun build(): DroidMap = DroidMap(__fields) } internal class DroidMap( diff --git a/libraries/apollo-compiler/src/test/graphql/com/example/mutation_create_review/kotlin/responseBased/mutation_create_review/type/Human.kt.expected b/libraries/apollo-compiler/src/test/graphql/com/example/mutation_create_review/kotlin/responseBased/mutation_create_review/type/Human.kt.expected index e11f23bad0c..1e7bfc889cd 100644 --- a/libraries/apollo-compiler/src/test/graphql/com/example/mutation_create_review/kotlin/responseBased/mutation_create_review/type/Human.kt.expected +++ b/libraries/apollo-compiler/src/test/graphql/com/example/mutation_create_review/kotlin/responseBased/mutation_create_review/type/Human.kt.expected @@ -24,7 +24,7 @@ internal class Human { public val type: ObjectType = ObjectType.Builder(name = "Human").interfaces(listOf(Character.type)).build() - public override fun newBuilder(customScalarAdapters: CustomScalarAdapters): HumanBuilder = + override fun newBuilder(customScalarAdapters: CustomScalarAdapters): HumanBuilder = HumanBuilder(customScalarAdapters) } } @@ -37,7 +37,7 @@ internal class HumanBuilder( init { __typename = "Human"} - public override fun build(): HumanMap = HumanMap(__fields) + override fun build(): HumanMap = HumanMap(__fields) } internal class HumanMap( diff --git a/libraries/apollo-compiler/src/test/graphql/com/example/mutation_create_review/kotlin/responseBased/mutation_create_review/type/Mutation.kt.expected b/libraries/apollo-compiler/src/test/graphql/com/example/mutation_create_review/kotlin/responseBased/mutation_create_review/type/Mutation.kt.expected index 56c239b583f..e78c47a9e6f 100644 --- a/libraries/apollo-compiler/src/test/graphql/com/example/mutation_create_review/kotlin/responseBased/mutation_create_review/type/Mutation.kt.expected +++ b/libraries/apollo-compiler/src/test/graphql/com/example/mutation_create_review/kotlin/responseBased/mutation_create_review/type/Mutation.kt.expected @@ -22,7 +22,7 @@ internal class Mutation { public companion object : BuilderFactory { public val type: ObjectType = ObjectType.Builder(name = "Mutation").build() - public override fun newBuilder(customScalarAdapters: CustomScalarAdapters): MutationBuilder = + override fun newBuilder(customScalarAdapters: CustomScalarAdapters): MutationBuilder = MutationBuilder(customScalarAdapters) } } @@ -35,7 +35,7 @@ internal class MutationBuilder( init { __typename = "Mutation"} - public override fun build(): MutationMap = MutationMap(__fields) + override fun build(): MutationMap = MutationMap(__fields) } internal class MutationMap( diff --git a/libraries/apollo-compiler/src/test/graphql/com/example/mutation_create_review/kotlin/responseBased/mutation_create_review/type/Review.kt.expected b/libraries/apollo-compiler/src/test/graphql/com/example/mutation_create_review/kotlin/responseBased/mutation_create_review/type/Review.kt.expected index d40376b6035..486ab6dee33 100644 --- a/libraries/apollo-compiler/src/test/graphql/com/example/mutation_create_review/kotlin/responseBased/mutation_create_review/type/Review.kt.expected +++ b/libraries/apollo-compiler/src/test/graphql/com/example/mutation_create_review/kotlin/responseBased/mutation_create_review/type/Review.kt.expected @@ -28,7 +28,7 @@ internal class Review { public companion object : BuilderFactory { public val type: ObjectType = ObjectType.Builder(name = "Review").build() - public override fun newBuilder(customScalarAdapters: CustomScalarAdapters): ReviewBuilder = + override fun newBuilder(customScalarAdapters: CustomScalarAdapters): ReviewBuilder = ReviewBuilder(customScalarAdapters) } } @@ -54,7 +54,7 @@ internal class ReviewBuilder( init { __typename = "Review"} - public override fun build(): ReviewMap = ReviewMap(__fields) + override fun build(): ReviewMap = ReviewMap(__fields) } internal class ReviewMap( diff --git a/libraries/apollo-compiler/src/test/graphql/com/example/mutation_create_review/kotlin/responseBased/mutation_create_review/type/SearchResult.kt.expected b/libraries/apollo-compiler/src/test/graphql/com/example/mutation_create_review/kotlin/responseBased/mutation_create_review/type/SearchResult.kt.expected index ef1bc6914cb..ea7298ea379 100644 --- a/libraries/apollo-compiler/src/test/graphql/com/example/mutation_create_review/kotlin/responseBased/mutation_create_review/type/SearchResult.kt.expected +++ b/libraries/apollo-compiler/src/test/graphql/com/example/mutation_create_review/kotlin/responseBased/mutation_create_review/type/SearchResult.kt.expected @@ -19,8 +19,8 @@ internal class SearchResult { public companion object : BuilderFactory { public val type: UnionType = UnionType("SearchResult", Human.type, Droid.type, Starship.type) - public override fun newBuilder(customScalarAdapters: CustomScalarAdapters): - OtherSearchResultBuilder = OtherSearchResultBuilder(customScalarAdapters) + override fun newBuilder(customScalarAdapters: CustomScalarAdapters): OtherSearchResultBuilder = + OtherSearchResultBuilder(customScalarAdapters) } } @@ -29,7 +29,7 @@ internal interface SearchResultMap : Map internal class OtherSearchResultBuilder( customScalarAdapters: CustomScalarAdapters, ) : ObjectBuilder(customScalarAdapters) { - public override fun build(): OtherSearchResultMap = OtherSearchResultMap(__fields) + override fun build(): OtherSearchResultMap = OtherSearchResultMap(__fields) } internal class OtherSearchResultMap( diff --git a/libraries/apollo-compiler/src/test/graphql/com/example/mutation_create_review/kotlin/responseBased/mutation_create_review/type/Starship.kt.expected b/libraries/apollo-compiler/src/test/graphql/com/example/mutation_create_review/kotlin/responseBased/mutation_create_review/type/Starship.kt.expected index bc9519efc81..c7d8d3c762e 100644 --- a/libraries/apollo-compiler/src/test/graphql/com/example/mutation_create_review/kotlin/responseBased/mutation_create_review/type/Starship.kt.expected +++ b/libraries/apollo-compiler/src/test/graphql/com/example/mutation_create_review/kotlin/responseBased/mutation_create_review/type/Starship.kt.expected @@ -19,7 +19,7 @@ internal class Starship { public companion object : BuilderFactory { public val type: ObjectType = ObjectType.Builder(name = "Starship").build() - public override fun newBuilder(customScalarAdapters: CustomScalarAdapters): StarshipBuilder = + override fun newBuilder(customScalarAdapters: CustomScalarAdapters): StarshipBuilder = StarshipBuilder(customScalarAdapters) } } @@ -30,7 +30,7 @@ internal class StarshipBuilder( init { __typename = "Starship"} - public override fun build(): StarshipMap = StarshipMap(__fields) + override fun build(): StarshipMap = StarshipMap(__fields) } internal class StarshipMap( diff --git a/libraries/apollo-compiler/src/test/graphql/com/example/mutation_create_review/kotlin/responseBased/mutation_create_review/type/adapter/ColorInput_InputAdapter.kt.expected b/libraries/apollo-compiler/src/test/graphql/com/example/mutation_create_review/kotlin/responseBased/mutation_create_review/type/adapter/ColorInput_InputAdapter.kt.expected index 6bb567188fc..69b65094850 100644 --- a/libraries/apollo-compiler/src/test/graphql/com/example/mutation_create_review/kotlin/responseBased/mutation_create_review/type/adapter/ColorInput_InputAdapter.kt.expected +++ b/libraries/apollo-compiler/src/test/graphql/com/example/mutation_create_review/kotlin/responseBased/mutation_create_review/type/adapter/ColorInput_InputAdapter.kt.expected @@ -19,17 +19,16 @@ import com.apollographql.apollo3.api.obj import com.apollographql.apollo3.api.present import com.example.mutation_create_review.type.ColorInput import kotlin.IllegalStateException -import kotlin.Unit internal object ColorInput_InputAdapter : CompositeAdapter { - public override fun fromJson(reader: JsonReader, adapterContext: CompositeAdapterContext): - ColorInput = throw IllegalStateException("Input type used in output position") + override fun fromJson(reader: JsonReader, adapterContext: CompositeAdapterContext): ColorInput = + throw IllegalStateException("Input type used in output position") - public override fun toJson( + override fun toJson( writer: JsonWriter, `value`: ColorInput, adapterContext: CompositeAdapterContext, - ): Unit { + ) { if (value.red is Optional.Present) { writer.name("red") IntAdapter.present().toJson(writer, CustomScalarAdapters.Empty, value.red) diff --git a/libraries/apollo-compiler/src/test/graphql/com/example/mutation_create_review/kotlin/responseBased/mutation_create_review/type/adapter/Episode_ResponseAdapter.kt.expected b/libraries/apollo-compiler/src/test/graphql/com/example/mutation_create_review/kotlin/responseBased/mutation_create_review/type/adapter/Episode_ResponseAdapter.kt.expected index c8faa4bb587..772e9e817f2 100644 --- a/libraries/apollo-compiler/src/test/graphql/com/example/mutation_create_review/kotlin/responseBased/mutation_create_review/type/adapter/Episode_ResponseAdapter.kt.expected +++ b/libraries/apollo-compiler/src/test/graphql/com/example/mutation_create_review/kotlin/responseBased/mutation_create_review/type/adapter/Episode_ResponseAdapter.kt.expected @@ -10,20 +10,18 @@ import com.apollographql.apollo3.api.CustomScalarAdapters import com.apollographql.apollo3.api.json.JsonReader import com.apollographql.apollo3.api.json.JsonWriter import com.example.mutation_create_review.type.Episode -import kotlin.Unit internal object Episode_ResponseAdapter : Adapter { - public override fun fromJson(reader: JsonReader, customScalarAdapters: CustomScalarAdapters): - Episode { + override fun fromJson(reader: JsonReader, customScalarAdapters: CustomScalarAdapters): Episode { val rawValue = reader.nextString()!! return Episode.safeValueOf(rawValue) } - public override fun toJson( + override fun toJson( writer: JsonWriter, customScalarAdapters: CustomScalarAdapters, `value`: Episode, - ): Unit { + ) { writer.value(value.rawValue) } } diff --git a/libraries/apollo-compiler/src/test/graphql/com/example/mutation_create_review/kotlin/responseBased/mutation_create_review/type/adapter/ReviewInput_InputAdapter.kt.expected b/libraries/apollo-compiler/src/test/graphql/com/example/mutation_create_review/kotlin/responseBased/mutation_create_review/type/adapter/ReviewInput_InputAdapter.kt.expected index 0ddc3fdda8b..c048abe3fd3 100644 --- a/libraries/apollo-compiler/src/test/graphql/com/example/mutation_create_review/kotlin/responseBased/mutation_create_review/type/adapter/ReviewInput_InputAdapter.kt.expected +++ b/libraries/apollo-compiler/src/test/graphql/com/example/mutation_create_review/kotlin/responseBased/mutation_create_review/type/adapter/ReviewInput_InputAdapter.kt.expected @@ -19,19 +19,19 @@ import com.apollographql.apollo3.api.nullable import com.apollographql.apollo3.api.obj import com.apollographql.apollo3.api.present import com.example.mutation_create_review.type.ReviewInput -import java.util.Date import kotlin.IllegalStateException -import kotlin.Unit +import com.example.mutation_create_review.type.Date as TypeDate +import java.util.Date as UtilDate internal object ReviewInput_InputAdapter : CompositeAdapter { - public override fun fromJson(reader: JsonReader, adapterContext: CompositeAdapterContext): - ReviewInput = throw IllegalStateException("Input type used in output position") + override fun fromJson(reader: JsonReader, adapterContext: CompositeAdapterContext): ReviewInput = + throw IllegalStateException("Input type used in output position") - public override fun toJson( + override fun toJson( writer: JsonWriter, `value`: ReviewInput, adapterContext: CompositeAdapterContext, - ): Unit { + ) { writer.name("stars") IntAdapter.toJson(writer, CustomScalarAdapters.Empty, value.stars) if (value.nullableIntFieldWithDefaultValue is Optional.Present) { @@ -63,12 +63,12 @@ internal object ReviewInput_InputAdapter : CompositeAdapter { } if (value.listOfCustomScalar is Optional.Present) { writer.name("listOfCustomScalar") - adapterContext.customScalarAdapters.responseAdapterFor(com.example.mutation_create_review.type.Date.type).nullable().list().nullable().present().toJson(writer, + adapterContext.customScalarAdapters.responseAdapterFor(TypeDate.type).nullable().list().nullable().present().toJson(writer, CustomScalarAdapters.Empty, value.listOfCustomScalar) } if (value.customScalar is Optional.Present) { writer.name("customScalar") - adapterContext.customScalarAdapters.responseAdapterFor(com.example.mutation_create_review.type.Date.type).nullable().present().toJson(writer, + adapterContext.customScalarAdapters.responseAdapterFor(TypeDate.type).nullable().present().toJson(writer, CustomScalarAdapters.Empty, value.customScalar) } if (value.listOfEnums is Optional.Present) { @@ -116,7 +116,7 @@ internal object ReviewInput_InputAdapter : CompositeAdapter { } if (value.listOfListOfCustom is Optional.Present) { writer.name("listOfListOfCustom") - adapterContext.customScalarAdapters.responseAdapterFor(com.example.mutation_create_review.type.Date.type).list().list().nullable().present().toJson(writer, + adapterContext.customScalarAdapters.responseAdapterFor(TypeDate.type).list().list().nullable().present().toJson(writer, CustomScalarAdapters.Empty, value.listOfListOfCustom) } if (value.listOfListOfObject is Optional.Present) { diff --git a/libraries/apollo-compiler/src/test/graphql/com/example/mutation_create_review/kotlin/responseBased/mutation_create_review/type/adapter/ReviewRefInput_InputAdapter.kt.expected b/libraries/apollo-compiler/src/test/graphql/com/example/mutation_create_review/kotlin/responseBased/mutation_create_review/type/adapter/ReviewRefInput_InputAdapter.kt.expected index cc05cd91b4b..9d6b4d8d640 100644 --- a/libraries/apollo-compiler/src/test/graphql/com/example/mutation_create_review/kotlin/responseBased/mutation_create_review/type/adapter/ReviewRefInput_InputAdapter.kt.expected +++ b/libraries/apollo-compiler/src/test/graphql/com/example/mutation_create_review/kotlin/responseBased/mutation_create_review/type/adapter/ReviewRefInput_InputAdapter.kt.expected @@ -15,17 +15,16 @@ import com.apollographql.apollo3.api.obj import com.apollographql.apollo3.api.present import com.example.mutation_create_review.type.ReviewRefInput import kotlin.IllegalStateException -import kotlin.Unit internal object ReviewRefInput_InputAdapter : CompositeAdapter { - public override fun fromJson(reader: JsonReader, adapterContext: CompositeAdapterContext): - ReviewRefInput = throw IllegalStateException("Input type used in output position") + override fun fromJson(reader: JsonReader, adapterContext: CompositeAdapterContext): ReviewRefInput + = throw IllegalStateException("Input type used in output position") - public override fun toJson( + override fun toJson( writer: JsonWriter, `value`: ReviewRefInput, adapterContext: CompositeAdapterContext, - ): Unit { + ) { if (value.reviewInput is Optional.Present) { writer.name("reviewInput") ReviewInput_InputAdapter.obj().nullable().present().toJson(writer, value.reviewInput, diff --git a/libraries/apollo-compiler/src/test/graphql/com/example/mutation_create_review_semantic_naming/kotlin/responseBased/mutation_create_review_semantic_naming/CreateReviewForEpisodeMutation.kt.expected b/libraries/apollo-compiler/src/test/graphql/com/example/mutation_create_review_semantic_naming/kotlin/responseBased/mutation_create_review_semantic_naming/CreateReviewForEpisodeMutation.kt.expected index 62d92637f37..9ab5e7690df 100644 --- a/libraries/apollo-compiler/src/test/graphql/com/example/mutation_create_review_semantic_naming/kotlin/responseBased/mutation_create_review_semantic_naming/CreateReviewForEpisodeMutation.kt.expected +++ b/libraries/apollo-compiler/src/test/graphql/com/example/mutation_create_review_semantic_naming/kotlin/responseBased/mutation_create_review_semantic_naming/CreateReviewForEpisodeMutation.kt.expected @@ -20,33 +20,33 @@ import com.example.mutation_create_review_semantic_naming.type.ReviewInput import kotlin.Boolean import kotlin.Int import kotlin.String -import kotlin.Unit +import com.example.mutation_create_review_semantic_naming.type.Mutation as CompiledMutation public data class CreateReviewForEpisodeMutation( public val ep: Episode, public val review: ReviewInput, ) : Mutation { - public override fun id(): String = OPERATION_ID + override fun id(): String = OPERATION_ID - public override fun document(): String = OPERATION_DOCUMENT + override fun document(): String = OPERATION_DOCUMENT - public override fun name(): String = OPERATION_NAME + override fun name(): String = OPERATION_NAME - public override fun serializeVariables( + override fun serializeVariables( writer: JsonWriter, customScalarAdapters: CustomScalarAdapters, withBooleanDefaultValues: Boolean, - ): Unit { + ) { CreateReviewForEpisodeMutation_VariablesAdapter.serializeVariables(writer, this, customScalarAdapters, withBooleanDefaultValues) } - public override fun adapter(): CompositeAdapter = + override fun adapter(): CompositeAdapter = CreateReviewForEpisodeMutation_ResponseAdapter.Data.obj() - public override fun rootField(): CompiledField = CompiledField.Builder( + override fun rootField(): CompiledField = CompiledField.Builder( name = "data", - type = com.example.mutation_create_review_semantic_naming.type.Mutation.type + type = CompiledMutation.type ) .selections(selections = CreateReviewForEpisodeMutationSelections.__root) .build() diff --git a/libraries/apollo-compiler/src/test/graphql/com/example/mutation_create_review_semantic_naming/kotlin/responseBased/mutation_create_review_semantic_naming/adapter/CreateReviewForEpisodeMutation_ResponseAdapter.kt.expected b/libraries/apollo-compiler/src/test/graphql/com/example/mutation_create_review_semantic_naming/kotlin/responseBased/mutation_create_review_semantic_naming/adapter/CreateReviewForEpisodeMutation_ResponseAdapter.kt.expected index 3377da53799..6ceeef855fe 100644 --- a/libraries/apollo-compiler/src/test/graphql/com/example/mutation_create_review_semantic_naming/kotlin/responseBased/mutation_create_review_semantic_naming/adapter/CreateReviewForEpisodeMutation_ResponseAdapter.kt.expected +++ b/libraries/apollo-compiler/src/test/graphql/com/example/mutation_create_review_semantic_naming/kotlin/responseBased/mutation_create_review_semantic_naming/adapter/CreateReviewForEpisodeMutation_ResponseAdapter.kt.expected @@ -17,14 +17,13 @@ import com.apollographql.apollo3.api.obj import com.example.mutation_create_review_semantic_naming.CreateReviewForEpisodeMutation import kotlin.Int import kotlin.String -import kotlin.Unit import kotlin.collections.List public object CreateReviewForEpisodeMutation_ResponseAdapter { public object Data : CompositeAdapter { public val RESPONSE_NAMES: List = listOf("createReview") - public override fun fromJson(reader: JsonReader, adapterContext: CompositeAdapterContext): + override fun fromJson(reader: JsonReader, adapterContext: CompositeAdapterContext): CreateReviewForEpisodeMutation.Data { var _createReview: CreateReviewForEpisodeMutation.Data.CreateReview? = null @@ -40,11 +39,11 @@ public object CreateReviewForEpisodeMutation_ResponseAdapter { ) } - public override fun toJson( + override fun toJson( writer: JsonWriter, `value`: CreateReviewForEpisodeMutation.Data, adapterContext: CompositeAdapterContext, - ): Unit { + ) { writer.name("createReview") CreateReview.obj().nullable().toJson(writer, value.createReview, adapterContext) } @@ -53,7 +52,7 @@ public object CreateReviewForEpisodeMutation_ResponseAdapter { { public val RESPONSE_NAMES: List = listOf("stars", "commentary") - public override fun fromJson(reader: JsonReader, adapterContext: CompositeAdapterContext): + override fun fromJson(reader: JsonReader, adapterContext: CompositeAdapterContext): CreateReviewForEpisodeMutation.Data.CreateReview { var _stars: Int? = null var _commentary: String? = null @@ -72,11 +71,11 @@ public object CreateReviewForEpisodeMutation_ResponseAdapter { ) } - public override fun toJson( + override fun toJson( writer: JsonWriter, `value`: CreateReviewForEpisodeMutation.Data.CreateReview, adapterContext: CompositeAdapterContext, - ): Unit { + ) { writer.name("stars") IntAdapter.toJson(writer, CustomScalarAdapters.Empty, value.stars) diff --git a/libraries/apollo-compiler/src/test/graphql/com/example/mutation_create_review_semantic_naming/kotlin/responseBased/mutation_create_review_semantic_naming/adapter/CreateReviewForEpisodeMutation_VariablesAdapter.kt.expected b/libraries/apollo-compiler/src/test/graphql/com/example/mutation_create_review_semantic_naming/kotlin/responseBased/mutation_create_review_semantic_naming/adapter/CreateReviewForEpisodeMutation_VariablesAdapter.kt.expected index 6056cb40847..766226e7e42 100644 --- a/libraries/apollo-compiler/src/test/graphql/com/example/mutation_create_review_semantic_naming/kotlin/responseBased/mutation_create_review_semantic_naming/adapter/CreateReviewForEpisodeMutation_VariablesAdapter.kt.expected +++ b/libraries/apollo-compiler/src/test/graphql/com/example/mutation_create_review_semantic_naming/kotlin/responseBased/mutation_create_review_semantic_naming/adapter/CreateReviewForEpisodeMutation_VariablesAdapter.kt.expected @@ -14,7 +14,6 @@ import com.example.mutation_create_review_semantic_naming.type.adapter.Episode_R import com.example.mutation_create_review_semantic_naming.type.adapter.ReviewInput_InputAdapter import kotlin.Boolean import kotlin.Suppress -import kotlin.Unit public object CreateReviewForEpisodeMutation_VariablesAdapter { @Suppress( @@ -26,7 +25,7 @@ public object CreateReviewForEpisodeMutation_VariablesAdapter { `value`: CreateReviewForEpisodeMutation, customScalarAdapters: CustomScalarAdapters, withBooleanDefaultValues: Boolean, - ): Unit { + ) { val adapterContext = CompositeAdapterContext.Builder().customScalarAdapters(customScalarAdapters).build() writer.name("ep") diff --git a/libraries/apollo-compiler/src/test/graphql/com/example/mutation_create_review_semantic_naming/kotlin/responseBased/mutation_create_review_semantic_naming/type/adapter/ColorInput_InputAdapter.kt.expected b/libraries/apollo-compiler/src/test/graphql/com/example/mutation_create_review_semantic_naming/kotlin/responseBased/mutation_create_review_semantic_naming/type/adapter/ColorInput_InputAdapter.kt.expected index 8c808d9ff78..a01b06a1c13 100644 --- a/libraries/apollo-compiler/src/test/graphql/com/example/mutation_create_review_semantic_naming/kotlin/responseBased/mutation_create_review_semantic_naming/type/adapter/ColorInput_InputAdapter.kt.expected +++ b/libraries/apollo-compiler/src/test/graphql/com/example/mutation_create_review_semantic_naming/kotlin/responseBased/mutation_create_review_semantic_naming/type/adapter/ColorInput_InputAdapter.kt.expected @@ -19,17 +19,16 @@ import com.apollographql.apollo3.api.obj import com.apollographql.apollo3.api.present import com.example.mutation_create_review_semantic_naming.type.ColorInput import kotlin.IllegalStateException -import kotlin.Unit public object ColorInput_InputAdapter : CompositeAdapter { - public override fun fromJson(reader: JsonReader, adapterContext: CompositeAdapterContext): - ColorInput = throw IllegalStateException("Input type used in output position") + override fun fromJson(reader: JsonReader, adapterContext: CompositeAdapterContext): ColorInput = + throw IllegalStateException("Input type used in output position") - public override fun toJson( + override fun toJson( writer: JsonWriter, `value`: ColorInput, adapterContext: CompositeAdapterContext, - ): Unit { + ) { if (value.red is Optional.Present) { writer.name("red") IntAdapter.present().toJson(writer, CustomScalarAdapters.Empty, value.red) diff --git a/libraries/apollo-compiler/src/test/graphql/com/example/mutation_create_review_semantic_naming/kotlin/responseBased/mutation_create_review_semantic_naming/type/adapter/Episode_ResponseAdapter.kt.expected b/libraries/apollo-compiler/src/test/graphql/com/example/mutation_create_review_semantic_naming/kotlin/responseBased/mutation_create_review_semantic_naming/type/adapter/Episode_ResponseAdapter.kt.expected index e959e083760..77b02424791 100644 --- a/libraries/apollo-compiler/src/test/graphql/com/example/mutation_create_review_semantic_naming/kotlin/responseBased/mutation_create_review_semantic_naming/type/adapter/Episode_ResponseAdapter.kt.expected +++ b/libraries/apollo-compiler/src/test/graphql/com/example/mutation_create_review_semantic_naming/kotlin/responseBased/mutation_create_review_semantic_naming/type/adapter/Episode_ResponseAdapter.kt.expected @@ -10,20 +10,18 @@ import com.apollographql.apollo3.api.CustomScalarAdapters import com.apollographql.apollo3.api.json.JsonReader import com.apollographql.apollo3.api.json.JsonWriter import com.example.mutation_create_review_semantic_naming.type.Episode -import kotlin.Unit public object Episode_ResponseAdapter : Adapter { - public override fun fromJson(reader: JsonReader, customScalarAdapters: CustomScalarAdapters): - Episode { + override fun fromJson(reader: JsonReader, customScalarAdapters: CustomScalarAdapters): Episode { val rawValue = reader.nextString()!! return Episode.safeValueOf(rawValue) } - public override fun toJson( + override fun toJson( writer: JsonWriter, customScalarAdapters: CustomScalarAdapters, `value`: Episode, - ): Unit { + ) { writer.value(value.rawValue) } } diff --git a/libraries/apollo-compiler/src/test/graphql/com/example/mutation_create_review_semantic_naming/kotlin/responseBased/mutation_create_review_semantic_naming/type/adapter/ReviewInput_InputAdapter.kt.expected b/libraries/apollo-compiler/src/test/graphql/com/example/mutation_create_review_semantic_naming/kotlin/responseBased/mutation_create_review_semantic_naming/type/adapter/ReviewInput_InputAdapter.kt.expected index 34fb82fb084..53c013bc391 100644 --- a/libraries/apollo-compiler/src/test/graphql/com/example/mutation_create_review_semantic_naming/kotlin/responseBased/mutation_create_review_semantic_naming/type/adapter/ReviewInput_InputAdapter.kt.expected +++ b/libraries/apollo-compiler/src/test/graphql/com/example/mutation_create_review_semantic_naming/kotlin/responseBased/mutation_create_review_semantic_naming/type/adapter/ReviewInput_InputAdapter.kt.expected @@ -24,17 +24,16 @@ import com.apollographql.apollo3.api.obj import com.apollographql.apollo3.api.present import com.example.mutation_create_review_semantic_naming.type.ReviewInput import kotlin.IllegalStateException -import kotlin.Unit public object ReviewInput_InputAdapter : CompositeAdapter { - public override fun fromJson(reader: JsonReader, adapterContext: CompositeAdapterContext): - ReviewInput = throw IllegalStateException("Input type used in output position") + override fun fromJson(reader: JsonReader, adapterContext: CompositeAdapterContext): ReviewInput = + throw IllegalStateException("Input type used in output position") - public override fun toJson( + override fun toJson( writer: JsonWriter, `value`: ReviewInput, adapterContext: CompositeAdapterContext, - ): Unit { + ) { writer.name("stars") IntAdapter.toJson(writer, CustomScalarAdapters.Empty, value.stars) if (value.nullableIntFieldWithDefaultValue is Optional.Present) { diff --git a/libraries/apollo-compiler/src/test/graphql/com/example/mutation_create_review_semantic_naming/kotlin/responseBased/mutation_create_review_semantic_naming/type/adapter/ReviewRefInput_InputAdapter.kt.expected b/libraries/apollo-compiler/src/test/graphql/com/example/mutation_create_review_semantic_naming/kotlin/responseBased/mutation_create_review_semantic_naming/type/adapter/ReviewRefInput_InputAdapter.kt.expected index 4a37a6edced..f5441f0bc4a 100644 --- a/libraries/apollo-compiler/src/test/graphql/com/example/mutation_create_review_semantic_naming/kotlin/responseBased/mutation_create_review_semantic_naming/type/adapter/ReviewRefInput_InputAdapter.kt.expected +++ b/libraries/apollo-compiler/src/test/graphql/com/example/mutation_create_review_semantic_naming/kotlin/responseBased/mutation_create_review_semantic_naming/type/adapter/ReviewRefInput_InputAdapter.kt.expected @@ -15,17 +15,16 @@ import com.apollographql.apollo3.api.obj import com.apollographql.apollo3.api.present import com.example.mutation_create_review_semantic_naming.type.ReviewRefInput import kotlin.IllegalStateException -import kotlin.Unit public object ReviewRefInput_InputAdapter : CompositeAdapter { - public override fun fromJson(reader: JsonReader, adapterContext: CompositeAdapterContext): - ReviewRefInput = throw IllegalStateException("Input type used in output position") + override fun fromJson(reader: JsonReader, adapterContext: CompositeAdapterContext): ReviewRefInput + = throw IllegalStateException("Input type used in output position") - public override fun toJson( + override fun toJson( writer: JsonWriter, `value`: ReviewRefInput, adapterContext: CompositeAdapterContext, - ): Unit { + ) { if (value.reviewInput is Optional.Present) { writer.name("reviewInput") ReviewInput_InputAdapter.obj().nullable().present().toJson(writer, value.reviewInput, diff --git a/libraries/apollo-compiler/src/test/graphql/com/example/named_fragment_delegate/kotlin/operationBased/named_fragment_delegate/TestQuery.kt.expected b/libraries/apollo-compiler/src/test/graphql/com/example/named_fragment_delegate/kotlin/operationBased/named_fragment_delegate/TestQuery.kt.expected index 69da8935e4c..b908e980963 100644 --- a/libraries/apollo-compiler/src/test/graphql/com/example/named_fragment_delegate/kotlin/operationBased/named_fragment_delegate/TestQuery.kt.expected +++ b/libraries/apollo-compiler/src/test/graphql/com/example/named_fragment_delegate/kotlin/operationBased/named_fragment_delegate/TestQuery.kt.expected @@ -20,32 +20,32 @@ import kotlin.Any import kotlin.Boolean import kotlin.Int import kotlin.String -import kotlin.Unit +import com.example.named_fragment_delegate.type.Query as CompiledQuery public class TestQuery() : Query { - public override fun equals(other: Any?): Boolean = other != null && other::class == this::class + override fun equals(other: Any?): Boolean = other != null && other::class == this::class - public override fun hashCode(): Int = this::class.hashCode() + override fun hashCode(): Int = this::class.hashCode() - public override fun id(): String = OPERATION_ID + override fun id(): String = OPERATION_ID - public override fun document(): String = OPERATION_DOCUMENT + override fun document(): String = OPERATION_DOCUMENT - public override fun name(): String = OPERATION_NAME + override fun name(): String = OPERATION_NAME - public override fun serializeVariables( + override fun serializeVariables( writer: JsonWriter, customScalarAdapters: CustomScalarAdapters, withBooleanDefaultValues: Boolean, - ): Unit { + ) { // This operation doesn't have any variable } - public override fun adapter(): CompositeAdapter = TestQuery_ResponseAdapter.Data.obj() + override fun adapter(): CompositeAdapter = TestQuery_ResponseAdapter.Data.obj() - public override fun rootField(): CompiledField = CompiledField.Builder( + override fun rootField(): CompiledField = CompiledField.Builder( name = "data", - type = com.example.named_fragment_delegate.type.Query.type + type = CompiledQuery.type ) .selections(selections = TestQuerySelections.__root) .build() diff --git a/libraries/apollo-compiler/src/test/graphql/com/example/named_fragment_delegate/kotlin/operationBased/named_fragment_delegate/adapter/TestQuery_ResponseAdapter.kt.expected b/libraries/apollo-compiler/src/test/graphql/com/example/named_fragment_delegate/kotlin/operationBased/named_fragment_delegate/adapter/TestQuery_ResponseAdapter.kt.expected index 5c84948387f..96882c0c667 100644 --- a/libraries/apollo-compiler/src/test/graphql/com/example/named_fragment_delegate/kotlin/operationBased/named_fragment_delegate/adapter/TestQuery_ResponseAdapter.kt.expected +++ b/libraries/apollo-compiler/src/test/graphql/com/example/named_fragment_delegate/kotlin/operationBased/named_fragment_delegate/adapter/TestQuery_ResponseAdapter.kt.expected @@ -19,14 +19,13 @@ import com.example.named_fragment_delegate.TestQuery import com.example.named_fragment_delegate.fragment.DroidDetails import com.example.named_fragment_delegate.fragment.HumanDetails import kotlin.String -import kotlin.Unit import kotlin.collections.List public object TestQuery_ResponseAdapter { public object Data : CompositeAdapter { public val RESPONSE_NAMES: List = listOf("hero") - public override fun fromJson(reader: JsonReader, adapterContext: CompositeAdapterContext): + override fun fromJson(reader: JsonReader, adapterContext: CompositeAdapterContext): TestQuery.Data { var _hero: TestQuery.Data.Hero? = null @@ -42,11 +41,11 @@ public object TestQuery_ResponseAdapter { ) } - public override fun toJson( + override fun toJson( writer: JsonWriter, `value`: TestQuery.Data, adapterContext: CompositeAdapterContext, - ): Unit { + ) { writer.name("hero") Hero.obj(true).nullable().toJson(writer, value.hero, adapterContext) } @@ -54,7 +53,7 @@ public object TestQuery_ResponseAdapter { private object Hero : CompositeAdapter { public val RESPONSE_NAMES: List = listOf("__typename") - public override fun fromJson(reader: JsonReader, adapterContext: CompositeAdapterContext): + override fun fromJson(reader: JsonReader, adapterContext: CompositeAdapterContext): TestQuery.Data.Hero { var __typename: String? = null @@ -90,11 +89,11 @@ public object TestQuery_ResponseAdapter { ) } - public override fun toJson( + override fun toJson( writer: JsonWriter, `value`: TestQuery.Data.Hero, adapterContext: CompositeAdapterContext, - ): Unit { + ) { writer.name("__typename") StringAdapter.toJson(writer, CustomScalarAdapters.Empty, value.__typename) diff --git a/libraries/apollo-compiler/src/test/graphql/com/example/named_fragment_delegate/kotlin/operationBased/named_fragment_delegate/fragment/DroidDetailsImpl.kt.expected b/libraries/apollo-compiler/src/test/graphql/com/example/named_fragment_delegate/kotlin/operationBased/named_fragment_delegate/fragment/DroidDetailsImpl.kt.expected index a76cb0ee8bd..acaa456ce71 100644 --- a/libraries/apollo-compiler/src/test/graphql/com/example/named_fragment_delegate/kotlin/operationBased/named_fragment_delegate/fragment/DroidDetailsImpl.kt.expected +++ b/libraries/apollo-compiler/src/test/graphql/com/example/named_fragment_delegate/kotlin/operationBased/named_fragment_delegate/fragment/DroidDetailsImpl.kt.expected @@ -16,25 +16,24 @@ import com.example.named_fragment_delegate.type.Droid import kotlin.Any import kotlin.Boolean import kotlin.Int -import kotlin.Unit public class DroidDetailsImpl() : Fragment { - public override fun equals(other: Any?): Boolean = other != null && other::class == this::class + override fun equals(other: Any?): Boolean = other != null && other::class == this::class - public override fun hashCode(): Int = this::class.hashCode() + override fun hashCode(): Int = this::class.hashCode() - public override fun serializeVariables( + override fun serializeVariables( writer: JsonWriter, customScalarAdapters: CustomScalarAdapters, withBooleanDefaultValues: Boolean, - ): Unit { + ) { // This fragment doesn't have any variable } - public override fun adapter(): CompositeAdapter = + override fun adapter(): CompositeAdapter = DroidDetailsImpl_ResponseAdapter.DroidDetails.obj() - public override fun rootField(): CompiledField = CompiledField.Builder( + override fun rootField(): CompiledField = CompiledField.Builder( name = "data", type = Droid.type ) diff --git a/libraries/apollo-compiler/src/test/graphql/com/example/named_fragment_delegate/kotlin/operationBased/named_fragment_delegate/fragment/DroidDetailsImpl_ResponseAdapter.kt.expected b/libraries/apollo-compiler/src/test/graphql/com/example/named_fragment_delegate/kotlin/operationBased/named_fragment_delegate/fragment/DroidDetailsImpl_ResponseAdapter.kt.expected index ed92427e5ff..f259956b452 100644 --- a/libraries/apollo-compiler/src/test/graphql/com/example/named_fragment_delegate/kotlin/operationBased/named_fragment_delegate/fragment/DroidDetailsImpl_ResponseAdapter.kt.expected +++ b/libraries/apollo-compiler/src/test/graphql/com/example/named_fragment_delegate/kotlin/operationBased/named_fragment_delegate/fragment/DroidDetailsImpl_ResponseAdapter.kt.expected @@ -16,7 +16,6 @@ import com.apollographql.apollo3.api.list import com.apollographql.apollo3.api.nullable import com.apollographql.apollo3.api.obj import kotlin.String -import kotlin.Unit import kotlin.collections.List public object DroidDetailsImpl_ResponseAdapter { @@ -24,7 +23,7 @@ public object DroidDetailsImpl_ResponseAdapter { CompositeAdapter { public val RESPONSE_NAMES: List = listOf("name", "primaryFunction", "friends") - public override fun fromJson(reader: JsonReader, adapterContext: CompositeAdapterContext): + override fun fromJson(reader: JsonReader, adapterContext: CompositeAdapterContext): com.example.named_fragment_delegate.fragment.DroidDetails { var _name: String? = null var _primaryFunction: String? = null @@ -46,11 +45,11 @@ public object DroidDetailsImpl_ResponseAdapter { ) } - public override fun toJson( + override fun toJson( writer: JsonWriter, `value`: com.example.named_fragment_delegate.fragment.DroidDetails, adapterContext: CompositeAdapterContext, - ): Unit { + ) { writer.name("name") StringAdapter.toJson(writer, CustomScalarAdapters.Empty, value.name) @@ -65,7 +64,7 @@ public object DroidDetailsImpl_ResponseAdapter { CompositeAdapter { public val RESPONSE_NAMES: List = listOf("name") - public override fun fromJson(reader: JsonReader, adapterContext: CompositeAdapterContext): + override fun fromJson(reader: JsonReader, adapterContext: CompositeAdapterContext): com.example.named_fragment_delegate.fragment.DroidDetails.Friend { var _name: String? = null @@ -81,11 +80,11 @@ public object DroidDetailsImpl_ResponseAdapter { ) } - public override fun toJson( + override fun toJson( writer: JsonWriter, `value`: com.example.named_fragment_delegate.fragment.DroidDetails.Friend, adapterContext: CompositeAdapterContext, - ): Unit { + ) { writer.name("name") StringAdapter.toJson(writer, CustomScalarAdapters.Empty, value.name) } diff --git a/libraries/apollo-compiler/src/test/graphql/com/example/named_fragment_delegate/kotlin/operationBased/named_fragment_delegate/fragment/HumanDetailsImpl.kt.expected b/libraries/apollo-compiler/src/test/graphql/com/example/named_fragment_delegate/kotlin/operationBased/named_fragment_delegate/fragment/HumanDetailsImpl.kt.expected index 1a8be6cc5ca..48231428b3b 100644 --- a/libraries/apollo-compiler/src/test/graphql/com/example/named_fragment_delegate/kotlin/operationBased/named_fragment_delegate/fragment/HumanDetailsImpl.kt.expected +++ b/libraries/apollo-compiler/src/test/graphql/com/example/named_fragment_delegate/kotlin/operationBased/named_fragment_delegate/fragment/HumanDetailsImpl.kt.expected @@ -16,25 +16,24 @@ import com.example.named_fragment_delegate.type.Human import kotlin.Any import kotlin.Boolean import kotlin.Int -import kotlin.Unit public class HumanDetailsImpl() : Fragment { - public override fun equals(other: Any?): Boolean = other != null && other::class == this::class + override fun equals(other: Any?): Boolean = other != null && other::class == this::class - public override fun hashCode(): Int = this::class.hashCode() + override fun hashCode(): Int = this::class.hashCode() - public override fun serializeVariables( + override fun serializeVariables( writer: JsonWriter, customScalarAdapters: CustomScalarAdapters, withBooleanDefaultValues: Boolean, - ): Unit { + ) { // This fragment doesn't have any variable } - public override fun adapter(): CompositeAdapter = + override fun adapter(): CompositeAdapter = HumanDetailsImpl_ResponseAdapter.HumanDetails.obj() - public override fun rootField(): CompiledField = CompiledField.Builder( + override fun rootField(): CompiledField = CompiledField.Builder( name = "data", type = Human.type ) diff --git a/libraries/apollo-compiler/src/test/graphql/com/example/named_fragment_delegate/kotlin/operationBased/named_fragment_delegate/fragment/HumanDetailsImpl_ResponseAdapter.kt.expected b/libraries/apollo-compiler/src/test/graphql/com/example/named_fragment_delegate/kotlin/operationBased/named_fragment_delegate/fragment/HumanDetailsImpl_ResponseAdapter.kt.expected index fe3550ca75c..8f3d46a88a4 100644 --- a/libraries/apollo-compiler/src/test/graphql/com/example/named_fragment_delegate/kotlin/operationBased/named_fragment_delegate/fragment/HumanDetailsImpl_ResponseAdapter.kt.expected +++ b/libraries/apollo-compiler/src/test/graphql/com/example/named_fragment_delegate/kotlin/operationBased/named_fragment_delegate/fragment/HumanDetailsImpl_ResponseAdapter.kt.expected @@ -17,7 +17,6 @@ import com.apollographql.apollo3.api.nullable import com.apollographql.apollo3.api.obj import kotlin.Any import kotlin.String -import kotlin.Unit import kotlin.collections.List public object HumanDetailsImpl_ResponseAdapter { @@ -25,7 +24,7 @@ public object HumanDetailsImpl_ResponseAdapter { CompositeAdapter { public val RESPONSE_NAMES: List = listOf("name", "profileLink", "friendsConnection") - public override fun fromJson(reader: JsonReader, adapterContext: CompositeAdapterContext): + override fun fromJson(reader: JsonReader, adapterContext: CompositeAdapterContext): com.example.named_fragment_delegate.fragment.HumanDetails { var _name: String? = null var _profileLink: Any? = null @@ -47,11 +46,11 @@ public object HumanDetailsImpl_ResponseAdapter { ) } - public override fun toJson( + override fun toJson( writer: JsonWriter, `value`: com.example.named_fragment_delegate.fragment.HumanDetails, adapterContext: CompositeAdapterContext, - ): Unit { + ) { writer.name("name") StringAdapter.toJson(writer, CustomScalarAdapters.Empty, value.name) @@ -67,7 +66,7 @@ public object HumanDetailsImpl_ResponseAdapter { { public val RESPONSE_NAMES: List = listOf("edges") - public override fun fromJson(reader: JsonReader, adapterContext: CompositeAdapterContext): + override fun fromJson(reader: JsonReader, adapterContext: CompositeAdapterContext): com.example.named_fragment_delegate.fragment.HumanDetails.FriendsConnection { var _edges: List? = null @@ -83,11 +82,11 @@ public object HumanDetailsImpl_ResponseAdapter { ) } - public override fun toJson( + override fun toJson( writer: JsonWriter, `value`: com.example.named_fragment_delegate.fragment.HumanDetails.FriendsConnection, adapterContext: CompositeAdapterContext, - ): Unit { + ) { writer.name("edges") Edge.obj().nullable().list().nullable().toJson(writer, value.edges, adapterContext) } @@ -97,7 +96,7 @@ public object HumanDetailsImpl_ResponseAdapter { { public val RESPONSE_NAMES: List = listOf("node") - public override fun fromJson(reader: JsonReader, adapterContext: CompositeAdapterContext): + override fun fromJson(reader: JsonReader, adapterContext: CompositeAdapterContext): com.example.named_fragment_delegate.fragment.HumanDetails.FriendsConnection.Edge { var _node: com.example.named_fragment_delegate.fragment.HumanDetails.FriendsConnection.Edge.Node? = null @@ -113,11 +112,11 @@ public object HumanDetailsImpl_ResponseAdapter { ) } - public override fun toJson( + override fun toJson( writer: JsonWriter, `value`: com.example.named_fragment_delegate.fragment.HumanDetails.FriendsConnection.Edge, adapterContext: CompositeAdapterContext, - ): Unit { + ) { writer.name("node") Node.obj().nullable().toJson(writer, value.node, adapterContext) } @@ -127,7 +126,7 @@ public object HumanDetailsImpl_ResponseAdapter { { public val RESPONSE_NAMES: List = listOf("name") - public override fun fromJson(reader: JsonReader, adapterContext: CompositeAdapterContext): + override fun fromJson(reader: JsonReader, adapterContext: CompositeAdapterContext): com.example.named_fragment_delegate.fragment.HumanDetails.FriendsConnection.Edge.Node { var _name: String? = null @@ -143,11 +142,11 @@ public object HumanDetailsImpl_ResponseAdapter { ) } - public override fun toJson( + override fun toJson( writer: JsonWriter, `value`: com.example.named_fragment_delegate.fragment.HumanDetails.FriendsConnection.Edge.Node, adapterContext: CompositeAdapterContext, - ): Unit { + ) { writer.name("name") StringAdapter.toJson(writer, CustomScalarAdapters.Empty, value.name) } diff --git a/libraries/apollo-compiler/src/test/graphql/com/example/named_fragment_delegate/kotlin/responseBased/named_fragment_delegate/TestQuery.kt.expected b/libraries/apollo-compiler/src/test/graphql/com/example/named_fragment_delegate/kotlin/responseBased/named_fragment_delegate/TestQuery.kt.expected index 5237e3da731..316d52f420e 100644 --- a/libraries/apollo-compiler/src/test/graphql/com/example/named_fragment_delegate/kotlin/responseBased/named_fragment_delegate/TestQuery.kt.expected +++ b/libraries/apollo-compiler/src/test/graphql/com/example/named_fragment_delegate/kotlin/responseBased/named_fragment_delegate/TestQuery.kt.expected @@ -20,33 +20,34 @@ import kotlin.Any import kotlin.Boolean import kotlin.Int import kotlin.String -import kotlin.Unit +import kotlin.Suppress import kotlin.collections.List +import com.example.named_fragment_delegate.type.Query as CompiledQuery public class TestQuery() : Query { - public override fun equals(other: Any?): Boolean = other != null && other::class == this::class + override fun equals(other: Any?): Boolean = other != null && other::class == this::class - public override fun hashCode(): Int = this::class.hashCode() + override fun hashCode(): Int = this::class.hashCode() - public override fun id(): String = OPERATION_ID + override fun id(): String = OPERATION_ID - public override fun document(): String = OPERATION_DOCUMENT + override fun document(): String = OPERATION_DOCUMENT - public override fun name(): String = OPERATION_NAME + override fun name(): String = OPERATION_NAME - public override fun serializeVariables( + override fun serializeVariables( writer: JsonWriter, customScalarAdapters: CustomScalarAdapters, withBooleanDefaultValues: Boolean, - ): Unit { + ) { // This operation doesn't have any variable } - public override fun adapter(): CompositeAdapter = TestQuery_ResponseAdapter.Data.obj() + override fun adapter(): CompositeAdapter = TestQuery_ResponseAdapter.Data.obj() - public override fun rootField(): CompiledField = CompiledField.Builder( + override fun rootField(): CompiledField = CompiledField.Builder( name = "data", - type = com.example.named_fragment_delegate.type.Query.type + type = CompiledQuery.type ) .selections(selections = TestQuerySelections.__root) .build() @@ -59,30 +60,34 @@ public class TestQuery() : Query { public val __typename: String public companion object { - public fun Hero.droidDetails() = this as? DroidDetails + @Suppress("USELESS_CAST") + public fun Hero.droidDetails(): DroidDetails? = this as? DroidDetails - public fun Hero.humanDetails() = this as? HumanDetails + @Suppress("USELESS_CAST") + public fun Hero.humanDetails(): HumanDetails? = this as? HumanDetails - public fun Hero.asDroid() = this as? DroidHero + @Suppress("USELESS_CAST") + public fun Hero.asDroid(): DroidHero? = this as? DroidHero - public fun Hero.asHuman() = this as? HumanHero + @Suppress("USELESS_CAST") + public fun Hero.asHuman(): HumanHero? = this as? HumanHero } } public data class DroidHero( - public override val __typename: String, + override val __typename: String, /** * What others call this droid */ - public override val name: String, + override val name: String, /** * This droid's primary function */ - public override val primaryFunction: String?, + override val primaryFunction: String?, /** * This droid's friends, or an empty list if they have none */ - public override val friends: List?, + override val friends: List?, ) : Hero, DroidDetails { public fun friendsFilterNotNull(): List? = friends?.filterNotNull() @@ -90,30 +95,30 @@ public class TestQuery() : Query { /** * The name of the character */ - public override val name: String, + override val name: String, ) : DroidDetails.Friend } public data class HumanHero( - public override val __typename: String, + override val __typename: String, /** * What this human calls themselves */ - public override val name: String, + override val name: String, /** * Profile link */ - public override val profileLink: Any, + override val profileLink: Any, /** * The friends of the human exposed as a connection with edges */ - public override val friendsConnection: FriendsConnection, + override val friendsConnection: FriendsConnection, ) : Hero, HumanDetails { public data class FriendsConnection( /** * The edges for each of the character's friends. */ - public override val edges: List?, + override val edges: List?, ) : HumanDetails.FriendsConnection { public fun edgesFilterNotNull(): List? = edges?.filterNotNull() @@ -121,20 +126,20 @@ public class TestQuery() : Query { /** * The character represented by this friendship edge */ - public override val node: Node?, + override val node: Node?, ) : HumanDetails.FriendsConnection.Edge { public data class Node( /** * The name of the character */ - public override val name: String, + override val name: String, ) : HumanDetails.FriendsConnection.Edge.Node } } } public data class OtherHero( - public override val __typename: String, + override val __typename: String, ) : Hero } diff --git a/libraries/apollo-compiler/src/test/graphql/com/example/named_fragment_delegate/kotlin/responseBased/named_fragment_delegate/adapter/TestQuery_ResponseAdapter.kt.expected b/libraries/apollo-compiler/src/test/graphql/com/example/named_fragment_delegate/kotlin/responseBased/named_fragment_delegate/adapter/TestQuery_ResponseAdapter.kt.expected index 706472c3497..472c85263a5 100644 --- a/libraries/apollo-compiler/src/test/graphql/com/example/named_fragment_delegate/kotlin/responseBased/named_fragment_delegate/adapter/TestQuery_ResponseAdapter.kt.expected +++ b/libraries/apollo-compiler/src/test/graphql/com/example/named_fragment_delegate/kotlin/responseBased/named_fragment_delegate/adapter/TestQuery_ResponseAdapter.kt.expected @@ -21,14 +21,13 @@ import com.example.named_fragment_delegate.TestQuery import kotlin.Any import kotlin.String import kotlin.Suppress -import kotlin.Unit import kotlin.collections.List public object TestQuery_ResponseAdapter { public object Data : CompositeAdapter { public val RESPONSE_NAMES: List = listOf("hero") - public override fun fromJson(reader: JsonReader, adapterContext: CompositeAdapterContext): + override fun fromJson(reader: JsonReader, adapterContext: CompositeAdapterContext): TestQuery.Data { var _hero: TestQuery.Data.Hero? = null @@ -44,17 +43,17 @@ public object TestQuery_ResponseAdapter { ) } - public override fun toJson( + override fun toJson( writer: JsonWriter, `value`: TestQuery.Data, adapterContext: CompositeAdapterContext, - ): Unit { + ) { writer.name("hero") Hero.obj().nullable().toJson(writer, value.hero, adapterContext) } private object Hero : CompositeAdapter { - public override fun fromJson(reader: JsonReader, adapterContext: CompositeAdapterContext): + override fun fromJson(reader: JsonReader, adapterContext: CompositeAdapterContext): TestQuery.Data.Hero { val __typename = reader.readTypename() return when(__typename) { @@ -67,11 +66,11 @@ public object TestQuery_ResponseAdapter { } } - public override fun toJson( + override fun toJson( writer: JsonWriter, `value`: TestQuery.Data.Hero, adapterContext: CompositeAdapterContext, - ): Unit { + ) { when(value) { is TestQuery.Data.DroidHero -> DroidHero.toJson(writer, value, adapterContext) is TestQuery.Data.HumanHero -> HumanHero.toJson(writer, value, adapterContext) @@ -116,7 +115,7 @@ public object TestQuery_ResponseAdapter { writer: JsonWriter, `value`: TestQuery.Data.DroidHero, @Suppress("UNUSED_PARAMETER") adapterContext: CompositeAdapterContext, - ): Unit { + ) { writer.name("__typename") StringAdapter.toJson(writer, CustomScalarAdapters.Empty, value.__typename) @@ -133,7 +132,7 @@ public object TestQuery_ResponseAdapter { private object Friend : CompositeAdapter { public val RESPONSE_NAMES: List = listOf("name") - public override fun fromJson(reader: JsonReader, adapterContext: CompositeAdapterContext): + override fun fromJson(reader: JsonReader, adapterContext: CompositeAdapterContext): TestQuery.Data.DroidHero.Friend { var _name: String? = null @@ -149,11 +148,11 @@ public object TestQuery_ResponseAdapter { ) } - public override fun toJson( + override fun toJson( writer: JsonWriter, `value`: TestQuery.Data.DroidHero.Friend, adapterContext: CompositeAdapterContext, - ): Unit { + ) { writer.name("name") StringAdapter.toJson(writer, CustomScalarAdapters.Empty, value.name) } @@ -196,7 +195,7 @@ public object TestQuery_ResponseAdapter { writer: JsonWriter, `value`: TestQuery.Data.HumanHero, @Suppress("UNUSED_PARAMETER") adapterContext: CompositeAdapterContext, - ): Unit { + ) { writer.name("__typename") StringAdapter.toJson(writer, CustomScalarAdapters.Empty, value.__typename) @@ -214,7 +213,7 @@ public object TestQuery_ResponseAdapter { CompositeAdapter { public val RESPONSE_NAMES: List = listOf("edges") - public override fun fromJson(reader: JsonReader, adapterContext: CompositeAdapterContext): + override fun fromJson(reader: JsonReader, adapterContext: CompositeAdapterContext): TestQuery.Data.HumanHero.FriendsConnection { var _edges: List? = null @@ -230,11 +229,11 @@ public object TestQuery_ResponseAdapter { ) } - public override fun toJson( + override fun toJson( writer: JsonWriter, `value`: TestQuery.Data.HumanHero.FriendsConnection, adapterContext: CompositeAdapterContext, - ): Unit { + ) { writer.name("edges") Edge.obj().nullable().list().nullable().toJson(writer, value.edges, adapterContext) } @@ -242,7 +241,7 @@ public object TestQuery_ResponseAdapter { private object Edge : CompositeAdapter { public val RESPONSE_NAMES: List = listOf("node") - public override fun fromJson(reader: JsonReader, adapterContext: CompositeAdapterContext): + override fun fromJson(reader: JsonReader, adapterContext: CompositeAdapterContext): TestQuery.Data.HumanHero.FriendsConnection.Edge { var _node: TestQuery.Data.HumanHero.FriendsConnection.Edge.Node? = null @@ -258,11 +257,11 @@ public object TestQuery_ResponseAdapter { ) } - public override fun toJson( + override fun toJson( writer: JsonWriter, `value`: TestQuery.Data.HumanHero.FriendsConnection.Edge, adapterContext: CompositeAdapterContext, - ): Unit { + ) { writer.name("node") Node.obj().nullable().toJson(writer, value.node, adapterContext) } @@ -271,8 +270,7 @@ public object TestQuery_ResponseAdapter { CompositeAdapter { public val RESPONSE_NAMES: List = listOf("name") - public override fun fromJson(reader: JsonReader, - adapterContext: CompositeAdapterContext): + override fun fromJson(reader: JsonReader, adapterContext: CompositeAdapterContext): TestQuery.Data.HumanHero.FriendsConnection.Edge.Node { var _name: String? = null @@ -288,11 +286,11 @@ public object TestQuery_ResponseAdapter { ) } - public override fun toJson( + override fun toJson( writer: JsonWriter, `value`: TestQuery.Data.HumanHero.FriendsConnection.Edge.Node, adapterContext: CompositeAdapterContext, - ): Unit { + ) { writer.name("name") StringAdapter.toJson(writer, CustomScalarAdapters.Empty, value.name) } @@ -327,7 +325,7 @@ public object TestQuery_ResponseAdapter { writer: JsonWriter, `value`: TestQuery.Data.OtherHero, @Suppress("UNUSED_PARAMETER") adapterContext: CompositeAdapterContext, - ): Unit { + ) { writer.name("__typename") StringAdapter.toJson(writer, CustomScalarAdapters.Empty, value.__typename) } diff --git a/libraries/apollo-compiler/src/test/graphql/com/example/named_fragment_delegate/kotlin/responseBased/named_fragment_delegate/fragment/DroidDetailsImpl.kt.expected b/libraries/apollo-compiler/src/test/graphql/com/example/named_fragment_delegate/kotlin/responseBased/named_fragment_delegate/fragment/DroidDetailsImpl.kt.expected index c52a98e689a..897b62893bd 100644 --- a/libraries/apollo-compiler/src/test/graphql/com/example/named_fragment_delegate/kotlin/responseBased/named_fragment_delegate/fragment/DroidDetailsImpl.kt.expected +++ b/libraries/apollo-compiler/src/test/graphql/com/example/named_fragment_delegate/kotlin/responseBased/named_fragment_delegate/fragment/DroidDetailsImpl.kt.expected @@ -17,26 +17,24 @@ import kotlin.Any import kotlin.Boolean import kotlin.Int import kotlin.String -import kotlin.Unit import kotlin.collections.List public class DroidDetailsImpl() : Fragment { - public override fun equals(other: Any?): Boolean = other != null && other::class == this::class + override fun equals(other: Any?): Boolean = other != null && other::class == this::class - public override fun hashCode(): Int = this::class.hashCode() + override fun hashCode(): Int = this::class.hashCode() - public override fun serializeVariables( + override fun serializeVariables( writer: JsonWriter, customScalarAdapters: CustomScalarAdapters, withBooleanDefaultValues: Boolean, - ): Unit { + ) { // This fragment doesn't have any variable } - public override fun adapter(): CompositeAdapter = - DroidDetailsImpl_ResponseAdapter.Data.obj() + override fun adapter(): CompositeAdapter = DroidDetailsImpl_ResponseAdapter.Data.obj() - public override fun rootField(): CompiledField = CompiledField.Builder( + override fun rootField(): CompiledField = CompiledField.Builder( name = "data", type = Droid.type ) @@ -47,15 +45,15 @@ public class DroidDetailsImpl() : Fragment { /** * What others call this droid */ - public override val name: String, + override val name: String, /** * This droid's primary function */ - public override val primaryFunction: String?, + override val primaryFunction: String?, /** * This droid's friends, or an empty list if they have none */ - public override val friends: List?, + override val friends: List?, ) : DroidDetails, Fragment.Data { public fun friendsFilterNotNull(): List? = friends?.filterNotNull() @@ -63,7 +61,7 @@ public class DroidDetailsImpl() : Fragment { /** * The name of the character */ - public override val name: String, + override val name: String, ) : DroidDetails.Friend } } diff --git a/libraries/apollo-compiler/src/test/graphql/com/example/named_fragment_delegate/kotlin/responseBased/named_fragment_delegate/fragment/DroidDetailsImpl_ResponseAdapter.kt.expected b/libraries/apollo-compiler/src/test/graphql/com/example/named_fragment_delegate/kotlin/responseBased/named_fragment_delegate/fragment/DroidDetailsImpl_ResponseAdapter.kt.expected index c7582ac49b0..e8acb4072c4 100644 --- a/libraries/apollo-compiler/src/test/graphql/com/example/named_fragment_delegate/kotlin/responseBased/named_fragment_delegate/fragment/DroidDetailsImpl_ResponseAdapter.kt.expected +++ b/libraries/apollo-compiler/src/test/graphql/com/example/named_fragment_delegate/kotlin/responseBased/named_fragment_delegate/fragment/DroidDetailsImpl_ResponseAdapter.kt.expected @@ -16,14 +16,13 @@ import com.apollographql.apollo3.api.list import com.apollographql.apollo3.api.nullable import com.apollographql.apollo3.api.obj import kotlin.String -import kotlin.Unit import kotlin.collections.List public object DroidDetailsImpl_ResponseAdapter { public object Data : CompositeAdapter { public val RESPONSE_NAMES: List = listOf("name", "primaryFunction", "friends") - public override fun fromJson(reader: JsonReader, adapterContext: CompositeAdapterContext): + override fun fromJson(reader: JsonReader, adapterContext: CompositeAdapterContext): DroidDetailsImpl.Data { var _name: String? = null var _primaryFunction: String? = null @@ -45,11 +44,11 @@ public object DroidDetailsImpl_ResponseAdapter { ) } - public override fun toJson( + override fun toJson( writer: JsonWriter, `value`: DroidDetailsImpl.Data, adapterContext: CompositeAdapterContext, - ): Unit { + ) { writer.name("name") StringAdapter.toJson(writer, CustomScalarAdapters.Empty, value.name) @@ -63,7 +62,7 @@ public object DroidDetailsImpl_ResponseAdapter { private object Friend : CompositeAdapter { public val RESPONSE_NAMES: List = listOf("name") - public override fun fromJson(reader: JsonReader, adapterContext: CompositeAdapterContext): + override fun fromJson(reader: JsonReader, adapterContext: CompositeAdapterContext): DroidDetailsImpl.Data.Friend { var _name: String? = null @@ -79,11 +78,11 @@ public object DroidDetailsImpl_ResponseAdapter { ) } - public override fun toJson( + override fun toJson( writer: JsonWriter, `value`: DroidDetailsImpl.Data.Friend, adapterContext: CompositeAdapterContext, - ): Unit { + ) { writer.name("name") StringAdapter.toJson(writer, CustomScalarAdapters.Empty, value.name) } diff --git a/libraries/apollo-compiler/src/test/graphql/com/example/named_fragment_delegate/kotlin/responseBased/named_fragment_delegate/fragment/HumanDetailsImpl.kt.expected b/libraries/apollo-compiler/src/test/graphql/com/example/named_fragment_delegate/kotlin/responseBased/named_fragment_delegate/fragment/HumanDetailsImpl.kt.expected index ebaff3e3e50..12292da80ff 100644 --- a/libraries/apollo-compiler/src/test/graphql/com/example/named_fragment_delegate/kotlin/responseBased/named_fragment_delegate/fragment/HumanDetailsImpl.kt.expected +++ b/libraries/apollo-compiler/src/test/graphql/com/example/named_fragment_delegate/kotlin/responseBased/named_fragment_delegate/fragment/HumanDetailsImpl.kt.expected @@ -17,26 +17,24 @@ import kotlin.Any import kotlin.Boolean import kotlin.Int import kotlin.String -import kotlin.Unit import kotlin.collections.List public class HumanDetailsImpl() : Fragment { - public override fun equals(other: Any?): Boolean = other != null && other::class == this::class + override fun equals(other: Any?): Boolean = other != null && other::class == this::class - public override fun hashCode(): Int = this::class.hashCode() + override fun hashCode(): Int = this::class.hashCode() - public override fun serializeVariables( + override fun serializeVariables( writer: JsonWriter, customScalarAdapters: CustomScalarAdapters, withBooleanDefaultValues: Boolean, - ): Unit { + ) { // This fragment doesn't have any variable } - public override fun adapter(): CompositeAdapter = - HumanDetailsImpl_ResponseAdapter.Data.obj() + override fun adapter(): CompositeAdapter = HumanDetailsImpl_ResponseAdapter.Data.obj() - public override fun rootField(): CompiledField = CompiledField.Builder( + override fun rootField(): CompiledField = CompiledField.Builder( name = "data", type = Human.type ) @@ -47,21 +45,21 @@ public class HumanDetailsImpl() : Fragment { /** * What this human calls themselves */ - public override val name: String, + override val name: String, /** * Profile link */ - public override val profileLink: Any, + override val profileLink: Any, /** * The friends of the human exposed as a connection with edges */ - public override val friendsConnection: FriendsConnection, + override val friendsConnection: FriendsConnection, ) : HumanDetails, Fragment.Data { public data class FriendsConnection( /** * The edges for each of the character's friends. */ - public override val edges: List?, + override val edges: List?, ) : HumanDetails.FriendsConnection { public fun edgesFilterNotNull(): List? = edges?.filterNotNull() @@ -69,13 +67,13 @@ public class HumanDetailsImpl() : Fragment { /** * The character represented by this friendship edge */ - public override val node: Node?, + override val node: Node?, ) : HumanDetails.FriendsConnection.Edge { public data class Node( /** * The name of the character */ - public override val name: String, + override val name: String, ) : HumanDetails.FriendsConnection.Edge.Node } } diff --git a/libraries/apollo-compiler/src/test/graphql/com/example/named_fragment_delegate/kotlin/responseBased/named_fragment_delegate/fragment/HumanDetailsImpl_ResponseAdapter.kt.expected b/libraries/apollo-compiler/src/test/graphql/com/example/named_fragment_delegate/kotlin/responseBased/named_fragment_delegate/fragment/HumanDetailsImpl_ResponseAdapter.kt.expected index f9d9eba5b37..91d408812de 100644 --- a/libraries/apollo-compiler/src/test/graphql/com/example/named_fragment_delegate/kotlin/responseBased/named_fragment_delegate/fragment/HumanDetailsImpl_ResponseAdapter.kt.expected +++ b/libraries/apollo-compiler/src/test/graphql/com/example/named_fragment_delegate/kotlin/responseBased/named_fragment_delegate/fragment/HumanDetailsImpl_ResponseAdapter.kt.expected @@ -17,14 +17,13 @@ import com.apollographql.apollo3.api.nullable import com.apollographql.apollo3.api.obj import kotlin.Any import kotlin.String -import kotlin.Unit import kotlin.collections.List public object HumanDetailsImpl_ResponseAdapter { public object Data : CompositeAdapter { public val RESPONSE_NAMES: List = listOf("name", "profileLink", "friendsConnection") - public override fun fromJson(reader: JsonReader, adapterContext: CompositeAdapterContext): + override fun fromJson(reader: JsonReader, adapterContext: CompositeAdapterContext): HumanDetailsImpl.Data { var _name: String? = null var _profileLink: Any? = null @@ -46,11 +45,11 @@ public object HumanDetailsImpl_ResponseAdapter { ) } - public override fun toJson( + override fun toJson( writer: JsonWriter, `value`: HumanDetailsImpl.Data, adapterContext: CompositeAdapterContext, - ): Unit { + ) { writer.name("name") StringAdapter.toJson(writer, CustomScalarAdapters.Empty, value.name) @@ -64,7 +63,7 @@ public object HumanDetailsImpl_ResponseAdapter { private object FriendsConnection : CompositeAdapter { public val RESPONSE_NAMES: List = listOf("edges") - public override fun fromJson(reader: JsonReader, adapterContext: CompositeAdapterContext): + override fun fromJson(reader: JsonReader, adapterContext: CompositeAdapterContext): HumanDetailsImpl.Data.FriendsConnection { var _edges: List? = null @@ -80,11 +79,11 @@ public object HumanDetailsImpl_ResponseAdapter { ) } - public override fun toJson( + override fun toJson( writer: JsonWriter, `value`: HumanDetailsImpl.Data.FriendsConnection, adapterContext: CompositeAdapterContext, - ): Unit { + ) { writer.name("edges") Edge.obj().nullable().list().nullable().toJson(writer, value.edges, adapterContext) } @@ -92,7 +91,7 @@ public object HumanDetailsImpl_ResponseAdapter { private object Edge : CompositeAdapter { public val RESPONSE_NAMES: List = listOf("node") - public override fun fromJson(reader: JsonReader, adapterContext: CompositeAdapterContext): + override fun fromJson(reader: JsonReader, adapterContext: CompositeAdapterContext): HumanDetailsImpl.Data.FriendsConnection.Edge { var _node: HumanDetailsImpl.Data.FriendsConnection.Edge.Node? = null @@ -108,11 +107,11 @@ public object HumanDetailsImpl_ResponseAdapter { ) } - public override fun toJson( + override fun toJson( writer: JsonWriter, `value`: HumanDetailsImpl.Data.FriendsConnection.Edge, adapterContext: CompositeAdapterContext, - ): Unit { + ) { writer.name("node") Node.obj().nullable().toJson(writer, value.node, adapterContext) } @@ -120,7 +119,7 @@ public object HumanDetailsImpl_ResponseAdapter { private object Node : CompositeAdapter { public val RESPONSE_NAMES: List = listOf("name") - public override fun fromJson(reader: JsonReader, adapterContext: CompositeAdapterContext): + override fun fromJson(reader: JsonReader, adapterContext: CompositeAdapterContext): HumanDetailsImpl.Data.FriendsConnection.Edge.Node { var _name: String? = null @@ -136,11 +135,11 @@ public object HumanDetailsImpl_ResponseAdapter { ) } - public override fun toJson( + override fun toJson( writer: JsonWriter, `value`: HumanDetailsImpl.Data.FriendsConnection.Edge.Node, adapterContext: CompositeAdapterContext, - ): Unit { + ) { writer.name("name") StringAdapter.toJson(writer, CustomScalarAdapters.Empty, value.name) } diff --git a/libraries/apollo-compiler/src/test/graphql/com/example/named_fragment_inside_inline_fragment/kotlin/operationBased/named_fragment_inside_inline_fragment/GetHero.kt.expected b/libraries/apollo-compiler/src/test/graphql/com/example/named_fragment_inside_inline_fragment/kotlin/operationBased/named_fragment_inside_inline_fragment/GetHero.kt.expected index 6a3b539a4df..f305174fe6a 100644 --- a/libraries/apollo-compiler/src/test/graphql/com/example/named_fragment_inside_inline_fragment/kotlin/operationBased/named_fragment_inside_inline_fragment/GetHero.kt.expected +++ b/libraries/apollo-compiler/src/test/graphql/com/example/named_fragment_inside_inline_fragment/kotlin/operationBased/named_fragment_inside_inline_fragment/GetHero.kt.expected @@ -20,32 +20,32 @@ import kotlin.Any import kotlin.Boolean import kotlin.Int import kotlin.String -import kotlin.Unit +import com.example.named_fragment_inside_inline_fragment.type.Query as CompiledQuery public class GetHero() : Query { - public override fun equals(other: Any?): Boolean = other != null && other::class == this::class + override fun equals(other: Any?): Boolean = other != null && other::class == this::class - public override fun hashCode(): Int = this::class.hashCode() + override fun hashCode(): Int = this::class.hashCode() - public override fun id(): String = OPERATION_ID + override fun id(): String = OPERATION_ID - public override fun document(): String = OPERATION_DOCUMENT + override fun document(): String = OPERATION_DOCUMENT - public override fun name(): String = OPERATION_NAME + override fun name(): String = OPERATION_NAME - public override fun serializeVariables( + override fun serializeVariables( writer: JsonWriter, customScalarAdapters: CustomScalarAdapters, withBooleanDefaultValues: Boolean, - ): Unit { + ) { // This operation doesn't have any variable } - public override fun adapter(): CompositeAdapter = GetHero_ResponseAdapter.Data.obj() + override fun adapter(): CompositeAdapter = GetHero_ResponseAdapter.Data.obj() - public override fun rootField(): CompiledField = CompiledField.Builder( + override fun rootField(): CompiledField = CompiledField.Builder( name = "data", - type = com.example.named_fragment_inside_inline_fragment.type.Query.type + type = CompiledQuery.type ) .selections(selections = GetHeroSelections.__root) .build() diff --git a/libraries/apollo-compiler/src/test/graphql/com/example/named_fragment_inside_inline_fragment/kotlin/operationBased/named_fragment_inside_inline_fragment/adapter/GetHero_ResponseAdapter.kt.expected b/libraries/apollo-compiler/src/test/graphql/com/example/named_fragment_inside_inline_fragment/kotlin/operationBased/named_fragment_inside_inline_fragment/adapter/GetHero_ResponseAdapter.kt.expected index a62641398fd..2e4929463c2 100644 --- a/libraries/apollo-compiler/src/test/graphql/com/example/named_fragment_inside_inline_fragment/kotlin/operationBased/named_fragment_inside_inline_fragment/adapter/GetHero_ResponseAdapter.kt.expected +++ b/libraries/apollo-compiler/src/test/graphql/com/example/named_fragment_inside_inline_fragment/kotlin/operationBased/named_fragment_inside_inline_fragment/adapter/GetHero_ResponseAdapter.kt.expected @@ -15,14 +15,13 @@ import com.apollographql.apollo3.api.nullable import com.apollographql.apollo3.api.obj import com.example.named_fragment_inside_inline_fragment.GetHero import kotlin.String -import kotlin.Unit import kotlin.collections.List public object GetHero_ResponseAdapter { public object Data : CompositeAdapter { public val RESPONSE_NAMES: List = listOf("hero") - public override fun fromJson(reader: JsonReader, adapterContext: CompositeAdapterContext): + override fun fromJson(reader: JsonReader, adapterContext: CompositeAdapterContext): GetHero.Data { var _hero: GetHero.Data.Hero? = null @@ -38,11 +37,11 @@ public object GetHero_ResponseAdapter { ) } - public override fun toJson( + override fun toJson( writer: JsonWriter, `value`: GetHero.Data, adapterContext: CompositeAdapterContext, - ): Unit { + ) { writer.name("hero") Hero.obj(true).nullable().toJson(writer, value.hero, adapterContext) } @@ -50,7 +49,7 @@ public object GetHero_ResponseAdapter { private object Hero : CompositeAdapter { public val RESPONSE_NAMES: List = listOf("__typename") - public override fun fromJson(reader: JsonReader, adapterContext: CompositeAdapterContext): + override fun fromJson(reader: JsonReader, adapterContext: CompositeAdapterContext): GetHero.Data.Hero { var __typename: String? = null @@ -71,11 +70,11 @@ public object GetHero_ResponseAdapter { ) } - public override fun toJson( + override fun toJson( writer: JsonWriter, `value`: GetHero.Data.Hero, adapterContext: CompositeAdapterContext, - ): Unit { + ) { writer.name("__typename") StringAdapter.toJson(writer, CustomScalarAdapters.Empty, value.__typename) @@ -86,7 +85,7 @@ public object GetHero_ResponseAdapter { private object OnCharacter : CompositeAdapter { public val RESPONSE_NAMES: List = listOf("__typename") - public override fun fromJson(reader: JsonReader, adapterContext: CompositeAdapterContext): + override fun fromJson(reader: JsonReader, adapterContext: CompositeAdapterContext): GetHero.Data.Hero.OnCharacter { var __typename: String? = null @@ -112,11 +111,11 @@ public object GetHero_ResponseAdapter { ) } - public override fun toJson( + override fun toJson( writer: JsonWriter, `value`: GetHero.Data.Hero.OnCharacter, adapterContext: CompositeAdapterContext, - ): Unit { + ) { writer.name("__typename") StringAdapter.toJson(writer, CustomScalarAdapters.Empty, value.__typename) diff --git a/libraries/apollo-compiler/src/test/graphql/com/example/named_fragment_inside_inline_fragment/kotlin/operationBased/named_fragment_inside_inline_fragment/fragment/CharacterAppearsInImpl.kt.expected b/libraries/apollo-compiler/src/test/graphql/com/example/named_fragment_inside_inline_fragment/kotlin/operationBased/named_fragment_inside_inline_fragment/fragment/CharacterAppearsInImpl.kt.expected index 3d4757660e0..89ea311c33f 100644 --- a/libraries/apollo-compiler/src/test/graphql/com/example/named_fragment_inside_inline_fragment/kotlin/operationBased/named_fragment_inside_inline_fragment/fragment/CharacterAppearsInImpl.kt.expected +++ b/libraries/apollo-compiler/src/test/graphql/com/example/named_fragment_inside_inline_fragment/kotlin/operationBased/named_fragment_inside_inline_fragment/fragment/CharacterAppearsInImpl.kt.expected @@ -16,25 +16,24 @@ import com.example.named_fragment_inside_inline_fragment.type.Character import kotlin.Any import kotlin.Boolean import kotlin.Int -import kotlin.Unit public class CharacterAppearsInImpl() : Fragment { - public override fun equals(other: Any?): Boolean = other != null && other::class == this::class + override fun equals(other: Any?): Boolean = other != null && other::class == this::class - public override fun hashCode(): Int = this::class.hashCode() + override fun hashCode(): Int = this::class.hashCode() - public override fun serializeVariables( + override fun serializeVariables( writer: JsonWriter, customScalarAdapters: CustomScalarAdapters, withBooleanDefaultValues: Boolean, - ): Unit { + ) { // This fragment doesn't have any variable } - public override fun adapter(): CompositeAdapter = + override fun adapter(): CompositeAdapter = CharacterAppearsInImpl_ResponseAdapter.CharacterAppearsIn.obj() - public override fun rootField(): CompiledField = CompiledField.Builder( + override fun rootField(): CompiledField = CompiledField.Builder( name = "data", type = Character.type ) diff --git a/libraries/apollo-compiler/src/test/graphql/com/example/named_fragment_inside_inline_fragment/kotlin/operationBased/named_fragment_inside_inline_fragment/fragment/CharacterAppearsInImpl_ResponseAdapter.kt.expected b/libraries/apollo-compiler/src/test/graphql/com/example/named_fragment_inside_inline_fragment/kotlin/operationBased/named_fragment_inside_inline_fragment/fragment/CharacterAppearsInImpl_ResponseAdapter.kt.expected index 607d9bdbbb5..13ae3fe7b70 100644 --- a/libraries/apollo-compiler/src/test/graphql/com/example/named_fragment_inside_inline_fragment/kotlin/operationBased/named_fragment_inside_inline_fragment/fragment/CharacterAppearsInImpl_ResponseAdapter.kt.expected +++ b/libraries/apollo-compiler/src/test/graphql/com/example/named_fragment_inside_inline_fragment/kotlin/operationBased/named_fragment_inside_inline_fragment/fragment/CharacterAppearsInImpl_ResponseAdapter.kt.expected @@ -15,7 +15,6 @@ import com.apollographql.apollo3.api.nullable import com.example.named_fragment_inside_inline_fragment.type.Episode import com.example.named_fragment_inside_inline_fragment.type.adapter.Episode_ResponseAdapter import kotlin.String -import kotlin.Unit import kotlin.collections.List public object CharacterAppearsInImpl_ResponseAdapter { @@ -24,7 +23,7 @@ public object CharacterAppearsInImpl_ResponseAdapter { { public val RESPONSE_NAMES: List = listOf("appearsIn") - public override fun fromJson(reader: JsonReader, adapterContext: CompositeAdapterContext): + override fun fromJson(reader: JsonReader, adapterContext: CompositeAdapterContext): com.example.named_fragment_inside_inline_fragment.fragment.CharacterAppearsIn { var _appearsIn: List? = null @@ -40,11 +39,11 @@ public object CharacterAppearsInImpl_ResponseAdapter { ) } - public override fun toJson( + override fun toJson( writer: JsonWriter, `value`: com.example.named_fragment_inside_inline_fragment.fragment.CharacterAppearsIn, adapterContext: CompositeAdapterContext, - ): Unit { + ) { writer.name("appearsIn") Episode_ResponseAdapter.nullable().list().toJson(writer, CustomScalarAdapters.Empty, value.appearsIn) diff --git a/libraries/apollo-compiler/src/test/graphql/com/example/named_fragment_inside_inline_fragment/kotlin/operationBased/named_fragment_inside_inline_fragment/fragment/CharacterNameImpl.kt.expected b/libraries/apollo-compiler/src/test/graphql/com/example/named_fragment_inside_inline_fragment/kotlin/operationBased/named_fragment_inside_inline_fragment/fragment/CharacterNameImpl.kt.expected index f86830cf68d..470e8c729d2 100644 --- a/libraries/apollo-compiler/src/test/graphql/com/example/named_fragment_inside_inline_fragment/kotlin/operationBased/named_fragment_inside_inline_fragment/fragment/CharacterNameImpl.kt.expected +++ b/libraries/apollo-compiler/src/test/graphql/com/example/named_fragment_inside_inline_fragment/kotlin/operationBased/named_fragment_inside_inline_fragment/fragment/CharacterNameImpl.kt.expected @@ -16,25 +16,24 @@ import com.example.named_fragment_inside_inline_fragment.type.Character import kotlin.Any import kotlin.Boolean import kotlin.Int -import kotlin.Unit public class CharacterNameImpl() : Fragment { - public override fun equals(other: Any?): Boolean = other != null && other::class == this::class + override fun equals(other: Any?): Boolean = other != null && other::class == this::class - public override fun hashCode(): Int = this::class.hashCode() + override fun hashCode(): Int = this::class.hashCode() - public override fun serializeVariables( + override fun serializeVariables( writer: JsonWriter, customScalarAdapters: CustomScalarAdapters, withBooleanDefaultValues: Boolean, - ): Unit { + ) { // This fragment doesn't have any variable } - public override fun adapter(): CompositeAdapter = + override fun adapter(): CompositeAdapter = CharacterNameImpl_ResponseAdapter.CharacterName.obj() - public override fun rootField(): CompiledField = CompiledField.Builder( + override fun rootField(): CompiledField = CompiledField.Builder( name = "data", type = Character.type ) diff --git a/libraries/apollo-compiler/src/test/graphql/com/example/named_fragment_inside_inline_fragment/kotlin/operationBased/named_fragment_inside_inline_fragment/fragment/CharacterNameImpl_ResponseAdapter.kt.expected b/libraries/apollo-compiler/src/test/graphql/com/example/named_fragment_inside_inline_fragment/kotlin/operationBased/named_fragment_inside_inline_fragment/fragment/CharacterNameImpl_ResponseAdapter.kt.expected index 3d552c892e3..1dded4f9ba6 100644 --- a/libraries/apollo-compiler/src/test/graphql/com/example/named_fragment_inside_inline_fragment/kotlin/operationBased/named_fragment_inside_inline_fragment/fragment/CharacterNameImpl_ResponseAdapter.kt.expected +++ b/libraries/apollo-compiler/src/test/graphql/com/example/named_fragment_inside_inline_fragment/kotlin/operationBased/named_fragment_inside_inline_fragment/fragment/CharacterNameImpl_ResponseAdapter.kt.expected @@ -12,7 +12,6 @@ import com.apollographql.apollo3.api.StringAdapter import com.apollographql.apollo3.api.json.JsonReader import com.apollographql.apollo3.api.json.JsonWriter import kotlin.String -import kotlin.Unit import kotlin.collections.List public object CharacterNameImpl_ResponseAdapter { @@ -20,7 +19,7 @@ public object CharacterNameImpl_ResponseAdapter { CompositeAdapter { public val RESPONSE_NAMES: List = listOf("name") - public override fun fromJson(reader: JsonReader, adapterContext: CompositeAdapterContext): + override fun fromJson(reader: JsonReader, adapterContext: CompositeAdapterContext): com.example.named_fragment_inside_inline_fragment.fragment.CharacterName { var _name: String? = null @@ -36,11 +35,11 @@ public object CharacterNameImpl_ResponseAdapter { ) } - public override fun toJson( + override fun toJson( writer: JsonWriter, `value`: com.example.named_fragment_inside_inline_fragment.fragment.CharacterName, adapterContext: CompositeAdapterContext, - ): Unit { + ) { writer.name("name") StringAdapter.toJson(writer, CustomScalarAdapters.Empty, value.name) } diff --git a/libraries/apollo-compiler/src/test/graphql/com/example/named_fragment_inside_inline_fragment/kotlin/operationBased/named_fragment_inside_inline_fragment/type/adapter/Episode_ResponseAdapter.kt.expected b/libraries/apollo-compiler/src/test/graphql/com/example/named_fragment_inside_inline_fragment/kotlin/operationBased/named_fragment_inside_inline_fragment/type/adapter/Episode_ResponseAdapter.kt.expected index f46a87a5cdd..c0a3b56e807 100644 --- a/libraries/apollo-compiler/src/test/graphql/com/example/named_fragment_inside_inline_fragment/kotlin/operationBased/named_fragment_inside_inline_fragment/type/adapter/Episode_ResponseAdapter.kt.expected +++ b/libraries/apollo-compiler/src/test/graphql/com/example/named_fragment_inside_inline_fragment/kotlin/operationBased/named_fragment_inside_inline_fragment/type/adapter/Episode_ResponseAdapter.kt.expected @@ -10,20 +10,18 @@ import com.apollographql.apollo3.api.CustomScalarAdapters import com.apollographql.apollo3.api.json.JsonReader import com.apollographql.apollo3.api.json.JsonWriter import com.example.named_fragment_inside_inline_fragment.type.Episode -import kotlin.Unit public object Episode_ResponseAdapter : Adapter { - public override fun fromJson(reader: JsonReader, customScalarAdapters: CustomScalarAdapters): - Episode { + override fun fromJson(reader: JsonReader, customScalarAdapters: CustomScalarAdapters): Episode { val rawValue = reader.nextString()!! return Episode.safeValueOf(rawValue) } - public override fun toJson( + override fun toJson( writer: JsonWriter, customScalarAdapters: CustomScalarAdapters, `value`: Episode, - ): Unit { + ) { writer.value(value.rawValue) } } diff --git a/libraries/apollo-compiler/src/test/graphql/com/example/named_fragment_inside_inline_fragment/kotlin/responseBased/named_fragment_inside_inline_fragment/GetHero.kt.expected b/libraries/apollo-compiler/src/test/graphql/com/example/named_fragment_inside_inline_fragment/kotlin/responseBased/named_fragment_inside_inline_fragment/GetHero.kt.expected index a785981b643..e6c345a3b96 100644 --- a/libraries/apollo-compiler/src/test/graphql/com/example/named_fragment_inside_inline_fragment/kotlin/responseBased/named_fragment_inside_inline_fragment/GetHero.kt.expected +++ b/libraries/apollo-compiler/src/test/graphql/com/example/named_fragment_inside_inline_fragment/kotlin/responseBased/named_fragment_inside_inline_fragment/GetHero.kt.expected @@ -21,33 +21,34 @@ import kotlin.Any import kotlin.Boolean import kotlin.Int import kotlin.String -import kotlin.Unit +import kotlin.Suppress import kotlin.collections.List +import com.example.named_fragment_inside_inline_fragment.type.Query as CompiledQuery public class GetHero() : Query { - public override fun equals(other: Any?): Boolean = other != null && other::class == this::class + override fun equals(other: Any?): Boolean = other != null && other::class == this::class - public override fun hashCode(): Int = this::class.hashCode() + override fun hashCode(): Int = this::class.hashCode() - public override fun id(): String = OPERATION_ID + override fun id(): String = OPERATION_ID - public override fun document(): String = OPERATION_DOCUMENT + override fun document(): String = OPERATION_DOCUMENT - public override fun name(): String = OPERATION_NAME + override fun name(): String = OPERATION_NAME - public override fun serializeVariables( + override fun serializeVariables( writer: JsonWriter, customScalarAdapters: CustomScalarAdapters, withBooleanDefaultValues: Boolean, - ): Unit { + ) { // This operation doesn't have any variable } - public override fun adapter(): CompositeAdapter = GetHero_ResponseAdapter.Data.obj() + override fun adapter(): CompositeAdapter = GetHero_ResponseAdapter.Data.obj() - public override fun rootField(): CompiledField = CompiledField.Builder( + override fun rootField(): CompiledField = CompiledField.Builder( name = "data", - type = com.example.named_fragment_inside_inline_fragment.type.Query.type + type = CompiledQuery.type ) .selections(selections = GetHeroSelections.__root) .build() @@ -61,18 +62,20 @@ public class GetHero() : Query { /** * The name of the character */ - public override val name: String, + override val name: String, /** * The movies this character appears in */ - public override val appearsIn: List, + override val appearsIn: List, ) : CharacterName, CharacterAppearsIn { public fun appearsInFilterNotNull(): List = appearsIn.filterNotNull() public companion object { - public fun Hero.characterName() = this as? CharacterName + @Suppress("USELESS_CAST") + public fun Hero.characterName(): CharacterName? = this as? CharacterName - public fun Hero.characterAppearsIn() = this as? CharacterAppearsIn + @Suppress("USELESS_CAST") + public fun Hero.characterAppearsIn(): CharacterAppearsIn? = this as? CharacterAppearsIn } } } diff --git a/libraries/apollo-compiler/src/test/graphql/com/example/named_fragment_inside_inline_fragment/kotlin/responseBased/named_fragment_inside_inline_fragment/adapter/GetHero_ResponseAdapter.kt.expected b/libraries/apollo-compiler/src/test/graphql/com/example/named_fragment_inside_inline_fragment/kotlin/responseBased/named_fragment_inside_inline_fragment/adapter/GetHero_ResponseAdapter.kt.expected index b28fb939048..ab18876fd2f 100644 --- a/libraries/apollo-compiler/src/test/graphql/com/example/named_fragment_inside_inline_fragment/kotlin/responseBased/named_fragment_inside_inline_fragment/adapter/GetHero_ResponseAdapter.kt.expected +++ b/libraries/apollo-compiler/src/test/graphql/com/example/named_fragment_inside_inline_fragment/kotlin/responseBased/named_fragment_inside_inline_fragment/adapter/GetHero_ResponseAdapter.kt.expected @@ -18,14 +18,13 @@ import com.example.named_fragment_inside_inline_fragment.GetHero import com.example.named_fragment_inside_inline_fragment.type.Episode import com.example.named_fragment_inside_inline_fragment.type.adapter.Episode_ResponseAdapter import kotlin.String -import kotlin.Unit import kotlin.collections.List public object GetHero_ResponseAdapter { public object Data : CompositeAdapter { public val RESPONSE_NAMES: List = listOf("hero") - public override fun fromJson(reader: JsonReader, adapterContext: CompositeAdapterContext): + override fun fromJson(reader: JsonReader, adapterContext: CompositeAdapterContext): GetHero.Data { var _hero: GetHero.Data.Hero? = null @@ -41,11 +40,11 @@ public object GetHero_ResponseAdapter { ) } - public override fun toJson( + override fun toJson( writer: JsonWriter, `value`: GetHero.Data, adapterContext: CompositeAdapterContext, - ): Unit { + ) { writer.name("hero") Hero.obj().nullable().toJson(writer, value.hero, adapterContext) } @@ -53,7 +52,7 @@ public object GetHero_ResponseAdapter { private object Hero : CompositeAdapter { public val RESPONSE_NAMES: List = listOf("__typename", "name", "appearsIn") - public override fun fromJson(reader: JsonReader, adapterContext: CompositeAdapterContext): + override fun fromJson(reader: JsonReader, adapterContext: CompositeAdapterContext): GetHero.Data.Hero { var __typename: String? = null var _name: String? = null @@ -75,11 +74,11 @@ public object GetHero_ResponseAdapter { ) } - public override fun toJson( + override fun toJson( writer: JsonWriter, `value`: GetHero.Data.Hero, adapterContext: CompositeAdapterContext, - ): Unit { + ) { writer.name("__typename") StringAdapter.toJson(writer, CustomScalarAdapters.Empty, value.__typename) diff --git a/libraries/apollo-compiler/src/test/graphql/com/example/named_fragment_inside_inline_fragment/kotlin/responseBased/named_fragment_inside_inline_fragment/fragment/CharacterAppearsInImpl.kt.expected b/libraries/apollo-compiler/src/test/graphql/com/example/named_fragment_inside_inline_fragment/kotlin/responseBased/named_fragment_inside_inline_fragment/fragment/CharacterAppearsInImpl.kt.expected index 47b6705dce8..b44213b1547 100644 --- a/libraries/apollo-compiler/src/test/graphql/com/example/named_fragment_inside_inline_fragment/kotlin/responseBased/named_fragment_inside_inline_fragment/fragment/CharacterAppearsInImpl.kt.expected +++ b/libraries/apollo-compiler/src/test/graphql/com/example/named_fragment_inside_inline_fragment/kotlin/responseBased/named_fragment_inside_inline_fragment/fragment/CharacterAppearsInImpl.kt.expected @@ -17,26 +17,24 @@ import com.example.named_fragment_inside_inline_fragment.type.Episode import kotlin.Any import kotlin.Boolean import kotlin.Int -import kotlin.Unit import kotlin.collections.List public class CharacterAppearsInImpl() : Fragment { - public override fun equals(other: Any?): Boolean = other != null && other::class == this::class + override fun equals(other: Any?): Boolean = other != null && other::class == this::class - public override fun hashCode(): Int = this::class.hashCode() + override fun hashCode(): Int = this::class.hashCode() - public override fun serializeVariables( + override fun serializeVariables( writer: JsonWriter, customScalarAdapters: CustomScalarAdapters, withBooleanDefaultValues: Boolean, - ): Unit { + ) { // This fragment doesn't have any variable } - public override fun adapter(): CompositeAdapter = - CharacterAppearsInImpl_ResponseAdapter.Data.obj() + override fun adapter(): CompositeAdapter = CharacterAppearsInImpl_ResponseAdapter.Data.obj() - public override fun rootField(): CompiledField = CompiledField.Builder( + override fun rootField(): CompiledField = CompiledField.Builder( name = "data", type = Character.type ) @@ -47,7 +45,7 @@ public class CharacterAppearsInImpl() : Fragment { /** * The movies this character appears in */ - public override val appearsIn: List, + override val appearsIn: List, ) : CharacterAppearsIn, Fragment.Data { public fun appearsInFilterNotNull(): List = appearsIn.filterNotNull() } diff --git a/libraries/apollo-compiler/src/test/graphql/com/example/named_fragment_inside_inline_fragment/kotlin/responseBased/named_fragment_inside_inline_fragment/fragment/CharacterAppearsInImpl_ResponseAdapter.kt.expected b/libraries/apollo-compiler/src/test/graphql/com/example/named_fragment_inside_inline_fragment/kotlin/responseBased/named_fragment_inside_inline_fragment/fragment/CharacterAppearsInImpl_ResponseAdapter.kt.expected index 1c9a44f8617..cd4cec31e3c 100644 --- a/libraries/apollo-compiler/src/test/graphql/com/example/named_fragment_inside_inline_fragment/kotlin/responseBased/named_fragment_inside_inline_fragment/fragment/CharacterAppearsInImpl_ResponseAdapter.kt.expected +++ b/libraries/apollo-compiler/src/test/graphql/com/example/named_fragment_inside_inline_fragment/kotlin/responseBased/named_fragment_inside_inline_fragment/fragment/CharacterAppearsInImpl_ResponseAdapter.kt.expected @@ -15,14 +15,13 @@ import com.apollographql.apollo3.api.nullable import com.example.named_fragment_inside_inline_fragment.type.Episode import com.example.named_fragment_inside_inline_fragment.type.adapter.Episode_ResponseAdapter import kotlin.String -import kotlin.Unit import kotlin.collections.List public object CharacterAppearsInImpl_ResponseAdapter { public object Data : CompositeAdapter { public val RESPONSE_NAMES: List = listOf("appearsIn") - public override fun fromJson(reader: JsonReader, adapterContext: CompositeAdapterContext): + override fun fromJson(reader: JsonReader, adapterContext: CompositeAdapterContext): CharacterAppearsInImpl.Data { var _appearsIn: List? = null @@ -38,11 +37,11 @@ public object CharacterAppearsInImpl_ResponseAdapter { ) } - public override fun toJson( + override fun toJson( writer: JsonWriter, `value`: CharacterAppearsInImpl.Data, adapterContext: CompositeAdapterContext, - ): Unit { + ) { writer.name("appearsIn") Episode_ResponseAdapter.nullable().list().toJson(writer, CustomScalarAdapters.Empty, value.appearsIn) diff --git a/libraries/apollo-compiler/src/test/graphql/com/example/named_fragment_inside_inline_fragment/kotlin/responseBased/named_fragment_inside_inline_fragment/fragment/CharacterNameImpl.kt.expected b/libraries/apollo-compiler/src/test/graphql/com/example/named_fragment_inside_inline_fragment/kotlin/responseBased/named_fragment_inside_inline_fragment/fragment/CharacterNameImpl.kt.expected index 9e715168537..8dc4a793e04 100644 --- a/libraries/apollo-compiler/src/test/graphql/com/example/named_fragment_inside_inline_fragment/kotlin/responseBased/named_fragment_inside_inline_fragment/fragment/CharacterNameImpl.kt.expected +++ b/libraries/apollo-compiler/src/test/graphql/com/example/named_fragment_inside_inline_fragment/kotlin/responseBased/named_fragment_inside_inline_fragment/fragment/CharacterNameImpl.kt.expected @@ -17,25 +17,23 @@ import kotlin.Any import kotlin.Boolean import kotlin.Int import kotlin.String -import kotlin.Unit public class CharacterNameImpl() : Fragment { - public override fun equals(other: Any?): Boolean = other != null && other::class == this::class + override fun equals(other: Any?): Boolean = other != null && other::class == this::class - public override fun hashCode(): Int = this::class.hashCode() + override fun hashCode(): Int = this::class.hashCode() - public override fun serializeVariables( + override fun serializeVariables( writer: JsonWriter, customScalarAdapters: CustomScalarAdapters, withBooleanDefaultValues: Boolean, - ): Unit { + ) { // This fragment doesn't have any variable } - public override fun adapter(): CompositeAdapter = - CharacterNameImpl_ResponseAdapter.Data.obj() + override fun adapter(): CompositeAdapter = CharacterNameImpl_ResponseAdapter.Data.obj() - public override fun rootField(): CompiledField = CompiledField.Builder( + override fun rootField(): CompiledField = CompiledField.Builder( name = "data", type = Character.type ) @@ -46,6 +44,6 @@ public class CharacterNameImpl() : Fragment { /** * The name of the character */ - public override val name: String, + override val name: String, ) : CharacterName, Fragment.Data } diff --git a/libraries/apollo-compiler/src/test/graphql/com/example/named_fragment_inside_inline_fragment/kotlin/responseBased/named_fragment_inside_inline_fragment/fragment/CharacterNameImpl_ResponseAdapter.kt.expected b/libraries/apollo-compiler/src/test/graphql/com/example/named_fragment_inside_inline_fragment/kotlin/responseBased/named_fragment_inside_inline_fragment/fragment/CharacterNameImpl_ResponseAdapter.kt.expected index 7c389ee4889..8b29ba62b94 100644 --- a/libraries/apollo-compiler/src/test/graphql/com/example/named_fragment_inside_inline_fragment/kotlin/responseBased/named_fragment_inside_inline_fragment/fragment/CharacterNameImpl_ResponseAdapter.kt.expected +++ b/libraries/apollo-compiler/src/test/graphql/com/example/named_fragment_inside_inline_fragment/kotlin/responseBased/named_fragment_inside_inline_fragment/fragment/CharacterNameImpl_ResponseAdapter.kt.expected @@ -12,14 +12,13 @@ import com.apollographql.apollo3.api.StringAdapter import com.apollographql.apollo3.api.json.JsonReader import com.apollographql.apollo3.api.json.JsonWriter import kotlin.String -import kotlin.Unit import kotlin.collections.List public object CharacterNameImpl_ResponseAdapter { public object Data : CompositeAdapter { public val RESPONSE_NAMES: List = listOf("name") - public override fun fromJson(reader: JsonReader, adapterContext: CompositeAdapterContext): + override fun fromJson(reader: JsonReader, adapterContext: CompositeAdapterContext): CharacterNameImpl.Data { var _name: String? = null @@ -35,11 +34,11 @@ public object CharacterNameImpl_ResponseAdapter { ) } - public override fun toJson( + override fun toJson( writer: JsonWriter, `value`: CharacterNameImpl.Data, adapterContext: CompositeAdapterContext, - ): Unit { + ) { writer.name("name") StringAdapter.toJson(writer, CustomScalarAdapters.Empty, value.name) } diff --git a/libraries/apollo-compiler/src/test/graphql/com/example/named_fragment_inside_inline_fragment/kotlin/responseBased/named_fragment_inside_inline_fragment/type/adapter/Episode_ResponseAdapter.kt.expected b/libraries/apollo-compiler/src/test/graphql/com/example/named_fragment_inside_inline_fragment/kotlin/responseBased/named_fragment_inside_inline_fragment/type/adapter/Episode_ResponseAdapter.kt.expected index f46a87a5cdd..c0a3b56e807 100644 --- a/libraries/apollo-compiler/src/test/graphql/com/example/named_fragment_inside_inline_fragment/kotlin/responseBased/named_fragment_inside_inline_fragment/type/adapter/Episode_ResponseAdapter.kt.expected +++ b/libraries/apollo-compiler/src/test/graphql/com/example/named_fragment_inside_inline_fragment/kotlin/responseBased/named_fragment_inside_inline_fragment/type/adapter/Episode_ResponseAdapter.kt.expected @@ -10,20 +10,18 @@ import com.apollographql.apollo3.api.CustomScalarAdapters import com.apollographql.apollo3.api.json.JsonReader import com.apollographql.apollo3.api.json.JsonWriter import com.example.named_fragment_inside_inline_fragment.type.Episode -import kotlin.Unit public object Episode_ResponseAdapter : Adapter { - public override fun fromJson(reader: JsonReader, customScalarAdapters: CustomScalarAdapters): - Episode { + override fun fromJson(reader: JsonReader, customScalarAdapters: CustomScalarAdapters): Episode { val rawValue = reader.nextString()!! return Episode.safeValueOf(rawValue) } - public override fun toJson( + override fun toJson( writer: JsonWriter, customScalarAdapters: CustomScalarAdapters, `value`: Episode, - ): Unit { + ) { writer.value(value.rawValue) } } diff --git a/libraries/apollo-compiler/src/test/graphql/com/example/named_fragment_with_variables/kotlin/operationBased/named_fragment_with_variables/GetUser.kt.expected b/libraries/apollo-compiler/src/test/graphql/com/example/named_fragment_with_variables/kotlin/operationBased/named_fragment_with_variables/GetUser.kt.expected index ee4b6c0d4f3..7efb40362b7 100644 --- a/libraries/apollo-compiler/src/test/graphql/com/example/named_fragment_with_variables/kotlin/operationBased/named_fragment_with_variables/GetUser.kt.expected +++ b/libraries/apollo-compiler/src/test/graphql/com/example/named_fragment_with_variables/kotlin/operationBased/named_fragment_with_variables/GetUser.kt.expected @@ -20,33 +20,33 @@ import com.example.named_fragment_with_variables.type.UserQuery import kotlin.Boolean import kotlin.Int import kotlin.String -import kotlin.Unit +import com.example.named_fragment_with_variables.type.Query as CompiledQuery public data class GetUser( public val organizationId: String, public val query: UserQuery, public val size: Int, ) : Query { - public override fun id(): String = OPERATION_ID + override fun id(): String = OPERATION_ID - public override fun document(): String = OPERATION_DOCUMENT + override fun document(): String = OPERATION_DOCUMENT - public override fun name(): String = OPERATION_NAME + override fun name(): String = OPERATION_NAME - public override fun serializeVariables( + override fun serializeVariables( writer: JsonWriter, customScalarAdapters: CustomScalarAdapters, withBooleanDefaultValues: Boolean, - ): Unit { + ) { GetUser_VariablesAdapter.serializeVariables(writer, this, customScalarAdapters, withBooleanDefaultValues) } - public override fun adapter(): CompositeAdapter = GetUser_ResponseAdapter.Data.obj(true) + override fun adapter(): CompositeAdapter = GetUser_ResponseAdapter.Data.obj(true) - public override fun rootField(): CompiledField = CompiledField.Builder( + override fun rootField(): CompiledField = CompiledField.Builder( name = "data", - type = com.example.named_fragment_with_variables.type.Query.type + type = CompiledQuery.type ) .selections(selections = GetUserSelections.__root) .build() diff --git a/libraries/apollo-compiler/src/test/graphql/com/example/named_fragment_with_variables/kotlin/operationBased/named_fragment_with_variables/adapter/GetUser_ResponseAdapter.kt.expected b/libraries/apollo-compiler/src/test/graphql/com/example/named_fragment_with_variables/kotlin/operationBased/named_fragment_with_variables/adapter/GetUser_ResponseAdapter.kt.expected index 8b19dffbc0a..2fdec853637 100644 --- a/libraries/apollo-compiler/src/test/graphql/com/example/named_fragment_with_variables/kotlin/operationBased/named_fragment_with_variables/adapter/GetUser_ResponseAdapter.kt.expected +++ b/libraries/apollo-compiler/src/test/graphql/com/example/named_fragment_with_variables/kotlin/operationBased/named_fragment_with_variables/adapter/GetUser_ResponseAdapter.kt.expected @@ -13,14 +13,13 @@ import com.apollographql.apollo3.api.json.JsonReader import com.apollographql.apollo3.api.json.JsonWriter import com.example.named_fragment_with_variables.GetUser import kotlin.String -import kotlin.Unit import kotlin.collections.List public object GetUser_ResponseAdapter { public object Data : CompositeAdapter { public val RESPONSE_NAMES: List = listOf("__typename") - public override fun fromJson(reader: JsonReader, adapterContext: CompositeAdapterContext): + override fun fromJson(reader: JsonReader, adapterContext: CompositeAdapterContext): GetUser.Data { var __typename: String? = null @@ -41,11 +40,11 @@ public object GetUser_ResponseAdapter { ) } - public override fun toJson( + override fun toJson( writer: JsonWriter, `value`: GetUser.Data, adapterContext: CompositeAdapterContext, - ): Unit { + ) { writer.name("__typename") StringAdapter.toJson(writer, CustomScalarAdapters.Empty, value.__typename) diff --git a/libraries/apollo-compiler/src/test/graphql/com/example/named_fragment_with_variables/kotlin/operationBased/named_fragment_with_variables/adapter/GetUser_VariablesAdapter.kt.expected b/libraries/apollo-compiler/src/test/graphql/com/example/named_fragment_with_variables/kotlin/operationBased/named_fragment_with_variables/adapter/GetUser_VariablesAdapter.kt.expected index cce29d97eea..9e5fe403964 100644 --- a/libraries/apollo-compiler/src/test/graphql/com/example/named_fragment_with_variables/kotlin/operationBased/named_fragment_with_variables/adapter/GetUser_VariablesAdapter.kt.expected +++ b/libraries/apollo-compiler/src/test/graphql/com/example/named_fragment_with_variables/kotlin/operationBased/named_fragment_with_variables/adapter/GetUser_VariablesAdapter.kt.expected @@ -15,7 +15,6 @@ import com.example.named_fragment_with_variables.GetUser import com.example.named_fragment_with_variables.type.adapter.UserQuery_InputAdapter import kotlin.Boolean import kotlin.Suppress -import kotlin.Unit public object GetUser_VariablesAdapter { @Suppress( @@ -27,7 +26,7 @@ public object GetUser_VariablesAdapter { `value`: GetUser, customScalarAdapters: CustomScalarAdapters, withBooleanDefaultValues: Boolean, - ): Unit { + ) { val adapterContext = CompositeAdapterContext.Builder().customScalarAdapters(customScalarAdapters).build() writer.name("organizationId") diff --git a/libraries/apollo-compiler/src/test/graphql/com/example/named_fragment_with_variables/kotlin/operationBased/named_fragment_with_variables/fragment/QueryFragmentImpl.kt.expected b/libraries/apollo-compiler/src/test/graphql/com/example/named_fragment_with_variables/kotlin/operationBased/named_fragment_with_variables/fragment/QueryFragmentImpl.kt.expected index 806996aea51..581edb29692 100644 --- a/libraries/apollo-compiler/src/test/graphql/com/example/named_fragment_with_variables/kotlin/operationBased/named_fragment_with_variables/fragment/QueryFragmentImpl.kt.expected +++ b/libraries/apollo-compiler/src/test/graphql/com/example/named_fragment_with_variables/kotlin/operationBased/named_fragment_with_variables/fragment/QueryFragmentImpl.kt.expected @@ -18,26 +18,25 @@ import com.example.named_fragment_with_variables.type.UserQuery import kotlin.Boolean import kotlin.Int import kotlin.String -import kotlin.Unit public data class QueryFragmentImpl( public val organizationId: String, public val query: UserQuery, public val size: Int, ) : Fragment { - public override fun serializeVariables( + override fun serializeVariables( writer: JsonWriter, customScalarAdapters: CustomScalarAdapters, withBooleanDefaultValues: Boolean, - ): Unit { + ) { QueryFragmentImpl_VariablesAdapter.serializeVariables(writer, this, customScalarAdapters, withBooleanDefaultValues) } - public override fun adapter(): CompositeAdapter = + override fun adapter(): CompositeAdapter = QueryFragmentImpl_ResponseAdapter.QueryFragment.obj() - public override fun rootField(): CompiledField = CompiledField.Builder( + override fun rootField(): CompiledField = CompiledField.Builder( name = "data", type = Query.type ) diff --git a/libraries/apollo-compiler/src/test/graphql/com/example/named_fragment_with_variables/kotlin/operationBased/named_fragment_with_variables/fragment/QueryFragmentImpl_ResponseAdapter.kt.expected b/libraries/apollo-compiler/src/test/graphql/com/example/named_fragment_with_variables/kotlin/operationBased/named_fragment_with_variables/fragment/QueryFragmentImpl_ResponseAdapter.kt.expected index ee0b1e8414f..6da943b0f7c 100644 --- a/libraries/apollo-compiler/src/test/graphql/com/example/named_fragment_with_variables/kotlin/operationBased/named_fragment_with_variables/fragment/QueryFragmentImpl_ResponseAdapter.kt.expected +++ b/libraries/apollo-compiler/src/test/graphql/com/example/named_fragment_with_variables/kotlin/operationBased/named_fragment_with_variables/fragment/QueryFragmentImpl_ResponseAdapter.kt.expected @@ -15,7 +15,6 @@ import com.apollographql.apollo3.api.list import com.apollographql.apollo3.api.nullable import com.apollographql.apollo3.api.obj import kotlin.String -import kotlin.Unit import kotlin.collections.List public object QueryFragmentImpl_ResponseAdapter { @@ -23,7 +22,7 @@ public object QueryFragmentImpl_ResponseAdapter { CompositeAdapter { public val RESPONSE_NAMES: List = listOf("organization") - public override fun fromJson(reader: JsonReader, adapterContext: CompositeAdapterContext): + override fun fromJson(reader: JsonReader, adapterContext: CompositeAdapterContext): com.example.named_fragment_with_variables.fragment.QueryFragment { var _organization: com.example.named_fragment_with_variables.fragment.QueryFragment.Organization? = null @@ -39,11 +38,11 @@ public object QueryFragmentImpl_ResponseAdapter { ) } - public override fun toJson( + override fun toJson( writer: JsonWriter, `value`: com.example.named_fragment_with_variables.fragment.QueryFragment, adapterContext: CompositeAdapterContext, - ): Unit { + ) { writer.name("organization") Organization.obj().nullable().toJson(writer, value.organization, adapterContext) } @@ -53,7 +52,7 @@ public object QueryFragmentImpl_ResponseAdapter { { public val RESPONSE_NAMES: List = listOf("id", "user") - public override fun fromJson(reader: JsonReader, adapterContext: CompositeAdapterContext): + override fun fromJson(reader: JsonReader, adapterContext: CompositeAdapterContext): com.example.named_fragment_with_variables.fragment.QueryFragment.Organization { var _id: String? = null var _user: List? = null @@ -72,11 +71,11 @@ public object QueryFragmentImpl_ResponseAdapter { ) } - public override fun toJson( + override fun toJson( writer: JsonWriter, `value`: com.example.named_fragment_with_variables.fragment.QueryFragment.Organization, adapterContext: CompositeAdapterContext, - ): Unit { + ) { writer.name("id") StringAdapter.toJson(writer, CustomScalarAdapters.Empty, value.id) @@ -89,7 +88,7 @@ public object QueryFragmentImpl_ResponseAdapter { { public val RESPONSE_NAMES: List = listOf("__typename") - public override fun fromJson(reader: JsonReader, adapterContext: CompositeAdapterContext): + override fun fromJson(reader: JsonReader, adapterContext: CompositeAdapterContext): com.example.named_fragment_with_variables.fragment.QueryFragment.Organization.User { var __typename: String? = null @@ -110,11 +109,11 @@ public object QueryFragmentImpl_ResponseAdapter { ) } - public override fun toJson( + override fun toJson( writer: JsonWriter, `value`: com.example.named_fragment_with_variables.fragment.QueryFragment.Organization.User, adapterContext: CompositeAdapterContext, - ): Unit { + ) { writer.name("__typename") StringAdapter.toJson(writer, CustomScalarAdapters.Empty, value.__typename) diff --git a/libraries/apollo-compiler/src/test/graphql/com/example/named_fragment_with_variables/kotlin/operationBased/named_fragment_with_variables/fragment/UserFragmentImpl.kt.expected b/libraries/apollo-compiler/src/test/graphql/com/example/named_fragment_with_variables/kotlin/operationBased/named_fragment_with_variables/fragment/UserFragmentImpl.kt.expected index 32d1b43b189..b958085fbdd 100644 --- a/libraries/apollo-compiler/src/test/graphql/com/example/named_fragment_with_variables/kotlin/operationBased/named_fragment_with_variables/fragment/UserFragmentImpl.kt.expected +++ b/libraries/apollo-compiler/src/test/graphql/com/example/named_fragment_with_variables/kotlin/operationBased/named_fragment_with_variables/fragment/UserFragmentImpl.kt.expected @@ -16,24 +16,23 @@ import com.example.named_fragment_with_variables.fragment.selections.UserFragmen import com.example.named_fragment_with_variables.type.User import kotlin.Boolean import kotlin.Int -import kotlin.Unit public data class UserFragmentImpl( public val size: Int, ) : Fragment { - public override fun serializeVariables( + override fun serializeVariables( writer: JsonWriter, customScalarAdapters: CustomScalarAdapters, withBooleanDefaultValues: Boolean, - ): Unit { + ) { UserFragmentImpl_VariablesAdapter.serializeVariables(writer, this, customScalarAdapters, withBooleanDefaultValues) } - public override fun adapter(): CompositeAdapter = + override fun adapter(): CompositeAdapter = UserFragmentImpl_ResponseAdapter.UserFragment.obj() - public override fun rootField(): CompiledField = CompiledField.Builder( + override fun rootField(): CompiledField = CompiledField.Builder( name = "data", type = User.type ) diff --git a/libraries/apollo-compiler/src/test/graphql/com/example/named_fragment_with_variables/kotlin/operationBased/named_fragment_with_variables/fragment/UserFragmentImpl_ResponseAdapter.kt.expected b/libraries/apollo-compiler/src/test/graphql/com/example/named_fragment_with_variables/kotlin/operationBased/named_fragment_with_variables/fragment/UserFragmentImpl_ResponseAdapter.kt.expected index a741f646d30..d6d2bcbccee 100644 --- a/libraries/apollo-compiler/src/test/graphql/com/example/named_fragment_with_variables/kotlin/operationBased/named_fragment_with_variables/fragment/UserFragmentImpl_ResponseAdapter.kt.expected +++ b/libraries/apollo-compiler/src/test/graphql/com/example/named_fragment_with_variables/kotlin/operationBased/named_fragment_with_variables/fragment/UserFragmentImpl_ResponseAdapter.kt.expected @@ -12,7 +12,6 @@ import com.apollographql.apollo3.api.StringAdapter import com.apollographql.apollo3.api.json.JsonReader import com.apollographql.apollo3.api.json.JsonWriter import kotlin.String -import kotlin.Unit import kotlin.collections.List public object UserFragmentImpl_ResponseAdapter { @@ -20,7 +19,7 @@ public object UserFragmentImpl_ResponseAdapter { CompositeAdapter { public val RESPONSE_NAMES: List = listOf("firstName", "lastName", "avatar") - public override fun fromJson(reader: JsonReader, adapterContext: CompositeAdapterContext): + override fun fromJson(reader: JsonReader, adapterContext: CompositeAdapterContext): com.example.named_fragment_with_variables.fragment.UserFragment { var _firstName: String? = null var _lastName: String? = null @@ -42,11 +41,11 @@ public object UserFragmentImpl_ResponseAdapter { ) } - public override fun toJson( + override fun toJson( writer: JsonWriter, `value`: com.example.named_fragment_with_variables.fragment.UserFragment, adapterContext: CompositeAdapterContext, - ): Unit { + ) { writer.name("firstName") StringAdapter.toJson(writer, CustomScalarAdapters.Empty, value.firstName) diff --git a/libraries/apollo-compiler/src/test/graphql/com/example/named_fragment_with_variables/kotlin/operationBased/named_fragment_with_variables/fragment/adapter/QueryFragmentImpl_VariablesAdapter.kt.expected b/libraries/apollo-compiler/src/test/graphql/com/example/named_fragment_with_variables/kotlin/operationBased/named_fragment_with_variables/fragment/adapter/QueryFragmentImpl_VariablesAdapter.kt.expected index a14739f0e53..4a542d352c2 100644 --- a/libraries/apollo-compiler/src/test/graphql/com/example/named_fragment_with_variables/kotlin/operationBased/named_fragment_with_variables/fragment/adapter/QueryFragmentImpl_VariablesAdapter.kt.expected +++ b/libraries/apollo-compiler/src/test/graphql/com/example/named_fragment_with_variables/kotlin/operationBased/named_fragment_with_variables/fragment/adapter/QueryFragmentImpl_VariablesAdapter.kt.expected @@ -15,7 +15,6 @@ import com.example.named_fragment_with_variables.fragment.QueryFragmentImpl import com.example.named_fragment_with_variables.type.adapter.UserQuery_InputAdapter import kotlin.Boolean import kotlin.Suppress -import kotlin.Unit public object QueryFragmentImpl_VariablesAdapter { @Suppress( @@ -27,7 +26,7 @@ public object QueryFragmentImpl_VariablesAdapter { `value`: QueryFragmentImpl, customScalarAdapters: CustomScalarAdapters, withBooleanDefaultValues: Boolean, - ): Unit { + ) { val adapterContext = CompositeAdapterContext.Builder().customScalarAdapters(customScalarAdapters).build() writer.name("organizationId") diff --git a/libraries/apollo-compiler/src/test/graphql/com/example/named_fragment_with_variables/kotlin/operationBased/named_fragment_with_variables/fragment/adapter/UserFragmentImpl_VariablesAdapter.kt.expected b/libraries/apollo-compiler/src/test/graphql/com/example/named_fragment_with_variables/kotlin/operationBased/named_fragment_with_variables/fragment/adapter/UserFragmentImpl_VariablesAdapter.kt.expected index 7b241525e3a..3d8396536c5 100644 --- a/libraries/apollo-compiler/src/test/graphql/com/example/named_fragment_with_variables/kotlin/operationBased/named_fragment_with_variables/fragment/adapter/UserFragmentImpl_VariablesAdapter.kt.expected +++ b/libraries/apollo-compiler/src/test/graphql/com/example/named_fragment_with_variables/kotlin/operationBased/named_fragment_with_variables/fragment/adapter/UserFragmentImpl_VariablesAdapter.kt.expected @@ -12,7 +12,6 @@ import com.apollographql.apollo3.api.json.JsonWriter import com.example.named_fragment_with_variables.fragment.UserFragmentImpl import kotlin.Boolean import kotlin.Suppress -import kotlin.Unit public object UserFragmentImpl_VariablesAdapter { @Suppress( @@ -24,7 +23,7 @@ public object UserFragmentImpl_VariablesAdapter { `value`: UserFragmentImpl, customScalarAdapters: CustomScalarAdapters, withBooleanDefaultValues: Boolean, - ): Unit { + ) { val adapterContext = CompositeAdapterContext.Builder().customScalarAdapters(customScalarAdapters).build() writer.name("size") diff --git a/libraries/apollo-compiler/src/test/graphql/com/example/named_fragment_with_variables/kotlin/operationBased/named_fragment_with_variables/type/adapter/UserQuery_InputAdapter.kt.expected b/libraries/apollo-compiler/src/test/graphql/com/example/named_fragment_with_variables/kotlin/operationBased/named_fragment_with_variables/type/adapter/UserQuery_InputAdapter.kt.expected index e6336b0c363..29a086e8fae 100644 --- a/libraries/apollo-compiler/src/test/graphql/com/example/named_fragment_with_variables/kotlin/operationBased/named_fragment_with_variables/type/adapter/UserQuery_InputAdapter.kt.expected +++ b/libraries/apollo-compiler/src/test/graphql/com/example/named_fragment_with_variables/kotlin/operationBased/named_fragment_with_variables/type/adapter/UserQuery_InputAdapter.kt.expected @@ -16,17 +16,16 @@ import com.apollographql.apollo3.api.json.JsonWriter import com.apollographql.apollo3.api.present import com.example.named_fragment_with_variables.type.UserQuery import kotlin.IllegalStateException -import kotlin.Unit public object UserQuery_InputAdapter : CompositeAdapter { - public override fun fromJson(reader: JsonReader, adapterContext: CompositeAdapterContext): - UserQuery = throw IllegalStateException("Input type used in output position") + override fun fromJson(reader: JsonReader, adapterContext: CompositeAdapterContext): UserQuery = + throw IllegalStateException("Input type used in output position") - public override fun toJson( + override fun toJson( writer: JsonWriter, `value`: UserQuery, adapterContext: CompositeAdapterContext, - ): Unit { + ) { writer.name("name") StringAdapter.toJson(writer, CustomScalarAdapters.Empty, value.name) if (value.isAdmin is Optional.Present) { diff --git a/libraries/apollo-compiler/src/test/graphql/com/example/named_fragment_with_variables/kotlin/responseBased/named_fragment_with_variables/GetUser.kt.expected b/libraries/apollo-compiler/src/test/graphql/com/example/named_fragment_with_variables/kotlin/responseBased/named_fragment_with_variables/GetUser.kt.expected index 37d4a915a5d..b648ed9a96e 100644 --- a/libraries/apollo-compiler/src/test/graphql/com/example/named_fragment_with_variables/kotlin/responseBased/named_fragment_with_variables/GetUser.kt.expected +++ b/libraries/apollo-compiler/src/test/graphql/com/example/named_fragment_with_variables/kotlin/responseBased/named_fragment_with_variables/GetUser.kt.expected @@ -21,34 +21,35 @@ import com.example.named_fragment_with_variables.type.UserQuery import kotlin.Boolean import kotlin.Int import kotlin.String -import kotlin.Unit +import kotlin.Suppress import kotlin.collections.List +import com.example.named_fragment_with_variables.type.Query as CompiledQuery public data class GetUser( public val organizationId: String, public val query: UserQuery, public val size: Int, ) : Query { - public override fun id(): String = OPERATION_ID + override fun id(): String = OPERATION_ID - public override fun document(): String = OPERATION_DOCUMENT + override fun document(): String = OPERATION_DOCUMENT - public override fun name(): String = OPERATION_NAME + override fun name(): String = OPERATION_NAME - public override fun serializeVariables( + override fun serializeVariables( writer: JsonWriter, customScalarAdapters: CustomScalarAdapters, withBooleanDefaultValues: Boolean, - ): Unit { + ) { GetUser_VariablesAdapter.serializeVariables(writer, this, customScalarAdapters, withBooleanDefaultValues) } - public override fun adapter(): CompositeAdapter = GetUser_ResponseAdapter.Data.obj() + override fun adapter(): CompositeAdapter = GetUser_ResponseAdapter.Data.obj() - public override fun rootField(): CompiledField = CompiledField.Builder( + override fun rootField(): CompiledField = CompiledField.Builder( name = "data", - type = com.example.named_fragment_with_variables.type.Query.type + type = CompiledQuery.type ) .selections(selections = GetUserSelections.__root) .build() @@ -56,26 +57,28 @@ public data class GetUser( @ApolloAdaptableWith(GetUser_ResponseAdapter.Data::class) public data class Data( public val __typename: String, - public override val organization: Organization?, + override val organization: Organization?, ) : QueryFragment, Query.Data { public data class Organization( - public override val id: String, - public override val user: List, + override val id: String, + override val user: List, ) : QueryFragment.Organization { public data class User( - public override val __typename: String, - public override val firstName: String, - public override val lastName: String, - public override val avatar: String, + override val __typename: String, + override val firstName: String, + override val lastName: String, + override val avatar: String, ) : UserFragment, QueryFragment.Organization.User { public companion object { - public fun User.userFragment() = this as? UserFragment + @Suppress("USELESS_CAST") + public fun User.userFragment(): UserFragment? = this as? UserFragment } } } public companion object { - public fun Data.queryFragment() = this as? QueryFragment + @Suppress("USELESS_CAST") + public fun Data.queryFragment(): QueryFragment? = this as? QueryFragment } } diff --git a/libraries/apollo-compiler/src/test/graphql/com/example/named_fragment_with_variables/kotlin/responseBased/named_fragment_with_variables/adapter/GetUser_ResponseAdapter.kt.expected b/libraries/apollo-compiler/src/test/graphql/com/example/named_fragment_with_variables/kotlin/responseBased/named_fragment_with_variables/adapter/GetUser_ResponseAdapter.kt.expected index 16b2befd85b..eb6eaa31b8a 100644 --- a/libraries/apollo-compiler/src/test/graphql/com/example/named_fragment_with_variables/kotlin/responseBased/named_fragment_with_variables/adapter/GetUser_ResponseAdapter.kt.expected +++ b/libraries/apollo-compiler/src/test/graphql/com/example/named_fragment_with_variables/kotlin/responseBased/named_fragment_with_variables/adapter/GetUser_ResponseAdapter.kt.expected @@ -16,14 +16,13 @@ import com.apollographql.apollo3.api.nullable import com.apollographql.apollo3.api.obj import com.example.named_fragment_with_variables.GetUser import kotlin.String -import kotlin.Unit import kotlin.collections.List public object GetUser_ResponseAdapter { public object Data : CompositeAdapter { public val RESPONSE_NAMES: List = listOf("__typename", "organization") - public override fun fromJson(reader: JsonReader, adapterContext: CompositeAdapterContext): + override fun fromJson(reader: JsonReader, adapterContext: CompositeAdapterContext): GetUser.Data { var __typename: String? = null var _organization: GetUser.Data.Organization? = null @@ -42,11 +41,11 @@ public object GetUser_ResponseAdapter { ) } - public override fun toJson( + override fun toJson( writer: JsonWriter, `value`: GetUser.Data, adapterContext: CompositeAdapterContext, - ): Unit { + ) { writer.name("__typename") StringAdapter.toJson(writer, CustomScalarAdapters.Empty, value.__typename) @@ -57,7 +56,7 @@ public object GetUser_ResponseAdapter { private object Organization : CompositeAdapter { public val RESPONSE_NAMES: List = listOf("id", "user") - public override fun fromJson(reader: JsonReader, adapterContext: CompositeAdapterContext): + override fun fromJson(reader: JsonReader, adapterContext: CompositeAdapterContext): GetUser.Data.Organization { var _id: String? = null var _user: List? = null @@ -76,11 +75,11 @@ public object GetUser_ResponseAdapter { ) } - public override fun toJson( + override fun toJson( writer: JsonWriter, `value`: GetUser.Data.Organization, adapterContext: CompositeAdapterContext, - ): Unit { + ) { writer.name("id") StringAdapter.toJson(writer, CustomScalarAdapters.Empty, value.id) @@ -92,7 +91,7 @@ public object GetUser_ResponseAdapter { public val RESPONSE_NAMES: List = listOf("__typename", "firstName", "lastName", "avatar") - public override fun fromJson(reader: JsonReader, adapterContext: CompositeAdapterContext): + override fun fromJson(reader: JsonReader, adapterContext: CompositeAdapterContext): GetUser.Data.Organization.User { var __typename: String? = null var _firstName: String? = null @@ -117,11 +116,11 @@ public object GetUser_ResponseAdapter { ) } - public override fun toJson( + override fun toJson( writer: JsonWriter, `value`: GetUser.Data.Organization.User, adapterContext: CompositeAdapterContext, - ): Unit { + ) { writer.name("__typename") StringAdapter.toJson(writer, CustomScalarAdapters.Empty, value.__typename) diff --git a/libraries/apollo-compiler/src/test/graphql/com/example/named_fragment_with_variables/kotlin/responseBased/named_fragment_with_variables/adapter/GetUser_VariablesAdapter.kt.expected b/libraries/apollo-compiler/src/test/graphql/com/example/named_fragment_with_variables/kotlin/responseBased/named_fragment_with_variables/adapter/GetUser_VariablesAdapter.kt.expected index cce29d97eea..9e5fe403964 100644 --- a/libraries/apollo-compiler/src/test/graphql/com/example/named_fragment_with_variables/kotlin/responseBased/named_fragment_with_variables/adapter/GetUser_VariablesAdapter.kt.expected +++ b/libraries/apollo-compiler/src/test/graphql/com/example/named_fragment_with_variables/kotlin/responseBased/named_fragment_with_variables/adapter/GetUser_VariablesAdapter.kt.expected @@ -15,7 +15,6 @@ import com.example.named_fragment_with_variables.GetUser import com.example.named_fragment_with_variables.type.adapter.UserQuery_InputAdapter import kotlin.Boolean import kotlin.Suppress -import kotlin.Unit public object GetUser_VariablesAdapter { @Suppress( @@ -27,7 +26,7 @@ public object GetUser_VariablesAdapter { `value`: GetUser, customScalarAdapters: CustomScalarAdapters, withBooleanDefaultValues: Boolean, - ): Unit { + ) { val adapterContext = CompositeAdapterContext.Builder().customScalarAdapters(customScalarAdapters).build() writer.name("organizationId") diff --git a/libraries/apollo-compiler/src/test/graphql/com/example/named_fragment_with_variables/kotlin/responseBased/named_fragment_with_variables/fragment/QueryFragment.kt.expected b/libraries/apollo-compiler/src/test/graphql/com/example/named_fragment_with_variables/kotlin/responseBased/named_fragment_with_variables/fragment/QueryFragment.kt.expected index 2be3feeb1e0..bb781861480 100644 --- a/libraries/apollo-compiler/src/test/graphql/com/example/named_fragment_with_variables/kotlin/responseBased/named_fragment_with_variables/fragment/QueryFragment.kt.expected +++ b/libraries/apollo-compiler/src/test/graphql/com/example/named_fragment_with_variables/kotlin/responseBased/named_fragment_with_variables/fragment/QueryFragment.kt.expected @@ -6,6 +6,7 @@ package com.example.named_fragment_with_variables.fragment import kotlin.String +import kotlin.Suppress import kotlin.collections.List public interface QueryFragment { @@ -19,14 +20,15 @@ public interface QueryFragment { public interface User : UserFragment { public val __typename: String - public override val firstName: String + override val firstName: String - public override val lastName: String + override val lastName: String - public override val avatar: String + override val avatar: String public companion object { - public fun User.userFragment() = this as? UserFragment + @Suppress("USELESS_CAST") + public fun User.userFragment(): UserFragment? = this as? UserFragment } } } diff --git a/libraries/apollo-compiler/src/test/graphql/com/example/named_fragment_with_variables/kotlin/responseBased/named_fragment_with_variables/fragment/QueryFragmentImpl.kt.expected b/libraries/apollo-compiler/src/test/graphql/com/example/named_fragment_with_variables/kotlin/responseBased/named_fragment_with_variables/fragment/QueryFragmentImpl.kt.expected index b0361b7cd02..a6e3888681f 100644 --- a/libraries/apollo-compiler/src/test/graphql/com/example/named_fragment_with_variables/kotlin/responseBased/named_fragment_with_variables/fragment/QueryFragmentImpl.kt.expected +++ b/libraries/apollo-compiler/src/test/graphql/com/example/named_fragment_with_variables/kotlin/responseBased/named_fragment_with_variables/fragment/QueryFragmentImpl.kt.expected @@ -18,7 +18,7 @@ import com.example.named_fragment_with_variables.type.UserQuery import kotlin.Boolean import kotlin.Int import kotlin.String -import kotlin.Unit +import kotlin.Suppress import kotlin.collections.List public data class QueryFragmentImpl( @@ -26,19 +26,18 @@ public data class QueryFragmentImpl( public val query: UserQuery, public val size: Int, ) : Fragment { - public override fun serializeVariables( + override fun serializeVariables( writer: JsonWriter, customScalarAdapters: CustomScalarAdapters, withBooleanDefaultValues: Boolean, - ): Unit { + ) { QueryFragmentImpl_VariablesAdapter.serializeVariables(writer, this, customScalarAdapters, withBooleanDefaultValues) } - public override fun adapter(): CompositeAdapter = - QueryFragmentImpl_ResponseAdapter.Data.obj() + override fun adapter(): CompositeAdapter = QueryFragmentImpl_ResponseAdapter.Data.obj() - public override fun rootField(): CompiledField = CompiledField.Builder( + override fun rootField(): CompiledField = CompiledField.Builder( name = "data", type = Query.type ) @@ -46,20 +45,21 @@ public data class QueryFragmentImpl( .build() public data class Data( - public override val organization: Organization?, + override val organization: Organization?, ) : QueryFragment, Fragment.Data { public data class Organization( - public override val id: String, - public override val user: List, + override val id: String, + override val user: List, ) : QueryFragment.Organization { public data class User( - public override val __typename: String, - public override val firstName: String, - public override val lastName: String, - public override val avatar: String, + override val __typename: String, + override val firstName: String, + override val lastName: String, + override val avatar: String, ) : UserFragment, QueryFragment.Organization.User { public companion object { - public fun User.userFragment() = this as? UserFragment + @Suppress("USELESS_CAST") + public fun User.userFragment(): UserFragment? = this as? UserFragment } } } diff --git a/libraries/apollo-compiler/src/test/graphql/com/example/named_fragment_with_variables/kotlin/responseBased/named_fragment_with_variables/fragment/QueryFragmentImpl_ResponseAdapter.kt.expected b/libraries/apollo-compiler/src/test/graphql/com/example/named_fragment_with_variables/kotlin/responseBased/named_fragment_with_variables/fragment/QueryFragmentImpl_ResponseAdapter.kt.expected index 5a3e4203f7e..d2e06696f1d 100644 --- a/libraries/apollo-compiler/src/test/graphql/com/example/named_fragment_with_variables/kotlin/responseBased/named_fragment_with_variables/fragment/QueryFragmentImpl_ResponseAdapter.kt.expected +++ b/libraries/apollo-compiler/src/test/graphql/com/example/named_fragment_with_variables/kotlin/responseBased/named_fragment_with_variables/fragment/QueryFragmentImpl_ResponseAdapter.kt.expected @@ -15,14 +15,13 @@ import com.apollographql.apollo3.api.list import com.apollographql.apollo3.api.nullable import com.apollographql.apollo3.api.obj import kotlin.String -import kotlin.Unit import kotlin.collections.List public object QueryFragmentImpl_ResponseAdapter { public object Data : CompositeAdapter { public val RESPONSE_NAMES: List = listOf("organization") - public override fun fromJson(reader: JsonReader, adapterContext: CompositeAdapterContext): + override fun fromJson(reader: JsonReader, adapterContext: CompositeAdapterContext): QueryFragmentImpl.Data { var _organization: QueryFragmentImpl.Data.Organization? = null @@ -38,11 +37,11 @@ public object QueryFragmentImpl_ResponseAdapter { ) } - public override fun toJson( + override fun toJson( writer: JsonWriter, `value`: QueryFragmentImpl.Data, adapterContext: CompositeAdapterContext, - ): Unit { + ) { writer.name("organization") Organization.obj().nullable().toJson(writer, value.organization, adapterContext) } @@ -50,7 +49,7 @@ public object QueryFragmentImpl_ResponseAdapter { private object Organization : CompositeAdapter { public val RESPONSE_NAMES: List = listOf("id", "user") - public override fun fromJson(reader: JsonReader, adapterContext: CompositeAdapterContext): + override fun fromJson(reader: JsonReader, adapterContext: CompositeAdapterContext): QueryFragmentImpl.Data.Organization { var _id: String? = null var _user: List? = null @@ -69,11 +68,11 @@ public object QueryFragmentImpl_ResponseAdapter { ) } - public override fun toJson( + override fun toJson( writer: JsonWriter, `value`: QueryFragmentImpl.Data.Organization, adapterContext: CompositeAdapterContext, - ): Unit { + ) { writer.name("id") StringAdapter.toJson(writer, CustomScalarAdapters.Empty, value.id) @@ -85,7 +84,7 @@ public object QueryFragmentImpl_ResponseAdapter { public val RESPONSE_NAMES: List = listOf("__typename", "firstName", "lastName", "avatar") - public override fun fromJson(reader: JsonReader, adapterContext: CompositeAdapterContext): + override fun fromJson(reader: JsonReader, adapterContext: CompositeAdapterContext): QueryFragmentImpl.Data.Organization.User { var __typename: String? = null var _firstName: String? = null @@ -110,11 +109,11 @@ public object QueryFragmentImpl_ResponseAdapter { ) } - public override fun toJson( + override fun toJson( writer: JsonWriter, `value`: QueryFragmentImpl.Data.Organization.User, adapterContext: CompositeAdapterContext, - ): Unit { + ) { writer.name("__typename") StringAdapter.toJson(writer, CustomScalarAdapters.Empty, value.__typename) diff --git a/libraries/apollo-compiler/src/test/graphql/com/example/named_fragment_with_variables/kotlin/responseBased/named_fragment_with_variables/fragment/UserFragmentImpl.kt.expected b/libraries/apollo-compiler/src/test/graphql/com/example/named_fragment_with_variables/kotlin/responseBased/named_fragment_with_variables/fragment/UserFragmentImpl.kt.expected index 78e673baf18..61d8c0f244b 100644 --- a/libraries/apollo-compiler/src/test/graphql/com/example/named_fragment_with_variables/kotlin/responseBased/named_fragment_with_variables/fragment/UserFragmentImpl.kt.expected +++ b/libraries/apollo-compiler/src/test/graphql/com/example/named_fragment_with_variables/kotlin/responseBased/named_fragment_with_variables/fragment/UserFragmentImpl.kt.expected @@ -17,24 +17,22 @@ import com.example.named_fragment_with_variables.type.User import kotlin.Boolean import kotlin.Int import kotlin.String -import kotlin.Unit public data class UserFragmentImpl( public val size: Int, ) : Fragment { - public override fun serializeVariables( + override fun serializeVariables( writer: JsonWriter, customScalarAdapters: CustomScalarAdapters, withBooleanDefaultValues: Boolean, - ): Unit { + ) { UserFragmentImpl_VariablesAdapter.serializeVariables(writer, this, customScalarAdapters, withBooleanDefaultValues) } - public override fun adapter(): CompositeAdapter = - UserFragmentImpl_ResponseAdapter.Data.obj() + override fun adapter(): CompositeAdapter = UserFragmentImpl_ResponseAdapter.Data.obj() - public override fun rootField(): CompiledField = CompiledField.Builder( + override fun rootField(): CompiledField = CompiledField.Builder( name = "data", type = User.type ) @@ -42,8 +40,8 @@ public data class UserFragmentImpl( .build() public data class Data( - public override val firstName: String, - public override val lastName: String, - public override val avatar: String, + override val firstName: String, + override val lastName: String, + override val avatar: String, ) : UserFragment, Fragment.Data } diff --git a/libraries/apollo-compiler/src/test/graphql/com/example/named_fragment_with_variables/kotlin/responseBased/named_fragment_with_variables/fragment/UserFragmentImpl_ResponseAdapter.kt.expected b/libraries/apollo-compiler/src/test/graphql/com/example/named_fragment_with_variables/kotlin/responseBased/named_fragment_with_variables/fragment/UserFragmentImpl_ResponseAdapter.kt.expected index 7fea5e105c3..7e0a49c103b 100644 --- a/libraries/apollo-compiler/src/test/graphql/com/example/named_fragment_with_variables/kotlin/responseBased/named_fragment_with_variables/fragment/UserFragmentImpl_ResponseAdapter.kt.expected +++ b/libraries/apollo-compiler/src/test/graphql/com/example/named_fragment_with_variables/kotlin/responseBased/named_fragment_with_variables/fragment/UserFragmentImpl_ResponseAdapter.kt.expected @@ -12,14 +12,13 @@ import com.apollographql.apollo3.api.StringAdapter import com.apollographql.apollo3.api.json.JsonReader import com.apollographql.apollo3.api.json.JsonWriter import kotlin.String -import kotlin.Unit import kotlin.collections.List public object UserFragmentImpl_ResponseAdapter { public object Data : CompositeAdapter { public val RESPONSE_NAMES: List = listOf("firstName", "lastName", "avatar") - public override fun fromJson(reader: JsonReader, adapterContext: CompositeAdapterContext): + override fun fromJson(reader: JsonReader, adapterContext: CompositeAdapterContext): UserFragmentImpl.Data { var _firstName: String? = null var _lastName: String? = null @@ -41,11 +40,11 @@ public object UserFragmentImpl_ResponseAdapter { ) } - public override fun toJson( + override fun toJson( writer: JsonWriter, `value`: UserFragmentImpl.Data, adapterContext: CompositeAdapterContext, - ): Unit { + ) { writer.name("firstName") StringAdapter.toJson(writer, CustomScalarAdapters.Empty, value.firstName) diff --git a/libraries/apollo-compiler/src/test/graphql/com/example/named_fragment_with_variables/kotlin/responseBased/named_fragment_with_variables/fragment/adapter/QueryFragmentImpl_VariablesAdapter.kt.expected b/libraries/apollo-compiler/src/test/graphql/com/example/named_fragment_with_variables/kotlin/responseBased/named_fragment_with_variables/fragment/adapter/QueryFragmentImpl_VariablesAdapter.kt.expected index a14739f0e53..4a542d352c2 100644 --- a/libraries/apollo-compiler/src/test/graphql/com/example/named_fragment_with_variables/kotlin/responseBased/named_fragment_with_variables/fragment/adapter/QueryFragmentImpl_VariablesAdapter.kt.expected +++ b/libraries/apollo-compiler/src/test/graphql/com/example/named_fragment_with_variables/kotlin/responseBased/named_fragment_with_variables/fragment/adapter/QueryFragmentImpl_VariablesAdapter.kt.expected @@ -15,7 +15,6 @@ import com.example.named_fragment_with_variables.fragment.QueryFragmentImpl import com.example.named_fragment_with_variables.type.adapter.UserQuery_InputAdapter import kotlin.Boolean import kotlin.Suppress -import kotlin.Unit public object QueryFragmentImpl_VariablesAdapter { @Suppress( @@ -27,7 +26,7 @@ public object QueryFragmentImpl_VariablesAdapter { `value`: QueryFragmentImpl, customScalarAdapters: CustomScalarAdapters, withBooleanDefaultValues: Boolean, - ): Unit { + ) { val adapterContext = CompositeAdapterContext.Builder().customScalarAdapters(customScalarAdapters).build() writer.name("organizationId") diff --git a/libraries/apollo-compiler/src/test/graphql/com/example/named_fragment_with_variables/kotlin/responseBased/named_fragment_with_variables/fragment/adapter/UserFragmentImpl_VariablesAdapter.kt.expected b/libraries/apollo-compiler/src/test/graphql/com/example/named_fragment_with_variables/kotlin/responseBased/named_fragment_with_variables/fragment/adapter/UserFragmentImpl_VariablesAdapter.kt.expected index 7b241525e3a..3d8396536c5 100644 --- a/libraries/apollo-compiler/src/test/graphql/com/example/named_fragment_with_variables/kotlin/responseBased/named_fragment_with_variables/fragment/adapter/UserFragmentImpl_VariablesAdapter.kt.expected +++ b/libraries/apollo-compiler/src/test/graphql/com/example/named_fragment_with_variables/kotlin/responseBased/named_fragment_with_variables/fragment/adapter/UserFragmentImpl_VariablesAdapter.kt.expected @@ -12,7 +12,6 @@ import com.apollographql.apollo3.api.json.JsonWriter import com.example.named_fragment_with_variables.fragment.UserFragmentImpl import kotlin.Boolean import kotlin.Suppress -import kotlin.Unit public object UserFragmentImpl_VariablesAdapter { @Suppress( @@ -24,7 +23,7 @@ public object UserFragmentImpl_VariablesAdapter { `value`: UserFragmentImpl, customScalarAdapters: CustomScalarAdapters, withBooleanDefaultValues: Boolean, - ): Unit { + ) { val adapterContext = CompositeAdapterContext.Builder().customScalarAdapters(customScalarAdapters).build() writer.name("size") diff --git a/libraries/apollo-compiler/src/test/graphql/com/example/named_fragment_with_variables/kotlin/responseBased/named_fragment_with_variables/type/adapter/UserQuery_InputAdapter.kt.expected b/libraries/apollo-compiler/src/test/graphql/com/example/named_fragment_with_variables/kotlin/responseBased/named_fragment_with_variables/type/adapter/UserQuery_InputAdapter.kt.expected index e6336b0c363..29a086e8fae 100644 --- a/libraries/apollo-compiler/src/test/graphql/com/example/named_fragment_with_variables/kotlin/responseBased/named_fragment_with_variables/type/adapter/UserQuery_InputAdapter.kt.expected +++ b/libraries/apollo-compiler/src/test/graphql/com/example/named_fragment_with_variables/kotlin/responseBased/named_fragment_with_variables/type/adapter/UserQuery_InputAdapter.kt.expected @@ -16,17 +16,16 @@ import com.apollographql.apollo3.api.json.JsonWriter import com.apollographql.apollo3.api.present import com.example.named_fragment_with_variables.type.UserQuery import kotlin.IllegalStateException -import kotlin.Unit public object UserQuery_InputAdapter : CompositeAdapter { - public override fun fromJson(reader: JsonReader, adapterContext: CompositeAdapterContext): - UserQuery = throw IllegalStateException("Input type used in output position") + override fun fromJson(reader: JsonReader, adapterContext: CompositeAdapterContext): UserQuery = + throw IllegalStateException("Input type used in output position") - public override fun toJson( + override fun toJson( writer: JsonWriter, `value`: UserQuery, adapterContext: CompositeAdapterContext, - ): Unit { + ) { writer.name("name") StringAdapter.toJson(writer, CustomScalarAdapters.Empty, value.name) if (value.isAdmin is Optional.Present) { diff --git a/libraries/apollo-compiler/src/test/graphql/com/example/named_fragment_without_implementation/kotlin/operationBased/named_fragment_without_implementation/TestQuery.kt.expected b/libraries/apollo-compiler/src/test/graphql/com/example/named_fragment_without_implementation/kotlin/operationBased/named_fragment_without_implementation/TestQuery.kt.expected index 72ab3829a91..cc284697168 100644 --- a/libraries/apollo-compiler/src/test/graphql/com/example/named_fragment_without_implementation/kotlin/operationBased/named_fragment_without_implementation/TestQuery.kt.expected +++ b/libraries/apollo-compiler/src/test/graphql/com/example/named_fragment_without_implementation/kotlin/operationBased/named_fragment_without_implementation/TestQuery.kt.expected @@ -20,32 +20,32 @@ import kotlin.Any import kotlin.Boolean import kotlin.Int import kotlin.String -import kotlin.Unit +import com.example.named_fragment_without_implementation.type.Query as CompiledQuery public class TestQuery() : Query { - public override fun equals(other: Any?): Boolean = other != null && other::class == this::class + override fun equals(other: Any?): Boolean = other != null && other::class == this::class - public override fun hashCode(): Int = this::class.hashCode() + override fun hashCode(): Int = this::class.hashCode() - public override fun id(): String = OPERATION_ID + override fun id(): String = OPERATION_ID - public override fun document(): String = OPERATION_DOCUMENT + override fun document(): String = OPERATION_DOCUMENT - public override fun name(): String = OPERATION_NAME + override fun name(): String = OPERATION_NAME - public override fun serializeVariables( + override fun serializeVariables( writer: JsonWriter, customScalarAdapters: CustomScalarAdapters, withBooleanDefaultValues: Boolean, - ): Unit { + ) { // This operation doesn't have any variable } - public override fun adapter(): CompositeAdapter = TestQuery_ResponseAdapter.Data.obj() + override fun adapter(): CompositeAdapter = TestQuery_ResponseAdapter.Data.obj() - public override fun rootField(): CompiledField = CompiledField.Builder( + override fun rootField(): CompiledField = CompiledField.Builder( name = "data", - type = com.example.named_fragment_without_implementation.type.Query.type + type = CompiledQuery.type ) .selections(selections = TestQuerySelections.__root) .build() diff --git a/libraries/apollo-compiler/src/test/graphql/com/example/named_fragment_without_implementation/kotlin/operationBased/named_fragment_without_implementation/adapter/TestQuery_ResponseAdapter.kt.expected b/libraries/apollo-compiler/src/test/graphql/com/example/named_fragment_without_implementation/kotlin/operationBased/named_fragment_without_implementation/adapter/TestQuery_ResponseAdapter.kt.expected index 4433ff7c33b..70baa074641 100644 --- a/libraries/apollo-compiler/src/test/graphql/com/example/named_fragment_without_implementation/kotlin/operationBased/named_fragment_without_implementation/adapter/TestQuery_ResponseAdapter.kt.expected +++ b/libraries/apollo-compiler/src/test/graphql/com/example/named_fragment_without_implementation/kotlin/operationBased/named_fragment_without_implementation/adapter/TestQuery_ResponseAdapter.kt.expected @@ -19,14 +19,13 @@ import com.example.named_fragment_without_implementation.TestQuery import com.example.named_fragment_without_implementation.fragment.DroidDetails import com.example.named_fragment_without_implementation.fragment.HumanDetails import kotlin.String -import kotlin.Unit import kotlin.collections.List public object TestQuery_ResponseAdapter { public object Data : CompositeAdapter { public val RESPONSE_NAMES: List = listOf("hero") - public override fun fromJson(reader: JsonReader, adapterContext: CompositeAdapterContext): + override fun fromJson(reader: JsonReader, adapterContext: CompositeAdapterContext): TestQuery.Data { var _hero: TestQuery.Data.Hero? = null @@ -42,11 +41,11 @@ public object TestQuery_ResponseAdapter { ) } - public override fun toJson( + override fun toJson( writer: JsonWriter, `value`: TestQuery.Data, adapterContext: CompositeAdapterContext, - ): Unit { + ) { writer.name("hero") Hero.obj(true).nullable().toJson(writer, value.hero, adapterContext) } @@ -54,7 +53,7 @@ public object TestQuery_ResponseAdapter { private object Hero : CompositeAdapter { public val RESPONSE_NAMES: List = listOf("__typename", "name") - public override fun fromJson(reader: JsonReader, adapterContext: CompositeAdapterContext): + override fun fromJson(reader: JsonReader, adapterContext: CompositeAdapterContext): TestQuery.Data.Hero { var __typename: String? = null var _name: String? = null @@ -93,11 +92,11 @@ public object TestQuery_ResponseAdapter { ) } - public override fun toJson( + override fun toJson( writer: JsonWriter, `value`: TestQuery.Data.Hero, adapterContext: CompositeAdapterContext, - ): Unit { + ) { writer.name("__typename") StringAdapter.toJson(writer, CustomScalarAdapters.Empty, value.__typename) diff --git a/libraries/apollo-compiler/src/test/graphql/com/example/named_fragment_without_implementation/kotlin/operationBased/named_fragment_without_implementation/fragment/DroidDetailsImpl_ResponseAdapter.kt.expected b/libraries/apollo-compiler/src/test/graphql/com/example/named_fragment_without_implementation/kotlin/operationBased/named_fragment_without_implementation/fragment/DroidDetailsImpl_ResponseAdapter.kt.expected index c72b77fe641..164ae15a9e3 100644 --- a/libraries/apollo-compiler/src/test/graphql/com/example/named_fragment_without_implementation/kotlin/operationBased/named_fragment_without_implementation/fragment/DroidDetailsImpl_ResponseAdapter.kt.expected +++ b/libraries/apollo-compiler/src/test/graphql/com/example/named_fragment_without_implementation/kotlin/operationBased/named_fragment_without_implementation/fragment/DroidDetailsImpl_ResponseAdapter.kt.expected @@ -12,7 +12,6 @@ import com.apollographql.apollo3.api.NullableStringAdapter import com.apollographql.apollo3.api.json.JsonReader import com.apollographql.apollo3.api.json.JsonWriter import kotlin.String -import kotlin.Unit import kotlin.collections.List public object DroidDetailsImpl_ResponseAdapter { @@ -20,7 +19,7 @@ public object DroidDetailsImpl_ResponseAdapter { CompositeAdapter { public val RESPONSE_NAMES: List = listOf("primaryFunction") - public override fun fromJson(reader: JsonReader, adapterContext: CompositeAdapterContext): + override fun fromJson(reader: JsonReader, adapterContext: CompositeAdapterContext): com.example.named_fragment_without_implementation.fragment.DroidDetails { var _primaryFunction: String? = null @@ -36,11 +35,11 @@ public object DroidDetailsImpl_ResponseAdapter { ) } - public override fun toJson( + override fun toJson( writer: JsonWriter, `value`: com.example.named_fragment_without_implementation.fragment.DroidDetails, adapterContext: CompositeAdapterContext, - ): Unit { + ) { writer.name("primaryFunction") NullableStringAdapter.toJson(writer, CustomScalarAdapters.Empty, value.primaryFunction) } diff --git a/libraries/apollo-compiler/src/test/graphql/com/example/named_fragment_without_implementation/kotlin/operationBased/named_fragment_without_implementation/fragment/HumanDetailsImpl_ResponseAdapter.kt.expected b/libraries/apollo-compiler/src/test/graphql/com/example/named_fragment_without_implementation/kotlin/operationBased/named_fragment_without_implementation/fragment/HumanDetailsImpl_ResponseAdapter.kt.expected index 1ef716c91aa..277e006f167 100644 --- a/libraries/apollo-compiler/src/test/graphql/com/example/named_fragment_without_implementation/kotlin/operationBased/named_fragment_without_implementation/fragment/HumanDetailsImpl_ResponseAdapter.kt.expected +++ b/libraries/apollo-compiler/src/test/graphql/com/example/named_fragment_without_implementation/kotlin/operationBased/named_fragment_without_implementation/fragment/HumanDetailsImpl_ResponseAdapter.kt.expected @@ -13,7 +13,6 @@ import com.apollographql.apollo3.api.json.JsonReader import com.apollographql.apollo3.api.json.JsonWriter import kotlin.Double import kotlin.String -import kotlin.Unit import kotlin.collections.List public object HumanDetailsImpl_ResponseAdapter { @@ -21,7 +20,7 @@ public object HumanDetailsImpl_ResponseAdapter { CompositeAdapter { public val RESPONSE_NAMES: List = listOf("height") - public override fun fromJson(reader: JsonReader, adapterContext: CompositeAdapterContext): + override fun fromJson(reader: JsonReader, adapterContext: CompositeAdapterContext): com.example.named_fragment_without_implementation.fragment.HumanDetails { var _height: Double? = null @@ -37,11 +36,11 @@ public object HumanDetailsImpl_ResponseAdapter { ) } - public override fun toJson( + override fun toJson( writer: JsonWriter, `value`: com.example.named_fragment_without_implementation.fragment.HumanDetails, adapterContext: CompositeAdapterContext, - ): Unit { + ) { writer.name("height") NullableDoubleAdapter.toJson(writer, CustomScalarAdapters.Empty, value.height) } diff --git a/libraries/apollo-compiler/src/test/graphql/com/example/named_fragment_without_implementation/kotlin/responseBased/named_fragment_without_implementation/TestQuery.kt.expected b/libraries/apollo-compiler/src/test/graphql/com/example/named_fragment_without_implementation/kotlin/responseBased/named_fragment_without_implementation/TestQuery.kt.expected index d8ca98b4702..aa20ffdc647 100644 --- a/libraries/apollo-compiler/src/test/graphql/com/example/named_fragment_without_implementation/kotlin/responseBased/named_fragment_without_implementation/TestQuery.kt.expected +++ b/libraries/apollo-compiler/src/test/graphql/com/example/named_fragment_without_implementation/kotlin/responseBased/named_fragment_without_implementation/TestQuery.kt.expected @@ -21,32 +21,33 @@ import kotlin.Boolean import kotlin.Double import kotlin.Int import kotlin.String -import kotlin.Unit +import kotlin.Suppress +import com.example.named_fragment_without_implementation.type.Query as CompiledQuery public class TestQuery() : Query { - public override fun equals(other: Any?): Boolean = other != null && other::class == this::class + override fun equals(other: Any?): Boolean = other != null && other::class == this::class - public override fun hashCode(): Int = this::class.hashCode() + override fun hashCode(): Int = this::class.hashCode() - public override fun id(): String = OPERATION_ID + override fun id(): String = OPERATION_ID - public override fun document(): String = OPERATION_DOCUMENT + override fun document(): String = OPERATION_DOCUMENT - public override fun name(): String = OPERATION_NAME + override fun name(): String = OPERATION_NAME - public override fun serializeVariables( + override fun serializeVariables( writer: JsonWriter, customScalarAdapters: CustomScalarAdapters, withBooleanDefaultValues: Boolean, - ): Unit { + ) { // This operation doesn't have any variable } - public override fun adapter(): CompositeAdapter = TestQuery_ResponseAdapter.Data.obj() + override fun adapter(): CompositeAdapter = TestQuery_ResponseAdapter.Data.obj() - public override fun rootField(): CompiledField = CompiledField.Builder( + override fun rootField(): CompiledField = CompiledField.Builder( name = "data", - type = com.example.named_fragment_without_implementation.type.Query.type + type = CompiledQuery.type ) .selections(selections = TestQuerySelections.__root) .build() @@ -64,46 +65,50 @@ public class TestQuery() : Query { public val name: String public companion object { - public fun Hero.humanDetails() = this as? HumanDetails + @Suppress("USELESS_CAST") + public fun Hero.humanDetails(): HumanDetails? = this as? HumanDetails - public fun Hero.droidDetails() = this as? DroidDetails + @Suppress("USELESS_CAST") + public fun Hero.droidDetails(): DroidDetails? = this as? DroidDetails - public fun Hero.asHuman() = this as? HumanHero + @Suppress("USELESS_CAST") + public fun Hero.asHuman(): HumanHero? = this as? HumanHero - public fun Hero.asDroid() = this as? DroidHero + @Suppress("USELESS_CAST") + public fun Hero.asDroid(): DroidHero? = this as? DroidHero } } public data class HumanHero( - public override val __typename: String, + override val __typename: String, /** * The name of the character */ - public override val name: String, + override val name: String, /** * Height in the preferred unit, default is meters */ - public override val height: Double?, + override val height: Double?, ) : Hero, HumanDetails public data class DroidHero( - public override val __typename: String, + override val __typename: String, /** * The name of the character */ - public override val name: String, + override val name: String, /** * This droid's primary function */ - public override val primaryFunction: String?, + override val primaryFunction: String?, ) : Hero, DroidDetails public data class OtherHero( - public override val __typename: String, + override val __typename: String, /** * The name of the character */ - public override val name: String, + override val name: String, ) : Hero } diff --git a/libraries/apollo-compiler/src/test/graphql/com/example/named_fragment_without_implementation/kotlin/responseBased/named_fragment_without_implementation/adapter/TestQuery_ResponseAdapter.kt.expected b/libraries/apollo-compiler/src/test/graphql/com/example/named_fragment_without_implementation/kotlin/responseBased/named_fragment_without_implementation/adapter/TestQuery_ResponseAdapter.kt.expected index 87f80a7c590..1427d3d3eca 100644 --- a/libraries/apollo-compiler/src/test/graphql/com/example/named_fragment_without_implementation/kotlin/responseBased/named_fragment_without_implementation/adapter/TestQuery_ResponseAdapter.kt.expected +++ b/libraries/apollo-compiler/src/test/graphql/com/example/named_fragment_without_implementation/kotlin/responseBased/named_fragment_without_implementation/adapter/TestQuery_ResponseAdapter.kt.expected @@ -20,14 +20,13 @@ import com.example.named_fragment_without_implementation.TestQuery import kotlin.Double import kotlin.String import kotlin.Suppress -import kotlin.Unit import kotlin.collections.List public object TestQuery_ResponseAdapter { public object Data : CompositeAdapter { public val RESPONSE_NAMES: List = listOf("hero") - public override fun fromJson(reader: JsonReader, adapterContext: CompositeAdapterContext): + override fun fromJson(reader: JsonReader, adapterContext: CompositeAdapterContext): TestQuery.Data { var _hero: TestQuery.Data.Hero? = null @@ -43,17 +42,17 @@ public object TestQuery_ResponseAdapter { ) } - public override fun toJson( + override fun toJson( writer: JsonWriter, `value`: TestQuery.Data, adapterContext: CompositeAdapterContext, - ): Unit { + ) { writer.name("hero") Hero.obj().nullable().toJson(writer, value.hero, adapterContext) } private object Hero : CompositeAdapter { - public override fun fromJson(reader: JsonReader, adapterContext: CompositeAdapterContext): + override fun fromJson(reader: JsonReader, adapterContext: CompositeAdapterContext): TestQuery.Data.Hero { val __typename = reader.readTypename() return when(__typename) { @@ -66,11 +65,11 @@ public object TestQuery_ResponseAdapter { } } - public override fun toJson( + override fun toJson( writer: JsonWriter, `value`: TestQuery.Data.Hero, adapterContext: CompositeAdapterContext, - ): Unit { + ) { when(value) { is TestQuery.Data.HumanHero -> HumanHero.toJson(writer, value, adapterContext) is TestQuery.Data.DroidHero -> DroidHero.toJson(writer, value, adapterContext) @@ -111,7 +110,7 @@ public object TestQuery_ResponseAdapter { writer: JsonWriter, `value`: TestQuery.Data.HumanHero, @Suppress("UNUSED_PARAMETER") adapterContext: CompositeAdapterContext, - ): Unit { + ) { writer.name("__typename") StringAdapter.toJson(writer, CustomScalarAdapters.Empty, value.__typename) @@ -155,7 +154,7 @@ public object TestQuery_ResponseAdapter { writer: JsonWriter, `value`: TestQuery.Data.DroidHero, @Suppress("UNUSED_PARAMETER") adapterContext: CompositeAdapterContext, - ): Unit { + ) { writer.name("__typename") StringAdapter.toJson(writer, CustomScalarAdapters.Empty, value.__typename) @@ -196,7 +195,7 @@ public object TestQuery_ResponseAdapter { writer: JsonWriter, `value`: TestQuery.Data.OtherHero, @Suppress("UNUSED_PARAMETER") adapterContext: CompositeAdapterContext, - ): Unit { + ) { writer.name("__typename") StringAdapter.toJson(writer, CustomScalarAdapters.Empty, value.__typename) diff --git a/libraries/apollo-compiler/src/test/graphql/com/example/nested_conditional_inline/kotlin/operationBased/nested_conditional_inline/TestQuery.kt.expected b/libraries/apollo-compiler/src/test/graphql/com/example/nested_conditional_inline/kotlin/operationBased/nested_conditional_inline/TestQuery.kt.expected index 72fd70014c2..fa05aaa5953 100644 --- a/libraries/apollo-compiler/src/test/graphql/com/example/nested_conditional_inline/kotlin/operationBased/nested_conditional_inline/TestQuery.kt.expected +++ b/libraries/apollo-compiler/src/test/graphql/com/example/nested_conditional_inline/kotlin/operationBased/nested_conditional_inline/TestQuery.kt.expected @@ -20,32 +20,32 @@ import com.example.nested_conditional_inline.type.Episode import kotlin.Boolean import kotlin.Double import kotlin.String -import kotlin.Unit import kotlin.collections.List +import com.example.nested_conditional_inline.type.Query as CompiledQuery public data class TestQuery( public val episode: Optional = Optional.Absent, ) : Query { - public override fun id(): String = OPERATION_ID + override fun id(): String = OPERATION_ID - public override fun document(): String = OPERATION_DOCUMENT + override fun document(): String = OPERATION_DOCUMENT - public override fun name(): String = OPERATION_NAME + override fun name(): String = OPERATION_NAME - public override fun serializeVariables( + override fun serializeVariables( writer: JsonWriter, customScalarAdapters: CustomScalarAdapters, withBooleanDefaultValues: Boolean, - ): Unit { + ) { TestQuery_VariablesAdapter.serializeVariables(writer, this, customScalarAdapters, withBooleanDefaultValues) } - public override fun adapter(): CompositeAdapter = TestQuery_ResponseAdapter.Data.obj() + override fun adapter(): CompositeAdapter = TestQuery_ResponseAdapter.Data.obj() - public override fun rootField(): CompiledField = CompiledField.Builder( + override fun rootField(): CompiledField = CompiledField.Builder( name = "data", - type = com.example.nested_conditional_inline.type.Query.type + type = CompiledQuery.type ) .selections(selections = TestQuerySelections.__root) .build() diff --git a/libraries/apollo-compiler/src/test/graphql/com/example/nested_conditional_inline/kotlin/operationBased/nested_conditional_inline/adapter/TestQuery_ResponseAdapter.kt.expected b/libraries/apollo-compiler/src/test/graphql/com/example/nested_conditional_inline/kotlin/operationBased/nested_conditional_inline/adapter/TestQuery_ResponseAdapter.kt.expected index 051d4b71a27..7be95aa54ac 100644 --- a/libraries/apollo-compiler/src/test/graphql/com/example/nested_conditional_inline/kotlin/operationBased/nested_conditional_inline/adapter/TestQuery_ResponseAdapter.kt.expected +++ b/libraries/apollo-compiler/src/test/graphql/com/example/nested_conditional_inline/kotlin/operationBased/nested_conditional_inline/adapter/TestQuery_ResponseAdapter.kt.expected @@ -20,14 +20,13 @@ import com.apollographql.apollo3.api.possibleTypes import com.example.nested_conditional_inline.TestQuery import kotlin.Double import kotlin.String -import kotlin.Unit import kotlin.collections.List public object TestQuery_ResponseAdapter { public object Data : CompositeAdapter { public val RESPONSE_NAMES: List = listOf("hero") - public override fun fromJson(reader: JsonReader, adapterContext: CompositeAdapterContext): + override fun fromJson(reader: JsonReader, adapterContext: CompositeAdapterContext): TestQuery.Data { var _hero: TestQuery.Data.Hero? = null @@ -43,11 +42,11 @@ public object TestQuery_ResponseAdapter { ) } - public override fun toJson( + override fun toJson( writer: JsonWriter, `value`: TestQuery.Data, adapterContext: CompositeAdapterContext, - ): Unit { + ) { writer.name("hero") Hero.obj(true).nullable().toJson(writer, value.hero, adapterContext) } @@ -55,7 +54,7 @@ public object TestQuery_ResponseAdapter { private object Hero : CompositeAdapter { public val RESPONSE_NAMES: List = listOf("__typename", "name") - public override fun fromJson(reader: JsonReader, adapterContext: CompositeAdapterContext): + override fun fromJson(reader: JsonReader, adapterContext: CompositeAdapterContext): TestQuery.Data.Hero { var __typename: String? = null var _name: String? = null @@ -94,11 +93,11 @@ public object TestQuery_ResponseAdapter { ) } - public override fun toJson( + override fun toJson( writer: JsonWriter, `value`: TestQuery.Data.Hero, adapterContext: CompositeAdapterContext, - ): Unit { + ) { writer.name("__typename") StringAdapter.toJson(writer, CustomScalarAdapters.Empty, value.__typename) @@ -119,7 +118,7 @@ public object TestQuery_ResponseAdapter { private object OnHuman : CompositeAdapter { public val RESPONSE_NAMES: List = listOf("friends") - public override fun fromJson(reader: JsonReader, adapterContext: CompositeAdapterContext): + override fun fromJson(reader: JsonReader, adapterContext: CompositeAdapterContext): TestQuery.Data.Hero.OnHuman { var _friends: List? = null @@ -135,11 +134,11 @@ public object TestQuery_ResponseAdapter { ) } - public override fun toJson( + override fun toJson( writer: JsonWriter, `value`: TestQuery.Data.Hero.OnHuman, adapterContext: CompositeAdapterContext, - ): Unit { + ) { writer.name("friends") Friend.obj(true).nullable().list().nullable().toJson(writer, value.friends, adapterContext) @@ -148,7 +147,7 @@ public object TestQuery_ResponseAdapter { private object Friend : CompositeAdapter { public val RESPONSE_NAMES: List = listOf("__typename", "name") - public override fun fromJson(reader: JsonReader, adapterContext: CompositeAdapterContext): + override fun fromJson(reader: JsonReader, adapterContext: CompositeAdapterContext): TestQuery.Data.Hero.OnHuman.Friend { var __typename: String? = null var _name: String? = null @@ -179,11 +178,11 @@ public object TestQuery_ResponseAdapter { ) } - public override fun toJson( + override fun toJson( writer: JsonWriter, `value`: TestQuery.Data.Hero.OnHuman.Friend, adapterContext: CompositeAdapterContext, - ): Unit { + ) { writer.name("__typename") StringAdapter.toJson(writer, CustomScalarAdapters.Empty, value.__typename) @@ -199,8 +198,7 @@ public object TestQuery_ResponseAdapter { private object OnHuman : CompositeAdapter { public val RESPONSE_NAMES: List = listOf("height") - public override fun fromJson(reader: JsonReader, - adapterContext: CompositeAdapterContext): + override fun fromJson(reader: JsonReader, adapterContext: CompositeAdapterContext): TestQuery.Data.Hero.OnHuman.Friend.OnHuman { var _height: Double? = null @@ -216,11 +214,11 @@ public object TestQuery_ResponseAdapter { ) } - public override fun toJson( + override fun toJson( writer: JsonWriter, `value`: TestQuery.Data.Hero.OnHuman.Friend.OnHuman, adapterContext: CompositeAdapterContext, - ): Unit { + ) { writer.name("height") NullableDoubleAdapter.toJson(writer, CustomScalarAdapters.Empty, value.height) } @@ -231,7 +229,7 @@ public object TestQuery_ResponseAdapter { private object OnDroid : CompositeAdapter { public val RESPONSE_NAMES: List = listOf("friends") - public override fun fromJson(reader: JsonReader, adapterContext: CompositeAdapterContext): + override fun fromJson(reader: JsonReader, adapterContext: CompositeAdapterContext): TestQuery.Data.Hero.OnDroid { var _friends: List? = null @@ -247,11 +245,11 @@ public object TestQuery_ResponseAdapter { ) } - public override fun toJson( + override fun toJson( writer: JsonWriter, `value`: TestQuery.Data.Hero.OnDroid, adapterContext: CompositeAdapterContext, - ): Unit { + ) { writer.name("friends") Friend.obj(true).nullable().list().nullable().toJson(writer, value.friends, adapterContext) @@ -260,7 +258,7 @@ public object TestQuery_ResponseAdapter { private object Friend : CompositeAdapter { public val RESPONSE_NAMES: List = listOf("__typename", "name") - public override fun fromJson(reader: JsonReader, adapterContext: CompositeAdapterContext): + override fun fromJson(reader: JsonReader, adapterContext: CompositeAdapterContext): TestQuery.Data.Hero.OnDroid.Friend { var __typename: String? = null var _name: String? = null @@ -291,11 +289,11 @@ public object TestQuery_ResponseAdapter { ) } - public override fun toJson( + override fun toJson( writer: JsonWriter, `value`: TestQuery.Data.Hero.OnDroid.Friend, adapterContext: CompositeAdapterContext, - ): Unit { + ) { writer.name("__typename") StringAdapter.toJson(writer, CustomScalarAdapters.Empty, value.__typename) @@ -311,8 +309,7 @@ public object TestQuery_ResponseAdapter { private object OnHuman : CompositeAdapter { public val RESPONSE_NAMES: List = listOf("height") - public override fun fromJson(reader: JsonReader, - adapterContext: CompositeAdapterContext): + override fun fromJson(reader: JsonReader, adapterContext: CompositeAdapterContext): TestQuery.Data.Hero.OnDroid.Friend.OnHuman { var _height: Double? = null @@ -328,11 +325,11 @@ public object TestQuery_ResponseAdapter { ) } - public override fun toJson( + override fun toJson( writer: JsonWriter, `value`: TestQuery.Data.Hero.OnDroid.Friend.OnHuman, adapterContext: CompositeAdapterContext, - ): Unit { + ) { writer.name("height") NullableDoubleAdapter.toJson(writer, CustomScalarAdapters.Empty, value.height) } diff --git a/libraries/apollo-compiler/src/test/graphql/com/example/nested_conditional_inline/kotlin/operationBased/nested_conditional_inline/adapter/TestQuery_VariablesAdapter.kt.expected b/libraries/apollo-compiler/src/test/graphql/com/example/nested_conditional_inline/kotlin/operationBased/nested_conditional_inline/adapter/TestQuery_VariablesAdapter.kt.expected index 7f2da68fea6..742854b3558 100644 --- a/libraries/apollo-compiler/src/test/graphql/com/example/nested_conditional_inline/kotlin/operationBased/nested_conditional_inline/adapter/TestQuery_VariablesAdapter.kt.expected +++ b/libraries/apollo-compiler/src/test/graphql/com/example/nested_conditional_inline/kotlin/operationBased/nested_conditional_inline/adapter/TestQuery_VariablesAdapter.kt.expected @@ -15,7 +15,6 @@ import com.example.nested_conditional_inline.TestQuery import com.example.nested_conditional_inline.type.adapter.Episode_ResponseAdapter import kotlin.Boolean import kotlin.Suppress -import kotlin.Unit public object TestQuery_VariablesAdapter { @Suppress( @@ -27,7 +26,7 @@ public object TestQuery_VariablesAdapter { `value`: TestQuery, customScalarAdapters: CustomScalarAdapters, withBooleanDefaultValues: Boolean, - ): Unit { + ) { val adapterContext = CompositeAdapterContext.Builder().customScalarAdapters(customScalarAdapters).build() if (value.episode is Optional.Present) { diff --git a/libraries/apollo-compiler/src/test/graphql/com/example/nested_conditional_inline/kotlin/operationBased/nested_conditional_inline/type/adapter/Episode_ResponseAdapter.kt.expected b/libraries/apollo-compiler/src/test/graphql/com/example/nested_conditional_inline/kotlin/operationBased/nested_conditional_inline/type/adapter/Episode_ResponseAdapter.kt.expected index 58a12c1a15c..1d45b28137a 100644 --- a/libraries/apollo-compiler/src/test/graphql/com/example/nested_conditional_inline/kotlin/operationBased/nested_conditional_inline/type/adapter/Episode_ResponseAdapter.kt.expected +++ b/libraries/apollo-compiler/src/test/graphql/com/example/nested_conditional_inline/kotlin/operationBased/nested_conditional_inline/type/adapter/Episode_ResponseAdapter.kt.expected @@ -10,20 +10,18 @@ import com.apollographql.apollo3.api.CustomScalarAdapters import com.apollographql.apollo3.api.json.JsonReader import com.apollographql.apollo3.api.json.JsonWriter import com.example.nested_conditional_inline.type.Episode -import kotlin.Unit public object Episode_ResponseAdapter : Adapter { - public override fun fromJson(reader: JsonReader, customScalarAdapters: CustomScalarAdapters): - Episode { + override fun fromJson(reader: JsonReader, customScalarAdapters: CustomScalarAdapters): Episode { val rawValue = reader.nextString()!! return Episode.safeValueOf(rawValue) } - public override fun toJson( + override fun toJson( writer: JsonWriter, customScalarAdapters: CustomScalarAdapters, `value`: Episode, - ): Unit { + ) { writer.value(value.rawValue) } } diff --git a/libraries/apollo-compiler/src/test/graphql/com/example/nested_conditional_inline/kotlin/responseBased/nested_conditional_inline/TestQuery.kt.expected b/libraries/apollo-compiler/src/test/graphql/com/example/nested_conditional_inline/kotlin/responseBased/nested_conditional_inline/TestQuery.kt.expected index 95a02f18b1d..42b6a8b4589 100644 --- a/libraries/apollo-compiler/src/test/graphql/com/example/nested_conditional_inline/kotlin/responseBased/nested_conditional_inline/TestQuery.kt.expected +++ b/libraries/apollo-compiler/src/test/graphql/com/example/nested_conditional_inline/kotlin/responseBased/nested_conditional_inline/TestQuery.kt.expected @@ -20,32 +20,33 @@ import com.example.nested_conditional_inline.type.Episode import kotlin.Boolean import kotlin.Double import kotlin.String -import kotlin.Unit +import kotlin.Suppress import kotlin.collections.List +import com.example.nested_conditional_inline.type.Query as CompiledQuery public data class TestQuery( public val episode: Optional = Optional.Absent, ) : Query { - public override fun id(): String = OPERATION_ID + override fun id(): String = OPERATION_ID - public override fun document(): String = OPERATION_DOCUMENT + override fun document(): String = OPERATION_DOCUMENT - public override fun name(): String = OPERATION_NAME + override fun name(): String = OPERATION_NAME - public override fun serializeVariables( + override fun serializeVariables( writer: JsonWriter, customScalarAdapters: CustomScalarAdapters, withBooleanDefaultValues: Boolean, - ): Unit { + ) { TestQuery_VariablesAdapter.serializeVariables(writer, this, customScalarAdapters, withBooleanDefaultValues) } - public override fun adapter(): CompositeAdapter = TestQuery_ResponseAdapter.Data.obj() + override fun adapter(): CompositeAdapter = TestQuery_ResponseAdapter.Data.obj() - public override fun rootField(): CompiledField = CompiledField.Builder( + override fun rootField(): CompiledField = CompiledField.Builder( name = "data", - type = com.example.nested_conditional_inline.type.Query.type + type = CompiledQuery.type ) .selections(selections = TestQuerySelections.__root) .build() @@ -63,18 +64,20 @@ public data class TestQuery( public val name: String public companion object { - public fun Hero.asHuman() = this as? HumanHero + @Suppress("USELESS_CAST") + public fun Hero.asHuman(): HumanHero? = this as? HumanHero - public fun Hero.asDroid() = this as? DroidHero + @Suppress("USELESS_CAST") + public fun Hero.asDroid(): DroidHero? = this as? DroidHero } } public data class HumanHero( - public override val __typename: String, + override val __typename: String, /** * The name of the character */ - public override val name: String, + override val name: String, /** * This human's friends, or an empty list if they have none */ @@ -91,16 +94,17 @@ public data class TestQuery( public val name: String public companion object { - public fun Friend.asHuman() = this as? HumanFriend + @Suppress("USELESS_CAST") + public fun Friend.asHuman(): HumanFriend? = this as? HumanFriend } } public data class HumanFriend( - public override val __typename: String, + override val __typename: String, /** * The name of the character */ - public override val name: String, + override val name: String, /** * Height in the preferred unit, default is meters */ @@ -108,20 +112,20 @@ public data class TestQuery( ) : Friend public data class OtherFriend( - public override val __typename: String, + override val __typename: String, /** * The name of the character */ - public override val name: String, + override val name: String, ) : Friend } public data class DroidHero( - public override val __typename: String, + override val __typename: String, /** * The name of the character */ - public override val name: String, + override val name: String, /** * This droid's friends, or an empty list if they have none */ @@ -138,16 +142,17 @@ public data class TestQuery( public val name: String public companion object { - public fun Friend.asHuman() = this as? HumanFriend + @Suppress("USELESS_CAST") + public fun Friend.asHuman(): HumanFriend? = this as? HumanFriend } } public data class HumanFriend( - public override val __typename: String, + override val __typename: String, /** * The name of the character */ - public override val name: String, + override val name: String, /** * Height in the preferred unit, default is meters */ @@ -155,20 +160,20 @@ public data class TestQuery( ) : Friend public data class OtherFriend( - public override val __typename: String, + override val __typename: String, /** * The name of the character */ - public override val name: String, + override val name: String, ) : Friend } public data class OtherHero( - public override val __typename: String, + override val __typename: String, /** * The name of the character */ - public override val name: String, + override val name: String, ) : Hero } diff --git a/libraries/apollo-compiler/src/test/graphql/com/example/nested_conditional_inline/kotlin/responseBased/nested_conditional_inline/adapter/TestQuery_ResponseAdapter.kt.expected b/libraries/apollo-compiler/src/test/graphql/com/example/nested_conditional_inline/kotlin/responseBased/nested_conditional_inline/adapter/TestQuery_ResponseAdapter.kt.expected index 170f20987de..e734b68e4b8 100644 --- a/libraries/apollo-compiler/src/test/graphql/com/example/nested_conditional_inline/kotlin/responseBased/nested_conditional_inline/adapter/TestQuery_ResponseAdapter.kt.expected +++ b/libraries/apollo-compiler/src/test/graphql/com/example/nested_conditional_inline/kotlin/responseBased/nested_conditional_inline/adapter/TestQuery_ResponseAdapter.kt.expected @@ -20,14 +20,13 @@ import com.example.nested_conditional_inline.TestQuery import kotlin.Double import kotlin.String import kotlin.Suppress -import kotlin.Unit import kotlin.collections.List public object TestQuery_ResponseAdapter { public object Data : CompositeAdapter { public val RESPONSE_NAMES: List = listOf("hero") - public override fun fromJson(reader: JsonReader, adapterContext: CompositeAdapterContext): + override fun fromJson(reader: JsonReader, adapterContext: CompositeAdapterContext): TestQuery.Data { var _hero: TestQuery.Data.Hero? = null @@ -43,17 +42,17 @@ public object TestQuery_ResponseAdapter { ) } - public override fun toJson( + override fun toJson( writer: JsonWriter, `value`: TestQuery.Data, adapterContext: CompositeAdapterContext, - ): Unit { + ) { writer.name("hero") Hero.obj().nullable().toJson(writer, value.hero, adapterContext) } private object Hero : CompositeAdapter { - public override fun fromJson(reader: JsonReader, adapterContext: CompositeAdapterContext): + override fun fromJson(reader: JsonReader, adapterContext: CompositeAdapterContext): TestQuery.Data.Hero { val __typename = reader.readTypename() return when(__typename) { @@ -66,11 +65,11 @@ public object TestQuery_ResponseAdapter { } } - public override fun toJson( + override fun toJson( writer: JsonWriter, `value`: TestQuery.Data.Hero, adapterContext: CompositeAdapterContext, - ): Unit { + ) { when(value) { is TestQuery.Data.HumanHero -> HumanHero.toJson(writer, value, adapterContext) is TestQuery.Data.DroidHero -> DroidHero.toJson(writer, value, adapterContext) @@ -111,7 +110,7 @@ public object TestQuery_ResponseAdapter { writer: JsonWriter, `value`: TestQuery.Data.HumanHero, @Suppress("UNUSED_PARAMETER") adapterContext: CompositeAdapterContext, - ): Unit { + ) { writer.name("__typename") StringAdapter.toJson(writer, CustomScalarAdapters.Empty, value.__typename) @@ -123,7 +122,7 @@ public object TestQuery_ResponseAdapter { } private object Friend : CompositeAdapter { - public override fun fromJson(reader: JsonReader, adapterContext: CompositeAdapterContext): + override fun fromJson(reader: JsonReader, adapterContext: CompositeAdapterContext): TestQuery.Data.HumanHero.Friend { val __typename = reader.readTypename() return when(__typename) { @@ -134,11 +133,11 @@ public object TestQuery_ResponseAdapter { } } - public override fun toJson( + override fun toJson( writer: JsonWriter, `value`: TestQuery.Data.HumanHero.Friend, adapterContext: CompositeAdapterContext, - ): Unit { + ) { when(value) { is TestQuery.Data.HumanHero.HumanFriend -> HumanFriend.toJson(writer, value, adapterContext) @@ -180,7 +179,7 @@ public object TestQuery_ResponseAdapter { writer: JsonWriter, `value`: TestQuery.Data.HumanHero.HumanFriend, @Suppress("UNUSED_PARAMETER") adapterContext: CompositeAdapterContext, - ): Unit { + ) { writer.name("__typename") StringAdapter.toJson(writer, CustomScalarAdapters.Empty, value.__typename) @@ -221,7 +220,7 @@ public object TestQuery_ResponseAdapter { writer: JsonWriter, `value`: TestQuery.Data.HumanHero.OtherFriend, @Suppress("UNUSED_PARAMETER") adapterContext: CompositeAdapterContext, - ): Unit { + ) { writer.name("__typename") StringAdapter.toJson(writer, CustomScalarAdapters.Empty, value.__typename) @@ -263,7 +262,7 @@ public object TestQuery_ResponseAdapter { writer: JsonWriter, `value`: TestQuery.Data.DroidHero, @Suppress("UNUSED_PARAMETER") adapterContext: CompositeAdapterContext, - ): Unit { + ) { writer.name("__typename") StringAdapter.toJson(writer, CustomScalarAdapters.Empty, value.__typename) @@ -275,7 +274,7 @@ public object TestQuery_ResponseAdapter { } private object Friend : CompositeAdapter { - public override fun fromJson(reader: JsonReader, adapterContext: CompositeAdapterContext): + override fun fromJson(reader: JsonReader, adapterContext: CompositeAdapterContext): TestQuery.Data.DroidHero.Friend { val __typename = reader.readTypename() return when(__typename) { @@ -286,11 +285,11 @@ public object TestQuery_ResponseAdapter { } } - public override fun toJson( + override fun toJson( writer: JsonWriter, `value`: TestQuery.Data.DroidHero.Friend, adapterContext: CompositeAdapterContext, - ): Unit { + ) { when(value) { is TestQuery.Data.DroidHero.HumanFriend -> HumanFriend.toJson(writer, value, adapterContext) @@ -332,7 +331,7 @@ public object TestQuery_ResponseAdapter { writer: JsonWriter, `value`: TestQuery.Data.DroidHero.HumanFriend, @Suppress("UNUSED_PARAMETER") adapterContext: CompositeAdapterContext, - ): Unit { + ) { writer.name("__typename") StringAdapter.toJson(writer, CustomScalarAdapters.Empty, value.__typename) @@ -373,7 +372,7 @@ public object TestQuery_ResponseAdapter { writer: JsonWriter, `value`: TestQuery.Data.DroidHero.OtherFriend, @Suppress("UNUSED_PARAMETER") adapterContext: CompositeAdapterContext, - ): Unit { + ) { writer.name("__typename") StringAdapter.toJson(writer, CustomScalarAdapters.Empty, value.__typename) @@ -412,7 +411,7 @@ public object TestQuery_ResponseAdapter { writer: JsonWriter, `value`: TestQuery.Data.OtherHero, @Suppress("UNUSED_PARAMETER") adapterContext: CompositeAdapterContext, - ): Unit { + ) { writer.name("__typename") StringAdapter.toJson(writer, CustomScalarAdapters.Empty, value.__typename) diff --git a/libraries/apollo-compiler/src/test/graphql/com/example/nested_conditional_inline/kotlin/responseBased/nested_conditional_inline/adapter/TestQuery_VariablesAdapter.kt.expected b/libraries/apollo-compiler/src/test/graphql/com/example/nested_conditional_inline/kotlin/responseBased/nested_conditional_inline/adapter/TestQuery_VariablesAdapter.kt.expected index 7f2da68fea6..742854b3558 100644 --- a/libraries/apollo-compiler/src/test/graphql/com/example/nested_conditional_inline/kotlin/responseBased/nested_conditional_inline/adapter/TestQuery_VariablesAdapter.kt.expected +++ b/libraries/apollo-compiler/src/test/graphql/com/example/nested_conditional_inline/kotlin/responseBased/nested_conditional_inline/adapter/TestQuery_VariablesAdapter.kt.expected @@ -15,7 +15,6 @@ import com.example.nested_conditional_inline.TestQuery import com.example.nested_conditional_inline.type.adapter.Episode_ResponseAdapter import kotlin.Boolean import kotlin.Suppress -import kotlin.Unit public object TestQuery_VariablesAdapter { @Suppress( @@ -27,7 +26,7 @@ public object TestQuery_VariablesAdapter { `value`: TestQuery, customScalarAdapters: CustomScalarAdapters, withBooleanDefaultValues: Boolean, - ): Unit { + ) { val adapterContext = CompositeAdapterContext.Builder().customScalarAdapters(customScalarAdapters).build() if (value.episode is Optional.Present) { diff --git a/libraries/apollo-compiler/src/test/graphql/com/example/nested_conditional_inline/kotlin/responseBased/nested_conditional_inline/type/adapter/Episode_ResponseAdapter.kt.expected b/libraries/apollo-compiler/src/test/graphql/com/example/nested_conditional_inline/kotlin/responseBased/nested_conditional_inline/type/adapter/Episode_ResponseAdapter.kt.expected index 58a12c1a15c..1d45b28137a 100644 --- a/libraries/apollo-compiler/src/test/graphql/com/example/nested_conditional_inline/kotlin/responseBased/nested_conditional_inline/type/adapter/Episode_ResponseAdapter.kt.expected +++ b/libraries/apollo-compiler/src/test/graphql/com/example/nested_conditional_inline/kotlin/responseBased/nested_conditional_inline/type/adapter/Episode_ResponseAdapter.kt.expected @@ -10,20 +10,18 @@ import com.apollographql.apollo3.api.CustomScalarAdapters import com.apollographql.apollo3.api.json.JsonReader import com.apollographql.apollo3.api.json.JsonWriter import com.example.nested_conditional_inline.type.Episode -import kotlin.Unit public object Episode_ResponseAdapter : Adapter { - public override fun fromJson(reader: JsonReader, customScalarAdapters: CustomScalarAdapters): - Episode { + override fun fromJson(reader: JsonReader, customScalarAdapters: CustomScalarAdapters): Episode { val rawValue = reader.nextString()!! return Episode.safeValueOf(rawValue) } - public override fun toJson( + override fun toJson( writer: JsonWriter, customScalarAdapters: CustomScalarAdapters, `value`: Episode, - ): Unit { + ) { writer.value(value.rawValue) } } diff --git a/libraries/apollo-compiler/src/test/graphql/com/example/nested_field_with_multiple_fieldsets/kotlin/operationBased/nested_field_with_multiple_fieldsets/TestQuery.kt.expected b/libraries/apollo-compiler/src/test/graphql/com/example/nested_field_with_multiple_fieldsets/kotlin/operationBased/nested_field_with_multiple_fieldsets/TestQuery.kt.expected index d21088bc1c0..8aa4a2f6d40 100644 --- a/libraries/apollo-compiler/src/test/graphql/com/example/nested_field_with_multiple_fieldsets/kotlin/operationBased/nested_field_with_multiple_fieldsets/TestQuery.kt.expected +++ b/libraries/apollo-compiler/src/test/graphql/com/example/nested_field_with_multiple_fieldsets/kotlin/operationBased/nested_field_with_multiple_fieldsets/TestQuery.kt.expected @@ -18,32 +18,32 @@ import kotlin.Any import kotlin.Boolean import kotlin.Int import kotlin.String -import kotlin.Unit +import com.example.nested_field_with_multiple_fieldsets.type.Query as CompiledQuery public class TestQuery() : Query { - public override fun equals(other: Any?): Boolean = other != null && other::class == this::class + override fun equals(other: Any?): Boolean = other != null && other::class == this::class - public override fun hashCode(): Int = this::class.hashCode() + override fun hashCode(): Int = this::class.hashCode() - public override fun id(): String = OPERATION_ID + override fun id(): String = OPERATION_ID - public override fun document(): String = OPERATION_DOCUMENT + override fun document(): String = OPERATION_DOCUMENT - public override fun name(): String = OPERATION_NAME + override fun name(): String = OPERATION_NAME - public override fun serializeVariables( + override fun serializeVariables( writer: JsonWriter, customScalarAdapters: CustomScalarAdapters, withBooleanDefaultValues: Boolean, - ): Unit { + ) { // This operation doesn't have any variable } - public override fun adapter(): CompositeAdapter = TestQuery_ResponseAdapter.Data.obj() + override fun adapter(): CompositeAdapter = TestQuery_ResponseAdapter.Data.obj() - public override fun rootField(): CompiledField = CompiledField.Builder( + override fun rootField(): CompiledField = CompiledField.Builder( name = "data", - type = com.example.nested_field_with_multiple_fieldsets.type.Query.type + type = CompiledQuery.type ) .selections(selections = TestQuerySelections.__root) .build() diff --git a/libraries/apollo-compiler/src/test/graphql/com/example/nested_field_with_multiple_fieldsets/kotlin/operationBased/nested_field_with_multiple_fieldsets/adapter/TestQuery_ResponseAdapter.kt.expected b/libraries/apollo-compiler/src/test/graphql/com/example/nested_field_with_multiple_fieldsets/kotlin/operationBased/nested_field_with_multiple_fieldsets/adapter/TestQuery_ResponseAdapter.kt.expected index 2c4c2c2b856..4c5c8c4051c 100644 --- a/libraries/apollo-compiler/src/test/graphql/com/example/nested_field_with_multiple_fieldsets/kotlin/operationBased/nested_field_with_multiple_fieldsets/adapter/TestQuery_ResponseAdapter.kt.expected +++ b/libraries/apollo-compiler/src/test/graphql/com/example/nested_field_with_multiple_fieldsets/kotlin/operationBased/nested_field_with_multiple_fieldsets/adapter/TestQuery_ResponseAdapter.kt.expected @@ -18,14 +18,13 @@ import com.apollographql.apollo3.api.obj import com.apollographql.apollo3.api.possibleTypes import com.example.nested_field_with_multiple_fieldsets.TestQuery import kotlin.String -import kotlin.Unit import kotlin.collections.List public object TestQuery_ResponseAdapter { public object Data : CompositeAdapter { public val RESPONSE_NAMES: List = listOf("iface1") - public override fun fromJson(reader: JsonReader, adapterContext: CompositeAdapterContext): + override fun fromJson(reader: JsonReader, adapterContext: CompositeAdapterContext): TestQuery.Data { var _iface1: TestQuery.Data.Iface1? = null @@ -41,11 +40,11 @@ public object TestQuery_ResponseAdapter { ) } - public override fun toJson( + override fun toJson( writer: JsonWriter, `value`: TestQuery.Data, adapterContext: CompositeAdapterContext, - ): Unit { + ) { writer.name("iface1") Iface1.obj(true).nullable().toJson(writer, value.iface1, adapterContext) } @@ -53,7 +52,7 @@ public object TestQuery_ResponseAdapter { private object Iface1 : CompositeAdapter { public val RESPONSE_NAMES: List = listOf("__typename") - public override fun fromJson(reader: JsonReader, adapterContext: CompositeAdapterContext): + override fun fromJson(reader: JsonReader, adapterContext: CompositeAdapterContext): TestQuery.Data.Iface1 { var __typename: String? = null @@ -86,11 +85,11 @@ public object TestQuery_ResponseAdapter { ) } - public override fun toJson( + override fun toJson( writer: JsonWriter, `value`: TestQuery.Data.Iface1, adapterContext: CompositeAdapterContext, - ): Unit { + ) { writer.name("__typename") StringAdapter.toJson(writer, CustomScalarAdapters.Empty, value.__typename) @@ -106,7 +105,7 @@ public object TestQuery_ResponseAdapter { private object OnIface1 : CompositeAdapter { public val RESPONSE_NAMES: List = listOf("iface2") - public override fun fromJson(reader: JsonReader, adapterContext: CompositeAdapterContext): + override fun fromJson(reader: JsonReader, adapterContext: CompositeAdapterContext): TestQuery.Data.Iface1.OnIface1 { var _iface2: TestQuery.Data.Iface1.OnIface1.Iface2? = null @@ -122,11 +121,11 @@ public object TestQuery_ResponseAdapter { ) } - public override fun toJson( + override fun toJson( writer: JsonWriter, `value`: TestQuery.Data.Iface1.OnIface1, adapterContext: CompositeAdapterContext, - ): Unit { + ) { writer.name("iface2") Iface2.obj(true).nullable().toJson(writer, value.iface2, adapterContext) } @@ -134,7 +133,7 @@ public object TestQuery_ResponseAdapter { private object Iface2 : CompositeAdapter { public val RESPONSE_NAMES: List = listOf("__typename") - public override fun fromJson(reader: JsonReader, adapterContext: CompositeAdapterContext): + override fun fromJson(reader: JsonReader, adapterContext: CompositeAdapterContext): TestQuery.Data.Iface1.OnIface1.Iface2 { var __typename: String? = null @@ -167,11 +166,11 @@ public object TestQuery_ResponseAdapter { ) } - public override fun toJson( + override fun toJson( writer: JsonWriter, `value`: TestQuery.Data.Iface1.OnIface1.Iface2, adapterContext: CompositeAdapterContext, - ): Unit { + ) { writer.name("__typename") StringAdapter.toJson(writer, CustomScalarAdapters.Empty, value.__typename) @@ -188,8 +187,7 @@ public object TestQuery_ResponseAdapter { { public val RESPONSE_NAMES: List = listOf("scalar1") - public override fun fromJson(reader: JsonReader, - adapterContext: CompositeAdapterContext): + override fun fromJson(reader: JsonReader, adapterContext: CompositeAdapterContext): TestQuery.Data.Iface1.OnIface1.Iface2.OnIface2 { var _scalar1: String? = null @@ -205,11 +203,11 @@ public object TestQuery_ResponseAdapter { ) } - public override fun toJson( + override fun toJson( writer: JsonWriter, `value`: TestQuery.Data.Iface1.OnIface1.Iface2.OnIface2, adapterContext: CompositeAdapterContext, - ): Unit { + ) { writer.name("scalar1") NullableStringAdapter.toJson(writer, CustomScalarAdapters.Empty, value.scalar1) } @@ -218,8 +216,7 @@ public object TestQuery_ResponseAdapter { private object OnImpl2 : CompositeAdapter { public val RESPONSE_NAMES: List = listOf("scalar2") - public override fun fromJson(reader: JsonReader, - adapterContext: CompositeAdapterContext): + override fun fromJson(reader: JsonReader, adapterContext: CompositeAdapterContext): TestQuery.Data.Iface1.OnIface1.Iface2.OnImpl2 { var _scalar2: String? = null @@ -235,11 +232,11 @@ public object TestQuery_ResponseAdapter { ) } - public override fun toJson( + override fun toJson( writer: JsonWriter, `value`: TestQuery.Data.Iface1.OnIface1.Iface2.OnImpl2, adapterContext: CompositeAdapterContext, - ): Unit { + ) { writer.name("scalar2") NullableStringAdapter.toJson(writer, CustomScalarAdapters.Empty, value.scalar2) } @@ -250,7 +247,7 @@ public object TestQuery_ResponseAdapter { private object OnImpl1 : CompositeAdapter { public val RESPONSE_NAMES: List = listOf("iface2") - public override fun fromJson(reader: JsonReader, adapterContext: CompositeAdapterContext): + override fun fromJson(reader: JsonReader, adapterContext: CompositeAdapterContext): TestQuery.Data.Iface1.OnImpl1 { var _iface2: TestQuery.Data.Iface1.OnImpl1.Iface2? = null @@ -266,11 +263,11 @@ public object TestQuery_ResponseAdapter { ) } - public override fun toJson( + override fun toJson( writer: JsonWriter, `value`: TestQuery.Data.Iface1.OnImpl1, adapterContext: CompositeAdapterContext, - ): Unit { + ) { writer.name("iface2") Iface2.obj(true).nullable().toJson(writer, value.iface2, adapterContext) } @@ -278,7 +275,7 @@ public object TestQuery_ResponseAdapter { private object Iface2 : CompositeAdapter { public val RESPONSE_NAMES: List = listOf("__typename") - public override fun fromJson(reader: JsonReader, adapterContext: CompositeAdapterContext): + override fun fromJson(reader: JsonReader, adapterContext: CompositeAdapterContext): TestQuery.Data.Iface1.OnImpl1.Iface2 { var __typename: String? = null @@ -311,11 +308,11 @@ public object TestQuery_ResponseAdapter { ) } - public override fun toJson( + override fun toJson( writer: JsonWriter, `value`: TestQuery.Data.Iface1.OnImpl1.Iface2, adapterContext: CompositeAdapterContext, - ): Unit { + ) { writer.name("__typename") StringAdapter.toJson(writer, CustomScalarAdapters.Empty, value.__typename) @@ -332,8 +329,7 @@ public object TestQuery_ResponseAdapter { { public val RESPONSE_NAMES: List = listOf("scalar3") - public override fun fromJson(reader: JsonReader, - adapterContext: CompositeAdapterContext): + override fun fromJson(reader: JsonReader, adapterContext: CompositeAdapterContext): TestQuery.Data.Iface1.OnImpl1.Iface2.OnIface2 { var _scalar3: String? = null @@ -349,11 +345,11 @@ public object TestQuery_ResponseAdapter { ) } - public override fun toJson( + override fun toJson( writer: JsonWriter, `value`: TestQuery.Data.Iface1.OnImpl1.Iface2.OnIface2, adapterContext: CompositeAdapterContext, - ): Unit { + ) { writer.name("scalar3") NullableStringAdapter.toJson(writer, CustomScalarAdapters.Empty, value.scalar3) } @@ -362,8 +358,7 @@ public object TestQuery_ResponseAdapter { private object OnImpl2 : CompositeAdapter { public val RESPONSE_NAMES: List = listOf("scalar4") - public override fun fromJson(reader: JsonReader, - adapterContext: CompositeAdapterContext): + override fun fromJson(reader: JsonReader, adapterContext: CompositeAdapterContext): TestQuery.Data.Iface1.OnImpl1.Iface2.OnImpl2 { var _scalar4: String? = null @@ -379,11 +374,11 @@ public object TestQuery_ResponseAdapter { ) } - public override fun toJson( + override fun toJson( writer: JsonWriter, `value`: TestQuery.Data.Iface1.OnImpl1.Iface2.OnImpl2, adapterContext: CompositeAdapterContext, - ): Unit { + ) { writer.name("scalar4") NullableStringAdapter.toJson(writer, CustomScalarAdapters.Empty, value.scalar4) } diff --git a/libraries/apollo-compiler/src/test/graphql/com/example/nested_field_with_multiple_fieldsets/kotlin/responseBased/nested_field_with_multiple_fieldsets/TestQuery.kt.expected b/libraries/apollo-compiler/src/test/graphql/com/example/nested_field_with_multiple_fieldsets/kotlin/responseBased/nested_field_with_multiple_fieldsets/TestQuery.kt.expected index 9aef3af379d..228aed373a3 100644 --- a/libraries/apollo-compiler/src/test/graphql/com/example/nested_field_with_multiple_fieldsets/kotlin/responseBased/nested_field_with_multiple_fieldsets/TestQuery.kt.expected +++ b/libraries/apollo-compiler/src/test/graphql/com/example/nested_field_with_multiple_fieldsets/kotlin/responseBased/nested_field_with_multiple_fieldsets/TestQuery.kt.expected @@ -18,32 +18,33 @@ import kotlin.Any import kotlin.Boolean import kotlin.Int import kotlin.String -import kotlin.Unit +import kotlin.Suppress +import com.example.nested_field_with_multiple_fieldsets.type.Query as CompiledQuery public class TestQuery() : Query { - public override fun equals(other: Any?): Boolean = other != null && other::class == this::class + override fun equals(other: Any?): Boolean = other != null && other::class == this::class - public override fun hashCode(): Int = this::class.hashCode() + override fun hashCode(): Int = this::class.hashCode() - public override fun id(): String = OPERATION_ID + override fun id(): String = OPERATION_ID - public override fun document(): String = OPERATION_DOCUMENT + override fun document(): String = OPERATION_DOCUMENT - public override fun name(): String = OPERATION_NAME + override fun name(): String = OPERATION_NAME - public override fun serializeVariables( + override fun serializeVariables( writer: JsonWriter, customScalarAdapters: CustomScalarAdapters, withBooleanDefaultValues: Boolean, - ): Unit { + ) { // This operation doesn't have any variable } - public override fun adapter(): CompositeAdapter = TestQuery_ResponseAdapter.Data.obj() + override fun adapter(): CompositeAdapter = TestQuery_ResponseAdapter.Data.obj() - public override fun rootField(): CompiledField = CompiledField.Builder( + override fun rootField(): CompiledField = CompiledField.Builder( name = "data", - type = com.example.nested_field_with_multiple_fieldsets.type.Query.type + type = CompiledQuery.type ) .selections(selections = TestQuerySelections.__root) .build() @@ -63,77 +64,81 @@ public class TestQuery() : Query { public val scalar1: String? public companion object { - public fun Iface2.asImpl2() = this as? Impl2Iface2 + @Suppress("USELESS_CAST") + public fun Iface2.asImpl2(): Impl2Iface2? = this as? Impl2Iface2 } } public sealed interface Impl2Iface2 : Iface2 { - public override val __typename: String + override val __typename: String - public override val scalar1: String? + override val scalar1: String? public val scalar2: String? } public companion object { - public fun Iface1.asImpl1() = this as? Impl1Iface1 + @Suppress("USELESS_CAST") + public fun Iface1.asImpl1(): Impl1Iface1? = this as? Impl1Iface1 } } public data class Impl1Iface1( - public override val __typename: String, - public override val iface2: Iface2?, + override val __typename: String, + override val iface2: Iface2?, ) : Iface1 { public sealed interface Iface2 : Iface1.Iface2 { - public override val __typename: String + override val __typename: String - public override val scalar1: String? + override val scalar1: String? public val scalar3: String? public companion object { - public fun Iface2.asImpl2() = this as? Impl2Iface2 + @Suppress("USELESS_CAST") + public fun Iface2.asImpl2(): Impl2Iface2? = this as? Impl2Iface2 } } public data class Impl2Iface2( - public override val __typename: String, - public override val scalar1: String?, - public override val scalar2: String?, - public override val scalar3: String?, + override val __typename: String, + override val scalar1: String?, + override val scalar2: String?, + override val scalar3: String?, public val scalar4: String?, ) : Iface2, Iface1.Impl2Iface2 public data class OtherIface2( - public override val __typename: String, - public override val scalar1: String?, - public override val scalar3: String?, + override val __typename: String, + override val scalar1: String?, + override val scalar3: String?, ) : Iface2, Iface1.Iface2 } public data class OtherIface1( - public override val __typename: String, - public override val iface2: Iface2?, + override val __typename: String, + override val iface2: Iface2?, ) : Iface1 { public sealed interface Iface2 : Iface1.Iface2 { - public override val __typename: String + override val __typename: String - public override val scalar1: String? + override val scalar1: String? public companion object { - public fun Iface2.asImpl2() = this as? Impl2Iface2 + @Suppress("USELESS_CAST") + public fun Iface2.asImpl2(): Impl2Iface2? = this as? Impl2Iface2 } } public data class Impl2Iface2( - public override val __typename: String, - public override val scalar1: String?, - public override val scalar2: String?, + override val __typename: String, + override val scalar1: String?, + override val scalar2: String?, ) : Iface2, Iface1.Impl2Iface2 public data class OtherIface2( - public override val __typename: String, - public override val scalar1: String?, + override val __typename: String, + override val scalar1: String?, ) : Iface2, Iface1.Iface2 } } diff --git a/libraries/apollo-compiler/src/test/graphql/com/example/nested_field_with_multiple_fieldsets/kotlin/responseBased/nested_field_with_multiple_fieldsets/adapter/TestQuery_ResponseAdapter.kt.expected b/libraries/apollo-compiler/src/test/graphql/com/example/nested_field_with_multiple_fieldsets/kotlin/responseBased/nested_field_with_multiple_fieldsets/adapter/TestQuery_ResponseAdapter.kt.expected index 9f515764ab3..f4ff9ab024a 100644 --- a/libraries/apollo-compiler/src/test/graphql/com/example/nested_field_with_multiple_fieldsets/kotlin/responseBased/nested_field_with_multiple_fieldsets/adapter/TestQuery_ResponseAdapter.kt.expected +++ b/libraries/apollo-compiler/src/test/graphql/com/example/nested_field_with_multiple_fieldsets/kotlin/responseBased/nested_field_with_multiple_fieldsets/adapter/TestQuery_ResponseAdapter.kt.expected @@ -18,14 +18,13 @@ import com.apollographql.apollo3.api.obj import com.example.nested_field_with_multiple_fieldsets.TestQuery import kotlin.String import kotlin.Suppress -import kotlin.Unit import kotlin.collections.List public object TestQuery_ResponseAdapter { public object Data : CompositeAdapter { public val RESPONSE_NAMES: List = listOf("iface1") - public override fun fromJson(reader: JsonReader, adapterContext: CompositeAdapterContext): + override fun fromJson(reader: JsonReader, adapterContext: CompositeAdapterContext): TestQuery.Data { var _iface1: TestQuery.Data.Iface1? = null @@ -41,17 +40,17 @@ public object TestQuery_ResponseAdapter { ) } - public override fun toJson( + override fun toJson( writer: JsonWriter, `value`: TestQuery.Data, adapterContext: CompositeAdapterContext, - ): Unit { + ) { writer.name("iface1") Iface1.obj().nullable().toJson(writer, value.iface1, adapterContext) } private object Iface1 : CompositeAdapter { - public override fun fromJson(reader: JsonReader, adapterContext: CompositeAdapterContext): + override fun fromJson(reader: JsonReader, adapterContext: CompositeAdapterContext): TestQuery.Data.Iface1 { val __typename = reader.readTypename() return when(__typename) { @@ -62,11 +61,11 @@ public object TestQuery_ResponseAdapter { } } - public override fun toJson( + override fun toJson( writer: JsonWriter, `value`: TestQuery.Data.Iface1, adapterContext: CompositeAdapterContext, - ): Unit { + ) { when(value) { is TestQuery.Data.Impl1Iface1 -> Impl1Iface1.toJson(writer, value, adapterContext) is TestQuery.Data.OtherIface1 -> OtherIface1.toJson(writer, value, adapterContext) @@ -103,7 +102,7 @@ public object TestQuery_ResponseAdapter { writer: JsonWriter, `value`: TestQuery.Data.Impl1Iface1, @Suppress("UNUSED_PARAMETER") adapterContext: CompositeAdapterContext, - ): Unit { + ) { writer.name("__typename") StringAdapter.toJson(writer, CustomScalarAdapters.Empty, value.__typename) @@ -112,7 +111,7 @@ public object TestQuery_ResponseAdapter { } private object Iface2 : CompositeAdapter { - public override fun fromJson(reader: JsonReader, adapterContext: CompositeAdapterContext): + override fun fromJson(reader: JsonReader, adapterContext: CompositeAdapterContext): TestQuery.Data.Impl1Iface1.Iface2 { val __typename = reader.readTypename() return when(__typename) { @@ -123,11 +122,11 @@ public object TestQuery_ResponseAdapter { } } - public override fun toJson( + override fun toJson( writer: JsonWriter, `value`: TestQuery.Data.Impl1Iface1.Iface2, adapterContext: CompositeAdapterContext, - ): Unit { + ) { when(value) { is TestQuery.Data.Impl1Iface1.Impl2Iface2 -> Impl2Iface2.toJson(writer, value, adapterContext) @@ -176,7 +175,7 @@ public object TestQuery_ResponseAdapter { writer: JsonWriter, `value`: TestQuery.Data.Impl1Iface1.Impl2Iface2, @Suppress("UNUSED_PARAMETER") adapterContext: CompositeAdapterContext, - ): Unit { + ) { writer.name("__typename") StringAdapter.toJson(writer, CustomScalarAdapters.Empty, value.__typename) @@ -226,7 +225,7 @@ public object TestQuery_ResponseAdapter { writer: JsonWriter, `value`: TestQuery.Data.Impl1Iface1.OtherIface2, @Suppress("UNUSED_PARAMETER") adapterContext: CompositeAdapterContext, - ): Unit { + ) { writer.name("__typename") StringAdapter.toJson(writer, CustomScalarAdapters.Empty, value.__typename) @@ -268,7 +267,7 @@ public object TestQuery_ResponseAdapter { writer: JsonWriter, `value`: TestQuery.Data.OtherIface1, @Suppress("UNUSED_PARAMETER") adapterContext: CompositeAdapterContext, - ): Unit { + ) { writer.name("__typename") StringAdapter.toJson(writer, CustomScalarAdapters.Empty, value.__typename) @@ -277,7 +276,7 @@ public object TestQuery_ResponseAdapter { } private object Iface2 : CompositeAdapter { - public override fun fromJson(reader: JsonReader, adapterContext: CompositeAdapterContext): + override fun fromJson(reader: JsonReader, adapterContext: CompositeAdapterContext): TestQuery.Data.OtherIface1.Iface2 { val __typename = reader.readTypename() return when(__typename) { @@ -288,11 +287,11 @@ public object TestQuery_ResponseAdapter { } } - public override fun toJson( + override fun toJson( writer: JsonWriter, `value`: TestQuery.Data.OtherIface1.Iface2, adapterContext: CompositeAdapterContext, - ): Unit { + ) { when(value) { is TestQuery.Data.OtherIface1.Impl2Iface2 -> Impl2Iface2.toJson(writer, value, adapterContext) @@ -334,7 +333,7 @@ public object TestQuery_ResponseAdapter { writer: JsonWriter, `value`: TestQuery.Data.OtherIface1.Impl2Iface2, @Suppress("UNUSED_PARAMETER") adapterContext: CompositeAdapterContext, - ): Unit { + ) { writer.name("__typename") StringAdapter.toJson(writer, CustomScalarAdapters.Empty, value.__typename) @@ -375,7 +374,7 @@ public object TestQuery_ResponseAdapter { writer: JsonWriter, `value`: TestQuery.Data.OtherIface1.OtherIface2, @Suppress("UNUSED_PARAMETER") adapterContext: CompositeAdapterContext, - ): Unit { + ) { writer.name("__typename") StringAdapter.toJson(writer, CustomScalarAdapters.Empty, value.__typename) diff --git a/libraries/apollo-compiler/src/test/graphql/com/example/nested_named_fragments/kotlin/operationBased/nested_named_fragments/AllStarships.kt.expected b/libraries/apollo-compiler/src/test/graphql/com/example/nested_named_fragments/kotlin/operationBased/nested_named_fragments/AllStarships.kt.expected index a4c23475932..2ef4128af64 100644 --- a/libraries/apollo-compiler/src/test/graphql/com/example/nested_named_fragments/kotlin/operationBased/nested_named_fragments/AllStarships.kt.expected +++ b/libraries/apollo-compiler/src/test/graphql/com/example/nested_named_fragments/kotlin/operationBased/nested_named_fragments/AllStarships.kt.expected @@ -15,38 +15,37 @@ import com.apollographql.apollo3.api.obj import com.example.nested_named_fragments.adapter.AllStarships_ResponseAdapter import com.example.nested_named_fragments.fragment.StarshipFragment import com.example.nested_named_fragments.selections.AllStarshipsSelections -import com.example.nested_named_fragments.type.Root import kotlin.Any import kotlin.Boolean import kotlin.Int import kotlin.String -import kotlin.Unit import kotlin.collections.List +import com.example.nested_named_fragments.type.Root as CompiledRoot public class AllStarships() : Query { - public override fun equals(other: Any?): Boolean = other != null && other::class == this::class + override fun equals(other: Any?): Boolean = other != null && other::class == this::class - public override fun hashCode(): Int = this::class.hashCode() + override fun hashCode(): Int = this::class.hashCode() - public override fun id(): String = OPERATION_ID + override fun id(): String = OPERATION_ID - public override fun document(): String = OPERATION_DOCUMENT + override fun document(): String = OPERATION_DOCUMENT - public override fun name(): String = OPERATION_NAME + override fun name(): String = OPERATION_NAME - public override fun serializeVariables( + override fun serializeVariables( writer: JsonWriter, customScalarAdapters: CustomScalarAdapters, withBooleanDefaultValues: Boolean, - ): Unit { + ) { // This operation doesn't have any variable } - public override fun adapter(): CompositeAdapter = AllStarships_ResponseAdapter.Data.obj() + override fun adapter(): CompositeAdapter = AllStarships_ResponseAdapter.Data.obj() - public override fun rootField(): CompiledField = CompiledField.Builder( + override fun rootField(): CompiledField = CompiledField.Builder( name = "data", - type = Root.type + type = CompiledRoot.type ) .selections(selections = AllStarshipsSelections.__root) .build() diff --git a/libraries/apollo-compiler/src/test/graphql/com/example/nested_named_fragments/kotlin/operationBased/nested_named_fragments/adapter/AllStarships_ResponseAdapter.kt.expected b/libraries/apollo-compiler/src/test/graphql/com/example/nested_named_fragments/kotlin/operationBased/nested_named_fragments/adapter/AllStarships_ResponseAdapter.kt.expected index 849709988d9..08ce20f763f 100644 --- a/libraries/apollo-compiler/src/test/graphql/com/example/nested_named_fragments/kotlin/operationBased/nested_named_fragments/adapter/AllStarships_ResponseAdapter.kt.expected +++ b/libraries/apollo-compiler/src/test/graphql/com/example/nested_named_fragments/kotlin/operationBased/nested_named_fragments/adapter/AllStarships_ResponseAdapter.kt.expected @@ -16,14 +16,13 @@ import com.apollographql.apollo3.api.nullable import com.apollographql.apollo3.api.obj import com.example.nested_named_fragments.AllStarships import kotlin.String -import kotlin.Unit import kotlin.collections.List public object AllStarships_ResponseAdapter { public object Data : CompositeAdapter { public val RESPONSE_NAMES: List = listOf("allStarships") - public override fun fromJson(reader: JsonReader, adapterContext: CompositeAdapterContext): + override fun fromJson(reader: JsonReader, adapterContext: CompositeAdapterContext): com.example.nested_named_fragments.AllStarships.Data { var _allStarships: com.example.nested_named_fragments.AllStarships.Data.AllStarships? = null @@ -39,11 +38,11 @@ public object AllStarships_ResponseAdapter { ) } - public override fun toJson( + override fun toJson( writer: JsonWriter, `value`: com.example.nested_named_fragments.AllStarships.Data, adapterContext: CompositeAdapterContext, - ): Unit { + ) { writer.name("allStarships") AllStarships.obj().nullable().toJson(writer, value.allStarships, adapterContext) } @@ -52,7 +51,7 @@ public object AllStarships_ResponseAdapter { CompositeAdapter { public val RESPONSE_NAMES: List = listOf("edges") - public override fun fromJson(reader: JsonReader, adapterContext: CompositeAdapterContext): + override fun fromJson(reader: JsonReader, adapterContext: CompositeAdapterContext): com.example.nested_named_fragments.AllStarships.Data.AllStarships { var _edges: List? = null @@ -68,11 +67,11 @@ public object AllStarships_ResponseAdapter { ) } - public override fun toJson( + override fun toJson( writer: JsonWriter, `value`: com.example.nested_named_fragments.AllStarships.Data.AllStarships, adapterContext: CompositeAdapterContext, - ): Unit { + ) { writer.name("edges") Edge.obj().nullable().list().nullable().toJson(writer, value.edges, adapterContext) } @@ -81,7 +80,7 @@ public object AllStarships_ResponseAdapter { CompositeAdapter { public val RESPONSE_NAMES: List = listOf("node") - public override fun fromJson(reader: JsonReader, adapterContext: CompositeAdapterContext): + override fun fromJson(reader: JsonReader, adapterContext: CompositeAdapterContext): com.example.nested_named_fragments.AllStarships.Data.AllStarships.Edge { var _node: com.example.nested_named_fragments.AllStarships.Data.AllStarships.Edge.Node? = null @@ -97,11 +96,11 @@ public object AllStarships_ResponseAdapter { ) } - public override fun toJson( + override fun toJson( writer: JsonWriter, `value`: com.example.nested_named_fragments.AllStarships.Data.AllStarships.Edge, adapterContext: CompositeAdapterContext, - ): Unit { + ) { writer.name("node") Node.obj(true).nullable().toJson(writer, value.node, adapterContext) } @@ -111,7 +110,7 @@ public object AllStarships_ResponseAdapter { { public val RESPONSE_NAMES: List = listOf("__typename") - public override fun fromJson(reader: JsonReader, adapterContext: CompositeAdapterContext): + override fun fromJson(reader: JsonReader, adapterContext: CompositeAdapterContext): com.example.nested_named_fragments.AllStarships.Data.AllStarships.Edge.Node { var __typename: String? = null @@ -132,11 +131,11 @@ public object AllStarships_ResponseAdapter { ) } - public override fun toJson( + override fun toJson( writer: JsonWriter, `value`: com.example.nested_named_fragments.AllStarships.Data.AllStarships.Edge.Node, adapterContext: CompositeAdapterContext, - ): Unit { + ) { writer.name("__typename") StringAdapter.toJson(writer, CustomScalarAdapters.Empty, value.__typename) diff --git a/libraries/apollo-compiler/src/test/graphql/com/example/nested_named_fragments/kotlin/operationBased/nested_named_fragments/fragment/PilotFragmentImpl.kt.expected b/libraries/apollo-compiler/src/test/graphql/com/example/nested_named_fragments/kotlin/operationBased/nested_named_fragments/fragment/PilotFragmentImpl.kt.expected index aa9bb9dd87d..a8ce8bdb87c 100644 --- a/libraries/apollo-compiler/src/test/graphql/com/example/nested_named_fragments/kotlin/operationBased/nested_named_fragments/fragment/PilotFragmentImpl.kt.expected +++ b/libraries/apollo-compiler/src/test/graphql/com/example/nested_named_fragments/kotlin/operationBased/nested_named_fragments/fragment/PilotFragmentImpl.kt.expected @@ -16,25 +16,24 @@ import com.example.nested_named_fragments.type.Person import kotlin.Any import kotlin.Boolean import kotlin.Int -import kotlin.Unit public class PilotFragmentImpl() : Fragment { - public override fun equals(other: Any?): Boolean = other != null && other::class == this::class + override fun equals(other: Any?): Boolean = other != null && other::class == this::class - public override fun hashCode(): Int = this::class.hashCode() + override fun hashCode(): Int = this::class.hashCode() - public override fun serializeVariables( + override fun serializeVariables( writer: JsonWriter, customScalarAdapters: CustomScalarAdapters, withBooleanDefaultValues: Boolean, - ): Unit { + ) { // This fragment doesn't have any variable } - public override fun adapter(): CompositeAdapter = + override fun adapter(): CompositeAdapter = PilotFragmentImpl_ResponseAdapter.PilotFragment.obj() - public override fun rootField(): CompiledField = CompiledField.Builder( + override fun rootField(): CompiledField = CompiledField.Builder( name = "data", type = Person.type ) diff --git a/libraries/apollo-compiler/src/test/graphql/com/example/nested_named_fragments/kotlin/operationBased/nested_named_fragments/fragment/PilotFragmentImpl_ResponseAdapter.kt.expected b/libraries/apollo-compiler/src/test/graphql/com/example/nested_named_fragments/kotlin/operationBased/nested_named_fragments/fragment/PilotFragmentImpl_ResponseAdapter.kt.expected index 18fe2d7870c..681b7387c07 100644 --- a/libraries/apollo-compiler/src/test/graphql/com/example/nested_named_fragments/kotlin/operationBased/nested_named_fragments/fragment/PilotFragmentImpl_ResponseAdapter.kt.expected +++ b/libraries/apollo-compiler/src/test/graphql/com/example/nested_named_fragments/kotlin/operationBased/nested_named_fragments/fragment/PilotFragmentImpl_ResponseAdapter.kt.expected @@ -15,7 +15,6 @@ import com.apollographql.apollo3.api.json.JsonWriter import com.apollographql.apollo3.api.nullable import com.apollographql.apollo3.api.obj import kotlin.String -import kotlin.Unit import kotlin.collections.List public object PilotFragmentImpl_ResponseAdapter { @@ -23,7 +22,7 @@ public object PilotFragmentImpl_ResponseAdapter { CompositeAdapter { public val RESPONSE_NAMES: List = listOf("name", "homeworld") - public override fun fromJson(reader: JsonReader, adapterContext: CompositeAdapterContext): + override fun fromJson(reader: JsonReader, adapterContext: CompositeAdapterContext): com.example.nested_named_fragments.fragment.PilotFragment { var _name: String? = null var _homeworld: com.example.nested_named_fragments.fragment.PilotFragment.Homeworld? = null @@ -42,11 +41,11 @@ public object PilotFragmentImpl_ResponseAdapter { ) } - public override fun toJson( + override fun toJson( writer: JsonWriter, `value`: com.example.nested_named_fragments.fragment.PilotFragment, adapterContext: CompositeAdapterContext, - ): Unit { + ) { writer.name("name") NullableStringAdapter.toJson(writer, CustomScalarAdapters.Empty, value.name) @@ -58,7 +57,7 @@ public object PilotFragmentImpl_ResponseAdapter { CompositeAdapter { public val RESPONSE_NAMES: List = listOf("__typename") - public override fun fromJson(reader: JsonReader, adapterContext: CompositeAdapterContext): + override fun fromJson(reader: JsonReader, adapterContext: CompositeAdapterContext): com.example.nested_named_fragments.fragment.PilotFragment.Homeworld { var __typename: String? = null @@ -79,11 +78,11 @@ public object PilotFragmentImpl_ResponseAdapter { ) } - public override fun toJson( + override fun toJson( writer: JsonWriter, `value`: com.example.nested_named_fragments.fragment.PilotFragment.Homeworld, adapterContext: CompositeAdapterContext, - ): Unit { + ) { writer.name("__typename") StringAdapter.toJson(writer, CustomScalarAdapters.Empty, value.__typename) diff --git a/libraries/apollo-compiler/src/test/graphql/com/example/nested_named_fragments/kotlin/operationBased/nested_named_fragments/fragment/PlanetFragmentImpl.kt.expected b/libraries/apollo-compiler/src/test/graphql/com/example/nested_named_fragments/kotlin/operationBased/nested_named_fragments/fragment/PlanetFragmentImpl.kt.expected index 910ae7760d4..e850bbebff7 100644 --- a/libraries/apollo-compiler/src/test/graphql/com/example/nested_named_fragments/kotlin/operationBased/nested_named_fragments/fragment/PlanetFragmentImpl.kt.expected +++ b/libraries/apollo-compiler/src/test/graphql/com/example/nested_named_fragments/kotlin/operationBased/nested_named_fragments/fragment/PlanetFragmentImpl.kt.expected @@ -16,25 +16,24 @@ import com.example.nested_named_fragments.type.Planet import kotlin.Any import kotlin.Boolean import kotlin.Int -import kotlin.Unit public class PlanetFragmentImpl() : Fragment { - public override fun equals(other: Any?): Boolean = other != null && other::class == this::class + override fun equals(other: Any?): Boolean = other != null && other::class == this::class - public override fun hashCode(): Int = this::class.hashCode() + override fun hashCode(): Int = this::class.hashCode() - public override fun serializeVariables( + override fun serializeVariables( writer: JsonWriter, customScalarAdapters: CustomScalarAdapters, withBooleanDefaultValues: Boolean, - ): Unit { + ) { // This fragment doesn't have any variable } - public override fun adapter(): CompositeAdapter = + override fun adapter(): CompositeAdapter = PlanetFragmentImpl_ResponseAdapter.PlanetFragment.obj() - public override fun rootField(): CompiledField = CompiledField.Builder( + override fun rootField(): CompiledField = CompiledField.Builder( name = "data", type = Planet.type ) diff --git a/libraries/apollo-compiler/src/test/graphql/com/example/nested_named_fragments/kotlin/operationBased/nested_named_fragments/fragment/PlanetFragmentImpl_ResponseAdapter.kt.expected b/libraries/apollo-compiler/src/test/graphql/com/example/nested_named_fragments/kotlin/operationBased/nested_named_fragments/fragment/PlanetFragmentImpl_ResponseAdapter.kt.expected index 53da3b7210f..0f0f5718b18 100644 --- a/libraries/apollo-compiler/src/test/graphql/com/example/nested_named_fragments/kotlin/operationBased/nested_named_fragments/fragment/PlanetFragmentImpl_ResponseAdapter.kt.expected +++ b/libraries/apollo-compiler/src/test/graphql/com/example/nested_named_fragments/kotlin/operationBased/nested_named_fragments/fragment/PlanetFragmentImpl_ResponseAdapter.kt.expected @@ -12,7 +12,6 @@ import com.apollographql.apollo3.api.NullableStringAdapter import com.apollographql.apollo3.api.json.JsonReader import com.apollographql.apollo3.api.json.JsonWriter import kotlin.String -import kotlin.Unit import kotlin.collections.List public object PlanetFragmentImpl_ResponseAdapter { @@ -20,7 +19,7 @@ public object PlanetFragmentImpl_ResponseAdapter { CompositeAdapter { public val RESPONSE_NAMES: List = listOf("name") - public override fun fromJson(reader: JsonReader, adapterContext: CompositeAdapterContext): + override fun fromJson(reader: JsonReader, adapterContext: CompositeAdapterContext): com.example.nested_named_fragments.fragment.PlanetFragment { var _name: String? = null @@ -36,11 +35,11 @@ public object PlanetFragmentImpl_ResponseAdapter { ) } - public override fun toJson( + override fun toJson( writer: JsonWriter, `value`: com.example.nested_named_fragments.fragment.PlanetFragment, adapterContext: CompositeAdapterContext, - ): Unit { + ) { writer.name("name") NullableStringAdapter.toJson(writer, CustomScalarAdapters.Empty, value.name) } diff --git a/libraries/apollo-compiler/src/test/graphql/com/example/nested_named_fragments/kotlin/operationBased/nested_named_fragments/fragment/StarshipFragmentImpl.kt.expected b/libraries/apollo-compiler/src/test/graphql/com/example/nested_named_fragments/kotlin/operationBased/nested_named_fragments/fragment/StarshipFragmentImpl.kt.expected index e0c94d2e50d..3a03ae0879c 100644 --- a/libraries/apollo-compiler/src/test/graphql/com/example/nested_named_fragments/kotlin/operationBased/nested_named_fragments/fragment/StarshipFragmentImpl.kt.expected +++ b/libraries/apollo-compiler/src/test/graphql/com/example/nested_named_fragments/kotlin/operationBased/nested_named_fragments/fragment/StarshipFragmentImpl.kt.expected @@ -16,25 +16,24 @@ import com.example.nested_named_fragments.type.Starship import kotlin.Any import kotlin.Boolean import kotlin.Int -import kotlin.Unit public class StarshipFragmentImpl() : Fragment { - public override fun equals(other: Any?): Boolean = other != null && other::class == this::class + override fun equals(other: Any?): Boolean = other != null && other::class == this::class - public override fun hashCode(): Int = this::class.hashCode() + override fun hashCode(): Int = this::class.hashCode() - public override fun serializeVariables( + override fun serializeVariables( writer: JsonWriter, customScalarAdapters: CustomScalarAdapters, withBooleanDefaultValues: Boolean, - ): Unit { + ) { // This fragment doesn't have any variable } - public override fun adapter(): CompositeAdapter = + override fun adapter(): CompositeAdapter = StarshipFragmentImpl_ResponseAdapter.StarshipFragment.obj() - public override fun rootField(): CompiledField = CompiledField.Builder( + override fun rootField(): CompiledField = CompiledField.Builder( name = "data", type = Starship.type ) diff --git a/libraries/apollo-compiler/src/test/graphql/com/example/nested_named_fragments/kotlin/operationBased/nested_named_fragments/fragment/StarshipFragmentImpl_ResponseAdapter.kt.expected b/libraries/apollo-compiler/src/test/graphql/com/example/nested_named_fragments/kotlin/operationBased/nested_named_fragments/fragment/StarshipFragmentImpl_ResponseAdapter.kt.expected index 9148dca720b..2ef5dcb0857 100644 --- a/libraries/apollo-compiler/src/test/graphql/com/example/nested_named_fragments/kotlin/operationBased/nested_named_fragments/fragment/StarshipFragmentImpl_ResponseAdapter.kt.expected +++ b/libraries/apollo-compiler/src/test/graphql/com/example/nested_named_fragments/kotlin/operationBased/nested_named_fragments/fragment/StarshipFragmentImpl_ResponseAdapter.kt.expected @@ -16,7 +16,6 @@ import com.apollographql.apollo3.api.list import com.apollographql.apollo3.api.nullable import com.apollographql.apollo3.api.obj import kotlin.String -import kotlin.Unit import kotlin.collections.List public object StarshipFragmentImpl_ResponseAdapter { @@ -24,7 +23,7 @@ public object StarshipFragmentImpl_ResponseAdapter { CompositeAdapter { public val RESPONSE_NAMES: List = listOf("id", "name", "pilotConnection") - public override fun fromJson(reader: JsonReader, adapterContext: CompositeAdapterContext): + override fun fromJson(reader: JsonReader, adapterContext: CompositeAdapterContext): com.example.nested_named_fragments.fragment.StarshipFragment { var _id: String? = null var _name: String? = null @@ -46,11 +45,11 @@ public object StarshipFragmentImpl_ResponseAdapter { ) } - public override fun toJson( + override fun toJson( writer: JsonWriter, `value`: com.example.nested_named_fragments.fragment.StarshipFragment, adapterContext: CompositeAdapterContext, - ): Unit { + ) { writer.name("id") StringAdapter.toJson(writer, CustomScalarAdapters.Empty, value.id) @@ -66,7 +65,7 @@ public object StarshipFragmentImpl_ResponseAdapter { { public val RESPONSE_NAMES: List = listOf("edges") - public override fun fromJson(reader: JsonReader, adapterContext: CompositeAdapterContext): + override fun fromJson(reader: JsonReader, adapterContext: CompositeAdapterContext): com.example.nested_named_fragments.fragment.StarshipFragment.PilotConnection { var _edges: List? = null @@ -82,11 +81,11 @@ public object StarshipFragmentImpl_ResponseAdapter { ) } - public override fun toJson( + override fun toJson( writer: JsonWriter, `value`: com.example.nested_named_fragments.fragment.StarshipFragment.PilotConnection, adapterContext: CompositeAdapterContext, - ): Unit { + ) { writer.name("edges") Edge.obj().nullable().list().nullable().toJson(writer, value.edges, adapterContext) } @@ -96,7 +95,7 @@ public object StarshipFragmentImpl_ResponseAdapter { { public val RESPONSE_NAMES: List = listOf("node") - public override fun fromJson(reader: JsonReader, adapterContext: CompositeAdapterContext): + override fun fromJson(reader: JsonReader, adapterContext: CompositeAdapterContext): com.example.nested_named_fragments.fragment.StarshipFragment.PilotConnection.Edge { var _node: com.example.nested_named_fragments.fragment.StarshipFragment.PilotConnection.Edge.Node? = null @@ -112,11 +111,11 @@ public object StarshipFragmentImpl_ResponseAdapter { ) } - public override fun toJson( + override fun toJson( writer: JsonWriter, `value`: com.example.nested_named_fragments.fragment.StarshipFragment.PilotConnection.Edge, adapterContext: CompositeAdapterContext, - ): Unit { + ) { writer.name("node") Node.obj(true).nullable().toJson(writer, value.node, adapterContext) } @@ -126,7 +125,7 @@ public object StarshipFragmentImpl_ResponseAdapter { { public val RESPONSE_NAMES: List = listOf("__typename") - public override fun fromJson(reader: JsonReader, adapterContext: CompositeAdapterContext): + override fun fromJson(reader: JsonReader, adapterContext: CompositeAdapterContext): com.example.nested_named_fragments.fragment.StarshipFragment.PilotConnection.Edge.Node { var __typename: String? = null @@ -147,11 +146,11 @@ public object StarshipFragmentImpl_ResponseAdapter { ) } - public override fun toJson( + override fun toJson( writer: JsonWriter, `value`: com.example.nested_named_fragments.fragment.StarshipFragment.PilotConnection.Edge.Node, adapterContext: CompositeAdapterContext, - ): Unit { + ) { writer.name("__typename") StringAdapter.toJson(writer, CustomScalarAdapters.Empty, value.__typename) diff --git a/libraries/apollo-compiler/src/test/graphql/com/example/nested_named_fragments/kotlin/responseBased/nested_named_fragments/AllStarships.kt.expected b/libraries/apollo-compiler/src/test/graphql/com/example/nested_named_fragments/kotlin/responseBased/nested_named_fragments/AllStarships.kt.expected index ec25ebaebcc..704ccfc369b 100644 --- a/libraries/apollo-compiler/src/test/graphql/com/example/nested_named_fragments/kotlin/responseBased/nested_named_fragments/AllStarships.kt.expected +++ b/libraries/apollo-compiler/src/test/graphql/com/example/nested_named_fragments/kotlin/responseBased/nested_named_fragments/AllStarships.kt.expected @@ -17,38 +17,38 @@ import com.example.nested_named_fragments.fragment.PilotFragment import com.example.nested_named_fragments.fragment.PlanetFragment import com.example.nested_named_fragments.fragment.StarshipFragment import com.example.nested_named_fragments.selections.AllStarshipsSelections -import com.example.nested_named_fragments.type.Root import kotlin.Any import kotlin.Boolean import kotlin.Int import kotlin.String -import kotlin.Unit +import kotlin.Suppress import kotlin.collections.List +import com.example.nested_named_fragments.type.Root as CompiledRoot public class AllStarships() : Query { - public override fun equals(other: Any?): Boolean = other != null && other::class == this::class + override fun equals(other: Any?): Boolean = other != null && other::class == this::class - public override fun hashCode(): Int = this::class.hashCode() + override fun hashCode(): Int = this::class.hashCode() - public override fun id(): String = OPERATION_ID + override fun id(): String = OPERATION_ID - public override fun document(): String = OPERATION_DOCUMENT + override fun document(): String = OPERATION_DOCUMENT - public override fun name(): String = OPERATION_NAME + override fun name(): String = OPERATION_NAME - public override fun serializeVariables( + override fun serializeVariables( writer: JsonWriter, customScalarAdapters: CustomScalarAdapters, withBooleanDefaultValues: Boolean, - ): Unit { + ) { // This operation doesn't have any variable } - public override fun adapter(): CompositeAdapter = AllStarships_ResponseAdapter.Data.obj() + override fun adapter(): CompositeAdapter = AllStarships_ResponseAdapter.Data.obj() - public override fun rootField(): CompiledField = CompiledField.Builder( + override fun rootField(): CompiledField = CompiledField.Builder( name = "data", - type = Root.type + type = CompiledRoot.type ) .selections(selections = AllStarshipsSelections.__root) .build() @@ -76,18 +76,18 @@ public class AllStarships() : Query { /** * The ID of an object */ - public override val id: String, + override val id: String, /** * The name of this starship. The common name, such as "Death Star". */ - public override val name: String?, - public override val pilotConnection: PilotConnection?, + override val name: String?, + override val pilotConnection: PilotConnection?, ) : StarshipFragment { public data class PilotConnection( /** * A list of edges. */ - public override val edges: List?, + override val edges: List?, ) : StarshipFragment.PilotConnection { public fun edgesFilterNotNull(): List? = edges?.filterNotNull() @@ -95,41 +95,44 @@ public class AllStarships() : Query { /** * The item at the end of the edge */ - public override val node: Node?, + override val node: Node?, ) : StarshipFragment.PilotConnection.Edge { public data class Node( - public override val __typename: String, + override val __typename: String, /** * The name of this person. */ - public override val name: String?, + override val name: String?, /** * A planet that this person was born on or inhabits. */ - public override val homeworld: Homeworld?, + override val homeworld: Homeworld?, ) : PilotFragment, StarshipFragment.PilotConnection.Edge.Node { public data class Homeworld( - public override val __typename: String, + override val __typename: String, /** * The name of this planet. */ - public override val name: String?, + override val name: String?, ) : PlanetFragment, PilotFragment.Homeworld, StarshipFragment.PilotConnection.Edge.Node.Homeworld { public companion object { - public fun Homeworld.planetFragment() = this as? PlanetFragment + @Suppress("USELESS_CAST") + public fun Homeworld.planetFragment(): PlanetFragment? = this as? PlanetFragment } } public companion object { - public fun Node.pilotFragment() = this as? PilotFragment + @Suppress("USELESS_CAST") + public fun Node.pilotFragment(): PilotFragment? = this as? PilotFragment } } } } public companion object { - public fun Node.starshipFragment() = this as? StarshipFragment + @Suppress("USELESS_CAST") + public fun Node.starshipFragment(): StarshipFragment? = this as? StarshipFragment } } } diff --git a/libraries/apollo-compiler/src/test/graphql/com/example/nested_named_fragments/kotlin/responseBased/nested_named_fragments/adapter/AllStarships_ResponseAdapter.kt.expected b/libraries/apollo-compiler/src/test/graphql/com/example/nested_named_fragments/kotlin/responseBased/nested_named_fragments/adapter/AllStarships_ResponseAdapter.kt.expected index 1d4c862352e..cdf9360dcb0 100644 --- a/libraries/apollo-compiler/src/test/graphql/com/example/nested_named_fragments/kotlin/responseBased/nested_named_fragments/adapter/AllStarships_ResponseAdapter.kt.expected +++ b/libraries/apollo-compiler/src/test/graphql/com/example/nested_named_fragments/kotlin/responseBased/nested_named_fragments/adapter/AllStarships_ResponseAdapter.kt.expected @@ -17,14 +17,13 @@ import com.apollographql.apollo3.api.nullable import com.apollographql.apollo3.api.obj import com.example.nested_named_fragments.AllStarships import kotlin.String -import kotlin.Unit import kotlin.collections.List public object AllStarships_ResponseAdapter { public object Data : CompositeAdapter { public val RESPONSE_NAMES: List = listOf("allStarships") - public override fun fromJson(reader: JsonReader, adapterContext: CompositeAdapterContext): + override fun fromJson(reader: JsonReader, adapterContext: CompositeAdapterContext): com.example.nested_named_fragments.AllStarships.Data { var _allStarships: com.example.nested_named_fragments.AllStarships.Data.AllStarships? = null @@ -40,11 +39,11 @@ public object AllStarships_ResponseAdapter { ) } - public override fun toJson( + override fun toJson( writer: JsonWriter, `value`: com.example.nested_named_fragments.AllStarships.Data, adapterContext: CompositeAdapterContext, - ): Unit { + ) { writer.name("allStarships") AllStarships.obj().nullable().toJson(writer, value.allStarships, adapterContext) } @@ -53,7 +52,7 @@ public object AllStarships_ResponseAdapter { CompositeAdapter { public val RESPONSE_NAMES: List = listOf("edges") - public override fun fromJson(reader: JsonReader, adapterContext: CompositeAdapterContext): + override fun fromJson(reader: JsonReader, adapterContext: CompositeAdapterContext): com.example.nested_named_fragments.AllStarships.Data.AllStarships { var _edges: List? = null @@ -69,11 +68,11 @@ public object AllStarships_ResponseAdapter { ) } - public override fun toJson( + override fun toJson( writer: JsonWriter, `value`: com.example.nested_named_fragments.AllStarships.Data.AllStarships, adapterContext: CompositeAdapterContext, - ): Unit { + ) { writer.name("edges") Edge.obj().nullable().list().nullable().toJson(writer, value.edges, adapterContext) } @@ -82,7 +81,7 @@ public object AllStarships_ResponseAdapter { CompositeAdapter { public val RESPONSE_NAMES: List = listOf("node") - public override fun fromJson(reader: JsonReader, adapterContext: CompositeAdapterContext): + override fun fromJson(reader: JsonReader, adapterContext: CompositeAdapterContext): com.example.nested_named_fragments.AllStarships.Data.AllStarships.Edge { var _node: com.example.nested_named_fragments.AllStarships.Data.AllStarships.Edge.Node? = null @@ -98,11 +97,11 @@ public object AllStarships_ResponseAdapter { ) } - public override fun toJson( + override fun toJson( writer: JsonWriter, `value`: com.example.nested_named_fragments.AllStarships.Data.AllStarships.Edge, adapterContext: CompositeAdapterContext, - ): Unit { + ) { writer.name("node") Node.obj().nullable().toJson(writer, value.node, adapterContext) } @@ -113,7 +112,7 @@ public object AllStarships_ResponseAdapter { public val RESPONSE_NAMES: List = listOf("__typename", "id", "name", "pilotConnection") - public override fun fromJson(reader: JsonReader, adapterContext: CompositeAdapterContext): + override fun fromJson(reader: JsonReader, adapterContext: CompositeAdapterContext): com.example.nested_named_fragments.AllStarships.Data.AllStarships.Edge.Node { var __typename: String? = null var _id: String? = null @@ -138,11 +137,11 @@ public object AllStarships_ResponseAdapter { ) } - public override fun toJson( + override fun toJson( writer: JsonWriter, `value`: com.example.nested_named_fragments.AllStarships.Data.AllStarships.Edge.Node, adapterContext: CompositeAdapterContext, - ): Unit { + ) { writer.name("__typename") StringAdapter.toJson(writer, CustomScalarAdapters.Empty, value.__typename) @@ -161,8 +160,7 @@ public object AllStarships_ResponseAdapter { { public val RESPONSE_NAMES: List = listOf("edges") - public override fun fromJson(reader: JsonReader, - adapterContext: CompositeAdapterContext): + override fun fromJson(reader: JsonReader, adapterContext: CompositeAdapterContext): com.example.nested_named_fragments.AllStarships.Data.AllStarships.Edge.Node.PilotConnection { var _edges: List? = null @@ -178,11 +176,11 @@ public object AllStarships_ResponseAdapter { ) } - public override fun toJson( + override fun toJson( writer: JsonWriter, `value`: com.example.nested_named_fragments.AllStarships.Data.AllStarships.Edge.Node.PilotConnection, adapterContext: CompositeAdapterContext, - ): Unit { + ) { writer.name("edges") Edge.obj().nullable().list().nullable().toJson(writer, value.edges, adapterContext) } @@ -192,8 +190,7 @@ public object AllStarships_ResponseAdapter { { public val RESPONSE_NAMES: List = listOf("node") - public override fun fromJson(reader: JsonReader, - adapterContext: CompositeAdapterContext): + override fun fromJson(reader: JsonReader, adapterContext: CompositeAdapterContext): com.example.nested_named_fragments.AllStarships.Data.AllStarships.Edge.Node.PilotConnection.Edge { var _node: com.example.nested_named_fragments.AllStarships.Data.AllStarships.Edge.Node.PilotConnection.Edge.Node? = null @@ -209,11 +206,11 @@ public object AllStarships_ResponseAdapter { ) } - public override fun toJson( + override fun toJson( writer: JsonWriter, `value`: com.example.nested_named_fragments.AllStarships.Data.AllStarships.Edge.Node.PilotConnection.Edge, adapterContext: CompositeAdapterContext, - ): Unit { + ) { writer.name("node") Node.obj().nullable().toJson(writer, value.node, adapterContext) } @@ -223,8 +220,7 @@ public object AllStarships_ResponseAdapter { { public val RESPONSE_NAMES: List = listOf("__typename", "name", "homeworld") - public override fun fromJson(reader: JsonReader, - adapterContext: CompositeAdapterContext): + override fun fromJson(reader: JsonReader, adapterContext: CompositeAdapterContext): com.example.nested_named_fragments.AllStarships.Data.AllStarships.Edge.Node.PilotConnection.Edge.Node { var __typename: String? = null var _name: String? = null @@ -246,11 +242,11 @@ public object AllStarships_ResponseAdapter { ) } - public override fun toJson( + override fun toJson( writer: JsonWriter, `value`: com.example.nested_named_fragments.AllStarships.Data.AllStarships.Edge.Node.PilotConnection.Edge.Node, adapterContext: CompositeAdapterContext, - ): Unit { + ) { writer.name("__typename") StringAdapter.toJson(writer, CustomScalarAdapters.Empty, value.__typename) @@ -266,7 +262,7 @@ public object AllStarships_ResponseAdapter { { public val RESPONSE_NAMES: List = listOf("__typename", "name") - public override fun fromJson(reader: JsonReader, + override fun fromJson(reader: JsonReader, adapterContext: CompositeAdapterContext): com.example.nested_named_fragments.AllStarships.Data.AllStarships.Edge.Node.PilotConnection.Edge.Node.Homeworld { var __typename: String? = null @@ -286,11 +282,11 @@ public object AllStarships_ResponseAdapter { ) } - public override fun toJson( + override fun toJson( writer: JsonWriter, `value`: com.example.nested_named_fragments.AllStarships.Data.AllStarships.Edge.Node.PilotConnection.Edge.Node.Homeworld, adapterContext: CompositeAdapterContext, - ): Unit { + ) { writer.name("__typename") StringAdapter.toJson(writer, CustomScalarAdapters.Empty, value.__typename) diff --git a/libraries/apollo-compiler/src/test/graphql/com/example/nested_named_fragments/kotlin/responseBased/nested_named_fragments/fragment/PilotFragment.kt.expected b/libraries/apollo-compiler/src/test/graphql/com/example/nested_named_fragments/kotlin/responseBased/nested_named_fragments/fragment/PilotFragment.kt.expected index ac3e8491539..e312b10ba2d 100644 --- a/libraries/apollo-compiler/src/test/graphql/com/example/nested_named_fragments/kotlin/responseBased/nested_named_fragments/fragment/PilotFragment.kt.expected +++ b/libraries/apollo-compiler/src/test/graphql/com/example/nested_named_fragments/kotlin/responseBased/nested_named_fragments/fragment/PilotFragment.kt.expected @@ -6,6 +6,7 @@ package com.example.nested_named_fragments.fragment import kotlin.String +import kotlin.Suppress public interface PilotFragment { /** @@ -24,10 +25,11 @@ public interface PilotFragment { /** * The name of this planet. */ - public override val name: String? + override val name: String? public companion object { - public fun Homeworld.planetFragment() = this as? PlanetFragment + @Suppress("USELESS_CAST") + public fun Homeworld.planetFragment(): PlanetFragment? = this as? PlanetFragment } } } diff --git a/libraries/apollo-compiler/src/test/graphql/com/example/nested_named_fragments/kotlin/responseBased/nested_named_fragments/fragment/PilotFragmentImpl.kt.expected b/libraries/apollo-compiler/src/test/graphql/com/example/nested_named_fragments/kotlin/responseBased/nested_named_fragments/fragment/PilotFragmentImpl.kt.expected index 7769e3ecfa4..8b246e5131d 100644 --- a/libraries/apollo-compiler/src/test/graphql/com/example/nested_named_fragments/kotlin/responseBased/nested_named_fragments/fragment/PilotFragmentImpl.kt.expected +++ b/libraries/apollo-compiler/src/test/graphql/com/example/nested_named_fragments/kotlin/responseBased/nested_named_fragments/fragment/PilotFragmentImpl.kt.expected @@ -17,25 +17,24 @@ import kotlin.Any import kotlin.Boolean import kotlin.Int import kotlin.String -import kotlin.Unit +import kotlin.Suppress public class PilotFragmentImpl() : Fragment { - public override fun equals(other: Any?): Boolean = other != null && other::class == this::class + override fun equals(other: Any?): Boolean = other != null && other::class == this::class - public override fun hashCode(): Int = this::class.hashCode() + override fun hashCode(): Int = this::class.hashCode() - public override fun serializeVariables( + override fun serializeVariables( writer: JsonWriter, customScalarAdapters: CustomScalarAdapters, withBooleanDefaultValues: Boolean, - ): Unit { + ) { // This fragment doesn't have any variable } - public override fun adapter(): CompositeAdapter = - PilotFragmentImpl_ResponseAdapter.Data.obj() + override fun adapter(): CompositeAdapter = PilotFragmentImpl_ResponseAdapter.Data.obj() - public override fun rootField(): CompiledField = CompiledField.Builder( + override fun rootField(): CompiledField = CompiledField.Builder( name = "data", type = Person.type ) @@ -46,21 +45,22 @@ public class PilotFragmentImpl() : Fragment { /** * The name of this person. */ - public override val name: String?, + override val name: String?, /** * A planet that this person was born on or inhabits. */ - public override val homeworld: Homeworld?, + override val homeworld: Homeworld?, ) : PilotFragment, Fragment.Data { public data class Homeworld( - public override val __typename: String, + override val __typename: String, /** * The name of this planet. */ - public override val name: String?, + override val name: String?, ) : PlanetFragment, PilotFragment.Homeworld { public companion object { - public fun Homeworld.planetFragment() = this as? PlanetFragment + @Suppress("USELESS_CAST") + public fun Homeworld.planetFragment(): PlanetFragment? = this as? PlanetFragment } } } diff --git a/libraries/apollo-compiler/src/test/graphql/com/example/nested_named_fragments/kotlin/responseBased/nested_named_fragments/fragment/PilotFragmentImpl_ResponseAdapter.kt.expected b/libraries/apollo-compiler/src/test/graphql/com/example/nested_named_fragments/kotlin/responseBased/nested_named_fragments/fragment/PilotFragmentImpl_ResponseAdapter.kt.expected index 0432d608b0e..ce001c525fc 100644 --- a/libraries/apollo-compiler/src/test/graphql/com/example/nested_named_fragments/kotlin/responseBased/nested_named_fragments/fragment/PilotFragmentImpl_ResponseAdapter.kt.expected +++ b/libraries/apollo-compiler/src/test/graphql/com/example/nested_named_fragments/kotlin/responseBased/nested_named_fragments/fragment/PilotFragmentImpl_ResponseAdapter.kt.expected @@ -15,14 +15,13 @@ import com.apollographql.apollo3.api.json.JsonWriter import com.apollographql.apollo3.api.nullable import com.apollographql.apollo3.api.obj import kotlin.String -import kotlin.Unit import kotlin.collections.List public object PilotFragmentImpl_ResponseAdapter { public object Data : CompositeAdapter { public val RESPONSE_NAMES: List = listOf("name", "homeworld") - public override fun fromJson(reader: JsonReader, adapterContext: CompositeAdapterContext): + override fun fromJson(reader: JsonReader, adapterContext: CompositeAdapterContext): PilotFragmentImpl.Data { var _name: String? = null var _homeworld: PilotFragmentImpl.Data.Homeworld? = null @@ -41,11 +40,11 @@ public object PilotFragmentImpl_ResponseAdapter { ) } - public override fun toJson( + override fun toJson( writer: JsonWriter, `value`: PilotFragmentImpl.Data, adapterContext: CompositeAdapterContext, - ): Unit { + ) { writer.name("name") NullableStringAdapter.toJson(writer, CustomScalarAdapters.Empty, value.name) @@ -56,7 +55,7 @@ public object PilotFragmentImpl_ResponseAdapter { private object Homeworld : CompositeAdapter { public val RESPONSE_NAMES: List = listOf("__typename", "name") - public override fun fromJson(reader: JsonReader, adapterContext: CompositeAdapterContext): + override fun fromJson(reader: JsonReader, adapterContext: CompositeAdapterContext): PilotFragmentImpl.Data.Homeworld { var __typename: String? = null var _name: String? = null @@ -75,11 +74,11 @@ public object PilotFragmentImpl_ResponseAdapter { ) } - public override fun toJson( + override fun toJson( writer: JsonWriter, `value`: PilotFragmentImpl.Data.Homeworld, adapterContext: CompositeAdapterContext, - ): Unit { + ) { writer.name("__typename") StringAdapter.toJson(writer, CustomScalarAdapters.Empty, value.__typename) diff --git a/libraries/apollo-compiler/src/test/graphql/com/example/nested_named_fragments/kotlin/responseBased/nested_named_fragments/fragment/PlanetFragmentImpl.kt.expected b/libraries/apollo-compiler/src/test/graphql/com/example/nested_named_fragments/kotlin/responseBased/nested_named_fragments/fragment/PlanetFragmentImpl.kt.expected index 437fe79683d..e6b4d2b2c94 100644 --- a/libraries/apollo-compiler/src/test/graphql/com/example/nested_named_fragments/kotlin/responseBased/nested_named_fragments/fragment/PlanetFragmentImpl.kt.expected +++ b/libraries/apollo-compiler/src/test/graphql/com/example/nested_named_fragments/kotlin/responseBased/nested_named_fragments/fragment/PlanetFragmentImpl.kt.expected @@ -17,25 +17,23 @@ import kotlin.Any import kotlin.Boolean import kotlin.Int import kotlin.String -import kotlin.Unit public class PlanetFragmentImpl() : Fragment { - public override fun equals(other: Any?): Boolean = other != null && other::class == this::class + override fun equals(other: Any?): Boolean = other != null && other::class == this::class - public override fun hashCode(): Int = this::class.hashCode() + override fun hashCode(): Int = this::class.hashCode() - public override fun serializeVariables( + override fun serializeVariables( writer: JsonWriter, customScalarAdapters: CustomScalarAdapters, withBooleanDefaultValues: Boolean, - ): Unit { + ) { // This fragment doesn't have any variable } - public override fun adapter(): CompositeAdapter = - PlanetFragmentImpl_ResponseAdapter.Data.obj() + override fun adapter(): CompositeAdapter = PlanetFragmentImpl_ResponseAdapter.Data.obj() - public override fun rootField(): CompiledField = CompiledField.Builder( + override fun rootField(): CompiledField = CompiledField.Builder( name = "data", type = Planet.type ) @@ -46,6 +44,6 @@ public class PlanetFragmentImpl() : Fragment { /** * The name of this planet. */ - public override val name: String?, + override val name: String?, ) : PlanetFragment, Fragment.Data } diff --git a/libraries/apollo-compiler/src/test/graphql/com/example/nested_named_fragments/kotlin/responseBased/nested_named_fragments/fragment/PlanetFragmentImpl_ResponseAdapter.kt.expected b/libraries/apollo-compiler/src/test/graphql/com/example/nested_named_fragments/kotlin/responseBased/nested_named_fragments/fragment/PlanetFragmentImpl_ResponseAdapter.kt.expected index 10f012afd00..ca46607437c 100644 --- a/libraries/apollo-compiler/src/test/graphql/com/example/nested_named_fragments/kotlin/responseBased/nested_named_fragments/fragment/PlanetFragmentImpl_ResponseAdapter.kt.expected +++ b/libraries/apollo-compiler/src/test/graphql/com/example/nested_named_fragments/kotlin/responseBased/nested_named_fragments/fragment/PlanetFragmentImpl_ResponseAdapter.kt.expected @@ -12,14 +12,13 @@ import com.apollographql.apollo3.api.NullableStringAdapter import com.apollographql.apollo3.api.json.JsonReader import com.apollographql.apollo3.api.json.JsonWriter import kotlin.String -import kotlin.Unit import kotlin.collections.List public object PlanetFragmentImpl_ResponseAdapter { public object Data : CompositeAdapter { public val RESPONSE_NAMES: List = listOf("name") - public override fun fromJson(reader: JsonReader, adapterContext: CompositeAdapterContext): + override fun fromJson(reader: JsonReader, adapterContext: CompositeAdapterContext): PlanetFragmentImpl.Data { var _name: String? = null @@ -35,11 +34,11 @@ public object PlanetFragmentImpl_ResponseAdapter { ) } - public override fun toJson( + override fun toJson( writer: JsonWriter, `value`: PlanetFragmentImpl.Data, adapterContext: CompositeAdapterContext, - ): Unit { + ) { writer.name("name") NullableStringAdapter.toJson(writer, CustomScalarAdapters.Empty, value.name) } diff --git a/libraries/apollo-compiler/src/test/graphql/com/example/nested_named_fragments/kotlin/responseBased/nested_named_fragments/fragment/StarshipFragment.kt.expected b/libraries/apollo-compiler/src/test/graphql/com/example/nested_named_fragments/kotlin/responseBased/nested_named_fragments/fragment/StarshipFragment.kt.expected index 77e2c79a8aa..dd86896248d 100644 --- a/libraries/apollo-compiler/src/test/graphql/com/example/nested_named_fragments/kotlin/responseBased/nested_named_fragments/fragment/StarshipFragment.kt.expected +++ b/libraries/apollo-compiler/src/test/graphql/com/example/nested_named_fragments/kotlin/responseBased/nested_named_fragments/fragment/StarshipFragment.kt.expected @@ -6,6 +6,7 @@ package com.example.nested_named_fragments.fragment import kotlin.String +import kotlin.Suppress import kotlin.collections.List public interface StarshipFragment { @@ -39,28 +40,30 @@ public interface StarshipFragment { /** * The name of this person. */ - public override val name: String? + override val name: String? /** * A planet that this person was born on or inhabits. */ - public override val homeworld: Homeworld? + override val homeworld: Homeworld? public interface Homeworld : PlanetFragment, PilotFragment.Homeworld { - public override val __typename: String + override val __typename: String /** * The name of this planet. */ - public override val name: String? + override val name: String? public companion object { - public fun Homeworld.planetFragment() = this as? PlanetFragment + @Suppress("USELESS_CAST") + public fun Homeworld.planetFragment(): PlanetFragment? = this as? PlanetFragment } } public companion object { - public fun Node.pilotFragment() = this as? PilotFragment + @Suppress("USELESS_CAST") + public fun Node.pilotFragment(): PilotFragment? = this as? PilotFragment } } } diff --git a/libraries/apollo-compiler/src/test/graphql/com/example/nested_named_fragments/kotlin/responseBased/nested_named_fragments/fragment/StarshipFragmentImpl.kt.expected b/libraries/apollo-compiler/src/test/graphql/com/example/nested_named_fragments/kotlin/responseBased/nested_named_fragments/fragment/StarshipFragmentImpl.kt.expected index a89b0b63fab..03456b3b169 100644 --- a/libraries/apollo-compiler/src/test/graphql/com/example/nested_named_fragments/kotlin/responseBased/nested_named_fragments/fragment/StarshipFragmentImpl.kt.expected +++ b/libraries/apollo-compiler/src/test/graphql/com/example/nested_named_fragments/kotlin/responseBased/nested_named_fragments/fragment/StarshipFragmentImpl.kt.expected @@ -17,26 +17,25 @@ import kotlin.Any import kotlin.Boolean import kotlin.Int import kotlin.String -import kotlin.Unit +import kotlin.Suppress import kotlin.collections.List public class StarshipFragmentImpl() : Fragment { - public override fun equals(other: Any?): Boolean = other != null && other::class == this::class + override fun equals(other: Any?): Boolean = other != null && other::class == this::class - public override fun hashCode(): Int = this::class.hashCode() + override fun hashCode(): Int = this::class.hashCode() - public override fun serializeVariables( + override fun serializeVariables( writer: JsonWriter, customScalarAdapters: CustomScalarAdapters, withBooleanDefaultValues: Boolean, - ): Unit { + ) { // This fragment doesn't have any variable } - public override fun adapter(): CompositeAdapter = - StarshipFragmentImpl_ResponseAdapter.Data.obj() + override fun adapter(): CompositeAdapter = StarshipFragmentImpl_ResponseAdapter.Data.obj() - public override fun rootField(): CompiledField = CompiledField.Builder( + override fun rootField(): CompiledField = CompiledField.Builder( name = "data", type = Starship.type ) @@ -47,18 +46,18 @@ public class StarshipFragmentImpl() : Fragment { /** * The ID of an object */ - public override val id: String, + override val id: String, /** * The name of this starship. The common name, such as "Death Star". */ - public override val name: String?, - public override val pilotConnection: PilotConnection?, + override val name: String?, + override val pilotConnection: PilotConnection?, ) : StarshipFragment, Fragment.Data { public data class PilotConnection( /** * A list of edges. */ - public override val edges: List?, + override val edges: List?, ) : StarshipFragment.PilotConnection { public fun edgesFilterNotNull(): List? = edges?.filterNotNull() @@ -66,34 +65,36 @@ public class StarshipFragmentImpl() : Fragment { /** * The item at the end of the edge */ - public override val node: Node?, + override val node: Node?, ) : StarshipFragment.PilotConnection.Edge { public data class Node( - public override val __typename: String, + override val __typename: String, /** * The name of this person. */ - public override val name: String?, + override val name: String?, /** * A planet that this person was born on or inhabits. */ - public override val homeworld: Homeworld?, + override val homeworld: Homeworld?, ) : PilotFragment, StarshipFragment.PilotConnection.Edge.Node { public data class Homeworld( - public override val __typename: String, + override val __typename: String, /** * The name of this planet. */ - public override val name: String?, + override val name: String?, ) : PlanetFragment, PilotFragment.Homeworld, StarshipFragment.PilotConnection.Edge.Node.Homeworld { public companion object { - public fun Homeworld.planetFragment() = this as? PlanetFragment + @Suppress("USELESS_CAST") + public fun Homeworld.planetFragment(): PlanetFragment? = this as? PlanetFragment } } public companion object { - public fun Node.pilotFragment() = this as? PilotFragment + @Suppress("USELESS_CAST") + public fun Node.pilotFragment(): PilotFragment? = this as? PilotFragment } } } diff --git a/libraries/apollo-compiler/src/test/graphql/com/example/nested_named_fragments/kotlin/responseBased/nested_named_fragments/fragment/StarshipFragmentImpl_ResponseAdapter.kt.expected b/libraries/apollo-compiler/src/test/graphql/com/example/nested_named_fragments/kotlin/responseBased/nested_named_fragments/fragment/StarshipFragmentImpl_ResponseAdapter.kt.expected index ff66158e26a..1be0b576361 100644 --- a/libraries/apollo-compiler/src/test/graphql/com/example/nested_named_fragments/kotlin/responseBased/nested_named_fragments/fragment/StarshipFragmentImpl_ResponseAdapter.kt.expected +++ b/libraries/apollo-compiler/src/test/graphql/com/example/nested_named_fragments/kotlin/responseBased/nested_named_fragments/fragment/StarshipFragmentImpl_ResponseAdapter.kt.expected @@ -16,14 +16,13 @@ import com.apollographql.apollo3.api.list import com.apollographql.apollo3.api.nullable import com.apollographql.apollo3.api.obj import kotlin.String -import kotlin.Unit import kotlin.collections.List public object StarshipFragmentImpl_ResponseAdapter { public object Data : CompositeAdapter { public val RESPONSE_NAMES: List = listOf("id", "name", "pilotConnection") - public override fun fromJson(reader: JsonReader, adapterContext: CompositeAdapterContext): + override fun fromJson(reader: JsonReader, adapterContext: CompositeAdapterContext): StarshipFragmentImpl.Data { var _id: String? = null var _name: String? = null @@ -45,11 +44,11 @@ public object StarshipFragmentImpl_ResponseAdapter { ) } - public override fun toJson( + override fun toJson( writer: JsonWriter, `value`: StarshipFragmentImpl.Data, adapterContext: CompositeAdapterContext, - ): Unit { + ) { writer.name("id") StringAdapter.toJson(writer, CustomScalarAdapters.Empty, value.id) @@ -63,7 +62,7 @@ public object StarshipFragmentImpl_ResponseAdapter { private object PilotConnection : CompositeAdapter { public val RESPONSE_NAMES: List = listOf("edges") - public override fun fromJson(reader: JsonReader, adapterContext: CompositeAdapterContext): + override fun fromJson(reader: JsonReader, adapterContext: CompositeAdapterContext): StarshipFragmentImpl.Data.PilotConnection { var _edges: List? = null @@ -79,11 +78,11 @@ public object StarshipFragmentImpl_ResponseAdapter { ) } - public override fun toJson( + override fun toJson( writer: JsonWriter, `value`: StarshipFragmentImpl.Data.PilotConnection, adapterContext: CompositeAdapterContext, - ): Unit { + ) { writer.name("edges") Edge.obj().nullable().list().nullable().toJson(writer, value.edges, adapterContext) } @@ -91,7 +90,7 @@ public object StarshipFragmentImpl_ResponseAdapter { private object Edge : CompositeAdapter { public val RESPONSE_NAMES: List = listOf("node") - public override fun fromJson(reader: JsonReader, adapterContext: CompositeAdapterContext): + override fun fromJson(reader: JsonReader, adapterContext: CompositeAdapterContext): StarshipFragmentImpl.Data.PilotConnection.Edge { var _node: StarshipFragmentImpl.Data.PilotConnection.Edge.Node? = null @@ -107,11 +106,11 @@ public object StarshipFragmentImpl_ResponseAdapter { ) } - public override fun toJson( + override fun toJson( writer: JsonWriter, `value`: StarshipFragmentImpl.Data.PilotConnection.Edge, adapterContext: CompositeAdapterContext, - ): Unit { + ) { writer.name("node") Node.obj().nullable().toJson(writer, value.node, adapterContext) } @@ -120,7 +119,7 @@ public object StarshipFragmentImpl_ResponseAdapter { { public val RESPONSE_NAMES: List = listOf("__typename", "name", "homeworld") - public override fun fromJson(reader: JsonReader, adapterContext: CompositeAdapterContext): + override fun fromJson(reader: JsonReader, adapterContext: CompositeAdapterContext): StarshipFragmentImpl.Data.PilotConnection.Edge.Node { var __typename: String? = null var _name: String? = null @@ -142,11 +141,11 @@ public object StarshipFragmentImpl_ResponseAdapter { ) } - public override fun toJson( + override fun toJson( writer: JsonWriter, `value`: StarshipFragmentImpl.Data.PilotConnection.Edge.Node, adapterContext: CompositeAdapterContext, - ): Unit { + ) { writer.name("__typename") StringAdapter.toJson(writer, CustomScalarAdapters.Empty, value.__typename) @@ -161,8 +160,7 @@ public object StarshipFragmentImpl_ResponseAdapter { CompositeAdapter { public val RESPONSE_NAMES: List = listOf("__typename", "name") - public override fun fromJson(reader: JsonReader, - adapterContext: CompositeAdapterContext): + override fun fromJson(reader: JsonReader, adapterContext: CompositeAdapterContext): StarshipFragmentImpl.Data.PilotConnection.Edge.Node.Homeworld { var __typename: String? = null var _name: String? = null @@ -181,11 +179,11 @@ public object StarshipFragmentImpl_ResponseAdapter { ) } - public override fun toJson( + override fun toJson( writer: JsonWriter, `value`: StarshipFragmentImpl.Data.PilotConnection.Edge.Node.Homeworld, adapterContext: CompositeAdapterContext, - ): Unit { + ) { writer.name("__typename") StringAdapter.toJson(writer, CustomScalarAdapters.Empty, value.__typename) diff --git a/libraries/apollo-compiler/src/test/graphql/com/example/nonnull/kotlin/responseBased/nonnull/TestQuery.kt.expected b/libraries/apollo-compiler/src/test/graphql/com/example/nonnull/kotlin/responseBased/nonnull/TestQuery.kt.expected index ef01f0f811f..83e6296ac87 100644 --- a/libraries/apollo-compiler/src/test/graphql/com/example/nonnull/kotlin/responseBased/nonnull/TestQuery.kt.expected +++ b/libraries/apollo-compiler/src/test/graphql/com/example/nonnull/kotlin/responseBased/nonnull/TestQuery.kt.expected @@ -18,32 +18,32 @@ import kotlin.Any import kotlin.Boolean import kotlin.Int import kotlin.String -import kotlin.Unit +import com.example.nonnull.type.Query as CompiledQuery public class TestQuery() : Query { - public override fun equals(other: Any?): Boolean = other != null && other::class == this::class + override fun equals(other: Any?): Boolean = other != null && other::class == this::class - public override fun hashCode(): Int = this::class.hashCode() + override fun hashCode(): Int = this::class.hashCode() - public override fun id(): String = OPERATION_ID + override fun id(): String = OPERATION_ID - public override fun document(): String = OPERATION_DOCUMENT + override fun document(): String = OPERATION_DOCUMENT - public override fun name(): String = OPERATION_NAME + override fun name(): String = OPERATION_NAME - public override fun serializeVariables( + override fun serializeVariables( writer: JsonWriter, customScalarAdapters: CustomScalarAdapters, withBooleanDefaultValues: Boolean, - ): Unit { + ) { // This operation doesn't have any variable } - public override fun adapter(): CompositeAdapter = TestQuery_ResponseAdapter.Data.obj() + override fun adapter(): CompositeAdapter = TestQuery_ResponseAdapter.Data.obj() - public override fun rootField(): CompiledField = CompiledField.Builder( + override fun rootField(): CompiledField = CompiledField.Builder( name = "data", - type = com.example.nonnull.type.Query.type + type = CompiledQuery.type ) .selections(selections = TestQuerySelections.__root) .build() diff --git a/libraries/apollo-compiler/src/test/graphql/com/example/nonnull/kotlin/responseBased/nonnull/adapter/TestQuery_ResponseAdapter.kt.expected b/libraries/apollo-compiler/src/test/graphql/com/example/nonnull/kotlin/responseBased/nonnull/adapter/TestQuery_ResponseAdapter.kt.expected index ca3db5ab222..d412be8c5d1 100644 --- a/libraries/apollo-compiler/src/test/graphql/com/example/nonnull/kotlin/responseBased/nonnull/adapter/TestQuery_ResponseAdapter.kt.expected +++ b/libraries/apollo-compiler/src/test/graphql/com/example/nonnull/kotlin/responseBased/nonnull/adapter/TestQuery_ResponseAdapter.kt.expected @@ -14,14 +14,13 @@ import com.apollographql.apollo3.api.json.JsonWriter import com.apollographql.apollo3.api.obj import com.example.nonnull.TestQuery import kotlin.String -import kotlin.Unit import kotlin.collections.List public object TestQuery_ResponseAdapter { public object Data : CompositeAdapter { public val RESPONSE_NAMES: List = listOf("hero") - public override fun fromJson(reader: JsonReader, adapterContext: CompositeAdapterContext): + override fun fromJson(reader: JsonReader, adapterContext: CompositeAdapterContext): TestQuery.Data { var _hero: TestQuery.Data.Hero? = null @@ -37,11 +36,11 @@ public object TestQuery_ResponseAdapter { ) } - public override fun toJson( + override fun toJson( writer: JsonWriter, `value`: TestQuery.Data, adapterContext: CompositeAdapterContext, - ): Unit { + ) { writer.name("hero") Hero.obj().toJson(writer, value.hero, adapterContext) } @@ -49,7 +48,7 @@ public object TestQuery_ResponseAdapter { private object Hero : CompositeAdapter { public val RESPONSE_NAMES: List = listOf("name") - public override fun fromJson(reader: JsonReader, adapterContext: CompositeAdapterContext): + override fun fromJson(reader: JsonReader, adapterContext: CompositeAdapterContext): TestQuery.Data.Hero { var _name: String? = null @@ -65,11 +64,11 @@ public object TestQuery_ResponseAdapter { ) } - public override fun toJson( + override fun toJson( writer: JsonWriter, `value`: TestQuery.Data.Hero, adapterContext: CompositeAdapterContext, - ): Unit { + ) { writer.name("name") StringAdapter.toJson(writer, CustomScalarAdapters.Empty, value.name) } diff --git a/libraries/apollo-compiler/src/test/graphql/com/example/not_all_combinations_are_needed/kotlin/operationBased/not_all_combinations_are_needed/TestQuery.kt.expected b/libraries/apollo-compiler/src/test/graphql/com/example/not_all_combinations_are_needed/kotlin/operationBased/not_all_combinations_are_needed/TestQuery.kt.expected index 89728093c17..4ec24b2c8ab 100644 --- a/libraries/apollo-compiler/src/test/graphql/com/example/not_all_combinations_are_needed/kotlin/operationBased/not_all_combinations_are_needed/TestQuery.kt.expected +++ b/libraries/apollo-compiler/src/test/graphql/com/example/not_all_combinations_are_needed/kotlin/operationBased/not_all_combinations_are_needed/TestQuery.kt.expected @@ -19,32 +19,32 @@ import kotlin.Any import kotlin.Boolean import kotlin.Int import kotlin.String -import kotlin.Unit +import com.example.not_all_combinations_are_needed.type.Query as CompiledQuery public class TestQuery() : Query { - public override fun equals(other: Any?): Boolean = other != null && other::class == this::class + override fun equals(other: Any?): Boolean = other != null && other::class == this::class - public override fun hashCode(): Int = this::class.hashCode() + override fun hashCode(): Int = this::class.hashCode() - public override fun id(): String = OPERATION_ID + override fun id(): String = OPERATION_ID - public override fun document(): String = OPERATION_DOCUMENT + override fun document(): String = OPERATION_DOCUMENT - public override fun name(): String = OPERATION_NAME + override fun name(): String = OPERATION_NAME - public override fun serializeVariables( + override fun serializeVariables( writer: JsonWriter, customScalarAdapters: CustomScalarAdapters, withBooleanDefaultValues: Boolean, - ): Unit { + ) { // This operation doesn't have any variable } - public override fun adapter(): CompositeAdapter = TestQuery_ResponseAdapter.Data.obj() + override fun adapter(): CompositeAdapter = TestQuery_ResponseAdapter.Data.obj() - public override fun rootField(): CompiledField = CompiledField.Builder( + override fun rootField(): CompiledField = CompiledField.Builder( name = "data", - type = com.example.not_all_combinations_are_needed.type.Query.type + type = CompiledQuery.type ) .selections(selections = TestQuerySelections.__root) .build() diff --git a/libraries/apollo-compiler/src/test/graphql/com/example/not_all_combinations_are_needed/kotlin/operationBased/not_all_combinations_are_needed/adapter/TestQuery_ResponseAdapter.kt.expected b/libraries/apollo-compiler/src/test/graphql/com/example/not_all_combinations_are_needed/kotlin/operationBased/not_all_combinations_are_needed/adapter/TestQuery_ResponseAdapter.kt.expected index 4e12fe50d6b..462c017997d 100644 --- a/libraries/apollo-compiler/src/test/graphql/com/example/not_all_combinations_are_needed/kotlin/operationBased/not_all_combinations_are_needed/adapter/TestQuery_ResponseAdapter.kt.expected +++ b/libraries/apollo-compiler/src/test/graphql/com/example/not_all_combinations_are_needed/kotlin/operationBased/not_all_combinations_are_needed/adapter/TestQuery_ResponseAdapter.kt.expected @@ -18,14 +18,13 @@ import com.apollographql.apollo3.api.obj import com.apollographql.apollo3.api.possibleTypes import com.example.not_all_combinations_are_needed.TestQuery import kotlin.String -import kotlin.Unit import kotlin.collections.List public object TestQuery_ResponseAdapter { public object Data : CompositeAdapter { public val RESPONSE_NAMES: List = listOf("root") - public override fun fromJson(reader: JsonReader, adapterContext: CompositeAdapterContext): + override fun fromJson(reader: JsonReader, adapterContext: CompositeAdapterContext): TestQuery.Data { var _root: TestQuery.Data.Root? = null @@ -41,11 +40,11 @@ public object TestQuery_ResponseAdapter { ) } - public override fun toJson( + override fun toJson( writer: JsonWriter, `value`: TestQuery.Data, adapterContext: CompositeAdapterContext, - ): Unit { + ) { writer.name("root") Root.obj(true).nullable().toJson(writer, value.root, adapterContext) } @@ -53,7 +52,7 @@ public object TestQuery_ResponseAdapter { private object Root : CompositeAdapter { public val RESPONSE_NAMES: List = listOf("__typename") - public override fun fromJson(reader: JsonReader, adapterContext: CompositeAdapterContext): + override fun fromJson(reader: JsonReader, adapterContext: CompositeAdapterContext): TestQuery.Data.Root { var __typename: String? = null @@ -81,11 +80,11 @@ public object TestQuery_ResponseAdapter { ) } - public override fun toJson( + override fun toJson( writer: JsonWriter, `value`: TestQuery.Data.Root, adapterContext: CompositeAdapterContext, - ): Unit { + ) { writer.name("__typename") StringAdapter.toJson(writer, CustomScalarAdapters.Empty, value.__typename) @@ -98,7 +97,7 @@ public object TestQuery_ResponseAdapter { private object OnA : CompositeAdapter { public val RESPONSE_NAMES: List = listOf("__typename", "fieldA1") - public override fun fromJson(reader: JsonReader, adapterContext: CompositeAdapterContext): + override fun fromJson(reader: JsonReader, adapterContext: CompositeAdapterContext): TestQuery.Data.Root.OnA { var __typename: String? = null var _fieldA1: String? = null @@ -129,11 +128,11 @@ public object TestQuery_ResponseAdapter { ) } - public override fun toJson( + override fun toJson( writer: JsonWriter, `value`: TestQuery.Data.Root.OnA, adapterContext: CompositeAdapterContext, - ): Unit { + ) { writer.name("__typename") StringAdapter.toJson(writer, CustomScalarAdapters.Empty, value.__typename) @@ -149,7 +148,7 @@ public object TestQuery_ResponseAdapter { private object OnB : CompositeAdapter { public val RESPONSE_NAMES: List = listOf("__typename") - public override fun fromJson(reader: JsonReader, adapterContext: CompositeAdapterContext): + override fun fromJson(reader: JsonReader, adapterContext: CompositeAdapterContext): TestQuery.Data.Root.OnA.OnB { var __typename: String? = null @@ -170,11 +169,11 @@ public object TestQuery_ResponseAdapter { ) } - public override fun toJson( + override fun toJson( writer: JsonWriter, `value`: TestQuery.Data.Root.OnA.OnB, adapterContext: CompositeAdapterContext, - ): Unit { + ) { writer.name("__typename") StringAdapter.toJson(writer, CustomScalarAdapters.Empty, value.__typename) diff --git a/libraries/apollo-compiler/src/test/graphql/com/example/not_all_combinations_are_needed/kotlin/operationBased/not_all_combinations_are_needed/fragment/BFragmentImpl.kt.expected b/libraries/apollo-compiler/src/test/graphql/com/example/not_all_combinations_are_needed/kotlin/operationBased/not_all_combinations_are_needed/fragment/BFragmentImpl.kt.expected index 0230b4f8d93..c3b0de73440 100644 --- a/libraries/apollo-compiler/src/test/graphql/com/example/not_all_combinations_are_needed/kotlin/operationBased/not_all_combinations_are_needed/fragment/BFragmentImpl.kt.expected +++ b/libraries/apollo-compiler/src/test/graphql/com/example/not_all_combinations_are_needed/kotlin/operationBased/not_all_combinations_are_needed/fragment/BFragmentImpl.kt.expected @@ -16,25 +16,24 @@ import com.example.not_all_combinations_are_needed.type.B import kotlin.Any import kotlin.Boolean import kotlin.Int -import kotlin.Unit public class BFragmentImpl() : Fragment { - public override fun equals(other: Any?): Boolean = other != null && other::class == this::class + override fun equals(other: Any?): Boolean = other != null && other::class == this::class - public override fun hashCode(): Int = this::class.hashCode() + override fun hashCode(): Int = this::class.hashCode() - public override fun serializeVariables( + override fun serializeVariables( writer: JsonWriter, customScalarAdapters: CustomScalarAdapters, withBooleanDefaultValues: Boolean, - ): Unit { + ) { // This fragment doesn't have any variable } - public override fun adapter(): CompositeAdapter = + override fun adapter(): CompositeAdapter = BFragmentImpl_ResponseAdapter.BFragment.obj() - public override fun rootField(): CompiledField = CompiledField.Builder( + override fun rootField(): CompiledField = CompiledField.Builder( name = "data", type = B.type ) diff --git a/libraries/apollo-compiler/src/test/graphql/com/example/not_all_combinations_are_needed/kotlin/operationBased/not_all_combinations_are_needed/fragment/BFragmentImpl_ResponseAdapter.kt.expected b/libraries/apollo-compiler/src/test/graphql/com/example/not_all_combinations_are_needed/kotlin/operationBased/not_all_combinations_are_needed/fragment/BFragmentImpl_ResponseAdapter.kt.expected index 8bbe4805e61..ed186026c1f 100644 --- a/libraries/apollo-compiler/src/test/graphql/com/example/not_all_combinations_are_needed/kotlin/operationBased/not_all_combinations_are_needed/fragment/BFragmentImpl_ResponseAdapter.kt.expected +++ b/libraries/apollo-compiler/src/test/graphql/com/example/not_all_combinations_are_needed/kotlin/operationBased/not_all_combinations_are_needed/fragment/BFragmentImpl_ResponseAdapter.kt.expected @@ -12,7 +12,6 @@ import com.apollographql.apollo3.api.NullableStringAdapter import com.apollographql.apollo3.api.json.JsonReader import com.apollographql.apollo3.api.json.JsonWriter import kotlin.String -import kotlin.Unit import kotlin.collections.List public object BFragmentImpl_ResponseAdapter { @@ -20,7 +19,7 @@ public object BFragmentImpl_ResponseAdapter { CompositeAdapter { public val RESPONSE_NAMES: List = listOf("fieldB1") - public override fun fromJson(reader: JsonReader, adapterContext: CompositeAdapterContext): + override fun fromJson(reader: JsonReader, adapterContext: CompositeAdapterContext): com.example.not_all_combinations_are_needed.fragment.BFragment { var _fieldB1: String? = null @@ -36,11 +35,11 @@ public object BFragmentImpl_ResponseAdapter { ) } - public override fun toJson( + override fun toJson( writer: JsonWriter, `value`: com.example.not_all_combinations_are_needed.fragment.BFragment, adapterContext: CompositeAdapterContext, - ): Unit { + ) { writer.name("fieldB1") NullableStringAdapter.toJson(writer, CustomScalarAdapters.Empty, value.fieldB1) } diff --git a/libraries/apollo-compiler/src/test/graphql/com/example/not_all_combinations_are_needed/kotlin/responseBased/not_all_combinations_are_needed/TestQuery.kt.expected b/libraries/apollo-compiler/src/test/graphql/com/example/not_all_combinations_are_needed/kotlin/responseBased/not_all_combinations_are_needed/TestQuery.kt.expected index 61de4ea2f0d..155a8130568 100644 --- a/libraries/apollo-compiler/src/test/graphql/com/example/not_all_combinations_are_needed/kotlin/responseBased/not_all_combinations_are_needed/TestQuery.kt.expected +++ b/libraries/apollo-compiler/src/test/graphql/com/example/not_all_combinations_are_needed/kotlin/responseBased/not_all_combinations_are_needed/TestQuery.kt.expected @@ -19,32 +19,33 @@ import kotlin.Any import kotlin.Boolean import kotlin.Int import kotlin.String -import kotlin.Unit +import kotlin.Suppress +import com.example.not_all_combinations_are_needed.type.Query as CompiledQuery public class TestQuery() : Query { - public override fun equals(other: Any?): Boolean = other != null && other::class == this::class + override fun equals(other: Any?): Boolean = other != null && other::class == this::class - public override fun hashCode(): Int = this::class.hashCode() + override fun hashCode(): Int = this::class.hashCode() - public override fun id(): String = OPERATION_ID + override fun id(): String = OPERATION_ID - public override fun document(): String = OPERATION_DOCUMENT + override fun document(): String = OPERATION_DOCUMENT - public override fun name(): String = OPERATION_NAME + override fun name(): String = OPERATION_NAME - public override fun serializeVariables( + override fun serializeVariables( writer: JsonWriter, customScalarAdapters: CustomScalarAdapters, withBooleanDefaultValues: Boolean, - ): Unit { + ) { // This operation doesn't have any variable } - public override fun adapter(): CompositeAdapter = TestQuery_ResponseAdapter.Data.obj() + override fun adapter(): CompositeAdapter = TestQuery_ResponseAdapter.Data.obj() - public override fun rootField(): CompiledField = CompiledField.Builder( + override fun rootField(): CompiledField = CompiledField.Builder( name = "data", - type = com.example.not_all_combinations_are_needed.type.Query.type + type = CompiledQuery.type ) .selections(selections = TestQuerySelections.__root) .build() @@ -54,7 +55,7 @@ public class TestQuery() : Query { public val root: Root?, ) : Query.Data { public sealed interface ARoot : Root { - public override val __typename: String + override val __typename: String public val fieldA1: String? } @@ -63,22 +64,25 @@ public class TestQuery() : Query { public val __typename: String public companion object { - public fun Root.bFragment() = this as? BFragment + @Suppress("USELESS_CAST") + public fun Root.bFragment(): BFragment? = this as? BFragment - public fun Root.asA() = this as? ARoot + @Suppress("USELESS_CAST") + public fun Root.asA(): ARoot? = this as? ARoot - public fun Root.asAB() = this as? ABRoot + @Suppress("USELESS_CAST") + public fun Root.asAB(): ABRoot? = this as? ABRoot } } public data class ABRoot( - public override val __typename: String, - public override val fieldA1: String?, - public override val fieldB1: String?, + override val __typename: String, + override val fieldA1: String?, + override val fieldB1: String?, ) : ARoot, BFragment public data class OtherRoot( - public override val __typename: String, + override val __typename: String, ) : Root } diff --git a/libraries/apollo-compiler/src/test/graphql/com/example/not_all_combinations_are_needed/kotlin/responseBased/not_all_combinations_are_needed/adapter/TestQuery_ResponseAdapter.kt.expected b/libraries/apollo-compiler/src/test/graphql/com/example/not_all_combinations_are_needed/kotlin/responseBased/not_all_combinations_are_needed/adapter/TestQuery_ResponseAdapter.kt.expected index abb5614ba7a..34a706479cf 100644 --- a/libraries/apollo-compiler/src/test/graphql/com/example/not_all_combinations_are_needed/kotlin/responseBased/not_all_combinations_are_needed/adapter/TestQuery_ResponseAdapter.kt.expected +++ b/libraries/apollo-compiler/src/test/graphql/com/example/not_all_combinations_are_needed/kotlin/responseBased/not_all_combinations_are_needed/adapter/TestQuery_ResponseAdapter.kt.expected @@ -18,14 +18,13 @@ import com.apollographql.apollo3.api.obj import com.example.not_all_combinations_are_needed.TestQuery import kotlin.String import kotlin.Suppress -import kotlin.Unit import kotlin.collections.List public object TestQuery_ResponseAdapter { public object Data : CompositeAdapter { public val RESPONSE_NAMES: List = listOf("root") - public override fun fromJson(reader: JsonReader, adapterContext: CompositeAdapterContext): + override fun fromJson(reader: JsonReader, adapterContext: CompositeAdapterContext): TestQuery.Data { var _root: TestQuery.Data.Root? = null @@ -41,17 +40,17 @@ public object TestQuery_ResponseAdapter { ) } - public override fun toJson( + override fun toJson( writer: JsonWriter, `value`: TestQuery.Data, adapterContext: CompositeAdapterContext, - ): Unit { + ) { writer.name("root") Root.obj().nullable().toJson(writer, value.root, adapterContext) } private object Root : CompositeAdapter { - public override fun fromJson(reader: JsonReader, adapterContext: CompositeAdapterContext): + override fun fromJson(reader: JsonReader, adapterContext: CompositeAdapterContext): TestQuery.Data.Root { val __typename = reader.readTypename() return when(__typename) { @@ -62,11 +61,11 @@ public object TestQuery_ResponseAdapter { } } - public override fun toJson( + override fun toJson( writer: JsonWriter, `value`: TestQuery.Data.Root, adapterContext: CompositeAdapterContext, - ): Unit { + ) { when(value) { is TestQuery.Data.ABRoot -> ABRoot.toJson(writer, value, adapterContext) is TestQuery.Data.OtherRoot -> OtherRoot.toJson(writer, value, adapterContext) @@ -106,7 +105,7 @@ public object TestQuery_ResponseAdapter { writer: JsonWriter, `value`: TestQuery.Data.ABRoot, @Suppress("UNUSED_PARAMETER") adapterContext: CompositeAdapterContext, - ): Unit { + ) { writer.name("__typename") StringAdapter.toJson(writer, CustomScalarAdapters.Empty, value.__typename) @@ -144,7 +143,7 @@ public object TestQuery_ResponseAdapter { writer: JsonWriter, `value`: TestQuery.Data.OtherRoot, @Suppress("UNUSED_PARAMETER") adapterContext: CompositeAdapterContext, - ): Unit { + ) { writer.name("__typename") StringAdapter.toJson(writer, CustomScalarAdapters.Empty, value.__typename) } diff --git a/libraries/apollo-compiler/src/test/graphql/com/example/not_all_combinations_are_needed/kotlin/responseBased/not_all_combinations_are_needed/fragment/BFragmentImpl.kt.expected b/libraries/apollo-compiler/src/test/graphql/com/example/not_all_combinations_are_needed/kotlin/responseBased/not_all_combinations_are_needed/fragment/BFragmentImpl.kt.expected index 3cb44da444e..def80a21639 100644 --- a/libraries/apollo-compiler/src/test/graphql/com/example/not_all_combinations_are_needed/kotlin/responseBased/not_all_combinations_are_needed/fragment/BFragmentImpl.kt.expected +++ b/libraries/apollo-compiler/src/test/graphql/com/example/not_all_combinations_are_needed/kotlin/responseBased/not_all_combinations_are_needed/fragment/BFragmentImpl.kt.expected @@ -17,24 +17,23 @@ import kotlin.Any import kotlin.Boolean import kotlin.Int import kotlin.String -import kotlin.Unit public class BFragmentImpl() : Fragment { - public override fun equals(other: Any?): Boolean = other != null && other::class == this::class + override fun equals(other: Any?): Boolean = other != null && other::class == this::class - public override fun hashCode(): Int = this::class.hashCode() + override fun hashCode(): Int = this::class.hashCode() - public override fun serializeVariables( + override fun serializeVariables( writer: JsonWriter, customScalarAdapters: CustomScalarAdapters, withBooleanDefaultValues: Boolean, - ): Unit { + ) { // This fragment doesn't have any variable } - public override fun adapter(): CompositeAdapter = BFragmentImpl_ResponseAdapter.Data.obj() + override fun adapter(): CompositeAdapter = BFragmentImpl_ResponseAdapter.Data.obj() - public override fun rootField(): CompiledField = CompiledField.Builder( + override fun rootField(): CompiledField = CompiledField.Builder( name = "data", type = B.type ) @@ -42,6 +41,6 @@ public class BFragmentImpl() : Fragment { .build() public data class Data( - public override val fieldB1: String?, + override val fieldB1: String?, ) : BFragment, Fragment.Data } diff --git a/libraries/apollo-compiler/src/test/graphql/com/example/not_all_combinations_are_needed/kotlin/responseBased/not_all_combinations_are_needed/fragment/BFragmentImpl_ResponseAdapter.kt.expected b/libraries/apollo-compiler/src/test/graphql/com/example/not_all_combinations_are_needed/kotlin/responseBased/not_all_combinations_are_needed/fragment/BFragmentImpl_ResponseAdapter.kt.expected index a684da861e7..9bd3270d602 100644 --- a/libraries/apollo-compiler/src/test/graphql/com/example/not_all_combinations_are_needed/kotlin/responseBased/not_all_combinations_are_needed/fragment/BFragmentImpl_ResponseAdapter.kt.expected +++ b/libraries/apollo-compiler/src/test/graphql/com/example/not_all_combinations_are_needed/kotlin/responseBased/not_all_combinations_are_needed/fragment/BFragmentImpl_ResponseAdapter.kt.expected @@ -12,14 +12,13 @@ import com.apollographql.apollo3.api.NullableStringAdapter import com.apollographql.apollo3.api.json.JsonReader import com.apollographql.apollo3.api.json.JsonWriter import kotlin.String -import kotlin.Unit import kotlin.collections.List public object BFragmentImpl_ResponseAdapter { public object Data : CompositeAdapter { public val RESPONSE_NAMES: List = listOf("fieldB1") - public override fun fromJson(reader: JsonReader, adapterContext: CompositeAdapterContext): + override fun fromJson(reader: JsonReader, adapterContext: CompositeAdapterContext): BFragmentImpl.Data { var _fieldB1: String? = null @@ -35,11 +34,11 @@ public object BFragmentImpl_ResponseAdapter { ) } - public override fun toJson( + override fun toJson( writer: JsonWriter, `value`: BFragmentImpl.Data, adapterContext: CompositeAdapterContext, - ): Unit { + ) { writer.name("fieldB1") NullableStringAdapter.toJson(writer, CustomScalarAdapters.Empty, value.fieldB1) } diff --git a/libraries/apollo-compiler/src/test/graphql/com/example/operation_id_generator/kotlin/responseBased/operation_id_generator/TestQuery.kt.expected b/libraries/apollo-compiler/src/test/graphql/com/example/operation_id_generator/kotlin/responseBased/operation_id_generator/TestQuery.kt.expected index b100df395cb..625f2e86130 100644 --- a/libraries/apollo-compiler/src/test/graphql/com/example/operation_id_generator/kotlin/responseBased/operation_id_generator/TestQuery.kt.expected +++ b/libraries/apollo-compiler/src/test/graphql/com/example/operation_id_generator/kotlin/responseBased/operation_id_generator/TestQuery.kt.expected @@ -18,32 +18,32 @@ import kotlin.Any import kotlin.Boolean import kotlin.Int import kotlin.String -import kotlin.Unit +import com.example.operation_id_generator.type.Query as CompiledQuery public class TestQuery() : Query { - public override fun equals(other: Any?): Boolean = other != null && other::class == this::class + override fun equals(other: Any?): Boolean = other != null && other::class == this::class - public override fun hashCode(): Int = this::class.hashCode() + override fun hashCode(): Int = this::class.hashCode() - public override fun id(): String = OPERATION_ID + override fun id(): String = OPERATION_ID - public override fun document(): String = OPERATION_DOCUMENT + override fun document(): String = OPERATION_DOCUMENT - public override fun name(): String = OPERATION_NAME + override fun name(): String = OPERATION_NAME - public override fun serializeVariables( + override fun serializeVariables( writer: JsonWriter, customScalarAdapters: CustomScalarAdapters, withBooleanDefaultValues: Boolean, - ): Unit { + ) { // This operation doesn't have any variable } - public override fun adapter(): CompositeAdapter = TestQuery_ResponseAdapter.Data.obj() + override fun adapter(): CompositeAdapter = TestQuery_ResponseAdapter.Data.obj() - public override fun rootField(): CompiledField = CompiledField.Builder( + override fun rootField(): CompiledField = CompiledField.Builder( name = "data", - type = com.example.operation_id_generator.type.Query.type + type = CompiledQuery.type ) .selections(selections = TestQuerySelections.__root) .build() diff --git a/libraries/apollo-compiler/src/test/graphql/com/example/operation_id_generator/kotlin/responseBased/operation_id_generator/adapter/TestQuery_ResponseAdapter.kt.expected b/libraries/apollo-compiler/src/test/graphql/com/example/operation_id_generator/kotlin/responseBased/operation_id_generator/adapter/TestQuery_ResponseAdapter.kt.expected index c2305e41c24..33c2151a71f 100644 --- a/libraries/apollo-compiler/src/test/graphql/com/example/operation_id_generator/kotlin/responseBased/operation_id_generator/adapter/TestQuery_ResponseAdapter.kt.expected +++ b/libraries/apollo-compiler/src/test/graphql/com/example/operation_id_generator/kotlin/responseBased/operation_id_generator/adapter/TestQuery_ResponseAdapter.kt.expected @@ -15,14 +15,13 @@ import com.apollographql.apollo3.api.nullable import com.apollographql.apollo3.api.obj import com.example.operation_id_generator.TestQuery import kotlin.String -import kotlin.Unit import kotlin.collections.List public object TestQuery_ResponseAdapter { public object Data : CompositeAdapter { public val RESPONSE_NAMES: List = listOf("hero") - public override fun fromJson(reader: JsonReader, adapterContext: CompositeAdapterContext): + override fun fromJson(reader: JsonReader, adapterContext: CompositeAdapterContext): TestQuery.Data { var _hero: TestQuery.Data.Hero? = null @@ -38,11 +37,11 @@ public object TestQuery_ResponseAdapter { ) } - public override fun toJson( + override fun toJson( writer: JsonWriter, `value`: TestQuery.Data, adapterContext: CompositeAdapterContext, - ): Unit { + ) { writer.name("hero") Hero.obj().nullable().toJson(writer, value.hero, adapterContext) } @@ -50,7 +49,7 @@ public object TestQuery_ResponseAdapter { private object Hero : CompositeAdapter { public val RESPONSE_NAMES: List = listOf("id", "name") - public override fun fromJson(reader: JsonReader, adapterContext: CompositeAdapterContext): + override fun fromJson(reader: JsonReader, adapterContext: CompositeAdapterContext): TestQuery.Data.Hero { var _id: String? = null var _name: String? = null @@ -69,11 +68,11 @@ public object TestQuery_ResponseAdapter { ) } - public override fun toJson( + override fun toJson( writer: JsonWriter, `value`: TestQuery.Data.Hero, adapterContext: CompositeAdapterContext, - ): Unit { + ) { writer.name("id") StringAdapter.toJson(writer, CustomScalarAdapters.Empty, value.id) diff --git a/libraries/apollo-compiler/src/test/graphql/com/example/operationbased2_ex7/kotlin/operationBased/operationbased2_ex7/TestOperation.kt.expected b/libraries/apollo-compiler/src/test/graphql/com/example/operationbased2_ex7/kotlin/operationBased/operationbased2_ex7/TestOperation.kt.expected index 9769763f562..9027ad51802 100644 --- a/libraries/apollo-compiler/src/test/graphql/com/example/operationbased2_ex7/kotlin/operationBased/operationbased2_ex7/TestOperation.kt.expected +++ b/libraries/apollo-compiler/src/test/graphql/com/example/operationbased2_ex7/kotlin/operationBased/operationbased2_ex7/TestOperation.kt.expected @@ -18,32 +18,32 @@ import kotlin.Any import kotlin.Boolean import kotlin.Int import kotlin.String -import kotlin.Unit +import com.example.operationbased2_ex7.type.Query as CompiledQuery public class TestOperation() : Query { - public override fun equals(other: Any?): Boolean = other != null && other::class == this::class + override fun equals(other: Any?): Boolean = other != null && other::class == this::class - public override fun hashCode(): Int = this::class.hashCode() + override fun hashCode(): Int = this::class.hashCode() - public override fun id(): String = OPERATION_ID + override fun id(): String = OPERATION_ID - public override fun document(): String = OPERATION_DOCUMENT + override fun document(): String = OPERATION_DOCUMENT - public override fun name(): String = OPERATION_NAME + override fun name(): String = OPERATION_NAME - public override fun serializeVariables( + override fun serializeVariables( writer: JsonWriter, customScalarAdapters: CustomScalarAdapters, withBooleanDefaultValues: Boolean, - ): Unit { + ) { // This operation doesn't have any variable } - public override fun adapter(): CompositeAdapter = TestOperation_ResponseAdapter.Data.obj() + override fun adapter(): CompositeAdapter = TestOperation_ResponseAdapter.Data.obj() - public override fun rootField(): CompiledField = CompiledField.Builder( + override fun rootField(): CompiledField = CompiledField.Builder( name = "data", - type = com.example.operationbased2_ex7.type.Query.type + type = CompiledQuery.type ) .selections(selections = TestOperationSelections.__root) .build() diff --git a/libraries/apollo-compiler/src/test/graphql/com/example/operationbased2_ex7/kotlin/operationBased/operationbased2_ex7/adapter/TestOperation_ResponseAdapter.kt.expected b/libraries/apollo-compiler/src/test/graphql/com/example/operationbased2_ex7/kotlin/operationBased/operationbased2_ex7/adapter/TestOperation_ResponseAdapter.kt.expected index 2dd405cfdc7..5242a027abf 100644 --- a/libraries/apollo-compiler/src/test/graphql/com/example/operationbased2_ex7/kotlin/operationBased/operationbased2_ex7/adapter/TestOperation_ResponseAdapter.kt.expected +++ b/libraries/apollo-compiler/src/test/graphql/com/example/operationbased2_ex7/kotlin/operationBased/operationbased2_ex7/adapter/TestOperation_ResponseAdapter.kt.expected @@ -19,14 +19,13 @@ import com.apollographql.apollo3.api.possibleTypes import com.example.operationbased2_ex7.TestOperation import kotlin.Int import kotlin.String -import kotlin.Unit import kotlin.collections.List public object TestOperation_ResponseAdapter { public object Data : CompositeAdapter { public val RESPONSE_NAMES: List = listOf("animal") - public override fun fromJson(reader: JsonReader, adapterContext: CompositeAdapterContext): + override fun fromJson(reader: JsonReader, adapterContext: CompositeAdapterContext): TestOperation.Data { var _animal: TestOperation.Data.Animal? = null @@ -42,11 +41,11 @@ public object TestOperation_ResponseAdapter { ) } - public override fun toJson( + override fun toJson( writer: JsonWriter, `value`: TestOperation.Data, adapterContext: CompositeAdapterContext, - ): Unit { + ) { writer.name("animal") Animal.obj(true).nullable().toJson(writer, value.animal, adapterContext) } @@ -54,7 +53,7 @@ public object TestOperation_ResponseAdapter { private object Animal : CompositeAdapter { public val RESPONSE_NAMES: List = listOf("__typename") - public override fun fromJson(reader: JsonReader, adapterContext: CompositeAdapterContext): + override fun fromJson(reader: JsonReader, adapterContext: CompositeAdapterContext): TestOperation.Data.Animal { var __typename: String? = null @@ -75,11 +74,11 @@ public object TestOperation_ResponseAdapter { ) } - public override fun toJson( + override fun toJson( writer: JsonWriter, `value`: TestOperation.Data.Animal, adapterContext: CompositeAdapterContext, - ): Unit { + ) { writer.name("__typename") StringAdapter.toJson(writer, CustomScalarAdapters.Empty, value.__typename) @@ -90,7 +89,7 @@ public object TestOperation_ResponseAdapter { private object OnAnimal : CompositeAdapter { public val RESPONSE_NAMES: List = listOf("__typename", "species") - public override fun fromJson(reader: JsonReader, adapterContext: CompositeAdapterContext): + override fun fromJson(reader: JsonReader, adapterContext: CompositeAdapterContext): TestOperation.Data.Animal.OnAnimal { var __typename: String? = null var _species: String? = null @@ -129,11 +128,11 @@ public object TestOperation_ResponseAdapter { ) } - public override fun toJson( + override fun toJson( writer: JsonWriter, `value`: TestOperation.Data.Animal.OnAnimal, adapterContext: CompositeAdapterContext, - ): Unit { + ) { writer.name("__typename") StringAdapter.toJson(writer, CustomScalarAdapters.Empty, value.__typename) @@ -155,7 +154,7 @@ public object TestOperation_ResponseAdapter { CompositeAdapter { public val RESPONSE_NAMES: List = listOf("temperature") - public override fun fromJson(reader: JsonReader, adapterContext: CompositeAdapterContext): + override fun fromJson(reader: JsonReader, adapterContext: CompositeAdapterContext): TestOperation.Data.Animal.OnAnimal.OnWarmBlooded { var _temperature: Int? = null @@ -171,11 +170,11 @@ public object TestOperation_ResponseAdapter { ) } - public override fun toJson( + override fun toJson( writer: JsonWriter, `value`: TestOperation.Data.Animal.OnAnimal.OnWarmBlooded, adapterContext: CompositeAdapterContext, - ): Unit { + ) { writer.name("temperature") IntAdapter.toJson(writer, CustomScalarAdapters.Empty, value.temperature) } @@ -184,7 +183,7 @@ public object TestOperation_ResponseAdapter { private object OnPet : CompositeAdapter { public val RESPONSE_NAMES: List = listOf("name") - public override fun fromJson(reader: JsonReader, adapterContext: CompositeAdapterContext): + override fun fromJson(reader: JsonReader, adapterContext: CompositeAdapterContext): TestOperation.Data.Animal.OnAnimal.OnPet { var _name: String? = null @@ -200,11 +199,11 @@ public object TestOperation_ResponseAdapter { ) } - public override fun toJson( + override fun toJson( writer: JsonWriter, `value`: TestOperation.Data.Animal.OnAnimal.OnPet, adapterContext: CompositeAdapterContext, - ): Unit { + ) { writer.name("name") StringAdapter.toJson(writer, CustomScalarAdapters.Empty, value.name) } diff --git a/libraries/apollo-compiler/src/test/graphql/com/example/operationbased2_ex7/kotlin/responseBased/operationbased2_ex7/TestOperation.kt.expected b/libraries/apollo-compiler/src/test/graphql/com/example/operationbased2_ex7/kotlin/responseBased/operationbased2_ex7/TestOperation.kt.expected index e332a4474b5..4499a77312e 100644 --- a/libraries/apollo-compiler/src/test/graphql/com/example/operationbased2_ex7/kotlin/responseBased/operationbased2_ex7/TestOperation.kt.expected +++ b/libraries/apollo-compiler/src/test/graphql/com/example/operationbased2_ex7/kotlin/responseBased/operationbased2_ex7/TestOperation.kt.expected @@ -18,32 +18,33 @@ import kotlin.Any import kotlin.Boolean import kotlin.Int import kotlin.String -import kotlin.Unit +import kotlin.Suppress +import com.example.operationbased2_ex7.type.Query as CompiledQuery public class TestOperation() : Query { - public override fun equals(other: Any?): Boolean = other != null && other::class == this::class + override fun equals(other: Any?): Boolean = other != null && other::class == this::class - public override fun hashCode(): Int = this::class.hashCode() + override fun hashCode(): Int = this::class.hashCode() - public override fun id(): String = OPERATION_ID + override fun id(): String = OPERATION_ID - public override fun document(): String = OPERATION_DOCUMENT + override fun document(): String = OPERATION_DOCUMENT - public override fun name(): String = OPERATION_NAME + override fun name(): String = OPERATION_NAME - public override fun serializeVariables( + override fun serializeVariables( writer: JsonWriter, customScalarAdapters: CustomScalarAdapters, withBooleanDefaultValues: Boolean, - ): Unit { + ) { // This operation doesn't have any variable } - public override fun adapter(): CompositeAdapter = TestOperation_ResponseAdapter.Data.obj() + override fun adapter(): CompositeAdapter = TestOperation_ResponseAdapter.Data.obj() - public override fun rootField(): CompiledField = CompiledField.Builder( + override fun rootField(): CompiledField = CompiledField.Builder( name = "data", - type = com.example.operationbased2_ex7.type.Query.type + type = CompiledQuery.type ) .selections(selections = TestOperationSelections.__root) .build() @@ -58,52 +59,55 @@ public class TestOperation() : Query { public val species: String public companion object { - public fun Animal.asWarmBlooded() = this as? WarmBloodedAnimal + @Suppress("USELESS_CAST") + public fun Animal.asWarmBlooded(): WarmBloodedAnimal? = this as? WarmBloodedAnimal - public fun Animal.asPet() = this as? PetAnimal + @Suppress("USELESS_CAST") + public fun Animal.asPet(): PetAnimal? = this as? PetAnimal - public fun Animal.asWarmBloodedPet() = this as? PetWarmBloodedAnimal + @Suppress("USELESS_CAST") + public fun Animal.asWarmBloodedPet(): PetWarmBloodedAnimal? = this as? PetWarmBloodedAnimal } } public sealed interface WarmBloodedAnimal : Animal { - public override val __typename: String + override val __typename: String - public override val species: String + override val species: String public val temperature: Int } public sealed interface PetAnimal : Animal { - public override val __typename: String + override val __typename: String - public override val species: String + override val species: String public val name: String } public data class PetWarmBloodedAnimal( - public override val __typename: String, - public override val species: String, - public override val temperature: Int, - public override val name: String, + override val __typename: String, + override val species: String, + override val temperature: Int, + override val name: String, ) : WarmBloodedAnimal, PetAnimal public data class OtherAnimal( - public override val __typename: String, - public override val species: String, + override val __typename: String, + override val species: String, ) : Animal public data class OtherWarmBloodedAnimal( - public override val __typename: String, - public override val species: String, - public override val temperature: Int, + override val __typename: String, + override val species: String, + override val temperature: Int, ) : WarmBloodedAnimal public data class OtherPetAnimal( - public override val __typename: String, - public override val species: String, - public override val name: String, + override val __typename: String, + override val species: String, + override val name: String, ) : PetAnimal } diff --git a/libraries/apollo-compiler/src/test/graphql/com/example/operationbased2_ex7/kotlin/responseBased/operationbased2_ex7/adapter/TestOperation_ResponseAdapter.kt.expected b/libraries/apollo-compiler/src/test/graphql/com/example/operationbased2_ex7/kotlin/responseBased/operationbased2_ex7/adapter/TestOperation_ResponseAdapter.kt.expected index 49395265bd5..d79462e2ef5 100644 --- a/libraries/apollo-compiler/src/test/graphql/com/example/operationbased2_ex7/kotlin/responseBased/operationbased2_ex7/adapter/TestOperation_ResponseAdapter.kt.expected +++ b/libraries/apollo-compiler/src/test/graphql/com/example/operationbased2_ex7/kotlin/responseBased/operationbased2_ex7/adapter/TestOperation_ResponseAdapter.kt.expected @@ -19,14 +19,13 @@ import com.example.operationbased2_ex7.TestOperation import kotlin.Int import kotlin.String import kotlin.Suppress -import kotlin.Unit import kotlin.collections.List public object TestOperation_ResponseAdapter { public object Data : CompositeAdapter { public val RESPONSE_NAMES: List = listOf("animal") - public override fun fromJson(reader: JsonReader, adapterContext: CompositeAdapterContext): + override fun fromJson(reader: JsonReader, adapterContext: CompositeAdapterContext): TestOperation.Data { var _animal: TestOperation.Data.Animal? = null @@ -42,17 +41,17 @@ public object TestOperation_ResponseAdapter { ) } - public override fun toJson( + override fun toJson( writer: JsonWriter, `value`: TestOperation.Data, adapterContext: CompositeAdapterContext, - ): Unit { + ) { writer.name("animal") Animal.obj().nullable().toJson(writer, value.animal, adapterContext) } private object Animal : CompositeAdapter { - public override fun fromJson(reader: JsonReader, adapterContext: CompositeAdapterContext): + override fun fromJson(reader: JsonReader, adapterContext: CompositeAdapterContext): TestOperation.Data.Animal { val __typename = reader.readTypename() return when(__typename) { @@ -68,11 +67,11 @@ public object TestOperation_ResponseAdapter { } } - public override fun toJson( + override fun toJson( writer: JsonWriter, `value`: TestOperation.Data.Animal, adapterContext: CompositeAdapterContext, - ): Unit { + ) { when(value) { is TestOperation.Data.PetWarmBloodedAnimal -> PetWarmBloodedAnimal.toJson(writer, value, adapterContext) @@ -121,7 +120,7 @@ public object TestOperation_ResponseAdapter { writer: JsonWriter, `value`: TestOperation.Data.PetWarmBloodedAnimal, @Suppress("UNUSED_PARAMETER") adapterContext: CompositeAdapterContext, - ): Unit { + ) { writer.name("__typename") StringAdapter.toJson(writer, CustomScalarAdapters.Empty, value.__typename) @@ -165,7 +164,7 @@ public object TestOperation_ResponseAdapter { writer: JsonWriter, `value`: TestOperation.Data.OtherAnimal, @Suppress("UNUSED_PARAMETER") adapterContext: CompositeAdapterContext, - ): Unit { + ) { writer.name("__typename") StringAdapter.toJson(writer, CustomScalarAdapters.Empty, value.__typename) @@ -206,7 +205,7 @@ public object TestOperation_ResponseAdapter { writer: JsonWriter, `value`: TestOperation.Data.OtherWarmBloodedAnimal, @Suppress("UNUSED_PARAMETER") adapterContext: CompositeAdapterContext, - ): Unit { + ) { writer.name("__typename") StringAdapter.toJson(writer, CustomScalarAdapters.Empty, value.__typename) @@ -250,7 +249,7 @@ public object TestOperation_ResponseAdapter { writer: JsonWriter, `value`: TestOperation.Data.OtherPetAnimal, @Suppress("UNUSED_PARAMETER") adapterContext: CompositeAdapterContext, - ): Unit { + ) { writer.name("__typename") StringAdapter.toJson(writer, CustomScalarAdapters.Empty, value.__typename) diff --git a/libraries/apollo-compiler/src/test/graphql/com/example/operationbased2_ex8/kotlin/operationBased/operationbased2_ex8/TestOperation.kt.expected b/libraries/apollo-compiler/src/test/graphql/com/example/operationbased2_ex8/kotlin/operationBased/operationbased2_ex8/TestOperation.kt.expected index c75835abdf2..58787b5e467 100644 --- a/libraries/apollo-compiler/src/test/graphql/com/example/operationbased2_ex8/kotlin/operationBased/operationbased2_ex8/TestOperation.kt.expected +++ b/libraries/apollo-compiler/src/test/graphql/com/example/operationbased2_ex8/kotlin/operationBased/operationbased2_ex8/TestOperation.kt.expected @@ -19,32 +19,32 @@ import kotlin.Any import kotlin.Boolean import kotlin.Int import kotlin.String -import kotlin.Unit +import com.example.operationbased2_ex8.type.Query as CompiledQuery public class TestOperation() : Query { - public override fun equals(other: Any?): Boolean = other != null && other::class == this::class + override fun equals(other: Any?): Boolean = other != null && other::class == this::class - public override fun hashCode(): Int = this::class.hashCode() + override fun hashCode(): Int = this::class.hashCode() - public override fun id(): String = OPERATION_ID + override fun id(): String = OPERATION_ID - public override fun document(): String = OPERATION_DOCUMENT + override fun document(): String = OPERATION_DOCUMENT - public override fun name(): String = OPERATION_NAME + override fun name(): String = OPERATION_NAME - public override fun serializeVariables( + override fun serializeVariables( writer: JsonWriter, customScalarAdapters: CustomScalarAdapters, withBooleanDefaultValues: Boolean, - ): Unit { + ) { // This operation doesn't have any variable } - public override fun adapter(): CompositeAdapter = TestOperation_ResponseAdapter.Data.obj() + override fun adapter(): CompositeAdapter = TestOperation_ResponseAdapter.Data.obj() - public override fun rootField(): CompiledField = CompiledField.Builder( + override fun rootField(): CompiledField = CompiledField.Builder( name = "data", - type = com.example.operationbased2_ex8.type.Query.type + type = CompiledQuery.type ) .selections(selections = TestOperationSelections.__root) .build() diff --git a/libraries/apollo-compiler/src/test/graphql/com/example/operationbased2_ex8/kotlin/operationBased/operationbased2_ex8/adapter/TestOperation_ResponseAdapter.kt.expected b/libraries/apollo-compiler/src/test/graphql/com/example/operationbased2_ex8/kotlin/operationBased/operationbased2_ex8/adapter/TestOperation_ResponseAdapter.kt.expected index 0ba3321f307..c8188501efb 100644 --- a/libraries/apollo-compiler/src/test/graphql/com/example/operationbased2_ex8/kotlin/operationBased/operationbased2_ex8/adapter/TestOperation_ResponseAdapter.kt.expected +++ b/libraries/apollo-compiler/src/test/graphql/com/example/operationbased2_ex8/kotlin/operationBased/operationbased2_ex8/adapter/TestOperation_ResponseAdapter.kt.expected @@ -15,14 +15,13 @@ import com.apollographql.apollo3.api.nullable import com.apollographql.apollo3.api.obj import com.example.operationbased2_ex8.TestOperation import kotlin.String -import kotlin.Unit import kotlin.collections.List public object TestOperation_ResponseAdapter { public object Data : CompositeAdapter { public val RESPONSE_NAMES: List = listOf("animal") - public override fun fromJson(reader: JsonReader, adapterContext: CompositeAdapterContext): + override fun fromJson(reader: JsonReader, adapterContext: CompositeAdapterContext): TestOperation.Data { var _animal: TestOperation.Data.Animal? = null @@ -38,11 +37,11 @@ public object TestOperation_ResponseAdapter { ) } - public override fun toJson( + override fun toJson( writer: JsonWriter, `value`: TestOperation.Data, adapterContext: CompositeAdapterContext, - ): Unit { + ) { writer.name("animal") Animal.obj(true).nullable().toJson(writer, value.animal, adapterContext) } @@ -50,7 +49,7 @@ public object TestOperation_ResponseAdapter { private object Animal : CompositeAdapter { public val RESPONSE_NAMES: List = listOf("__typename") - public override fun fromJson(reader: JsonReader, adapterContext: CompositeAdapterContext): + override fun fromJson(reader: JsonReader, adapterContext: CompositeAdapterContext): TestOperation.Data.Animal { var __typename: String? = null @@ -71,11 +70,11 @@ public object TestOperation_ResponseAdapter { ) } - public override fun toJson( + override fun toJson( writer: JsonWriter, `value`: TestOperation.Data.Animal, adapterContext: CompositeAdapterContext, - ): Unit { + ) { writer.name("__typename") StringAdapter.toJson(writer, CustomScalarAdapters.Empty, value.__typename) diff --git a/libraries/apollo-compiler/src/test/graphql/com/example/operationbased2_ex8/kotlin/operationBased/operationbased2_ex8/fragment/AnimalFragmentImpl.kt.expected b/libraries/apollo-compiler/src/test/graphql/com/example/operationbased2_ex8/kotlin/operationBased/operationbased2_ex8/fragment/AnimalFragmentImpl.kt.expected index b04ba15c380..7086fbddf02 100644 --- a/libraries/apollo-compiler/src/test/graphql/com/example/operationbased2_ex8/kotlin/operationBased/operationbased2_ex8/fragment/AnimalFragmentImpl.kt.expected +++ b/libraries/apollo-compiler/src/test/graphql/com/example/operationbased2_ex8/kotlin/operationBased/operationbased2_ex8/fragment/AnimalFragmentImpl.kt.expected @@ -16,25 +16,24 @@ import com.example.operationbased2_ex8.type.Animal import kotlin.Any import kotlin.Boolean import kotlin.Int -import kotlin.Unit public class AnimalFragmentImpl() : Fragment { - public override fun equals(other: Any?): Boolean = other != null && other::class == this::class + override fun equals(other: Any?): Boolean = other != null && other::class == this::class - public override fun hashCode(): Int = this::class.hashCode() + override fun hashCode(): Int = this::class.hashCode() - public override fun serializeVariables( + override fun serializeVariables( writer: JsonWriter, customScalarAdapters: CustomScalarAdapters, withBooleanDefaultValues: Boolean, - ): Unit { + ) { // This fragment doesn't have any variable } - public override fun adapter(): CompositeAdapter = + override fun adapter(): CompositeAdapter = AnimalFragmentImpl_ResponseAdapter.AnimalFragment.obj() - public override fun rootField(): CompiledField = CompiledField.Builder( + override fun rootField(): CompiledField = CompiledField.Builder( name = "data", type = Animal.type ) diff --git a/libraries/apollo-compiler/src/test/graphql/com/example/operationbased2_ex8/kotlin/operationBased/operationbased2_ex8/fragment/AnimalFragmentImpl_ResponseAdapter.kt.expected b/libraries/apollo-compiler/src/test/graphql/com/example/operationbased2_ex8/kotlin/operationBased/operationbased2_ex8/fragment/AnimalFragmentImpl_ResponseAdapter.kt.expected index e169dc65d3c..83f919bee85 100644 --- a/libraries/apollo-compiler/src/test/graphql/com/example/operationbased2_ex8/kotlin/operationBased/operationbased2_ex8/fragment/AnimalFragmentImpl_ResponseAdapter.kt.expected +++ b/libraries/apollo-compiler/src/test/graphql/com/example/operationbased2_ex8/kotlin/operationBased/operationbased2_ex8/fragment/AnimalFragmentImpl_ResponseAdapter.kt.expected @@ -17,7 +17,6 @@ import com.apollographql.apollo3.api.obj import com.apollographql.apollo3.api.possibleTypes import kotlin.Int import kotlin.String -import kotlin.Unit import kotlin.collections.List public object AnimalFragmentImpl_ResponseAdapter { @@ -25,7 +24,7 @@ public object AnimalFragmentImpl_ResponseAdapter { CompositeAdapter { public val RESPONSE_NAMES: List = listOf("species", "parent") - public override fun fromJson(reader: JsonReader, adapterContext: CompositeAdapterContext): + override fun fromJson(reader: JsonReader, adapterContext: CompositeAdapterContext): com.example.operationbased2_ex8.fragment.AnimalFragment { var _species: String? = null var _parent: com.example.operationbased2_ex8.fragment.AnimalFragment.Parent? = null @@ -44,11 +43,11 @@ public object AnimalFragmentImpl_ResponseAdapter { ) } - public override fun toJson( + override fun toJson( writer: JsonWriter, `value`: com.example.operationbased2_ex8.fragment.AnimalFragment, adapterContext: CompositeAdapterContext, - ): Unit { + ) { writer.name("species") StringAdapter.toJson(writer, CustomScalarAdapters.Empty, value.species) @@ -60,7 +59,7 @@ public object AnimalFragmentImpl_ResponseAdapter { CompositeAdapter { public val RESPONSE_NAMES: List = listOf("__typename", "species") - public override fun fromJson(reader: JsonReader, adapterContext: CompositeAdapterContext): + override fun fromJson(reader: JsonReader, adapterContext: CompositeAdapterContext): com.example.operationbased2_ex8.fragment.AnimalFragment.Parent { var __typename: String? = null var _species: String? = null @@ -99,11 +98,11 @@ public object AnimalFragmentImpl_ResponseAdapter { ) } - public override fun toJson( + override fun toJson( writer: JsonWriter, `value`: com.example.operationbased2_ex8.fragment.AnimalFragment.Parent, adapterContext: CompositeAdapterContext, - ): Unit { + ) { writer.name("__typename") StringAdapter.toJson(writer, CustomScalarAdapters.Empty, value.__typename) @@ -125,7 +124,7 @@ public object AnimalFragmentImpl_ResponseAdapter { CompositeAdapter { public val RESPONSE_NAMES: List = listOf("temperature") - public override fun fromJson(reader: JsonReader, adapterContext: CompositeAdapterContext): + override fun fromJson(reader: JsonReader, adapterContext: CompositeAdapterContext): com.example.operationbased2_ex8.fragment.AnimalFragment.Parent.OnLion { var _temperature: Int? = null @@ -141,11 +140,11 @@ public object AnimalFragmentImpl_ResponseAdapter { ) } - public override fun toJson( + override fun toJson( writer: JsonWriter, `value`: com.example.operationbased2_ex8.fragment.AnimalFragment.Parent.OnLion, adapterContext: CompositeAdapterContext, - ): Unit { + ) { writer.name("temperature") IntAdapter.toJson(writer, CustomScalarAdapters.Empty, value.temperature) } @@ -155,7 +154,7 @@ public object AnimalFragmentImpl_ResponseAdapter { CompositeAdapter { public val RESPONSE_NAMES: List = listOf("name") - public override fun fromJson(reader: JsonReader, adapterContext: CompositeAdapterContext): + override fun fromJson(reader: JsonReader, adapterContext: CompositeAdapterContext): com.example.operationbased2_ex8.fragment.AnimalFragment.Parent.OnCat { var _name: String? = null @@ -171,11 +170,11 @@ public object AnimalFragmentImpl_ResponseAdapter { ) } - public override fun toJson( + override fun toJson( writer: JsonWriter, `value`: com.example.operationbased2_ex8.fragment.AnimalFragment.Parent.OnCat, adapterContext: CompositeAdapterContext, - ): Unit { + ) { writer.name("name") StringAdapter.toJson(writer, CustomScalarAdapters.Empty, value.name) } diff --git a/libraries/apollo-compiler/src/test/graphql/com/example/operationbased2_ex8/kotlin/responseBased/operationbased2_ex8/TestOperation.kt.expected b/libraries/apollo-compiler/src/test/graphql/com/example/operationbased2_ex8/kotlin/responseBased/operationbased2_ex8/TestOperation.kt.expected index 4a66b02b1ca..d50ab321b6a 100644 --- a/libraries/apollo-compiler/src/test/graphql/com/example/operationbased2_ex8/kotlin/responseBased/operationbased2_ex8/TestOperation.kt.expected +++ b/libraries/apollo-compiler/src/test/graphql/com/example/operationbased2_ex8/kotlin/responseBased/operationbased2_ex8/TestOperation.kt.expected @@ -19,32 +19,33 @@ import kotlin.Any import kotlin.Boolean import kotlin.Int import kotlin.String -import kotlin.Unit +import kotlin.Suppress +import com.example.operationbased2_ex8.type.Query as CompiledQuery public class TestOperation() : Query { - public override fun equals(other: Any?): Boolean = other != null && other::class == this::class + override fun equals(other: Any?): Boolean = other != null && other::class == this::class - public override fun hashCode(): Int = this::class.hashCode() + override fun hashCode(): Int = this::class.hashCode() - public override fun id(): String = OPERATION_ID + override fun id(): String = OPERATION_ID - public override fun document(): String = OPERATION_DOCUMENT + override fun document(): String = OPERATION_DOCUMENT - public override fun name(): String = OPERATION_NAME + override fun name(): String = OPERATION_NAME - public override fun serializeVariables( + override fun serializeVariables( writer: JsonWriter, customScalarAdapters: CustomScalarAdapters, withBooleanDefaultValues: Boolean, - ): Unit { + ) { // This operation doesn't have any variable } - public override fun adapter(): CompositeAdapter = TestOperation_ResponseAdapter.Data.obj() + override fun adapter(): CompositeAdapter = TestOperation_ResponseAdapter.Data.obj() - public override fun rootField(): CompiledField = CompiledField.Builder( + override fun rootField(): CompiledField = CompiledField.Builder( name = "data", - type = com.example.operationbased2_ex8.type.Query.type + type = CompiledQuery.type ) .selections(selections = TestOperationSelections.__root) .build() @@ -55,40 +56,43 @@ public class TestOperation() : Query { ) : Query.Data { public data class Animal( public val __typename: String, - public override val species: String, - public override val parent: Parent, + override val species: String, + override val parent: Parent, ) : AnimalFragment { public sealed interface Parent : AnimalFragment.Parent { - public override val __typename: String + override val __typename: String - public override val species: String + override val species: String public companion object { - public fun Parent.asLion() = this as? LionParent + @Suppress("USELESS_CAST") + public fun Parent.asLion(): LionParent? = this as? LionParent - public fun Parent.asCat() = this as? CatParent + @Suppress("USELESS_CAST") + public fun Parent.asCat(): CatParent? = this as? CatParent } } public data class LionParent( - public override val __typename: String, - public override val species: String, - public override val temperature: Int, + override val __typename: String, + override val species: String, + override val temperature: Int, ) : Parent, AnimalFragment.LionParent public data class CatParent( - public override val __typename: String, - public override val species: String, - public override val name: String, + override val __typename: String, + override val species: String, + override val name: String, ) : Parent, AnimalFragment.CatParent public data class OtherParent( - public override val __typename: String, - public override val species: String, + override val __typename: String, + override val species: String, ) : Parent, AnimalFragment.Parent public companion object { - public fun Animal.animalFragment() = this as? AnimalFragment + @Suppress("USELESS_CAST") + public fun Animal.animalFragment(): AnimalFragment? = this as? AnimalFragment } } } diff --git a/libraries/apollo-compiler/src/test/graphql/com/example/operationbased2_ex8/kotlin/responseBased/operationbased2_ex8/adapter/TestOperation_ResponseAdapter.kt.expected b/libraries/apollo-compiler/src/test/graphql/com/example/operationbased2_ex8/kotlin/responseBased/operationbased2_ex8/adapter/TestOperation_ResponseAdapter.kt.expected index 8a779845c0d..4a42814c78b 100644 --- a/libraries/apollo-compiler/src/test/graphql/com/example/operationbased2_ex8/kotlin/responseBased/operationbased2_ex8/adapter/TestOperation_ResponseAdapter.kt.expected +++ b/libraries/apollo-compiler/src/test/graphql/com/example/operationbased2_ex8/kotlin/responseBased/operationbased2_ex8/adapter/TestOperation_ResponseAdapter.kt.expected @@ -19,14 +19,13 @@ import com.example.operationbased2_ex8.TestOperation import kotlin.Int import kotlin.String import kotlin.Suppress -import kotlin.Unit import kotlin.collections.List public object TestOperation_ResponseAdapter { public object Data : CompositeAdapter { public val RESPONSE_NAMES: List = listOf("animal") - public override fun fromJson(reader: JsonReader, adapterContext: CompositeAdapterContext): + override fun fromJson(reader: JsonReader, adapterContext: CompositeAdapterContext): TestOperation.Data { var _animal: TestOperation.Data.Animal? = null @@ -42,11 +41,11 @@ public object TestOperation_ResponseAdapter { ) } - public override fun toJson( + override fun toJson( writer: JsonWriter, `value`: TestOperation.Data, adapterContext: CompositeAdapterContext, - ): Unit { + ) { writer.name("animal") Animal.obj().nullable().toJson(writer, value.animal, adapterContext) } @@ -54,7 +53,7 @@ public object TestOperation_ResponseAdapter { private object Animal : CompositeAdapter { public val RESPONSE_NAMES: List = listOf("__typename", "species", "parent") - public override fun fromJson(reader: JsonReader, adapterContext: CompositeAdapterContext): + override fun fromJson(reader: JsonReader, adapterContext: CompositeAdapterContext): TestOperation.Data.Animal { var __typename: String? = null var _species: String? = null @@ -76,11 +75,11 @@ public object TestOperation_ResponseAdapter { ) } - public override fun toJson( + override fun toJson( writer: JsonWriter, `value`: TestOperation.Data.Animal, adapterContext: CompositeAdapterContext, - ): Unit { + ) { writer.name("__typename") StringAdapter.toJson(writer, CustomScalarAdapters.Empty, value.__typename) @@ -92,7 +91,7 @@ public object TestOperation_ResponseAdapter { } private object Parent : CompositeAdapter { - public override fun fromJson(reader: JsonReader, adapterContext: CompositeAdapterContext): + override fun fromJson(reader: JsonReader, adapterContext: CompositeAdapterContext): TestOperation.Data.Animal.Parent { val __typename = reader.readTypename() return when(__typename) { @@ -105,11 +104,11 @@ public object TestOperation_ResponseAdapter { } } - public override fun toJson( + override fun toJson( writer: JsonWriter, `value`: TestOperation.Data.Animal.Parent, adapterContext: CompositeAdapterContext, - ): Unit { + ) { when(value) { is TestOperation.Data.Animal.LionParent -> LionParent.toJson(writer, value, adapterContext) @@ -153,7 +152,7 @@ public object TestOperation_ResponseAdapter { writer: JsonWriter, `value`: TestOperation.Data.Animal.LionParent, @Suppress("UNUSED_PARAMETER") adapterContext: CompositeAdapterContext, - ): Unit { + ) { writer.name("__typename") StringAdapter.toJson(writer, CustomScalarAdapters.Empty, value.__typename) @@ -197,7 +196,7 @@ public object TestOperation_ResponseAdapter { writer: JsonWriter, `value`: TestOperation.Data.Animal.CatParent, @Suppress("UNUSED_PARAMETER") adapterContext: CompositeAdapterContext, - ): Unit { + ) { writer.name("__typename") StringAdapter.toJson(writer, CustomScalarAdapters.Empty, value.__typename) @@ -238,7 +237,7 @@ public object TestOperation_ResponseAdapter { writer: JsonWriter, `value`: TestOperation.Data.Animal.OtherParent, @Suppress("UNUSED_PARAMETER") adapterContext: CompositeAdapterContext, - ): Unit { + ) { writer.name("__typename") StringAdapter.toJson(writer, CustomScalarAdapters.Empty, value.__typename) diff --git a/libraries/apollo-compiler/src/test/graphql/com/example/operationbased2_ex8/kotlin/responseBased/operationbased2_ex8/fragment/AnimalFragment.kt.expected b/libraries/apollo-compiler/src/test/graphql/com/example/operationbased2_ex8/kotlin/responseBased/operationbased2_ex8/fragment/AnimalFragment.kt.expected index 8b895118289..738b7bf1d7d 100644 --- a/libraries/apollo-compiler/src/test/graphql/com/example/operationbased2_ex8/kotlin/responseBased/operationbased2_ex8/fragment/AnimalFragment.kt.expected +++ b/libraries/apollo-compiler/src/test/graphql/com/example/operationbased2_ex8/kotlin/responseBased/operationbased2_ex8/fragment/AnimalFragment.kt.expected @@ -7,6 +7,7 @@ package com.example.operationbased2_ex8.fragment import kotlin.Int import kotlin.String +import kotlin.Suppress public interface AnimalFragment { public val species: String @@ -19,24 +20,26 @@ public interface AnimalFragment { public val species: String public companion object { - public fun Parent.asLion() = this as? LionParent + @Suppress("USELESS_CAST") + public fun Parent.asLion(): LionParent? = this as? LionParent - public fun Parent.asCat() = this as? CatParent + @Suppress("USELESS_CAST") + public fun Parent.asCat(): CatParent? = this as? CatParent } } public interface LionParent : Parent { - public override val __typename: String + override val __typename: String - public override val species: String + override val species: String public val temperature: Int } public interface CatParent : Parent { - public override val __typename: String + override val __typename: String - public override val species: String + override val species: String public val name: String } diff --git a/libraries/apollo-compiler/src/test/graphql/com/example/operationbased2_ex8/kotlin/responseBased/operationbased2_ex8/fragment/AnimalFragmentImpl.kt.expected b/libraries/apollo-compiler/src/test/graphql/com/example/operationbased2_ex8/kotlin/responseBased/operationbased2_ex8/fragment/AnimalFragmentImpl.kt.expected index aceb62b188e..61b6edae91c 100644 --- a/libraries/apollo-compiler/src/test/graphql/com/example/operationbased2_ex8/kotlin/responseBased/operationbased2_ex8/fragment/AnimalFragmentImpl.kt.expected +++ b/libraries/apollo-compiler/src/test/graphql/com/example/operationbased2_ex8/kotlin/responseBased/operationbased2_ex8/fragment/AnimalFragmentImpl.kt.expected @@ -17,25 +17,24 @@ import kotlin.Any import kotlin.Boolean import kotlin.Int import kotlin.String -import kotlin.Unit +import kotlin.Suppress public class AnimalFragmentImpl() : Fragment { - public override fun equals(other: Any?): Boolean = other != null && other::class == this::class + override fun equals(other: Any?): Boolean = other != null && other::class == this::class - public override fun hashCode(): Int = this::class.hashCode() + override fun hashCode(): Int = this::class.hashCode() - public override fun serializeVariables( + override fun serializeVariables( writer: JsonWriter, customScalarAdapters: CustomScalarAdapters, withBooleanDefaultValues: Boolean, - ): Unit { + ) { // This fragment doesn't have any variable } - public override fun adapter(): CompositeAdapter = - AnimalFragmentImpl_ResponseAdapter.Data.obj() + override fun adapter(): CompositeAdapter = AnimalFragmentImpl_ResponseAdapter.Data.obj() - public override fun rootField(): CompiledField = CompiledField.Builder( + override fun rootField(): CompiledField = CompiledField.Builder( name = "data", type = Animal.type ) @@ -43,36 +42,38 @@ public class AnimalFragmentImpl() : Fragment { .build() public data class Data( - public override val species: String, - public override val parent: Parent, + override val species: String, + override val parent: Parent, ) : AnimalFragment, Fragment.Data { public sealed interface Parent : AnimalFragment.Parent { - public override val __typename: String + override val __typename: String - public override val species: String + override val species: String public companion object { - public fun Parent.asLion() = this as? LionParent + @Suppress("USELESS_CAST") + public fun Parent.asLion(): LionParent? = this as? LionParent - public fun Parent.asCat() = this as? CatParent + @Suppress("USELESS_CAST") + public fun Parent.asCat(): CatParent? = this as? CatParent } } public data class LionParent( - public override val __typename: String, - public override val species: String, - public override val temperature: Int, + override val __typename: String, + override val species: String, + override val temperature: Int, ) : Parent, AnimalFragment.LionParent public data class CatParent( - public override val __typename: String, - public override val species: String, - public override val name: String, + override val __typename: String, + override val species: String, + override val name: String, ) : Parent, AnimalFragment.CatParent public data class OtherParent( - public override val __typename: String, - public override val species: String, + override val __typename: String, + override val species: String, ) : Parent, AnimalFragment.Parent } } diff --git a/libraries/apollo-compiler/src/test/graphql/com/example/operationbased2_ex8/kotlin/responseBased/operationbased2_ex8/fragment/AnimalFragmentImpl_ResponseAdapter.kt.expected b/libraries/apollo-compiler/src/test/graphql/com/example/operationbased2_ex8/kotlin/responseBased/operationbased2_ex8/fragment/AnimalFragmentImpl_ResponseAdapter.kt.expected index 67ad3f9feb6..2c519865d9d 100644 --- a/libraries/apollo-compiler/src/test/graphql/com/example/operationbased2_ex8/kotlin/responseBased/operationbased2_ex8/fragment/AnimalFragmentImpl_ResponseAdapter.kt.expected +++ b/libraries/apollo-compiler/src/test/graphql/com/example/operationbased2_ex8/kotlin/responseBased/operationbased2_ex8/fragment/AnimalFragmentImpl_ResponseAdapter.kt.expected @@ -17,14 +17,13 @@ import com.apollographql.apollo3.api.obj import kotlin.Int import kotlin.String import kotlin.Suppress -import kotlin.Unit import kotlin.collections.List public object AnimalFragmentImpl_ResponseAdapter { public object Data : CompositeAdapter { public val RESPONSE_NAMES: List = listOf("species", "parent") - public override fun fromJson(reader: JsonReader, adapterContext: CompositeAdapterContext): + override fun fromJson(reader: JsonReader, adapterContext: CompositeAdapterContext): AnimalFragmentImpl.Data { var _species: String? = null var _parent: AnimalFragmentImpl.Data.Parent? = null @@ -43,11 +42,11 @@ public object AnimalFragmentImpl_ResponseAdapter { ) } - public override fun toJson( + override fun toJson( writer: JsonWriter, `value`: AnimalFragmentImpl.Data, adapterContext: CompositeAdapterContext, - ): Unit { + ) { writer.name("species") StringAdapter.toJson(writer, CustomScalarAdapters.Empty, value.species) @@ -56,7 +55,7 @@ public object AnimalFragmentImpl_ResponseAdapter { } private object Parent : CompositeAdapter { - public override fun fromJson(reader: JsonReader, adapterContext: CompositeAdapterContext): + override fun fromJson(reader: JsonReader, adapterContext: CompositeAdapterContext): AnimalFragmentImpl.Data.Parent { val __typename = reader.readTypename() return when(__typename) { @@ -69,11 +68,11 @@ public object AnimalFragmentImpl_ResponseAdapter { } } - public override fun toJson( + override fun toJson( writer: JsonWriter, `value`: AnimalFragmentImpl.Data.Parent, adapterContext: CompositeAdapterContext, - ): Unit { + ) { when(value) { is AnimalFragmentImpl.Data.LionParent -> LionParent.toJson(writer, value, adapterContext) is AnimalFragmentImpl.Data.CatParent -> CatParent.toJson(writer, value, adapterContext) @@ -115,7 +114,7 @@ public object AnimalFragmentImpl_ResponseAdapter { writer: JsonWriter, `value`: AnimalFragmentImpl.Data.LionParent, @Suppress("UNUSED_PARAMETER") adapterContext: CompositeAdapterContext, - ): Unit { + ) { writer.name("__typename") StringAdapter.toJson(writer, CustomScalarAdapters.Empty, value.__typename) @@ -159,7 +158,7 @@ public object AnimalFragmentImpl_ResponseAdapter { writer: JsonWriter, `value`: AnimalFragmentImpl.Data.CatParent, @Suppress("UNUSED_PARAMETER") adapterContext: CompositeAdapterContext, - ): Unit { + ) { writer.name("__typename") StringAdapter.toJson(writer, CustomScalarAdapters.Empty, value.__typename) @@ -200,7 +199,7 @@ public object AnimalFragmentImpl_ResponseAdapter { writer: JsonWriter, `value`: AnimalFragmentImpl.Data.OtherParent, @Suppress("UNUSED_PARAMETER") adapterContext: CompositeAdapterContext, - ): Unit { + ) { writer.name("__typename") StringAdapter.toJson(writer, CustomScalarAdapters.Empty, value.__typename) diff --git a/libraries/apollo-compiler/src/test/graphql/com/example/optional/kotlin/responseBased/optional/TestQuery.kt.expected b/libraries/apollo-compiler/src/test/graphql/com/example/optional/kotlin/responseBased/optional/TestQuery.kt.expected index bb3530c02cf..c81d2013176 100644 --- a/libraries/apollo-compiler/src/test/graphql/com/example/optional/kotlin/responseBased/optional/TestQuery.kt.expected +++ b/libraries/apollo-compiler/src/test/graphql/com/example/optional/kotlin/responseBased/optional/TestQuery.kt.expected @@ -19,33 +19,33 @@ import kotlin.Any import kotlin.Boolean import kotlin.Int import kotlin.String -import kotlin.Unit import kotlin.collections.List +import com.example.optional.type.Query as CompiledQuery public class TestQuery() : Query { - public override fun equals(other: Any?): Boolean = other != null && other::class == this::class + override fun equals(other: Any?): Boolean = other != null && other::class == this::class - public override fun hashCode(): Int = this::class.hashCode() + override fun hashCode(): Int = this::class.hashCode() - public override fun id(): String = OPERATION_ID + override fun id(): String = OPERATION_ID - public override fun document(): String = OPERATION_DOCUMENT + override fun document(): String = OPERATION_DOCUMENT - public override fun name(): String = OPERATION_NAME + override fun name(): String = OPERATION_NAME - public override fun serializeVariables( + override fun serializeVariables( writer: JsonWriter, customScalarAdapters: CustomScalarAdapters, withBooleanDefaultValues: Boolean, - ): Unit { + ) { // This operation doesn't have any variable } - public override fun adapter(): CompositeAdapter = TestQuery_ResponseAdapter.Data.obj() + override fun adapter(): CompositeAdapter = TestQuery_ResponseAdapter.Data.obj() - public override fun rootField(): CompiledField = CompiledField.Builder( + override fun rootField(): CompiledField = CompiledField.Builder( name = "data", - type = com.example.optional.type.Query.type + type = CompiledQuery.type ) .selections(selections = TestQuerySelections.__root) .build() diff --git a/libraries/apollo-compiler/src/test/graphql/com/example/optional/kotlin/responseBased/optional/adapter/TestQuery_ResponseAdapter.kt.expected b/libraries/apollo-compiler/src/test/graphql/com/example/optional/kotlin/responseBased/optional/adapter/TestQuery_ResponseAdapter.kt.expected index 1bc5c46b0f5..633a8c6192c 100644 --- a/libraries/apollo-compiler/src/test/graphql/com/example/optional/kotlin/responseBased/optional/adapter/TestQuery_ResponseAdapter.kt.expected +++ b/libraries/apollo-compiler/src/test/graphql/com/example/optional/kotlin/responseBased/optional/adapter/TestQuery_ResponseAdapter.kt.expected @@ -18,14 +18,13 @@ import com.example.optional.TestQuery import com.example.optional.type.Episode import com.example.optional.type.adapter.Episode_ResponseAdapter import kotlin.String -import kotlin.Unit import kotlin.collections.List public object TestQuery_ResponseAdapter { public object Data : CompositeAdapter { public val RESPONSE_NAMES: List = listOf("hero") - public override fun fromJson(reader: JsonReader, adapterContext: CompositeAdapterContext): + override fun fromJson(reader: JsonReader, adapterContext: CompositeAdapterContext): TestQuery.Data { var _hero: TestQuery.Data.Hero? = null @@ -41,11 +40,11 @@ public object TestQuery_ResponseAdapter { ) } - public override fun toJson( + override fun toJson( writer: JsonWriter, `value`: TestQuery.Data, adapterContext: CompositeAdapterContext, - ): Unit { + ) { writer.name("hero") Hero.obj().nullable().toJson(writer, value.hero, adapterContext) } @@ -53,7 +52,7 @@ public object TestQuery_ResponseAdapter { private object Hero : CompositeAdapter { public val RESPONSE_NAMES: List = listOf("name", "appearsIn") - public override fun fromJson(reader: JsonReader, adapterContext: CompositeAdapterContext): + override fun fromJson(reader: JsonReader, adapterContext: CompositeAdapterContext): TestQuery.Data.Hero { var _name: String? = null var _appearsIn: List? = null @@ -72,11 +71,11 @@ public object TestQuery_ResponseAdapter { ) } - public override fun toJson( + override fun toJson( writer: JsonWriter, `value`: TestQuery.Data.Hero, adapterContext: CompositeAdapterContext, - ): Unit { + ) { writer.name("name") StringAdapter.toJson(writer, CustomScalarAdapters.Empty, value.name) diff --git a/libraries/apollo-compiler/src/test/graphql/com/example/optional/kotlin/responseBased/optional/type/adapter/Episode_ResponseAdapter.kt.expected b/libraries/apollo-compiler/src/test/graphql/com/example/optional/kotlin/responseBased/optional/type/adapter/Episode_ResponseAdapter.kt.expected index 64d63d65223..a6c134955e9 100644 --- a/libraries/apollo-compiler/src/test/graphql/com/example/optional/kotlin/responseBased/optional/type/adapter/Episode_ResponseAdapter.kt.expected +++ b/libraries/apollo-compiler/src/test/graphql/com/example/optional/kotlin/responseBased/optional/type/adapter/Episode_ResponseAdapter.kt.expected @@ -10,20 +10,18 @@ import com.apollographql.apollo3.api.CustomScalarAdapters import com.apollographql.apollo3.api.json.JsonReader import com.apollographql.apollo3.api.json.JsonWriter import com.example.optional.type.Episode -import kotlin.Unit public object Episode_ResponseAdapter : Adapter { - public override fun fromJson(reader: JsonReader, customScalarAdapters: CustomScalarAdapters): - Episode { + override fun fromJson(reader: JsonReader, customScalarAdapters: CustomScalarAdapters): Episode { val rawValue = reader.nextString()!! return Episode.safeValueOf(rawValue) } - public override fun toJson( + override fun toJson( writer: JsonWriter, customScalarAdapters: CustomScalarAdapters, `value`: Episode, - ): Unit { + ) { writer.value(value.rawValue) } } diff --git a/libraries/apollo-compiler/src/test/graphql/com/example/path_vs_flat_accessors/kotlin/operationBased/path_vs_flat_accessors/TestQuery.kt.expected b/libraries/apollo-compiler/src/test/graphql/com/example/path_vs_flat_accessors/kotlin/operationBased/path_vs_flat_accessors/TestQuery.kt.expected index 75fab6c18b0..1aebb118c40 100644 --- a/libraries/apollo-compiler/src/test/graphql/com/example/path_vs_flat_accessors/kotlin/operationBased/path_vs_flat_accessors/TestQuery.kt.expected +++ b/libraries/apollo-compiler/src/test/graphql/com/example/path_vs_flat_accessors/kotlin/operationBased/path_vs_flat_accessors/TestQuery.kt.expected @@ -18,32 +18,32 @@ import kotlin.Any import kotlin.Boolean import kotlin.Int import kotlin.String -import kotlin.Unit +import com.example.path_vs_flat_accessors.type.Query as CompiledQuery public class TestQuery() : Query { - public override fun equals(other: Any?): Boolean = other != null && other::class == this::class + override fun equals(other: Any?): Boolean = other != null && other::class == this::class - public override fun hashCode(): Int = this::class.hashCode() + override fun hashCode(): Int = this::class.hashCode() - public override fun id(): String = OPERATION_ID + override fun id(): String = OPERATION_ID - public override fun document(): String = OPERATION_DOCUMENT + override fun document(): String = OPERATION_DOCUMENT - public override fun name(): String = OPERATION_NAME + override fun name(): String = OPERATION_NAME - public override fun serializeVariables( + override fun serializeVariables( writer: JsonWriter, customScalarAdapters: CustomScalarAdapters, withBooleanDefaultValues: Boolean, - ): Unit { + ) { // This operation doesn't have any variable } - public override fun adapter(): CompositeAdapter = TestQuery_ResponseAdapter.Data.obj() + override fun adapter(): CompositeAdapter = TestQuery_ResponseAdapter.Data.obj() - public override fun rootField(): CompiledField = CompiledField.Builder( + override fun rootField(): CompiledField = CompiledField.Builder( name = "data", - type = com.example.path_vs_flat_accessors.type.Query.type + type = CompiledQuery.type ) .selections(selections = TestQuerySelections.__root) .build() diff --git a/libraries/apollo-compiler/src/test/graphql/com/example/path_vs_flat_accessors/kotlin/operationBased/path_vs_flat_accessors/adapter/TestQuery_ResponseAdapter.kt.expected b/libraries/apollo-compiler/src/test/graphql/com/example/path_vs_flat_accessors/kotlin/operationBased/path_vs_flat_accessors/adapter/TestQuery_ResponseAdapter.kt.expected index 0f147dcca90..ff431856e0c 100644 --- a/libraries/apollo-compiler/src/test/graphql/com/example/path_vs_flat_accessors/kotlin/operationBased/path_vs_flat_accessors/adapter/TestQuery_ResponseAdapter.kt.expected +++ b/libraries/apollo-compiler/src/test/graphql/com/example/path_vs_flat_accessors/kotlin/operationBased/path_vs_flat_accessors/adapter/TestQuery_ResponseAdapter.kt.expected @@ -18,14 +18,13 @@ import com.apollographql.apollo3.api.obj import com.apollographql.apollo3.api.possibleTypes import com.example.path_vs_flat_accessors.TestQuery import kotlin.String -import kotlin.Unit import kotlin.collections.List public object TestQuery_ResponseAdapter { public object Data : CompositeAdapter { public val RESPONSE_NAMES: List = listOf("root") - public override fun fromJson(reader: JsonReader, adapterContext: CompositeAdapterContext): + override fun fromJson(reader: JsonReader, adapterContext: CompositeAdapterContext): TestQuery.Data { var _root: TestQuery.Data.Root? = null @@ -41,11 +40,11 @@ public object TestQuery_ResponseAdapter { ) } - public override fun toJson( + override fun toJson( writer: JsonWriter, `value`: TestQuery.Data, adapterContext: CompositeAdapterContext, - ): Unit { + ) { writer.name("root") Root.obj(true).nullable().toJson(writer, value.root, adapterContext) } @@ -53,7 +52,7 @@ public object TestQuery_ResponseAdapter { private object Root : CompositeAdapter { public val RESPONSE_NAMES: List = listOf("__typename") - public override fun fromJson(reader: JsonReader, adapterContext: CompositeAdapterContext): + override fun fromJson(reader: JsonReader, adapterContext: CompositeAdapterContext): TestQuery.Data.Root { var __typename: String? = null @@ -89,11 +88,11 @@ public object TestQuery_ResponseAdapter { ) } - public override fun toJson( + override fun toJson( writer: JsonWriter, `value`: TestQuery.Data.Root, adapterContext: CompositeAdapterContext, - ): Unit { + ) { writer.name("__typename") StringAdapter.toJson(writer, CustomScalarAdapters.Empty, value.__typename) @@ -111,7 +110,7 @@ public object TestQuery_ResponseAdapter { private object OnA : CompositeAdapter { public val RESPONSE_NAMES: List = listOf("__typename") - public override fun fromJson(reader: JsonReader, adapterContext: CompositeAdapterContext): + override fun fromJson(reader: JsonReader, adapterContext: CompositeAdapterContext): TestQuery.Data.Root.OnA { var __typename: String? = null @@ -139,11 +138,11 @@ public object TestQuery_ResponseAdapter { ) } - public override fun toJson( + override fun toJson( writer: JsonWriter, `value`: TestQuery.Data.Root.OnA, adapterContext: CompositeAdapterContext, - ): Unit { + ) { writer.name("__typename") StringAdapter.toJson(writer, CustomScalarAdapters.Empty, value.__typename) @@ -156,7 +155,7 @@ public object TestQuery_ResponseAdapter { private object OnB : CompositeAdapter { public val RESPONSE_NAMES: List = listOf("fieldB1") - public override fun fromJson(reader: JsonReader, adapterContext: CompositeAdapterContext): + override fun fromJson(reader: JsonReader, adapterContext: CompositeAdapterContext): TestQuery.Data.Root.OnA.OnB { var _fieldB1: String? = null @@ -172,11 +171,11 @@ public object TestQuery_ResponseAdapter { ) } - public override fun toJson( + override fun toJson( writer: JsonWriter, `value`: TestQuery.Data.Root.OnA.OnB, adapterContext: CompositeAdapterContext, - ): Unit { + ) { writer.name("fieldB1") NullableStringAdapter.toJson(writer, CustomScalarAdapters.Empty, value.fieldB1) } @@ -186,7 +185,7 @@ public object TestQuery_ResponseAdapter { private object OnB : CompositeAdapter { public val RESPONSE_NAMES: List = listOf("fieldB2") - public override fun fromJson(reader: JsonReader, adapterContext: CompositeAdapterContext): + override fun fromJson(reader: JsonReader, adapterContext: CompositeAdapterContext): TestQuery.Data.Root.OnB { var _fieldB2: String? = null @@ -202,11 +201,11 @@ public object TestQuery_ResponseAdapter { ) } - public override fun toJson( + override fun toJson( writer: JsonWriter, `value`: TestQuery.Data.Root.OnB, adapterContext: CompositeAdapterContext, - ): Unit { + ) { writer.name("fieldB2") NullableStringAdapter.toJson(writer, CustomScalarAdapters.Empty, value.fieldB2) } diff --git a/libraries/apollo-compiler/src/test/graphql/com/example/path_vs_flat_accessors/kotlin/responseBased/path_vs_flat_accessors/TestQuery.kt.expected b/libraries/apollo-compiler/src/test/graphql/com/example/path_vs_flat_accessors/kotlin/responseBased/path_vs_flat_accessors/TestQuery.kt.expected index 1a6567cf236..6100d973a5e 100644 --- a/libraries/apollo-compiler/src/test/graphql/com/example/path_vs_flat_accessors/kotlin/responseBased/path_vs_flat_accessors/TestQuery.kt.expected +++ b/libraries/apollo-compiler/src/test/graphql/com/example/path_vs_flat_accessors/kotlin/responseBased/path_vs_flat_accessors/TestQuery.kt.expected @@ -18,32 +18,33 @@ import kotlin.Any import kotlin.Boolean import kotlin.Int import kotlin.String -import kotlin.Unit +import kotlin.Suppress +import com.example.path_vs_flat_accessors.type.Query as CompiledQuery public class TestQuery() : Query { - public override fun equals(other: Any?): Boolean = other != null && other::class == this::class + override fun equals(other: Any?): Boolean = other != null && other::class == this::class - public override fun hashCode(): Int = this::class.hashCode() + override fun hashCode(): Int = this::class.hashCode() - public override fun id(): String = OPERATION_ID + override fun id(): String = OPERATION_ID - public override fun document(): String = OPERATION_DOCUMENT + override fun document(): String = OPERATION_DOCUMENT - public override fun name(): String = OPERATION_NAME + override fun name(): String = OPERATION_NAME - public override fun serializeVariables( + override fun serializeVariables( writer: JsonWriter, customScalarAdapters: CustomScalarAdapters, withBooleanDefaultValues: Boolean, - ): Unit { + ) { // This operation doesn't have any variable } - public override fun adapter(): CompositeAdapter = TestQuery_ResponseAdapter.Data.obj() + override fun adapter(): CompositeAdapter = TestQuery_ResponseAdapter.Data.obj() - public override fun rootField(): CompiledField = CompiledField.Builder( + override fun rootField(): CompiledField = CompiledField.Builder( name = "data", - type = com.example.path_vs_flat_accessors.type.Query.type + type = CompiledQuery.type ) .selections(selections = TestQuerySelections.__root) .build() @@ -56,41 +57,44 @@ public class TestQuery() : Query { public val __typename: String public companion object { - public fun Root.asA() = this as? ARoot + @Suppress("USELESS_CAST") + public fun Root.asA(): ARoot? = this as? ARoot - public fun Root.asAB() = this as? ABRoot + @Suppress("USELESS_CAST") + public fun Root.asAB(): ABRoot? = this as? ABRoot - public fun Root.asB() = this as? BRoot + @Suppress("USELESS_CAST") + public fun Root.asB(): BRoot? = this as? BRoot } } public sealed interface ARoot : Root { - public override val __typename: String + override val __typename: String } public sealed interface BRoot : Root { - public override val __typename: String + override val __typename: String public val fieldB2: String? } public data class ABRoot( - public override val __typename: String, + override val __typename: String, public val fieldB1: String?, - public override val fieldB2: String?, + override val fieldB2: String?, ) : ARoot, BRoot public data class OtherRoot( - public override val __typename: String, + override val __typename: String, ) : Root public data class OtherARoot( - public override val __typename: String, + override val __typename: String, ) : ARoot public data class OtherBRoot( - public override val __typename: String, - public override val fieldB2: String?, + override val __typename: String, + override val fieldB2: String?, ) : BRoot } diff --git a/libraries/apollo-compiler/src/test/graphql/com/example/path_vs_flat_accessors/kotlin/responseBased/path_vs_flat_accessors/adapter/TestQuery_ResponseAdapter.kt.expected b/libraries/apollo-compiler/src/test/graphql/com/example/path_vs_flat_accessors/kotlin/responseBased/path_vs_flat_accessors/adapter/TestQuery_ResponseAdapter.kt.expected index 047c87d6603..f1a3c73ef9e 100644 --- a/libraries/apollo-compiler/src/test/graphql/com/example/path_vs_flat_accessors/kotlin/responseBased/path_vs_flat_accessors/adapter/TestQuery_ResponseAdapter.kt.expected +++ b/libraries/apollo-compiler/src/test/graphql/com/example/path_vs_flat_accessors/kotlin/responseBased/path_vs_flat_accessors/adapter/TestQuery_ResponseAdapter.kt.expected @@ -18,14 +18,13 @@ import com.apollographql.apollo3.api.obj import com.example.path_vs_flat_accessors.TestQuery import kotlin.String import kotlin.Suppress -import kotlin.Unit import kotlin.collections.List public object TestQuery_ResponseAdapter { public object Data : CompositeAdapter { public val RESPONSE_NAMES: List = listOf("root") - public override fun fromJson(reader: JsonReader, adapterContext: CompositeAdapterContext): + override fun fromJson(reader: JsonReader, adapterContext: CompositeAdapterContext): TestQuery.Data { var _root: TestQuery.Data.Root? = null @@ -41,17 +40,17 @@ public object TestQuery_ResponseAdapter { ) } - public override fun toJson( + override fun toJson( writer: JsonWriter, `value`: TestQuery.Data, adapterContext: CompositeAdapterContext, - ): Unit { + ) { writer.name("root") Root.obj().nullable().toJson(writer, value.root, adapterContext) } private object Root : CompositeAdapter { - public override fun fromJson(reader: JsonReader, adapterContext: CompositeAdapterContext): + override fun fromJson(reader: JsonReader, adapterContext: CompositeAdapterContext): TestQuery.Data.Root { val __typename = reader.readTypename() return when(__typename) { @@ -66,11 +65,11 @@ public object TestQuery_ResponseAdapter { } } - public override fun toJson( + override fun toJson( writer: JsonWriter, `value`: TestQuery.Data.Root, adapterContext: CompositeAdapterContext, - ): Unit { + ) { when(value) { is TestQuery.Data.ABRoot -> ABRoot.toJson(writer, value, adapterContext) is TestQuery.Data.OtherARoot -> OtherARoot.toJson(writer, value, adapterContext) @@ -112,7 +111,7 @@ public object TestQuery_ResponseAdapter { writer: JsonWriter, `value`: TestQuery.Data.ABRoot, @Suppress("UNUSED_PARAMETER") adapterContext: CompositeAdapterContext, - ): Unit { + ) { writer.name("__typename") StringAdapter.toJson(writer, CustomScalarAdapters.Empty, value.__typename) @@ -150,7 +149,7 @@ public object TestQuery_ResponseAdapter { writer: JsonWriter, `value`: TestQuery.Data.OtherRoot, @Suppress("UNUSED_PARAMETER") adapterContext: CompositeAdapterContext, - ): Unit { + ) { writer.name("__typename") StringAdapter.toJson(writer, CustomScalarAdapters.Empty, value.__typename) } @@ -182,7 +181,7 @@ public object TestQuery_ResponseAdapter { writer: JsonWriter, `value`: TestQuery.Data.OtherARoot, @Suppress("UNUSED_PARAMETER") adapterContext: CompositeAdapterContext, - ): Unit { + ) { writer.name("__typename") StringAdapter.toJson(writer, CustomScalarAdapters.Empty, value.__typename) } @@ -217,7 +216,7 @@ public object TestQuery_ResponseAdapter { writer: JsonWriter, `value`: TestQuery.Data.OtherBRoot, @Suppress("UNUSED_PARAMETER") adapterContext: CompositeAdapterContext, - ): Unit { + ) { writer.name("__typename") StringAdapter.toJson(writer, CustomScalarAdapters.Empty, value.__typename) diff --git a/libraries/apollo-compiler/src/test/graphql/com/example/recursive_selection/kotlin/responseBased/recursive_selection/TestQuery.kt.expected b/libraries/apollo-compiler/src/test/graphql/com/example/recursive_selection/kotlin/responseBased/recursive_selection/TestQuery.kt.expected index 197fb886ed7..d12c0438b83 100644 --- a/libraries/apollo-compiler/src/test/graphql/com/example/recursive_selection/kotlin/responseBased/recursive_selection/TestQuery.kt.expected +++ b/libraries/apollo-compiler/src/test/graphql/com/example/recursive_selection/kotlin/responseBased/recursive_selection/TestQuery.kt.expected @@ -18,33 +18,33 @@ import kotlin.Any import kotlin.Boolean import kotlin.Int import kotlin.String -import kotlin.Unit import kotlin.collections.List +import com.example.recursive_selection.type.Query as CompiledQuery public class TestQuery() : Query { - public override fun equals(other: Any?): Boolean = other != null && other::class == this::class + override fun equals(other: Any?): Boolean = other != null && other::class == this::class - public override fun hashCode(): Int = this::class.hashCode() + override fun hashCode(): Int = this::class.hashCode() - public override fun id(): String = OPERATION_ID + override fun id(): String = OPERATION_ID - public override fun document(): String = OPERATION_DOCUMENT + override fun document(): String = OPERATION_DOCUMENT - public override fun name(): String = OPERATION_NAME + override fun name(): String = OPERATION_NAME - public override fun serializeVariables( + override fun serializeVariables( writer: JsonWriter, customScalarAdapters: CustomScalarAdapters, withBooleanDefaultValues: Boolean, - ): Unit { + ) { // This operation doesn't have any variable } - public override fun adapter(): CompositeAdapter = TestQuery_ResponseAdapter.Data.obj() + override fun adapter(): CompositeAdapter = TestQuery_ResponseAdapter.Data.obj() - public override fun rootField(): CompiledField = CompiledField.Builder( + override fun rootField(): CompiledField = CompiledField.Builder( name = "data", - type = com.example.recursive_selection.type.Query.type + type = CompiledQuery.type ) .selections(selections = TestQuerySelections.__root) .build() diff --git a/libraries/apollo-compiler/src/test/graphql/com/example/recursive_selection/kotlin/responseBased/recursive_selection/adapter/TestQuery_ResponseAdapter.kt.expected b/libraries/apollo-compiler/src/test/graphql/com/example/recursive_selection/kotlin/responseBased/recursive_selection/adapter/TestQuery_ResponseAdapter.kt.expected index efacd6d3b80..a035f88754f 100644 --- a/libraries/apollo-compiler/src/test/graphql/com/example/recursive_selection/kotlin/responseBased/recursive_selection/adapter/TestQuery_ResponseAdapter.kt.expected +++ b/libraries/apollo-compiler/src/test/graphql/com/example/recursive_selection/kotlin/responseBased/recursive_selection/adapter/TestQuery_ResponseAdapter.kt.expected @@ -16,14 +16,13 @@ import com.apollographql.apollo3.api.nullable import com.apollographql.apollo3.api.obj import com.example.recursive_selection.TestQuery import kotlin.String -import kotlin.Unit import kotlin.collections.List public object TestQuery_ResponseAdapter { public object Data : CompositeAdapter { public val RESPONSE_NAMES: List = listOf("tree") - public override fun fromJson(reader: JsonReader, adapterContext: CompositeAdapterContext): + override fun fromJson(reader: JsonReader, adapterContext: CompositeAdapterContext): TestQuery.Data { var _tree: TestQuery.Data.Tree? = null @@ -39,11 +38,11 @@ public object TestQuery_ResponseAdapter { ) } - public override fun toJson( + override fun toJson( writer: JsonWriter, `value`: TestQuery.Data, adapterContext: CompositeAdapterContext, - ): Unit { + ) { writer.name("tree") Tree.obj().nullable().toJson(writer, value.tree, adapterContext) } @@ -51,7 +50,7 @@ public object TestQuery_ResponseAdapter { private object Tree : CompositeAdapter { public val RESPONSE_NAMES: List = listOf("name", "children", "parent") - public override fun fromJson(reader: JsonReader, adapterContext: CompositeAdapterContext): + override fun fromJson(reader: JsonReader, adapterContext: CompositeAdapterContext): TestQuery.Data.Tree { var _name: String? = null var _children: List? = null @@ -73,11 +72,11 @@ public object TestQuery_ResponseAdapter { ) } - public override fun toJson( + override fun toJson( writer: JsonWriter, `value`: TestQuery.Data.Tree, adapterContext: CompositeAdapterContext, - ): Unit { + ) { writer.name("name") StringAdapter.toJson(writer, CustomScalarAdapters.Empty, value.name) @@ -91,7 +90,7 @@ public object TestQuery_ResponseAdapter { private object Child : CompositeAdapter { public val RESPONSE_NAMES: List = listOf("name") - public override fun fromJson(reader: JsonReader, adapterContext: CompositeAdapterContext): + override fun fromJson(reader: JsonReader, adapterContext: CompositeAdapterContext): TestQuery.Data.Tree.Child { var _name: String? = null @@ -107,11 +106,11 @@ public object TestQuery_ResponseAdapter { ) } - public override fun toJson( + override fun toJson( writer: JsonWriter, `value`: TestQuery.Data.Tree.Child, adapterContext: CompositeAdapterContext, - ): Unit { + ) { writer.name("name") StringAdapter.toJson(writer, CustomScalarAdapters.Empty, value.name) } @@ -120,7 +119,7 @@ public object TestQuery_ResponseAdapter { private object Parent : CompositeAdapter { public val RESPONSE_NAMES: List = listOf("name") - public override fun fromJson(reader: JsonReader, adapterContext: CompositeAdapterContext): + override fun fromJson(reader: JsonReader, adapterContext: CompositeAdapterContext): TestQuery.Data.Tree.Parent { var _name: String? = null @@ -136,11 +135,11 @@ public object TestQuery_ResponseAdapter { ) } - public override fun toJson( + override fun toJson( writer: JsonWriter, `value`: TestQuery.Data.Tree.Parent, adapterContext: CompositeAdapterContext, - ): Unit { + ) { writer.name("name") StringAdapter.toJson(writer, CustomScalarAdapters.Empty, value.name) } diff --git a/libraries/apollo-compiler/src/test/graphql/com/example/reserved_keywords/kotlin/operationBased/reserved_keywords/TestQuery.kt.expected b/libraries/apollo-compiler/src/test/graphql/com/example/reserved_keywords/kotlin/operationBased/reserved_keywords/TestQuery.kt.expected index 33e060e853f..42253d7a980 100644 --- a/libraries/apollo-compiler/src/test/graphql/com/example/reserved_keywords/kotlin/operationBased/reserved_keywords/TestQuery.kt.expected +++ b/libraries/apollo-compiler/src/test/graphql/com/example/reserved_keywords/kotlin/operationBased/reserved_keywords/TestQuery.kt.expected @@ -18,33 +18,33 @@ import kotlin.Any import kotlin.Boolean import kotlin.Int import kotlin.String -import kotlin.Unit import kotlin.collections.List +import com.example.reserved_keywords.type.Query as CompiledQuery public class TestQuery() : Query { - public override fun equals(other: Any?): Boolean = other != null && other::class == this::class + override fun equals(other: Any?): Boolean = other != null && other::class == this::class - public override fun hashCode(): Int = this::class.hashCode() + override fun hashCode(): Int = this::class.hashCode() - public override fun id(): String = OPERATION_ID + override fun id(): String = OPERATION_ID - public override fun document(): String = OPERATION_DOCUMENT + override fun document(): String = OPERATION_DOCUMENT - public override fun name(): String = OPERATION_NAME + override fun name(): String = OPERATION_NAME - public override fun serializeVariables( + override fun serializeVariables( writer: JsonWriter, customScalarAdapters: CustomScalarAdapters, withBooleanDefaultValues: Boolean, - ): Unit { + ) { // This operation doesn't have any variable } - public override fun adapter(): CompositeAdapter = TestQuery_ResponseAdapter.Data.obj() + override fun adapter(): CompositeAdapter = TestQuery_ResponseAdapter.Data.obj() - public override fun rootField(): CompiledField = CompiledField.Builder( + override fun rootField(): CompiledField = CompiledField.Builder( name = "data", - type = com.example.reserved_keywords.type.Query.type + type = CompiledQuery.type ) .selections(selections = TestQuerySelections.__root) .build() diff --git a/libraries/apollo-compiler/src/test/graphql/com/example/reserved_keywords/kotlin/operationBased/reserved_keywords/adapter/TestQuery_ResponseAdapter.kt.expected b/libraries/apollo-compiler/src/test/graphql/com/example/reserved_keywords/kotlin/operationBased/reserved_keywords/adapter/TestQuery_ResponseAdapter.kt.expected index 0d2dba42c11..d19204e91a1 100644 --- a/libraries/apollo-compiler/src/test/graphql/com/example/reserved_keywords/kotlin/operationBased/reserved_keywords/adapter/TestQuery_ResponseAdapter.kt.expected +++ b/libraries/apollo-compiler/src/test/graphql/com/example/reserved_keywords/kotlin/operationBased/reserved_keywords/adapter/TestQuery_ResponseAdapter.kt.expected @@ -18,14 +18,13 @@ import com.apollographql.apollo3.api.obj import com.apollographql.apollo3.api.possibleTypes import com.example.reserved_keywords.TestQuery import kotlin.String -import kotlin.Unit import kotlin.collections.List public object TestQuery_ResponseAdapter { public object Data : CompositeAdapter { public val RESPONSE_NAMES: List = listOf("yield", "objects") - public override fun fromJson(reader: JsonReader, adapterContext: CompositeAdapterContext): + override fun fromJson(reader: JsonReader, adapterContext: CompositeAdapterContext): TestQuery.Data { var _yield: TestQuery.Data.Yield? = null var _objects: List? = null @@ -44,11 +43,11 @@ public object TestQuery_ResponseAdapter { ) } - public override fun toJson( + override fun toJson( writer: JsonWriter, `value`: TestQuery.Data, adapterContext: CompositeAdapterContext, - ): Unit { + ) { writer.name("yield") Yield.obj().nullable().toJson(writer, value.`yield`, adapterContext) @@ -59,7 +58,7 @@ public object TestQuery_ResponseAdapter { private object Yield : CompositeAdapter { public val RESPONSE_NAMES: List = listOf("while", "it") - public override fun fromJson(reader: JsonReader, adapterContext: CompositeAdapterContext): + override fun fromJson(reader: JsonReader, adapterContext: CompositeAdapterContext): TestQuery.Data.Yield { var _while: String? = null var _it: String? = null @@ -78,11 +77,11 @@ public object TestQuery_ResponseAdapter { ) } - public override fun toJson( + override fun toJson( writer: JsonWriter, `value`: TestQuery.Data.Yield, adapterContext: CompositeAdapterContext, - ): Unit { + ) { writer.name("while") StringAdapter.toJson(writer, CustomScalarAdapters.Empty, value.`while`) @@ -94,7 +93,7 @@ public object TestQuery_ResponseAdapter { private object Object : CompositeAdapter { public val RESPONSE_NAMES: List = listOf("__typename") - public override fun fromJson(reader: JsonReader, adapterContext: CompositeAdapterContext): + override fun fromJson(reader: JsonReader, adapterContext: CompositeAdapterContext): TestQuery.Data.Object { var __typename: String? = null @@ -122,11 +121,11 @@ public object TestQuery_ResponseAdapter { ) } - public override fun toJson( + override fun toJson( writer: JsonWriter, `value`: TestQuery.Data.Object, adapterContext: CompositeAdapterContext, - ): Unit { + ) { writer.name("__typename") StringAdapter.toJson(writer, CustomScalarAdapters.Empty, value.__typename) @@ -139,7 +138,7 @@ public object TestQuery_ResponseAdapter { private object OnCharacter : CompositeAdapter { public val RESPONSE_NAMES: List = listOf("name") - public override fun fromJson(reader: JsonReader, adapterContext: CompositeAdapterContext): + override fun fromJson(reader: JsonReader, adapterContext: CompositeAdapterContext): TestQuery.Data.Object.OnCharacter { var _name: String? = null @@ -155,11 +154,11 @@ public object TestQuery_ResponseAdapter { ) } - public override fun toJson( + override fun toJson( writer: JsonWriter, `value`: TestQuery.Data.Object.OnCharacter, adapterContext: CompositeAdapterContext, - ): Unit { + ) { writer.name("name") StringAdapter.toJson(writer, CustomScalarAdapters.Empty, value.name) } diff --git a/libraries/apollo-compiler/src/test/graphql/com/example/reserved_keywords/kotlin/responseBased/reserved_keywords/TestQuery.kt.expected b/libraries/apollo-compiler/src/test/graphql/com/example/reserved_keywords/kotlin/responseBased/reserved_keywords/TestQuery.kt.expected index ae7fa268021..b16d806c6e8 100644 --- a/libraries/apollo-compiler/src/test/graphql/com/example/reserved_keywords/kotlin/responseBased/reserved_keywords/TestQuery.kt.expected +++ b/libraries/apollo-compiler/src/test/graphql/com/example/reserved_keywords/kotlin/responseBased/reserved_keywords/TestQuery.kt.expected @@ -18,33 +18,34 @@ import kotlin.Any import kotlin.Boolean import kotlin.Int import kotlin.String -import kotlin.Unit +import kotlin.Suppress import kotlin.collections.List +import com.example.reserved_keywords.type.Query as CompiledQuery public class TestQuery() : Query { - public override fun equals(other: Any?): Boolean = other != null && other::class == this::class + override fun equals(other: Any?): Boolean = other != null && other::class == this::class - public override fun hashCode(): Int = this::class.hashCode() + override fun hashCode(): Int = this::class.hashCode() - public override fun id(): String = OPERATION_ID + override fun id(): String = OPERATION_ID - public override fun document(): String = OPERATION_DOCUMENT + override fun document(): String = OPERATION_DOCUMENT - public override fun name(): String = OPERATION_NAME + override fun name(): String = OPERATION_NAME - public override fun serializeVariables( + override fun serializeVariables( writer: JsonWriter, customScalarAdapters: CustomScalarAdapters, withBooleanDefaultValues: Boolean, - ): Unit { + ) { // This operation doesn't have any variable } - public override fun adapter(): CompositeAdapter = TestQuery_ResponseAdapter.Data.obj() + override fun adapter(): CompositeAdapter = TestQuery_ResponseAdapter.Data.obj() - public override fun rootField(): CompiledField = CompiledField.Builder( + override fun rootField(): CompiledField = CompiledField.Builder( name = "data", - type = com.example.reserved_keywords.type.Query.type + type = CompiledQuery.type ) .selections(selections = TestQuerySelections.__root) .build() @@ -71,12 +72,13 @@ public class TestQuery() : Query { public val __typename: String public companion object { - public fun Object.asCharacter() = this as? CharacterObject + @Suppress("USELESS_CAST") + public fun Object.asCharacter(): CharacterObject? = this as? CharacterObject } } public data class CharacterObject( - public override val __typename: String, + override val __typename: String, /** * The name of the character */ @@ -84,7 +86,7 @@ public class TestQuery() : Query { ) : Object public data class OtherObject( - public override val __typename: String, + override val __typename: String, ) : Object } diff --git a/libraries/apollo-compiler/src/test/graphql/com/example/reserved_keywords/kotlin/responseBased/reserved_keywords/adapter/TestQuery_ResponseAdapter.kt.expected b/libraries/apollo-compiler/src/test/graphql/com/example/reserved_keywords/kotlin/responseBased/reserved_keywords/adapter/TestQuery_ResponseAdapter.kt.expected index 8080d523f3b..34572c8e06d 100644 --- a/libraries/apollo-compiler/src/test/graphql/com/example/reserved_keywords/kotlin/responseBased/reserved_keywords/adapter/TestQuery_ResponseAdapter.kt.expected +++ b/libraries/apollo-compiler/src/test/graphql/com/example/reserved_keywords/kotlin/responseBased/reserved_keywords/adapter/TestQuery_ResponseAdapter.kt.expected @@ -18,14 +18,13 @@ import com.apollographql.apollo3.api.obj import com.example.reserved_keywords.TestQuery import kotlin.String import kotlin.Suppress -import kotlin.Unit import kotlin.collections.List public object TestQuery_ResponseAdapter { public object Data : CompositeAdapter { public val RESPONSE_NAMES: List = listOf("yield", "objects") - public override fun fromJson(reader: JsonReader, adapterContext: CompositeAdapterContext): + override fun fromJson(reader: JsonReader, adapterContext: CompositeAdapterContext): TestQuery.Data { var _yield: TestQuery.Data.Yield? = null var _objects: List? = null @@ -44,11 +43,11 @@ public object TestQuery_ResponseAdapter { ) } - public override fun toJson( + override fun toJson( writer: JsonWriter, `value`: TestQuery.Data, adapterContext: CompositeAdapterContext, - ): Unit { + ) { writer.name("yield") Yield.obj().nullable().toJson(writer, value.`yield`, adapterContext) @@ -59,7 +58,7 @@ public object TestQuery_ResponseAdapter { private object Yield : CompositeAdapter { public val RESPONSE_NAMES: List = listOf("while", "it") - public override fun fromJson(reader: JsonReader, adapterContext: CompositeAdapterContext): + override fun fromJson(reader: JsonReader, adapterContext: CompositeAdapterContext): TestQuery.Data.Yield { var _while: String? = null var _it: String? = null @@ -78,11 +77,11 @@ public object TestQuery_ResponseAdapter { ) } - public override fun toJson( + override fun toJson( writer: JsonWriter, `value`: TestQuery.Data.Yield, adapterContext: CompositeAdapterContext, - ): Unit { + ) { writer.name("while") StringAdapter.toJson(writer, CustomScalarAdapters.Empty, value.`while`) @@ -92,7 +91,7 @@ public object TestQuery_ResponseAdapter { } private object Object : CompositeAdapter { - public override fun fromJson(reader: JsonReader, adapterContext: CompositeAdapterContext): + override fun fromJson(reader: JsonReader, adapterContext: CompositeAdapterContext): TestQuery.Data.Object { val __typename = reader.readTypename() return when(__typename) { @@ -104,11 +103,11 @@ public object TestQuery_ResponseAdapter { } } - public override fun toJson( + override fun toJson( writer: JsonWriter, `value`: TestQuery.Data.Object, adapterContext: CompositeAdapterContext, - ): Unit { + ) { when(value) { is TestQuery.Data.CharacterObject -> CharacterObject.toJson(writer, value, adapterContext) is TestQuery.Data.OtherObject -> OtherObject.toJson(writer, value, adapterContext) @@ -145,7 +144,7 @@ public object TestQuery_ResponseAdapter { writer: JsonWriter, `value`: TestQuery.Data.CharacterObject, @Suppress("UNUSED_PARAMETER") adapterContext: CompositeAdapterContext, - ): Unit { + ) { writer.name("__typename") StringAdapter.toJson(writer, CustomScalarAdapters.Empty, value.__typename) @@ -180,7 +179,7 @@ public object TestQuery_ResponseAdapter { writer: JsonWriter, `value`: TestQuery.Data.OtherObject, @Suppress("UNUSED_PARAMETER") adapterContext: CompositeAdapterContext, - ): Unit { + ) { writer.name("__typename") StringAdapter.toJson(writer, CustomScalarAdapters.Empty, value.__typename) } diff --git a/libraries/apollo-compiler/src/test/graphql/com/example/root_query_fragment/kotlin/operationBased/root_query_fragment/TestQuery.kt.expected b/libraries/apollo-compiler/src/test/graphql/com/example/root_query_fragment/kotlin/operationBased/root_query_fragment/TestQuery.kt.expected index 272b499bdb1..b3cb4011e74 100644 --- a/libraries/apollo-compiler/src/test/graphql/com/example/root_query_fragment/kotlin/operationBased/root_query_fragment/TestQuery.kt.expected +++ b/libraries/apollo-compiler/src/test/graphql/com/example/root_query_fragment/kotlin/operationBased/root_query_fragment/TestQuery.kt.expected @@ -19,32 +19,32 @@ import kotlin.Any import kotlin.Boolean import kotlin.Int import kotlin.String -import kotlin.Unit +import com.example.root_query_fragment.type.Query as CompiledQuery public class TestQuery() : Query { - public override fun equals(other: Any?): Boolean = other != null && other::class == this::class + override fun equals(other: Any?): Boolean = other != null && other::class == this::class - public override fun hashCode(): Int = this::class.hashCode() + override fun hashCode(): Int = this::class.hashCode() - public override fun id(): String = OPERATION_ID + override fun id(): String = OPERATION_ID - public override fun document(): String = OPERATION_DOCUMENT + override fun document(): String = OPERATION_DOCUMENT - public override fun name(): String = OPERATION_NAME + override fun name(): String = OPERATION_NAME - public override fun serializeVariables( + override fun serializeVariables( writer: JsonWriter, customScalarAdapters: CustomScalarAdapters, withBooleanDefaultValues: Boolean, - ): Unit { + ) { // This operation doesn't have any variable } - public override fun adapter(): CompositeAdapter = TestQuery_ResponseAdapter.Data.obj(true) + override fun adapter(): CompositeAdapter = TestQuery_ResponseAdapter.Data.obj(true) - public override fun rootField(): CompiledField = CompiledField.Builder( + override fun rootField(): CompiledField = CompiledField.Builder( name = "data", - type = com.example.root_query_fragment.type.Query.type + type = CompiledQuery.type ) .selections(selections = TestQuerySelections.__root) .build() diff --git a/libraries/apollo-compiler/src/test/graphql/com/example/root_query_fragment/kotlin/operationBased/root_query_fragment/adapter/TestQuery_ResponseAdapter.kt.expected b/libraries/apollo-compiler/src/test/graphql/com/example/root_query_fragment/kotlin/operationBased/root_query_fragment/adapter/TestQuery_ResponseAdapter.kt.expected index e0e0d2506cc..9829b89b129 100644 --- a/libraries/apollo-compiler/src/test/graphql/com/example/root_query_fragment/kotlin/operationBased/root_query_fragment/adapter/TestQuery_ResponseAdapter.kt.expected +++ b/libraries/apollo-compiler/src/test/graphql/com/example/root_query_fragment/kotlin/operationBased/root_query_fragment/adapter/TestQuery_ResponseAdapter.kt.expected @@ -13,14 +13,13 @@ import com.apollographql.apollo3.api.json.JsonReader import com.apollographql.apollo3.api.json.JsonWriter import com.example.root_query_fragment.TestQuery import kotlin.String -import kotlin.Unit import kotlin.collections.List public object TestQuery_ResponseAdapter { public object Data : CompositeAdapter { public val RESPONSE_NAMES: List = listOf("__typename") - public override fun fromJson(reader: JsonReader, adapterContext: CompositeAdapterContext): + override fun fromJson(reader: JsonReader, adapterContext: CompositeAdapterContext): TestQuery.Data { var __typename: String? = null @@ -41,11 +40,11 @@ public object TestQuery_ResponseAdapter { ) } - public override fun toJson( + override fun toJson( writer: JsonWriter, `value`: TestQuery.Data, adapterContext: CompositeAdapterContext, - ): Unit { + ) { writer.name("__typename") StringAdapter.toJson(writer, CustomScalarAdapters.Empty, value.__typename) diff --git a/libraries/apollo-compiler/src/test/graphql/com/example/root_query_fragment/kotlin/operationBased/root_query_fragment/fragment/QueryFragmentImpl.kt.expected b/libraries/apollo-compiler/src/test/graphql/com/example/root_query_fragment/kotlin/operationBased/root_query_fragment/fragment/QueryFragmentImpl.kt.expected index 7c9bf50117c..a7f2d8aaf78 100644 --- a/libraries/apollo-compiler/src/test/graphql/com/example/root_query_fragment/kotlin/operationBased/root_query_fragment/fragment/QueryFragmentImpl.kt.expected +++ b/libraries/apollo-compiler/src/test/graphql/com/example/root_query_fragment/kotlin/operationBased/root_query_fragment/fragment/QueryFragmentImpl.kt.expected @@ -16,25 +16,24 @@ import com.example.root_query_fragment.type.Query import kotlin.Any import kotlin.Boolean import kotlin.Int -import kotlin.Unit public class QueryFragmentImpl() : Fragment { - public override fun equals(other: Any?): Boolean = other != null && other::class == this::class + override fun equals(other: Any?): Boolean = other != null && other::class == this::class - public override fun hashCode(): Int = this::class.hashCode() + override fun hashCode(): Int = this::class.hashCode() - public override fun serializeVariables( + override fun serializeVariables( writer: JsonWriter, customScalarAdapters: CustomScalarAdapters, withBooleanDefaultValues: Boolean, - ): Unit { + ) { // This fragment doesn't have any variable } - public override fun adapter(): CompositeAdapter = + override fun adapter(): CompositeAdapter = QueryFragmentImpl_ResponseAdapter.QueryFragment.obj() - public override fun rootField(): CompiledField = CompiledField.Builder( + override fun rootField(): CompiledField = CompiledField.Builder( name = "data", type = Query.type ) diff --git a/libraries/apollo-compiler/src/test/graphql/com/example/root_query_fragment/kotlin/operationBased/root_query_fragment/fragment/QueryFragmentImpl_ResponseAdapter.kt.expected b/libraries/apollo-compiler/src/test/graphql/com/example/root_query_fragment/kotlin/operationBased/root_query_fragment/fragment/QueryFragmentImpl_ResponseAdapter.kt.expected index 10fbdf3af6e..a791c894a19 100644 --- a/libraries/apollo-compiler/src/test/graphql/com/example/root_query_fragment/kotlin/operationBased/root_query_fragment/fragment/QueryFragmentImpl_ResponseAdapter.kt.expected +++ b/libraries/apollo-compiler/src/test/graphql/com/example/root_query_fragment/kotlin/operationBased/root_query_fragment/fragment/QueryFragmentImpl_ResponseAdapter.kt.expected @@ -14,7 +14,6 @@ import com.apollographql.apollo3.api.json.JsonWriter import com.apollographql.apollo3.api.nullable import com.apollographql.apollo3.api.obj import kotlin.String -import kotlin.Unit import kotlin.collections.List public object QueryFragmentImpl_ResponseAdapter { @@ -22,7 +21,7 @@ public object QueryFragmentImpl_ResponseAdapter { CompositeAdapter { public val RESPONSE_NAMES: List = listOf("__typename", "hero") - public override fun fromJson(reader: JsonReader, adapterContext: CompositeAdapterContext): + override fun fromJson(reader: JsonReader, adapterContext: CompositeAdapterContext): com.example.root_query_fragment.fragment.QueryFragment { var __typename: String? = null var _hero: com.example.root_query_fragment.fragment.QueryFragment.Hero? = null @@ -41,11 +40,11 @@ public object QueryFragmentImpl_ResponseAdapter { ) } - public override fun toJson( + override fun toJson( writer: JsonWriter, `value`: com.example.root_query_fragment.fragment.QueryFragment, adapterContext: CompositeAdapterContext, - ): Unit { + ) { writer.name("__typename") StringAdapter.toJson(writer, CustomScalarAdapters.Empty, value.__typename) @@ -57,7 +56,7 @@ public object QueryFragmentImpl_ResponseAdapter { CompositeAdapter { public val RESPONSE_NAMES: List = listOf("name") - public override fun fromJson(reader: JsonReader, adapterContext: CompositeAdapterContext): + override fun fromJson(reader: JsonReader, adapterContext: CompositeAdapterContext): com.example.root_query_fragment.fragment.QueryFragment.Hero { var _name: String? = null @@ -73,11 +72,11 @@ public object QueryFragmentImpl_ResponseAdapter { ) } - public override fun toJson( + override fun toJson( writer: JsonWriter, `value`: com.example.root_query_fragment.fragment.QueryFragment.Hero, adapterContext: CompositeAdapterContext, - ): Unit { + ) { writer.name("name") StringAdapter.toJson(writer, CustomScalarAdapters.Empty, value.name) } diff --git a/libraries/apollo-compiler/src/test/graphql/com/example/root_query_fragment/kotlin/responseBased/root_query_fragment/TestQuery.kt.expected b/libraries/apollo-compiler/src/test/graphql/com/example/root_query_fragment/kotlin/responseBased/root_query_fragment/TestQuery.kt.expected index 42059319520..5a9913e16a6 100644 --- a/libraries/apollo-compiler/src/test/graphql/com/example/root_query_fragment/kotlin/responseBased/root_query_fragment/TestQuery.kt.expected +++ b/libraries/apollo-compiler/src/test/graphql/com/example/root_query_fragment/kotlin/responseBased/root_query_fragment/TestQuery.kt.expected @@ -19,50 +19,52 @@ import kotlin.Any import kotlin.Boolean import kotlin.Int import kotlin.String -import kotlin.Unit +import kotlin.Suppress +import com.example.root_query_fragment.type.Query as CompiledQuery public class TestQuery() : Query { - public override fun equals(other: Any?): Boolean = other != null && other::class == this::class + override fun equals(other: Any?): Boolean = other != null && other::class == this::class - public override fun hashCode(): Int = this::class.hashCode() + override fun hashCode(): Int = this::class.hashCode() - public override fun id(): String = OPERATION_ID + override fun id(): String = OPERATION_ID - public override fun document(): String = OPERATION_DOCUMENT + override fun document(): String = OPERATION_DOCUMENT - public override fun name(): String = OPERATION_NAME + override fun name(): String = OPERATION_NAME - public override fun serializeVariables( + override fun serializeVariables( writer: JsonWriter, customScalarAdapters: CustomScalarAdapters, withBooleanDefaultValues: Boolean, - ): Unit { + ) { // This operation doesn't have any variable } - public override fun adapter(): CompositeAdapter = TestQuery_ResponseAdapter.Data.obj() + override fun adapter(): CompositeAdapter = TestQuery_ResponseAdapter.Data.obj() - public override fun rootField(): CompiledField = CompiledField.Builder( + override fun rootField(): CompiledField = CompiledField.Builder( name = "data", - type = com.example.root_query_fragment.type.Query.type + type = CompiledQuery.type ) .selections(selections = TestQuerySelections.__root) .build() @ApolloAdaptableWith(TestQuery_ResponseAdapter.Data::class) public data class Data( - public override val __typename: String, - public override val hero: Hero?, + override val __typename: String, + override val hero: Hero?, ) : QueryFragment, Query.Data { public data class Hero( /** * The name of the character */ - public override val name: String, + override val name: String, ) : QueryFragment.Hero public companion object { - public fun Data.queryFragment() = this as? QueryFragment + @Suppress("USELESS_CAST") + public fun Data.queryFragment(): QueryFragment? = this as? QueryFragment } } diff --git a/libraries/apollo-compiler/src/test/graphql/com/example/root_query_fragment/kotlin/responseBased/root_query_fragment/adapter/TestQuery_ResponseAdapter.kt.expected b/libraries/apollo-compiler/src/test/graphql/com/example/root_query_fragment/kotlin/responseBased/root_query_fragment/adapter/TestQuery_ResponseAdapter.kt.expected index 42cbc2377d5..639711c107b 100644 --- a/libraries/apollo-compiler/src/test/graphql/com/example/root_query_fragment/kotlin/responseBased/root_query_fragment/adapter/TestQuery_ResponseAdapter.kt.expected +++ b/libraries/apollo-compiler/src/test/graphql/com/example/root_query_fragment/kotlin/responseBased/root_query_fragment/adapter/TestQuery_ResponseAdapter.kt.expected @@ -15,14 +15,13 @@ import com.apollographql.apollo3.api.nullable import com.apollographql.apollo3.api.obj import com.example.root_query_fragment.TestQuery import kotlin.String -import kotlin.Unit import kotlin.collections.List public object TestQuery_ResponseAdapter { public object Data : CompositeAdapter { public val RESPONSE_NAMES: List = listOf("__typename", "hero") - public override fun fromJson(reader: JsonReader, adapterContext: CompositeAdapterContext): + override fun fromJson(reader: JsonReader, adapterContext: CompositeAdapterContext): TestQuery.Data { var __typename: String? = null var _hero: TestQuery.Data.Hero? = null @@ -41,11 +40,11 @@ public object TestQuery_ResponseAdapter { ) } - public override fun toJson( + override fun toJson( writer: JsonWriter, `value`: TestQuery.Data, adapterContext: CompositeAdapterContext, - ): Unit { + ) { writer.name("__typename") StringAdapter.toJson(writer, CustomScalarAdapters.Empty, value.__typename) @@ -56,7 +55,7 @@ public object TestQuery_ResponseAdapter { private object Hero : CompositeAdapter { public val RESPONSE_NAMES: List = listOf("name") - public override fun fromJson(reader: JsonReader, adapterContext: CompositeAdapterContext): + override fun fromJson(reader: JsonReader, adapterContext: CompositeAdapterContext): TestQuery.Data.Hero { var _name: String? = null @@ -72,11 +71,11 @@ public object TestQuery_ResponseAdapter { ) } - public override fun toJson( + override fun toJson( writer: JsonWriter, `value`: TestQuery.Data.Hero, adapterContext: CompositeAdapterContext, - ): Unit { + ) { writer.name("name") StringAdapter.toJson(writer, CustomScalarAdapters.Empty, value.name) } diff --git a/libraries/apollo-compiler/src/test/graphql/com/example/root_query_fragment/kotlin/responseBased/root_query_fragment/fragment/QueryFragmentImpl.kt.expected b/libraries/apollo-compiler/src/test/graphql/com/example/root_query_fragment/kotlin/responseBased/root_query_fragment/fragment/QueryFragmentImpl.kt.expected index 43aa1e35b60..a1273919bd9 100644 --- a/libraries/apollo-compiler/src/test/graphql/com/example/root_query_fragment/kotlin/responseBased/root_query_fragment/fragment/QueryFragmentImpl.kt.expected +++ b/libraries/apollo-compiler/src/test/graphql/com/example/root_query_fragment/kotlin/responseBased/root_query_fragment/fragment/QueryFragmentImpl.kt.expected @@ -17,25 +17,23 @@ import kotlin.Any import kotlin.Boolean import kotlin.Int import kotlin.String -import kotlin.Unit public class QueryFragmentImpl() : Fragment { - public override fun equals(other: Any?): Boolean = other != null && other::class == this::class + override fun equals(other: Any?): Boolean = other != null && other::class == this::class - public override fun hashCode(): Int = this::class.hashCode() + override fun hashCode(): Int = this::class.hashCode() - public override fun serializeVariables( + override fun serializeVariables( writer: JsonWriter, customScalarAdapters: CustomScalarAdapters, withBooleanDefaultValues: Boolean, - ): Unit { + ) { // This fragment doesn't have any variable } - public override fun adapter(): CompositeAdapter = - QueryFragmentImpl_ResponseAdapter.Data.obj() + override fun adapter(): CompositeAdapter = QueryFragmentImpl_ResponseAdapter.Data.obj() - public override fun rootField(): CompiledField = CompiledField.Builder( + override fun rootField(): CompiledField = CompiledField.Builder( name = "data", type = Query.type ) @@ -43,14 +41,14 @@ public class QueryFragmentImpl() : Fragment { .build() public data class Data( - public override val __typename: String, - public override val hero: Hero?, + override val __typename: String, + override val hero: Hero?, ) : QueryFragment, Fragment.Data { public data class Hero( /** * The name of the character */ - public override val name: String, + override val name: String, ) : QueryFragment.Hero } } diff --git a/libraries/apollo-compiler/src/test/graphql/com/example/root_query_fragment/kotlin/responseBased/root_query_fragment/fragment/QueryFragmentImpl_ResponseAdapter.kt.expected b/libraries/apollo-compiler/src/test/graphql/com/example/root_query_fragment/kotlin/responseBased/root_query_fragment/fragment/QueryFragmentImpl_ResponseAdapter.kt.expected index 9e32c453835..2c6da6db844 100644 --- a/libraries/apollo-compiler/src/test/graphql/com/example/root_query_fragment/kotlin/responseBased/root_query_fragment/fragment/QueryFragmentImpl_ResponseAdapter.kt.expected +++ b/libraries/apollo-compiler/src/test/graphql/com/example/root_query_fragment/kotlin/responseBased/root_query_fragment/fragment/QueryFragmentImpl_ResponseAdapter.kt.expected @@ -14,14 +14,13 @@ import com.apollographql.apollo3.api.json.JsonWriter import com.apollographql.apollo3.api.nullable import com.apollographql.apollo3.api.obj import kotlin.String -import kotlin.Unit import kotlin.collections.List public object QueryFragmentImpl_ResponseAdapter { public object Data : CompositeAdapter { public val RESPONSE_NAMES: List = listOf("__typename", "hero") - public override fun fromJson(reader: JsonReader, adapterContext: CompositeAdapterContext): + override fun fromJson(reader: JsonReader, adapterContext: CompositeAdapterContext): QueryFragmentImpl.Data { var __typename: String? = null var _hero: QueryFragmentImpl.Data.Hero? = null @@ -40,11 +39,11 @@ public object QueryFragmentImpl_ResponseAdapter { ) } - public override fun toJson( + override fun toJson( writer: JsonWriter, `value`: QueryFragmentImpl.Data, adapterContext: CompositeAdapterContext, - ): Unit { + ) { writer.name("__typename") StringAdapter.toJson(writer, CustomScalarAdapters.Empty, value.__typename) @@ -55,7 +54,7 @@ public object QueryFragmentImpl_ResponseAdapter { private object Hero : CompositeAdapter { public val RESPONSE_NAMES: List = listOf("name") - public override fun fromJson(reader: JsonReader, adapterContext: CompositeAdapterContext): + override fun fromJson(reader: JsonReader, adapterContext: CompositeAdapterContext): QueryFragmentImpl.Data.Hero { var _name: String? = null @@ -71,11 +70,11 @@ public object QueryFragmentImpl_ResponseAdapter { ) } - public override fun toJson( + override fun toJson( writer: JsonWriter, `value`: QueryFragmentImpl.Data.Hero, adapterContext: CompositeAdapterContext, - ): Unit { + ) { writer.name("name") StringAdapter.toJson(writer, CustomScalarAdapters.Empty, value.name) } diff --git a/libraries/apollo-compiler/src/test/graphql/com/example/root_query_fragment_with_nested_fragments/kotlin/operationBased/root_query_fragment_with_nested_fragments/TestQuery.kt.expected b/libraries/apollo-compiler/src/test/graphql/com/example/root_query_fragment_with_nested_fragments/kotlin/operationBased/root_query_fragment_with_nested_fragments/TestQuery.kt.expected index e9718627fbf..db96dc946e3 100644 --- a/libraries/apollo-compiler/src/test/graphql/com/example/root_query_fragment_with_nested_fragments/kotlin/operationBased/root_query_fragment_with_nested_fragments/TestQuery.kt.expected +++ b/libraries/apollo-compiler/src/test/graphql/com/example/root_query_fragment_with_nested_fragments/kotlin/operationBased/root_query_fragment_with_nested_fragments/TestQuery.kt.expected @@ -19,32 +19,32 @@ import kotlin.Any import kotlin.Boolean import kotlin.Int import kotlin.String -import kotlin.Unit +import com.example.root_query_fragment_with_nested_fragments.type.Query as CompiledQuery public class TestQuery() : Query { - public override fun equals(other: Any?): Boolean = other != null && other::class == this::class + override fun equals(other: Any?): Boolean = other != null && other::class == this::class - public override fun hashCode(): Int = this::class.hashCode() + override fun hashCode(): Int = this::class.hashCode() - public override fun id(): String = OPERATION_ID + override fun id(): String = OPERATION_ID - public override fun document(): String = OPERATION_DOCUMENT + override fun document(): String = OPERATION_DOCUMENT - public override fun name(): String = OPERATION_NAME + override fun name(): String = OPERATION_NAME - public override fun serializeVariables( + override fun serializeVariables( writer: JsonWriter, customScalarAdapters: CustomScalarAdapters, withBooleanDefaultValues: Boolean, - ): Unit { + ) { // This operation doesn't have any variable } - public override fun adapter(): CompositeAdapter = TestQuery_ResponseAdapter.Data.obj(true) + override fun adapter(): CompositeAdapter = TestQuery_ResponseAdapter.Data.obj(true) - public override fun rootField(): CompiledField = CompiledField.Builder( + override fun rootField(): CompiledField = CompiledField.Builder( name = "data", - type = com.example.root_query_fragment_with_nested_fragments.type.Query.type + type = CompiledQuery.type ) .selections(selections = TestQuerySelections.__root) .build() diff --git a/libraries/apollo-compiler/src/test/graphql/com/example/root_query_fragment_with_nested_fragments/kotlin/operationBased/root_query_fragment_with_nested_fragments/adapter/TestQuery_ResponseAdapter.kt.expected b/libraries/apollo-compiler/src/test/graphql/com/example/root_query_fragment_with_nested_fragments/kotlin/operationBased/root_query_fragment_with_nested_fragments/adapter/TestQuery_ResponseAdapter.kt.expected index c50cd1786cb..45f5d3d04c6 100644 --- a/libraries/apollo-compiler/src/test/graphql/com/example/root_query_fragment_with_nested_fragments/kotlin/operationBased/root_query_fragment_with_nested_fragments/adapter/TestQuery_ResponseAdapter.kt.expected +++ b/libraries/apollo-compiler/src/test/graphql/com/example/root_query_fragment_with_nested_fragments/kotlin/operationBased/root_query_fragment_with_nested_fragments/adapter/TestQuery_ResponseAdapter.kt.expected @@ -13,14 +13,13 @@ import com.apollographql.apollo3.api.json.JsonReader import com.apollographql.apollo3.api.json.JsonWriter import com.example.root_query_fragment_with_nested_fragments.TestQuery import kotlin.String -import kotlin.Unit import kotlin.collections.List public object TestQuery_ResponseAdapter { public object Data : CompositeAdapter { public val RESPONSE_NAMES: List = listOf("__typename") - public override fun fromJson(reader: JsonReader, adapterContext: CompositeAdapterContext): + override fun fromJson(reader: JsonReader, adapterContext: CompositeAdapterContext): TestQuery.Data { var __typename: String? = null @@ -41,11 +40,11 @@ public object TestQuery_ResponseAdapter { ) } - public override fun toJson( + override fun toJson( writer: JsonWriter, `value`: TestQuery.Data, adapterContext: CompositeAdapterContext, - ): Unit { + ) { writer.name("__typename") StringAdapter.toJson(writer, CustomScalarAdapters.Empty, value.__typename) diff --git a/libraries/apollo-compiler/src/test/graphql/com/example/root_query_fragment_with_nested_fragments/kotlin/operationBased/root_query_fragment_with_nested_fragments/fragment/DroidFragmentImpl.kt.expected b/libraries/apollo-compiler/src/test/graphql/com/example/root_query_fragment_with_nested_fragments/kotlin/operationBased/root_query_fragment_with_nested_fragments/fragment/DroidFragmentImpl.kt.expected index 7fcc28100f7..fca189f55c0 100644 --- a/libraries/apollo-compiler/src/test/graphql/com/example/root_query_fragment_with_nested_fragments/kotlin/operationBased/root_query_fragment_with_nested_fragments/fragment/DroidFragmentImpl.kt.expected +++ b/libraries/apollo-compiler/src/test/graphql/com/example/root_query_fragment_with_nested_fragments/kotlin/operationBased/root_query_fragment_with_nested_fragments/fragment/DroidFragmentImpl.kt.expected @@ -16,25 +16,24 @@ import com.example.root_query_fragment_with_nested_fragments.type.Droid import kotlin.Any import kotlin.Boolean import kotlin.Int -import kotlin.Unit public class DroidFragmentImpl() : Fragment { - public override fun equals(other: Any?): Boolean = other != null && other::class == this::class + override fun equals(other: Any?): Boolean = other != null && other::class == this::class - public override fun hashCode(): Int = this::class.hashCode() + override fun hashCode(): Int = this::class.hashCode() - public override fun serializeVariables( + override fun serializeVariables( writer: JsonWriter, customScalarAdapters: CustomScalarAdapters, withBooleanDefaultValues: Boolean, - ): Unit { + ) { // This fragment doesn't have any variable } - public override fun adapter(): CompositeAdapter = + override fun adapter(): CompositeAdapter = DroidFragmentImpl_ResponseAdapter.DroidFragment.obj() - public override fun rootField(): CompiledField = CompiledField.Builder( + override fun rootField(): CompiledField = CompiledField.Builder( name = "data", type = Droid.type ) diff --git a/libraries/apollo-compiler/src/test/graphql/com/example/root_query_fragment_with_nested_fragments/kotlin/operationBased/root_query_fragment_with_nested_fragments/fragment/DroidFragmentImpl_ResponseAdapter.kt.expected b/libraries/apollo-compiler/src/test/graphql/com/example/root_query_fragment_with_nested_fragments/kotlin/operationBased/root_query_fragment_with_nested_fragments/fragment/DroidFragmentImpl_ResponseAdapter.kt.expected index 2f4604f708d..37257a70afc 100644 --- a/libraries/apollo-compiler/src/test/graphql/com/example/root_query_fragment_with_nested_fragments/kotlin/operationBased/root_query_fragment_with_nested_fragments/fragment/DroidFragmentImpl_ResponseAdapter.kt.expected +++ b/libraries/apollo-compiler/src/test/graphql/com/example/root_query_fragment_with_nested_fragments/kotlin/operationBased/root_query_fragment_with_nested_fragments/fragment/DroidFragmentImpl_ResponseAdapter.kt.expected @@ -13,7 +13,6 @@ import com.apollographql.apollo3.api.StringAdapter import com.apollographql.apollo3.api.json.JsonReader import com.apollographql.apollo3.api.json.JsonWriter import kotlin.String -import kotlin.Unit import kotlin.collections.List public object DroidFragmentImpl_ResponseAdapter { @@ -22,7 +21,7 @@ public object DroidFragmentImpl_ResponseAdapter { { public val RESPONSE_NAMES: List = listOf("name", "primaryFunction") - public override fun fromJson(reader: JsonReader, adapterContext: CompositeAdapterContext): + override fun fromJson(reader: JsonReader, adapterContext: CompositeAdapterContext): com.example.root_query_fragment_with_nested_fragments.fragment.DroidFragment { var _name: String? = null var _primaryFunction: String? = null @@ -41,11 +40,11 @@ public object DroidFragmentImpl_ResponseAdapter { ) } - public override fun toJson( + override fun toJson( writer: JsonWriter, `value`: com.example.root_query_fragment_with_nested_fragments.fragment.DroidFragment, adapterContext: CompositeAdapterContext, - ): Unit { + ) { writer.name("name") StringAdapter.toJson(writer, CustomScalarAdapters.Empty, value.name) diff --git a/libraries/apollo-compiler/src/test/graphql/com/example/root_query_fragment_with_nested_fragments/kotlin/operationBased/root_query_fragment_with_nested_fragments/fragment/HeroFragmentImpl.kt.expected b/libraries/apollo-compiler/src/test/graphql/com/example/root_query_fragment_with_nested_fragments/kotlin/operationBased/root_query_fragment_with_nested_fragments/fragment/HeroFragmentImpl.kt.expected index ef6b11520ac..3161bdcbc7d 100644 --- a/libraries/apollo-compiler/src/test/graphql/com/example/root_query_fragment_with_nested_fragments/kotlin/operationBased/root_query_fragment_with_nested_fragments/fragment/HeroFragmentImpl.kt.expected +++ b/libraries/apollo-compiler/src/test/graphql/com/example/root_query_fragment_with_nested_fragments/kotlin/operationBased/root_query_fragment_with_nested_fragments/fragment/HeroFragmentImpl.kt.expected @@ -16,25 +16,24 @@ import com.example.root_query_fragment_with_nested_fragments.type.Character import kotlin.Any import kotlin.Boolean import kotlin.Int -import kotlin.Unit public class HeroFragmentImpl() : Fragment { - public override fun equals(other: Any?): Boolean = other != null && other::class == this::class + override fun equals(other: Any?): Boolean = other != null && other::class == this::class - public override fun hashCode(): Int = this::class.hashCode() + override fun hashCode(): Int = this::class.hashCode() - public override fun serializeVariables( + override fun serializeVariables( writer: JsonWriter, customScalarAdapters: CustomScalarAdapters, withBooleanDefaultValues: Boolean, - ): Unit { + ) { // This fragment doesn't have any variable } - public override fun adapter(): CompositeAdapter = + override fun adapter(): CompositeAdapter = HeroFragmentImpl_ResponseAdapter.HeroFragment.obj() - public override fun rootField(): CompiledField = CompiledField.Builder( + override fun rootField(): CompiledField = CompiledField.Builder( name = "data", type = Character.type ) diff --git a/libraries/apollo-compiler/src/test/graphql/com/example/root_query_fragment_with_nested_fragments/kotlin/operationBased/root_query_fragment_with_nested_fragments/fragment/HeroFragmentImpl_ResponseAdapter.kt.expected b/libraries/apollo-compiler/src/test/graphql/com/example/root_query_fragment_with_nested_fragments/kotlin/operationBased/root_query_fragment_with_nested_fragments/fragment/HeroFragmentImpl_ResponseAdapter.kt.expected index a4094a14e58..d6cdd62a52f 100644 --- a/libraries/apollo-compiler/src/test/graphql/com/example/root_query_fragment_with_nested_fragments/kotlin/operationBased/root_query_fragment_with_nested_fragments/fragment/HeroFragmentImpl_ResponseAdapter.kt.expected +++ b/libraries/apollo-compiler/src/test/graphql/com/example/root_query_fragment_with_nested_fragments/kotlin/operationBased/root_query_fragment_with_nested_fragments/fragment/HeroFragmentImpl_ResponseAdapter.kt.expected @@ -12,7 +12,6 @@ import com.apollographql.apollo3.api.StringAdapter import com.apollographql.apollo3.api.json.JsonReader import com.apollographql.apollo3.api.json.JsonWriter import kotlin.String -import kotlin.Unit import kotlin.collections.List public object HeroFragmentImpl_ResponseAdapter { @@ -21,7 +20,7 @@ public object HeroFragmentImpl_ResponseAdapter { { public val RESPONSE_NAMES: List = listOf("name") - public override fun fromJson(reader: JsonReader, adapterContext: CompositeAdapterContext): + override fun fromJson(reader: JsonReader, adapterContext: CompositeAdapterContext): com.example.root_query_fragment_with_nested_fragments.fragment.HeroFragment { var _name: String? = null @@ -37,11 +36,11 @@ public object HeroFragmentImpl_ResponseAdapter { ) } - public override fun toJson( + override fun toJson( writer: JsonWriter, `value`: com.example.root_query_fragment_with_nested_fragments.fragment.HeroFragment, adapterContext: CompositeAdapterContext, - ): Unit { + ) { writer.name("name") StringAdapter.toJson(writer, CustomScalarAdapters.Empty, value.name) } diff --git a/libraries/apollo-compiler/src/test/graphql/com/example/root_query_fragment_with_nested_fragments/kotlin/operationBased/root_query_fragment_with_nested_fragments/fragment/QueryFragmentImpl.kt.expected b/libraries/apollo-compiler/src/test/graphql/com/example/root_query_fragment_with_nested_fragments/kotlin/operationBased/root_query_fragment_with_nested_fragments/fragment/QueryFragmentImpl.kt.expected index 4f0cb40f5d7..46f74ce4c68 100644 --- a/libraries/apollo-compiler/src/test/graphql/com/example/root_query_fragment_with_nested_fragments/kotlin/operationBased/root_query_fragment_with_nested_fragments/fragment/QueryFragmentImpl.kt.expected +++ b/libraries/apollo-compiler/src/test/graphql/com/example/root_query_fragment_with_nested_fragments/kotlin/operationBased/root_query_fragment_with_nested_fragments/fragment/QueryFragmentImpl.kt.expected @@ -16,25 +16,24 @@ import com.example.root_query_fragment_with_nested_fragments.type.Query import kotlin.Any import kotlin.Boolean import kotlin.Int -import kotlin.Unit public class QueryFragmentImpl() : Fragment { - public override fun equals(other: Any?): Boolean = other != null && other::class == this::class + override fun equals(other: Any?): Boolean = other != null && other::class == this::class - public override fun hashCode(): Int = this::class.hashCode() + override fun hashCode(): Int = this::class.hashCode() - public override fun serializeVariables( + override fun serializeVariables( writer: JsonWriter, customScalarAdapters: CustomScalarAdapters, withBooleanDefaultValues: Boolean, - ): Unit { + ) { // This fragment doesn't have any variable } - public override fun adapter(): CompositeAdapter = + override fun adapter(): CompositeAdapter = QueryFragmentImpl_ResponseAdapter.QueryFragment.obj() - public override fun rootField(): CompiledField = CompiledField.Builder( + override fun rootField(): CompiledField = CompiledField.Builder( name = "data", type = Query.type ) diff --git a/libraries/apollo-compiler/src/test/graphql/com/example/root_query_fragment_with_nested_fragments/kotlin/operationBased/root_query_fragment_with_nested_fragments/fragment/QueryFragmentImpl_ResponseAdapter.kt.expected b/libraries/apollo-compiler/src/test/graphql/com/example/root_query_fragment_with_nested_fragments/kotlin/operationBased/root_query_fragment_with_nested_fragments/fragment/QueryFragmentImpl_ResponseAdapter.kt.expected index 2ffa9b2f20c..5a0a0d3da52 100644 --- a/libraries/apollo-compiler/src/test/graphql/com/example/root_query_fragment_with_nested_fragments/kotlin/operationBased/root_query_fragment_with_nested_fragments/fragment/QueryFragmentImpl_ResponseAdapter.kt.expected +++ b/libraries/apollo-compiler/src/test/graphql/com/example/root_query_fragment_with_nested_fragments/kotlin/operationBased/root_query_fragment_with_nested_fragments/fragment/QueryFragmentImpl_ResponseAdapter.kt.expected @@ -15,7 +15,6 @@ import com.apollographql.apollo3.api.json.JsonWriter import com.apollographql.apollo3.api.nullable import com.apollographql.apollo3.api.obj import kotlin.String -import kotlin.Unit import kotlin.collections.List public object QueryFragmentImpl_ResponseAdapter { @@ -24,7 +23,7 @@ public object QueryFragmentImpl_ResponseAdapter { { public val RESPONSE_NAMES: List = listOf("__typename", "hero", "droid", "human") - public override fun fromJson(reader: JsonReader, adapterContext: CompositeAdapterContext): + override fun fromJson(reader: JsonReader, adapterContext: CompositeAdapterContext): com.example.root_query_fragment_with_nested_fragments.fragment.QueryFragment { var __typename: String? = null var _hero: com.example.root_query_fragment_with_nested_fragments.fragment.QueryFragment.Hero? = null @@ -49,11 +48,11 @@ public object QueryFragmentImpl_ResponseAdapter { ) } - public override fun toJson( + override fun toJson( writer: JsonWriter, `value`: com.example.root_query_fragment_with_nested_fragments.fragment.QueryFragment, adapterContext: CompositeAdapterContext, - ): Unit { + ) { writer.name("__typename") StringAdapter.toJson(writer, CustomScalarAdapters.Empty, value.__typename) @@ -72,7 +71,7 @@ public object QueryFragmentImpl_ResponseAdapter { { public val RESPONSE_NAMES: List = listOf("__typename") - public override fun fromJson(reader: JsonReader, adapterContext: CompositeAdapterContext): + override fun fromJson(reader: JsonReader, adapterContext: CompositeAdapterContext): com.example.root_query_fragment_with_nested_fragments.fragment.QueryFragment.Hero { var __typename: String? = null @@ -93,11 +92,11 @@ public object QueryFragmentImpl_ResponseAdapter { ) } - public override fun toJson( + override fun toJson( writer: JsonWriter, `value`: com.example.root_query_fragment_with_nested_fragments.fragment.QueryFragment.Hero, adapterContext: CompositeAdapterContext, - ): Unit { + ) { writer.name("__typename") StringAdapter.toJson(writer, CustomScalarAdapters.Empty, value.__typename) @@ -111,7 +110,7 @@ public object QueryFragmentImpl_ResponseAdapter { { public val RESPONSE_NAMES: List = listOf("__typename") - public override fun fromJson(reader: JsonReader, adapterContext: CompositeAdapterContext): + override fun fromJson(reader: JsonReader, adapterContext: CompositeAdapterContext): com.example.root_query_fragment_with_nested_fragments.fragment.QueryFragment.Droid { var __typename: String? = null @@ -132,11 +131,11 @@ public object QueryFragmentImpl_ResponseAdapter { ) } - public override fun toJson( + override fun toJson( writer: JsonWriter, `value`: com.example.root_query_fragment_with_nested_fragments.fragment.QueryFragment.Droid, adapterContext: CompositeAdapterContext, - ): Unit { + ) { writer.name("__typename") StringAdapter.toJson(writer, CustomScalarAdapters.Empty, value.__typename) @@ -150,7 +149,7 @@ public object QueryFragmentImpl_ResponseAdapter { { public val RESPONSE_NAMES: List = listOf("__typename") - public override fun fromJson(reader: JsonReader, adapterContext: CompositeAdapterContext): + override fun fromJson(reader: JsonReader, adapterContext: CompositeAdapterContext): com.example.root_query_fragment_with_nested_fragments.fragment.QueryFragment.Human { var __typename: String? = null @@ -171,11 +170,11 @@ public object QueryFragmentImpl_ResponseAdapter { ) } - public override fun toJson( + override fun toJson( writer: JsonWriter, `value`: com.example.root_query_fragment_with_nested_fragments.fragment.QueryFragment.Human, adapterContext: CompositeAdapterContext, - ): Unit { + ) { writer.name("__typename") StringAdapter.toJson(writer, CustomScalarAdapters.Empty, value.__typename) @@ -188,7 +187,7 @@ public object QueryFragmentImpl_ResponseAdapter { { public val RESPONSE_NAMES: List = listOf("name", "homePlanet") - public override fun fromJson(reader: JsonReader, adapterContext: CompositeAdapterContext): + override fun fromJson(reader: JsonReader, adapterContext: CompositeAdapterContext): com.example.root_query_fragment_with_nested_fragments.fragment.QueryFragment.Human.OnHuman { var _name: String? = null var _homePlanet: String? = null @@ -207,11 +206,11 @@ public object QueryFragmentImpl_ResponseAdapter { ) } - public override fun toJson( + override fun toJson( writer: JsonWriter, `value`: com.example.root_query_fragment_with_nested_fragments.fragment.QueryFragment.Human.OnHuman, adapterContext: CompositeAdapterContext, - ): Unit { + ) { writer.name("name") StringAdapter.toJson(writer, CustomScalarAdapters.Empty, value.name) diff --git a/libraries/apollo-compiler/src/test/graphql/com/example/root_query_fragment_with_nested_fragments/kotlin/responseBased/root_query_fragment_with_nested_fragments/TestQuery.kt.expected b/libraries/apollo-compiler/src/test/graphql/com/example/root_query_fragment_with_nested_fragments/kotlin/responseBased/root_query_fragment_with_nested_fragments/TestQuery.kt.expected index 4fd56993da4..625357e247a 100644 --- a/libraries/apollo-compiler/src/test/graphql/com/example/root_query_fragment_with_nested_fragments/kotlin/responseBased/root_query_fragment_with_nested_fragments/TestQuery.kt.expected +++ b/libraries/apollo-compiler/src/test/graphql/com/example/root_query_fragment_with_nested_fragments/kotlin/responseBased/root_query_fragment_with_nested_fragments/TestQuery.kt.expected @@ -21,85 +21,89 @@ import kotlin.Any import kotlin.Boolean import kotlin.Int import kotlin.String -import kotlin.Unit +import kotlin.Suppress +import com.example.root_query_fragment_with_nested_fragments.type.Query as CompiledQuery public class TestQuery() : Query { - public override fun equals(other: Any?): Boolean = other != null && other::class == this::class + override fun equals(other: Any?): Boolean = other != null && other::class == this::class - public override fun hashCode(): Int = this::class.hashCode() + override fun hashCode(): Int = this::class.hashCode() - public override fun id(): String = OPERATION_ID + override fun id(): String = OPERATION_ID - public override fun document(): String = OPERATION_DOCUMENT + override fun document(): String = OPERATION_DOCUMENT - public override fun name(): String = OPERATION_NAME + override fun name(): String = OPERATION_NAME - public override fun serializeVariables( + override fun serializeVariables( writer: JsonWriter, customScalarAdapters: CustomScalarAdapters, withBooleanDefaultValues: Boolean, - ): Unit { + ) { // This operation doesn't have any variable } - public override fun adapter(): CompositeAdapter = TestQuery_ResponseAdapter.Data.obj() + override fun adapter(): CompositeAdapter = TestQuery_ResponseAdapter.Data.obj() - public override fun rootField(): CompiledField = CompiledField.Builder( + override fun rootField(): CompiledField = CompiledField.Builder( name = "data", - type = com.example.root_query_fragment_with_nested_fragments.type.Query.type + type = CompiledQuery.type ) .selections(selections = TestQuerySelections.__root) .build() @ApolloAdaptableWith(TestQuery_ResponseAdapter.Data::class) public data class Data( - public override val __typename: String, - public override val hero: Hero?, - public override val droid: Droid?, - public override val human: Human?, + override val __typename: String, + override val hero: Hero?, + override val droid: Droid?, + override val human: Human?, ) : QueryFragment, Query.Data { public data class Hero( - public override val __typename: String, + override val __typename: String, /** * The name of the character */ - public override val name: String, + override val name: String, ) : HeroFragment, QueryFragment.Hero { public companion object { - public fun Hero.heroFragment() = this as? HeroFragment + @Suppress("USELESS_CAST") + public fun Hero.heroFragment(): HeroFragment? = this as? HeroFragment } } public data class Droid( - public override val __typename: String, + override val __typename: String, /** * What others call this droid */ - public override val name: String, + override val name: String, /** * This droid's primary function */ - public override val primaryFunction: String?, + override val primaryFunction: String?, ) : DroidFragment, QueryFragment.Droid { public companion object { - public fun Droid.droidFragment() = this as? DroidFragment + @Suppress("USELESS_CAST") + public fun Droid.droidFragment(): DroidFragment? = this as? DroidFragment } } public data class Human( - public override val __typename: String, + override val __typename: String, /** * What this human calls themselves */ - public override val name: String, + override val name: String, /** * The home planet of the human, or null if unknown */ - public override val homePlanet: String?, + override val homePlanet: String?, ) : QueryFragment.Human public companion object { - public fun Data.queryFragment() = this as? QueryFragment + @Suppress("USELESS_CAST") + public fun Data.queryFragment(): QueryFragment? = this as? QueryFragment } } diff --git a/libraries/apollo-compiler/src/test/graphql/com/example/root_query_fragment_with_nested_fragments/kotlin/responseBased/root_query_fragment_with_nested_fragments/adapter/TestQuery_ResponseAdapter.kt.expected b/libraries/apollo-compiler/src/test/graphql/com/example/root_query_fragment_with_nested_fragments/kotlin/responseBased/root_query_fragment_with_nested_fragments/adapter/TestQuery_ResponseAdapter.kt.expected index 58cb3130e1c..cc1b1e0bfe7 100644 --- a/libraries/apollo-compiler/src/test/graphql/com/example/root_query_fragment_with_nested_fragments/kotlin/responseBased/root_query_fragment_with_nested_fragments/adapter/TestQuery_ResponseAdapter.kt.expected +++ b/libraries/apollo-compiler/src/test/graphql/com/example/root_query_fragment_with_nested_fragments/kotlin/responseBased/root_query_fragment_with_nested_fragments/adapter/TestQuery_ResponseAdapter.kt.expected @@ -16,14 +16,13 @@ import com.apollographql.apollo3.api.nullable import com.apollographql.apollo3.api.obj import com.example.root_query_fragment_with_nested_fragments.TestQuery import kotlin.String -import kotlin.Unit import kotlin.collections.List public object TestQuery_ResponseAdapter { public object Data : CompositeAdapter { public val RESPONSE_NAMES: List = listOf("__typename", "hero", "droid", "human") - public override fun fromJson(reader: JsonReader, adapterContext: CompositeAdapterContext): + override fun fromJson(reader: JsonReader, adapterContext: CompositeAdapterContext): TestQuery.Data { var __typename: String? = null var _hero: TestQuery.Data.Hero? = null @@ -48,11 +47,11 @@ public object TestQuery_ResponseAdapter { ) } - public override fun toJson( + override fun toJson( writer: JsonWriter, `value`: TestQuery.Data, adapterContext: CompositeAdapterContext, - ): Unit { + ) { writer.name("__typename") StringAdapter.toJson(writer, CustomScalarAdapters.Empty, value.__typename) @@ -69,7 +68,7 @@ public object TestQuery_ResponseAdapter { private object Hero : CompositeAdapter { public val RESPONSE_NAMES: List = listOf("__typename", "name") - public override fun fromJson(reader: JsonReader, adapterContext: CompositeAdapterContext): + override fun fromJson(reader: JsonReader, adapterContext: CompositeAdapterContext): TestQuery.Data.Hero { var __typename: String? = null var _name: String? = null @@ -88,11 +87,11 @@ public object TestQuery_ResponseAdapter { ) } - public override fun toJson( + override fun toJson( writer: JsonWriter, `value`: TestQuery.Data.Hero, adapterContext: CompositeAdapterContext, - ): Unit { + ) { writer.name("__typename") StringAdapter.toJson(writer, CustomScalarAdapters.Empty, value.__typename) @@ -104,7 +103,7 @@ public object TestQuery_ResponseAdapter { private object Droid : CompositeAdapter { public val RESPONSE_NAMES: List = listOf("__typename", "name", "primaryFunction") - public override fun fromJson(reader: JsonReader, adapterContext: CompositeAdapterContext): + override fun fromJson(reader: JsonReader, adapterContext: CompositeAdapterContext): TestQuery.Data.Droid { var __typename: String? = null var _name: String? = null @@ -126,11 +125,11 @@ public object TestQuery_ResponseAdapter { ) } - public override fun toJson( + override fun toJson( writer: JsonWriter, `value`: TestQuery.Data.Droid, adapterContext: CompositeAdapterContext, - ): Unit { + ) { writer.name("__typename") StringAdapter.toJson(writer, CustomScalarAdapters.Empty, value.__typename) @@ -145,7 +144,7 @@ public object TestQuery_ResponseAdapter { private object Human : CompositeAdapter { public val RESPONSE_NAMES: List = listOf("__typename", "name", "homePlanet") - public override fun fromJson(reader: JsonReader, adapterContext: CompositeAdapterContext): + override fun fromJson(reader: JsonReader, adapterContext: CompositeAdapterContext): TestQuery.Data.Human { var __typename: String? = null var _name: String? = null @@ -167,11 +166,11 @@ public object TestQuery_ResponseAdapter { ) } - public override fun toJson( + override fun toJson( writer: JsonWriter, `value`: TestQuery.Data.Human, adapterContext: CompositeAdapterContext, - ): Unit { + ) { writer.name("__typename") StringAdapter.toJson(writer, CustomScalarAdapters.Empty, value.__typename) diff --git a/libraries/apollo-compiler/src/test/graphql/com/example/root_query_fragment_with_nested_fragments/kotlin/responseBased/root_query_fragment_with_nested_fragments/fragment/DroidFragmentImpl.kt.expected b/libraries/apollo-compiler/src/test/graphql/com/example/root_query_fragment_with_nested_fragments/kotlin/responseBased/root_query_fragment_with_nested_fragments/fragment/DroidFragmentImpl.kt.expected index b07a16c6b9e..77aa9b81cc3 100644 --- a/libraries/apollo-compiler/src/test/graphql/com/example/root_query_fragment_with_nested_fragments/kotlin/responseBased/root_query_fragment_with_nested_fragments/fragment/DroidFragmentImpl.kt.expected +++ b/libraries/apollo-compiler/src/test/graphql/com/example/root_query_fragment_with_nested_fragments/kotlin/responseBased/root_query_fragment_with_nested_fragments/fragment/DroidFragmentImpl.kt.expected @@ -17,25 +17,23 @@ import kotlin.Any import kotlin.Boolean import kotlin.Int import kotlin.String -import kotlin.Unit public class DroidFragmentImpl() : Fragment { - public override fun equals(other: Any?): Boolean = other != null && other::class == this::class + override fun equals(other: Any?): Boolean = other != null && other::class == this::class - public override fun hashCode(): Int = this::class.hashCode() + override fun hashCode(): Int = this::class.hashCode() - public override fun serializeVariables( + override fun serializeVariables( writer: JsonWriter, customScalarAdapters: CustomScalarAdapters, withBooleanDefaultValues: Boolean, - ): Unit { + ) { // This fragment doesn't have any variable } - public override fun adapter(): CompositeAdapter = - DroidFragmentImpl_ResponseAdapter.Data.obj() + override fun adapter(): CompositeAdapter = DroidFragmentImpl_ResponseAdapter.Data.obj() - public override fun rootField(): CompiledField = CompiledField.Builder( + override fun rootField(): CompiledField = CompiledField.Builder( name = "data", type = Droid.type ) @@ -46,10 +44,10 @@ public class DroidFragmentImpl() : Fragment { /** * What others call this droid */ - public override val name: String, + override val name: String, /** * This droid's primary function */ - public override val primaryFunction: String?, + override val primaryFunction: String?, ) : DroidFragment, Fragment.Data } diff --git a/libraries/apollo-compiler/src/test/graphql/com/example/root_query_fragment_with_nested_fragments/kotlin/responseBased/root_query_fragment_with_nested_fragments/fragment/DroidFragmentImpl_ResponseAdapter.kt.expected b/libraries/apollo-compiler/src/test/graphql/com/example/root_query_fragment_with_nested_fragments/kotlin/responseBased/root_query_fragment_with_nested_fragments/fragment/DroidFragmentImpl_ResponseAdapter.kt.expected index 36e78ba30d9..a4cfc757d38 100644 --- a/libraries/apollo-compiler/src/test/graphql/com/example/root_query_fragment_with_nested_fragments/kotlin/responseBased/root_query_fragment_with_nested_fragments/fragment/DroidFragmentImpl_ResponseAdapter.kt.expected +++ b/libraries/apollo-compiler/src/test/graphql/com/example/root_query_fragment_with_nested_fragments/kotlin/responseBased/root_query_fragment_with_nested_fragments/fragment/DroidFragmentImpl_ResponseAdapter.kt.expected @@ -13,14 +13,13 @@ import com.apollographql.apollo3.api.StringAdapter import com.apollographql.apollo3.api.json.JsonReader import com.apollographql.apollo3.api.json.JsonWriter import kotlin.String -import kotlin.Unit import kotlin.collections.List public object DroidFragmentImpl_ResponseAdapter { public object Data : CompositeAdapter { public val RESPONSE_NAMES: List = listOf("name", "primaryFunction") - public override fun fromJson(reader: JsonReader, adapterContext: CompositeAdapterContext): + override fun fromJson(reader: JsonReader, adapterContext: CompositeAdapterContext): DroidFragmentImpl.Data { var _name: String? = null var _primaryFunction: String? = null @@ -39,11 +38,11 @@ public object DroidFragmentImpl_ResponseAdapter { ) } - public override fun toJson( + override fun toJson( writer: JsonWriter, `value`: DroidFragmentImpl.Data, adapterContext: CompositeAdapterContext, - ): Unit { + ) { writer.name("name") StringAdapter.toJson(writer, CustomScalarAdapters.Empty, value.name) diff --git a/libraries/apollo-compiler/src/test/graphql/com/example/root_query_fragment_with_nested_fragments/kotlin/responseBased/root_query_fragment_with_nested_fragments/fragment/HeroFragmentImpl.kt.expected b/libraries/apollo-compiler/src/test/graphql/com/example/root_query_fragment_with_nested_fragments/kotlin/responseBased/root_query_fragment_with_nested_fragments/fragment/HeroFragmentImpl.kt.expected index 4f24d168d5a..e0ea5158049 100644 --- a/libraries/apollo-compiler/src/test/graphql/com/example/root_query_fragment_with_nested_fragments/kotlin/responseBased/root_query_fragment_with_nested_fragments/fragment/HeroFragmentImpl.kt.expected +++ b/libraries/apollo-compiler/src/test/graphql/com/example/root_query_fragment_with_nested_fragments/kotlin/responseBased/root_query_fragment_with_nested_fragments/fragment/HeroFragmentImpl.kt.expected @@ -17,25 +17,23 @@ import kotlin.Any import kotlin.Boolean import kotlin.Int import kotlin.String -import kotlin.Unit public class HeroFragmentImpl() : Fragment { - public override fun equals(other: Any?): Boolean = other != null && other::class == this::class + override fun equals(other: Any?): Boolean = other != null && other::class == this::class - public override fun hashCode(): Int = this::class.hashCode() + override fun hashCode(): Int = this::class.hashCode() - public override fun serializeVariables( + override fun serializeVariables( writer: JsonWriter, customScalarAdapters: CustomScalarAdapters, withBooleanDefaultValues: Boolean, - ): Unit { + ) { // This fragment doesn't have any variable } - public override fun adapter(): CompositeAdapter = - HeroFragmentImpl_ResponseAdapter.Data.obj() + override fun adapter(): CompositeAdapter = HeroFragmentImpl_ResponseAdapter.Data.obj() - public override fun rootField(): CompiledField = CompiledField.Builder( + override fun rootField(): CompiledField = CompiledField.Builder( name = "data", type = Character.type ) @@ -46,6 +44,6 @@ public class HeroFragmentImpl() : Fragment { /** * The name of the character */ - public override val name: String, + override val name: String, ) : HeroFragment, Fragment.Data } diff --git a/libraries/apollo-compiler/src/test/graphql/com/example/root_query_fragment_with_nested_fragments/kotlin/responseBased/root_query_fragment_with_nested_fragments/fragment/HeroFragmentImpl_ResponseAdapter.kt.expected b/libraries/apollo-compiler/src/test/graphql/com/example/root_query_fragment_with_nested_fragments/kotlin/responseBased/root_query_fragment_with_nested_fragments/fragment/HeroFragmentImpl_ResponseAdapter.kt.expected index d7d23d62003..6c058445706 100644 --- a/libraries/apollo-compiler/src/test/graphql/com/example/root_query_fragment_with_nested_fragments/kotlin/responseBased/root_query_fragment_with_nested_fragments/fragment/HeroFragmentImpl_ResponseAdapter.kt.expected +++ b/libraries/apollo-compiler/src/test/graphql/com/example/root_query_fragment_with_nested_fragments/kotlin/responseBased/root_query_fragment_with_nested_fragments/fragment/HeroFragmentImpl_ResponseAdapter.kt.expected @@ -12,14 +12,13 @@ import com.apollographql.apollo3.api.StringAdapter import com.apollographql.apollo3.api.json.JsonReader import com.apollographql.apollo3.api.json.JsonWriter import kotlin.String -import kotlin.Unit import kotlin.collections.List public object HeroFragmentImpl_ResponseAdapter { public object Data : CompositeAdapter { public val RESPONSE_NAMES: List = listOf("name") - public override fun fromJson(reader: JsonReader, adapterContext: CompositeAdapterContext): + override fun fromJson(reader: JsonReader, adapterContext: CompositeAdapterContext): HeroFragmentImpl.Data { var _name: String? = null @@ -35,11 +34,11 @@ public object HeroFragmentImpl_ResponseAdapter { ) } - public override fun toJson( + override fun toJson( writer: JsonWriter, `value`: HeroFragmentImpl.Data, adapterContext: CompositeAdapterContext, - ): Unit { + ) { writer.name("name") StringAdapter.toJson(writer, CustomScalarAdapters.Empty, value.name) } diff --git a/libraries/apollo-compiler/src/test/graphql/com/example/root_query_fragment_with_nested_fragments/kotlin/responseBased/root_query_fragment_with_nested_fragments/fragment/QueryFragment.kt.expected b/libraries/apollo-compiler/src/test/graphql/com/example/root_query_fragment_with_nested_fragments/kotlin/responseBased/root_query_fragment_with_nested_fragments/fragment/QueryFragment.kt.expected index 4861633de3c..e0a7e4f5d57 100644 --- a/libraries/apollo-compiler/src/test/graphql/com/example/root_query_fragment_with_nested_fragments/kotlin/responseBased/root_query_fragment_with_nested_fragments/fragment/QueryFragment.kt.expected +++ b/libraries/apollo-compiler/src/test/graphql/com/example/root_query_fragment_with_nested_fragments/kotlin/responseBased/root_query_fragment_with_nested_fragments/fragment/QueryFragment.kt.expected @@ -6,6 +6,7 @@ package com.example.root_query_fragment_with_nested_fragments.fragment import kotlin.String +import kotlin.Suppress public interface QueryFragment { public val __typename: String @@ -22,10 +23,11 @@ public interface QueryFragment { /** * The name of the character */ - public override val name: String + override val name: String public companion object { - public fun Hero.heroFragment() = this as? HeroFragment + @Suppress("USELESS_CAST") + public fun Hero.heroFragment(): HeroFragment? = this as? HeroFragment } } @@ -35,15 +37,16 @@ public interface QueryFragment { /** * What others call this droid */ - public override val name: String + override val name: String /** * This droid's primary function */ - public override val primaryFunction: String? + override val primaryFunction: String? public companion object { - public fun Droid.droidFragment() = this as? DroidFragment + @Suppress("USELESS_CAST") + public fun Droid.droidFragment(): DroidFragment? = this as? DroidFragment } } diff --git a/libraries/apollo-compiler/src/test/graphql/com/example/root_query_fragment_with_nested_fragments/kotlin/responseBased/root_query_fragment_with_nested_fragments/fragment/QueryFragmentImpl.kt.expected b/libraries/apollo-compiler/src/test/graphql/com/example/root_query_fragment_with_nested_fragments/kotlin/responseBased/root_query_fragment_with_nested_fragments/fragment/QueryFragmentImpl.kt.expected index 78b9ff1a54f..002b22c3fa1 100644 --- a/libraries/apollo-compiler/src/test/graphql/com/example/root_query_fragment_with_nested_fragments/kotlin/responseBased/root_query_fragment_with_nested_fragments/fragment/QueryFragmentImpl.kt.expected +++ b/libraries/apollo-compiler/src/test/graphql/com/example/root_query_fragment_with_nested_fragments/kotlin/responseBased/root_query_fragment_with_nested_fragments/fragment/QueryFragmentImpl.kt.expected @@ -17,25 +17,24 @@ import kotlin.Any import kotlin.Boolean import kotlin.Int import kotlin.String -import kotlin.Unit +import kotlin.Suppress public class QueryFragmentImpl() : Fragment { - public override fun equals(other: Any?): Boolean = other != null && other::class == this::class + override fun equals(other: Any?): Boolean = other != null && other::class == this::class - public override fun hashCode(): Int = this::class.hashCode() + override fun hashCode(): Int = this::class.hashCode() - public override fun serializeVariables( + override fun serializeVariables( writer: JsonWriter, customScalarAdapters: CustomScalarAdapters, withBooleanDefaultValues: Boolean, - ): Unit { + ) { // This fragment doesn't have any variable } - public override fun adapter(): CompositeAdapter = - QueryFragmentImpl_ResponseAdapter.Data.obj() + override fun adapter(): CompositeAdapter = QueryFragmentImpl_ResponseAdapter.Data.obj() - public override fun rootField(): CompiledField = CompiledField.Builder( + override fun rootField(): CompiledField = CompiledField.Builder( name = "data", type = Query.type ) @@ -43,49 +42,51 @@ public class QueryFragmentImpl() : Fragment { .build() public data class Data( - public override val __typename: String, - public override val hero: Hero?, - public override val droid: Droid?, - public override val human: Human?, + override val __typename: String, + override val hero: Hero?, + override val droid: Droid?, + override val human: Human?, ) : QueryFragment, Fragment.Data { public data class Hero( - public override val __typename: String, + override val __typename: String, /** * The name of the character */ - public override val name: String, + override val name: String, ) : HeroFragment, QueryFragment.Hero { public companion object { - public fun Hero.heroFragment() = this as? HeroFragment + @Suppress("USELESS_CAST") + public fun Hero.heroFragment(): HeroFragment? = this as? HeroFragment } } public data class Droid( - public override val __typename: String, + override val __typename: String, /** * What others call this droid */ - public override val name: String, + override val name: String, /** * This droid's primary function */ - public override val primaryFunction: String?, + override val primaryFunction: String?, ) : DroidFragment, QueryFragment.Droid { public companion object { - public fun Droid.droidFragment() = this as? DroidFragment + @Suppress("USELESS_CAST") + public fun Droid.droidFragment(): DroidFragment? = this as? DroidFragment } } public data class Human( - public override val __typename: String, + override val __typename: String, /** * What this human calls themselves */ - public override val name: String, + override val name: String, /** * The home planet of the human, or null if unknown */ - public override val homePlanet: String?, + override val homePlanet: String?, ) : QueryFragment.Human } } diff --git a/libraries/apollo-compiler/src/test/graphql/com/example/root_query_fragment_with_nested_fragments/kotlin/responseBased/root_query_fragment_with_nested_fragments/fragment/QueryFragmentImpl_ResponseAdapter.kt.expected b/libraries/apollo-compiler/src/test/graphql/com/example/root_query_fragment_with_nested_fragments/kotlin/responseBased/root_query_fragment_with_nested_fragments/fragment/QueryFragmentImpl_ResponseAdapter.kt.expected index 75353710e0b..308419a7d42 100644 --- a/libraries/apollo-compiler/src/test/graphql/com/example/root_query_fragment_with_nested_fragments/kotlin/responseBased/root_query_fragment_with_nested_fragments/fragment/QueryFragmentImpl_ResponseAdapter.kt.expected +++ b/libraries/apollo-compiler/src/test/graphql/com/example/root_query_fragment_with_nested_fragments/kotlin/responseBased/root_query_fragment_with_nested_fragments/fragment/QueryFragmentImpl_ResponseAdapter.kt.expected @@ -15,14 +15,13 @@ import com.apollographql.apollo3.api.json.JsonWriter import com.apollographql.apollo3.api.nullable import com.apollographql.apollo3.api.obj import kotlin.String -import kotlin.Unit import kotlin.collections.List public object QueryFragmentImpl_ResponseAdapter { public object Data : CompositeAdapter { public val RESPONSE_NAMES: List = listOf("__typename", "hero", "droid", "human") - public override fun fromJson(reader: JsonReader, adapterContext: CompositeAdapterContext): + override fun fromJson(reader: JsonReader, adapterContext: CompositeAdapterContext): QueryFragmentImpl.Data { var __typename: String? = null var _hero: QueryFragmentImpl.Data.Hero? = null @@ -47,11 +46,11 @@ public object QueryFragmentImpl_ResponseAdapter { ) } - public override fun toJson( + override fun toJson( writer: JsonWriter, `value`: QueryFragmentImpl.Data, adapterContext: CompositeAdapterContext, - ): Unit { + ) { writer.name("__typename") StringAdapter.toJson(writer, CustomScalarAdapters.Empty, value.__typename) @@ -68,7 +67,7 @@ public object QueryFragmentImpl_ResponseAdapter { private object Hero : CompositeAdapter { public val RESPONSE_NAMES: List = listOf("__typename", "name") - public override fun fromJson(reader: JsonReader, adapterContext: CompositeAdapterContext): + override fun fromJson(reader: JsonReader, adapterContext: CompositeAdapterContext): QueryFragmentImpl.Data.Hero { var __typename: String? = null var _name: String? = null @@ -87,11 +86,11 @@ public object QueryFragmentImpl_ResponseAdapter { ) } - public override fun toJson( + override fun toJson( writer: JsonWriter, `value`: QueryFragmentImpl.Data.Hero, adapterContext: CompositeAdapterContext, - ): Unit { + ) { writer.name("__typename") StringAdapter.toJson(writer, CustomScalarAdapters.Empty, value.__typename) @@ -103,7 +102,7 @@ public object QueryFragmentImpl_ResponseAdapter { private object Droid : CompositeAdapter { public val RESPONSE_NAMES: List = listOf("__typename", "name", "primaryFunction") - public override fun fromJson(reader: JsonReader, adapterContext: CompositeAdapterContext): + override fun fromJson(reader: JsonReader, adapterContext: CompositeAdapterContext): QueryFragmentImpl.Data.Droid { var __typename: String? = null var _name: String? = null @@ -125,11 +124,11 @@ public object QueryFragmentImpl_ResponseAdapter { ) } - public override fun toJson( + override fun toJson( writer: JsonWriter, `value`: QueryFragmentImpl.Data.Droid, adapterContext: CompositeAdapterContext, - ): Unit { + ) { writer.name("__typename") StringAdapter.toJson(writer, CustomScalarAdapters.Empty, value.__typename) @@ -144,7 +143,7 @@ public object QueryFragmentImpl_ResponseAdapter { private object Human : CompositeAdapter { public val RESPONSE_NAMES: List = listOf("__typename", "name", "homePlanet") - public override fun fromJson(reader: JsonReader, adapterContext: CompositeAdapterContext): + override fun fromJson(reader: JsonReader, adapterContext: CompositeAdapterContext): QueryFragmentImpl.Data.Human { var __typename: String? = null var _name: String? = null @@ -166,11 +165,11 @@ public object QueryFragmentImpl_ResponseAdapter { ) } - public override fun toJson( + override fun toJson( writer: JsonWriter, `value`: QueryFragmentImpl.Data.Human, adapterContext: CompositeAdapterContext, - ): Unit { + ) { writer.name("__typename") StringAdapter.toJson(writer, CustomScalarAdapters.Empty, value.__typename) diff --git a/libraries/apollo-compiler/src/test/graphql/com/example/root_query_inline_fragment/kotlin/operationBased/root_query_inline_fragment/TestQuery.kt.expected b/libraries/apollo-compiler/src/test/graphql/com/example/root_query_inline_fragment/kotlin/operationBased/root_query_inline_fragment/TestQuery.kt.expected index 7be83fedffc..22a161cb3df 100644 --- a/libraries/apollo-compiler/src/test/graphql/com/example/root_query_inline_fragment/kotlin/operationBased/root_query_inline_fragment/TestQuery.kt.expected +++ b/libraries/apollo-compiler/src/test/graphql/com/example/root_query_inline_fragment/kotlin/operationBased/root_query_inline_fragment/TestQuery.kt.expected @@ -20,33 +20,33 @@ import kotlin.Boolean import kotlin.Double import kotlin.Int import kotlin.String -import kotlin.Unit import kotlin.collections.List +import com.example.root_query_inline_fragment.type.Query as CompiledQuery public class TestQuery() : Query { - public override fun equals(other: Any?): Boolean = other != null && other::class == this::class + override fun equals(other: Any?): Boolean = other != null && other::class == this::class - public override fun hashCode(): Int = this::class.hashCode() + override fun hashCode(): Int = this::class.hashCode() - public override fun id(): String = OPERATION_ID + override fun id(): String = OPERATION_ID - public override fun document(): String = OPERATION_DOCUMENT + override fun document(): String = OPERATION_DOCUMENT - public override fun name(): String = OPERATION_NAME + override fun name(): String = OPERATION_NAME - public override fun serializeVariables( + override fun serializeVariables( writer: JsonWriter, customScalarAdapters: CustomScalarAdapters, withBooleanDefaultValues: Boolean, - ): Unit { + ) { // This operation doesn't have any variable } - public override fun adapter(): CompositeAdapter = TestQuery_ResponseAdapter.Data.obj(true) + override fun adapter(): CompositeAdapter = TestQuery_ResponseAdapter.Data.obj(true) - public override fun rootField(): CompiledField = CompiledField.Builder( + override fun rootField(): CompiledField = CompiledField.Builder( name = "data", - type = com.example.root_query_inline_fragment.type.Query.type + type = CompiledQuery.type ) .selections(selections = TestQuerySelections.__root) .build() diff --git a/libraries/apollo-compiler/src/test/graphql/com/example/root_query_inline_fragment/kotlin/operationBased/root_query_inline_fragment/adapter/TestQuery_ResponseAdapter.kt.expected b/libraries/apollo-compiler/src/test/graphql/com/example/root_query_inline_fragment/kotlin/operationBased/root_query_inline_fragment/adapter/TestQuery_ResponseAdapter.kt.expected index cba34af7882..7bab9d9eaba 100644 --- a/libraries/apollo-compiler/src/test/graphql/com/example/root_query_inline_fragment/kotlin/operationBased/root_query_inline_fragment/adapter/TestQuery_ResponseAdapter.kt.expected +++ b/libraries/apollo-compiler/src/test/graphql/com/example/root_query_inline_fragment/kotlin/operationBased/root_query_inline_fragment/adapter/TestQuery_ResponseAdapter.kt.expected @@ -23,14 +23,13 @@ import com.example.root_query_inline_fragment.type.Episode import com.example.root_query_inline_fragment.type.adapter.Episode_ResponseAdapter import kotlin.Double import kotlin.String -import kotlin.Unit import kotlin.collections.List public object TestQuery_ResponseAdapter { public object Data : CompositeAdapter { public val RESPONSE_NAMES: List = listOf("__typename") - public override fun fromJson(reader: JsonReader, adapterContext: CompositeAdapterContext): + override fun fromJson(reader: JsonReader, adapterContext: CompositeAdapterContext): TestQuery.Data { var __typename: String? = null @@ -51,11 +50,11 @@ public object TestQuery_ResponseAdapter { ) } - public override fun toJson( + override fun toJson( writer: JsonWriter, `value`: TestQuery.Data, adapterContext: CompositeAdapterContext, - ): Unit { + ) { writer.name("__typename") StringAdapter.toJson(writer, CustomScalarAdapters.Empty, value.__typename) @@ -66,7 +65,7 @@ public object TestQuery_ResponseAdapter { private object OnQuery : CompositeAdapter { public val RESPONSE_NAMES: List = listOf("__typename", "hero", "droid") - public override fun fromJson(reader: JsonReader, adapterContext: CompositeAdapterContext): + override fun fromJson(reader: JsonReader, adapterContext: CompositeAdapterContext): TestQuery.Data.OnQuery { var __typename: String? = null var _hero: TestQuery.Data.OnQuery.Hero? = null @@ -88,11 +87,11 @@ public object TestQuery_ResponseAdapter { ) } - public override fun toJson( + override fun toJson( writer: JsonWriter, `value`: TestQuery.Data.OnQuery, adapterContext: CompositeAdapterContext, - ): Unit { + ) { writer.name("__typename") StringAdapter.toJson(writer, CustomScalarAdapters.Empty, value.__typename) @@ -106,7 +105,7 @@ public object TestQuery_ResponseAdapter { private object Hero : CompositeAdapter { public val RESPONSE_NAMES: List = listOf("__typename", "name", "appearsIn") - public override fun fromJson(reader: JsonReader, adapterContext: CompositeAdapterContext): + override fun fromJson(reader: JsonReader, adapterContext: CompositeAdapterContext): TestQuery.Data.OnQuery.Hero { var __typename: String? = null var _name: String? = null @@ -140,11 +139,11 @@ public object TestQuery_ResponseAdapter { ) } - public override fun toJson( + override fun toJson( writer: JsonWriter, `value`: TestQuery.Data.OnQuery.Hero, adapterContext: CompositeAdapterContext, - ): Unit { + ) { writer.name("__typename") StringAdapter.toJson(writer, CustomScalarAdapters.Empty, value.__typename) @@ -164,7 +163,7 @@ public object TestQuery_ResponseAdapter { private object OnHuman : CompositeAdapter { public val RESPONSE_NAMES: List = listOf("height") - public override fun fromJson(reader: JsonReader, adapterContext: CompositeAdapterContext): + override fun fromJson(reader: JsonReader, adapterContext: CompositeAdapterContext): TestQuery.Data.OnQuery.Hero.OnHuman { var _height: Double? = null @@ -180,11 +179,11 @@ public object TestQuery_ResponseAdapter { ) } - public override fun toJson( + override fun toJson( writer: JsonWriter, `value`: TestQuery.Data.OnQuery.Hero.OnHuman, adapterContext: CompositeAdapterContext, - ): Unit { + ) { writer.name("height") NullableDoubleAdapter.toJson(writer, CustomScalarAdapters.Empty, value.height) } @@ -194,7 +193,7 @@ public object TestQuery_ResponseAdapter { private object Droid : CompositeAdapter { public val RESPONSE_NAMES: List = listOf("__typename") - public override fun fromJson(reader: JsonReader, adapterContext: CompositeAdapterContext): + override fun fromJson(reader: JsonReader, adapterContext: CompositeAdapterContext): TestQuery.Data.OnQuery.Droid { var __typename: String? = null @@ -215,11 +214,11 @@ public object TestQuery_ResponseAdapter { ) } - public override fun toJson( + override fun toJson( writer: JsonWriter, `value`: TestQuery.Data.OnQuery.Droid, adapterContext: CompositeAdapterContext, - ): Unit { + ) { writer.name("__typename") StringAdapter.toJson(writer, CustomScalarAdapters.Empty, value.__typename) @@ -230,7 +229,7 @@ public object TestQuery_ResponseAdapter { private object OnDroid : CompositeAdapter { public val RESPONSE_NAMES: List = listOf("name", "primaryFunction") - public override fun fromJson(reader: JsonReader, adapterContext: CompositeAdapterContext): + override fun fromJson(reader: JsonReader, adapterContext: CompositeAdapterContext): TestQuery.Data.OnQuery.Droid.OnDroid { var _name: String? = null var _primaryFunction: String? = null @@ -249,11 +248,11 @@ public object TestQuery_ResponseAdapter { ) } - public override fun toJson( + override fun toJson( writer: JsonWriter, `value`: TestQuery.Data.OnQuery.Droid.OnDroid, adapterContext: CompositeAdapterContext, - ): Unit { + ) { writer.name("name") StringAdapter.toJson(writer, CustomScalarAdapters.Empty, value.name) diff --git a/libraries/apollo-compiler/src/test/graphql/com/example/root_query_inline_fragment/kotlin/operationBased/root_query_inline_fragment/type/adapter/Episode_ResponseAdapter.kt.expected b/libraries/apollo-compiler/src/test/graphql/com/example/root_query_inline_fragment/kotlin/operationBased/root_query_inline_fragment/type/adapter/Episode_ResponseAdapter.kt.expected index 0738ee348c1..bc573a99f2a 100644 --- a/libraries/apollo-compiler/src/test/graphql/com/example/root_query_inline_fragment/kotlin/operationBased/root_query_inline_fragment/type/adapter/Episode_ResponseAdapter.kt.expected +++ b/libraries/apollo-compiler/src/test/graphql/com/example/root_query_inline_fragment/kotlin/operationBased/root_query_inline_fragment/type/adapter/Episode_ResponseAdapter.kt.expected @@ -10,20 +10,18 @@ import com.apollographql.apollo3.api.CustomScalarAdapters import com.apollographql.apollo3.api.json.JsonReader import com.apollographql.apollo3.api.json.JsonWriter import com.example.root_query_inline_fragment.type.Episode -import kotlin.Unit public object Episode_ResponseAdapter : Adapter { - public override fun fromJson(reader: JsonReader, customScalarAdapters: CustomScalarAdapters): - Episode { + override fun fromJson(reader: JsonReader, customScalarAdapters: CustomScalarAdapters): Episode { val rawValue = reader.nextString()!! return Episode.safeValueOf(rawValue) } - public override fun toJson( + override fun toJson( writer: JsonWriter, customScalarAdapters: CustomScalarAdapters, `value`: Episode, - ): Unit { + ) { writer.value(value.rawValue) } } diff --git a/libraries/apollo-compiler/src/test/graphql/com/example/root_query_inline_fragment/kotlin/responseBased/root_query_inline_fragment/TestQuery.kt.expected b/libraries/apollo-compiler/src/test/graphql/com/example/root_query_inline_fragment/kotlin/responseBased/root_query_inline_fragment/TestQuery.kt.expected index a3cb3843740..b3fd99a0ca1 100644 --- a/libraries/apollo-compiler/src/test/graphql/com/example/root_query_inline_fragment/kotlin/responseBased/root_query_inline_fragment/TestQuery.kt.expected +++ b/libraries/apollo-compiler/src/test/graphql/com/example/root_query_inline_fragment/kotlin/responseBased/root_query_inline_fragment/TestQuery.kt.expected @@ -20,33 +20,34 @@ import kotlin.Boolean import kotlin.Double import kotlin.Int import kotlin.String -import kotlin.Unit +import kotlin.Suppress import kotlin.collections.List +import com.example.root_query_inline_fragment.type.Query as CompiledQuery public class TestQuery() : Query { - public override fun equals(other: Any?): Boolean = other != null && other::class == this::class + override fun equals(other: Any?): Boolean = other != null && other::class == this::class - public override fun hashCode(): Int = this::class.hashCode() + override fun hashCode(): Int = this::class.hashCode() - public override fun id(): String = OPERATION_ID + override fun id(): String = OPERATION_ID - public override fun document(): String = OPERATION_DOCUMENT + override fun document(): String = OPERATION_DOCUMENT - public override fun name(): String = OPERATION_NAME + override fun name(): String = OPERATION_NAME - public override fun serializeVariables( + override fun serializeVariables( writer: JsonWriter, customScalarAdapters: CustomScalarAdapters, withBooleanDefaultValues: Boolean, - ): Unit { + ) { // This operation doesn't have any variable } - public override fun adapter(): CompositeAdapter = TestQuery_ResponseAdapter.Data.obj() + override fun adapter(): CompositeAdapter = TestQuery_ResponseAdapter.Data.obj() - public override fun rootField(): CompiledField = CompiledField.Builder( + override fun rootField(): CompiledField = CompiledField.Builder( name = "data", - type = com.example.root_query_inline_fragment.type.Query.type + type = CompiledQuery.type ) .selections(selections = TestQuerySelections.__root) .build() @@ -71,20 +72,21 @@ public class TestQuery() : Query { public val appearsIn: List public companion object { - public fun Hero.asHuman() = this as? HumanHero + @Suppress("USELESS_CAST") + public fun Hero.asHuman(): HumanHero? = this as? HumanHero } } public data class HumanHero( - public override val __typename: String, + override val __typename: String, /** * The name of the character */ - public override val name: String, + override val name: String, /** * The movies this character appears in */ - public override val appearsIn: List, + override val appearsIn: List, /** * Height in the preferred unit, default is meters */ @@ -94,15 +96,15 @@ public class TestQuery() : Query { } public data class OtherHero( - public override val __typename: String, + override val __typename: String, /** * The name of the character */ - public override val name: String, + override val name: String, /** * The movies this character appears in */ - public override val appearsIn: List, + override val appearsIn: List, ) : Hero { public fun appearsInFilterNotNull(): List = appearsIn.filterNotNull() } diff --git a/libraries/apollo-compiler/src/test/graphql/com/example/root_query_inline_fragment/kotlin/responseBased/root_query_inline_fragment/adapter/TestQuery_ResponseAdapter.kt.expected b/libraries/apollo-compiler/src/test/graphql/com/example/root_query_inline_fragment/kotlin/responseBased/root_query_inline_fragment/adapter/TestQuery_ResponseAdapter.kt.expected index 5595406e1e2..c36dab5c90b 100644 --- a/libraries/apollo-compiler/src/test/graphql/com/example/root_query_inline_fragment/kotlin/responseBased/root_query_inline_fragment/adapter/TestQuery_ResponseAdapter.kt.expected +++ b/libraries/apollo-compiler/src/test/graphql/com/example/root_query_inline_fragment/kotlin/responseBased/root_query_inline_fragment/adapter/TestQuery_ResponseAdapter.kt.expected @@ -23,14 +23,13 @@ import com.example.root_query_inline_fragment.type.adapter.Episode_ResponseAdapt import kotlin.Double import kotlin.String import kotlin.Suppress -import kotlin.Unit import kotlin.collections.List public object TestQuery_ResponseAdapter { public object Data : CompositeAdapter { public val RESPONSE_NAMES: List = listOf("__typename", "hero", "droid") - public override fun fromJson(reader: JsonReader, adapterContext: CompositeAdapterContext): + override fun fromJson(reader: JsonReader, adapterContext: CompositeAdapterContext): TestQuery.Data { var __typename: String? = null var _hero: TestQuery.Data.Hero? = null @@ -52,11 +51,11 @@ public object TestQuery_ResponseAdapter { ) } - public override fun toJson( + override fun toJson( writer: JsonWriter, `value`: TestQuery.Data, adapterContext: CompositeAdapterContext, - ): Unit { + ) { writer.name("__typename") StringAdapter.toJson(writer, CustomScalarAdapters.Empty, value.__typename) @@ -68,7 +67,7 @@ public object TestQuery_ResponseAdapter { } private object Hero : CompositeAdapter { - public override fun fromJson(reader: JsonReader, adapterContext: CompositeAdapterContext): + override fun fromJson(reader: JsonReader, adapterContext: CompositeAdapterContext): TestQuery.Data.Hero { val __typename = reader.readTypename() return when(__typename) { @@ -79,11 +78,11 @@ public object TestQuery_ResponseAdapter { } } - public override fun toJson( + override fun toJson( writer: JsonWriter, `value`: TestQuery.Data.Hero, adapterContext: CompositeAdapterContext, - ): Unit { + ) { when(value) { is TestQuery.Data.HumanHero -> HumanHero.toJson(writer, value, adapterContext) is TestQuery.Data.OtherHero -> OtherHero.toJson(writer, value, adapterContext) @@ -126,7 +125,7 @@ public object TestQuery_ResponseAdapter { writer: JsonWriter, `value`: TestQuery.Data.HumanHero, @Suppress("UNUSED_PARAMETER") adapterContext: CompositeAdapterContext, - ): Unit { + ) { writer.name("__typename") StringAdapter.toJson(writer, CustomScalarAdapters.Empty, value.__typename) @@ -174,7 +173,7 @@ public object TestQuery_ResponseAdapter { writer: JsonWriter, `value`: TestQuery.Data.OtherHero, @Suppress("UNUSED_PARAMETER") adapterContext: CompositeAdapterContext, - ): Unit { + ) { writer.name("__typename") StringAdapter.toJson(writer, CustomScalarAdapters.Empty, value.__typename) @@ -190,7 +189,7 @@ public object TestQuery_ResponseAdapter { private object Droid : CompositeAdapter { public val RESPONSE_NAMES: List = listOf("__typename", "name", "primaryFunction") - public override fun fromJson(reader: JsonReader, adapterContext: CompositeAdapterContext): + override fun fromJson(reader: JsonReader, adapterContext: CompositeAdapterContext): TestQuery.Data.Droid { var __typename: String? = null var _name: String? = null @@ -212,11 +211,11 @@ public object TestQuery_ResponseAdapter { ) } - public override fun toJson( + override fun toJson( writer: JsonWriter, `value`: TestQuery.Data.Droid, adapterContext: CompositeAdapterContext, - ): Unit { + ) { writer.name("__typename") StringAdapter.toJson(writer, CustomScalarAdapters.Empty, value.__typename) diff --git a/libraries/apollo-compiler/src/test/graphql/com/example/root_query_inline_fragment/kotlin/responseBased/root_query_inline_fragment/type/adapter/Episode_ResponseAdapter.kt.expected b/libraries/apollo-compiler/src/test/graphql/com/example/root_query_inline_fragment/kotlin/responseBased/root_query_inline_fragment/type/adapter/Episode_ResponseAdapter.kt.expected index 0738ee348c1..bc573a99f2a 100644 --- a/libraries/apollo-compiler/src/test/graphql/com/example/root_query_inline_fragment/kotlin/responseBased/root_query_inline_fragment/type/adapter/Episode_ResponseAdapter.kt.expected +++ b/libraries/apollo-compiler/src/test/graphql/com/example/root_query_inline_fragment/kotlin/responseBased/root_query_inline_fragment/type/adapter/Episode_ResponseAdapter.kt.expected @@ -10,20 +10,18 @@ import com.apollographql.apollo3.api.CustomScalarAdapters import com.apollographql.apollo3.api.json.JsonReader import com.apollographql.apollo3.api.json.JsonWriter import com.example.root_query_inline_fragment.type.Episode -import kotlin.Unit public object Episode_ResponseAdapter : Adapter { - public override fun fromJson(reader: JsonReader, customScalarAdapters: CustomScalarAdapters): - Episode { + override fun fromJson(reader: JsonReader, customScalarAdapters: CustomScalarAdapters): Episode { val rawValue = reader.nextString()!! return Episode.safeValueOf(rawValue) } - public override fun toJson( + override fun toJson( writer: JsonWriter, customScalarAdapters: CustomScalarAdapters, `value`: Episode, - ): Unit { + ) { writer.value(value.rawValue) } } diff --git a/libraries/apollo-compiler/src/test/graphql/com/example/simple_fragment/kotlin/operationBased/simple_fragment/TestQuery.kt.expected b/libraries/apollo-compiler/src/test/graphql/com/example/simple_fragment/kotlin/operationBased/simple_fragment/TestQuery.kt.expected index 5cef6a93761..62c81b460bf 100644 --- a/libraries/apollo-compiler/src/test/graphql/com/example/simple_fragment/kotlin/operationBased/simple_fragment/TestQuery.kt.expected +++ b/libraries/apollo-compiler/src/test/graphql/com/example/simple_fragment/kotlin/operationBased/simple_fragment/TestQuery.kt.expected @@ -27,35 +27,36 @@ import kotlin.Boolean import kotlin.Int import kotlin.String import kotlin.Unit +import com.example.simple_fragment.type.Query as CompiledQuery /** * Demonstration of Java / Kotlin docs generation * for both query and fragments */ internal class TestQuery() : Query { - public override fun equals(other: Any?): Boolean = other != null && other::class == this::class + override fun equals(other: Any?): Boolean = other != null && other::class == this::class - public override fun hashCode(): Int = this::class.hashCode() + override fun hashCode(): Int = this::class.hashCode() - public override fun id(): String = OPERATION_ID + override fun id(): String = OPERATION_ID - public override fun document(): String = OPERATION_DOCUMENT + override fun document(): String = OPERATION_DOCUMENT - public override fun name(): String = OPERATION_NAME + override fun name(): String = OPERATION_NAME - public override fun serializeVariables( + override fun serializeVariables( writer: JsonWriter, customScalarAdapters: CustomScalarAdapters, withBooleanDefaultValues: Boolean, - ): Unit { + ) { // This operation doesn't have any variable } - public override fun adapter(): CompositeAdapter = TestQuery_ResponseAdapter.Data.obj() + override fun adapter(): CompositeAdapter = TestQuery_ResponseAdapter.Data.obj() - public override fun rootField(): CompiledField = CompiledField.Builder( + override fun rootField(): CompiledField = CompiledField.Builder( name = "data", - type = com.example.simple_fragment.type.Query.type + type = CompiledQuery.type ) .selections(selections = TestQuerySelections.__root) .build() @@ -111,7 +112,7 @@ internal class TestQuery() : Query { public fun Data(resolver: FakeResolver = DefaultFakeResolver(__Schema.all), block: QueryBuilder.() -> Unit = {}): Data = buildData( - com.example.simple_fragment.type.Query, + CompiledQuery, block, TestQuery_ResponseAdapter.Data, TestQuerySelections.__root, diff --git a/libraries/apollo-compiler/src/test/graphql/com/example/simple_fragment/kotlin/operationBased/simple_fragment/adapter/TestQuery_ResponseAdapter.kt.expected b/libraries/apollo-compiler/src/test/graphql/com/example/simple_fragment/kotlin/operationBased/simple_fragment/adapter/TestQuery_ResponseAdapter.kt.expected index c177f07629d..9aa96593e0b 100644 --- a/libraries/apollo-compiler/src/test/graphql/com/example/simple_fragment/kotlin/operationBased/simple_fragment/adapter/TestQuery_ResponseAdapter.kt.expected +++ b/libraries/apollo-compiler/src/test/graphql/com/example/simple_fragment/kotlin/operationBased/simple_fragment/adapter/TestQuery_ResponseAdapter.kt.expected @@ -18,14 +18,13 @@ import com.apollographql.apollo3.api.possibleTypes import com.example.simple_fragment.TestQuery import com.example.simple_fragment.fragment.HumanDetails import kotlin.String -import kotlin.Unit import kotlin.collections.List internal object TestQuery_ResponseAdapter { public object Data : CompositeAdapter { public val RESPONSE_NAMES: List = listOf("hero") - public override fun fromJson(reader: JsonReader, adapterContext: CompositeAdapterContext): + override fun fromJson(reader: JsonReader, adapterContext: CompositeAdapterContext): TestQuery.Data { var _hero: TestQuery.Data.Hero? = null @@ -41,11 +40,11 @@ internal object TestQuery_ResponseAdapter { ) } - public override fun toJson( + override fun toJson( writer: JsonWriter, `value`: TestQuery.Data, adapterContext: CompositeAdapterContext, - ): Unit { + ) { writer.name("hero") Hero.obj(true).nullable().toJson(writer, value.hero, adapterContext) } @@ -53,7 +52,7 @@ internal object TestQuery_ResponseAdapter { private object Hero : CompositeAdapter { public val RESPONSE_NAMES: List = listOf("__typename") - public override fun fromJson(reader: JsonReader, adapterContext: CompositeAdapterContext): + override fun fromJson(reader: JsonReader, adapterContext: CompositeAdapterContext): TestQuery.Data.Hero { var __typename: String? = null @@ -86,11 +85,11 @@ internal object TestQuery_ResponseAdapter { ) } - public override fun toJson( + override fun toJson( writer: JsonWriter, `value`: TestQuery.Data.Hero, adapterContext: CompositeAdapterContext, - ): Unit { + ) { writer.name("__typename") StringAdapter.toJson(writer, CustomScalarAdapters.Empty, value.__typename) diff --git a/libraries/apollo-compiler/src/test/graphql/com/example/simple_fragment/kotlin/operationBased/simple_fragment/fragment/HeroDetailsImpl.kt.expected b/libraries/apollo-compiler/src/test/graphql/com/example/simple_fragment/kotlin/operationBased/simple_fragment/fragment/HeroDetailsImpl.kt.expected index b0533823ad0..61ba8a23099 100644 --- a/libraries/apollo-compiler/src/test/graphql/com/example/simple_fragment/kotlin/operationBased/simple_fragment/fragment/HeroDetailsImpl.kt.expected +++ b/libraries/apollo-compiler/src/test/graphql/com/example/simple_fragment/kotlin/operationBased/simple_fragment/fragment/HeroDetailsImpl.kt.expected @@ -31,22 +31,22 @@ import kotlin.Unit * with multi lines support */ internal class HeroDetailsImpl() : Fragment { - public override fun equals(other: Any?): Boolean = other != null && other::class == this::class + override fun equals(other: Any?): Boolean = other != null && other::class == this::class - public override fun hashCode(): Int = this::class.hashCode() + override fun hashCode(): Int = this::class.hashCode() - public override fun serializeVariables( + override fun serializeVariables( writer: JsonWriter, customScalarAdapters: CustomScalarAdapters, withBooleanDefaultValues: Boolean, - ): Unit { + ) { // This fragment doesn't have any variable } - public override fun adapter(): CompositeAdapter = + override fun adapter(): CompositeAdapter = HeroDetailsImpl_ResponseAdapter.HeroDetails.obj(true) - public override fun rootField(): CompiledField = CompiledField.Builder( + override fun rootField(): CompiledField = CompiledField.Builder( name = "data", type = Character.type ) diff --git a/libraries/apollo-compiler/src/test/graphql/com/example/simple_fragment/kotlin/operationBased/simple_fragment/fragment/HeroDetailsImpl_ResponseAdapter.kt.expected b/libraries/apollo-compiler/src/test/graphql/com/example/simple_fragment/kotlin/operationBased/simple_fragment/fragment/HeroDetailsImpl_ResponseAdapter.kt.expected index 3c602a69b8a..f5aeb10a9f2 100644 --- a/libraries/apollo-compiler/src/test/graphql/com/example/simple_fragment/kotlin/operationBased/simple_fragment/fragment/HeroDetailsImpl_ResponseAdapter.kt.expected +++ b/libraries/apollo-compiler/src/test/graphql/com/example/simple_fragment/kotlin/operationBased/simple_fragment/fragment/HeroDetailsImpl_ResponseAdapter.kt.expected @@ -14,14 +14,13 @@ import com.apollographql.apollo3.api.json.JsonReader import com.apollographql.apollo3.api.json.JsonWriter import com.apollographql.apollo3.api.possibleTypes import kotlin.String -import kotlin.Unit import kotlin.collections.List internal object HeroDetailsImpl_ResponseAdapter { public object HeroDetails : CompositeAdapter { public val RESPONSE_NAMES: List = listOf("__typename") - public override fun fromJson(reader: JsonReader, adapterContext: CompositeAdapterContext): + override fun fromJson(reader: JsonReader, adapterContext: CompositeAdapterContext): com.example.simple_fragment.fragment.HeroDetails { var __typename: String? = null @@ -49,11 +48,11 @@ internal object HeroDetailsImpl_ResponseAdapter { ) } - public override fun toJson( + override fun toJson( writer: JsonWriter, `value`: com.example.simple_fragment.fragment.HeroDetails, adapterContext: CompositeAdapterContext, - ): Unit { + ) { writer.name("__typename") StringAdapter.toJson(writer, CustomScalarAdapters.Empty, value.__typename) diff --git a/libraries/apollo-compiler/src/test/graphql/com/example/simple_fragment/kotlin/operationBased/simple_fragment/fragment/HumanDetailsImpl.kt.expected b/libraries/apollo-compiler/src/test/graphql/com/example/simple_fragment/kotlin/operationBased/simple_fragment/fragment/HumanDetailsImpl.kt.expected index d4de6783de9..b2177689034 100644 --- a/libraries/apollo-compiler/src/test/graphql/com/example/simple_fragment/kotlin/operationBased/simple_fragment/fragment/HumanDetailsImpl.kt.expected +++ b/libraries/apollo-compiler/src/test/graphql/com/example/simple_fragment/kotlin/operationBased/simple_fragment/fragment/HumanDetailsImpl.kt.expected @@ -28,22 +28,22 @@ import kotlin.Unit * Fragment with Java / Kotlin docs generation */ internal class HumanDetailsImpl() : Fragment { - public override fun equals(other: Any?): Boolean = other != null && other::class == this::class + override fun equals(other: Any?): Boolean = other != null && other::class == this::class - public override fun hashCode(): Int = this::class.hashCode() + override fun hashCode(): Int = this::class.hashCode() - public override fun serializeVariables( + override fun serializeVariables( writer: JsonWriter, customScalarAdapters: CustomScalarAdapters, withBooleanDefaultValues: Boolean, - ): Unit { + ) { // This fragment doesn't have any variable } - public override fun adapter(): CompositeAdapter = + override fun adapter(): CompositeAdapter = HumanDetailsImpl_ResponseAdapter.HumanDetails.obj() - public override fun rootField(): CompiledField = CompiledField.Builder( + override fun rootField(): CompiledField = CompiledField.Builder( name = "data", type = Human.type ) diff --git a/libraries/apollo-compiler/src/test/graphql/com/example/simple_fragment/kotlin/operationBased/simple_fragment/fragment/HumanDetailsImpl_ResponseAdapter.kt.expected b/libraries/apollo-compiler/src/test/graphql/com/example/simple_fragment/kotlin/operationBased/simple_fragment/fragment/HumanDetailsImpl_ResponseAdapter.kt.expected index 5c87794b052..e21a3468238 100644 --- a/libraries/apollo-compiler/src/test/graphql/com/example/simple_fragment/kotlin/operationBased/simple_fragment/fragment/HumanDetailsImpl_ResponseAdapter.kt.expected +++ b/libraries/apollo-compiler/src/test/graphql/com/example/simple_fragment/kotlin/operationBased/simple_fragment/fragment/HumanDetailsImpl_ResponseAdapter.kt.expected @@ -12,14 +12,13 @@ import com.apollographql.apollo3.api.StringAdapter import com.apollographql.apollo3.api.json.JsonReader import com.apollographql.apollo3.api.json.JsonWriter import kotlin.String -import kotlin.Unit import kotlin.collections.List internal object HumanDetailsImpl_ResponseAdapter { public object HumanDetails : CompositeAdapter { public val RESPONSE_NAMES: List = listOf("__typename", "name") - public override fun fromJson(reader: JsonReader, adapterContext: CompositeAdapterContext): + override fun fromJson(reader: JsonReader, adapterContext: CompositeAdapterContext): com.example.simple_fragment.fragment.HumanDetails { var __typename: String? = null var _name: String? = null @@ -38,11 +37,11 @@ internal object HumanDetailsImpl_ResponseAdapter { ) } - public override fun toJson( + override fun toJson( writer: JsonWriter, `value`: com.example.simple_fragment.fragment.HumanDetails, adapterContext: CompositeAdapterContext, - ): Unit { + ) { writer.name("__typename") StringAdapter.toJson(writer, CustomScalarAdapters.Empty, value.__typename) diff --git a/libraries/apollo-compiler/src/test/graphql/com/example/simple_fragment/kotlin/operationBased/simple_fragment/type/Character.kt.expected b/libraries/apollo-compiler/src/test/graphql/com/example/simple_fragment/kotlin/operationBased/simple_fragment/type/Character.kt.expected index 35d991eb28f..79c819e0076 100644 --- a/libraries/apollo-compiler/src/test/graphql/com/example/simple_fragment/kotlin/operationBased/simple_fragment/type/Character.kt.expected +++ b/libraries/apollo-compiler/src/test/graphql/com/example/simple_fragment/kotlin/operationBased/simple_fragment/type/Character.kt.expected @@ -22,8 +22,8 @@ internal class Character { public companion object : BuilderFactory { public val type: InterfaceType = InterfaceType.Builder(name = "Character").build() - public override fun newBuilder(customScalarAdapters: CustomScalarAdapters): - OtherCharacterBuilder = OtherCharacterBuilder(customScalarAdapters) + override fun newBuilder(customScalarAdapters: CustomScalarAdapters): OtherCharacterBuilder = + OtherCharacterBuilder(customScalarAdapters) } } @@ -32,7 +32,7 @@ internal interface CharacterMap : Map internal class OtherCharacterBuilder( customScalarAdapters: CustomScalarAdapters, ) : ObjectBuilder(customScalarAdapters) { - public override fun build(): OtherCharacterMap = OtherCharacterMap(__fields) + override fun build(): OtherCharacterMap = OtherCharacterMap(__fields) } internal class OtherCharacterMap( diff --git a/libraries/apollo-compiler/src/test/graphql/com/example/simple_fragment/kotlin/operationBased/simple_fragment/type/Droid.kt.expected b/libraries/apollo-compiler/src/test/graphql/com/example/simple_fragment/kotlin/operationBased/simple_fragment/type/Droid.kt.expected index 284b3738227..1af22cc6a1a 100644 --- a/libraries/apollo-compiler/src/test/graphql/com/example/simple_fragment/kotlin/operationBased/simple_fragment/type/Droid.kt.expected +++ b/libraries/apollo-compiler/src/test/graphql/com/example/simple_fragment/kotlin/operationBased/simple_fragment/type/Droid.kt.expected @@ -23,7 +23,7 @@ internal class Droid { public val type: ObjectType = ObjectType.Builder(name = "Droid").interfaces(listOf(Character.type)).build() - public override fun newBuilder(customScalarAdapters: CustomScalarAdapters): DroidBuilder = + override fun newBuilder(customScalarAdapters: CustomScalarAdapters): DroidBuilder = DroidBuilder(customScalarAdapters) } } @@ -34,7 +34,7 @@ internal class DroidBuilder( init { __typename = "Droid"} - public override fun build(): DroidMap = DroidMap(__fields) + override fun build(): DroidMap = DroidMap(__fields) } internal class DroidMap( diff --git a/libraries/apollo-compiler/src/test/graphql/com/example/simple_fragment/kotlin/operationBased/simple_fragment/type/Human.kt.expected b/libraries/apollo-compiler/src/test/graphql/com/example/simple_fragment/kotlin/operationBased/simple_fragment/type/Human.kt.expected index fd3d9182026..93dd40f1d09 100644 --- a/libraries/apollo-compiler/src/test/graphql/com/example/simple_fragment/kotlin/operationBased/simple_fragment/type/Human.kt.expected +++ b/libraries/apollo-compiler/src/test/graphql/com/example/simple_fragment/kotlin/operationBased/simple_fragment/type/Human.kt.expected @@ -23,7 +23,7 @@ internal class Human { public val type: ObjectType = ObjectType.Builder(name = "Human").interfaces(listOf(Character.type)).build() - public override fun newBuilder(customScalarAdapters: CustomScalarAdapters): HumanBuilder = + override fun newBuilder(customScalarAdapters: CustomScalarAdapters): HumanBuilder = HumanBuilder(customScalarAdapters) } } @@ -36,7 +36,7 @@ internal class HumanBuilder( init { __typename = "Human"} - public override fun build(): HumanMap = HumanMap(__fields) + override fun build(): HumanMap = HumanMap(__fields) } internal class HumanMap( diff --git a/libraries/apollo-compiler/src/test/graphql/com/example/simple_fragment/kotlin/operationBased/simple_fragment/type/Query.kt.expected b/libraries/apollo-compiler/src/test/graphql/com/example/simple_fragment/kotlin/operationBased/simple_fragment/type/Query.kt.expected index 98728231517..c9a59b90d6a 100644 --- a/libraries/apollo-compiler/src/test/graphql/com/example/simple_fragment/kotlin/operationBased/simple_fragment/type/Query.kt.expected +++ b/libraries/apollo-compiler/src/test/graphql/com/example/simple_fragment/kotlin/operationBased/simple_fragment/type/Query.kt.expected @@ -22,7 +22,7 @@ internal class Query { public companion object : BuilderFactory { public val type: ObjectType = ObjectType.Builder(name = "Query").build() - public override fun newBuilder(customScalarAdapters: CustomScalarAdapters): QueryBuilder = + override fun newBuilder(customScalarAdapters: CustomScalarAdapters): QueryBuilder = QueryBuilder(customScalarAdapters) } } @@ -35,7 +35,7 @@ internal class QueryBuilder( init { __typename = "Query"} - public override fun build(): QueryMap = QueryMap(__fields) + override fun build(): QueryMap = QueryMap(__fields) } internal class QueryMap( diff --git a/libraries/apollo-compiler/src/test/graphql/com/example/simple_fragment/kotlin/operationBased/simple_fragment/type/SearchResult.kt.expected b/libraries/apollo-compiler/src/test/graphql/com/example/simple_fragment/kotlin/operationBased/simple_fragment/type/SearchResult.kt.expected index 22d4cb60932..83b97b7e1c2 100644 --- a/libraries/apollo-compiler/src/test/graphql/com/example/simple_fragment/kotlin/operationBased/simple_fragment/type/SearchResult.kt.expected +++ b/libraries/apollo-compiler/src/test/graphql/com/example/simple_fragment/kotlin/operationBased/simple_fragment/type/SearchResult.kt.expected @@ -19,8 +19,8 @@ internal class SearchResult { public companion object : BuilderFactory { public val type: UnionType = UnionType("SearchResult", Human.type, Droid.type, Starship.type) - public override fun newBuilder(customScalarAdapters: CustomScalarAdapters): - OtherSearchResultBuilder = OtherSearchResultBuilder(customScalarAdapters) + override fun newBuilder(customScalarAdapters: CustomScalarAdapters): OtherSearchResultBuilder = + OtherSearchResultBuilder(customScalarAdapters) } } @@ -29,7 +29,7 @@ internal interface SearchResultMap : Map internal class OtherSearchResultBuilder( customScalarAdapters: CustomScalarAdapters, ) : ObjectBuilder(customScalarAdapters) { - public override fun build(): OtherSearchResultMap = OtherSearchResultMap(__fields) + override fun build(): OtherSearchResultMap = OtherSearchResultMap(__fields) } internal class OtherSearchResultMap( diff --git a/libraries/apollo-compiler/src/test/graphql/com/example/simple_fragment/kotlin/operationBased/simple_fragment/type/Starship.kt.expected b/libraries/apollo-compiler/src/test/graphql/com/example/simple_fragment/kotlin/operationBased/simple_fragment/type/Starship.kt.expected index d177907ce3f..3ce48916939 100644 --- a/libraries/apollo-compiler/src/test/graphql/com/example/simple_fragment/kotlin/operationBased/simple_fragment/type/Starship.kt.expected +++ b/libraries/apollo-compiler/src/test/graphql/com/example/simple_fragment/kotlin/operationBased/simple_fragment/type/Starship.kt.expected @@ -19,7 +19,7 @@ internal class Starship { public companion object : BuilderFactory { public val type: ObjectType = ObjectType.Builder(name = "Starship").build() - public override fun newBuilder(customScalarAdapters: CustomScalarAdapters): StarshipBuilder = + override fun newBuilder(customScalarAdapters: CustomScalarAdapters): StarshipBuilder = StarshipBuilder(customScalarAdapters) } } @@ -30,7 +30,7 @@ internal class StarshipBuilder( init { __typename = "Starship"} - public override fun build(): StarshipMap = StarshipMap(__fields) + override fun build(): StarshipMap = StarshipMap(__fields) } internal class StarshipMap( diff --git a/libraries/apollo-compiler/src/test/graphql/com/example/simple_fragment/kotlin/responseBased/simple_fragment/TestQuery.kt.expected b/libraries/apollo-compiler/src/test/graphql/com/example/simple_fragment/kotlin/responseBased/simple_fragment/TestQuery.kt.expected index 37b56ea6ea1..6f56731136c 100644 --- a/libraries/apollo-compiler/src/test/graphql/com/example/simple_fragment/kotlin/responseBased/simple_fragment/TestQuery.kt.expected +++ b/libraries/apollo-compiler/src/test/graphql/com/example/simple_fragment/kotlin/responseBased/simple_fragment/TestQuery.kt.expected @@ -27,36 +27,38 @@ import kotlin.Any import kotlin.Boolean import kotlin.Int import kotlin.String +import kotlin.Suppress import kotlin.Unit +import com.example.simple_fragment.type.Query as CompiledQuery /** * Demonstration of Java / Kotlin docs generation * for both query and fragments */ internal class TestQuery() : Query { - public override fun equals(other: Any?): Boolean = other != null && other::class == this::class + override fun equals(other: Any?): Boolean = other != null && other::class == this::class - public override fun hashCode(): Int = this::class.hashCode() + override fun hashCode(): Int = this::class.hashCode() - public override fun id(): String = OPERATION_ID + override fun id(): String = OPERATION_ID - public override fun document(): String = OPERATION_DOCUMENT + override fun document(): String = OPERATION_DOCUMENT - public override fun name(): String = OPERATION_NAME + override fun name(): String = OPERATION_NAME - public override fun serializeVariables( + override fun serializeVariables( writer: JsonWriter, customScalarAdapters: CustomScalarAdapters, withBooleanDefaultValues: Boolean, - ): Unit { + ) { // This operation doesn't have any variable } - public override fun adapter(): CompositeAdapter = TestQuery_ResponseAdapter.Data.obj() + override fun adapter(): CompositeAdapter = TestQuery_ResponseAdapter.Data.obj() - public override fun rootField(): CompiledField = CompiledField.Builder( + override fun rootField(): CompiledField = CompiledField.Builder( name = "data", - type = com.example.simple_fragment.type.Query.type + type = CompiledQuery.type ) .selections(selections = TestQuerySelections.__root) .build() @@ -66,27 +68,30 @@ internal class TestQuery() : Query { public val hero: Hero?, ) : Query.Data { public sealed interface Hero : HeroDetails { - public override val __typename: String + override val __typename: String public companion object { - public fun Hero.heroDetails() = this as? HeroDetails + @Suppress("USELESS_CAST") + public fun Hero.heroDetails(): HeroDetails? = this as? HeroDetails - public fun Hero.humanDetails() = this as? HumanDetails + @Suppress("USELESS_CAST") + public fun Hero.humanDetails(): HumanDetails? = this as? HumanDetails - public fun Hero.asHuman() = this as? HumanHero + @Suppress("USELESS_CAST") + public fun Hero.asHuman(): HumanHero? = this as? HumanHero } } public data class HumanHero( - public override val __typename: String, + override val __typename: String, /** * What this human calls themselves */ - public override val name: String, + override val name: String, ) : Hero, HumanHeroDetails, HumanDetails public data class OtherHero( - public override val __typename: String, + override val __typename: String, ) : Hero, HeroDetails } @@ -124,7 +129,7 @@ internal class TestQuery() : Query { public fun Data(resolver: FakeResolver = DefaultFakeResolver(__Schema.all), block: QueryBuilder.() -> Unit = {}): Data = buildData( - com.example.simple_fragment.type.Query, + CompiledQuery, block, TestQuery_ResponseAdapter.Data, TestQuerySelections.__root, diff --git a/libraries/apollo-compiler/src/test/graphql/com/example/simple_fragment/kotlin/responseBased/simple_fragment/adapter/TestQuery_ResponseAdapter.kt.expected b/libraries/apollo-compiler/src/test/graphql/com/example/simple_fragment/kotlin/responseBased/simple_fragment/adapter/TestQuery_ResponseAdapter.kt.expected index 55e05ec324b..3620c051a49 100644 --- a/libraries/apollo-compiler/src/test/graphql/com/example/simple_fragment/kotlin/responseBased/simple_fragment/adapter/TestQuery_ResponseAdapter.kt.expected +++ b/libraries/apollo-compiler/src/test/graphql/com/example/simple_fragment/kotlin/responseBased/simple_fragment/adapter/TestQuery_ResponseAdapter.kt.expected @@ -17,14 +17,13 @@ import com.apollographql.apollo3.api.obj import com.example.simple_fragment.TestQuery import kotlin.String import kotlin.Suppress -import kotlin.Unit import kotlin.collections.List internal object TestQuery_ResponseAdapter { public object Data : CompositeAdapter { public val RESPONSE_NAMES: List = listOf("hero") - public override fun fromJson(reader: JsonReader, adapterContext: CompositeAdapterContext): + override fun fromJson(reader: JsonReader, adapterContext: CompositeAdapterContext): TestQuery.Data { var _hero: TestQuery.Data.Hero? = null @@ -40,17 +39,17 @@ internal object TestQuery_ResponseAdapter { ) } - public override fun toJson( + override fun toJson( writer: JsonWriter, `value`: TestQuery.Data, adapterContext: CompositeAdapterContext, - ): Unit { + ) { writer.name("hero") Hero.obj().nullable().toJson(writer, value.hero, adapterContext) } private object Hero : CompositeAdapter { - public override fun fromJson(reader: JsonReader, adapterContext: CompositeAdapterContext): + override fun fromJson(reader: JsonReader, adapterContext: CompositeAdapterContext): TestQuery.Data.Hero { val __typename = reader.readTypename() return when(__typename) { @@ -61,11 +60,11 @@ internal object TestQuery_ResponseAdapter { } } - public override fun toJson( + override fun toJson( writer: JsonWriter, `value`: TestQuery.Data.Hero, adapterContext: CompositeAdapterContext, - ): Unit { + ) { when(value) { is TestQuery.Data.HumanHero -> HumanHero.toJson(writer, value, adapterContext) is TestQuery.Data.OtherHero -> OtherHero.toJson(writer, value, adapterContext) @@ -102,7 +101,7 @@ internal object TestQuery_ResponseAdapter { writer: JsonWriter, `value`: TestQuery.Data.HumanHero, @Suppress("UNUSED_PARAMETER") adapterContext: CompositeAdapterContext, - ): Unit { + ) { writer.name("__typename") StringAdapter.toJson(writer, CustomScalarAdapters.Empty, value.__typename) @@ -137,7 +136,7 @@ internal object TestQuery_ResponseAdapter { writer: JsonWriter, `value`: TestQuery.Data.OtherHero, @Suppress("UNUSED_PARAMETER") adapterContext: CompositeAdapterContext, - ): Unit { + ) { writer.name("__typename") StringAdapter.toJson(writer, CustomScalarAdapters.Empty, value.__typename) } diff --git a/libraries/apollo-compiler/src/test/graphql/com/example/simple_fragment/kotlin/responseBased/simple_fragment/fragment/HeroDetails.kt.expected b/libraries/apollo-compiler/src/test/graphql/com/example/simple_fragment/kotlin/responseBased/simple_fragment/fragment/HeroDetails.kt.expected index 288837be9b3..9703441fd7c 100644 --- a/libraries/apollo-compiler/src/test/graphql/com/example/simple_fragment/kotlin/responseBased/simple_fragment/fragment/HeroDetails.kt.expected +++ b/libraries/apollo-compiler/src/test/graphql/com/example/simple_fragment/kotlin/responseBased/simple_fragment/fragment/HeroDetails.kt.expected @@ -6,22 +6,25 @@ package com.example.simple_fragment.fragment import kotlin.String +import kotlin.Suppress internal interface HeroDetails { public val __typename: String public companion object { - public fun HeroDetails.humanDetails() = this as? HumanDetails + @Suppress("USELESS_CAST") + public fun HeroDetails.humanDetails(): HumanDetails? = this as? HumanDetails - public fun HeroDetails.asHuman() = this as? HumanHeroDetails + @Suppress("USELESS_CAST") + public fun HeroDetails.asHuman(): HumanHeroDetails? = this as? HumanHeroDetails } } internal interface HumanHeroDetails : HeroDetails, HumanDetails { - public override val __typename: String + override val __typename: String /** * What this human calls themselves */ - public override val name: String + override val name: String } diff --git a/libraries/apollo-compiler/src/test/graphql/com/example/simple_fragment/kotlin/responseBased/simple_fragment/fragment/HeroDetailsImpl.kt.expected b/libraries/apollo-compiler/src/test/graphql/com/example/simple_fragment/kotlin/responseBased/simple_fragment/fragment/HeroDetailsImpl.kt.expected index 5616a49915c..9110081f3d0 100644 --- a/libraries/apollo-compiler/src/test/graphql/com/example/simple_fragment/kotlin/responseBased/simple_fragment/fragment/HeroDetailsImpl.kt.expected +++ b/libraries/apollo-compiler/src/test/graphql/com/example/simple_fragment/kotlin/responseBased/simple_fragment/fragment/HeroDetailsImpl.kt.expected @@ -25,6 +25,7 @@ import kotlin.Any import kotlin.Boolean import kotlin.Int import kotlin.String +import kotlin.Suppress import kotlin.Unit /** @@ -32,21 +33,21 @@ import kotlin.Unit * with multi lines support */ internal class HeroDetailsImpl() : Fragment { - public override fun equals(other: Any?): Boolean = other != null && other::class == this::class + override fun equals(other: Any?): Boolean = other != null && other::class == this::class - public override fun hashCode(): Int = this::class.hashCode() + override fun hashCode(): Int = this::class.hashCode() - public override fun serializeVariables( + override fun serializeVariables( writer: JsonWriter, customScalarAdapters: CustomScalarAdapters, withBooleanDefaultValues: Boolean, - ): Unit { + ) { // This fragment doesn't have any variable } - public override fun adapter(): CompositeAdapter = HeroDetailsImpl_ResponseAdapter.Data.obj() + override fun adapter(): CompositeAdapter = HeroDetailsImpl_ResponseAdapter.Data.obj() - public override fun rootField(): CompiledField = CompiledField.Builder( + override fun rootField(): CompiledField = CompiledField.Builder( name = "data", type = Character.type ) @@ -54,25 +55,27 @@ internal class HeroDetailsImpl() : Fragment { .build() public sealed interface Data : HeroDetails, Fragment.Data { - public override val __typename: String + override val __typename: String public companion object { - public fun Data.humanDetails() = this as? HumanDetails + @Suppress("USELESS_CAST") + public fun Data.humanDetails(): HumanDetails? = this as? HumanDetails - public fun Data.asHuman() = this as? HumanData + @Suppress("USELESS_CAST") + public fun Data.asHuman(): HumanData? = this as? HumanData } } public data class HumanData( - public override val __typename: String, + override val __typename: String, /** * What this human calls themselves */ - public override val name: String, + override val name: String, ) : Data, HumanDetails, HumanHeroDetails public data class OtherData( - public override val __typename: String, + override val __typename: String, ) : Data, HeroDetails public companion object { diff --git a/libraries/apollo-compiler/src/test/graphql/com/example/simple_fragment/kotlin/responseBased/simple_fragment/fragment/HeroDetailsImpl_ResponseAdapter.kt.expected b/libraries/apollo-compiler/src/test/graphql/com/example/simple_fragment/kotlin/responseBased/simple_fragment/fragment/HeroDetailsImpl_ResponseAdapter.kt.expected index fbf21d7c2fa..e480986cc9c 100644 --- a/libraries/apollo-compiler/src/test/graphql/com/example/simple_fragment/kotlin/responseBased/simple_fragment/fragment/HeroDetailsImpl_ResponseAdapter.kt.expected +++ b/libraries/apollo-compiler/src/test/graphql/com/example/simple_fragment/kotlin/responseBased/simple_fragment/fragment/HeroDetailsImpl_ResponseAdapter.kt.expected @@ -14,12 +14,11 @@ import com.apollographql.apollo3.api.json.JsonWriter import com.apollographql.apollo3.api.json.readTypename import kotlin.String import kotlin.Suppress -import kotlin.Unit import kotlin.collections.List internal object HeroDetailsImpl_ResponseAdapter { public object Data : CompositeAdapter { - public override fun fromJson(reader: JsonReader, adapterContext: CompositeAdapterContext): + override fun fromJson(reader: JsonReader, adapterContext: CompositeAdapterContext): HeroDetailsImpl.Data { val __typename = reader.readTypename() return when(__typename) { @@ -30,11 +29,11 @@ internal object HeroDetailsImpl_ResponseAdapter { } } - public override fun toJson( + override fun toJson( writer: JsonWriter, `value`: HeroDetailsImpl.Data, adapterContext: CompositeAdapterContext, - ): Unit { + ) { when(value) { is HeroDetailsImpl.HumanData -> HumanData.toJson(writer, value, adapterContext) is HeroDetailsImpl.OtherData -> OtherData.toJson(writer, value, adapterContext) @@ -71,7 +70,7 @@ internal object HeroDetailsImpl_ResponseAdapter { writer: JsonWriter, `value`: HeroDetailsImpl.HumanData, @Suppress("UNUSED_PARAMETER") adapterContext: CompositeAdapterContext, - ): Unit { + ) { writer.name("__typename") StringAdapter.toJson(writer, CustomScalarAdapters.Empty, value.__typename) @@ -106,7 +105,7 @@ internal object HeroDetailsImpl_ResponseAdapter { writer: JsonWriter, `value`: HeroDetailsImpl.OtherData, @Suppress("UNUSED_PARAMETER") adapterContext: CompositeAdapterContext, - ): Unit { + ) { writer.name("__typename") StringAdapter.toJson(writer, CustomScalarAdapters.Empty, value.__typename) } diff --git a/libraries/apollo-compiler/src/test/graphql/com/example/simple_fragment/kotlin/responseBased/simple_fragment/fragment/HumanDetailsImpl.kt.expected b/libraries/apollo-compiler/src/test/graphql/com/example/simple_fragment/kotlin/responseBased/simple_fragment/fragment/HumanDetailsImpl.kt.expected index 9cbfb8e3cff..718b5115d45 100644 --- a/libraries/apollo-compiler/src/test/graphql/com/example/simple_fragment/kotlin/responseBased/simple_fragment/fragment/HumanDetailsImpl.kt.expected +++ b/libraries/apollo-compiler/src/test/graphql/com/example/simple_fragment/kotlin/responseBased/simple_fragment/fragment/HumanDetailsImpl.kt.expected @@ -29,22 +29,21 @@ import kotlin.Unit * Fragment with Java / Kotlin docs generation */ internal class HumanDetailsImpl() : Fragment { - public override fun equals(other: Any?): Boolean = other != null && other::class == this::class + override fun equals(other: Any?): Boolean = other != null && other::class == this::class - public override fun hashCode(): Int = this::class.hashCode() + override fun hashCode(): Int = this::class.hashCode() - public override fun serializeVariables( + override fun serializeVariables( writer: JsonWriter, customScalarAdapters: CustomScalarAdapters, withBooleanDefaultValues: Boolean, - ): Unit { + ) { // This fragment doesn't have any variable } - public override fun adapter(): CompositeAdapter = - HumanDetailsImpl_ResponseAdapter.Data.obj() + override fun adapter(): CompositeAdapter = HumanDetailsImpl_ResponseAdapter.Data.obj() - public override fun rootField(): CompiledField = CompiledField.Builder( + override fun rootField(): CompiledField = CompiledField.Builder( name = "data", type = Human.type ) @@ -52,11 +51,11 @@ internal class HumanDetailsImpl() : Fragment { .build() public data class Data( - public override val __typename: String, + override val __typename: String, /** * What this human calls themselves */ - public override val name: String, + override val name: String, ) : HumanDetails, Fragment.Data public companion object { diff --git a/libraries/apollo-compiler/src/test/graphql/com/example/simple_fragment/kotlin/responseBased/simple_fragment/fragment/HumanDetailsImpl_ResponseAdapter.kt.expected b/libraries/apollo-compiler/src/test/graphql/com/example/simple_fragment/kotlin/responseBased/simple_fragment/fragment/HumanDetailsImpl_ResponseAdapter.kt.expected index 831f4937d17..e4dc0690040 100644 --- a/libraries/apollo-compiler/src/test/graphql/com/example/simple_fragment/kotlin/responseBased/simple_fragment/fragment/HumanDetailsImpl_ResponseAdapter.kt.expected +++ b/libraries/apollo-compiler/src/test/graphql/com/example/simple_fragment/kotlin/responseBased/simple_fragment/fragment/HumanDetailsImpl_ResponseAdapter.kt.expected @@ -12,14 +12,13 @@ import com.apollographql.apollo3.api.StringAdapter import com.apollographql.apollo3.api.json.JsonReader import com.apollographql.apollo3.api.json.JsonWriter import kotlin.String -import kotlin.Unit import kotlin.collections.List internal object HumanDetailsImpl_ResponseAdapter { public object Data : CompositeAdapter { public val RESPONSE_NAMES: List = listOf("__typename", "name") - public override fun fromJson(reader: JsonReader, adapterContext: CompositeAdapterContext): + override fun fromJson(reader: JsonReader, adapterContext: CompositeAdapterContext): HumanDetailsImpl.Data { var __typename: String? = null var _name: String? = null @@ -38,11 +37,11 @@ internal object HumanDetailsImpl_ResponseAdapter { ) } - public override fun toJson( + override fun toJson( writer: JsonWriter, `value`: HumanDetailsImpl.Data, adapterContext: CompositeAdapterContext, - ): Unit { + ) { writer.name("__typename") StringAdapter.toJson(writer, CustomScalarAdapters.Empty, value.__typename) diff --git a/libraries/apollo-compiler/src/test/graphql/com/example/simple_fragment/kotlin/responseBased/simple_fragment/type/Character.kt.expected b/libraries/apollo-compiler/src/test/graphql/com/example/simple_fragment/kotlin/responseBased/simple_fragment/type/Character.kt.expected index 35d991eb28f..79c819e0076 100644 --- a/libraries/apollo-compiler/src/test/graphql/com/example/simple_fragment/kotlin/responseBased/simple_fragment/type/Character.kt.expected +++ b/libraries/apollo-compiler/src/test/graphql/com/example/simple_fragment/kotlin/responseBased/simple_fragment/type/Character.kt.expected @@ -22,8 +22,8 @@ internal class Character { public companion object : BuilderFactory { public val type: InterfaceType = InterfaceType.Builder(name = "Character").build() - public override fun newBuilder(customScalarAdapters: CustomScalarAdapters): - OtherCharacterBuilder = OtherCharacterBuilder(customScalarAdapters) + override fun newBuilder(customScalarAdapters: CustomScalarAdapters): OtherCharacterBuilder = + OtherCharacterBuilder(customScalarAdapters) } } @@ -32,7 +32,7 @@ internal interface CharacterMap : Map internal class OtherCharacterBuilder( customScalarAdapters: CustomScalarAdapters, ) : ObjectBuilder(customScalarAdapters) { - public override fun build(): OtherCharacterMap = OtherCharacterMap(__fields) + override fun build(): OtherCharacterMap = OtherCharacterMap(__fields) } internal class OtherCharacterMap( diff --git a/libraries/apollo-compiler/src/test/graphql/com/example/simple_fragment/kotlin/responseBased/simple_fragment/type/Droid.kt.expected b/libraries/apollo-compiler/src/test/graphql/com/example/simple_fragment/kotlin/responseBased/simple_fragment/type/Droid.kt.expected index 284b3738227..1af22cc6a1a 100644 --- a/libraries/apollo-compiler/src/test/graphql/com/example/simple_fragment/kotlin/responseBased/simple_fragment/type/Droid.kt.expected +++ b/libraries/apollo-compiler/src/test/graphql/com/example/simple_fragment/kotlin/responseBased/simple_fragment/type/Droid.kt.expected @@ -23,7 +23,7 @@ internal class Droid { public val type: ObjectType = ObjectType.Builder(name = "Droid").interfaces(listOf(Character.type)).build() - public override fun newBuilder(customScalarAdapters: CustomScalarAdapters): DroidBuilder = + override fun newBuilder(customScalarAdapters: CustomScalarAdapters): DroidBuilder = DroidBuilder(customScalarAdapters) } } @@ -34,7 +34,7 @@ internal class DroidBuilder( init { __typename = "Droid"} - public override fun build(): DroidMap = DroidMap(__fields) + override fun build(): DroidMap = DroidMap(__fields) } internal class DroidMap( diff --git a/libraries/apollo-compiler/src/test/graphql/com/example/simple_fragment/kotlin/responseBased/simple_fragment/type/Human.kt.expected b/libraries/apollo-compiler/src/test/graphql/com/example/simple_fragment/kotlin/responseBased/simple_fragment/type/Human.kt.expected index fd3d9182026..93dd40f1d09 100644 --- a/libraries/apollo-compiler/src/test/graphql/com/example/simple_fragment/kotlin/responseBased/simple_fragment/type/Human.kt.expected +++ b/libraries/apollo-compiler/src/test/graphql/com/example/simple_fragment/kotlin/responseBased/simple_fragment/type/Human.kt.expected @@ -23,7 +23,7 @@ internal class Human { public val type: ObjectType = ObjectType.Builder(name = "Human").interfaces(listOf(Character.type)).build() - public override fun newBuilder(customScalarAdapters: CustomScalarAdapters): HumanBuilder = + override fun newBuilder(customScalarAdapters: CustomScalarAdapters): HumanBuilder = HumanBuilder(customScalarAdapters) } } @@ -36,7 +36,7 @@ internal class HumanBuilder( init { __typename = "Human"} - public override fun build(): HumanMap = HumanMap(__fields) + override fun build(): HumanMap = HumanMap(__fields) } internal class HumanMap( diff --git a/libraries/apollo-compiler/src/test/graphql/com/example/simple_fragment/kotlin/responseBased/simple_fragment/type/Query.kt.expected b/libraries/apollo-compiler/src/test/graphql/com/example/simple_fragment/kotlin/responseBased/simple_fragment/type/Query.kt.expected index 98728231517..c9a59b90d6a 100644 --- a/libraries/apollo-compiler/src/test/graphql/com/example/simple_fragment/kotlin/responseBased/simple_fragment/type/Query.kt.expected +++ b/libraries/apollo-compiler/src/test/graphql/com/example/simple_fragment/kotlin/responseBased/simple_fragment/type/Query.kt.expected @@ -22,7 +22,7 @@ internal class Query { public companion object : BuilderFactory { public val type: ObjectType = ObjectType.Builder(name = "Query").build() - public override fun newBuilder(customScalarAdapters: CustomScalarAdapters): QueryBuilder = + override fun newBuilder(customScalarAdapters: CustomScalarAdapters): QueryBuilder = QueryBuilder(customScalarAdapters) } } @@ -35,7 +35,7 @@ internal class QueryBuilder( init { __typename = "Query"} - public override fun build(): QueryMap = QueryMap(__fields) + override fun build(): QueryMap = QueryMap(__fields) } internal class QueryMap( diff --git a/libraries/apollo-compiler/src/test/graphql/com/example/simple_fragment/kotlin/responseBased/simple_fragment/type/SearchResult.kt.expected b/libraries/apollo-compiler/src/test/graphql/com/example/simple_fragment/kotlin/responseBased/simple_fragment/type/SearchResult.kt.expected index 22d4cb60932..83b97b7e1c2 100644 --- a/libraries/apollo-compiler/src/test/graphql/com/example/simple_fragment/kotlin/responseBased/simple_fragment/type/SearchResult.kt.expected +++ b/libraries/apollo-compiler/src/test/graphql/com/example/simple_fragment/kotlin/responseBased/simple_fragment/type/SearchResult.kt.expected @@ -19,8 +19,8 @@ internal class SearchResult { public companion object : BuilderFactory { public val type: UnionType = UnionType("SearchResult", Human.type, Droid.type, Starship.type) - public override fun newBuilder(customScalarAdapters: CustomScalarAdapters): - OtherSearchResultBuilder = OtherSearchResultBuilder(customScalarAdapters) + override fun newBuilder(customScalarAdapters: CustomScalarAdapters): OtherSearchResultBuilder = + OtherSearchResultBuilder(customScalarAdapters) } } @@ -29,7 +29,7 @@ internal interface SearchResultMap : Map internal class OtherSearchResultBuilder( customScalarAdapters: CustomScalarAdapters, ) : ObjectBuilder(customScalarAdapters) { - public override fun build(): OtherSearchResultMap = OtherSearchResultMap(__fields) + override fun build(): OtherSearchResultMap = OtherSearchResultMap(__fields) } internal class OtherSearchResultMap( diff --git a/libraries/apollo-compiler/src/test/graphql/com/example/simple_fragment/kotlin/responseBased/simple_fragment/type/Starship.kt.expected b/libraries/apollo-compiler/src/test/graphql/com/example/simple_fragment/kotlin/responseBased/simple_fragment/type/Starship.kt.expected index d177907ce3f..3ce48916939 100644 --- a/libraries/apollo-compiler/src/test/graphql/com/example/simple_fragment/kotlin/responseBased/simple_fragment/type/Starship.kt.expected +++ b/libraries/apollo-compiler/src/test/graphql/com/example/simple_fragment/kotlin/responseBased/simple_fragment/type/Starship.kt.expected @@ -19,7 +19,7 @@ internal class Starship { public companion object : BuilderFactory { public val type: ObjectType = ObjectType.Builder(name = "Starship").build() - public override fun newBuilder(customScalarAdapters: CustomScalarAdapters): StarshipBuilder = + override fun newBuilder(customScalarAdapters: CustomScalarAdapters): StarshipBuilder = StarshipBuilder(customScalarAdapters) } } @@ -30,7 +30,7 @@ internal class StarshipBuilder( init { __typename = "Starship"} - public override fun build(): StarshipMap = StarshipMap(__fields) + override fun build(): StarshipMap = StarshipMap(__fields) } internal class StarshipMap( diff --git a/libraries/apollo-compiler/src/test/graphql/com/example/simple_fragment_with_inline_fragments/kotlin/operationBased/simple_fragment_with_inline_fragments/TestQuery.kt.expected b/libraries/apollo-compiler/src/test/graphql/com/example/simple_fragment_with_inline_fragments/kotlin/operationBased/simple_fragment_with_inline_fragments/TestQuery.kt.expected index 7f355039c58..ac7f1692873 100644 --- a/libraries/apollo-compiler/src/test/graphql/com/example/simple_fragment_with_inline_fragments/kotlin/operationBased/simple_fragment_with_inline_fragments/TestQuery.kt.expected +++ b/libraries/apollo-compiler/src/test/graphql/com/example/simple_fragment_with_inline_fragments/kotlin/operationBased/simple_fragment_with_inline_fragments/TestQuery.kt.expected @@ -19,32 +19,32 @@ import kotlin.Any import kotlin.Boolean import kotlin.Int import kotlin.String -import kotlin.Unit +import com.example.simple_fragment_with_inline_fragments.type.Query as CompiledQuery public class TestQuery() : Query { - public override fun equals(other: Any?): Boolean = other != null && other::class == this::class + override fun equals(other: Any?): Boolean = other != null && other::class == this::class - public override fun hashCode(): Int = this::class.hashCode() + override fun hashCode(): Int = this::class.hashCode() - public override fun id(): String = OPERATION_ID + override fun id(): String = OPERATION_ID - public override fun document(): String = OPERATION_DOCUMENT + override fun document(): String = OPERATION_DOCUMENT - public override fun name(): String = OPERATION_NAME + override fun name(): String = OPERATION_NAME - public override fun serializeVariables( + override fun serializeVariables( writer: JsonWriter, customScalarAdapters: CustomScalarAdapters, withBooleanDefaultValues: Boolean, - ): Unit { + ) { // This operation doesn't have any variable } - public override fun adapter(): CompositeAdapter = TestQuery_ResponseAdapter.Data.obj() + override fun adapter(): CompositeAdapter = TestQuery_ResponseAdapter.Data.obj() - public override fun rootField(): CompiledField = CompiledField.Builder( + override fun rootField(): CompiledField = CompiledField.Builder( name = "data", - type = com.example.simple_fragment_with_inline_fragments.type.Query.type + type = CompiledQuery.type ) .selections(selections = TestQuerySelections.__root) .build() diff --git a/libraries/apollo-compiler/src/test/graphql/com/example/simple_fragment_with_inline_fragments/kotlin/operationBased/simple_fragment_with_inline_fragments/adapter/TestQuery_ResponseAdapter.kt.expected b/libraries/apollo-compiler/src/test/graphql/com/example/simple_fragment_with_inline_fragments/kotlin/operationBased/simple_fragment_with_inline_fragments/adapter/TestQuery_ResponseAdapter.kt.expected index 42fc0e85d54..fe57414e190 100644 --- a/libraries/apollo-compiler/src/test/graphql/com/example/simple_fragment_with_inline_fragments/kotlin/operationBased/simple_fragment_with_inline_fragments/adapter/TestQuery_ResponseAdapter.kt.expected +++ b/libraries/apollo-compiler/src/test/graphql/com/example/simple_fragment_with_inline_fragments/kotlin/operationBased/simple_fragment_with_inline_fragments/adapter/TestQuery_ResponseAdapter.kt.expected @@ -15,14 +15,13 @@ import com.apollographql.apollo3.api.nullable import com.apollographql.apollo3.api.obj import com.example.simple_fragment_with_inline_fragments.TestQuery import kotlin.String -import kotlin.Unit import kotlin.collections.List public object TestQuery_ResponseAdapter { public object Data : CompositeAdapter { public val RESPONSE_NAMES: List = listOf("hero") - public override fun fromJson(reader: JsonReader, adapterContext: CompositeAdapterContext): + override fun fromJson(reader: JsonReader, adapterContext: CompositeAdapterContext): TestQuery.Data { var _hero: TestQuery.Data.Hero? = null @@ -38,11 +37,11 @@ public object TestQuery_ResponseAdapter { ) } - public override fun toJson( + override fun toJson( writer: JsonWriter, `value`: TestQuery.Data, adapterContext: CompositeAdapterContext, - ): Unit { + ) { writer.name("hero") Hero.obj(true).nullable().toJson(writer, value.hero, adapterContext) } @@ -50,7 +49,7 @@ public object TestQuery_ResponseAdapter { private object Hero : CompositeAdapter { public val RESPONSE_NAMES: List = listOf("__typename") - public override fun fromJson(reader: JsonReader, adapterContext: CompositeAdapterContext): + override fun fromJson(reader: JsonReader, adapterContext: CompositeAdapterContext): TestQuery.Data.Hero { var __typename: String? = null @@ -71,11 +70,11 @@ public object TestQuery_ResponseAdapter { ) } - public override fun toJson( + override fun toJson( writer: JsonWriter, `value`: TestQuery.Data.Hero, adapterContext: CompositeAdapterContext, - ): Unit { + ) { writer.name("__typename") StringAdapter.toJson(writer, CustomScalarAdapters.Empty, value.__typename) diff --git a/libraries/apollo-compiler/src/test/graphql/com/example/simple_fragment_with_inline_fragments/kotlin/operationBased/simple_fragment_with_inline_fragments/fragment/HeroDetailsImpl.kt.expected b/libraries/apollo-compiler/src/test/graphql/com/example/simple_fragment_with_inline_fragments/kotlin/operationBased/simple_fragment_with_inline_fragments/fragment/HeroDetailsImpl.kt.expected index 27550bdf208..a4c8527b861 100644 --- a/libraries/apollo-compiler/src/test/graphql/com/example/simple_fragment_with_inline_fragments/kotlin/operationBased/simple_fragment_with_inline_fragments/fragment/HeroDetailsImpl.kt.expected +++ b/libraries/apollo-compiler/src/test/graphql/com/example/simple_fragment_with_inline_fragments/kotlin/operationBased/simple_fragment_with_inline_fragments/fragment/HeroDetailsImpl.kt.expected @@ -16,25 +16,24 @@ import com.example.simple_fragment_with_inline_fragments.type.Character import kotlin.Any import kotlin.Boolean import kotlin.Int -import kotlin.Unit public class HeroDetailsImpl() : Fragment { - public override fun equals(other: Any?): Boolean = other != null && other::class == this::class + override fun equals(other: Any?): Boolean = other != null && other::class == this::class - public override fun hashCode(): Int = this::class.hashCode() + override fun hashCode(): Int = this::class.hashCode() - public override fun serializeVariables( + override fun serializeVariables( writer: JsonWriter, customScalarAdapters: CustomScalarAdapters, withBooleanDefaultValues: Boolean, - ): Unit { + ) { // This fragment doesn't have any variable } - public override fun adapter(): CompositeAdapter = + override fun adapter(): CompositeAdapter = HeroDetailsImpl_ResponseAdapter.HeroDetails.obj() - public override fun rootField(): CompiledField = CompiledField.Builder( + override fun rootField(): CompiledField = CompiledField.Builder( name = "data", type = Character.type ) diff --git a/libraries/apollo-compiler/src/test/graphql/com/example/simple_fragment_with_inline_fragments/kotlin/operationBased/simple_fragment_with_inline_fragments/fragment/HeroDetailsImpl_ResponseAdapter.kt.expected b/libraries/apollo-compiler/src/test/graphql/com/example/simple_fragment_with_inline_fragments/kotlin/operationBased/simple_fragment_with_inline_fragments/fragment/HeroDetailsImpl_ResponseAdapter.kt.expected index 4be74448f61..d0e17f73524 100644 --- a/libraries/apollo-compiler/src/test/graphql/com/example/simple_fragment_with_inline_fragments/kotlin/operationBased/simple_fragment_with_inline_fragments/fragment/HeroDetailsImpl_ResponseAdapter.kt.expected +++ b/libraries/apollo-compiler/src/test/graphql/com/example/simple_fragment_with_inline_fragments/kotlin/operationBased/simple_fragment_with_inline_fragments/fragment/HeroDetailsImpl_ResponseAdapter.kt.expected @@ -20,7 +20,6 @@ import com.apollographql.apollo3.api.obj import com.apollographql.apollo3.api.possibleTypes import kotlin.Double import kotlin.String -import kotlin.Unit import kotlin.collections.List public object HeroDetailsImpl_ResponseAdapter { @@ -28,7 +27,7 @@ public object HeroDetailsImpl_ResponseAdapter { CompositeAdapter { public val RESPONSE_NAMES: List = listOf("name", "friends") - public override fun fromJson(reader: JsonReader, adapterContext: CompositeAdapterContext): + override fun fromJson(reader: JsonReader, adapterContext: CompositeAdapterContext): com.example.simple_fragment_with_inline_fragments.fragment.HeroDetails { var _name: String? = null var _friends: List? = null @@ -47,11 +46,11 @@ public object HeroDetailsImpl_ResponseAdapter { ) } - public override fun toJson( + override fun toJson( writer: JsonWriter, `value`: com.example.simple_fragment_with_inline_fragments.fragment.HeroDetails, adapterContext: CompositeAdapterContext, - ): Unit { + ) { writer.name("name") StringAdapter.toJson(writer, CustomScalarAdapters.Empty, value.name) @@ -64,7 +63,7 @@ public object HeroDetailsImpl_ResponseAdapter { { public val RESPONSE_NAMES: List = listOf("__typename", "name") - public override fun fromJson(reader: JsonReader, adapterContext: CompositeAdapterContext): + override fun fromJson(reader: JsonReader, adapterContext: CompositeAdapterContext): com.example.simple_fragment_with_inline_fragments.fragment.HeroDetails.Friend { var __typename: String? = null var _name: String? = null @@ -103,11 +102,11 @@ public object HeroDetailsImpl_ResponseAdapter { ) } - public override fun toJson( + override fun toJson( writer: JsonWriter, `value`: com.example.simple_fragment_with_inline_fragments.fragment.HeroDetails.Friend, adapterContext: CompositeAdapterContext, - ): Unit { + ) { writer.name("__typename") StringAdapter.toJson(writer, CustomScalarAdapters.Empty, value.__typename) @@ -130,7 +129,7 @@ public object HeroDetailsImpl_ResponseAdapter { { public val RESPONSE_NAMES: List = listOf("height") - public override fun fromJson(reader: JsonReader, adapterContext: CompositeAdapterContext): + override fun fromJson(reader: JsonReader, adapterContext: CompositeAdapterContext): com.example.simple_fragment_with_inline_fragments.fragment.HeroDetails.Friend.OnHuman { var _height: Double? = null @@ -146,11 +145,11 @@ public object HeroDetailsImpl_ResponseAdapter { ) } - public override fun toJson( + override fun toJson( writer: JsonWriter, `value`: com.example.simple_fragment_with_inline_fragments.fragment.HeroDetails.Friend.OnHuman, adapterContext: CompositeAdapterContext, - ): Unit { + ) { writer.name("height") NullableDoubleAdapter.toJson(writer, CustomScalarAdapters.Empty, value.height) } @@ -161,7 +160,7 @@ public object HeroDetailsImpl_ResponseAdapter { { public val RESPONSE_NAMES: List = listOf("primaryFunction") - public override fun fromJson(reader: JsonReader, adapterContext: CompositeAdapterContext): + override fun fromJson(reader: JsonReader, adapterContext: CompositeAdapterContext): com.example.simple_fragment_with_inline_fragments.fragment.HeroDetails.Friend.OnDroid { var _primaryFunction: String? = null @@ -177,11 +176,11 @@ public object HeroDetailsImpl_ResponseAdapter { ) } - public override fun toJson( + override fun toJson( writer: JsonWriter, `value`: com.example.simple_fragment_with_inline_fragments.fragment.HeroDetails.Friend.OnDroid, adapterContext: CompositeAdapterContext, - ): Unit { + ) { writer.name("primaryFunction") NullableStringAdapter.toJson(writer, CustomScalarAdapters.Empty, value.primaryFunction) } diff --git a/libraries/apollo-compiler/src/test/graphql/com/example/simple_fragment_with_inline_fragments/kotlin/responseBased/simple_fragment_with_inline_fragments/TestQuery.kt.expected b/libraries/apollo-compiler/src/test/graphql/com/example/simple_fragment_with_inline_fragments/kotlin/responseBased/simple_fragment_with_inline_fragments/TestQuery.kt.expected index deb9eb8483e..4f66fd32a5b 100644 --- a/libraries/apollo-compiler/src/test/graphql/com/example/simple_fragment_with_inline_fragments/kotlin/responseBased/simple_fragment_with_inline_fragments/TestQuery.kt.expected +++ b/libraries/apollo-compiler/src/test/graphql/com/example/simple_fragment_with_inline_fragments/kotlin/responseBased/simple_fragment_with_inline_fragments/TestQuery.kt.expected @@ -20,33 +20,34 @@ import kotlin.Boolean import kotlin.Double import kotlin.Int import kotlin.String -import kotlin.Unit +import kotlin.Suppress import kotlin.collections.List +import com.example.simple_fragment_with_inline_fragments.type.Query as CompiledQuery public class TestQuery() : Query { - public override fun equals(other: Any?): Boolean = other != null && other::class == this::class + override fun equals(other: Any?): Boolean = other != null && other::class == this::class - public override fun hashCode(): Int = this::class.hashCode() + override fun hashCode(): Int = this::class.hashCode() - public override fun id(): String = OPERATION_ID + override fun id(): String = OPERATION_ID - public override fun document(): String = OPERATION_DOCUMENT + override fun document(): String = OPERATION_DOCUMENT - public override fun name(): String = OPERATION_NAME + override fun name(): String = OPERATION_NAME - public override fun serializeVariables( + override fun serializeVariables( writer: JsonWriter, customScalarAdapters: CustomScalarAdapters, withBooleanDefaultValues: Boolean, - ): Unit { + ) { // This operation doesn't have any variable } - public override fun adapter(): CompositeAdapter = TestQuery_ResponseAdapter.Data.obj() + override fun adapter(): CompositeAdapter = TestQuery_ResponseAdapter.Data.obj() - public override fun rootField(): CompiledField = CompiledField.Builder( + override fun rootField(): CompiledField = CompiledField.Builder( name = "data", - type = com.example.simple_fragment_with_inline_fragments.type.Query.type + type = CompiledQuery.type ) .selections(selections = TestQuerySelections.__root) .build() @@ -60,63 +61,66 @@ public class TestQuery() : Query { /** * The name of the character */ - public override val name: String, + override val name: String, /** * The friends of the character, or an empty list if they have none */ - public override val friends: List?, + override val friends: List?, ) : HeroDetails { public fun friendsFilterNotNull(): List? = friends?.filterNotNull() public sealed interface Friend : HeroDetails.Friend { - public override val __typename: String + override val __typename: String /** * The name of the character */ - public override val name: String + override val name: String public companion object { - public fun Friend.asHuman() = this as? HumanFriend + @Suppress("USELESS_CAST") + public fun Friend.asHuman(): HumanFriend? = this as? HumanFriend - public fun Friend.asDroid() = this as? DroidFriend + @Suppress("USELESS_CAST") + public fun Friend.asDroid(): DroidFriend? = this as? DroidFriend } } public data class HumanFriend( - public override val __typename: String, + override val __typename: String, /** * The name of the character */ - public override val name: String, + override val name: String, /** * Height in the preferred unit, default is meters */ - public override val height: Double?, + override val height: Double?, ) : Friend, HeroDetails.HumanFriend public data class DroidFriend( - public override val __typename: String, + override val __typename: String, /** * The name of the character */ - public override val name: String, + override val name: String, /** * This droid's primary function */ - public override val primaryFunction: String?, + override val primaryFunction: String?, ) : Friend, HeroDetails.DroidFriend public data class OtherFriend( - public override val __typename: String, + override val __typename: String, /** * The name of the character */ - public override val name: String, + override val name: String, ) : Friend, HeroDetails.Friend public companion object { - public fun Hero.heroDetails() = this as? HeroDetails + @Suppress("USELESS_CAST") + public fun Hero.heroDetails(): HeroDetails? = this as? HeroDetails } } } diff --git a/libraries/apollo-compiler/src/test/graphql/com/example/simple_fragment_with_inline_fragments/kotlin/responseBased/simple_fragment_with_inline_fragments/adapter/TestQuery_ResponseAdapter.kt.expected b/libraries/apollo-compiler/src/test/graphql/com/example/simple_fragment_with_inline_fragments/kotlin/responseBased/simple_fragment_with_inline_fragments/adapter/TestQuery_ResponseAdapter.kt.expected index 685eec7bca6..57df61a09a0 100644 --- a/libraries/apollo-compiler/src/test/graphql/com/example/simple_fragment_with_inline_fragments/kotlin/responseBased/simple_fragment_with_inline_fragments/adapter/TestQuery_ResponseAdapter.kt.expected +++ b/libraries/apollo-compiler/src/test/graphql/com/example/simple_fragment_with_inline_fragments/kotlin/responseBased/simple_fragment_with_inline_fragments/adapter/TestQuery_ResponseAdapter.kt.expected @@ -21,14 +21,13 @@ import com.example.simple_fragment_with_inline_fragments.TestQuery import kotlin.Double import kotlin.String import kotlin.Suppress -import kotlin.Unit import kotlin.collections.List public object TestQuery_ResponseAdapter { public object Data : CompositeAdapter { public val RESPONSE_NAMES: List = listOf("hero") - public override fun fromJson(reader: JsonReader, adapterContext: CompositeAdapterContext): + override fun fromJson(reader: JsonReader, adapterContext: CompositeAdapterContext): TestQuery.Data { var _hero: TestQuery.Data.Hero? = null @@ -44,11 +43,11 @@ public object TestQuery_ResponseAdapter { ) } - public override fun toJson( + override fun toJson( writer: JsonWriter, `value`: TestQuery.Data, adapterContext: CompositeAdapterContext, - ): Unit { + ) { writer.name("hero") Hero.obj().nullable().toJson(writer, value.hero, adapterContext) } @@ -56,7 +55,7 @@ public object TestQuery_ResponseAdapter { private object Hero : CompositeAdapter { public val RESPONSE_NAMES: List = listOf("__typename", "name", "friends") - public override fun fromJson(reader: JsonReader, adapterContext: CompositeAdapterContext): + override fun fromJson(reader: JsonReader, adapterContext: CompositeAdapterContext): TestQuery.Data.Hero { var __typename: String? = null var _name: String? = null @@ -78,11 +77,11 @@ public object TestQuery_ResponseAdapter { ) } - public override fun toJson( + override fun toJson( writer: JsonWriter, `value`: TestQuery.Data.Hero, adapterContext: CompositeAdapterContext, - ): Unit { + ) { writer.name("__typename") StringAdapter.toJson(writer, CustomScalarAdapters.Empty, value.__typename) @@ -94,7 +93,7 @@ public object TestQuery_ResponseAdapter { } private object Friend : CompositeAdapter { - public override fun fromJson(reader: JsonReader, adapterContext: CompositeAdapterContext): + override fun fromJson(reader: JsonReader, adapterContext: CompositeAdapterContext): TestQuery.Data.Hero.Friend { val __typename = reader.readTypename() return when(__typename) { @@ -107,11 +106,11 @@ public object TestQuery_ResponseAdapter { } } - public override fun toJson( + override fun toJson( writer: JsonWriter, `value`: TestQuery.Data.Hero.Friend, adapterContext: CompositeAdapterContext, - ): Unit { + ) { when(value) { is TestQuery.Data.Hero.HumanFriend -> HumanFriend.toJson(writer, value, adapterContext) is TestQuery.Data.Hero.DroidFriend -> DroidFriend.toJson(writer, value, adapterContext) @@ -152,7 +151,7 @@ public object TestQuery_ResponseAdapter { writer: JsonWriter, `value`: TestQuery.Data.Hero.HumanFriend, @Suppress("UNUSED_PARAMETER") adapterContext: CompositeAdapterContext, - ): Unit { + ) { writer.name("__typename") StringAdapter.toJson(writer, CustomScalarAdapters.Empty, value.__typename) @@ -196,7 +195,7 @@ public object TestQuery_ResponseAdapter { writer: JsonWriter, `value`: TestQuery.Data.Hero.DroidFriend, @Suppress("UNUSED_PARAMETER") adapterContext: CompositeAdapterContext, - ): Unit { + ) { writer.name("__typename") StringAdapter.toJson(writer, CustomScalarAdapters.Empty, value.__typename) @@ -237,7 +236,7 @@ public object TestQuery_ResponseAdapter { writer: JsonWriter, `value`: TestQuery.Data.Hero.OtherFriend, @Suppress("UNUSED_PARAMETER") adapterContext: CompositeAdapterContext, - ): Unit { + ) { writer.name("__typename") StringAdapter.toJson(writer, CustomScalarAdapters.Empty, value.__typename) diff --git a/libraries/apollo-compiler/src/test/graphql/com/example/simple_fragment_with_inline_fragments/kotlin/responseBased/simple_fragment_with_inline_fragments/fragment/HeroDetails.kt.expected b/libraries/apollo-compiler/src/test/graphql/com/example/simple_fragment_with_inline_fragments/kotlin/responseBased/simple_fragment_with_inline_fragments/fragment/HeroDetails.kt.expected index 96ba73fb2c7..c5ad4a93c3f 100644 --- a/libraries/apollo-compiler/src/test/graphql/com/example/simple_fragment_with_inline_fragments/kotlin/responseBased/simple_fragment_with_inline_fragments/fragment/HeroDetails.kt.expected +++ b/libraries/apollo-compiler/src/test/graphql/com/example/simple_fragment_with_inline_fragments/kotlin/responseBased/simple_fragment_with_inline_fragments/fragment/HeroDetails.kt.expected @@ -7,6 +7,7 @@ package com.example.simple_fragment_with_inline_fragments.fragment import kotlin.Double import kotlin.String +import kotlin.Suppress import kotlin.collections.List public interface HeroDetails { @@ -29,19 +30,21 @@ public interface HeroDetails { public val name: String public companion object { - public fun Friend.asHuman() = this as? HumanFriend + @Suppress("USELESS_CAST") + public fun Friend.asHuman(): HumanFriend? = this as? HumanFriend - public fun Friend.asDroid() = this as? DroidFriend + @Suppress("USELESS_CAST") + public fun Friend.asDroid(): DroidFriend? = this as? DroidFriend } } public interface HumanFriend : Friend { - public override val __typename: String + override val __typename: String /** * The name of the character */ - public override val name: String + override val name: String /** * Height in the preferred unit, default is meters @@ -50,12 +53,12 @@ public interface HeroDetails { } public interface DroidFriend : Friend { - public override val __typename: String + override val __typename: String /** * The name of the character */ - public override val name: String + override val name: String /** * This droid's primary function diff --git a/libraries/apollo-compiler/src/test/graphql/com/example/simple_fragment_with_inline_fragments/kotlin/responseBased/simple_fragment_with_inline_fragments/fragment/HeroDetailsImpl.kt.expected b/libraries/apollo-compiler/src/test/graphql/com/example/simple_fragment_with_inline_fragments/kotlin/responseBased/simple_fragment_with_inline_fragments/fragment/HeroDetailsImpl.kt.expected index 91750a9b86c..28177c11136 100644 --- a/libraries/apollo-compiler/src/test/graphql/com/example/simple_fragment_with_inline_fragments/kotlin/responseBased/simple_fragment_with_inline_fragments/fragment/HeroDetailsImpl.kt.expected +++ b/libraries/apollo-compiler/src/test/graphql/com/example/simple_fragment_with_inline_fragments/kotlin/responseBased/simple_fragment_with_inline_fragments/fragment/HeroDetailsImpl.kt.expected @@ -18,25 +18,25 @@ import kotlin.Boolean import kotlin.Double import kotlin.Int import kotlin.String -import kotlin.Unit +import kotlin.Suppress import kotlin.collections.List public class HeroDetailsImpl() : Fragment { - public override fun equals(other: Any?): Boolean = other != null && other::class == this::class + override fun equals(other: Any?): Boolean = other != null && other::class == this::class - public override fun hashCode(): Int = this::class.hashCode() + override fun hashCode(): Int = this::class.hashCode() - public override fun serializeVariables( + override fun serializeVariables( writer: JsonWriter, customScalarAdapters: CustomScalarAdapters, withBooleanDefaultValues: Boolean, - ): Unit { + ) { // This fragment doesn't have any variable } - public override fun adapter(): CompositeAdapter = HeroDetailsImpl_ResponseAdapter.Data.obj() + override fun adapter(): CompositeAdapter = HeroDetailsImpl_ResponseAdapter.Data.obj() - public override fun rootField(): CompiledField = CompiledField.Builder( + override fun rootField(): CompiledField = CompiledField.Builder( name = "data", type = Character.type ) @@ -47,59 +47,61 @@ public class HeroDetailsImpl() : Fragment { /** * The name of the character */ - public override val name: String, + override val name: String, /** * The friends of the character, or an empty list if they have none */ - public override val friends: List?, + override val friends: List?, ) : HeroDetails, Fragment.Data { public fun friendsFilterNotNull(): List? = friends?.filterNotNull() public sealed interface Friend : HeroDetails.Friend { - public override val __typename: String + override val __typename: String /** * The name of the character */ - public override val name: String + override val name: String public companion object { - public fun Friend.asHuman() = this as? HumanFriend + @Suppress("USELESS_CAST") + public fun Friend.asHuman(): HumanFriend? = this as? HumanFriend - public fun Friend.asDroid() = this as? DroidFriend + @Suppress("USELESS_CAST") + public fun Friend.asDroid(): DroidFriend? = this as? DroidFriend } } public data class HumanFriend( - public override val __typename: String, + override val __typename: String, /** * The name of the character */ - public override val name: String, + override val name: String, /** * Height in the preferred unit, default is meters */ - public override val height: Double?, + override val height: Double?, ) : Friend, HeroDetails.HumanFriend public data class DroidFriend( - public override val __typename: String, + override val __typename: String, /** * The name of the character */ - public override val name: String, + override val name: String, /** * This droid's primary function */ - public override val primaryFunction: String?, + override val primaryFunction: String?, ) : Friend, HeroDetails.DroidFriend public data class OtherFriend( - public override val __typename: String, + override val __typename: String, /** * The name of the character */ - public override val name: String, + override val name: String, ) : Friend, HeroDetails.Friend } } diff --git a/libraries/apollo-compiler/src/test/graphql/com/example/simple_fragment_with_inline_fragments/kotlin/responseBased/simple_fragment_with_inline_fragments/fragment/HeroDetailsImpl_ResponseAdapter.kt.expected b/libraries/apollo-compiler/src/test/graphql/com/example/simple_fragment_with_inline_fragments/kotlin/responseBased/simple_fragment_with_inline_fragments/fragment/HeroDetailsImpl_ResponseAdapter.kt.expected index 4890142fc90..d87ea68d83d 100644 --- a/libraries/apollo-compiler/src/test/graphql/com/example/simple_fragment_with_inline_fragments/kotlin/responseBased/simple_fragment_with_inline_fragments/fragment/HeroDetailsImpl_ResponseAdapter.kt.expected +++ b/libraries/apollo-compiler/src/test/graphql/com/example/simple_fragment_with_inline_fragments/kotlin/responseBased/simple_fragment_with_inline_fragments/fragment/HeroDetailsImpl_ResponseAdapter.kt.expected @@ -20,14 +20,13 @@ import com.apollographql.apollo3.api.obj import kotlin.Double import kotlin.String import kotlin.Suppress -import kotlin.Unit import kotlin.collections.List public object HeroDetailsImpl_ResponseAdapter { public object Data : CompositeAdapter { public val RESPONSE_NAMES: List = listOf("name", "friends") - public override fun fromJson(reader: JsonReader, adapterContext: CompositeAdapterContext): + override fun fromJson(reader: JsonReader, adapterContext: CompositeAdapterContext): HeroDetailsImpl.Data { var _name: String? = null var _friends: List? = null @@ -46,11 +45,11 @@ public object HeroDetailsImpl_ResponseAdapter { ) } - public override fun toJson( + override fun toJson( writer: JsonWriter, `value`: HeroDetailsImpl.Data, adapterContext: CompositeAdapterContext, - ): Unit { + ) { writer.name("name") StringAdapter.toJson(writer, CustomScalarAdapters.Empty, value.name) @@ -59,7 +58,7 @@ public object HeroDetailsImpl_ResponseAdapter { } private object Friend : CompositeAdapter { - public override fun fromJson(reader: JsonReader, adapterContext: CompositeAdapterContext): + override fun fromJson(reader: JsonReader, adapterContext: CompositeAdapterContext): HeroDetailsImpl.Data.Friend { val __typename = reader.readTypename() return when(__typename) { @@ -72,11 +71,11 @@ public object HeroDetailsImpl_ResponseAdapter { } } - public override fun toJson( + override fun toJson( writer: JsonWriter, `value`: HeroDetailsImpl.Data.Friend, adapterContext: CompositeAdapterContext, - ): Unit { + ) { when(value) { is HeroDetailsImpl.Data.HumanFriend -> HumanFriend.toJson(writer, value, adapterContext) is HeroDetailsImpl.Data.DroidFriend -> DroidFriend.toJson(writer, value, adapterContext) @@ -117,7 +116,7 @@ public object HeroDetailsImpl_ResponseAdapter { writer: JsonWriter, `value`: HeroDetailsImpl.Data.HumanFriend, @Suppress("UNUSED_PARAMETER") adapterContext: CompositeAdapterContext, - ): Unit { + ) { writer.name("__typename") StringAdapter.toJson(writer, CustomScalarAdapters.Empty, value.__typename) @@ -161,7 +160,7 @@ public object HeroDetailsImpl_ResponseAdapter { writer: JsonWriter, `value`: HeroDetailsImpl.Data.DroidFriend, @Suppress("UNUSED_PARAMETER") adapterContext: CompositeAdapterContext, - ): Unit { + ) { writer.name("__typename") StringAdapter.toJson(writer, CustomScalarAdapters.Empty, value.__typename) @@ -202,7 +201,7 @@ public object HeroDetailsImpl_ResponseAdapter { writer: JsonWriter, `value`: HeroDetailsImpl.Data.OtherFriend, @Suppress("UNUSED_PARAMETER") adapterContext: CompositeAdapterContext, - ): Unit { + ) { writer.name("__typename") StringAdapter.toJson(writer, CustomScalarAdapters.Empty, value.__typename) diff --git a/libraries/apollo-compiler/src/test/graphql/com/example/simple_inline_fragment/kotlin/operationBased/simple_inline_fragment/TestQuery.kt.expected b/libraries/apollo-compiler/src/test/graphql/com/example/simple_inline_fragment/kotlin/operationBased/simple_inline_fragment/TestQuery.kt.expected index 6d6168ed169..5ebb634e554 100644 --- a/libraries/apollo-compiler/src/test/graphql/com/example/simple_inline_fragment/kotlin/operationBased/simple_inline_fragment/TestQuery.kt.expected +++ b/libraries/apollo-compiler/src/test/graphql/com/example/simple_inline_fragment/kotlin/operationBased/simple_inline_fragment/TestQuery.kt.expected @@ -19,32 +19,32 @@ import kotlin.Boolean import kotlin.Double import kotlin.Int import kotlin.String -import kotlin.Unit +import com.example.simple_inline_fragment.type.Query as CompiledQuery public class TestQuery() : Query { - public override fun equals(other: Any?): Boolean = other != null && other::class == this::class + override fun equals(other: Any?): Boolean = other != null && other::class == this::class - public override fun hashCode(): Int = this::class.hashCode() + override fun hashCode(): Int = this::class.hashCode() - public override fun id(): String = OPERATION_ID + override fun id(): String = OPERATION_ID - public override fun document(): String = OPERATION_DOCUMENT + override fun document(): String = OPERATION_DOCUMENT - public override fun name(): String = OPERATION_NAME + override fun name(): String = OPERATION_NAME - public override fun serializeVariables( + override fun serializeVariables( writer: JsonWriter, customScalarAdapters: CustomScalarAdapters, withBooleanDefaultValues: Boolean, - ): Unit { + ) { // This operation doesn't have any variable } - public override fun adapter(): CompositeAdapter = TestQuery_ResponseAdapter.Data.obj() + override fun adapter(): CompositeAdapter = TestQuery_ResponseAdapter.Data.obj() - public override fun rootField(): CompiledField = CompiledField.Builder( + override fun rootField(): CompiledField = CompiledField.Builder( name = "data", - type = com.example.simple_inline_fragment.type.Query.type + type = CompiledQuery.type ) .selections(selections = TestQuerySelections.__root) .build() diff --git a/libraries/apollo-compiler/src/test/graphql/com/example/simple_inline_fragment/kotlin/operationBased/simple_inline_fragment/adapter/TestQuery_ResponseAdapter.kt.expected b/libraries/apollo-compiler/src/test/graphql/com/example/simple_inline_fragment/kotlin/operationBased/simple_inline_fragment/adapter/TestQuery_ResponseAdapter.kt.expected index 25bd10b44dc..37db65ae799 100644 --- a/libraries/apollo-compiler/src/test/graphql/com/example/simple_inline_fragment/kotlin/operationBased/simple_inline_fragment/adapter/TestQuery_ResponseAdapter.kt.expected +++ b/libraries/apollo-compiler/src/test/graphql/com/example/simple_inline_fragment/kotlin/operationBased/simple_inline_fragment/adapter/TestQuery_ResponseAdapter.kt.expected @@ -20,14 +20,13 @@ import com.apollographql.apollo3.api.possibleTypes import com.example.simple_inline_fragment.TestQuery import kotlin.Double import kotlin.String -import kotlin.Unit import kotlin.collections.List public object TestQuery_ResponseAdapter { public object Data : CompositeAdapter { public val RESPONSE_NAMES: List = listOf("hero") - public override fun fromJson(reader: JsonReader, adapterContext: CompositeAdapterContext): + override fun fromJson(reader: JsonReader, adapterContext: CompositeAdapterContext): TestQuery.Data { var _hero: TestQuery.Data.Hero? = null @@ -43,11 +42,11 @@ public object TestQuery_ResponseAdapter { ) } - public override fun toJson( + override fun toJson( writer: JsonWriter, `value`: TestQuery.Data, adapterContext: CompositeAdapterContext, - ): Unit { + ) { writer.name("hero") Hero.obj(true).nullable().toJson(writer, value.hero, adapterContext) } @@ -55,7 +54,7 @@ public object TestQuery_ResponseAdapter { private object Hero : CompositeAdapter { public val RESPONSE_NAMES: List = listOf("__typename") - public override fun fromJson(reader: JsonReader, adapterContext: CompositeAdapterContext): + override fun fromJson(reader: JsonReader, adapterContext: CompositeAdapterContext): TestQuery.Data.Hero { var __typename: String? = null @@ -96,11 +95,11 @@ public object TestQuery_ResponseAdapter { ) } - public override fun toJson( + override fun toJson( writer: JsonWriter, `value`: TestQuery.Data.Hero, adapterContext: CompositeAdapterContext, - ): Unit { + ) { writer.name("__typename") StringAdapter.toJson(writer, CustomScalarAdapters.Empty, value.__typename) @@ -121,7 +120,7 @@ public object TestQuery_ResponseAdapter { private object OnCharacter : CompositeAdapter { public val RESPONSE_NAMES: List = listOf("__typename", "id") - public override fun fromJson(reader: JsonReader, adapterContext: CompositeAdapterContext): + override fun fromJson(reader: JsonReader, adapterContext: CompositeAdapterContext): TestQuery.Data.Hero.OnCharacter { var __typename: String? = null var _id: String? = null @@ -145,11 +144,11 @@ public object TestQuery_ResponseAdapter { ) } - public override fun toJson( + override fun toJson( writer: JsonWriter, `value`: TestQuery.Data.Hero.OnCharacter, adapterContext: CompositeAdapterContext, - ): Unit { + ) { writer.name("__typename") StringAdapter.toJson(writer, CustomScalarAdapters.Empty, value.__typename) @@ -163,7 +162,7 @@ public object TestQuery_ResponseAdapter { private object OnCharacter : CompositeAdapter { public val RESPONSE_NAMES: List = listOf("name") - public override fun fromJson(reader: JsonReader, adapterContext: CompositeAdapterContext): + override fun fromJson(reader: JsonReader, adapterContext: CompositeAdapterContext): TestQuery.Data.Hero.OnCharacter.OnCharacter { var _name: String? = null @@ -179,11 +178,11 @@ public object TestQuery_ResponseAdapter { ) } - public override fun toJson( + override fun toJson( writer: JsonWriter, `value`: TestQuery.Data.Hero.OnCharacter.OnCharacter, adapterContext: CompositeAdapterContext, - ): Unit { + ) { writer.name("name") StringAdapter.toJson(writer, CustomScalarAdapters.Empty, value.name) } @@ -193,7 +192,7 @@ public object TestQuery_ResponseAdapter { private object OnHuman : CompositeAdapter { public val RESPONSE_NAMES: List = listOf("height") - public override fun fromJson(reader: JsonReader, adapterContext: CompositeAdapterContext): + override fun fromJson(reader: JsonReader, adapterContext: CompositeAdapterContext): TestQuery.Data.Hero.OnHuman { var _height: Double? = null @@ -209,11 +208,11 @@ public object TestQuery_ResponseAdapter { ) } - public override fun toJson( + override fun toJson( writer: JsonWriter, `value`: TestQuery.Data.Hero.OnHuman, adapterContext: CompositeAdapterContext, - ): Unit { + ) { writer.name("height") NullableDoubleAdapter.toJson(writer, CustomScalarAdapters.Empty, value.height) } @@ -222,7 +221,7 @@ public object TestQuery_ResponseAdapter { private object OnDroid : CompositeAdapter { public val RESPONSE_NAMES: List = listOf("primaryFunction") - public override fun fromJson(reader: JsonReader, adapterContext: CompositeAdapterContext): + override fun fromJson(reader: JsonReader, adapterContext: CompositeAdapterContext): TestQuery.Data.Hero.OnDroid { var _primaryFunction: String? = null @@ -238,11 +237,11 @@ public object TestQuery_ResponseAdapter { ) } - public override fun toJson( + override fun toJson( writer: JsonWriter, `value`: TestQuery.Data.Hero.OnDroid, adapterContext: CompositeAdapterContext, - ): Unit { + ) { writer.name("primaryFunction") NullableStringAdapter.toJson(writer, CustomScalarAdapters.Empty, value.primaryFunction) } diff --git a/libraries/apollo-compiler/src/test/graphql/com/example/simple_inline_fragment/kotlin/responseBased/simple_inline_fragment/TestQuery.kt.expected b/libraries/apollo-compiler/src/test/graphql/com/example/simple_inline_fragment/kotlin/responseBased/simple_inline_fragment/TestQuery.kt.expected index 121524f2397..75517a7b491 100644 --- a/libraries/apollo-compiler/src/test/graphql/com/example/simple_inline_fragment/kotlin/responseBased/simple_inline_fragment/TestQuery.kt.expected +++ b/libraries/apollo-compiler/src/test/graphql/com/example/simple_inline_fragment/kotlin/responseBased/simple_inline_fragment/TestQuery.kt.expected @@ -19,32 +19,33 @@ import kotlin.Boolean import kotlin.Double import kotlin.Int import kotlin.String -import kotlin.Unit +import kotlin.Suppress +import com.example.simple_inline_fragment.type.Query as CompiledQuery public class TestQuery() : Query { - public override fun equals(other: Any?): Boolean = other != null && other::class == this::class + override fun equals(other: Any?): Boolean = other != null && other::class == this::class - public override fun hashCode(): Int = this::class.hashCode() + override fun hashCode(): Int = this::class.hashCode() - public override fun id(): String = OPERATION_ID + override fun id(): String = OPERATION_ID - public override fun document(): String = OPERATION_DOCUMENT + override fun document(): String = OPERATION_DOCUMENT - public override fun name(): String = OPERATION_NAME + override fun name(): String = OPERATION_NAME - public override fun serializeVariables( + override fun serializeVariables( writer: JsonWriter, customScalarAdapters: CustomScalarAdapters, withBooleanDefaultValues: Boolean, - ): Unit { + ) { // This operation doesn't have any variable } - public override fun adapter(): CompositeAdapter = TestQuery_ResponseAdapter.Data.obj() + override fun adapter(): CompositeAdapter = TestQuery_ResponseAdapter.Data.obj() - public override fun rootField(): CompiledField = CompiledField.Builder( + override fun rootField(): CompiledField = CompiledField.Builder( name = "data", - type = com.example.simple_inline_fragment.type.Query.type + type = CompiledQuery.type ) .selections(selections = TestQuerySelections.__root) .build() @@ -67,22 +68,24 @@ public class TestQuery() : Query { public val name: String public companion object { - public fun Hero.asHuman() = this as? HumanHero + @Suppress("USELESS_CAST") + public fun Hero.asHuman(): HumanHero? = this as? HumanHero - public fun Hero.asDroid() = this as? DroidHero + @Suppress("USELESS_CAST") + public fun Hero.asDroid(): DroidHero? = this as? DroidHero } } public data class HumanHero( - public override val __typename: String, + override val __typename: String, /** * The ID of the character */ - public override val id: String, + override val id: String, /** * The name of the character */ - public override val name: String, + override val name: String, /** * Height in the preferred unit, default is meters */ @@ -90,15 +93,15 @@ public class TestQuery() : Query { ) : Hero public data class DroidHero( - public override val __typename: String, + override val __typename: String, /** * The ID of the character */ - public override val id: String, + override val id: String, /** * The name of the character */ - public override val name: String, + override val name: String, /** * This droid's primary function */ @@ -106,15 +109,15 @@ public class TestQuery() : Query { ) : Hero public data class OtherHero( - public override val __typename: String, + override val __typename: String, /** * The ID of the character */ - public override val id: String, + override val id: String, /** * The name of the character */ - public override val name: String, + override val name: String, ) : Hero } diff --git a/libraries/apollo-compiler/src/test/graphql/com/example/simple_inline_fragment/kotlin/responseBased/simple_inline_fragment/adapter/TestQuery_ResponseAdapter.kt.expected b/libraries/apollo-compiler/src/test/graphql/com/example/simple_inline_fragment/kotlin/responseBased/simple_inline_fragment/adapter/TestQuery_ResponseAdapter.kt.expected index 18c25cea518..0de9b2f1a13 100644 --- a/libraries/apollo-compiler/src/test/graphql/com/example/simple_inline_fragment/kotlin/responseBased/simple_inline_fragment/adapter/TestQuery_ResponseAdapter.kt.expected +++ b/libraries/apollo-compiler/src/test/graphql/com/example/simple_inline_fragment/kotlin/responseBased/simple_inline_fragment/adapter/TestQuery_ResponseAdapter.kt.expected @@ -20,14 +20,13 @@ import com.example.simple_inline_fragment.TestQuery import kotlin.Double import kotlin.String import kotlin.Suppress -import kotlin.Unit import kotlin.collections.List public object TestQuery_ResponseAdapter { public object Data : CompositeAdapter { public val RESPONSE_NAMES: List = listOf("hero") - public override fun fromJson(reader: JsonReader, adapterContext: CompositeAdapterContext): + override fun fromJson(reader: JsonReader, adapterContext: CompositeAdapterContext): TestQuery.Data { var _hero: TestQuery.Data.Hero? = null @@ -43,17 +42,17 @@ public object TestQuery_ResponseAdapter { ) } - public override fun toJson( + override fun toJson( writer: JsonWriter, `value`: TestQuery.Data, adapterContext: CompositeAdapterContext, - ): Unit { + ) { writer.name("hero") Hero.obj().nullable().toJson(writer, value.hero, adapterContext) } private object Hero : CompositeAdapter { - public override fun fromJson(reader: JsonReader, adapterContext: CompositeAdapterContext): + override fun fromJson(reader: JsonReader, adapterContext: CompositeAdapterContext): TestQuery.Data.Hero { val __typename = reader.readTypename() return when(__typename) { @@ -66,11 +65,11 @@ public object TestQuery_ResponseAdapter { } } - public override fun toJson( + override fun toJson( writer: JsonWriter, `value`: TestQuery.Data.Hero, adapterContext: CompositeAdapterContext, - ): Unit { + ) { when(value) { is TestQuery.Data.HumanHero -> HumanHero.toJson(writer, value, adapterContext) is TestQuery.Data.DroidHero -> DroidHero.toJson(writer, value, adapterContext) @@ -114,7 +113,7 @@ public object TestQuery_ResponseAdapter { writer: JsonWriter, `value`: TestQuery.Data.HumanHero, @Suppress("UNUSED_PARAMETER") adapterContext: CompositeAdapterContext, - ): Unit { + ) { writer.name("__typename") StringAdapter.toJson(writer, CustomScalarAdapters.Empty, value.__typename) @@ -165,7 +164,7 @@ public object TestQuery_ResponseAdapter { writer: JsonWriter, `value`: TestQuery.Data.DroidHero, @Suppress("UNUSED_PARAMETER") adapterContext: CompositeAdapterContext, - ): Unit { + ) { writer.name("__typename") StringAdapter.toJson(writer, CustomScalarAdapters.Empty, value.__typename) @@ -212,7 +211,7 @@ public object TestQuery_ResponseAdapter { writer: JsonWriter, `value`: TestQuery.Data.OtherHero, @Suppress("UNUSED_PARAMETER") adapterContext: CompositeAdapterContext, - ): Unit { + ) { writer.name("__typename") StringAdapter.toJson(writer, CustomScalarAdapters.Empty, value.__typename) diff --git a/libraries/apollo-compiler/src/test/graphql/com/example/simple_union/kotlin/operationBased/simple_union/AnimalQuery.kt.expected b/libraries/apollo-compiler/src/test/graphql/com/example/simple_union/kotlin/operationBased/simple_union/AnimalQuery.kt.expected index a93ca0d66ad..c12318e4aa2 100644 --- a/libraries/apollo-compiler/src/test/graphql/com/example/simple_union/kotlin/operationBased/simple_union/AnimalQuery.kt.expected +++ b/libraries/apollo-compiler/src/test/graphql/com/example/simple_union/kotlin/operationBased/simple_union/AnimalQuery.kt.expected @@ -20,32 +20,32 @@ import kotlin.Any import kotlin.Boolean import kotlin.Int import kotlin.String -import kotlin.Unit +import com.example.simple_union.type.Query as CompiledQuery public class AnimalQuery() : Query { - public override fun equals(other: Any?): Boolean = other != null && other::class == this::class + override fun equals(other: Any?): Boolean = other != null && other::class == this::class - public override fun hashCode(): Int = this::class.hashCode() + override fun hashCode(): Int = this::class.hashCode() - public override fun id(): String = OPERATION_ID + override fun id(): String = OPERATION_ID - public override fun document(): String = OPERATION_DOCUMENT + override fun document(): String = OPERATION_DOCUMENT - public override fun name(): String = OPERATION_NAME + override fun name(): String = OPERATION_NAME - public override fun serializeVariables( + override fun serializeVariables( writer: JsonWriter, customScalarAdapters: CustomScalarAdapters, withBooleanDefaultValues: Boolean, - ): Unit { + ) { // This operation doesn't have any variable } - public override fun adapter(): CompositeAdapter = AnimalQuery_ResponseAdapter.Data.obj() + override fun adapter(): CompositeAdapter = AnimalQuery_ResponseAdapter.Data.obj() - public override fun rootField(): CompiledField = CompiledField.Builder( + override fun rootField(): CompiledField = CompiledField.Builder( name = "data", - type = com.example.simple_union.type.Query.type + type = CompiledQuery.type ) .selections(selections = AnimalQuerySelections.__root) .build() diff --git a/libraries/apollo-compiler/src/test/graphql/com/example/simple_union/kotlin/operationBased/simple_union/adapter/AnimalQuery_ResponseAdapter.kt.expected b/libraries/apollo-compiler/src/test/graphql/com/example/simple_union/kotlin/operationBased/simple_union/adapter/AnimalQuery_ResponseAdapter.kt.expected index 7791beb5f92..16f92b755fd 100644 --- a/libraries/apollo-compiler/src/test/graphql/com/example/simple_union/kotlin/operationBased/simple_union/adapter/AnimalQuery_ResponseAdapter.kt.expected +++ b/libraries/apollo-compiler/src/test/graphql/com/example/simple_union/kotlin/operationBased/simple_union/adapter/AnimalQuery_ResponseAdapter.kt.expected @@ -19,14 +19,13 @@ import com.example.simple_union.AnimalQuery import com.example.simple_union.fragment.CatFragment import com.example.simple_union.fragment.DogFragment import kotlin.String -import kotlin.Unit import kotlin.collections.List public object AnimalQuery_ResponseAdapter { public object Data : CompositeAdapter { public val RESPONSE_NAMES: List = listOf("animal") - public override fun fromJson(reader: JsonReader, adapterContext: CompositeAdapterContext): + override fun fromJson(reader: JsonReader, adapterContext: CompositeAdapterContext): AnimalQuery.Data { var _animal: AnimalQuery.Data.Animal? = null @@ -42,11 +41,11 @@ public object AnimalQuery_ResponseAdapter { ) } - public override fun toJson( + override fun toJson( writer: JsonWriter, `value`: AnimalQuery.Data, adapterContext: CompositeAdapterContext, - ): Unit { + ) { writer.name("animal") Animal.obj(true).nullable().toJson(writer, value.animal, adapterContext) } @@ -54,7 +53,7 @@ public object AnimalQuery_ResponseAdapter { private object Animal : CompositeAdapter { public val RESPONSE_NAMES: List = listOf("__typename") - public override fun fromJson(reader: JsonReader, adapterContext: CompositeAdapterContext): + override fun fromJson(reader: JsonReader, adapterContext: CompositeAdapterContext): AnimalQuery.Data.Animal { var __typename: String? = null @@ -90,11 +89,11 @@ public object AnimalQuery_ResponseAdapter { ) } - public override fun toJson( + override fun toJson( writer: JsonWriter, `value`: AnimalQuery.Data.Animal, adapterContext: CompositeAdapterContext, - ): Unit { + ) { writer.name("__typename") StringAdapter.toJson(writer, CustomScalarAdapters.Empty, value.__typename) diff --git a/libraries/apollo-compiler/src/test/graphql/com/example/simple_union/kotlin/operationBased/simple_union/fragment/CatFragmentImpl.kt.expected b/libraries/apollo-compiler/src/test/graphql/com/example/simple_union/kotlin/operationBased/simple_union/fragment/CatFragmentImpl.kt.expected index 8c91c012e63..04a19185ff3 100644 --- a/libraries/apollo-compiler/src/test/graphql/com/example/simple_union/kotlin/operationBased/simple_union/fragment/CatFragmentImpl.kt.expected +++ b/libraries/apollo-compiler/src/test/graphql/com/example/simple_union/kotlin/operationBased/simple_union/fragment/CatFragmentImpl.kt.expected @@ -16,25 +16,24 @@ import com.example.simple_union.type.Cat import kotlin.Any import kotlin.Boolean import kotlin.Int -import kotlin.Unit public class CatFragmentImpl() : Fragment { - public override fun equals(other: Any?): Boolean = other != null && other::class == this::class + override fun equals(other: Any?): Boolean = other != null && other::class == this::class - public override fun hashCode(): Int = this::class.hashCode() + override fun hashCode(): Int = this::class.hashCode() - public override fun serializeVariables( + override fun serializeVariables( writer: JsonWriter, customScalarAdapters: CustomScalarAdapters, withBooleanDefaultValues: Boolean, - ): Unit { + ) { // This fragment doesn't have any variable } - public override fun adapter(): CompositeAdapter = + override fun adapter(): CompositeAdapter = CatFragmentImpl_ResponseAdapter.CatFragment.obj() - public override fun rootField(): CompiledField = CompiledField.Builder( + override fun rootField(): CompiledField = CompiledField.Builder( name = "data", type = Cat.type ) diff --git a/libraries/apollo-compiler/src/test/graphql/com/example/simple_union/kotlin/operationBased/simple_union/fragment/CatFragmentImpl_ResponseAdapter.kt.expected b/libraries/apollo-compiler/src/test/graphql/com/example/simple_union/kotlin/operationBased/simple_union/fragment/CatFragmentImpl_ResponseAdapter.kt.expected index 312f5750201..c015884a378 100644 --- a/libraries/apollo-compiler/src/test/graphql/com/example/simple_union/kotlin/operationBased/simple_union/fragment/CatFragmentImpl_ResponseAdapter.kt.expected +++ b/libraries/apollo-compiler/src/test/graphql/com/example/simple_union/kotlin/operationBased/simple_union/fragment/CatFragmentImpl_ResponseAdapter.kt.expected @@ -12,14 +12,13 @@ import com.apollographql.apollo3.api.StringAdapter import com.apollographql.apollo3.api.json.JsonReader import com.apollographql.apollo3.api.json.JsonWriter import kotlin.String -import kotlin.Unit import kotlin.collections.List public object CatFragmentImpl_ResponseAdapter { public object CatFragment : CompositeAdapter { public val RESPONSE_NAMES: List = listOf("meow") - public override fun fromJson(reader: JsonReader, adapterContext: CompositeAdapterContext): + override fun fromJson(reader: JsonReader, adapterContext: CompositeAdapterContext): com.example.simple_union.fragment.CatFragment { var _meow: String? = null @@ -35,11 +34,11 @@ public object CatFragmentImpl_ResponseAdapter { ) } - public override fun toJson( + override fun toJson( writer: JsonWriter, `value`: com.example.simple_union.fragment.CatFragment, adapterContext: CompositeAdapterContext, - ): Unit { + ) { writer.name("meow") StringAdapter.toJson(writer, CustomScalarAdapters.Empty, value.meow) } diff --git a/libraries/apollo-compiler/src/test/graphql/com/example/simple_union/kotlin/operationBased/simple_union/fragment/DogFragmentImpl.kt.expected b/libraries/apollo-compiler/src/test/graphql/com/example/simple_union/kotlin/operationBased/simple_union/fragment/DogFragmentImpl.kt.expected index 0f2f7425e9a..e02aabda0d0 100644 --- a/libraries/apollo-compiler/src/test/graphql/com/example/simple_union/kotlin/operationBased/simple_union/fragment/DogFragmentImpl.kt.expected +++ b/libraries/apollo-compiler/src/test/graphql/com/example/simple_union/kotlin/operationBased/simple_union/fragment/DogFragmentImpl.kt.expected @@ -16,25 +16,24 @@ import com.example.simple_union.type.Dog import kotlin.Any import kotlin.Boolean import kotlin.Int -import kotlin.Unit public class DogFragmentImpl() : Fragment { - public override fun equals(other: Any?): Boolean = other != null && other::class == this::class + override fun equals(other: Any?): Boolean = other != null && other::class == this::class - public override fun hashCode(): Int = this::class.hashCode() + override fun hashCode(): Int = this::class.hashCode() - public override fun serializeVariables( + override fun serializeVariables( writer: JsonWriter, customScalarAdapters: CustomScalarAdapters, withBooleanDefaultValues: Boolean, - ): Unit { + ) { // This fragment doesn't have any variable } - public override fun adapter(): CompositeAdapter = + override fun adapter(): CompositeAdapter = DogFragmentImpl_ResponseAdapter.DogFragment.obj() - public override fun rootField(): CompiledField = CompiledField.Builder( + override fun rootField(): CompiledField = CompiledField.Builder( name = "data", type = Dog.type ) diff --git a/libraries/apollo-compiler/src/test/graphql/com/example/simple_union/kotlin/operationBased/simple_union/fragment/DogFragmentImpl_ResponseAdapter.kt.expected b/libraries/apollo-compiler/src/test/graphql/com/example/simple_union/kotlin/operationBased/simple_union/fragment/DogFragmentImpl_ResponseAdapter.kt.expected index 44bdf11f210..e1bea23b534 100644 --- a/libraries/apollo-compiler/src/test/graphql/com/example/simple_union/kotlin/operationBased/simple_union/fragment/DogFragmentImpl_ResponseAdapter.kt.expected +++ b/libraries/apollo-compiler/src/test/graphql/com/example/simple_union/kotlin/operationBased/simple_union/fragment/DogFragmentImpl_ResponseAdapter.kt.expected @@ -12,14 +12,13 @@ import com.apollographql.apollo3.api.StringAdapter import com.apollographql.apollo3.api.json.JsonReader import com.apollographql.apollo3.api.json.JsonWriter import kotlin.String -import kotlin.Unit import kotlin.collections.List public object DogFragmentImpl_ResponseAdapter { public object DogFragment : CompositeAdapter { public val RESPONSE_NAMES: List = listOf("woof") - public override fun fromJson(reader: JsonReader, adapterContext: CompositeAdapterContext): + override fun fromJson(reader: JsonReader, adapterContext: CompositeAdapterContext): com.example.simple_union.fragment.DogFragment { var _woof: String? = null @@ -35,11 +34,11 @@ public object DogFragmentImpl_ResponseAdapter { ) } - public override fun toJson( + override fun toJson( writer: JsonWriter, `value`: com.example.simple_union.fragment.DogFragment, adapterContext: CompositeAdapterContext, - ): Unit { + ) { writer.name("woof") StringAdapter.toJson(writer, CustomScalarAdapters.Empty, value.woof) } diff --git a/libraries/apollo-compiler/src/test/graphql/com/example/simple_union/kotlin/responseBased/simple_union/AnimalQuery.kt.expected b/libraries/apollo-compiler/src/test/graphql/com/example/simple_union/kotlin/responseBased/simple_union/AnimalQuery.kt.expected index 4582ef6e032..c6af14abb0e 100644 --- a/libraries/apollo-compiler/src/test/graphql/com/example/simple_union/kotlin/responseBased/simple_union/AnimalQuery.kt.expected +++ b/libraries/apollo-compiler/src/test/graphql/com/example/simple_union/kotlin/responseBased/simple_union/AnimalQuery.kt.expected @@ -20,32 +20,33 @@ import kotlin.Any import kotlin.Boolean import kotlin.Int import kotlin.String -import kotlin.Unit +import kotlin.Suppress +import com.example.simple_union.type.Query as CompiledQuery public class AnimalQuery() : Query { - public override fun equals(other: Any?): Boolean = other != null && other::class == this::class + override fun equals(other: Any?): Boolean = other != null && other::class == this::class - public override fun hashCode(): Int = this::class.hashCode() + override fun hashCode(): Int = this::class.hashCode() - public override fun id(): String = OPERATION_ID + override fun id(): String = OPERATION_ID - public override fun document(): String = OPERATION_DOCUMENT + override fun document(): String = OPERATION_DOCUMENT - public override fun name(): String = OPERATION_NAME + override fun name(): String = OPERATION_NAME - public override fun serializeVariables( + override fun serializeVariables( writer: JsonWriter, customScalarAdapters: CustomScalarAdapters, withBooleanDefaultValues: Boolean, - ): Unit { + ) { // This operation doesn't have any variable } - public override fun adapter(): CompositeAdapter = AnimalQuery_ResponseAdapter.Data.obj() + override fun adapter(): CompositeAdapter = AnimalQuery_ResponseAdapter.Data.obj() - public override fun rootField(): CompiledField = CompiledField.Builder( + override fun rootField(): CompiledField = CompiledField.Builder( name = "data", - type = com.example.simple_union.type.Query.type + type = CompiledQuery.type ) .selections(selections = AnimalQuerySelections.__root) .build() @@ -58,28 +59,32 @@ public class AnimalQuery() : Query { public val __typename: String public companion object { - public fun Animal.catFragment() = this as? CatFragment + @Suppress("USELESS_CAST") + public fun Animal.catFragment(): CatFragment? = this as? CatFragment - public fun Animal.dogFragment() = this as? DogFragment + @Suppress("USELESS_CAST") + public fun Animal.dogFragment(): DogFragment? = this as? DogFragment - public fun Animal.asCat() = this as? CatAnimal + @Suppress("USELESS_CAST") + public fun Animal.asCat(): CatAnimal? = this as? CatAnimal - public fun Animal.asDog() = this as? DogAnimal + @Suppress("USELESS_CAST") + public fun Animal.asDog(): DogAnimal? = this as? DogAnimal } } public data class CatAnimal( - public override val __typename: String, - public override val meow: String, + override val __typename: String, + override val meow: String, ) : Animal, CatFragment public data class DogAnimal( - public override val __typename: String, - public override val woof: String, + override val __typename: String, + override val woof: String, ) : Animal, DogFragment public data class OtherAnimal( - public override val __typename: String, + override val __typename: String, ) : Animal } diff --git a/libraries/apollo-compiler/src/test/graphql/com/example/simple_union/kotlin/responseBased/simple_union/adapter/AnimalQuery_ResponseAdapter.kt.expected b/libraries/apollo-compiler/src/test/graphql/com/example/simple_union/kotlin/responseBased/simple_union/adapter/AnimalQuery_ResponseAdapter.kt.expected index 7ebd2541e2c..9b2165646df 100644 --- a/libraries/apollo-compiler/src/test/graphql/com/example/simple_union/kotlin/responseBased/simple_union/adapter/AnimalQuery_ResponseAdapter.kt.expected +++ b/libraries/apollo-compiler/src/test/graphql/com/example/simple_union/kotlin/responseBased/simple_union/adapter/AnimalQuery_ResponseAdapter.kt.expected @@ -17,14 +17,13 @@ import com.apollographql.apollo3.api.obj import com.example.simple_union.AnimalQuery import kotlin.String import kotlin.Suppress -import kotlin.Unit import kotlin.collections.List public object AnimalQuery_ResponseAdapter { public object Data : CompositeAdapter { public val RESPONSE_NAMES: List = listOf("animal") - public override fun fromJson(reader: JsonReader, adapterContext: CompositeAdapterContext): + override fun fromJson(reader: JsonReader, adapterContext: CompositeAdapterContext): AnimalQuery.Data { var _animal: AnimalQuery.Data.Animal? = null @@ -40,17 +39,17 @@ public object AnimalQuery_ResponseAdapter { ) } - public override fun toJson( + override fun toJson( writer: JsonWriter, `value`: AnimalQuery.Data, adapterContext: CompositeAdapterContext, - ): Unit { + ) { writer.name("animal") Animal.obj().nullable().toJson(writer, value.animal, adapterContext) } private object Animal : CompositeAdapter { - public override fun fromJson(reader: JsonReader, adapterContext: CompositeAdapterContext): + override fun fromJson(reader: JsonReader, adapterContext: CompositeAdapterContext): AnimalQuery.Data.Animal { val __typename = reader.readTypename() return when(__typename) { @@ -63,11 +62,11 @@ public object AnimalQuery_ResponseAdapter { } } - public override fun toJson( + override fun toJson( writer: JsonWriter, `value`: AnimalQuery.Data.Animal, adapterContext: CompositeAdapterContext, - ): Unit { + ) { when(value) { is AnimalQuery.Data.CatAnimal -> CatAnimal.toJson(writer, value, adapterContext) is AnimalQuery.Data.DogAnimal -> DogAnimal.toJson(writer, value, adapterContext) @@ -105,7 +104,7 @@ public object AnimalQuery_ResponseAdapter { writer: JsonWriter, `value`: AnimalQuery.Data.CatAnimal, @Suppress("UNUSED_PARAMETER") adapterContext: CompositeAdapterContext, - ): Unit { + ) { writer.name("__typename") StringAdapter.toJson(writer, CustomScalarAdapters.Empty, value.__typename) @@ -143,7 +142,7 @@ public object AnimalQuery_ResponseAdapter { writer: JsonWriter, `value`: AnimalQuery.Data.DogAnimal, @Suppress("UNUSED_PARAMETER") adapterContext: CompositeAdapterContext, - ): Unit { + ) { writer.name("__typename") StringAdapter.toJson(writer, CustomScalarAdapters.Empty, value.__typename) @@ -178,7 +177,7 @@ public object AnimalQuery_ResponseAdapter { writer: JsonWriter, `value`: AnimalQuery.Data.OtherAnimal, @Suppress("UNUSED_PARAMETER") adapterContext: CompositeAdapterContext, - ): Unit { + ) { writer.name("__typename") StringAdapter.toJson(writer, CustomScalarAdapters.Empty, value.__typename) } diff --git a/libraries/apollo-compiler/src/test/graphql/com/example/simple_union/kotlin/responseBased/simple_union/fragment/CatFragmentImpl.kt.expected b/libraries/apollo-compiler/src/test/graphql/com/example/simple_union/kotlin/responseBased/simple_union/fragment/CatFragmentImpl.kt.expected index 2a2a3000cad..5b6716a1763 100644 --- a/libraries/apollo-compiler/src/test/graphql/com/example/simple_union/kotlin/responseBased/simple_union/fragment/CatFragmentImpl.kt.expected +++ b/libraries/apollo-compiler/src/test/graphql/com/example/simple_union/kotlin/responseBased/simple_union/fragment/CatFragmentImpl.kt.expected @@ -17,24 +17,23 @@ import kotlin.Any import kotlin.Boolean import kotlin.Int import kotlin.String -import kotlin.Unit public class CatFragmentImpl() : Fragment { - public override fun equals(other: Any?): Boolean = other != null && other::class == this::class + override fun equals(other: Any?): Boolean = other != null && other::class == this::class - public override fun hashCode(): Int = this::class.hashCode() + override fun hashCode(): Int = this::class.hashCode() - public override fun serializeVariables( + override fun serializeVariables( writer: JsonWriter, customScalarAdapters: CustomScalarAdapters, withBooleanDefaultValues: Boolean, - ): Unit { + ) { // This fragment doesn't have any variable } - public override fun adapter(): CompositeAdapter = CatFragmentImpl_ResponseAdapter.Data.obj() + override fun adapter(): CompositeAdapter = CatFragmentImpl_ResponseAdapter.Data.obj() - public override fun rootField(): CompiledField = CompiledField.Builder( + override fun rootField(): CompiledField = CompiledField.Builder( name = "data", type = Cat.type ) @@ -42,6 +41,6 @@ public class CatFragmentImpl() : Fragment { .build() public data class Data( - public override val meow: String, + override val meow: String, ) : CatFragment, Fragment.Data } diff --git a/libraries/apollo-compiler/src/test/graphql/com/example/simple_union/kotlin/responseBased/simple_union/fragment/CatFragmentImpl_ResponseAdapter.kt.expected b/libraries/apollo-compiler/src/test/graphql/com/example/simple_union/kotlin/responseBased/simple_union/fragment/CatFragmentImpl_ResponseAdapter.kt.expected index ec8e71a141c..5f2b4fbe872 100644 --- a/libraries/apollo-compiler/src/test/graphql/com/example/simple_union/kotlin/responseBased/simple_union/fragment/CatFragmentImpl_ResponseAdapter.kt.expected +++ b/libraries/apollo-compiler/src/test/graphql/com/example/simple_union/kotlin/responseBased/simple_union/fragment/CatFragmentImpl_ResponseAdapter.kt.expected @@ -12,14 +12,13 @@ import com.apollographql.apollo3.api.StringAdapter import com.apollographql.apollo3.api.json.JsonReader import com.apollographql.apollo3.api.json.JsonWriter import kotlin.String -import kotlin.Unit import kotlin.collections.List public object CatFragmentImpl_ResponseAdapter { public object Data : CompositeAdapter { public val RESPONSE_NAMES: List = listOf("meow") - public override fun fromJson(reader: JsonReader, adapterContext: CompositeAdapterContext): + override fun fromJson(reader: JsonReader, adapterContext: CompositeAdapterContext): CatFragmentImpl.Data { var _meow: String? = null @@ -35,11 +34,11 @@ public object CatFragmentImpl_ResponseAdapter { ) } - public override fun toJson( + override fun toJson( writer: JsonWriter, `value`: CatFragmentImpl.Data, adapterContext: CompositeAdapterContext, - ): Unit { + ) { writer.name("meow") StringAdapter.toJson(writer, CustomScalarAdapters.Empty, value.meow) } diff --git a/libraries/apollo-compiler/src/test/graphql/com/example/simple_union/kotlin/responseBased/simple_union/fragment/DogFragmentImpl.kt.expected b/libraries/apollo-compiler/src/test/graphql/com/example/simple_union/kotlin/responseBased/simple_union/fragment/DogFragmentImpl.kt.expected index ededfcd452d..0cab9fc565f 100644 --- a/libraries/apollo-compiler/src/test/graphql/com/example/simple_union/kotlin/responseBased/simple_union/fragment/DogFragmentImpl.kt.expected +++ b/libraries/apollo-compiler/src/test/graphql/com/example/simple_union/kotlin/responseBased/simple_union/fragment/DogFragmentImpl.kt.expected @@ -17,24 +17,23 @@ import kotlin.Any import kotlin.Boolean import kotlin.Int import kotlin.String -import kotlin.Unit public class DogFragmentImpl() : Fragment { - public override fun equals(other: Any?): Boolean = other != null && other::class == this::class + override fun equals(other: Any?): Boolean = other != null && other::class == this::class - public override fun hashCode(): Int = this::class.hashCode() + override fun hashCode(): Int = this::class.hashCode() - public override fun serializeVariables( + override fun serializeVariables( writer: JsonWriter, customScalarAdapters: CustomScalarAdapters, withBooleanDefaultValues: Boolean, - ): Unit { + ) { // This fragment doesn't have any variable } - public override fun adapter(): CompositeAdapter = DogFragmentImpl_ResponseAdapter.Data.obj() + override fun adapter(): CompositeAdapter = DogFragmentImpl_ResponseAdapter.Data.obj() - public override fun rootField(): CompiledField = CompiledField.Builder( + override fun rootField(): CompiledField = CompiledField.Builder( name = "data", type = Dog.type ) @@ -42,6 +41,6 @@ public class DogFragmentImpl() : Fragment { .build() public data class Data( - public override val woof: String, + override val woof: String, ) : DogFragment, Fragment.Data } diff --git a/libraries/apollo-compiler/src/test/graphql/com/example/simple_union/kotlin/responseBased/simple_union/fragment/DogFragmentImpl_ResponseAdapter.kt.expected b/libraries/apollo-compiler/src/test/graphql/com/example/simple_union/kotlin/responseBased/simple_union/fragment/DogFragmentImpl_ResponseAdapter.kt.expected index c7886227c10..c2b65fcd2af 100644 --- a/libraries/apollo-compiler/src/test/graphql/com/example/simple_union/kotlin/responseBased/simple_union/fragment/DogFragmentImpl_ResponseAdapter.kt.expected +++ b/libraries/apollo-compiler/src/test/graphql/com/example/simple_union/kotlin/responseBased/simple_union/fragment/DogFragmentImpl_ResponseAdapter.kt.expected @@ -12,14 +12,13 @@ import com.apollographql.apollo3.api.StringAdapter import com.apollographql.apollo3.api.json.JsonReader import com.apollographql.apollo3.api.json.JsonWriter import kotlin.String -import kotlin.Unit import kotlin.collections.List public object DogFragmentImpl_ResponseAdapter { public object Data : CompositeAdapter { public val RESPONSE_NAMES: List = listOf("woof") - public override fun fromJson(reader: JsonReader, adapterContext: CompositeAdapterContext): + override fun fromJson(reader: JsonReader, adapterContext: CompositeAdapterContext): DogFragmentImpl.Data { var _woof: String? = null @@ -35,11 +34,11 @@ public object DogFragmentImpl_ResponseAdapter { ) } - public override fun toJson( + override fun toJson( writer: JsonWriter, `value`: DogFragmentImpl.Data, adapterContext: CompositeAdapterContext, - ): Unit { + ) { writer.name("woof") StringAdapter.toJson(writer, CustomScalarAdapters.Empty, value.woof) } diff --git a/libraries/apollo-compiler/src/test/graphql/com/example/starships/kotlin/responseBased/starships/TestQuery.kt.expected b/libraries/apollo-compiler/src/test/graphql/com/example/starships/kotlin/responseBased/starships/TestQuery.kt.expected index 6ff37dca1e2..164dc1b73f4 100644 --- a/libraries/apollo-compiler/src/test/graphql/com/example/starships/kotlin/responseBased/starships/TestQuery.kt.expected +++ b/libraries/apollo-compiler/src/test/graphql/com/example/starships/kotlin/responseBased/starships/TestQuery.kt.expected @@ -18,32 +18,32 @@ import com.example.starships.selections.TestQuerySelections import kotlin.Boolean import kotlin.Double import kotlin.String -import kotlin.Unit import kotlin.collections.List +import com.example.starships.type.Query as CompiledQuery public data class TestQuery( public val id: String, ) : Query { - public override fun id(): String = OPERATION_ID + override fun id(): String = OPERATION_ID - public override fun document(): String = OPERATION_DOCUMENT + override fun document(): String = OPERATION_DOCUMENT - public override fun name(): String = OPERATION_NAME + override fun name(): String = OPERATION_NAME - public override fun serializeVariables( + override fun serializeVariables( writer: JsonWriter, customScalarAdapters: CustomScalarAdapters, withBooleanDefaultValues: Boolean, - ): Unit { + ) { TestQuery_VariablesAdapter.serializeVariables(writer, this, customScalarAdapters, withBooleanDefaultValues) } - public override fun adapter(): CompositeAdapter = TestQuery_ResponseAdapter.Data.obj() + override fun adapter(): CompositeAdapter = TestQuery_ResponseAdapter.Data.obj() - public override fun rootField(): CompiledField = CompiledField.Builder( + override fun rootField(): CompiledField = CompiledField.Builder( name = "data", - type = com.example.starships.type.Query.type + type = CompiledQuery.type ) .selections(selections = TestQuerySelections.__root) .build() diff --git a/libraries/apollo-compiler/src/test/graphql/com/example/starships/kotlin/responseBased/starships/adapter/TestQuery_ResponseAdapter.kt.expected b/libraries/apollo-compiler/src/test/graphql/com/example/starships/kotlin/responseBased/starships/adapter/TestQuery_ResponseAdapter.kt.expected index 230f928945f..633fa4f027a 100644 --- a/libraries/apollo-compiler/src/test/graphql/com/example/starships/kotlin/responseBased/starships/adapter/TestQuery_ResponseAdapter.kt.expected +++ b/libraries/apollo-compiler/src/test/graphql/com/example/starships/kotlin/responseBased/starships/adapter/TestQuery_ResponseAdapter.kt.expected @@ -18,14 +18,13 @@ import com.apollographql.apollo3.api.obj import com.example.starships.TestQuery import kotlin.Double import kotlin.String -import kotlin.Unit import kotlin.collections.List public object TestQuery_ResponseAdapter { public object Data : CompositeAdapter { public val RESPONSE_NAMES: List = listOf("starship") - public override fun fromJson(reader: JsonReader, adapterContext: CompositeAdapterContext): + override fun fromJson(reader: JsonReader, adapterContext: CompositeAdapterContext): TestQuery.Data { var _starship: TestQuery.Data.Starship? = null @@ -41,11 +40,11 @@ public object TestQuery_ResponseAdapter { ) } - public override fun toJson( + override fun toJson( writer: JsonWriter, `value`: TestQuery.Data, adapterContext: CompositeAdapterContext, - ): Unit { + ) { writer.name("starship") Starship.obj().nullable().toJson(writer, value.starship, adapterContext) } @@ -53,7 +52,7 @@ public object TestQuery_ResponseAdapter { private object Starship : CompositeAdapter { public val RESPONSE_NAMES: List = listOf("id", "name", "coordinates") - public override fun fromJson(reader: JsonReader, adapterContext: CompositeAdapterContext): + override fun fromJson(reader: JsonReader, adapterContext: CompositeAdapterContext): TestQuery.Data.Starship { var _id: String? = null var _name: String? = null @@ -75,11 +74,11 @@ public object TestQuery_ResponseAdapter { ) } - public override fun toJson( + override fun toJson( writer: JsonWriter, `value`: TestQuery.Data.Starship, adapterContext: CompositeAdapterContext, - ): Unit { + ) { writer.name("id") StringAdapter.toJson(writer, CustomScalarAdapters.Empty, value.id) diff --git a/libraries/apollo-compiler/src/test/graphql/com/example/starships/kotlin/responseBased/starships/adapter/TestQuery_VariablesAdapter.kt.expected b/libraries/apollo-compiler/src/test/graphql/com/example/starships/kotlin/responseBased/starships/adapter/TestQuery_VariablesAdapter.kt.expected index cad1904e273..feb2e70b40d 100644 --- a/libraries/apollo-compiler/src/test/graphql/com/example/starships/kotlin/responseBased/starships/adapter/TestQuery_VariablesAdapter.kt.expected +++ b/libraries/apollo-compiler/src/test/graphql/com/example/starships/kotlin/responseBased/starships/adapter/TestQuery_VariablesAdapter.kt.expected @@ -12,7 +12,6 @@ import com.apollographql.apollo3.api.json.JsonWriter import com.example.starships.TestQuery import kotlin.Boolean import kotlin.Suppress -import kotlin.Unit public object TestQuery_VariablesAdapter { @Suppress( @@ -24,7 +23,7 @@ public object TestQuery_VariablesAdapter { `value`: TestQuery, customScalarAdapters: CustomScalarAdapters, withBooleanDefaultValues: Boolean, - ): Unit { + ) { val adapterContext = CompositeAdapterContext.Builder().customScalarAdapters(customScalarAdapters).build() writer.name("id") diff --git a/libraries/apollo-compiler/src/test/graphql/com/example/subscriptions/kotlin/responseBased/subscriptions/TestSubscription.kt.expected b/libraries/apollo-compiler/src/test/graphql/com/example/subscriptions/kotlin/responseBased/subscriptions/TestSubscription.kt.expected index 25c3e7b42c5..f24020ffc74 100644 --- a/libraries/apollo-compiler/src/test/graphql/com/example/subscriptions/kotlin/responseBased/subscriptions/TestSubscription.kt.expected +++ b/libraries/apollo-compiler/src/test/graphql/com/example/subscriptions/kotlin/responseBased/subscriptions/TestSubscription.kt.expected @@ -18,32 +18,31 @@ import com.example.subscriptions.selections.TestSubscriptionSelections import kotlin.Boolean import kotlin.Int import kotlin.String -import kotlin.Unit +import com.example.subscriptions.type.Subscription as CompiledSubscription public data class TestSubscription( public val repo: String, ) : Subscription { - public override fun id(): String = OPERATION_ID + override fun id(): String = OPERATION_ID - public override fun document(): String = OPERATION_DOCUMENT + override fun document(): String = OPERATION_DOCUMENT - public override fun name(): String = OPERATION_NAME + override fun name(): String = OPERATION_NAME - public override fun serializeVariables( + override fun serializeVariables( writer: JsonWriter, customScalarAdapters: CustomScalarAdapters, withBooleanDefaultValues: Boolean, - ): Unit { + ) { TestSubscription_VariablesAdapter.serializeVariables(writer, this, customScalarAdapters, withBooleanDefaultValues) } - public override fun adapter(): CompositeAdapter = - TestSubscription_ResponseAdapter.Data.obj() + override fun adapter(): CompositeAdapter = TestSubscription_ResponseAdapter.Data.obj() - public override fun rootField(): CompiledField = CompiledField.Builder( + override fun rootField(): CompiledField = CompiledField.Builder( name = "data", - type = com.example.subscriptions.type.Subscription.type + type = CompiledSubscription.type ) .selections(selections = TestSubscriptionSelections.__root) .build() diff --git a/libraries/apollo-compiler/src/test/graphql/com/example/subscriptions/kotlin/responseBased/subscriptions/adapter/TestSubscription_ResponseAdapter.kt.expected b/libraries/apollo-compiler/src/test/graphql/com/example/subscriptions/kotlin/responseBased/subscriptions/adapter/TestSubscription_ResponseAdapter.kt.expected index 7be2fab423f..bb2bbe6190d 100644 --- a/libraries/apollo-compiler/src/test/graphql/com/example/subscriptions/kotlin/responseBased/subscriptions/adapter/TestSubscription_ResponseAdapter.kt.expected +++ b/libraries/apollo-compiler/src/test/graphql/com/example/subscriptions/kotlin/responseBased/subscriptions/adapter/TestSubscription_ResponseAdapter.kt.expected @@ -17,14 +17,13 @@ import com.apollographql.apollo3.api.obj import com.example.subscriptions.TestSubscription import kotlin.Int import kotlin.String -import kotlin.Unit import kotlin.collections.List public object TestSubscription_ResponseAdapter { public object Data : CompositeAdapter { public val RESPONSE_NAMES: List = listOf("commentAdded") - public override fun fromJson(reader: JsonReader, adapterContext: CompositeAdapterContext): + override fun fromJson(reader: JsonReader, adapterContext: CompositeAdapterContext): TestSubscription.Data { var _commentAdded: TestSubscription.Data.CommentAdded? = null @@ -40,11 +39,11 @@ public object TestSubscription_ResponseAdapter { ) } - public override fun toJson( + override fun toJson( writer: JsonWriter, `value`: TestSubscription.Data, adapterContext: CompositeAdapterContext, - ): Unit { + ) { writer.name("commentAdded") CommentAdded.obj().nullable().toJson(writer, value.commentAdded, adapterContext) } @@ -52,7 +51,7 @@ public object TestSubscription_ResponseAdapter { private object CommentAdded : CompositeAdapter { public val RESPONSE_NAMES: List = listOf("id", "content") - public override fun fromJson(reader: JsonReader, adapterContext: CompositeAdapterContext): + override fun fromJson(reader: JsonReader, adapterContext: CompositeAdapterContext): TestSubscription.Data.CommentAdded { var _id: Int? = null var _content: String? = null @@ -71,11 +70,11 @@ public object TestSubscription_ResponseAdapter { ) } - public override fun toJson( + override fun toJson( writer: JsonWriter, `value`: TestSubscription.Data.CommentAdded, adapterContext: CompositeAdapterContext, - ): Unit { + ) { writer.name("id") IntAdapter.toJson(writer, CustomScalarAdapters.Empty, value.id) diff --git a/libraries/apollo-compiler/src/test/graphql/com/example/subscriptions/kotlin/responseBased/subscriptions/adapter/TestSubscription_VariablesAdapter.kt.expected b/libraries/apollo-compiler/src/test/graphql/com/example/subscriptions/kotlin/responseBased/subscriptions/adapter/TestSubscription_VariablesAdapter.kt.expected index 7cc228f243c..627461ab76c 100644 --- a/libraries/apollo-compiler/src/test/graphql/com/example/subscriptions/kotlin/responseBased/subscriptions/adapter/TestSubscription_VariablesAdapter.kt.expected +++ b/libraries/apollo-compiler/src/test/graphql/com/example/subscriptions/kotlin/responseBased/subscriptions/adapter/TestSubscription_VariablesAdapter.kt.expected @@ -12,7 +12,6 @@ import com.apollographql.apollo3.api.json.JsonWriter import com.example.subscriptions.TestSubscription import kotlin.Boolean import kotlin.Suppress -import kotlin.Unit public object TestSubscription_VariablesAdapter { @Suppress( @@ -24,7 +23,7 @@ public object TestSubscription_VariablesAdapter { `value`: TestSubscription, customScalarAdapters: CustomScalarAdapters, withBooleanDefaultValues: Boolean, - ): Unit { + ) { val adapterContext = CompositeAdapterContext.Builder().customScalarAdapters(customScalarAdapters).build() writer.name("repo") diff --git a/libraries/apollo-compiler/src/test/graphql/com/example/suppressed_warnings/kotlin/responseBased/suppressed_warnings/CatQuery.kt.expected b/libraries/apollo-compiler/src/test/graphql/com/example/suppressed_warnings/kotlin/responseBased/suppressed_warnings/CatQuery.kt.expected index 5b4232295c9..d2fd50f6e08 100644 --- a/libraries/apollo-compiler/src/test/graphql/com/example/suppressed_warnings/kotlin/responseBased/suppressed_warnings/CatQuery.kt.expected +++ b/libraries/apollo-compiler/src/test/graphql/com/example/suppressed_warnings/kotlin/responseBased/suppressed_warnings/CatQuery.kt.expected @@ -21,31 +21,31 @@ import com.example.suppressed_warnings.type.Filter import kotlin.Boolean import kotlin.Int import kotlin.String -import kotlin.Unit +import com.example.suppressed_warnings.type.Query as CompiledQuery public data class CatQuery( public val filter: Optional = Optional.Absent, ) : Query { - public override fun id(): String = OPERATION_ID + override fun id(): String = OPERATION_ID - public override fun document(): String = OPERATION_DOCUMENT + override fun document(): String = OPERATION_DOCUMENT - public override fun name(): String = OPERATION_NAME + override fun name(): String = OPERATION_NAME - public override fun serializeVariables( + override fun serializeVariables( writer: JsonWriter, customScalarAdapters: CustomScalarAdapters, withBooleanDefaultValues: Boolean, - ): Unit { + ) { CatQuery_VariablesAdapter.serializeVariables(writer, this, customScalarAdapters, withBooleanDefaultValues) } - public override fun adapter(): CompositeAdapter = CatQuery_ResponseAdapter.Data.obj() + override fun adapter(): CompositeAdapter = CatQuery_ResponseAdapter.Data.obj() - public override fun rootField(): CompiledField = CompiledField.Builder( + override fun rootField(): CompiledField = CompiledField.Builder( name = "data", - type = com.example.suppressed_warnings.type.Query.type + type = CompiledQuery.type ) .selections(selections = CatQuerySelections.__root) .build() diff --git a/libraries/apollo-compiler/src/test/graphql/com/example/suppressed_warnings/kotlin/responseBased/suppressed_warnings/adapter/CatQuery_ResponseAdapter.kt.expected b/libraries/apollo-compiler/src/test/graphql/com/example/suppressed_warnings/kotlin/responseBased/suppressed_warnings/adapter/CatQuery_ResponseAdapter.kt.expected index 79ecfbd2ced..397eae823ff 100644 --- a/libraries/apollo-compiler/src/test/graphql/com/example/suppressed_warnings/kotlin/responseBased/suppressed_warnings/adapter/CatQuery_ResponseAdapter.kt.expected +++ b/libraries/apollo-compiler/src/test/graphql/com/example/suppressed_warnings/kotlin/responseBased/suppressed_warnings/adapter/CatQuery_ResponseAdapter.kt.expected @@ -18,14 +18,13 @@ import com.example.suppressed_warnings.type.Direction import com.example.suppressed_warnings.type.adapter.Direction_ResponseAdapter import kotlin.Int import kotlin.String -import kotlin.Unit import kotlin.collections.List public object CatQuery_ResponseAdapter { public object Data : CompositeAdapter { public val RESPONSE_NAMES: List = listOf("search", "direction") - public override fun fromJson(reader: JsonReader, adapterContext: CompositeAdapterContext): + override fun fromJson(reader: JsonReader, adapterContext: CompositeAdapterContext): CatQuery.Data { var _search: CatQuery.Data.Search? = null var _direction: Direction? = null @@ -44,11 +43,11 @@ public object CatQuery_ResponseAdapter { ) } - public override fun toJson( + override fun toJson( writer: JsonWriter, `value`: CatQuery.Data, adapterContext: CompositeAdapterContext, - ): Unit { + ) { writer.name("search") Search.obj().nullable().toJson(writer, value.search, adapterContext) @@ -60,7 +59,7 @@ public object CatQuery_ResponseAdapter { private object Search : CompositeAdapter { public val RESPONSE_NAMES: List = listOf("mustaches") - public override fun fromJson(reader: JsonReader, adapterContext: CompositeAdapterContext): + override fun fromJson(reader: JsonReader, adapterContext: CompositeAdapterContext): CatQuery.Data.Search { var _mustaches: Int? = null @@ -76,11 +75,11 @@ public object CatQuery_ResponseAdapter { ) } - public override fun toJson( + override fun toJson( writer: JsonWriter, `value`: CatQuery.Data.Search, adapterContext: CompositeAdapterContext, - ): Unit { + ) { writer.name("mustaches") IntAdapter.toJson(writer, CustomScalarAdapters.Empty, value.mustaches) } diff --git a/libraries/apollo-compiler/src/test/graphql/com/example/suppressed_warnings/kotlin/responseBased/suppressed_warnings/adapter/CatQuery_VariablesAdapter.kt.expected b/libraries/apollo-compiler/src/test/graphql/com/example/suppressed_warnings/kotlin/responseBased/suppressed_warnings/adapter/CatQuery_VariablesAdapter.kt.expected index 188ddd9884e..f6f92ca0582 100644 --- a/libraries/apollo-compiler/src/test/graphql/com/example/suppressed_warnings/kotlin/responseBased/suppressed_warnings/adapter/CatQuery_VariablesAdapter.kt.expected +++ b/libraries/apollo-compiler/src/test/graphql/com/example/suppressed_warnings/kotlin/responseBased/suppressed_warnings/adapter/CatQuery_VariablesAdapter.kt.expected @@ -16,7 +16,6 @@ import com.example.suppressed_warnings.CatQuery import com.example.suppressed_warnings.type.adapter.Filter_InputAdapter import kotlin.Boolean import kotlin.Suppress -import kotlin.Unit public object CatQuery_VariablesAdapter { @Suppress( @@ -28,7 +27,7 @@ public object CatQuery_VariablesAdapter { `value`: CatQuery, customScalarAdapters: CustomScalarAdapters, withBooleanDefaultValues: Boolean, - ): Unit { + ) { val adapterContext = CompositeAdapterContext.Builder().customScalarAdapters(customScalarAdapters).build() if (value.filter is Optional.Present) { diff --git a/libraries/apollo-compiler/src/test/graphql/com/example/suppressed_warnings/kotlin/responseBased/suppressed_warnings/type/adapter/Direction_ResponseAdapter.kt.expected b/libraries/apollo-compiler/src/test/graphql/com/example/suppressed_warnings/kotlin/responseBased/suppressed_warnings/type/adapter/Direction_ResponseAdapter.kt.expected index 83c39451e12..c547f5498cf 100644 --- a/libraries/apollo-compiler/src/test/graphql/com/example/suppressed_warnings/kotlin/responseBased/suppressed_warnings/type/adapter/Direction_ResponseAdapter.kt.expected +++ b/libraries/apollo-compiler/src/test/graphql/com/example/suppressed_warnings/kotlin/responseBased/suppressed_warnings/type/adapter/Direction_ResponseAdapter.kt.expected @@ -10,20 +10,18 @@ import com.apollographql.apollo3.api.CustomScalarAdapters import com.apollographql.apollo3.api.json.JsonReader import com.apollographql.apollo3.api.json.JsonWriter import com.example.suppressed_warnings.type.Direction -import kotlin.Unit public object Direction_ResponseAdapter : Adapter { - public override fun fromJson(reader: JsonReader, customScalarAdapters: CustomScalarAdapters): - Direction { + override fun fromJson(reader: JsonReader, customScalarAdapters: CustomScalarAdapters): Direction { val rawValue = reader.nextString()!! return Direction.safeValueOf(rawValue) } - public override fun toJson( + override fun toJson( writer: JsonWriter, customScalarAdapters: CustomScalarAdapters, `value`: Direction, - ): Unit { + ) { writer.value(value.rawValue) } } diff --git a/libraries/apollo-compiler/src/test/graphql/com/example/suppressed_warnings/kotlin/responseBased/suppressed_warnings/type/adapter/Filter_InputAdapter.kt.expected b/libraries/apollo-compiler/src/test/graphql/com/example/suppressed_warnings/kotlin/responseBased/suppressed_warnings/type/adapter/Filter_InputAdapter.kt.expected index 1789e338e20..8dc73b5e7fc 100644 --- a/libraries/apollo-compiler/src/test/graphql/com/example/suppressed_warnings/kotlin/responseBased/suppressed_warnings/type/adapter/Filter_InputAdapter.kt.expected +++ b/libraries/apollo-compiler/src/test/graphql/com/example/suppressed_warnings/kotlin/responseBased/suppressed_warnings/type/adapter/Filter_InputAdapter.kt.expected @@ -18,19 +18,18 @@ import com.example.suppressed_warnings.type.Filter import kotlin.IllegalStateException import kotlin.OptIn import kotlin.Suppress -import kotlin.Unit @Suppress("DEPRECATION") @OptIn(ApolloRequiresOptIn::class) public object Filter_InputAdapter : CompositeAdapter { - public override fun fromJson(reader: JsonReader, adapterContext: CompositeAdapterContext): Filter - = throw IllegalStateException("Input type used in output position") + override fun fromJson(reader: JsonReader, adapterContext: CompositeAdapterContext): Filter = throw + IllegalStateException("Input type used in output position") - public override fun toJson( + override fun toJson( writer: JsonWriter, `value`: Filter, adapterContext: CompositeAdapterContext, - ): Unit { + ) { if (value.name is Optional.Present) { writer.name("name") NullableStringAdapter.present().toJson(writer, CustomScalarAdapters.Empty, value.name) diff --git a/libraries/apollo-compiler/src/test/graphql/com/example/target_name/kotlin/operationBased/target_name/TestQuery.kt.expected b/libraries/apollo-compiler/src/test/graphql/com/example/target_name/kotlin/operationBased/target_name/TestQuery.kt.expected index b57579ae0af..6917d5bb9cb 100644 --- a/libraries/apollo-compiler/src/test/graphql/com/example/target_name/kotlin/operationBased/target_name/TestQuery.kt.expected +++ b/libraries/apollo-compiler/src/test/graphql/com/example/target_name/kotlin/operationBased/target_name/TestQuery.kt.expected @@ -21,33 +21,33 @@ import com.example.target_name.type.renamedInput import kotlin.Any import kotlin.Boolean import kotlin.String -import kotlin.Unit +import com.example.target_name.type.Query as CompiledQuery public data class TestQuery( public val input: Optional = Optional.Absent, public val scalar: Optional = Optional.Absent, public val `enum`: Optional = Optional.Absent, ) : Query { - public override fun id(): String = OPERATION_ID + override fun id(): String = OPERATION_ID - public override fun document(): String = OPERATION_DOCUMENT + override fun document(): String = OPERATION_DOCUMENT - public override fun name(): String = OPERATION_NAME + override fun name(): String = OPERATION_NAME - public override fun serializeVariables( + override fun serializeVariables( writer: JsonWriter, customScalarAdapters: CustomScalarAdapters, withBooleanDefaultValues: Boolean, - ): Unit { + ) { TestQuery_VariablesAdapter.serializeVariables(writer, this, customScalarAdapters, withBooleanDefaultValues) } - public override fun adapter(): CompositeAdapter = TestQuery_ResponseAdapter.Data.obj() + override fun adapter(): CompositeAdapter = TestQuery_ResponseAdapter.Data.obj() - public override fun rootField(): CompiledField = CompiledField.Builder( + override fun rootField(): CompiledField = CompiledField.Builder( name = "data", - type = com.example.target_name.type.Query.type + type = CompiledQuery.type ) .selections(selections = TestQuerySelections.__root) .build() diff --git a/libraries/apollo-compiler/src/test/graphql/com/example/target_name/kotlin/operationBased/target_name/adapter/TestQuery_ResponseAdapter.kt.expected b/libraries/apollo-compiler/src/test/graphql/com/example/target_name/kotlin/operationBased/target_name/adapter/TestQuery_ResponseAdapter.kt.expected index 887a144936f..2d1752578c1 100644 --- a/libraries/apollo-compiler/src/test/graphql/com/example/target_name/kotlin/operationBased/target_name/adapter/TestQuery_ResponseAdapter.kt.expected +++ b/libraries/apollo-compiler/src/test/graphql/com/example/target_name/kotlin/operationBased/target_name/adapter/TestQuery_ResponseAdapter.kt.expected @@ -22,7 +22,6 @@ import com.example.target_name.type.adapter.renamedEnum_ResponseAdapter import com.example.target_name.type.renamedEnum import kotlin.Any import kotlin.String -import kotlin.Unit import kotlin.collections.List public object TestQuery_ResponseAdapter { @@ -30,7 +29,7 @@ public object TestQuery_ResponseAdapter { public val RESPONSE_NAMES: List = listOf("object", "interface", "union", "scalar", "enum") - public override fun fromJson(reader: JsonReader, adapterContext: CompositeAdapterContext): + override fun fromJson(reader: JsonReader, adapterContext: CompositeAdapterContext): TestQuery.Data { var _object: TestQuery.Data.Object? = null var _interface: TestQuery.Data.Interface? = null @@ -58,11 +57,11 @@ public object TestQuery_ResponseAdapter { ) } - public override fun toJson( + override fun toJson( writer: JsonWriter, `value`: TestQuery.Data, adapterContext: CompositeAdapterContext, - ): Unit { + ) { writer.name("object") Object.obj().nullable().toJson(writer, value.`object`, adapterContext) @@ -83,7 +82,7 @@ public object TestQuery_ResponseAdapter { private object Object : CompositeAdapter { public val RESPONSE_NAMES: List = listOf("field") - public override fun fromJson(reader: JsonReader, adapterContext: CompositeAdapterContext): + override fun fromJson(reader: JsonReader, adapterContext: CompositeAdapterContext): TestQuery.Data.Object { var _field: String? = null @@ -99,11 +98,11 @@ public object TestQuery_ResponseAdapter { ) } - public override fun toJson( + override fun toJson( writer: JsonWriter, `value`: TestQuery.Data.Object, adapterContext: CompositeAdapterContext, - ): Unit { + ) { writer.name("field") NullableStringAdapter.toJson(writer, CustomScalarAdapters.Empty, value.`field`) } @@ -112,7 +111,7 @@ public object TestQuery_ResponseAdapter { private object Interface : CompositeAdapter { public val RESPONSE_NAMES: List = listOf("field") - public override fun fromJson(reader: JsonReader, adapterContext: CompositeAdapterContext): + override fun fromJson(reader: JsonReader, adapterContext: CompositeAdapterContext): TestQuery.Data.Interface { var _field: String? = null @@ -128,11 +127,11 @@ public object TestQuery_ResponseAdapter { ) } - public override fun toJson( + override fun toJson( writer: JsonWriter, `value`: TestQuery.Data.Interface, adapterContext: CompositeAdapterContext, - ): Unit { + ) { writer.name("field") NullableStringAdapter.toJson(writer, CustomScalarAdapters.Empty, value.`field`) } @@ -141,7 +140,7 @@ public object TestQuery_ResponseAdapter { private object Union : CompositeAdapter { public val RESPONSE_NAMES: List = listOf("__typename") - public override fun fromJson(reader: JsonReader, adapterContext: CompositeAdapterContext): + override fun fromJson(reader: JsonReader, adapterContext: CompositeAdapterContext): TestQuery.Data.Union { var __typename: String? = null @@ -169,11 +168,11 @@ public object TestQuery_ResponseAdapter { ) } - public override fun toJson( + override fun toJson( writer: JsonWriter, `value`: TestQuery.Data.Union, adapterContext: CompositeAdapterContext, - ): Unit { + ) { writer.name("__typename") StringAdapter.toJson(writer, CustomScalarAdapters.Empty, value.__typename) @@ -186,7 +185,7 @@ public object TestQuery_ResponseAdapter { private object OnReservedObject : CompositeAdapter { public val RESPONSE_NAMES: List = listOf("field") - public override fun fromJson(reader: JsonReader, adapterContext: CompositeAdapterContext): + override fun fromJson(reader: JsonReader, adapterContext: CompositeAdapterContext): TestQuery.Data.Union.OnReservedObject { var _field: String? = null @@ -202,11 +201,11 @@ public object TestQuery_ResponseAdapter { ) } - public override fun toJson( + override fun toJson( writer: JsonWriter, `value`: TestQuery.Data.Union.OnReservedObject, adapterContext: CompositeAdapterContext, - ): Unit { + ) { writer.name("field") NullableStringAdapter.toJson(writer, CustomScalarAdapters.Empty, value.`field`) } diff --git a/libraries/apollo-compiler/src/test/graphql/com/example/target_name/kotlin/operationBased/target_name/adapter/TestQuery_VariablesAdapter.kt.expected b/libraries/apollo-compiler/src/test/graphql/com/example/target_name/kotlin/operationBased/target_name/adapter/TestQuery_VariablesAdapter.kt.expected index 9f9a60ad344..fd96e7e41c0 100644 --- a/libraries/apollo-compiler/src/test/graphql/com/example/target_name/kotlin/operationBased/target_name/adapter/TestQuery_VariablesAdapter.kt.expected +++ b/libraries/apollo-compiler/src/test/graphql/com/example/target_name/kotlin/operationBased/target_name/adapter/TestQuery_VariablesAdapter.kt.expected @@ -18,7 +18,6 @@ import com.example.target_name.type.adapter.renamedEnum_ResponseAdapter import com.example.target_name.type.adapter.renamedInput_InputAdapter import kotlin.Boolean import kotlin.Suppress -import kotlin.Unit public object TestQuery_VariablesAdapter { @Suppress( @@ -30,7 +29,7 @@ public object TestQuery_VariablesAdapter { `value`: TestQuery, customScalarAdapters: CustomScalarAdapters, withBooleanDefaultValues: Boolean, - ): Unit { + ) { val adapterContext = CompositeAdapterContext.Builder().customScalarAdapters(customScalarAdapters).build() if (value.input is Optional.Present) { diff --git a/libraries/apollo-compiler/src/test/graphql/com/example/target_name/kotlin/operationBased/target_name/type/adapter/renamedEnum_ResponseAdapter.kt.expected b/libraries/apollo-compiler/src/test/graphql/com/example/target_name/kotlin/operationBased/target_name/type/adapter/renamedEnum_ResponseAdapter.kt.expected index 8a361db082b..fc1f706fbfa 100644 --- a/libraries/apollo-compiler/src/test/graphql/com/example/target_name/kotlin/operationBased/target_name/type/adapter/renamedEnum_ResponseAdapter.kt.expected +++ b/libraries/apollo-compiler/src/test/graphql/com/example/target_name/kotlin/operationBased/target_name/type/adapter/renamedEnum_ResponseAdapter.kt.expected @@ -10,20 +10,19 @@ import com.apollographql.apollo3.api.CustomScalarAdapters import com.apollographql.apollo3.api.json.JsonReader import com.apollographql.apollo3.api.json.JsonWriter import com.example.target_name.type.renamedEnum -import kotlin.Unit public object renamedEnum_ResponseAdapter : Adapter { - public override fun fromJson(reader: JsonReader, customScalarAdapters: CustomScalarAdapters): + override fun fromJson(reader: JsonReader, customScalarAdapters: CustomScalarAdapters): renamedEnum { val rawValue = reader.nextString()!! return renamedEnum.safeValueOf(rawValue) } - public override fun toJson( + override fun toJson( writer: JsonWriter, customScalarAdapters: CustomScalarAdapters, `value`: renamedEnum, - ): Unit { + ) { writer.value(value.rawValue) } } diff --git a/libraries/apollo-compiler/src/test/graphql/com/example/target_name/kotlin/operationBased/target_name/type/adapter/renamedInput_InputAdapter.kt.expected b/libraries/apollo-compiler/src/test/graphql/com/example/target_name/kotlin/operationBased/target_name/type/adapter/renamedInput_InputAdapter.kt.expected index 005f94c6a5b..d0d7cef27e6 100644 --- a/libraries/apollo-compiler/src/test/graphql/com/example/target_name/kotlin/operationBased/target_name/type/adapter/renamedInput_InputAdapter.kt.expected +++ b/libraries/apollo-compiler/src/test/graphql/com/example/target_name/kotlin/operationBased/target_name/type/adapter/renamedInput_InputAdapter.kt.expected @@ -15,17 +15,16 @@ import com.apollographql.apollo3.api.json.JsonWriter import com.apollographql.apollo3.api.present import com.example.target_name.type.renamedInput import kotlin.IllegalStateException -import kotlin.Unit public object renamedInput_InputAdapter : CompositeAdapter { - public override fun fromJson(reader: JsonReader, adapterContext: CompositeAdapterContext): - renamedInput = throw IllegalStateException("Input type used in output position") + override fun fromJson(reader: JsonReader, adapterContext: CompositeAdapterContext): renamedInput = + throw IllegalStateException("Input type used in output position") - public override fun toJson( + override fun toJson( writer: JsonWriter, `value`: renamedInput, adapterContext: CompositeAdapterContext, - ): Unit { + ) { if (value.`field` is Optional.Present) { writer.name("field") NullableStringAdapter.present().toJson(writer, CustomScalarAdapters.Empty, value.`field`) diff --git a/libraries/apollo-compiler/src/test/graphql/com/example/target_name/kotlin/responseBased/target_name/TestQuery.kt.expected b/libraries/apollo-compiler/src/test/graphql/com/example/target_name/kotlin/responseBased/target_name/TestQuery.kt.expected index 6d6ab536f9b..bcd04146e6d 100644 --- a/libraries/apollo-compiler/src/test/graphql/com/example/target_name/kotlin/responseBased/target_name/TestQuery.kt.expected +++ b/libraries/apollo-compiler/src/test/graphql/com/example/target_name/kotlin/responseBased/target_name/TestQuery.kt.expected @@ -21,33 +21,34 @@ import com.example.target_name.type.renamedInput import kotlin.Any import kotlin.Boolean import kotlin.String -import kotlin.Unit +import kotlin.Suppress +import com.example.target_name.type.Query as CompiledQuery public data class TestQuery( public val input: Optional = Optional.Absent, public val scalar: Optional = Optional.Absent, public val `enum`: Optional = Optional.Absent, ) : Query { - public override fun id(): String = OPERATION_ID + override fun id(): String = OPERATION_ID - public override fun document(): String = OPERATION_DOCUMENT + override fun document(): String = OPERATION_DOCUMENT - public override fun name(): String = OPERATION_NAME + override fun name(): String = OPERATION_NAME - public override fun serializeVariables( + override fun serializeVariables( writer: JsonWriter, customScalarAdapters: CustomScalarAdapters, withBooleanDefaultValues: Boolean, - ): Unit { + ) { TestQuery_VariablesAdapter.serializeVariables(writer, this, customScalarAdapters, withBooleanDefaultValues) } - public override fun adapter(): CompositeAdapter = TestQuery_ResponseAdapter.Data.obj() + override fun adapter(): CompositeAdapter = TestQuery_ResponseAdapter.Data.obj() - public override fun rootField(): CompiledField = CompiledField.Builder( + override fun rootField(): CompiledField = CompiledField.Builder( name = "data", - type = com.example.target_name.type.Query.type + type = CompiledQuery.type ) .selections(selections = TestQuerySelections.__root) .build() @@ -72,17 +73,18 @@ public data class TestQuery( public val __typename: String public companion object { - public fun Union.asReservedObject() = this as? ReservedObjectUnion + @Suppress("USELESS_CAST") + public fun Union.asReservedObject(): ReservedObjectUnion? = this as? ReservedObjectUnion } } public data class ReservedObjectUnion( - public override val __typename: String, + override val __typename: String, public val `field`: String?, ) : Union public data class OtherUnion( - public override val __typename: String, + override val __typename: String, ) : Union } diff --git a/libraries/apollo-compiler/src/test/graphql/com/example/target_name/kotlin/responseBased/target_name/adapter/TestQuery_ResponseAdapter.kt.expected b/libraries/apollo-compiler/src/test/graphql/com/example/target_name/kotlin/responseBased/target_name/adapter/TestQuery_ResponseAdapter.kt.expected index bcf5565066a..dfc0db798cc 100644 --- a/libraries/apollo-compiler/src/test/graphql/com/example/target_name/kotlin/responseBased/target_name/adapter/TestQuery_ResponseAdapter.kt.expected +++ b/libraries/apollo-compiler/src/test/graphql/com/example/target_name/kotlin/responseBased/target_name/adapter/TestQuery_ResponseAdapter.kt.expected @@ -22,7 +22,6 @@ import com.example.target_name.type.renamedEnum import kotlin.Any import kotlin.String import kotlin.Suppress -import kotlin.Unit import kotlin.collections.List public object TestQuery_ResponseAdapter { @@ -30,7 +29,7 @@ public object TestQuery_ResponseAdapter { public val RESPONSE_NAMES: List = listOf("object", "interface", "union", "scalar", "enum") - public override fun fromJson(reader: JsonReader, adapterContext: CompositeAdapterContext): + override fun fromJson(reader: JsonReader, adapterContext: CompositeAdapterContext): TestQuery.Data { var _object: TestQuery.Data.Object? = null var _interface: TestQuery.Data.Interface? = null @@ -58,11 +57,11 @@ public object TestQuery_ResponseAdapter { ) } - public override fun toJson( + override fun toJson( writer: JsonWriter, `value`: TestQuery.Data, adapterContext: CompositeAdapterContext, - ): Unit { + ) { writer.name("object") Object.obj().nullable().toJson(writer, value.`object`, adapterContext) @@ -83,7 +82,7 @@ public object TestQuery_ResponseAdapter { private object Object : CompositeAdapter { public val RESPONSE_NAMES: List = listOf("field") - public override fun fromJson(reader: JsonReader, adapterContext: CompositeAdapterContext): + override fun fromJson(reader: JsonReader, adapterContext: CompositeAdapterContext): TestQuery.Data.Object { var _field: String? = null @@ -99,11 +98,11 @@ public object TestQuery_ResponseAdapter { ) } - public override fun toJson( + override fun toJson( writer: JsonWriter, `value`: TestQuery.Data.Object, adapterContext: CompositeAdapterContext, - ): Unit { + ) { writer.name("field") NullableStringAdapter.toJson(writer, CustomScalarAdapters.Empty, value.`field`) } @@ -112,7 +111,7 @@ public object TestQuery_ResponseAdapter { private object Interface : CompositeAdapter { public val RESPONSE_NAMES: List = listOf("field") - public override fun fromJson(reader: JsonReader, adapterContext: CompositeAdapterContext): + override fun fromJson(reader: JsonReader, adapterContext: CompositeAdapterContext): TestQuery.Data.Interface { var _field: String? = null @@ -128,18 +127,18 @@ public object TestQuery_ResponseAdapter { ) } - public override fun toJson( + override fun toJson( writer: JsonWriter, `value`: TestQuery.Data.Interface, adapterContext: CompositeAdapterContext, - ): Unit { + ) { writer.name("field") NullableStringAdapter.toJson(writer, CustomScalarAdapters.Empty, value.`field`) } } private object Union : CompositeAdapter { - public override fun fromJson(reader: JsonReader, adapterContext: CompositeAdapterContext): + override fun fromJson(reader: JsonReader, adapterContext: CompositeAdapterContext): TestQuery.Data.Union { val __typename = reader.readTypename() return when(__typename) { @@ -150,11 +149,11 @@ public object TestQuery_ResponseAdapter { } } - public override fun toJson( + override fun toJson( writer: JsonWriter, `value`: TestQuery.Data.Union, adapterContext: CompositeAdapterContext, - ): Unit { + ) { when(value) { is TestQuery.Data.ReservedObjectUnion -> ReservedObjectUnion.toJson(writer, value, adapterContext) @@ -192,7 +191,7 @@ public object TestQuery_ResponseAdapter { writer: JsonWriter, `value`: TestQuery.Data.ReservedObjectUnion, @Suppress("UNUSED_PARAMETER") adapterContext: CompositeAdapterContext, - ): Unit { + ) { writer.name("__typename") StringAdapter.toJson(writer, CustomScalarAdapters.Empty, value.__typename) @@ -227,7 +226,7 @@ public object TestQuery_ResponseAdapter { writer: JsonWriter, `value`: TestQuery.Data.OtherUnion, @Suppress("UNUSED_PARAMETER") adapterContext: CompositeAdapterContext, - ): Unit { + ) { writer.name("__typename") StringAdapter.toJson(writer, CustomScalarAdapters.Empty, value.__typename) } diff --git a/libraries/apollo-compiler/src/test/graphql/com/example/target_name/kotlin/responseBased/target_name/adapter/TestQuery_VariablesAdapter.kt.expected b/libraries/apollo-compiler/src/test/graphql/com/example/target_name/kotlin/responseBased/target_name/adapter/TestQuery_VariablesAdapter.kt.expected index 9f9a60ad344..fd96e7e41c0 100644 --- a/libraries/apollo-compiler/src/test/graphql/com/example/target_name/kotlin/responseBased/target_name/adapter/TestQuery_VariablesAdapter.kt.expected +++ b/libraries/apollo-compiler/src/test/graphql/com/example/target_name/kotlin/responseBased/target_name/adapter/TestQuery_VariablesAdapter.kt.expected @@ -18,7 +18,6 @@ import com.example.target_name.type.adapter.renamedEnum_ResponseAdapter import com.example.target_name.type.adapter.renamedInput_InputAdapter import kotlin.Boolean import kotlin.Suppress -import kotlin.Unit public object TestQuery_VariablesAdapter { @Suppress( @@ -30,7 +29,7 @@ public object TestQuery_VariablesAdapter { `value`: TestQuery, customScalarAdapters: CustomScalarAdapters, withBooleanDefaultValues: Boolean, - ): Unit { + ) { val adapterContext = CompositeAdapterContext.Builder().customScalarAdapters(customScalarAdapters).build() if (value.input is Optional.Present) { diff --git a/libraries/apollo-compiler/src/test/graphql/com/example/target_name/kotlin/responseBased/target_name/type/adapter/renamedEnum_ResponseAdapter.kt.expected b/libraries/apollo-compiler/src/test/graphql/com/example/target_name/kotlin/responseBased/target_name/type/adapter/renamedEnum_ResponseAdapter.kt.expected index 8a361db082b..fc1f706fbfa 100644 --- a/libraries/apollo-compiler/src/test/graphql/com/example/target_name/kotlin/responseBased/target_name/type/adapter/renamedEnum_ResponseAdapter.kt.expected +++ b/libraries/apollo-compiler/src/test/graphql/com/example/target_name/kotlin/responseBased/target_name/type/adapter/renamedEnum_ResponseAdapter.kt.expected @@ -10,20 +10,19 @@ import com.apollographql.apollo3.api.CustomScalarAdapters import com.apollographql.apollo3.api.json.JsonReader import com.apollographql.apollo3.api.json.JsonWriter import com.example.target_name.type.renamedEnum -import kotlin.Unit public object renamedEnum_ResponseAdapter : Adapter { - public override fun fromJson(reader: JsonReader, customScalarAdapters: CustomScalarAdapters): + override fun fromJson(reader: JsonReader, customScalarAdapters: CustomScalarAdapters): renamedEnum { val rawValue = reader.nextString()!! return renamedEnum.safeValueOf(rawValue) } - public override fun toJson( + override fun toJson( writer: JsonWriter, customScalarAdapters: CustomScalarAdapters, `value`: renamedEnum, - ): Unit { + ) { writer.value(value.rawValue) } } diff --git a/libraries/apollo-compiler/src/test/graphql/com/example/target_name/kotlin/responseBased/target_name/type/adapter/renamedInput_InputAdapter.kt.expected b/libraries/apollo-compiler/src/test/graphql/com/example/target_name/kotlin/responseBased/target_name/type/adapter/renamedInput_InputAdapter.kt.expected index 005f94c6a5b..d0d7cef27e6 100644 --- a/libraries/apollo-compiler/src/test/graphql/com/example/target_name/kotlin/responseBased/target_name/type/adapter/renamedInput_InputAdapter.kt.expected +++ b/libraries/apollo-compiler/src/test/graphql/com/example/target_name/kotlin/responseBased/target_name/type/adapter/renamedInput_InputAdapter.kt.expected @@ -15,17 +15,16 @@ import com.apollographql.apollo3.api.json.JsonWriter import com.apollographql.apollo3.api.present import com.example.target_name.type.renamedInput import kotlin.IllegalStateException -import kotlin.Unit public object renamedInput_InputAdapter : CompositeAdapter { - public override fun fromJson(reader: JsonReader, adapterContext: CompositeAdapterContext): - renamedInput = throw IllegalStateException("Input type used in output position") + override fun fromJson(reader: JsonReader, adapterContext: CompositeAdapterContext): renamedInput = + throw IllegalStateException("Input type used in output position") - public override fun toJson( + override fun toJson( writer: JsonWriter, `value`: renamedInput, adapterContext: CompositeAdapterContext, - ): Unit { + ) { if (value.`field` is Optional.Present) { writer.name("field") NullableStringAdapter.present().toJson(writer, CustomScalarAdapters.Empty, value.`field`) diff --git a/libraries/apollo-compiler/src/test/graphql/com/example/test_inline/kotlin/operationBased/test_inline/GetPage.kt.expected b/libraries/apollo-compiler/src/test/graphql/com/example/test_inline/kotlin/operationBased/test_inline/GetPage.kt.expected index 4782c6d39aa..f4a5afe4d0e 100644 --- a/libraries/apollo-compiler/src/test/graphql/com/example/test_inline/kotlin/operationBased/test_inline/GetPage.kt.expected +++ b/libraries/apollo-compiler/src/test/graphql/com/example/test_inline/kotlin/operationBased/test_inline/GetPage.kt.expected @@ -18,33 +18,33 @@ import kotlin.Any import kotlin.Boolean import kotlin.Int import kotlin.String -import kotlin.Unit import kotlin.collections.List +import com.example.test_inline.type.Query as CompiledQuery public class GetPage() : Query { - public override fun equals(other: Any?): Boolean = other != null && other::class == this::class + override fun equals(other: Any?): Boolean = other != null && other::class == this::class - public override fun hashCode(): Int = this::class.hashCode() + override fun hashCode(): Int = this::class.hashCode() - public override fun id(): String = OPERATION_ID + override fun id(): String = OPERATION_ID - public override fun document(): String = OPERATION_DOCUMENT + override fun document(): String = OPERATION_DOCUMENT - public override fun name(): String = OPERATION_NAME + override fun name(): String = OPERATION_NAME - public override fun serializeVariables( + override fun serializeVariables( writer: JsonWriter, customScalarAdapters: CustomScalarAdapters, withBooleanDefaultValues: Boolean, - ): Unit { + ) { // This operation doesn't have any variable } - public override fun adapter(): CompositeAdapter = GetPage_ResponseAdapter.Data.obj() + override fun adapter(): CompositeAdapter = GetPage_ResponseAdapter.Data.obj() - public override fun rootField(): CompiledField = CompiledField.Builder( + override fun rootField(): CompiledField = CompiledField.Builder( name = "data", - type = com.example.test_inline.type.Query.type + type = CompiledQuery.type ) .selections(selections = GetPageSelections.__root) .build() diff --git a/libraries/apollo-compiler/src/test/graphql/com/example/test_inline/kotlin/operationBased/test_inline/adapter/GetPage_ResponseAdapter.kt.expected b/libraries/apollo-compiler/src/test/graphql/com/example/test_inline/kotlin/operationBased/test_inline/adapter/GetPage_ResponseAdapter.kt.expected index df814a56528..c35af36ed74 100644 --- a/libraries/apollo-compiler/src/test/graphql/com/example/test_inline/kotlin/operationBased/test_inline/adapter/GetPage_ResponseAdapter.kt.expected +++ b/libraries/apollo-compiler/src/test/graphql/com/example/test_inline/kotlin/operationBased/test_inline/adapter/GetPage_ResponseAdapter.kt.expected @@ -17,14 +17,13 @@ import com.apollographql.apollo3.api.obj import com.apollographql.apollo3.api.possibleTypes import com.example.test_inline.GetPage import kotlin.String -import kotlin.Unit import kotlin.collections.List public object GetPage_ResponseAdapter { public object Data : CompositeAdapter { public val RESPONSE_NAMES: List = listOf("collection") - public override fun fromJson(reader: JsonReader, adapterContext: CompositeAdapterContext): + override fun fromJson(reader: JsonReader, adapterContext: CompositeAdapterContext): GetPage.Data { var _collection: GetPage.Data.Collection? = null @@ -40,11 +39,11 @@ public object GetPage_ResponseAdapter { ) } - public override fun toJson( + override fun toJson( writer: JsonWriter, `value`: GetPage.Data, adapterContext: CompositeAdapterContext, - ): Unit { + ) { writer.name("collection") Collection.obj(true).toJson(writer, value.collection, adapterContext) } @@ -52,7 +51,7 @@ public object GetPage_ResponseAdapter { private object Collection : CompositeAdapter { public val RESPONSE_NAMES: List = listOf("__typename", "items") - public override fun fromJson(reader: JsonReader, adapterContext: CompositeAdapterContext): + override fun fromJson(reader: JsonReader, adapterContext: CompositeAdapterContext): GetPage.Data.Collection { var __typename: String? = null var _items: List? = null @@ -83,11 +82,11 @@ public object GetPage_ResponseAdapter { ) } - public override fun toJson( + override fun toJson( writer: JsonWriter, `value`: GetPage.Data.Collection, adapterContext: CompositeAdapterContext, - ): Unit { + ) { writer.name("__typename") StringAdapter.toJson(writer, CustomScalarAdapters.Empty, value.__typename) @@ -103,7 +102,7 @@ public object GetPage_ResponseAdapter { private object Item : CompositeAdapter { public val RESPONSE_NAMES: List = listOf("title") - public override fun fromJson(reader: JsonReader, adapterContext: CompositeAdapterContext): + override fun fromJson(reader: JsonReader, adapterContext: CompositeAdapterContext): GetPage.Data.Collection.Item { var _title: String? = null @@ -119,11 +118,11 @@ public object GetPage_ResponseAdapter { ) } - public override fun toJson( + override fun toJson( writer: JsonWriter, `value`: GetPage.Data.Collection.Item, adapterContext: CompositeAdapterContext, - ): Unit { + ) { writer.name("title") StringAdapter.toJson(writer, CustomScalarAdapters.Empty, value.title) } @@ -133,7 +132,7 @@ public object GetPage_ResponseAdapter { CompositeAdapter { public val RESPONSE_NAMES: List = listOf("items") - public override fun fromJson(reader: JsonReader, adapterContext: CompositeAdapterContext): + override fun fromJson(reader: JsonReader, adapterContext: CompositeAdapterContext): GetPage.Data.Collection.OnParticularCollection { var _items: List? = null @@ -149,11 +148,11 @@ public object GetPage_ResponseAdapter { ) } - public override fun toJson( + override fun toJson( writer: JsonWriter, `value`: GetPage.Data.Collection.OnParticularCollection, adapterContext: CompositeAdapterContext, - ): Unit { + ) { writer.name("items") Item.obj(true).list().toJson(writer, value.items, adapterContext) } @@ -162,7 +161,7 @@ public object GetPage_ResponseAdapter { { public val RESPONSE_NAMES: List = listOf("__typename") - public override fun fromJson(reader: JsonReader, adapterContext: CompositeAdapterContext): + override fun fromJson(reader: JsonReader, adapterContext: CompositeAdapterContext): GetPage.Data.Collection.OnParticularCollection.Item { var __typename: String? = null @@ -190,11 +189,11 @@ public object GetPage_ResponseAdapter { ) } - public override fun toJson( + override fun toJson( writer: JsonWriter, `value`: GetPage.Data.Collection.OnParticularCollection.Item, adapterContext: CompositeAdapterContext, - ): Unit { + ) { writer.name("__typename") StringAdapter.toJson(writer, CustomScalarAdapters.Empty, value.__typename) @@ -209,8 +208,7 @@ public object GetPage_ResponseAdapter { { public val RESPONSE_NAMES: List = listOf("image") - public override fun fromJson(reader: JsonReader, - adapterContext: CompositeAdapterContext): + override fun fromJson(reader: JsonReader, adapterContext: CompositeAdapterContext): GetPage.Data.Collection.OnParticularCollection.Item.OnParticularItem { var _image: String? = null @@ -226,11 +224,11 @@ public object GetPage_ResponseAdapter { ) } - public override fun toJson( + override fun toJson( writer: JsonWriter, `value`: GetPage.Data.Collection.OnParticularCollection.Item.OnParticularItem, adapterContext: CompositeAdapterContext, - ): Unit { + ) { writer.name("image") StringAdapter.toJson(writer, CustomScalarAdapters.Empty, value.image) } diff --git a/libraries/apollo-compiler/src/test/graphql/com/example/test_inline/kotlin/responseBased/test_inline/GetPage.kt.expected b/libraries/apollo-compiler/src/test/graphql/com/example/test_inline/kotlin/responseBased/test_inline/GetPage.kt.expected index eeedd2bddd5..259a1e5b4ec 100644 --- a/libraries/apollo-compiler/src/test/graphql/com/example/test_inline/kotlin/responseBased/test_inline/GetPage.kt.expected +++ b/libraries/apollo-compiler/src/test/graphql/com/example/test_inline/kotlin/responseBased/test_inline/GetPage.kt.expected @@ -18,33 +18,34 @@ import kotlin.Any import kotlin.Boolean import kotlin.Int import kotlin.String -import kotlin.Unit +import kotlin.Suppress import kotlin.collections.List +import com.example.test_inline.type.Query as CompiledQuery public class GetPage() : Query { - public override fun equals(other: Any?): Boolean = other != null && other::class == this::class + override fun equals(other: Any?): Boolean = other != null && other::class == this::class - public override fun hashCode(): Int = this::class.hashCode() + override fun hashCode(): Int = this::class.hashCode() - public override fun id(): String = OPERATION_ID + override fun id(): String = OPERATION_ID - public override fun document(): String = OPERATION_DOCUMENT + override fun document(): String = OPERATION_DOCUMENT - public override fun name(): String = OPERATION_NAME + override fun name(): String = OPERATION_NAME - public override fun serializeVariables( + override fun serializeVariables( writer: JsonWriter, customScalarAdapters: CustomScalarAdapters, withBooleanDefaultValues: Boolean, - ): Unit { + ) { // This operation doesn't have any variable } - public override fun adapter(): CompositeAdapter = GetPage_ResponseAdapter.Data.obj() + override fun adapter(): CompositeAdapter = GetPage_ResponseAdapter.Data.obj() - public override fun rootField(): CompiledField = CompiledField.Builder( + override fun rootField(): CompiledField = CompiledField.Builder( name = "data", - type = com.example.test_inline.type.Query.type + type = CompiledQuery.type ) .selections(selections = GetPageSelections.__root) .build() @@ -63,42 +64,45 @@ public class GetPage() : Query { } public companion object { - public fun Collection.asParticularCollection() = this as? ParticularCollectionCollection + @Suppress("USELESS_CAST") + public fun Collection.asParticularCollection(): ParticularCollectionCollection? = this as? + ParticularCollectionCollection } } public data class ParticularCollectionCollection( - public override val __typename: String, - public override val items: List, + override val __typename: String, + override val items: List, ) : Collection { public sealed interface Item : Collection.Item { - public override val title: String + override val title: String public val __typename: String public companion object { - public fun Item.asParticularItem() = this as? ParticularItemItem + @Suppress("USELESS_CAST") + public fun Item.asParticularItem(): ParticularItemItem? = this as? ParticularItemItem } } public data class ParticularItemItem( - public override val title: String, - public override val __typename: String, + override val title: String, + override val __typename: String, public val image: String, ) : Item, Collection.Item public data class OtherItem( - public override val title: String, - public override val __typename: String, + override val title: String, + override val __typename: String, ) : Item, Collection.Item } public data class OtherCollection( - public override val __typename: String, - public override val items: List, + override val __typename: String, + override val items: List, ) : Collection { public data class Item( - public override val title: String, + override val title: String, ) : Collection.Item } } diff --git a/libraries/apollo-compiler/src/test/graphql/com/example/test_inline/kotlin/responseBased/test_inline/adapter/GetPage_ResponseAdapter.kt.expected b/libraries/apollo-compiler/src/test/graphql/com/example/test_inline/kotlin/responseBased/test_inline/adapter/GetPage_ResponseAdapter.kt.expected index c0033179a13..88297255d26 100644 --- a/libraries/apollo-compiler/src/test/graphql/com/example/test_inline/kotlin/responseBased/test_inline/adapter/GetPage_ResponseAdapter.kt.expected +++ b/libraries/apollo-compiler/src/test/graphql/com/example/test_inline/kotlin/responseBased/test_inline/adapter/GetPage_ResponseAdapter.kt.expected @@ -17,14 +17,13 @@ import com.apollographql.apollo3.api.obj import com.example.test_inline.GetPage import kotlin.String import kotlin.Suppress -import kotlin.Unit import kotlin.collections.List public object GetPage_ResponseAdapter { public object Data : CompositeAdapter { public val RESPONSE_NAMES: List = listOf("collection") - public override fun fromJson(reader: JsonReader, adapterContext: CompositeAdapterContext): + override fun fromJson(reader: JsonReader, adapterContext: CompositeAdapterContext): GetPage.Data { var _collection: GetPage.Data.Collection? = null @@ -40,17 +39,17 @@ public object GetPage_ResponseAdapter { ) } - public override fun toJson( + override fun toJson( writer: JsonWriter, `value`: GetPage.Data, adapterContext: CompositeAdapterContext, - ): Unit { + ) { writer.name("collection") Collection.obj().toJson(writer, value.collection, adapterContext) } private object Collection : CompositeAdapter { - public override fun fromJson(reader: JsonReader, adapterContext: CompositeAdapterContext): + override fun fromJson(reader: JsonReader, adapterContext: CompositeAdapterContext): GetPage.Data.Collection { val __typename = reader.readTypename() return when(__typename) { @@ -61,11 +60,11 @@ public object GetPage_ResponseAdapter { } } - public override fun toJson( + override fun toJson( writer: JsonWriter, `value`: GetPage.Data.Collection, adapterContext: CompositeAdapterContext, - ): Unit { + ) { when(value) { is GetPage.Data.ParticularCollectionCollection -> ParticularCollectionCollection.toJson(writer, value, adapterContext) @@ -103,7 +102,7 @@ public object GetPage_ResponseAdapter { writer: JsonWriter, `value`: GetPage.Data.ParticularCollectionCollection, @Suppress("UNUSED_PARAMETER") adapterContext: CompositeAdapterContext, - ): Unit { + ) { writer.name("__typename") StringAdapter.toJson(writer, CustomScalarAdapters.Empty, value.__typename) @@ -112,7 +111,7 @@ public object GetPage_ResponseAdapter { } private object Item : CompositeAdapter { - public override fun fromJson(reader: JsonReader, adapterContext: CompositeAdapterContext): + override fun fromJson(reader: JsonReader, adapterContext: CompositeAdapterContext): GetPage.Data.ParticularCollectionCollection.Item { val __typename = reader.readTypename() return when(__typename) { @@ -123,11 +122,11 @@ public object GetPage_ResponseAdapter { } } - public override fun toJson( + override fun toJson( writer: JsonWriter, `value`: GetPage.Data.ParticularCollectionCollection.Item, adapterContext: CompositeAdapterContext, - ): Unit { + ) { when(value) { is GetPage.Data.ParticularCollectionCollection.ParticularItemItem -> ParticularItemItem.toJson(writer, value, adapterContext) @@ -169,7 +168,7 @@ public object GetPage_ResponseAdapter { writer: JsonWriter, `value`: GetPage.Data.ParticularCollectionCollection.ParticularItemItem, @Suppress("UNUSED_PARAMETER") adapterContext: CompositeAdapterContext, - ): Unit { + ) { writer.name("title") StringAdapter.toJson(writer, CustomScalarAdapters.Empty, value.title) @@ -210,7 +209,7 @@ public object GetPage_ResponseAdapter { writer: JsonWriter, `value`: GetPage.Data.ParticularCollectionCollection.OtherItem, @Suppress("UNUSED_PARAMETER") adapterContext: CompositeAdapterContext, - ): Unit { + ) { writer.name("title") StringAdapter.toJson(writer, CustomScalarAdapters.Empty, value.title) @@ -249,7 +248,7 @@ public object GetPage_ResponseAdapter { writer: JsonWriter, `value`: GetPage.Data.OtherCollection, @Suppress("UNUSED_PARAMETER") adapterContext: CompositeAdapterContext, - ): Unit { + ) { writer.name("__typename") StringAdapter.toJson(writer, CustomScalarAdapters.Empty, value.__typename) @@ -260,7 +259,7 @@ public object GetPage_ResponseAdapter { private object Item : CompositeAdapter { public val RESPONSE_NAMES: List = listOf("title") - public override fun fromJson(reader: JsonReader, adapterContext: CompositeAdapterContext): + override fun fromJson(reader: JsonReader, adapterContext: CompositeAdapterContext): GetPage.Data.OtherCollection.Item { var _title: String? = null @@ -276,11 +275,11 @@ public object GetPage_ResponseAdapter { ) } - public override fun toJson( + override fun toJson( writer: JsonWriter, `value`: GetPage.Data.OtherCollection.Item, adapterContext: CompositeAdapterContext, - ): Unit { + ) { writer.name("title") StringAdapter.toJson(writer, CustomScalarAdapters.Empty, value.title) } diff --git a/libraries/apollo-compiler/src/test/graphql/com/example/two_heroes_unique/kotlin/responseBased/two_heroes_unique/TestQuery.kt.expected b/libraries/apollo-compiler/src/test/graphql/com/example/two_heroes_unique/kotlin/responseBased/two_heroes_unique/TestQuery.kt.expected index 2efda86dac4..8fab05511e3 100644 --- a/libraries/apollo-compiler/src/test/graphql/com/example/two_heroes_unique/kotlin/responseBased/two_heroes_unique/TestQuery.kt.expected +++ b/libraries/apollo-compiler/src/test/graphql/com/example/two_heroes_unique/kotlin/responseBased/two_heroes_unique/TestQuery.kt.expected @@ -18,32 +18,32 @@ import kotlin.Any import kotlin.Boolean import kotlin.Int import kotlin.String -import kotlin.Unit +import com.example.two_heroes_unique.type.Query as CompiledQuery public class TestQuery() : Query { - public override fun equals(other: Any?): Boolean = other != null && other::class == this::class + override fun equals(other: Any?): Boolean = other != null && other::class == this::class - public override fun hashCode(): Int = this::class.hashCode() + override fun hashCode(): Int = this::class.hashCode() - public override fun id(): String = OPERATION_ID + override fun id(): String = OPERATION_ID - public override fun document(): String = OPERATION_DOCUMENT + override fun document(): String = OPERATION_DOCUMENT - public override fun name(): String = OPERATION_NAME + override fun name(): String = OPERATION_NAME - public override fun serializeVariables( + override fun serializeVariables( writer: JsonWriter, customScalarAdapters: CustomScalarAdapters, withBooleanDefaultValues: Boolean, - ): Unit { + ) { // This operation doesn't have any variable } - public override fun adapter(): CompositeAdapter = TestQuery_ResponseAdapter.Data.obj() + override fun adapter(): CompositeAdapter = TestQuery_ResponseAdapter.Data.obj() - public override fun rootField(): CompiledField = CompiledField.Builder( + override fun rootField(): CompiledField = CompiledField.Builder( name = "data", - type = com.example.two_heroes_unique.type.Query.type + type = CompiledQuery.type ) .selections(selections = TestQuerySelections.__root) .build() diff --git a/libraries/apollo-compiler/src/test/graphql/com/example/two_heroes_unique/kotlin/responseBased/two_heroes_unique/adapter/TestQuery_ResponseAdapter.kt.expected b/libraries/apollo-compiler/src/test/graphql/com/example/two_heroes_unique/kotlin/responseBased/two_heroes_unique/adapter/TestQuery_ResponseAdapter.kt.expected index 23a0bd38a95..916aa2ae4a2 100644 --- a/libraries/apollo-compiler/src/test/graphql/com/example/two_heroes_unique/kotlin/responseBased/two_heroes_unique/adapter/TestQuery_ResponseAdapter.kt.expected +++ b/libraries/apollo-compiler/src/test/graphql/com/example/two_heroes_unique/kotlin/responseBased/two_heroes_unique/adapter/TestQuery_ResponseAdapter.kt.expected @@ -15,14 +15,13 @@ import com.apollographql.apollo3.api.nullable import com.apollographql.apollo3.api.obj import com.example.two_heroes_unique.TestQuery import kotlin.String -import kotlin.Unit import kotlin.collections.List public object TestQuery_ResponseAdapter { public object Data : CompositeAdapter { public val RESPONSE_NAMES: List = listOf("r2", "luke") - public override fun fromJson(reader: JsonReader, adapterContext: CompositeAdapterContext): + override fun fromJson(reader: JsonReader, adapterContext: CompositeAdapterContext): TestQuery.Data { var _r2: TestQuery.Data.R2? = null var _luke: TestQuery.Data.Luke? = null @@ -41,11 +40,11 @@ public object TestQuery_ResponseAdapter { ) } - public override fun toJson( + override fun toJson( writer: JsonWriter, `value`: TestQuery.Data, adapterContext: CompositeAdapterContext, - ): Unit { + ) { writer.name("r2") R2.obj().nullable().toJson(writer, value.r2, adapterContext) @@ -56,7 +55,7 @@ public object TestQuery_ResponseAdapter { private object R2 : CompositeAdapter { public val RESPONSE_NAMES: List = listOf("name") - public override fun fromJson(reader: JsonReader, adapterContext: CompositeAdapterContext): + override fun fromJson(reader: JsonReader, adapterContext: CompositeAdapterContext): TestQuery.Data.R2 { var _name: String? = null @@ -72,11 +71,11 @@ public object TestQuery_ResponseAdapter { ) } - public override fun toJson( + override fun toJson( writer: JsonWriter, `value`: TestQuery.Data.R2, adapterContext: CompositeAdapterContext, - ): Unit { + ) { writer.name("name") StringAdapter.toJson(writer, CustomScalarAdapters.Empty, value.name) } @@ -85,7 +84,7 @@ public object TestQuery_ResponseAdapter { private object Luke : CompositeAdapter { public val RESPONSE_NAMES: List = listOf("id", "name") - public override fun fromJson(reader: JsonReader, adapterContext: CompositeAdapterContext): + override fun fromJson(reader: JsonReader, adapterContext: CompositeAdapterContext): TestQuery.Data.Luke { var _id: String? = null var _name: String? = null @@ -104,11 +103,11 @@ public object TestQuery_ResponseAdapter { ) } - public override fun toJson( + override fun toJson( writer: JsonWriter, `value`: TestQuery.Data.Luke, adapterContext: CompositeAdapterContext, - ): Unit { + ) { writer.name("id") StringAdapter.toJson(writer, CustomScalarAdapters.Empty, value.id) diff --git a/libraries/apollo-compiler/src/test/graphql/com/example/two_heroes_with_friends/kotlin/responseBased/two_heroes_with_friends/TestQuery.kt.expected b/libraries/apollo-compiler/src/test/graphql/com/example/two_heroes_with_friends/kotlin/responseBased/two_heroes_with_friends/TestQuery.kt.expected index 3931503d1d6..3b63605ca3f 100644 --- a/libraries/apollo-compiler/src/test/graphql/com/example/two_heroes_with_friends/kotlin/responseBased/two_heroes_with_friends/TestQuery.kt.expected +++ b/libraries/apollo-compiler/src/test/graphql/com/example/two_heroes_with_friends/kotlin/responseBased/two_heroes_with_friends/TestQuery.kt.expected @@ -18,33 +18,33 @@ import kotlin.Any import kotlin.Boolean import kotlin.Int import kotlin.String -import kotlin.Unit import kotlin.collections.List +import com.example.two_heroes_with_friends.type.Query as CompiledQuery public class TestQuery() : Query { - public override fun equals(other: Any?): Boolean = other != null && other::class == this::class + override fun equals(other: Any?): Boolean = other != null && other::class == this::class - public override fun hashCode(): Int = this::class.hashCode() + override fun hashCode(): Int = this::class.hashCode() - public override fun id(): String = OPERATION_ID + override fun id(): String = OPERATION_ID - public override fun document(): String = OPERATION_DOCUMENT + override fun document(): String = OPERATION_DOCUMENT - public override fun name(): String = OPERATION_NAME + override fun name(): String = OPERATION_NAME - public override fun serializeVariables( + override fun serializeVariables( writer: JsonWriter, customScalarAdapters: CustomScalarAdapters, withBooleanDefaultValues: Boolean, - ): Unit { + ) { // This operation doesn't have any variable } - public override fun adapter(): CompositeAdapter = TestQuery_ResponseAdapter.Data.obj() + override fun adapter(): CompositeAdapter = TestQuery_ResponseAdapter.Data.obj() - public override fun rootField(): CompiledField = CompiledField.Builder( + override fun rootField(): CompiledField = CompiledField.Builder( name = "data", - type = com.example.two_heroes_with_friends.type.Query.type + type = CompiledQuery.type ) .selections(selections = TestQuerySelections.__root) .build() diff --git a/libraries/apollo-compiler/src/test/graphql/com/example/two_heroes_with_friends/kotlin/responseBased/two_heroes_with_friends/adapter/TestQuery_ResponseAdapter.kt.expected b/libraries/apollo-compiler/src/test/graphql/com/example/two_heroes_with_friends/kotlin/responseBased/two_heroes_with_friends/adapter/TestQuery_ResponseAdapter.kt.expected index 9f3bcef1c4d..a1430c39761 100644 --- a/libraries/apollo-compiler/src/test/graphql/com/example/two_heroes_with_friends/kotlin/responseBased/two_heroes_with_friends/adapter/TestQuery_ResponseAdapter.kt.expected +++ b/libraries/apollo-compiler/src/test/graphql/com/example/two_heroes_with_friends/kotlin/responseBased/two_heroes_with_friends/adapter/TestQuery_ResponseAdapter.kt.expected @@ -18,14 +18,13 @@ import com.apollographql.apollo3.api.obj import com.example.two_heroes_with_friends.TestQuery import kotlin.Int import kotlin.String -import kotlin.Unit import kotlin.collections.List public object TestQuery_ResponseAdapter { public object Data : CompositeAdapter { public val RESPONSE_NAMES: List = listOf("r2", "luke") - public override fun fromJson(reader: JsonReader, adapterContext: CompositeAdapterContext): + override fun fromJson(reader: JsonReader, adapterContext: CompositeAdapterContext): TestQuery.Data { var _r2: TestQuery.Data.R2? = null var _luke: TestQuery.Data.Luke? = null @@ -44,11 +43,11 @@ public object TestQuery_ResponseAdapter { ) } - public override fun toJson( + override fun toJson( writer: JsonWriter, `value`: TestQuery.Data, adapterContext: CompositeAdapterContext, - ): Unit { + ) { writer.name("r2") R2.obj().nullable().toJson(writer, value.r2, adapterContext) @@ -59,7 +58,7 @@ public object TestQuery_ResponseAdapter { private object R2 : CompositeAdapter { public val RESPONSE_NAMES: List = listOf("name", "friendsConnection") - public override fun fromJson(reader: JsonReader, adapterContext: CompositeAdapterContext): + override fun fromJson(reader: JsonReader, adapterContext: CompositeAdapterContext): TestQuery.Data.R2 { var _name: String? = null var _friendsConnection: TestQuery.Data.R2.FriendsConnection? = null @@ -78,11 +77,11 @@ public object TestQuery_ResponseAdapter { ) } - public override fun toJson( + override fun toJson( writer: JsonWriter, `value`: TestQuery.Data.R2, adapterContext: CompositeAdapterContext, - ): Unit { + ) { writer.name("name") StringAdapter.toJson(writer, CustomScalarAdapters.Empty, value.name) @@ -93,7 +92,7 @@ public object TestQuery_ResponseAdapter { private object FriendsConnection : CompositeAdapter { public val RESPONSE_NAMES: List = listOf("totalCount", "edges") - public override fun fromJson(reader: JsonReader, adapterContext: CompositeAdapterContext): + override fun fromJson(reader: JsonReader, adapterContext: CompositeAdapterContext): TestQuery.Data.R2.FriendsConnection { var _totalCount: Int? = null var _edges: List? = null @@ -112,11 +111,11 @@ public object TestQuery_ResponseAdapter { ) } - public override fun toJson( + override fun toJson( writer: JsonWriter, `value`: TestQuery.Data.R2.FriendsConnection, adapterContext: CompositeAdapterContext, - ): Unit { + ) { writer.name("totalCount") NullableIntAdapter.toJson(writer, CustomScalarAdapters.Empty, value.totalCount) @@ -127,7 +126,7 @@ public object TestQuery_ResponseAdapter { private object Edge : CompositeAdapter { public val RESPONSE_NAMES: List = listOf("node") - public override fun fromJson(reader: JsonReader, adapterContext: CompositeAdapterContext): + override fun fromJson(reader: JsonReader, adapterContext: CompositeAdapterContext): TestQuery.Data.R2.FriendsConnection.Edge { var _node: TestQuery.Data.R2.FriendsConnection.Edge.Node? = null @@ -143,11 +142,11 @@ public object TestQuery_ResponseAdapter { ) } - public override fun toJson( + override fun toJson( writer: JsonWriter, `value`: TestQuery.Data.R2.FriendsConnection.Edge, adapterContext: CompositeAdapterContext, - ): Unit { + ) { writer.name("node") Node.obj().nullable().toJson(writer, value.node, adapterContext) } @@ -155,8 +154,7 @@ public object TestQuery_ResponseAdapter { private object Node : CompositeAdapter { public val RESPONSE_NAMES: List = listOf("name") - public override fun fromJson(reader: JsonReader, - adapterContext: CompositeAdapterContext): + override fun fromJson(reader: JsonReader, adapterContext: CompositeAdapterContext): TestQuery.Data.R2.FriendsConnection.Edge.Node { var _name: String? = null @@ -172,11 +170,11 @@ public object TestQuery_ResponseAdapter { ) } - public override fun toJson( + override fun toJson( writer: JsonWriter, `value`: TestQuery.Data.R2.FriendsConnection.Edge.Node, adapterContext: CompositeAdapterContext, - ): Unit { + ) { writer.name("name") StringAdapter.toJson(writer, CustomScalarAdapters.Empty, value.name) } @@ -188,7 +186,7 @@ public object TestQuery_ResponseAdapter { private object Luke : CompositeAdapter { public val RESPONSE_NAMES: List = listOf("id", "name", "friendsConnection") - public override fun fromJson(reader: JsonReader, adapterContext: CompositeAdapterContext): + override fun fromJson(reader: JsonReader, adapterContext: CompositeAdapterContext): TestQuery.Data.Luke { var _id: String? = null var _name: String? = null @@ -210,11 +208,11 @@ public object TestQuery_ResponseAdapter { ) } - public override fun toJson( + override fun toJson( writer: JsonWriter, `value`: TestQuery.Data.Luke, adapterContext: CompositeAdapterContext, - ): Unit { + ) { writer.name("id") StringAdapter.toJson(writer, CustomScalarAdapters.Empty, value.id) @@ -228,7 +226,7 @@ public object TestQuery_ResponseAdapter { private object FriendsConnection : CompositeAdapter { public val RESPONSE_NAMES: List = listOf("totalCount", "edges") - public override fun fromJson(reader: JsonReader, adapterContext: CompositeAdapterContext): + override fun fromJson(reader: JsonReader, adapterContext: CompositeAdapterContext): TestQuery.Data.Luke.FriendsConnection { var _totalCount: Int? = null var _edges: List? = null @@ -247,11 +245,11 @@ public object TestQuery_ResponseAdapter { ) } - public override fun toJson( + override fun toJson( writer: JsonWriter, `value`: TestQuery.Data.Luke.FriendsConnection, adapterContext: CompositeAdapterContext, - ): Unit { + ) { writer.name("totalCount") NullableIntAdapter.toJson(writer, CustomScalarAdapters.Empty, value.totalCount) @@ -262,7 +260,7 @@ public object TestQuery_ResponseAdapter { private object Edge : CompositeAdapter { public val RESPONSE_NAMES: List = listOf("node") - public override fun fromJson(reader: JsonReader, adapterContext: CompositeAdapterContext): + override fun fromJson(reader: JsonReader, adapterContext: CompositeAdapterContext): TestQuery.Data.Luke.FriendsConnection.Edge { var _node: TestQuery.Data.Luke.FriendsConnection.Edge.Node? = null @@ -278,11 +276,11 @@ public object TestQuery_ResponseAdapter { ) } - public override fun toJson( + override fun toJson( writer: JsonWriter, `value`: TestQuery.Data.Luke.FriendsConnection.Edge, adapterContext: CompositeAdapterContext, - ): Unit { + ) { writer.name("node") Node.obj().nullable().toJson(writer, value.node, adapterContext) } @@ -290,8 +288,7 @@ public object TestQuery_ResponseAdapter { private object Node : CompositeAdapter { public val RESPONSE_NAMES: List = listOf("name") - public override fun fromJson(reader: JsonReader, - adapterContext: CompositeAdapterContext): + override fun fromJson(reader: JsonReader, adapterContext: CompositeAdapterContext): TestQuery.Data.Luke.FriendsConnection.Edge.Node { var _name: String? = null @@ -307,11 +304,11 @@ public object TestQuery_ResponseAdapter { ) } - public override fun toJson( + override fun toJson( writer: JsonWriter, `value`: TestQuery.Data.Luke.FriendsConnection.Edge.Node, adapterContext: CompositeAdapterContext, - ): Unit { + ) { writer.name("name") StringAdapter.toJson(writer, CustomScalarAdapters.Empty, value.name) } diff --git a/libraries/apollo-compiler/src/test/graphql/com/example/typename_always_first/kotlin/operationBased/typename_always_first/TestQuery.kt.expected b/libraries/apollo-compiler/src/test/graphql/com/example/typename_always_first/kotlin/operationBased/typename_always_first/TestQuery.kt.expected index a3d647992d5..16b6b63adfd 100644 --- a/libraries/apollo-compiler/src/test/graphql/com/example/typename_always_first/kotlin/operationBased/typename_always_first/TestQuery.kt.expected +++ b/libraries/apollo-compiler/src/test/graphql/com/example/typename_always_first/kotlin/operationBased/typename_always_first/TestQuery.kt.expected @@ -19,32 +19,32 @@ import kotlin.Boolean import kotlin.Double import kotlin.Int import kotlin.String -import kotlin.Unit +import com.example.typename_always_first.type.Query as CompiledQuery public class TestQuery() : Query { - public override fun equals(other: Any?): Boolean = other != null && other::class == this::class + override fun equals(other: Any?): Boolean = other != null && other::class == this::class - public override fun hashCode(): Int = this::class.hashCode() + override fun hashCode(): Int = this::class.hashCode() - public override fun id(): String = OPERATION_ID + override fun id(): String = OPERATION_ID - public override fun document(): String = OPERATION_DOCUMENT + override fun document(): String = OPERATION_DOCUMENT - public override fun name(): String = OPERATION_NAME + override fun name(): String = OPERATION_NAME - public override fun serializeVariables( + override fun serializeVariables( writer: JsonWriter, customScalarAdapters: CustomScalarAdapters, withBooleanDefaultValues: Boolean, - ): Unit { + ) { // This operation doesn't have any variable } - public override fun adapter(): CompositeAdapter = TestQuery_ResponseAdapter.Data.obj() + override fun adapter(): CompositeAdapter = TestQuery_ResponseAdapter.Data.obj() - public override fun rootField(): CompiledField = CompiledField.Builder( + override fun rootField(): CompiledField = CompiledField.Builder( name = "data", - type = com.example.typename_always_first.type.Query.type + type = CompiledQuery.type ) .selections(selections = TestQuerySelections.__root) .build() diff --git a/libraries/apollo-compiler/src/test/graphql/com/example/typename_always_first/kotlin/operationBased/typename_always_first/adapter/TestQuery_ResponseAdapter.kt.expected b/libraries/apollo-compiler/src/test/graphql/com/example/typename_always_first/kotlin/operationBased/typename_always_first/adapter/TestQuery_ResponseAdapter.kt.expected index 1949813d442..6e6922f0ec1 100644 --- a/libraries/apollo-compiler/src/test/graphql/com/example/typename_always_first/kotlin/operationBased/typename_always_first/adapter/TestQuery_ResponseAdapter.kt.expected +++ b/libraries/apollo-compiler/src/test/graphql/com/example/typename_always_first/kotlin/operationBased/typename_always_first/adapter/TestQuery_ResponseAdapter.kt.expected @@ -20,14 +20,13 @@ import com.apollographql.apollo3.api.possibleTypes import com.example.typename_always_first.TestQuery import kotlin.Double import kotlin.String -import kotlin.Unit import kotlin.collections.List public object TestQuery_ResponseAdapter { public object Data : CompositeAdapter { public val RESPONSE_NAMES: List = listOf("hero", "__typename") - public override fun fromJson(reader: JsonReader, adapterContext: CompositeAdapterContext): + override fun fromJson(reader: JsonReader, adapterContext: CompositeAdapterContext): TestQuery.Data { var _hero: TestQuery.Data.Hero? = null var __typename: String? = null @@ -46,11 +45,11 @@ public object TestQuery_ResponseAdapter { ) } - public override fun toJson( + override fun toJson( writer: JsonWriter, `value`: TestQuery.Data, adapterContext: CompositeAdapterContext, - ): Unit { + ) { writer.name("hero") Hero.obj(true).nullable().toJson(writer, value.hero, adapterContext) @@ -61,7 +60,7 @@ public object TestQuery_ResponseAdapter { private object Hero : CompositeAdapter { public val RESPONSE_NAMES: List = listOf("__typename") - public override fun fromJson(reader: JsonReader, adapterContext: CompositeAdapterContext): + override fun fromJson(reader: JsonReader, adapterContext: CompositeAdapterContext): TestQuery.Data.Hero { var __typename: String? = null @@ -97,11 +96,11 @@ public object TestQuery_ResponseAdapter { ) } - public override fun toJson( + override fun toJson( writer: JsonWriter, `value`: TestQuery.Data.Hero, adapterContext: CompositeAdapterContext, - ): Unit { + ) { writer.name("__typename") StringAdapter.toJson(writer, CustomScalarAdapters.Empty, value.__typename) @@ -119,7 +118,7 @@ public object TestQuery_ResponseAdapter { private object OnHuman : CompositeAdapter { public val RESPONSE_NAMES: List = listOf("height", "__typename") - public override fun fromJson(reader: JsonReader, adapterContext: CompositeAdapterContext): + override fun fromJson(reader: JsonReader, adapterContext: CompositeAdapterContext): TestQuery.Data.Hero.OnHuman { var _height: Double? = null var __typename: String? = null @@ -138,11 +137,11 @@ public object TestQuery_ResponseAdapter { ) } - public override fun toJson( + override fun toJson( writer: JsonWriter, `value`: TestQuery.Data.Hero.OnHuman, adapterContext: CompositeAdapterContext, - ): Unit { + ) { writer.name("height") NullableDoubleAdapter.toJson(writer, CustomScalarAdapters.Empty, value.height) @@ -154,7 +153,7 @@ public object TestQuery_ResponseAdapter { private object OnDroid : CompositeAdapter { public val RESPONSE_NAMES: List = listOf("name", "__typename", "primaryFunction") - public override fun fromJson(reader: JsonReader, adapterContext: CompositeAdapterContext): + override fun fromJson(reader: JsonReader, adapterContext: CompositeAdapterContext): TestQuery.Data.Hero.OnDroid { var _name: String? = null var __typename: String? = null @@ -176,11 +175,11 @@ public object TestQuery_ResponseAdapter { ) } - public override fun toJson( + override fun toJson( writer: JsonWriter, `value`: TestQuery.Data.Hero.OnDroid, adapterContext: CompositeAdapterContext, - ): Unit { + ) { writer.name("name") StringAdapter.toJson(writer, CustomScalarAdapters.Empty, value.name) diff --git a/libraries/apollo-compiler/src/test/graphql/com/example/typename_always_first/kotlin/responseBased/typename_always_first/TestQuery.kt.expected b/libraries/apollo-compiler/src/test/graphql/com/example/typename_always_first/kotlin/responseBased/typename_always_first/TestQuery.kt.expected index d10eae162ae..6f8ab6f8979 100644 --- a/libraries/apollo-compiler/src/test/graphql/com/example/typename_always_first/kotlin/responseBased/typename_always_first/TestQuery.kt.expected +++ b/libraries/apollo-compiler/src/test/graphql/com/example/typename_always_first/kotlin/responseBased/typename_always_first/TestQuery.kt.expected @@ -19,32 +19,33 @@ import kotlin.Boolean import kotlin.Double import kotlin.Int import kotlin.String -import kotlin.Unit +import kotlin.Suppress +import com.example.typename_always_first.type.Query as CompiledQuery public class TestQuery() : Query { - public override fun equals(other: Any?): Boolean = other != null && other::class == this::class + override fun equals(other: Any?): Boolean = other != null && other::class == this::class - public override fun hashCode(): Int = this::class.hashCode() + override fun hashCode(): Int = this::class.hashCode() - public override fun id(): String = OPERATION_ID + override fun id(): String = OPERATION_ID - public override fun document(): String = OPERATION_DOCUMENT + override fun document(): String = OPERATION_DOCUMENT - public override fun name(): String = OPERATION_NAME + override fun name(): String = OPERATION_NAME - public override fun serializeVariables( + override fun serializeVariables( writer: JsonWriter, customScalarAdapters: CustomScalarAdapters, withBooleanDefaultValues: Boolean, - ): Unit { + ) { // This operation doesn't have any variable } - public override fun adapter(): CompositeAdapter = TestQuery_ResponseAdapter.Data.obj() + override fun adapter(): CompositeAdapter = TestQuery_ResponseAdapter.Data.obj() - public override fun rootField(): CompiledField = CompiledField.Builder( + override fun rootField(): CompiledField = CompiledField.Builder( name = "data", - type = com.example.typename_always_first.type.Query.type + type = CompiledQuery.type ) .selections(selections = TestQuerySelections.__root) .build() @@ -58,14 +59,16 @@ public class TestQuery() : Query { public val __typename: String public companion object { - public fun Hero.asHuman() = this as? HumanHero + @Suppress("USELESS_CAST") + public fun Hero.asHuman(): HumanHero? = this as? HumanHero - public fun Hero.asDroid() = this as? DroidHero + @Suppress("USELESS_CAST") + public fun Hero.asDroid(): DroidHero? = this as? DroidHero } } public data class HumanHero( - public override val __typename: String, + override val __typename: String, /** * Height in the preferred unit, default is meters */ @@ -73,7 +76,7 @@ public class TestQuery() : Query { ) : Hero public data class DroidHero( - public override val __typename: String, + override val __typename: String, /** * What others call this droid */ @@ -85,7 +88,7 @@ public class TestQuery() : Query { ) : Hero public data class OtherHero( - public override val __typename: String, + override val __typename: String, ) : Hero } diff --git a/libraries/apollo-compiler/src/test/graphql/com/example/typename_always_first/kotlin/responseBased/typename_always_first/adapter/TestQuery_ResponseAdapter.kt.expected b/libraries/apollo-compiler/src/test/graphql/com/example/typename_always_first/kotlin/responseBased/typename_always_first/adapter/TestQuery_ResponseAdapter.kt.expected index a4e37684b4b..ff8fc113a93 100644 --- a/libraries/apollo-compiler/src/test/graphql/com/example/typename_always_first/kotlin/responseBased/typename_always_first/adapter/TestQuery_ResponseAdapter.kt.expected +++ b/libraries/apollo-compiler/src/test/graphql/com/example/typename_always_first/kotlin/responseBased/typename_always_first/adapter/TestQuery_ResponseAdapter.kt.expected @@ -20,14 +20,13 @@ import com.example.typename_always_first.TestQuery import kotlin.Double import kotlin.String import kotlin.Suppress -import kotlin.Unit import kotlin.collections.List public object TestQuery_ResponseAdapter { public object Data : CompositeAdapter { public val RESPONSE_NAMES: List = listOf("hero", "__typename") - public override fun fromJson(reader: JsonReader, adapterContext: CompositeAdapterContext): + override fun fromJson(reader: JsonReader, adapterContext: CompositeAdapterContext): TestQuery.Data { var _hero: TestQuery.Data.Hero? = null var __typename: String? = null @@ -46,11 +45,11 @@ public object TestQuery_ResponseAdapter { ) } - public override fun toJson( + override fun toJson( writer: JsonWriter, `value`: TestQuery.Data, adapterContext: CompositeAdapterContext, - ): Unit { + ) { writer.name("hero") Hero.obj().nullable().toJson(writer, value.hero, adapterContext) @@ -59,7 +58,7 @@ public object TestQuery_ResponseAdapter { } private object Hero : CompositeAdapter { - public override fun fromJson(reader: JsonReader, adapterContext: CompositeAdapterContext): + override fun fromJson(reader: JsonReader, adapterContext: CompositeAdapterContext): TestQuery.Data.Hero { val __typename = reader.readTypename() return when(__typename) { @@ -72,11 +71,11 @@ public object TestQuery_ResponseAdapter { } } - public override fun toJson( + override fun toJson( writer: JsonWriter, `value`: TestQuery.Data.Hero, adapterContext: CompositeAdapterContext, - ): Unit { + ) { when(value) { is TestQuery.Data.HumanHero -> HumanHero.toJson(writer, value, adapterContext) is TestQuery.Data.DroidHero -> DroidHero.toJson(writer, value, adapterContext) @@ -114,7 +113,7 @@ public object TestQuery_ResponseAdapter { writer: JsonWriter, `value`: TestQuery.Data.HumanHero, @Suppress("UNUSED_PARAMETER") adapterContext: CompositeAdapterContext, - ): Unit { + ) { writer.name("__typename") StringAdapter.toJson(writer, CustomScalarAdapters.Empty, value.__typename) @@ -155,7 +154,7 @@ public object TestQuery_ResponseAdapter { writer: JsonWriter, `value`: TestQuery.Data.DroidHero, @Suppress("UNUSED_PARAMETER") adapterContext: CompositeAdapterContext, - ): Unit { + ) { writer.name("__typename") StringAdapter.toJson(writer, CustomScalarAdapters.Empty, value.__typename) @@ -193,7 +192,7 @@ public object TestQuery_ResponseAdapter { writer: JsonWriter, `value`: TestQuery.Data.OtherHero, @Suppress("UNUSED_PARAMETER") adapterContext: CompositeAdapterContext, - ): Unit { + ) { writer.name("__typename") StringAdapter.toJson(writer, CustomScalarAdapters.Empty, value.__typename) } diff --git a/libraries/apollo-compiler/src/test/graphql/com/example/union_fragment/kotlin/operationBased/union_fragment/TestQuery.kt.expected b/libraries/apollo-compiler/src/test/graphql/com/example/union_fragment/kotlin/operationBased/union_fragment/TestQuery.kt.expected index 284400d9abd..7f5c789ca68 100644 --- a/libraries/apollo-compiler/src/test/graphql/com/example/union_fragment/kotlin/operationBased/union_fragment/TestQuery.kt.expected +++ b/libraries/apollo-compiler/src/test/graphql/com/example/union_fragment/kotlin/operationBased/union_fragment/TestQuery.kt.expected @@ -19,33 +19,33 @@ import kotlin.Any import kotlin.Boolean import kotlin.Int import kotlin.String -import kotlin.Unit import kotlin.collections.List +import com.example.union_fragment.type.Query as CompiledQuery public class TestQuery() : Query { - public override fun equals(other: Any?): Boolean = other != null && other::class == this::class + override fun equals(other: Any?): Boolean = other != null && other::class == this::class - public override fun hashCode(): Int = this::class.hashCode() + override fun hashCode(): Int = this::class.hashCode() - public override fun id(): String = OPERATION_ID + override fun id(): String = OPERATION_ID - public override fun document(): String = OPERATION_DOCUMENT + override fun document(): String = OPERATION_DOCUMENT - public override fun name(): String = OPERATION_NAME + override fun name(): String = OPERATION_NAME - public override fun serializeVariables( + override fun serializeVariables( writer: JsonWriter, customScalarAdapters: CustomScalarAdapters, withBooleanDefaultValues: Boolean, - ): Unit { + ) { // This operation doesn't have any variable } - public override fun adapter(): CompositeAdapter = TestQuery_ResponseAdapter.Data.obj() + override fun adapter(): CompositeAdapter = TestQuery_ResponseAdapter.Data.obj() - public override fun rootField(): CompiledField = CompiledField.Builder( + override fun rootField(): CompiledField = CompiledField.Builder( name = "data", - type = com.example.union_fragment.type.Query.type + type = CompiledQuery.type ) .selections(selections = TestQuerySelections.__root) .build() diff --git a/libraries/apollo-compiler/src/test/graphql/com/example/union_fragment/kotlin/operationBased/union_fragment/adapter/TestQuery_ResponseAdapter.kt.expected b/libraries/apollo-compiler/src/test/graphql/com/example/union_fragment/kotlin/operationBased/union_fragment/adapter/TestQuery_ResponseAdapter.kt.expected index 2cc9452779d..6f6e96e1644 100644 --- a/libraries/apollo-compiler/src/test/graphql/com/example/union_fragment/kotlin/operationBased/union_fragment/adapter/TestQuery_ResponseAdapter.kt.expected +++ b/libraries/apollo-compiler/src/test/graphql/com/example/union_fragment/kotlin/operationBased/union_fragment/adapter/TestQuery_ResponseAdapter.kt.expected @@ -19,14 +19,13 @@ import com.apollographql.apollo3.api.possibleTypes import com.example.union_fragment.TestQuery import com.example.union_fragment.fragment.Starship import kotlin.String -import kotlin.Unit import kotlin.collections.List public object TestQuery_ResponseAdapter { public object Data : CompositeAdapter { public val RESPONSE_NAMES: List = listOf("search") - public override fun fromJson(reader: JsonReader, adapterContext: CompositeAdapterContext): + override fun fromJson(reader: JsonReader, adapterContext: CompositeAdapterContext): TestQuery.Data { var _search: List? = null @@ -42,11 +41,11 @@ public object TestQuery_ResponseAdapter { ) } - public override fun toJson( + override fun toJson( writer: JsonWriter, `value`: TestQuery.Data, adapterContext: CompositeAdapterContext, - ): Unit { + ) { writer.name("search") Search.obj(true).nullable().list().nullable().toJson(writer, value.search, adapterContext) } @@ -54,7 +53,7 @@ public object TestQuery_ResponseAdapter { private object Search : CompositeAdapter { public val RESPONSE_NAMES: List = listOf("__typename") - public override fun fromJson(reader: JsonReader, adapterContext: CompositeAdapterContext): + override fun fromJson(reader: JsonReader, adapterContext: CompositeAdapterContext): TestQuery.Data.Search { var __typename: String? = null @@ -90,11 +89,11 @@ public object TestQuery_ResponseAdapter { ) } - public override fun toJson( + override fun toJson( writer: JsonWriter, `value`: TestQuery.Data.Search, adapterContext: CompositeAdapterContext, - ): Unit { + ) { writer.name("__typename") StringAdapter.toJson(writer, CustomScalarAdapters.Empty, value.__typename) @@ -112,7 +111,7 @@ public object TestQuery_ResponseAdapter { private object OnStarship : CompositeAdapter { public val RESPONSE_NAMES: List = listOf("id") - public override fun fromJson(reader: JsonReader, adapterContext: CompositeAdapterContext): + override fun fromJson(reader: JsonReader, adapterContext: CompositeAdapterContext): TestQuery.Data.Search.OnStarship { var _id: String? = null @@ -128,11 +127,11 @@ public object TestQuery_ResponseAdapter { ) } - public override fun toJson( + override fun toJson( writer: JsonWriter, `value`: TestQuery.Data.Search.OnStarship, adapterContext: CompositeAdapterContext, - ): Unit { + ) { writer.name("id") StringAdapter.toJson(writer, CustomScalarAdapters.Empty, value.id) } diff --git a/libraries/apollo-compiler/src/test/graphql/com/example/union_fragment/kotlin/operationBased/union_fragment/fragment/StarshipImpl.kt.expected b/libraries/apollo-compiler/src/test/graphql/com/example/union_fragment/kotlin/operationBased/union_fragment/fragment/StarshipImpl.kt.expected index 4b44543f7ac..406cdccaffe 100644 --- a/libraries/apollo-compiler/src/test/graphql/com/example/union_fragment/kotlin/operationBased/union_fragment/fragment/StarshipImpl.kt.expected +++ b/libraries/apollo-compiler/src/test/graphql/com/example/union_fragment/kotlin/operationBased/union_fragment/fragment/StarshipImpl.kt.expected @@ -15,25 +15,23 @@ import com.example.union_fragment.fragment.selections.StarshipSelections import kotlin.Any import kotlin.Boolean import kotlin.Int -import kotlin.Unit public class StarshipImpl() : Fragment { - public override fun equals(other: Any?): Boolean = other != null && other::class == this::class + override fun equals(other: Any?): Boolean = other != null && other::class == this::class - public override fun hashCode(): Int = this::class.hashCode() + override fun hashCode(): Int = this::class.hashCode() - public override fun serializeVariables( + override fun serializeVariables( writer: JsonWriter, customScalarAdapters: CustomScalarAdapters, withBooleanDefaultValues: Boolean, - ): Unit { + ) { // This fragment doesn't have any variable } - public override fun adapter(): CompositeAdapter = - StarshipImpl_ResponseAdapter.Starship.obj() + override fun adapter(): CompositeAdapter = StarshipImpl_ResponseAdapter.Starship.obj() - public override fun rootField(): CompiledField = CompiledField.Builder( + override fun rootField(): CompiledField = CompiledField.Builder( name = "data", type = com.example.union_fragment.type.Starship.type ) diff --git a/libraries/apollo-compiler/src/test/graphql/com/example/union_fragment/kotlin/operationBased/union_fragment/fragment/StarshipImpl_ResponseAdapter.kt.expected b/libraries/apollo-compiler/src/test/graphql/com/example/union_fragment/kotlin/operationBased/union_fragment/fragment/StarshipImpl_ResponseAdapter.kt.expected index 0411fb41072..b96a5e5e6f9 100644 --- a/libraries/apollo-compiler/src/test/graphql/com/example/union_fragment/kotlin/operationBased/union_fragment/fragment/StarshipImpl_ResponseAdapter.kt.expected +++ b/libraries/apollo-compiler/src/test/graphql/com/example/union_fragment/kotlin/operationBased/union_fragment/fragment/StarshipImpl_ResponseAdapter.kt.expected @@ -12,14 +12,13 @@ import com.apollographql.apollo3.api.StringAdapter import com.apollographql.apollo3.api.json.JsonReader import com.apollographql.apollo3.api.json.JsonWriter import kotlin.String -import kotlin.Unit import kotlin.collections.List public object StarshipImpl_ResponseAdapter { public object Starship : CompositeAdapter { public val RESPONSE_NAMES: List = listOf("name") - public override fun fromJson(reader: JsonReader, adapterContext: CompositeAdapterContext): + override fun fromJson(reader: JsonReader, adapterContext: CompositeAdapterContext): com.example.union_fragment.fragment.Starship { var _name: String? = null @@ -35,11 +34,11 @@ public object StarshipImpl_ResponseAdapter { ) } - public override fun toJson( + override fun toJson( writer: JsonWriter, `value`: com.example.union_fragment.fragment.Starship, adapterContext: CompositeAdapterContext, - ): Unit { + ) { writer.name("name") StringAdapter.toJson(writer, CustomScalarAdapters.Empty, value.name) } diff --git a/libraries/apollo-compiler/src/test/graphql/com/example/union_fragment/kotlin/responseBased/union_fragment/TestQuery.kt.expected b/libraries/apollo-compiler/src/test/graphql/com/example/union_fragment/kotlin/responseBased/union_fragment/TestQuery.kt.expected index a92816a7d4f..e00933c64fa 100644 --- a/libraries/apollo-compiler/src/test/graphql/com/example/union_fragment/kotlin/responseBased/union_fragment/TestQuery.kt.expected +++ b/libraries/apollo-compiler/src/test/graphql/com/example/union_fragment/kotlin/responseBased/union_fragment/TestQuery.kt.expected @@ -19,33 +19,34 @@ import kotlin.Any import kotlin.Boolean import kotlin.Int import kotlin.String -import kotlin.Unit +import kotlin.Suppress import kotlin.collections.List +import com.example.union_fragment.type.Query as CompiledQuery public class TestQuery() : Query { - public override fun equals(other: Any?): Boolean = other != null && other::class == this::class + override fun equals(other: Any?): Boolean = other != null && other::class == this::class - public override fun hashCode(): Int = this::class.hashCode() + override fun hashCode(): Int = this::class.hashCode() - public override fun id(): String = OPERATION_ID + override fun id(): String = OPERATION_ID - public override fun document(): String = OPERATION_DOCUMENT + override fun document(): String = OPERATION_DOCUMENT - public override fun name(): String = OPERATION_NAME + override fun name(): String = OPERATION_NAME - public override fun serializeVariables( + override fun serializeVariables( writer: JsonWriter, customScalarAdapters: CustomScalarAdapters, withBooleanDefaultValues: Boolean, - ): Unit { + ) { // This operation doesn't have any variable } - public override fun adapter(): CompositeAdapter = TestQuery_ResponseAdapter.Data.obj() + override fun adapter(): CompositeAdapter = TestQuery_ResponseAdapter.Data.obj() - public override fun rootField(): CompiledField = CompiledField.Builder( + override fun rootField(): CompiledField = CompiledField.Builder( name = "data", - type = com.example.union_fragment.type.Query.type + type = CompiledQuery.type ) .selections(selections = TestQuerySelections.__root) .build() @@ -60,14 +61,16 @@ public class TestQuery() : Query { public val __typename: String public companion object { - public fun Search.starship() = this as? Starship + @Suppress("USELESS_CAST") + public fun Search.starship(): Starship? = this as? Starship - public fun Search.asStarship() = this as? StarshipSearch + @Suppress("USELESS_CAST") + public fun Search.asStarship(): StarshipSearch? = this as? StarshipSearch } } public data class StarshipSearch( - public override val __typename: String, + override val __typename: String, /** * The ID of the starship */ @@ -75,11 +78,11 @@ public class TestQuery() : Query { /** * The name of the starship */ - public override val name: String, + override val name: String, ) : Search, Starship public data class OtherSearch( - public override val __typename: String, + override val __typename: String, ) : Search } diff --git a/libraries/apollo-compiler/src/test/graphql/com/example/union_fragment/kotlin/responseBased/union_fragment/adapter/TestQuery_ResponseAdapter.kt.expected b/libraries/apollo-compiler/src/test/graphql/com/example/union_fragment/kotlin/responseBased/union_fragment/adapter/TestQuery_ResponseAdapter.kt.expected index b3928b8090f..fa8e5450fcc 100644 --- a/libraries/apollo-compiler/src/test/graphql/com/example/union_fragment/kotlin/responseBased/union_fragment/adapter/TestQuery_ResponseAdapter.kt.expected +++ b/libraries/apollo-compiler/src/test/graphql/com/example/union_fragment/kotlin/responseBased/union_fragment/adapter/TestQuery_ResponseAdapter.kt.expected @@ -18,14 +18,13 @@ import com.apollographql.apollo3.api.obj import com.example.union_fragment.TestQuery import kotlin.String import kotlin.Suppress -import kotlin.Unit import kotlin.collections.List public object TestQuery_ResponseAdapter { public object Data : CompositeAdapter { public val RESPONSE_NAMES: List = listOf("search") - public override fun fromJson(reader: JsonReader, adapterContext: CompositeAdapterContext): + override fun fromJson(reader: JsonReader, adapterContext: CompositeAdapterContext): TestQuery.Data { var _search: List? = null @@ -41,17 +40,17 @@ public object TestQuery_ResponseAdapter { ) } - public override fun toJson( + override fun toJson( writer: JsonWriter, `value`: TestQuery.Data, adapterContext: CompositeAdapterContext, - ): Unit { + ) { writer.name("search") Search.obj().nullable().list().nullable().toJson(writer, value.search, adapterContext) } private object Search : CompositeAdapter { - public override fun fromJson(reader: JsonReader, adapterContext: CompositeAdapterContext): + override fun fromJson(reader: JsonReader, adapterContext: CompositeAdapterContext): TestQuery.Data.Search { val __typename = reader.readTypename() return when(__typename) { @@ -62,11 +61,11 @@ public object TestQuery_ResponseAdapter { } } - public override fun toJson( + override fun toJson( writer: JsonWriter, `value`: TestQuery.Data.Search, adapterContext: CompositeAdapterContext, - ): Unit { + ) { when(value) { is TestQuery.Data.StarshipSearch -> StarshipSearch.toJson(writer, value, adapterContext) is TestQuery.Data.OtherSearch -> OtherSearch.toJson(writer, value, adapterContext) @@ -106,7 +105,7 @@ public object TestQuery_ResponseAdapter { writer: JsonWriter, `value`: TestQuery.Data.StarshipSearch, @Suppress("UNUSED_PARAMETER") adapterContext: CompositeAdapterContext, - ): Unit { + ) { writer.name("__typename") StringAdapter.toJson(writer, CustomScalarAdapters.Empty, value.__typename) @@ -144,7 +143,7 @@ public object TestQuery_ResponseAdapter { writer: JsonWriter, `value`: TestQuery.Data.OtherSearch, @Suppress("UNUSED_PARAMETER") adapterContext: CompositeAdapterContext, - ): Unit { + ) { writer.name("__typename") StringAdapter.toJson(writer, CustomScalarAdapters.Empty, value.__typename) } diff --git a/libraries/apollo-compiler/src/test/graphql/com/example/union_fragment/kotlin/responseBased/union_fragment/fragment/StarshipImpl.kt.expected b/libraries/apollo-compiler/src/test/graphql/com/example/union_fragment/kotlin/responseBased/union_fragment/fragment/StarshipImpl.kt.expected index 8edb00a170a..ae33149d884 100644 --- a/libraries/apollo-compiler/src/test/graphql/com/example/union_fragment/kotlin/responseBased/union_fragment/fragment/StarshipImpl.kt.expected +++ b/libraries/apollo-compiler/src/test/graphql/com/example/union_fragment/kotlin/responseBased/union_fragment/fragment/StarshipImpl.kt.expected @@ -16,24 +16,23 @@ import kotlin.Any import kotlin.Boolean import kotlin.Int import kotlin.String -import kotlin.Unit public class StarshipImpl() : Fragment { - public override fun equals(other: Any?): Boolean = other != null && other::class == this::class + override fun equals(other: Any?): Boolean = other != null && other::class == this::class - public override fun hashCode(): Int = this::class.hashCode() + override fun hashCode(): Int = this::class.hashCode() - public override fun serializeVariables( + override fun serializeVariables( writer: JsonWriter, customScalarAdapters: CustomScalarAdapters, withBooleanDefaultValues: Boolean, - ): Unit { + ) { // This fragment doesn't have any variable } - public override fun adapter(): CompositeAdapter = StarshipImpl_ResponseAdapter.Data.obj() + override fun adapter(): CompositeAdapter = StarshipImpl_ResponseAdapter.Data.obj() - public override fun rootField(): CompiledField = CompiledField.Builder( + override fun rootField(): CompiledField = CompiledField.Builder( name = "data", type = com.example.union_fragment.type.Starship.type ) @@ -44,6 +43,6 @@ public class StarshipImpl() : Fragment { /** * The name of the starship */ - public override val name: String, + override val name: String, ) : Starship, Fragment.Data } diff --git a/libraries/apollo-compiler/src/test/graphql/com/example/union_fragment/kotlin/responseBased/union_fragment/fragment/StarshipImpl_ResponseAdapter.kt.expected b/libraries/apollo-compiler/src/test/graphql/com/example/union_fragment/kotlin/responseBased/union_fragment/fragment/StarshipImpl_ResponseAdapter.kt.expected index 4752842ef7b..8458cbe284b 100644 --- a/libraries/apollo-compiler/src/test/graphql/com/example/union_fragment/kotlin/responseBased/union_fragment/fragment/StarshipImpl_ResponseAdapter.kt.expected +++ b/libraries/apollo-compiler/src/test/graphql/com/example/union_fragment/kotlin/responseBased/union_fragment/fragment/StarshipImpl_ResponseAdapter.kt.expected @@ -12,14 +12,13 @@ import com.apollographql.apollo3.api.StringAdapter import com.apollographql.apollo3.api.json.JsonReader import com.apollographql.apollo3.api.json.JsonWriter import kotlin.String -import kotlin.Unit import kotlin.collections.List public object StarshipImpl_ResponseAdapter { public object Data : CompositeAdapter { public val RESPONSE_NAMES: List = listOf("name") - public override fun fromJson(reader: JsonReader, adapterContext: CompositeAdapterContext): + override fun fromJson(reader: JsonReader, adapterContext: CompositeAdapterContext): StarshipImpl.Data { var _name: String? = null @@ -35,11 +34,11 @@ public object StarshipImpl_ResponseAdapter { ) } - public override fun toJson( + override fun toJson( writer: JsonWriter, `value`: StarshipImpl.Data, adapterContext: CompositeAdapterContext, - ): Unit { + ) { writer.name("name") StringAdapter.toJson(writer, CustomScalarAdapters.Empty, value.name) } diff --git a/libraries/apollo-compiler/src/test/graphql/com/example/union_inline_fragments/kotlin/operationBased/union_inline_fragments/TestQuery.kt.expected b/libraries/apollo-compiler/src/test/graphql/com/example/union_inline_fragments/kotlin/operationBased/union_inline_fragments/TestQuery.kt.expected index 7176826523a..405e5a92014 100644 --- a/libraries/apollo-compiler/src/test/graphql/com/example/union_inline_fragments/kotlin/operationBased/union_inline_fragments/TestQuery.kt.expected +++ b/libraries/apollo-compiler/src/test/graphql/com/example/union_inline_fragments/kotlin/operationBased/union_inline_fragments/TestQuery.kt.expected @@ -19,33 +19,33 @@ import kotlin.Any import kotlin.Boolean import kotlin.Int import kotlin.String -import kotlin.Unit import kotlin.collections.List +import com.example.union_inline_fragments.type.Query as CompiledQuery public class TestQuery() : Query { - public override fun equals(other: Any?): Boolean = other != null && other::class == this::class + override fun equals(other: Any?): Boolean = other != null && other::class == this::class - public override fun hashCode(): Int = this::class.hashCode() + override fun hashCode(): Int = this::class.hashCode() - public override fun id(): String = OPERATION_ID + override fun id(): String = OPERATION_ID - public override fun document(): String = OPERATION_DOCUMENT + override fun document(): String = OPERATION_DOCUMENT - public override fun name(): String = OPERATION_NAME + override fun name(): String = OPERATION_NAME - public override fun serializeVariables( + override fun serializeVariables( writer: JsonWriter, customScalarAdapters: CustomScalarAdapters, withBooleanDefaultValues: Boolean, - ): Unit { + ) { // This operation doesn't have any variable } - public override fun adapter(): CompositeAdapter = TestQuery_ResponseAdapter.Data.obj() + override fun adapter(): CompositeAdapter = TestQuery_ResponseAdapter.Data.obj() - public override fun rootField(): CompiledField = CompiledField.Builder( + override fun rootField(): CompiledField = CompiledField.Builder( name = "data", - type = com.example.union_inline_fragments.type.Query.type + type = CompiledQuery.type ) .selections(selections = TestQuerySelections.__root) .build() diff --git a/libraries/apollo-compiler/src/test/graphql/com/example/union_inline_fragments/kotlin/operationBased/union_inline_fragments/adapter/TestQuery_ResponseAdapter.kt.expected b/libraries/apollo-compiler/src/test/graphql/com/example/union_inline_fragments/kotlin/operationBased/union_inline_fragments/adapter/TestQuery_ResponseAdapter.kt.expected index 253018c6d87..c0576c628fe 100644 --- a/libraries/apollo-compiler/src/test/graphql/com/example/union_inline_fragments/kotlin/operationBased/union_inline_fragments/adapter/TestQuery_ResponseAdapter.kt.expected +++ b/libraries/apollo-compiler/src/test/graphql/com/example/union_inline_fragments/kotlin/operationBased/union_inline_fragments/adapter/TestQuery_ResponseAdapter.kt.expected @@ -21,14 +21,13 @@ import com.example.union_inline_fragments.TestQuery import com.example.union_inline_fragments.type.Episode import com.example.union_inline_fragments.type.adapter.Episode_ResponseAdapter import kotlin.String -import kotlin.Unit import kotlin.collections.List public object TestQuery_ResponseAdapter { public object Data : CompositeAdapter { public val RESPONSE_NAMES: List = listOf("search") - public override fun fromJson(reader: JsonReader, adapterContext: CompositeAdapterContext): + override fun fromJson(reader: JsonReader, adapterContext: CompositeAdapterContext): TestQuery.Data { var _search: List? = null @@ -44,11 +43,11 @@ public object TestQuery_ResponseAdapter { ) } - public override fun toJson( + override fun toJson( writer: JsonWriter, `value`: TestQuery.Data, adapterContext: CompositeAdapterContext, - ): Unit { + ) { writer.name("search") Search.obj(true).nullable().list().nullable().toJson(writer, value.search, adapterContext) } @@ -56,7 +55,7 @@ public object TestQuery_ResponseAdapter { private object Search : CompositeAdapter { public val RESPONSE_NAMES: List = listOf("__typename") - public override fun fromJson(reader: JsonReader, adapterContext: CompositeAdapterContext): + override fun fromJson(reader: JsonReader, adapterContext: CompositeAdapterContext): TestQuery.Data.Search { var __typename: String? = null @@ -92,11 +91,11 @@ public object TestQuery_ResponseAdapter { ) } - public override fun toJson( + override fun toJson( writer: JsonWriter, `value`: TestQuery.Data.Search, adapterContext: CompositeAdapterContext, - ): Unit { + ) { writer.name("__typename") StringAdapter.toJson(writer, CustomScalarAdapters.Empty, value.__typename) @@ -114,7 +113,7 @@ public object TestQuery_ResponseAdapter { private object OnCharacter : CompositeAdapter { public val RESPONSE_NAMES: List = listOf("id", "name", "friends") - public override fun fromJson(reader: JsonReader, adapterContext: CompositeAdapterContext): + override fun fromJson(reader: JsonReader, adapterContext: CompositeAdapterContext): TestQuery.Data.Search.OnCharacter { var _id: String? = null var _name: String? = null @@ -136,11 +135,11 @@ public object TestQuery_ResponseAdapter { ) } - public override fun toJson( + override fun toJson( writer: JsonWriter, `value`: TestQuery.Data.Search.OnCharacter, adapterContext: CompositeAdapterContext, - ): Unit { + ) { writer.name("id") StringAdapter.toJson(writer, CustomScalarAdapters.Empty, value.id) @@ -155,7 +154,7 @@ public object TestQuery_ResponseAdapter { private object Friend : CompositeAdapter { public val RESPONSE_NAMES: List = listOf("__typename") - public override fun fromJson(reader: JsonReader, adapterContext: CompositeAdapterContext): + override fun fromJson(reader: JsonReader, adapterContext: CompositeAdapterContext): TestQuery.Data.Search.OnCharacter.Friend { var __typename: String? = null @@ -196,11 +195,11 @@ public object TestQuery_ResponseAdapter { ) } - public override fun toJson( + override fun toJson( writer: JsonWriter, `value`: TestQuery.Data.Search.OnCharacter.Friend, adapterContext: CompositeAdapterContext, - ): Unit { + ) { writer.name("__typename") StringAdapter.toJson(writer, CustomScalarAdapters.Empty, value.__typename) @@ -222,8 +221,7 @@ public object TestQuery_ResponseAdapter { CompositeAdapter { public val RESPONSE_NAMES: List = listOf("name") - public override fun fromJson(reader: JsonReader, - adapterContext: CompositeAdapterContext): + override fun fromJson(reader: JsonReader, adapterContext: CompositeAdapterContext): TestQuery.Data.Search.OnCharacter.Friend.OnCharacter { var _name: String? = null @@ -239,11 +237,11 @@ public object TestQuery_ResponseAdapter { ) } - public override fun toJson( + override fun toJson( writer: JsonWriter, `value`: TestQuery.Data.Search.OnCharacter.Friend.OnCharacter, adapterContext: CompositeAdapterContext, - ): Unit { + ) { writer.name("name") StringAdapter.toJson(writer, CustomScalarAdapters.Empty, value.name) } @@ -253,8 +251,7 @@ public object TestQuery_ResponseAdapter { CompositeAdapter { public val RESPONSE_NAMES: List = listOf("homePlanet", "friends") - public override fun fromJson(reader: JsonReader, - adapterContext: CompositeAdapterContext): + override fun fromJson(reader: JsonReader, adapterContext: CompositeAdapterContext): TestQuery.Data.Search.OnCharacter.Friend.OnHuman { var _homePlanet: String? = null var _friends: List? = null @@ -273,11 +270,11 @@ public object TestQuery_ResponseAdapter { ) } - public override fun toJson( + override fun toJson( writer: JsonWriter, `value`: TestQuery.Data.Search.OnCharacter.Friend.OnHuman, adapterContext: CompositeAdapterContext, - ): Unit { + ) { writer.name("homePlanet") NullableStringAdapter.toJson(writer, CustomScalarAdapters.Empty, value.homePlanet) @@ -290,8 +287,7 @@ public object TestQuery_ResponseAdapter { CompositeAdapter { public val RESPONSE_NAMES: List = listOf("__typename") - public override fun fromJson(reader: JsonReader, - adapterContext: CompositeAdapterContext): + override fun fromJson(reader: JsonReader, adapterContext: CompositeAdapterContext): TestQuery.Data.Search.OnCharacter.Friend.OnHuman.Friend { var __typename: String? = null @@ -312,11 +308,11 @@ public object TestQuery_ResponseAdapter { ) } - public override fun toJson( + override fun toJson( writer: JsonWriter, `value`: TestQuery.Data.Search.OnCharacter.Friend.OnHuman.Friend, adapterContext: CompositeAdapterContext, - ): Unit { + ) { writer.name("__typename") StringAdapter.toJson(writer, CustomScalarAdapters.Empty, value.__typename) @@ -329,8 +325,7 @@ public object TestQuery_ResponseAdapter { { public val RESPONSE_NAMES: List = listOf("firstAppearsIn") - public override fun fromJson(reader: JsonReader, - adapterContext: CompositeAdapterContext): + override fun fromJson(reader: JsonReader, adapterContext: CompositeAdapterContext): TestQuery.Data.Search.OnCharacter.Friend.OnHuman.Friend.OnCharacter { var _firstAppearsIn: Episode? = null @@ -346,11 +341,11 @@ public object TestQuery_ResponseAdapter { ) } - public override fun toJson( + override fun toJson( writer: JsonWriter, `value`: TestQuery.Data.Search.OnCharacter.Friend.OnHuman.Friend.OnCharacter, adapterContext: CompositeAdapterContext, - ): Unit { + ) { writer.name("firstAppearsIn") Episode_ResponseAdapter.toJson(writer, CustomScalarAdapters.Empty, value.firstAppearsIn) @@ -363,8 +358,7 @@ public object TestQuery_ResponseAdapter { CompositeAdapter { public val RESPONSE_NAMES: List = listOf("primaryFunction", "friends") - public override fun fromJson(reader: JsonReader, - adapterContext: CompositeAdapterContext): + override fun fromJson(reader: JsonReader, adapterContext: CompositeAdapterContext): TestQuery.Data.Search.OnCharacter.Friend.OnDroid { var _primaryFunction: String? = null var _friends: List? = null @@ -383,11 +377,11 @@ public object TestQuery_ResponseAdapter { ) } - public override fun toJson( + override fun toJson( writer: JsonWriter, `value`: TestQuery.Data.Search.OnCharacter.Friend.OnDroid, adapterContext: CompositeAdapterContext, - ): Unit { + ) { writer.name("primaryFunction") NullableStringAdapter.toJson(writer, CustomScalarAdapters.Empty, value.primaryFunction) @@ -401,8 +395,7 @@ public object TestQuery_ResponseAdapter { CompositeAdapter { public val RESPONSE_NAMES: List = listOf("id") - public override fun fromJson(reader: JsonReader, - adapterContext: CompositeAdapterContext): + override fun fromJson(reader: JsonReader, adapterContext: CompositeAdapterContext): TestQuery.Data.Search.OnCharacter.Friend.OnDroid.Friend { var _id: String? = null @@ -418,11 +411,11 @@ public object TestQuery_ResponseAdapter { ) } - public override fun toJson( + override fun toJson( writer: JsonWriter, `value`: TestQuery.Data.Search.OnCharacter.Friend.OnDroid.Friend, adapterContext: CompositeAdapterContext, - ): Unit { + ) { writer.name("id") StringAdapter.toJson(writer, CustomScalarAdapters.Empty, value.id) } @@ -434,7 +427,7 @@ public object TestQuery_ResponseAdapter { private object OnStarship : CompositeAdapter { public val RESPONSE_NAMES: List = listOf("name") - public override fun fromJson(reader: JsonReader, adapterContext: CompositeAdapterContext): + override fun fromJson(reader: JsonReader, adapterContext: CompositeAdapterContext): TestQuery.Data.Search.OnStarship { var _name: String? = null @@ -450,11 +443,11 @@ public object TestQuery_ResponseAdapter { ) } - public override fun toJson( + override fun toJson( writer: JsonWriter, `value`: TestQuery.Data.Search.OnStarship, adapterContext: CompositeAdapterContext, - ): Unit { + ) { writer.name("name") StringAdapter.toJson(writer, CustomScalarAdapters.Empty, value.name) } diff --git a/libraries/apollo-compiler/src/test/graphql/com/example/union_inline_fragments/kotlin/operationBased/union_inline_fragments/type/adapter/Episode_ResponseAdapter.kt.expected b/libraries/apollo-compiler/src/test/graphql/com/example/union_inline_fragments/kotlin/operationBased/union_inline_fragments/type/adapter/Episode_ResponseAdapter.kt.expected index 3a02e3fad6d..0750e5ab2bc 100644 --- a/libraries/apollo-compiler/src/test/graphql/com/example/union_inline_fragments/kotlin/operationBased/union_inline_fragments/type/adapter/Episode_ResponseAdapter.kt.expected +++ b/libraries/apollo-compiler/src/test/graphql/com/example/union_inline_fragments/kotlin/operationBased/union_inline_fragments/type/adapter/Episode_ResponseAdapter.kt.expected @@ -10,20 +10,18 @@ import com.apollographql.apollo3.api.CustomScalarAdapters import com.apollographql.apollo3.api.json.JsonReader import com.apollographql.apollo3.api.json.JsonWriter import com.example.union_inline_fragments.type.Episode -import kotlin.Unit public object Episode_ResponseAdapter : Adapter { - public override fun fromJson(reader: JsonReader, customScalarAdapters: CustomScalarAdapters): - Episode { + override fun fromJson(reader: JsonReader, customScalarAdapters: CustomScalarAdapters): Episode { val rawValue = reader.nextString()!! return Episode.safeValueOf(rawValue) } - public override fun toJson( + override fun toJson( writer: JsonWriter, customScalarAdapters: CustomScalarAdapters, `value`: Episode, - ): Unit { + ) { writer.value(value.rawValue) } } diff --git a/libraries/apollo-compiler/src/test/graphql/com/example/union_inline_fragments/kotlin/responseBased/union_inline_fragments/TestQuery.kt.expected b/libraries/apollo-compiler/src/test/graphql/com/example/union_inline_fragments/kotlin/responseBased/union_inline_fragments/TestQuery.kt.expected index 67e980fee37..6b721f15582 100644 --- a/libraries/apollo-compiler/src/test/graphql/com/example/union_inline_fragments/kotlin/responseBased/union_inline_fragments/TestQuery.kt.expected +++ b/libraries/apollo-compiler/src/test/graphql/com/example/union_inline_fragments/kotlin/responseBased/union_inline_fragments/TestQuery.kt.expected @@ -19,33 +19,34 @@ import kotlin.Any import kotlin.Boolean import kotlin.Int import kotlin.String -import kotlin.Unit +import kotlin.Suppress import kotlin.collections.List +import com.example.union_inline_fragments.type.Query as CompiledQuery public class TestQuery() : Query { - public override fun equals(other: Any?): Boolean = other != null && other::class == this::class + override fun equals(other: Any?): Boolean = other != null && other::class == this::class - public override fun hashCode(): Int = this::class.hashCode() + override fun hashCode(): Int = this::class.hashCode() - public override fun id(): String = OPERATION_ID + override fun id(): String = OPERATION_ID - public override fun document(): String = OPERATION_DOCUMENT + override fun document(): String = OPERATION_DOCUMENT - public override fun name(): String = OPERATION_NAME + override fun name(): String = OPERATION_NAME - public override fun serializeVariables( + override fun serializeVariables( writer: JsonWriter, customScalarAdapters: CustomScalarAdapters, withBooleanDefaultValues: Boolean, - ): Unit { + ) { // This operation doesn't have any variable } - public override fun adapter(): CompositeAdapter = TestQuery_ResponseAdapter.Data.obj() + override fun adapter(): CompositeAdapter = TestQuery_ResponseAdapter.Data.obj() - public override fun rootField(): CompiledField = CompiledField.Builder( + override fun rootField(): CompiledField = CompiledField.Builder( name = "data", - type = com.example.union_inline_fragments.type.Query.type + type = CompiledQuery.type ) .selections(selections = TestQuerySelections.__root) .build() @@ -60,14 +61,16 @@ public class TestQuery() : Query { public val __typename: String public companion object { - public fun Search.asCharacter() = this as? CharacterSearch + @Suppress("USELESS_CAST") + public fun Search.asCharacter(): CharacterSearch? = this as? CharacterSearch - public fun Search.asStarship() = this as? StarshipSearch + @Suppress("USELESS_CAST") + public fun Search.asStarship(): StarshipSearch? = this as? StarshipSearch } } public data class CharacterSearch( - public override val __typename: String, + override val __typename: String, /** * The ID of the character */ @@ -92,18 +95,20 @@ public class TestQuery() : Query { public val name: String public companion object { - public fun Friend.asHuman() = this as? HumanFriend + @Suppress("USELESS_CAST") + public fun Friend.asHuman(): HumanFriend? = this as? HumanFriend - public fun Friend.asDroid() = this as? DroidFriend + @Suppress("USELESS_CAST") + public fun Friend.asDroid(): DroidFriend? = this as? DroidFriend } } public data class HumanFriend( - public override val __typename: String, + override val __typename: String, /** * The name of the character */ - public override val name: String, + override val name: String, /** * The home planet of the human, or null if unknown */ @@ -125,11 +130,11 @@ public class TestQuery() : Query { } public data class DroidFriend( - public override val __typename: String, + override val __typename: String, /** * The name of the character */ - public override val name: String, + override val name: String, /** * This droid's primary function */ @@ -150,16 +155,16 @@ public class TestQuery() : Query { } public data class OtherFriend( - public override val __typename: String, + override val __typename: String, /** * The name of the character */ - public override val name: String, + override val name: String, ) : Friend } public data class StarshipSearch( - public override val __typename: String, + override val __typename: String, /** * The name of the starship */ @@ -167,7 +172,7 @@ public class TestQuery() : Query { ) : Search public data class OtherSearch( - public override val __typename: String, + override val __typename: String, ) : Search } diff --git a/libraries/apollo-compiler/src/test/graphql/com/example/union_inline_fragments/kotlin/responseBased/union_inline_fragments/adapter/TestQuery_ResponseAdapter.kt.expected b/libraries/apollo-compiler/src/test/graphql/com/example/union_inline_fragments/kotlin/responseBased/union_inline_fragments/adapter/TestQuery_ResponseAdapter.kt.expected index b064259b5f8..4a57ce78424 100644 --- a/libraries/apollo-compiler/src/test/graphql/com/example/union_inline_fragments/kotlin/responseBased/union_inline_fragments/adapter/TestQuery_ResponseAdapter.kt.expected +++ b/libraries/apollo-compiler/src/test/graphql/com/example/union_inline_fragments/kotlin/responseBased/union_inline_fragments/adapter/TestQuery_ResponseAdapter.kt.expected @@ -21,14 +21,13 @@ import com.example.union_inline_fragments.type.Episode import com.example.union_inline_fragments.type.adapter.Episode_ResponseAdapter import kotlin.String import kotlin.Suppress -import kotlin.Unit import kotlin.collections.List public object TestQuery_ResponseAdapter { public object Data : CompositeAdapter { public val RESPONSE_NAMES: List = listOf("search") - public override fun fromJson(reader: JsonReader, adapterContext: CompositeAdapterContext): + override fun fromJson(reader: JsonReader, adapterContext: CompositeAdapterContext): TestQuery.Data { var _search: List? = null @@ -44,17 +43,17 @@ public object TestQuery_ResponseAdapter { ) } - public override fun toJson( + override fun toJson( writer: JsonWriter, `value`: TestQuery.Data, adapterContext: CompositeAdapterContext, - ): Unit { + ) { writer.name("search") Search.obj().nullable().list().nullable().toJson(writer, value.search, adapterContext) } private object Search : CompositeAdapter { - public override fun fromJson(reader: JsonReader, adapterContext: CompositeAdapterContext): + override fun fromJson(reader: JsonReader, adapterContext: CompositeAdapterContext): TestQuery.Data.Search { val __typename = reader.readTypename() return when(__typename) { @@ -68,11 +67,11 @@ public object TestQuery_ResponseAdapter { } } - public override fun toJson( + override fun toJson( writer: JsonWriter, `value`: TestQuery.Data.Search, adapterContext: CompositeAdapterContext, - ): Unit { + ) { when(value) { is TestQuery.Data.CharacterSearch -> CharacterSearch.toJson(writer, value, adapterContext) is TestQuery.Data.StarshipSearch -> StarshipSearch.toJson(writer, value, adapterContext) @@ -116,7 +115,7 @@ public object TestQuery_ResponseAdapter { writer: JsonWriter, `value`: TestQuery.Data.CharacterSearch, @Suppress("UNUSED_PARAMETER") adapterContext: CompositeAdapterContext, - ): Unit { + ) { writer.name("__typename") StringAdapter.toJson(writer, CustomScalarAdapters.Empty, value.__typename) @@ -131,7 +130,7 @@ public object TestQuery_ResponseAdapter { } private object Friend : CompositeAdapter { - public override fun fromJson(reader: JsonReader, adapterContext: CompositeAdapterContext): + override fun fromJson(reader: JsonReader, adapterContext: CompositeAdapterContext): TestQuery.Data.CharacterSearch.Friend { val __typename = reader.readTypename() return when(__typename) { @@ -144,11 +143,11 @@ public object TestQuery_ResponseAdapter { } } - public override fun toJson( + override fun toJson( writer: JsonWriter, `value`: TestQuery.Data.CharacterSearch.Friend, adapterContext: CompositeAdapterContext, - ): Unit { + ) { when(value) { is TestQuery.Data.CharacterSearch.HumanFriend -> HumanFriend.toJson(writer, value, adapterContext) @@ -196,7 +195,7 @@ public object TestQuery_ResponseAdapter { writer: JsonWriter, `value`: TestQuery.Data.CharacterSearch.HumanFriend, @Suppress("UNUSED_PARAMETER") adapterContext: CompositeAdapterContext, - ): Unit { + ) { writer.name("__typename") StringAdapter.toJson(writer, CustomScalarAdapters.Empty, value.__typename) @@ -214,7 +213,7 @@ public object TestQuery_ResponseAdapter { { public val RESPONSE_NAMES: List = listOf("__typename", "firstAppearsIn") - public override fun fromJson(reader: JsonReader, adapterContext: CompositeAdapterContext): + override fun fromJson(reader: JsonReader, adapterContext: CompositeAdapterContext): TestQuery.Data.CharacterSearch.HumanFriend.Friend { var __typename: String? = null var _firstAppearsIn: Episode? = null @@ -233,11 +232,11 @@ public object TestQuery_ResponseAdapter { ) } - public override fun toJson( + override fun toJson( writer: JsonWriter, `value`: TestQuery.Data.CharacterSearch.HumanFriend.Friend, adapterContext: CompositeAdapterContext, - ): Unit { + ) { writer.name("__typename") StringAdapter.toJson(writer, CustomScalarAdapters.Empty, value.__typename) @@ -283,7 +282,7 @@ public object TestQuery_ResponseAdapter { writer: JsonWriter, `value`: TestQuery.Data.CharacterSearch.DroidFriend, @Suppress("UNUSED_PARAMETER") adapterContext: CompositeAdapterContext, - ): Unit { + ) { writer.name("__typename") StringAdapter.toJson(writer, CustomScalarAdapters.Empty, value.__typename) @@ -301,7 +300,7 @@ public object TestQuery_ResponseAdapter { { public val RESPONSE_NAMES: List = listOf("id") - public override fun fromJson(reader: JsonReader, adapterContext: CompositeAdapterContext): + override fun fromJson(reader: JsonReader, adapterContext: CompositeAdapterContext): TestQuery.Data.CharacterSearch.DroidFriend.Friend { var _id: String? = null @@ -317,11 +316,11 @@ public object TestQuery_ResponseAdapter { ) } - public override fun toJson( + override fun toJson( writer: JsonWriter, `value`: TestQuery.Data.CharacterSearch.DroidFriend.Friend, adapterContext: CompositeAdapterContext, - ): Unit { + ) { writer.name("id") StringAdapter.toJson(writer, CustomScalarAdapters.Empty, value.id) } @@ -357,7 +356,7 @@ public object TestQuery_ResponseAdapter { writer: JsonWriter, `value`: TestQuery.Data.CharacterSearch.OtherFriend, @Suppress("UNUSED_PARAMETER") adapterContext: CompositeAdapterContext, - ): Unit { + ) { writer.name("__typename") StringAdapter.toJson(writer, CustomScalarAdapters.Empty, value.__typename) @@ -396,7 +395,7 @@ public object TestQuery_ResponseAdapter { writer: JsonWriter, `value`: TestQuery.Data.StarshipSearch, @Suppress("UNUSED_PARAMETER") adapterContext: CompositeAdapterContext, - ): Unit { + ) { writer.name("__typename") StringAdapter.toJson(writer, CustomScalarAdapters.Empty, value.__typename) @@ -431,7 +430,7 @@ public object TestQuery_ResponseAdapter { writer: JsonWriter, `value`: TestQuery.Data.OtherSearch, @Suppress("UNUSED_PARAMETER") adapterContext: CompositeAdapterContext, - ): Unit { + ) { writer.name("__typename") StringAdapter.toJson(writer, CustomScalarAdapters.Empty, value.__typename) } diff --git a/libraries/apollo-compiler/src/test/graphql/com/example/union_inline_fragments/kotlin/responseBased/union_inline_fragments/type/adapter/Episode_ResponseAdapter.kt.expected b/libraries/apollo-compiler/src/test/graphql/com/example/union_inline_fragments/kotlin/responseBased/union_inline_fragments/type/adapter/Episode_ResponseAdapter.kt.expected index 3a02e3fad6d..0750e5ab2bc 100644 --- a/libraries/apollo-compiler/src/test/graphql/com/example/union_inline_fragments/kotlin/responseBased/union_inline_fragments/type/adapter/Episode_ResponseAdapter.kt.expected +++ b/libraries/apollo-compiler/src/test/graphql/com/example/union_inline_fragments/kotlin/responseBased/union_inline_fragments/type/adapter/Episode_ResponseAdapter.kt.expected @@ -10,20 +10,18 @@ import com.apollographql.apollo3.api.CustomScalarAdapters import com.apollographql.apollo3.api.json.JsonReader import com.apollographql.apollo3.api.json.JsonWriter import com.example.union_inline_fragments.type.Episode -import kotlin.Unit public object Episode_ResponseAdapter : Adapter { - public override fun fromJson(reader: JsonReader, customScalarAdapters: CustomScalarAdapters): - Episode { + override fun fromJson(reader: JsonReader, customScalarAdapters: CustomScalarAdapters): Episode { val rawValue = reader.nextString()!! return Episode.safeValueOf(rawValue) } - public override fun toJson( + override fun toJson( writer: JsonWriter, customScalarAdapters: CustomScalarAdapters, `value`: Episode, - ): Unit { + ) { writer.value(value.rawValue) } } diff --git a/libraries/apollo-compiler/src/test/graphql/com/example/unique_type_name/kotlin/operationBased/unique_type_name/HeroDetailQuery.kt.expected b/libraries/apollo-compiler/src/test/graphql/com/example/unique_type_name/kotlin/operationBased/unique_type_name/HeroDetailQuery.kt.expected index 557f05c9040..35864332d49 100644 --- a/libraries/apollo-compiler/src/test/graphql/com/example/unique_type_name/kotlin/operationBased/unique_type_name/HeroDetailQuery.kt.expected +++ b/libraries/apollo-compiler/src/test/graphql/com/example/unique_type_name/kotlin/operationBased/unique_type_name/HeroDetailQuery.kt.expected @@ -21,33 +21,33 @@ import kotlin.Boolean import kotlin.Double import kotlin.Int import kotlin.String -import kotlin.Unit import kotlin.collections.List +import com.example.unique_type_name.type.Query as CompiledQuery public class HeroDetailQuery() : Query { - public override fun equals(other: Any?): Boolean = other != null && other::class == this::class + override fun equals(other: Any?): Boolean = other != null && other::class == this::class - public override fun hashCode(): Int = this::class.hashCode() + override fun hashCode(): Int = this::class.hashCode() - public override fun id(): String = OPERATION_ID + override fun id(): String = OPERATION_ID - public override fun document(): String = OPERATION_DOCUMENT + override fun document(): String = OPERATION_DOCUMENT - public override fun name(): String = OPERATION_NAME + override fun name(): String = OPERATION_NAME - public override fun serializeVariables( + override fun serializeVariables( writer: JsonWriter, customScalarAdapters: CustomScalarAdapters, withBooleanDefaultValues: Boolean, - ): Unit { + ) { // This operation doesn't have any variable } - public override fun adapter(): CompositeAdapter = HeroDetailQuery_ResponseAdapter.Data.obj() + override fun adapter(): CompositeAdapter = HeroDetailQuery_ResponseAdapter.Data.obj() - public override fun rootField(): CompiledField = CompiledField.Builder( + override fun rootField(): CompiledField = CompiledField.Builder( name = "data", - type = com.example.unique_type_name.type.Query.type + type = CompiledQuery.type ) .selections(selections = HeroDetailQuerySelections.__root) .build() diff --git a/libraries/apollo-compiler/src/test/graphql/com/example/unique_type_name/kotlin/operationBased/unique_type_name/adapter/HeroDetailQuery_ResponseAdapter.kt.expected b/libraries/apollo-compiler/src/test/graphql/com/example/unique_type_name/kotlin/operationBased/unique_type_name/adapter/HeroDetailQuery_ResponseAdapter.kt.expected index c756ec411c1..0c0a0e48dc7 100644 --- a/libraries/apollo-compiler/src/test/graphql/com/example/unique_type_name/kotlin/operationBased/unique_type_name/adapter/HeroDetailQuery_ResponseAdapter.kt.expected +++ b/libraries/apollo-compiler/src/test/graphql/com/example/unique_type_name/kotlin/operationBased/unique_type_name/adapter/HeroDetailQuery_ResponseAdapter.kt.expected @@ -22,14 +22,13 @@ import com.example.unique_type_name.type.Episode import com.example.unique_type_name.type.adapter.Episode_ResponseAdapter import kotlin.Double import kotlin.String -import kotlin.Unit import kotlin.collections.List public object HeroDetailQuery_ResponseAdapter { public object Data : CompositeAdapter { public val RESPONSE_NAMES: List = listOf("heroDetailQuery") - public override fun fromJson(reader: JsonReader, adapterContext: CompositeAdapterContext): + override fun fromJson(reader: JsonReader, adapterContext: CompositeAdapterContext): com.example.unique_type_name.HeroDetailQuery.Data { var _heroDetailQuery: com.example.unique_type_name.HeroDetailQuery.Data.HeroDetailQuery? = null @@ -45,11 +44,11 @@ public object HeroDetailQuery_ResponseAdapter { ) } - public override fun toJson( + override fun toJson( writer: JsonWriter, `value`: com.example.unique_type_name.HeroDetailQuery.Data, adapterContext: CompositeAdapterContext, - ): Unit { + ) { writer.name("heroDetailQuery") HeroDetailQuery.obj(true).nullable().toJson(writer, value.heroDetailQuery, adapterContext) } @@ -58,7 +57,7 @@ public object HeroDetailQuery_ResponseAdapter { CompositeAdapter { public val RESPONSE_NAMES: List = listOf("__typename", "name", "friends") - public override fun fromJson(reader: JsonReader, adapterContext: CompositeAdapterContext): + override fun fromJson(reader: JsonReader, adapterContext: CompositeAdapterContext): com.example.unique_type_name.HeroDetailQuery.Data.HeroDetailQuery { var __typename: String? = null var _name: String? = null @@ -92,11 +91,11 @@ public object HeroDetailQuery_ResponseAdapter { ) } - public override fun toJson( + override fun toJson( writer: JsonWriter, `value`: com.example.unique_type_name.HeroDetailQuery.Data.HeroDetailQuery, adapterContext: CompositeAdapterContext, - ): Unit { + ) { writer.name("__typename") StringAdapter.toJson(writer, CustomScalarAdapters.Empty, value.__typename) @@ -117,7 +116,7 @@ public object HeroDetailQuery_ResponseAdapter { { public val RESPONSE_NAMES: List = listOf("name") - public override fun fromJson(reader: JsonReader, adapterContext: CompositeAdapterContext): + override fun fromJson(reader: JsonReader, adapterContext: CompositeAdapterContext): com.example.unique_type_name.HeroDetailQuery.Data.HeroDetailQuery.Friend { var _name: String? = null @@ -133,11 +132,11 @@ public object HeroDetailQuery_ResponseAdapter { ) } - public override fun toJson( + override fun toJson( writer: JsonWriter, `value`: com.example.unique_type_name.HeroDetailQuery.Data.HeroDetailQuery.Friend, adapterContext: CompositeAdapterContext, - ): Unit { + ) { writer.name("name") StringAdapter.toJson(writer, CustomScalarAdapters.Empty, value.name) } @@ -148,7 +147,7 @@ public object HeroDetailQuery_ResponseAdapter { { public val RESPONSE_NAMES: List = listOf("height", "friends") - public override fun fromJson(reader: JsonReader, adapterContext: CompositeAdapterContext): + override fun fromJson(reader: JsonReader, adapterContext: CompositeAdapterContext): com.example.unique_type_name.HeroDetailQuery.Data.HeroDetailQuery.OnHuman { var _height: Double? = null var _friends: List? = null @@ -167,11 +166,11 @@ public object HeroDetailQuery_ResponseAdapter { ) } - public override fun toJson( + override fun toJson( writer: JsonWriter, `value`: com.example.unique_type_name.HeroDetailQuery.Data.HeroDetailQuery.OnHuman, adapterContext: CompositeAdapterContext, - ): Unit { + ) { writer.name("height") NullableDoubleAdapter.toJson(writer, CustomScalarAdapters.Empty, value.height) @@ -184,7 +183,7 @@ public object HeroDetailQuery_ResponseAdapter { { public val RESPONSE_NAMES: List = listOf("appearsIn", "friends") - public override fun fromJson(reader: JsonReader, adapterContext: CompositeAdapterContext): + override fun fromJson(reader: JsonReader, adapterContext: CompositeAdapterContext): com.example.unique_type_name.HeroDetailQuery.Data.HeroDetailQuery.OnHuman.Friend { var _appearsIn: List? = null var _friends: List? = null @@ -203,11 +202,11 @@ public object HeroDetailQuery_ResponseAdapter { ) } - public override fun toJson( + override fun toJson( writer: JsonWriter, `value`: com.example.unique_type_name.HeroDetailQuery.Data.HeroDetailQuery.OnHuman.Friend, adapterContext: CompositeAdapterContext, - ): Unit { + ) { writer.name("appearsIn") Episode_ResponseAdapter.nullable().list().toJson(writer, CustomScalarAdapters.Empty, value.appearsIn) @@ -222,8 +221,7 @@ public object HeroDetailQuery_ResponseAdapter { { public val RESPONSE_NAMES: List = listOf("__typename") - public override fun fromJson(reader: JsonReader, - adapterContext: CompositeAdapterContext): + override fun fromJson(reader: JsonReader, adapterContext: CompositeAdapterContext): com.example.unique_type_name.HeroDetailQuery.Data.HeroDetailQuery.OnHuman.Friend.Friend { var __typename: String? = null @@ -244,11 +242,11 @@ public object HeroDetailQuery_ResponseAdapter { ) } - public override fun toJson( + override fun toJson( writer: JsonWriter, `value`: com.example.unique_type_name.HeroDetailQuery.Data.HeroDetailQuery.OnHuman.Friend.Friend, adapterContext: CompositeAdapterContext, - ): Unit { + ) { writer.name("__typename") StringAdapter.toJson(writer, CustomScalarAdapters.Empty, value.__typename) diff --git a/libraries/apollo-compiler/src/test/graphql/com/example/unique_type_name/kotlin/operationBased/unique_type_name/fragment/HeroDetailsImpl.kt.expected b/libraries/apollo-compiler/src/test/graphql/com/example/unique_type_name/kotlin/operationBased/unique_type_name/fragment/HeroDetailsImpl.kt.expected index 6d1b75306dc..e672c38bfc2 100644 --- a/libraries/apollo-compiler/src/test/graphql/com/example/unique_type_name/kotlin/operationBased/unique_type_name/fragment/HeroDetailsImpl.kt.expected +++ b/libraries/apollo-compiler/src/test/graphql/com/example/unique_type_name/kotlin/operationBased/unique_type_name/fragment/HeroDetailsImpl.kt.expected @@ -16,25 +16,24 @@ import com.example.unique_type_name.type.Character import kotlin.Any import kotlin.Boolean import kotlin.Int -import kotlin.Unit public class HeroDetailsImpl() : Fragment { - public override fun equals(other: Any?): Boolean = other != null && other::class == this::class + override fun equals(other: Any?): Boolean = other != null && other::class == this::class - public override fun hashCode(): Int = this::class.hashCode() + override fun hashCode(): Int = this::class.hashCode() - public override fun serializeVariables( + override fun serializeVariables( writer: JsonWriter, customScalarAdapters: CustomScalarAdapters, withBooleanDefaultValues: Boolean, - ): Unit { + ) { // This fragment doesn't have any variable } - public override fun adapter(): CompositeAdapter = + override fun adapter(): CompositeAdapter = HeroDetailsImpl_ResponseAdapter.HeroDetails.obj() - public override fun rootField(): CompiledField = CompiledField.Builder( + override fun rootField(): CompiledField = CompiledField.Builder( name = "data", type = Character.type ) diff --git a/libraries/apollo-compiler/src/test/graphql/com/example/unique_type_name/kotlin/operationBased/unique_type_name/fragment/HeroDetailsImpl_ResponseAdapter.kt.expected b/libraries/apollo-compiler/src/test/graphql/com/example/unique_type_name/kotlin/operationBased/unique_type_name/fragment/HeroDetailsImpl_ResponseAdapter.kt.expected index 33b90ce7437..f2882e8e28a 100644 --- a/libraries/apollo-compiler/src/test/graphql/com/example/unique_type_name/kotlin/operationBased/unique_type_name/fragment/HeroDetailsImpl_ResponseAdapter.kt.expected +++ b/libraries/apollo-compiler/src/test/graphql/com/example/unique_type_name/kotlin/operationBased/unique_type_name/fragment/HeroDetailsImpl_ResponseAdapter.kt.expected @@ -17,14 +17,13 @@ import com.apollographql.apollo3.api.nullable import com.apollographql.apollo3.api.obj import kotlin.Int import kotlin.String -import kotlin.Unit import kotlin.collections.List public object HeroDetailsImpl_ResponseAdapter { public object HeroDetails : CompositeAdapter { public val RESPONSE_NAMES: List = listOf("name", "friendsConnection") - public override fun fromJson(reader: JsonReader, adapterContext: CompositeAdapterContext): + override fun fromJson(reader: JsonReader, adapterContext: CompositeAdapterContext): com.example.unique_type_name.fragment.HeroDetails { var _name: String? = null var _friendsConnection: com.example.unique_type_name.fragment.HeroDetails.FriendsConnection? = null @@ -43,11 +42,11 @@ public object HeroDetailsImpl_ResponseAdapter { ) } - public override fun toJson( + override fun toJson( writer: JsonWriter, `value`: com.example.unique_type_name.fragment.HeroDetails, adapterContext: CompositeAdapterContext, - ): Unit { + ) { writer.name("name") StringAdapter.toJson(writer, CustomScalarAdapters.Empty, value.name) @@ -59,7 +58,7 @@ public object HeroDetailsImpl_ResponseAdapter { CompositeAdapter { public val RESPONSE_NAMES: List = listOf("totalCount", "edges") - public override fun fromJson(reader: JsonReader, adapterContext: CompositeAdapterContext): + override fun fromJson(reader: JsonReader, adapterContext: CompositeAdapterContext): com.example.unique_type_name.fragment.HeroDetails.FriendsConnection { var _totalCount: Int? = null var _edges: List? = null @@ -78,11 +77,11 @@ public object HeroDetailsImpl_ResponseAdapter { ) } - public override fun toJson( + override fun toJson( writer: JsonWriter, `value`: com.example.unique_type_name.fragment.HeroDetails.FriendsConnection, adapterContext: CompositeAdapterContext, - ): Unit { + ) { writer.name("totalCount") NullableIntAdapter.toJson(writer, CustomScalarAdapters.Empty, value.totalCount) @@ -95,7 +94,7 @@ public object HeroDetailsImpl_ResponseAdapter { { public val RESPONSE_NAMES: List = listOf("node") - public override fun fromJson(reader: JsonReader, adapterContext: CompositeAdapterContext): + override fun fromJson(reader: JsonReader, adapterContext: CompositeAdapterContext): com.example.unique_type_name.fragment.HeroDetails.FriendsConnection.Edge { var _node: com.example.unique_type_name.fragment.HeroDetails.FriendsConnection.Edge.Node? = null @@ -111,11 +110,11 @@ public object HeroDetailsImpl_ResponseAdapter { ) } - public override fun toJson( + override fun toJson( writer: JsonWriter, `value`: com.example.unique_type_name.fragment.HeroDetails.FriendsConnection.Edge, adapterContext: CompositeAdapterContext, - ): Unit { + ) { writer.name("node") Node.obj().nullable().toJson(writer, value.node, adapterContext) } @@ -125,7 +124,7 @@ public object HeroDetailsImpl_ResponseAdapter { { public val RESPONSE_NAMES: List = listOf("name") - public override fun fromJson(reader: JsonReader, adapterContext: CompositeAdapterContext): + override fun fromJson(reader: JsonReader, adapterContext: CompositeAdapterContext): com.example.unique_type_name.fragment.HeroDetails.FriendsConnection.Edge.Node { var _name: String? = null @@ -141,11 +140,11 @@ public object HeroDetailsImpl_ResponseAdapter { ) } - public override fun toJson( + override fun toJson( writer: JsonWriter, `value`: com.example.unique_type_name.fragment.HeroDetails.FriendsConnection.Edge.Node, adapterContext: CompositeAdapterContext, - ): Unit { + ) { writer.name("name") StringAdapter.toJson(writer, CustomScalarAdapters.Empty, value.name) } diff --git a/libraries/apollo-compiler/src/test/graphql/com/example/unique_type_name/kotlin/operationBased/unique_type_name/type/adapter/Episode_ResponseAdapter.kt.expected b/libraries/apollo-compiler/src/test/graphql/com/example/unique_type_name/kotlin/operationBased/unique_type_name/type/adapter/Episode_ResponseAdapter.kt.expected index 16d2f4b00ac..a16d888a696 100644 --- a/libraries/apollo-compiler/src/test/graphql/com/example/unique_type_name/kotlin/operationBased/unique_type_name/type/adapter/Episode_ResponseAdapter.kt.expected +++ b/libraries/apollo-compiler/src/test/graphql/com/example/unique_type_name/kotlin/operationBased/unique_type_name/type/adapter/Episode_ResponseAdapter.kt.expected @@ -10,20 +10,18 @@ import com.apollographql.apollo3.api.CustomScalarAdapters import com.apollographql.apollo3.api.json.JsonReader import com.apollographql.apollo3.api.json.JsonWriter import com.example.unique_type_name.type.Episode -import kotlin.Unit public object Episode_ResponseAdapter : Adapter { - public override fun fromJson(reader: JsonReader, customScalarAdapters: CustomScalarAdapters): - Episode { + override fun fromJson(reader: JsonReader, customScalarAdapters: CustomScalarAdapters): Episode { val rawValue = reader.nextString()!! return Episode.safeValueOf(rawValue) } - public override fun toJson( + override fun toJson( writer: JsonWriter, customScalarAdapters: CustomScalarAdapters, `value`: Episode, - ): Unit { + ) { writer.value(value.rawValue) } } diff --git a/libraries/apollo-compiler/src/test/graphql/com/example/unique_type_name/kotlin/responseBased/unique_type_name/HeroDetailQuery.kt.expected b/libraries/apollo-compiler/src/test/graphql/com/example/unique_type_name/kotlin/responseBased/unique_type_name/HeroDetailQuery.kt.expected index 97fd86d0b1b..0e922d515aa 100644 --- a/libraries/apollo-compiler/src/test/graphql/com/example/unique_type_name/kotlin/responseBased/unique_type_name/HeroDetailQuery.kt.expected +++ b/libraries/apollo-compiler/src/test/graphql/com/example/unique_type_name/kotlin/responseBased/unique_type_name/HeroDetailQuery.kt.expected @@ -21,33 +21,34 @@ import kotlin.Boolean import kotlin.Double import kotlin.Int import kotlin.String -import kotlin.Unit +import kotlin.Suppress import kotlin.collections.List +import com.example.unique_type_name.type.Query as CompiledQuery public class HeroDetailQuery() : Query { - public override fun equals(other: Any?): Boolean = other != null && other::class == this::class + override fun equals(other: Any?): Boolean = other != null && other::class == this::class - public override fun hashCode(): Int = this::class.hashCode() + override fun hashCode(): Int = this::class.hashCode() - public override fun id(): String = OPERATION_ID + override fun id(): String = OPERATION_ID - public override fun document(): String = OPERATION_DOCUMENT + override fun document(): String = OPERATION_DOCUMENT - public override fun name(): String = OPERATION_NAME + override fun name(): String = OPERATION_NAME - public override fun serializeVariables( + override fun serializeVariables( writer: JsonWriter, customScalarAdapters: CustomScalarAdapters, withBooleanDefaultValues: Boolean, - ): Unit { + ) { // This operation doesn't have any variable } - public override fun adapter(): CompositeAdapter = HeroDetailQuery_ResponseAdapter.Data.obj() + override fun adapter(): CompositeAdapter = HeroDetailQuery_ResponseAdapter.Data.obj() - public override fun rootField(): CompiledField = CompiledField.Builder( + override fun rootField(): CompiledField = CompiledField.Builder( name = "data", - type = com.example.unique_type_name.type.Query.type + type = CompiledQuery.type ) .selections(selections = HeroDetailQuerySelections.__root) .build() @@ -77,21 +78,22 @@ public class HeroDetailQuery() : Query { } public companion object { - public fun HeroDetailQuery.asHuman() = this as? HumanHeroDetailQuery + @Suppress("USELESS_CAST") + public fun HeroDetailQuery.asHuman(): HumanHeroDetailQuery? = this as? HumanHeroDetailQuery } } public data class HumanHeroDetailQuery( - public override val __typename: String, + override val __typename: String, /** * The name of the character */ - public override val name: String, + override val name: String, /** * Merged field with multiple descriptions. See parentTypes: 'Character, Human' for more * information */ - public override val friends: List?, + override val friends: List?, /** * Height in the preferred unit, default is meters */ @@ -103,7 +105,7 @@ public class HeroDetailQuery() : Query { /** * The name of the character */ - public override val name: String, + override val name: String, /** * The movies this character appears in */ @@ -122,21 +124,21 @@ public class HeroDetailQuery() : Query { /** * The name of the character */ - public override val name: String, + override val name: String, /** * The friends of the character exposed as a connection with edges */ - public override val friendsConnection: FriendsConnection, + override val friendsConnection: FriendsConnection, ) : HeroDetails { public data class FriendsConnection( /** * The total number of friends */ - public override val totalCount: Int?, + override val totalCount: Int?, /** * The edges for each of the character's friends. */ - public override val edges: List?, + override val edges: List?, ) : HeroDetails.FriendsConnection { public fun edgesFilterNotNull(): List? = edges?.filterNotNull() @@ -144,34 +146,35 @@ public class HeroDetailQuery() : Query { /** * The character represented by this friendship edge */ - public override val node: Node?, + override val node: Node?, ) : HeroDetails.FriendsConnection.Edge { public data class Node( /** * The name of the character */ - public override val name: String, + override val name: String, ) : HeroDetails.FriendsConnection.Edge.Node } } public companion object { - public fun Friend.heroDetails() = this as? HeroDetails + @Suppress("USELESS_CAST") + public fun Friend.heroDetails(): HeroDetails? = this as? HeroDetails } } } } public data class OtherHeroDetailQuery( - public override val __typename: String, + override val __typename: String, /** * The name of the character */ - public override val name: String, + override val name: String, /** * The friends of the character, or an empty list if they have none */ - public override val friends: List?, + override val friends: List?, ) : HeroDetailQuery { public fun friendsFilterNotNull(): List? = friends?.filterNotNull() @@ -179,7 +182,7 @@ public class HeroDetailQuery() : Query { /** * The name of the character */ - public override val name: String, + override val name: String, ) : HeroDetailQuery.Friend } } diff --git a/libraries/apollo-compiler/src/test/graphql/com/example/unique_type_name/kotlin/responseBased/unique_type_name/adapter/HeroDetailQuery_ResponseAdapter.kt.expected b/libraries/apollo-compiler/src/test/graphql/com/example/unique_type_name/kotlin/responseBased/unique_type_name/adapter/HeroDetailQuery_ResponseAdapter.kt.expected index c4290afb705..ebd98b2d343 100644 --- a/libraries/apollo-compiler/src/test/graphql/com/example/unique_type_name/kotlin/responseBased/unique_type_name/adapter/HeroDetailQuery_ResponseAdapter.kt.expected +++ b/libraries/apollo-compiler/src/test/graphql/com/example/unique_type_name/kotlin/responseBased/unique_type_name/adapter/HeroDetailQuery_ResponseAdapter.kt.expected @@ -24,14 +24,13 @@ import kotlin.Double import kotlin.Int import kotlin.String import kotlin.Suppress -import kotlin.Unit import kotlin.collections.List public object HeroDetailQuery_ResponseAdapter { public object Data : CompositeAdapter { public val RESPONSE_NAMES: List = listOf("heroDetailQuery") - public override fun fromJson(reader: JsonReader, adapterContext: CompositeAdapterContext): + override fun fromJson(reader: JsonReader, adapterContext: CompositeAdapterContext): com.example.unique_type_name.HeroDetailQuery.Data { var _heroDetailQuery: com.example.unique_type_name.HeroDetailQuery.Data.HeroDetailQuery? = null @@ -47,18 +46,18 @@ public object HeroDetailQuery_ResponseAdapter { ) } - public override fun toJson( + override fun toJson( writer: JsonWriter, `value`: com.example.unique_type_name.HeroDetailQuery.Data, adapterContext: CompositeAdapterContext, - ): Unit { + ) { writer.name("heroDetailQuery") HeroDetailQuery.obj().nullable().toJson(writer, value.heroDetailQuery, adapterContext) } private object HeroDetailQuery : CompositeAdapter { - public override fun fromJson(reader: JsonReader, adapterContext: CompositeAdapterContext): + override fun fromJson(reader: JsonReader, adapterContext: CompositeAdapterContext): com.example.unique_type_name.HeroDetailQuery.Data.HeroDetailQuery { val __typename = reader.readTypename() return when(__typename) { @@ -69,11 +68,11 @@ public object HeroDetailQuery_ResponseAdapter { } } - public override fun toJson( + override fun toJson( writer: JsonWriter, `value`: com.example.unique_type_name.HeroDetailQuery.Data.HeroDetailQuery, adapterContext: CompositeAdapterContext, - ): Unit { + ) { when(value) { is com.example.unique_type_name.HeroDetailQuery.Data.HumanHeroDetailQuery -> HumanHeroDetailQuery.toJson(writer, value, adapterContext) @@ -118,7 +117,7 @@ public object HeroDetailQuery_ResponseAdapter { writer: JsonWriter, `value`: com.example.unique_type_name.HeroDetailQuery.Data.HumanHeroDetailQuery, @Suppress("UNUSED_PARAMETER") adapterContext: CompositeAdapterContext, - ): Unit { + ) { writer.name("__typename") StringAdapter.toJson(writer, CustomScalarAdapters.Empty, value.__typename) @@ -137,7 +136,7 @@ public object HeroDetailQuery_ResponseAdapter { { public val RESPONSE_NAMES: List = listOf("name", "appearsIn", "friends") - public override fun fromJson(reader: JsonReader, adapterContext: CompositeAdapterContext): + override fun fromJson(reader: JsonReader, adapterContext: CompositeAdapterContext): com.example.unique_type_name.HeroDetailQuery.Data.HumanHeroDetailQuery.Friend { var _name: String? = null var _appearsIn: List? = null @@ -159,11 +158,11 @@ public object HeroDetailQuery_ResponseAdapter { ) } - public override fun toJson( + override fun toJson( writer: JsonWriter, `value`: com.example.unique_type_name.HeroDetailQuery.Data.HumanHeroDetailQuery.Friend, adapterContext: CompositeAdapterContext, - ): Unit { + ) { writer.name("name") StringAdapter.toJson(writer, CustomScalarAdapters.Empty, value.name) @@ -181,7 +180,7 @@ public object HeroDetailQuery_ResponseAdapter { public val RESPONSE_NAMES: List = listOf("__typename", "name", "friendsConnection") - public override fun fromJson(reader: JsonReader, adapterContext: CompositeAdapterContext): + override fun fromJson(reader: JsonReader, adapterContext: CompositeAdapterContext): com.example.unique_type_name.HeroDetailQuery.Data.HumanHeroDetailQuery.Friend.Friend { var __typename: String? = null var _name: String? = null @@ -203,11 +202,11 @@ public object HeroDetailQuery_ResponseAdapter { ) } - public override fun toJson( + override fun toJson( writer: JsonWriter, `value`: com.example.unique_type_name.HeroDetailQuery.Data.HumanHeroDetailQuery.Friend.Friend, adapterContext: CompositeAdapterContext, - ): Unit { + ) { writer.name("__typename") StringAdapter.toJson(writer, CustomScalarAdapters.Empty, value.__typename) @@ -223,8 +222,7 @@ public object HeroDetailQuery_ResponseAdapter { { public val RESPONSE_NAMES: List = listOf("totalCount", "edges") - public override fun fromJson(reader: JsonReader, - adapterContext: CompositeAdapterContext): + override fun fromJson(reader: JsonReader, adapterContext: CompositeAdapterContext): com.example.unique_type_name.HeroDetailQuery.Data.HumanHeroDetailQuery.Friend.Friend.FriendsConnection { var _totalCount: Int? = null var _edges: List? = null @@ -243,11 +241,11 @@ public object HeroDetailQuery_ResponseAdapter { ) } - public override fun toJson( + override fun toJson( writer: JsonWriter, `value`: com.example.unique_type_name.HeroDetailQuery.Data.HumanHeroDetailQuery.Friend.Friend.FriendsConnection, adapterContext: CompositeAdapterContext, - ): Unit { + ) { writer.name("totalCount") NullableIntAdapter.toJson(writer, CustomScalarAdapters.Empty, value.totalCount) @@ -260,8 +258,7 @@ public object HeroDetailQuery_ResponseAdapter { { public val RESPONSE_NAMES: List = listOf("node") - public override fun fromJson(reader: JsonReader, - adapterContext: CompositeAdapterContext): + override fun fromJson(reader: JsonReader, adapterContext: CompositeAdapterContext): com.example.unique_type_name.HeroDetailQuery.Data.HumanHeroDetailQuery.Friend.Friend.FriendsConnection.Edge { var _node: com.example.unique_type_name.HeroDetailQuery.Data.HumanHeroDetailQuery.Friend.Friend.FriendsConnection.Edge.Node? = null @@ -277,11 +274,11 @@ public object HeroDetailQuery_ResponseAdapter { ) } - public override fun toJson( + override fun toJson( writer: JsonWriter, `value`: com.example.unique_type_name.HeroDetailQuery.Data.HumanHeroDetailQuery.Friend.Friend.FriendsConnection.Edge, adapterContext: CompositeAdapterContext, - ): Unit { + ) { writer.name("node") Node.obj().nullable().toJson(writer, value.node, adapterContext) } @@ -291,8 +288,7 @@ public object HeroDetailQuery_ResponseAdapter { { public val RESPONSE_NAMES: List = listOf("name") - public override fun fromJson(reader: JsonReader, - adapterContext: CompositeAdapterContext): + override fun fromJson(reader: JsonReader, adapterContext: CompositeAdapterContext): com.example.unique_type_name.HeroDetailQuery.Data.HumanHeroDetailQuery.Friend.Friend.FriendsConnection.Edge.Node { var _name: String? = null @@ -308,11 +304,11 @@ public object HeroDetailQuery_ResponseAdapter { ) } - public override fun toJson( + override fun toJson( writer: JsonWriter, `value`: com.example.unique_type_name.HeroDetailQuery.Data.HumanHeroDetailQuery.Friend.Friend.FriendsConnection.Edge.Node, adapterContext: CompositeAdapterContext, - ): Unit { + ) { writer.name("name") StringAdapter.toJson(writer, CustomScalarAdapters.Empty, value.name) } @@ -355,7 +351,7 @@ public object HeroDetailQuery_ResponseAdapter { writer: JsonWriter, `value`: com.example.unique_type_name.HeroDetailQuery.Data.OtherHeroDetailQuery, @Suppress("UNUSED_PARAMETER") adapterContext: CompositeAdapterContext, - ): Unit { + ) { writer.name("__typename") StringAdapter.toJson(writer, CustomScalarAdapters.Empty, value.__typename) @@ -371,7 +367,7 @@ public object HeroDetailQuery_ResponseAdapter { { public val RESPONSE_NAMES: List = listOf("name") - public override fun fromJson(reader: JsonReader, adapterContext: CompositeAdapterContext): + override fun fromJson(reader: JsonReader, adapterContext: CompositeAdapterContext): com.example.unique_type_name.HeroDetailQuery.Data.OtherHeroDetailQuery.Friend { var _name: String? = null @@ -387,11 +383,11 @@ public object HeroDetailQuery_ResponseAdapter { ) } - public override fun toJson( + override fun toJson( writer: JsonWriter, `value`: com.example.unique_type_name.HeroDetailQuery.Data.OtherHeroDetailQuery.Friend, adapterContext: CompositeAdapterContext, - ): Unit { + ) { writer.name("name") StringAdapter.toJson(writer, CustomScalarAdapters.Empty, value.name) } diff --git a/libraries/apollo-compiler/src/test/graphql/com/example/unique_type_name/kotlin/responseBased/unique_type_name/fragment/HeroDetailsImpl.kt.expected b/libraries/apollo-compiler/src/test/graphql/com/example/unique_type_name/kotlin/responseBased/unique_type_name/fragment/HeroDetailsImpl.kt.expected index 31189babff5..912d97e253b 100644 --- a/libraries/apollo-compiler/src/test/graphql/com/example/unique_type_name/kotlin/responseBased/unique_type_name/fragment/HeroDetailsImpl.kt.expected +++ b/libraries/apollo-compiler/src/test/graphql/com/example/unique_type_name/kotlin/responseBased/unique_type_name/fragment/HeroDetailsImpl.kt.expected @@ -17,25 +17,24 @@ import kotlin.Any import kotlin.Boolean import kotlin.Int import kotlin.String -import kotlin.Unit import kotlin.collections.List public class HeroDetailsImpl() : Fragment { - public override fun equals(other: Any?): Boolean = other != null && other::class == this::class + override fun equals(other: Any?): Boolean = other != null && other::class == this::class - public override fun hashCode(): Int = this::class.hashCode() + override fun hashCode(): Int = this::class.hashCode() - public override fun serializeVariables( + override fun serializeVariables( writer: JsonWriter, customScalarAdapters: CustomScalarAdapters, withBooleanDefaultValues: Boolean, - ): Unit { + ) { // This fragment doesn't have any variable } - public override fun adapter(): CompositeAdapter = HeroDetailsImpl_ResponseAdapter.Data.obj() + override fun adapter(): CompositeAdapter = HeroDetailsImpl_ResponseAdapter.Data.obj() - public override fun rootField(): CompiledField = CompiledField.Builder( + override fun rootField(): CompiledField = CompiledField.Builder( name = "data", type = Character.type ) @@ -46,21 +45,21 @@ public class HeroDetailsImpl() : Fragment { /** * The name of the character */ - public override val name: String, + override val name: String, /** * The friends of the character exposed as a connection with edges */ - public override val friendsConnection: FriendsConnection, + override val friendsConnection: FriendsConnection, ) : HeroDetails, Fragment.Data { public data class FriendsConnection( /** * The total number of friends */ - public override val totalCount: Int?, + override val totalCount: Int?, /** * The edges for each of the character's friends. */ - public override val edges: List?, + override val edges: List?, ) : HeroDetails.FriendsConnection { public fun edgesFilterNotNull(): List? = edges?.filterNotNull() @@ -68,13 +67,13 @@ public class HeroDetailsImpl() : Fragment { /** * The character represented by this friendship edge */ - public override val node: Node?, + override val node: Node?, ) : HeroDetails.FriendsConnection.Edge { public data class Node( /** * The name of the character */ - public override val name: String, + override val name: String, ) : HeroDetails.FriendsConnection.Edge.Node } } diff --git a/libraries/apollo-compiler/src/test/graphql/com/example/unique_type_name/kotlin/responseBased/unique_type_name/fragment/HeroDetailsImpl_ResponseAdapter.kt.expected b/libraries/apollo-compiler/src/test/graphql/com/example/unique_type_name/kotlin/responseBased/unique_type_name/fragment/HeroDetailsImpl_ResponseAdapter.kt.expected index 7c465cc3b15..05f2cfbc64c 100644 --- a/libraries/apollo-compiler/src/test/graphql/com/example/unique_type_name/kotlin/responseBased/unique_type_name/fragment/HeroDetailsImpl_ResponseAdapter.kt.expected +++ b/libraries/apollo-compiler/src/test/graphql/com/example/unique_type_name/kotlin/responseBased/unique_type_name/fragment/HeroDetailsImpl_ResponseAdapter.kt.expected @@ -17,14 +17,13 @@ import com.apollographql.apollo3.api.nullable import com.apollographql.apollo3.api.obj import kotlin.Int import kotlin.String -import kotlin.Unit import kotlin.collections.List public object HeroDetailsImpl_ResponseAdapter { public object Data : CompositeAdapter { public val RESPONSE_NAMES: List = listOf("name", "friendsConnection") - public override fun fromJson(reader: JsonReader, adapterContext: CompositeAdapterContext): + override fun fromJson(reader: JsonReader, adapterContext: CompositeAdapterContext): HeroDetailsImpl.Data { var _name: String? = null var _friendsConnection: HeroDetailsImpl.Data.FriendsConnection? = null @@ -43,11 +42,11 @@ public object HeroDetailsImpl_ResponseAdapter { ) } - public override fun toJson( + override fun toJson( writer: JsonWriter, `value`: HeroDetailsImpl.Data, adapterContext: CompositeAdapterContext, - ): Unit { + ) { writer.name("name") StringAdapter.toJson(writer, CustomScalarAdapters.Empty, value.name) @@ -58,7 +57,7 @@ public object HeroDetailsImpl_ResponseAdapter { private object FriendsConnection : CompositeAdapter { public val RESPONSE_NAMES: List = listOf("totalCount", "edges") - public override fun fromJson(reader: JsonReader, adapterContext: CompositeAdapterContext): + override fun fromJson(reader: JsonReader, adapterContext: CompositeAdapterContext): HeroDetailsImpl.Data.FriendsConnection { var _totalCount: Int? = null var _edges: List? = null @@ -77,11 +76,11 @@ public object HeroDetailsImpl_ResponseAdapter { ) } - public override fun toJson( + override fun toJson( writer: JsonWriter, `value`: HeroDetailsImpl.Data.FriendsConnection, adapterContext: CompositeAdapterContext, - ): Unit { + ) { writer.name("totalCount") NullableIntAdapter.toJson(writer, CustomScalarAdapters.Empty, value.totalCount) @@ -92,7 +91,7 @@ public object HeroDetailsImpl_ResponseAdapter { private object Edge : CompositeAdapter { public val RESPONSE_NAMES: List = listOf("node") - public override fun fromJson(reader: JsonReader, adapterContext: CompositeAdapterContext): + override fun fromJson(reader: JsonReader, adapterContext: CompositeAdapterContext): HeroDetailsImpl.Data.FriendsConnection.Edge { var _node: HeroDetailsImpl.Data.FriendsConnection.Edge.Node? = null @@ -108,11 +107,11 @@ public object HeroDetailsImpl_ResponseAdapter { ) } - public override fun toJson( + override fun toJson( writer: JsonWriter, `value`: HeroDetailsImpl.Data.FriendsConnection.Edge, adapterContext: CompositeAdapterContext, - ): Unit { + ) { writer.name("node") Node.obj().nullable().toJson(writer, value.node, adapterContext) } @@ -120,7 +119,7 @@ public object HeroDetailsImpl_ResponseAdapter { private object Node : CompositeAdapter { public val RESPONSE_NAMES: List = listOf("name") - public override fun fromJson(reader: JsonReader, adapterContext: CompositeAdapterContext): + override fun fromJson(reader: JsonReader, adapterContext: CompositeAdapterContext): HeroDetailsImpl.Data.FriendsConnection.Edge.Node { var _name: String? = null @@ -136,11 +135,11 @@ public object HeroDetailsImpl_ResponseAdapter { ) } - public override fun toJson( + override fun toJson( writer: JsonWriter, `value`: HeroDetailsImpl.Data.FriendsConnection.Edge.Node, adapterContext: CompositeAdapterContext, - ): Unit { + ) { writer.name("name") StringAdapter.toJson(writer, CustomScalarAdapters.Empty, value.name) } diff --git a/libraries/apollo-compiler/src/test/graphql/com/example/unique_type_name/kotlin/responseBased/unique_type_name/type/adapter/Episode_ResponseAdapter.kt.expected b/libraries/apollo-compiler/src/test/graphql/com/example/unique_type_name/kotlin/responseBased/unique_type_name/type/adapter/Episode_ResponseAdapter.kt.expected index 16d2f4b00ac..a16d888a696 100644 --- a/libraries/apollo-compiler/src/test/graphql/com/example/unique_type_name/kotlin/responseBased/unique_type_name/type/adapter/Episode_ResponseAdapter.kt.expected +++ b/libraries/apollo-compiler/src/test/graphql/com/example/unique_type_name/kotlin/responseBased/unique_type_name/type/adapter/Episode_ResponseAdapter.kt.expected @@ -10,20 +10,18 @@ import com.apollographql.apollo3.api.CustomScalarAdapters import com.apollographql.apollo3.api.json.JsonReader import com.apollographql.apollo3.api.json.JsonWriter import com.example.unique_type_name.type.Episode -import kotlin.Unit public object Episode_ResponseAdapter : Adapter { - public override fun fromJson(reader: JsonReader, customScalarAdapters: CustomScalarAdapters): - Episode { + override fun fromJson(reader: JsonReader, customScalarAdapters: CustomScalarAdapters): Episode { val rawValue = reader.nextString()!! return Episode.safeValueOf(rawValue) } - public override fun toJson( + override fun toJson( writer: JsonWriter, customScalarAdapters: CustomScalarAdapters, `value`: Episode, - ): Unit { + ) { writer.value(value.rawValue) } } diff --git a/libraries/apollo-compiler/src/test/graphql/com/example/variable_default_value/kotlin/responseBased/variable_default_value/TestQuery.kt.expected b/libraries/apollo-compiler/src/test/graphql/com/example/variable_default_value/kotlin/responseBased/variable_default_value/TestQuery.kt.expected index 32e68ab3967..1a2bfdee38d 100644 --- a/libraries/apollo-compiler/src/test/graphql/com/example/variable_default_value/kotlin/responseBased/variable_default_value/TestQuery.kt.expected +++ b/libraries/apollo-compiler/src/test/graphql/com/example/variable_default_value/kotlin/responseBased/variable_default_value/TestQuery.kt.expected @@ -19,32 +19,32 @@ import com.example.variable_default_value.selections.TestQuerySelections import com.example.variable_default_value.type.Episode import kotlin.Boolean import kotlin.String -import kotlin.Unit import kotlin.jvm.JvmOverloads +import com.example.variable_default_value.type.Query as CompiledQuery public data class TestQuery @JvmOverloads constructor( public val episode: Optional = Optional.Absent, ) : Query { - public override fun id(): String = OPERATION_ID + override fun id(): String = OPERATION_ID - public override fun document(): String = OPERATION_DOCUMENT + override fun document(): String = OPERATION_DOCUMENT - public override fun name(): String = OPERATION_NAME + override fun name(): String = OPERATION_NAME - public override fun serializeVariables( + override fun serializeVariables( writer: JsonWriter, customScalarAdapters: CustomScalarAdapters, withBooleanDefaultValues: Boolean, - ): Unit { + ) { TestQuery_VariablesAdapter.serializeVariables(writer, this, customScalarAdapters, withBooleanDefaultValues) } - public override fun adapter(): CompositeAdapter = TestQuery_ResponseAdapter.Data.obj() + override fun adapter(): CompositeAdapter = TestQuery_ResponseAdapter.Data.obj() - public override fun rootField(): CompiledField = CompiledField.Builder( + override fun rootField(): CompiledField = CompiledField.Builder( name = "data", - type = com.example.variable_default_value.type.Query.type + type = CompiledQuery.type ) .selections(selections = TestQuerySelections.__root) .build() diff --git a/libraries/apollo-compiler/src/test/graphql/com/example/variable_default_value/kotlin/responseBased/variable_default_value/adapter/TestQuery_ResponseAdapter.kt.expected b/libraries/apollo-compiler/src/test/graphql/com/example/variable_default_value/kotlin/responseBased/variable_default_value/adapter/TestQuery_ResponseAdapter.kt.expected index b5d5a8ef2de..cefec8a189e 100644 --- a/libraries/apollo-compiler/src/test/graphql/com/example/variable_default_value/kotlin/responseBased/variable_default_value/adapter/TestQuery_ResponseAdapter.kt.expected +++ b/libraries/apollo-compiler/src/test/graphql/com/example/variable_default_value/kotlin/responseBased/variable_default_value/adapter/TestQuery_ResponseAdapter.kt.expected @@ -15,14 +15,13 @@ import com.apollographql.apollo3.api.nullable import com.apollographql.apollo3.api.obj import com.example.variable_default_value.TestQuery import kotlin.String -import kotlin.Unit import kotlin.collections.List public object TestQuery_ResponseAdapter { public object Data : CompositeAdapter { public val RESPONSE_NAMES: List = listOf("hero") - public override fun fromJson(reader: JsonReader, adapterContext: CompositeAdapterContext): + override fun fromJson(reader: JsonReader, adapterContext: CompositeAdapterContext): TestQuery.Data { var _hero: TestQuery.Data.Hero? = null @@ -38,11 +37,11 @@ public object TestQuery_ResponseAdapter { ) } - public override fun toJson( + override fun toJson( writer: JsonWriter, `value`: TestQuery.Data, adapterContext: CompositeAdapterContext, - ): Unit { + ) { writer.name("hero") Hero.obj().nullable().toJson(writer, value.hero, adapterContext) } @@ -50,7 +49,7 @@ public object TestQuery_ResponseAdapter { private object Hero : CompositeAdapter { public val RESPONSE_NAMES: List = listOf("name") - public override fun fromJson(reader: JsonReader, adapterContext: CompositeAdapterContext): + override fun fromJson(reader: JsonReader, adapterContext: CompositeAdapterContext): TestQuery.Data.Hero { var _name: String? = null @@ -66,11 +65,11 @@ public object TestQuery_ResponseAdapter { ) } - public override fun toJson( + override fun toJson( writer: JsonWriter, `value`: TestQuery.Data.Hero, adapterContext: CompositeAdapterContext, - ): Unit { + ) { writer.name("name") StringAdapter.toJson(writer, CustomScalarAdapters.Empty, value.name) } diff --git a/libraries/apollo-compiler/src/test/graphql/com/example/variable_default_value/kotlin/responseBased/variable_default_value/adapter/TestQuery_VariablesAdapter.kt.expected b/libraries/apollo-compiler/src/test/graphql/com/example/variable_default_value/kotlin/responseBased/variable_default_value/adapter/TestQuery_VariablesAdapter.kt.expected index 3acf3e5a527..695f1a323db 100644 --- a/libraries/apollo-compiler/src/test/graphql/com/example/variable_default_value/kotlin/responseBased/variable_default_value/adapter/TestQuery_VariablesAdapter.kt.expected +++ b/libraries/apollo-compiler/src/test/graphql/com/example/variable_default_value/kotlin/responseBased/variable_default_value/adapter/TestQuery_VariablesAdapter.kt.expected @@ -14,7 +14,6 @@ import com.example.variable_default_value.TestQuery import com.example.variable_default_value.type.adapter.Episode_ResponseAdapter import kotlin.Boolean import kotlin.Suppress -import kotlin.Unit public object TestQuery_VariablesAdapter { @Suppress( @@ -26,7 +25,7 @@ public object TestQuery_VariablesAdapter { `value`: TestQuery, customScalarAdapters: CustomScalarAdapters, withBooleanDefaultValues: Boolean, - ): Unit { + ) { val adapterContext = CompositeAdapterContext.Builder().customScalarAdapters(customScalarAdapters).build() if (value.episode is Optional.Present) { diff --git a/libraries/apollo-compiler/src/test/graphql/com/example/variable_default_value/kotlin/responseBased/variable_default_value/type/adapter/Episode_ResponseAdapter.kt.expected b/libraries/apollo-compiler/src/test/graphql/com/example/variable_default_value/kotlin/responseBased/variable_default_value/type/adapter/Episode_ResponseAdapter.kt.expected index 9c273c325e4..921c6e207e1 100644 --- a/libraries/apollo-compiler/src/test/graphql/com/example/variable_default_value/kotlin/responseBased/variable_default_value/type/adapter/Episode_ResponseAdapter.kt.expected +++ b/libraries/apollo-compiler/src/test/graphql/com/example/variable_default_value/kotlin/responseBased/variable_default_value/type/adapter/Episode_ResponseAdapter.kt.expected @@ -10,20 +10,18 @@ import com.apollographql.apollo3.api.CustomScalarAdapters import com.apollographql.apollo3.api.json.JsonReader import com.apollographql.apollo3.api.json.JsonWriter import com.example.variable_default_value.type.Episode -import kotlin.Unit public object Episode_ResponseAdapter : Adapter { - public override fun fromJson(reader: JsonReader, customScalarAdapters: CustomScalarAdapters): - Episode { + override fun fromJson(reader: JsonReader, customScalarAdapters: CustomScalarAdapters): Episode { val rawValue = reader.nextString()!! return Episode.safeValueOf(rawValue) } - public override fun toJson( + override fun toJson( writer: JsonWriter, customScalarAdapters: CustomScalarAdapters, `value`: Episode, - ): Unit { + ) { writer.value(value.rawValue) } }