diff --git a/libraries/apollo-annotations/api/apollo-annotations.api b/libraries/apollo-annotations/api/apollo-annotations.api index 93ae6cdcc22..36ce888ee3c 100644 --- a/libraries/apollo-annotations/api/apollo-annotations.api +++ b/libraries/apollo-annotations/api/apollo-annotations.api @@ -36,9 +36,6 @@ public abstract interface annotation class com/apollographql/apollo3/annotations public abstract interface annotation class com/apollographql/apollo3/annotations/ApolloRequiresOptIn : java/lang/annotation/Annotation { } -public abstract interface annotation class com/apollographql/apollo3/annotations/ApolloUnknownEnum : java/lang/annotation/Annotation { -} - public abstract interface annotation class com/apollographql/apollo3/annotations/GraphQLAdapter : java/lang/annotation/Annotation { public abstract fun forScalar ()Ljava/lang/String; } diff --git a/libraries/apollo-annotations/api/apollo-annotations.klib.api b/libraries/apollo-annotations/api/apollo-annotations.klib.api index 5b2c380afbf..586be351c62 100644 --- a/libraries/apollo-annotations/api/apollo-annotations.klib.api +++ b/libraries/apollo-annotations/api/apollo-annotations.klib.api @@ -46,9 +46,6 @@ open annotation class com.apollographql.apollo3.annotations/ApolloInternal : kot open annotation class com.apollographql.apollo3.annotations/ApolloRequiresOptIn : kotlin/Annotation { // com.apollographql.apollo3.annotations/ApolloRequiresOptIn|null[0] constructor () // com.apollographql.apollo3.annotations/ApolloRequiresOptIn.|(){}[0] } -open annotation class com.apollographql.apollo3.annotations/ApolloUnknownEnum : kotlin/Annotation { // com.apollographql.apollo3.annotations/ApolloUnknownEnum|null[0] - constructor () // com.apollographql.apollo3.annotations/ApolloUnknownEnum.|(){}[0] -} open annotation class com.apollographql.apollo3.annotations/GraphQLAdapter : kotlin/Annotation { // com.apollographql.apollo3.annotations/GraphQLAdapter|null[0] constructor (kotlin/String) // com.apollographql.apollo3.annotations/GraphQLAdapter.|(kotlin.String){}[0] final val forScalar // com.apollographql.apollo3.annotations/GraphQLAdapter.forScalar|{}forScalar[0] diff --git a/libraries/apollo-annotations/src/commonMain/kotlin/com/apollographql/apollo3/annotations/ApolloUnknownEnum.kt b/libraries/apollo-annotations/src/commonMain/kotlin/com/apollographql/apollo3/annotations/ApolloUnknownEnum.kt deleted file mode 100644 index f0e79111260..00000000000 --- a/libraries/apollo-annotations/src/commonMain/kotlin/com/apollographql/apollo3/annotations/ApolloUnknownEnum.kt +++ /dev/null @@ -1,9 +0,0 @@ -package com.apollographql.apollo3.annotations - -@RequiresOptIn( - level = RequiresOptIn.Level.WARNING, - message = "The `UNKNOWN__` class represents GraphQL enums that are not present in the schema and whose `rawValue` cannot be checked at build time. You may want to update your schema instead of calling this directly." -) -@Retention(AnnotationRetention.BINARY) -@Target(AnnotationTarget.FUNCTION, AnnotationTarget.CONSTRUCTOR) -annotation class ApolloUnknownEnum diff --git a/libraries/apollo-compiler/src/main/kotlin/com/apollographql/apollo3/compiler/codegen/kotlin/KotlinSymbols.kt b/libraries/apollo-compiler/src/main/kotlin/com/apollographql/apollo3/compiler/codegen/kotlin/KotlinSymbols.kt index 2d40dfb7f34..adb33870e98 100644 --- a/libraries/apollo-compiler/src/main/kotlin/com/apollographql/apollo3/compiler/codegen/kotlin/KotlinSymbols.kt +++ b/libraries/apollo-compiler/src/main/kotlin/com/apollographql/apollo3/compiler/codegen/kotlin/KotlinSymbols.kt @@ -105,7 +105,6 @@ internal object KotlinSymbols { val ApolloAdaptableWith = ClassName(ClassNames.apolloAnnotationsPackageName, "ApolloAdaptableWith") val ApolloExperimental = ClassName(ClassNames.apolloAnnotationsPackageName, "ApolloExperimental") - val ApolloUnknownEnum = ClassName(ClassNames.apolloAnnotationsPackageName, "ApolloUnknownEnum") val JsExport = ClassName("kotlin.js", "JsExport") diff --git a/libraries/apollo-compiler/src/main/kotlin/com/apollographql/apollo3/compiler/codegen/kotlin/schema/EnumAsEnumBuilder.kt b/libraries/apollo-compiler/src/main/kotlin/com/apollographql/apollo3/compiler/codegen/kotlin/schema/EnumAsEnumBuilder.kt index e73087bfca7..497c800d895 100644 --- a/libraries/apollo-compiler/src/main/kotlin/com/apollographql/apollo3/compiler/codegen/kotlin/schema/EnumAsEnumBuilder.kt +++ b/libraries/apollo-compiler/src/main/kotlin/com/apollographql/apollo3/compiler/codegen/kotlin/schema/EnumAsEnumBuilder.kt @@ -128,7 +128,6 @@ internal class EnumAsEnumBuilder( "Note: unknown values of [rawValue] will return [UNKNOWN__]. You may want to update your schema instead of calling this function directly.\n", selfClassName ) - .addAnnotation(KotlinSymbols.ApolloUnknownEnum) .addParameter("rawValue", String:: class) .returns(selfClassName) diff --git a/libraries/apollo-compiler/src/main/kotlin/com/apollographql/apollo3/compiler/codegen/kotlin/schema/EnumAsSealedBuilder.kt b/libraries/apollo-compiler/src/main/kotlin/com/apollographql/apollo3/compiler/codegen/kotlin/schema/EnumAsSealedBuilder.kt index d1dcb52c850..b07379ddcce 100644 --- a/libraries/apollo-compiler/src/main/kotlin/com/apollographql/apollo3/compiler/codegen/kotlin/schema/EnumAsSealedBuilder.kt +++ b/libraries/apollo-compiler/src/main/kotlin/com/apollographql/apollo3/compiler/codegen/kotlin/schema/EnumAsSealedBuilder.kt @@ -50,16 +50,15 @@ internal class EnumAsSealedBuilder( return CgFile( packageName = packageName, fileName = simpleName, - typeSpecs = listOf(enum.toSealedClassTypeSpec()) + typeSpecs = listOf(enum.toSealedClassTypeSpec(), enum.unknownClassTypeSpec()) ) } private fun IrEnum.toSealedClassTypeSpec(): TypeSpec { - return TypeSpec.classBuilder(simpleName) + return TypeSpec.interfaceBuilder(simpleName) .maybeAddDescription(description) // XXX: can an enum be made deprecated (and not only its values) ? .addModifiers(KModifier.SEALED) - .primaryConstructor(primaryConstructorWithOverriddenParamSpec) .addProperty(rawValuePropertySpec) .addType(companionTypeSpec()) .addTypes(values.map { value -> @@ -82,19 +81,30 @@ internal class EnumAsSealedBuilder( .maybeAddDeprecation(deprecationReason) .maybeAddDescription(description) .maybeAddRequiresOptIn(context.resolver, optInFeature) - .superclass(superClass) - .addSuperclassConstructorParameter("rawValue·=·%S", name) + .addSuperinterface(superClass) + .addProperty( + PropertySpec.builder("rawValue", KotlinSymbols.String) + .addModifiers(KModifier.OVERRIDE) + .initializer("%S", name) + .build() + ) .build() } private fun IrEnum.unknownValueTypeSpec(): TypeSpec { - return TypeSpec.classBuilder("UNKNOWN__") - .addKdoc("An enum value that wasn't known at compile time.\n" + - "Note: the `UNKNOWN__` class represents GraphQL enums that are not present in the schema and whose `rawValue` cannot be checked at build time. You may want to update your schema instead of instantiating it directly." - ) + return TypeSpec.interfaceBuilder("UNKNOWN__") + .addKdoc("An enum value that wasn't known at compile time.") + .addSuperinterface(selfClassName) + .addProperty(unknownValueRawValuePropertySpec) + .build() + } + + private fun IrEnum.unknownClassTypeSpec(): TypeSpec { + return TypeSpec.classBuilder("UNKNOWN__${simpleName}") + .addSuperinterface(unknownValueInterfaceName()) .primaryConstructor(unknownValuePrimaryConstructorSpec) - .superclass(selfClassName) - .addSuperclassConstructorParameter("rawValue·=·rawValue") + .addProperty(unknownValueRawValuePropertySpecWithInitializer) + .addModifiers(KModifier.PRIVATE) .addFunction( FunSpec.builder("equals") .addModifiers(KModifier.OVERRIDE) @@ -128,7 +138,6 @@ internal class EnumAsSealedBuilder( "Note: unknown values of [rawValue] will return [UNKNOWN__]. You may want to update your schema instead of calling this function directly.\n", selfClassName ) - .addAnnotation(KotlinSymbols.ApolloUnknownEnum) .addSuppressions(enum.values.any { it.deprecationReason != null }) .maybeAddOptIn(context.resolver, enum.values) .addParameter("rawValue", KotlinSymbols.String) @@ -139,7 +148,7 @@ internal class EnumAsSealedBuilder( .map { CodeBlock.of("%S·->·%T", it.name, it.valueClassName()) } .joinToCode(separator = "\n", suffix = "\n") ) - .addCode("else -> @OptIn(%T::class) %T(rawValue)\n", KotlinSymbols.ApolloUnknownEnum, unknownValueClassName()) + .addCode("else -> %T(rawValue)\n", unknownValueClassName()) .endControlFlow() .build() } @@ -170,24 +179,31 @@ internal class EnumAsSealedBuilder( return ClassName(selfClassName.packageName, selfClassName.simpleName, targetName.escapeKotlinReservedWordInSealedClass()) } - private fun unknownValueClassName(): ClassName { + private fun unknownValueInterfaceName(): ClassName { return ClassName(selfClassName.packageName, selfClassName.simpleName, "UNKNOWN__") } + private fun unknownValueClassName(): ClassName { + return ClassName(selfClassName.packageName, "UNKNOWN__${selfClassName.simpleName}") + } + private val unknownValuePrimaryConstructorSpec = FunSpec.constructorBuilder() - .addAnnotation(KotlinSymbols.ApolloUnknownEnum) .addParameter("rawValue", KotlinSymbols.String) .build() - private val primaryConstructorWithOverriddenParamSpec = - FunSpec.constructorBuilder() - .addParameter("rawValue", KotlinSymbols.String) + private val unknownValueRawValuePropertySpec = + PropertySpec.builder("rawValue", KotlinSymbols.String) + .addModifiers(KModifier.OVERRIDE) .build() - private val rawValuePropertySpec = + private val unknownValueRawValuePropertySpecWithInitializer = PropertySpec.builder("rawValue", KotlinSymbols.String) + .addModifiers(KModifier.OVERRIDE) .initializer("rawValue") .build() + private val rawValuePropertySpec = + PropertySpec.builder("rawValue", KotlinSymbols.String) + .build() } diff --git a/libraries/apollo-compiler/src/main/kotlin/com/apollographql/apollo3/compiler/codegen/kotlin/schema/EnumResponseAdapterBuilder.kt b/libraries/apollo-compiler/src/main/kotlin/com/apollographql/apollo3/compiler/codegen/kotlin/schema/EnumResponseAdapterBuilder.kt index d7ffacb170f..6d346dd0eb5 100644 --- a/libraries/apollo-compiler/src/main/kotlin/com/apollographql/apollo3/compiler/codegen/kotlin/schema/EnumResponseAdapterBuilder.kt +++ b/libraries/apollo-compiler/src/main/kotlin/com/apollographql/apollo3/compiler/codegen/kotlin/schema/EnumResponseAdapterBuilder.kt @@ -5,7 +5,6 @@ import com.apollographql.apollo3.compiler.codegen.kotlin.CgFile import com.apollographql.apollo3.compiler.codegen.kotlin.CgFileBuilder import com.apollographql.apollo3.compiler.codegen.kotlin.KotlinSchemaContext import com.apollographql.apollo3.compiler.codegen.kotlin.KotlinSymbols -import com.apollographql.apollo3.compiler.codegen.kotlin.helpers.requiresOptInAnnotation import com.apollographql.apollo3.compiler.codegen.responseAdapter import com.apollographql.apollo3.compiler.codegen.typeAdapterPackageName import com.apollographql.apollo3.compiler.ir.IrEnum @@ -43,7 +42,6 @@ internal class EnumResponseAdapterBuilder( private fun IrEnum.typeSpec(): TypeSpec { val adaptedTypeName = context.resolver.resolveSchemaType(enum.name) val fromResponseFunSpec = FunSpec.builder(Identifier.fromJson) - .addAnnotation(requiresOptInAnnotation(KotlinSymbols.ApolloUnknownEnum)) .addModifiers(KModifier.OVERRIDE) .addParameter(Identifier.reader, KotlinSymbols.JsonReader) .addParameter(Identifier.customScalarAdapters, KotlinSymbols.CustomScalarAdapters) diff --git a/libraries/apollo-compiler/src/test/graphql/com/example/case_sensitive_enum/kotlin/responseBased/case_sensitive_enum/type/Enum.kt.expected b/libraries/apollo-compiler/src/test/graphql/com/example/case_sensitive_enum/kotlin/responseBased/case_sensitive_enum/type/Enum.kt.expected index 3e8c0f889f4..545358ff13c 100644 --- a/libraries/apollo-compiler/src/test/graphql/com/example/case_sensitive_enum/kotlin/responseBased/case_sensitive_enum/type/Enum.kt.expected +++ b/libraries/apollo-compiler/src/test/graphql/com/example/case_sensitive_enum/kotlin/responseBased/case_sensitive_enum/type/Enum.kt.expected @@ -5,7 +5,6 @@ // package com.example.case_sensitive_enum.type -import com.apollographql.apollo3.annotations.ApolloUnknownEnum import com.apollographql.apollo3.api.EnumType import kotlin.Array import kotlin.Deprecated @@ -56,7 +55,6 @@ public enum class Enum( * Note: unknown values of [rawValue] will return [UNKNOWN__]. You may want to update your * schema instead of calling this function directly. */ - @ApolloUnknownEnum public fun safeValueOf(rawValue: String): Enum = values().find { it.rawValue == rawValue } ?: UNKNOWN__ } 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 3d5b7e314d6..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 @@ -5,16 +5,13 @@ // package com.example.case_sensitive_enum.type.adapter -import com.apollographql.apollo3.annotations.ApolloUnknownEnum import com.apollographql.apollo3.api.Adapter 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.OptIn public object Enum_ResponseAdapter : Adapter { - @OptIn(ApolloUnknownEnum::class) override fun fromJson(reader: JsonReader, customScalarAdapters: CustomScalarAdapters): Enum { val rawValue = reader.nextString()!! return Enum.safeValueOf(rawValue) diff --git a/libraries/apollo-compiler/src/test/graphql/com/example/deprecation/kotlin/responseBased/deprecation/type/Episode.kt.expected b/libraries/apollo-compiler/src/test/graphql/com/example/deprecation/kotlin/responseBased/deprecation/type/Episode.kt.expected index adaa92d4b02..2f7674c2f41 100644 --- a/libraries/apollo-compiler/src/test/graphql/com/example/deprecation/kotlin/responseBased/deprecation/type/Episode.kt.expected +++ b/libraries/apollo-compiler/src/test/graphql/com/example/deprecation/kotlin/responseBased/deprecation/type/Episode.kt.expected @@ -5,7 +5,6 @@ // package com.example.deprecation.type -import com.apollographql.apollo3.annotations.ApolloUnknownEnum import com.apollographql.apollo3.api.EnumType import kotlin.Array import kotlin.Deprecated @@ -51,7 +50,6 @@ public enum class Episode( * Note: unknown values of [rawValue] will return [UNKNOWN__]. You may want to update your * schema instead of calling this function directly. */ - @ApolloUnknownEnum public fun safeValueOf(rawValue: String): Episode = values().find { it.rawValue == rawValue } ?: UNKNOWN__ } 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 9b6850881ff..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 @@ -5,16 +5,13 @@ // package com.example.deprecation.type.adapter -import com.apollographql.apollo3.annotations.ApolloUnknownEnum import com.apollographql.apollo3.api.Adapter 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.OptIn public object Episode_ResponseAdapter : Adapter { - @OptIn(ApolloUnknownEnum::class) override fun fromJson(reader: JsonReader, customScalarAdapters: CustomScalarAdapters): Episode { val rawValue = reader.nextString()!! return Episode.safeValueOf(rawValue) diff --git a/libraries/apollo-compiler/src/test/graphql/com/example/enum_field/kotlin/responseBased/enum_field/type/Gravity.kt.expected b/libraries/apollo-compiler/src/test/graphql/com/example/enum_field/kotlin/responseBased/enum_field/type/Gravity.kt.expected index 02457891253..375a20a3c40 100644 --- a/libraries/apollo-compiler/src/test/graphql/com/example/enum_field/kotlin/responseBased/enum_field/type/Gravity.kt.expected +++ b/libraries/apollo-compiler/src/test/graphql/com/example/enum_field/kotlin/responseBased/enum_field/type/Gravity.kt.expected @@ -5,7 +5,6 @@ // package com.example.enum_field.type -import com.apollographql.apollo3.annotations.ApolloUnknownEnum import com.apollographql.apollo3.api.EnumType import kotlin.Array import kotlin.Deprecated @@ -61,7 +60,6 @@ public enum class Gravity( * Note: unknown values of [rawValue] will return [UNKNOWN__]. You may want to update your * schema instead of calling this function directly. */ - @ApolloUnknownEnum public fun safeValueOf(rawValue: kotlin.String): Gravity = entries.find { it.rawValue == rawValue } ?: UNKNOWN__ } diff --git a/libraries/apollo-compiler/src/test/graphql/com/example/enum_field/kotlin/responseBased/enum_field/type/GravityAsEnum.kt.expected b/libraries/apollo-compiler/src/test/graphql/com/example/enum_field/kotlin/responseBased/enum_field/type/GravityAsEnum.kt.expected index 7c7a42fba53..04953d73ab9 100644 --- a/libraries/apollo-compiler/src/test/graphql/com/example/enum_field/kotlin/responseBased/enum_field/type/GravityAsEnum.kt.expected +++ b/libraries/apollo-compiler/src/test/graphql/com/example/enum_field/kotlin/responseBased/enum_field/type/GravityAsEnum.kt.expected @@ -5,7 +5,6 @@ // package com.example.enum_field.type -import com.apollographql.apollo3.annotations.ApolloUnknownEnum import com.apollographql.apollo3.api.EnumType import kotlin.Array import kotlin.Deprecated @@ -75,7 +74,6 @@ public enum class GravityAsEnum( * Note: unknown values of [rawValue] will return [UNKNOWN__]. You may want to update your * schema instead of calling this function directly. */ - @ApolloUnknownEnum public fun safeValueOf(rawValue: kotlin.String): GravityAsEnum = entries.find { it.rawValue == rawValue } ?: UNKNOWN__ } 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 34fb1307db7..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 @@ -5,16 +5,13 @@ // package com.example.enum_field.type.adapter -import com.apollographql.apollo3.annotations.ApolloUnknownEnum import com.apollographql.apollo3.api.Adapter 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.OptIn public object GravityAsEnum_ResponseAdapter : Adapter { - @OptIn(ApolloUnknownEnum::class) override fun fromJson(reader: JsonReader, customScalarAdapters: CustomScalarAdapters): GravityAsEnum { val rawValue = reader.nextString()!! 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 080c8dbb85a..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 @@ -5,16 +5,13 @@ // package com.example.enum_field.type.adapter -import com.apollographql.apollo3.annotations.ApolloUnknownEnum import com.apollographql.apollo3.api.Adapter 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.OptIn public object Gravity_ResponseAdapter : Adapter { - @OptIn(ApolloUnknownEnum::class) override fun fromJson(reader: JsonReader, customScalarAdapters: CustomScalarAdapters): Gravity { val rawValue = reader.nextString()!! return Gravity.safeValueOf(rawValue) 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 fb4b6b96623..e01dbd09ef5 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 @@ -5,7 +5,6 @@ // package com.example.enums_as_sealed.type -import com.apollographql.apollo3.annotations.ApolloUnknownEnum import com.apollographql.apollo3.api.EnumType import kotlin.Any import kotlin.Array @@ -15,9 +14,9 @@ import kotlin.Int import kotlin.String import kotlin.Suppress -public sealed class Enum( - public val rawValue: String, -) { +public sealed interface Enum { + public val rawValue: String + public companion object { public val type: EnumType = EnumType("Enum", listOf("north", "North", "NORTH", "SOUTH", "type")) @@ -26,7 +25,6 @@ public sealed class Enum( * Note: unknown values of [rawValue] will return [UNKNOWN__]. You may want to update your * schema instead of calling this function directly. */ - @ApolloUnknownEnum @Suppress("DEPRECATION") public fun safeValueOf(rawValue: String): Enum = when(rawValue) { "north" -> north @@ -34,7 +32,7 @@ public sealed class Enum( "NORTH" -> NORTH "SOUTH" -> SOUTH "type" -> type_ - else -> @OptIn(ApolloUnknownEnum::class) UNKNOWN__(rawValue) + else -> UNKNOWN__Enum(rawValue) } /** @@ -50,33 +48,44 @@ public sealed class Enum( } @Deprecated(message = "No longer supported") - public object north : Enum(rawValue = "north") + public object north : Enum { + override val rawValue: String = "north" + } @Deprecated(message = "No longer supported") - public object North : Enum(rawValue = "North") + public object North : Enum { + override val rawValue: String = "North" + } - public object NORTH : Enum(rawValue = "NORTH") + public object NORTH : Enum { + override val rawValue: String = "NORTH" + } - public object SOUTH : Enum(rawValue = "SOUTH") + public object SOUTH : Enum { + override val rawValue: String = "SOUTH" + } - public object type_ : Enum(rawValue = "type") + public object type_ : Enum { + override val rawValue: String = "type" + } /** * An enum value that wasn't known at compile time. - * Note: the `UNKNOWN__` class represents GraphQL enums that are not present in the schema and - * whose `rawValue` cannot be checked at build time. You may want to update your schema instead of - * instantiating it directly. */ - public class UNKNOWN__ @ApolloUnknownEnum constructor( - rawValue: String, - ) : Enum(rawValue = rawValue) { - override fun equals(other: Any?): Boolean { - if (other !is UNKNOWN__) return false - return this.rawValue == other.rawValue - } - - override fun hashCode(): Int = this.rawValue.hashCode() + public interface UNKNOWN__ : Enum { + override val rawValue: String + } +} - override fun toString(): String = "UNKNOWN__($rawValue)" +private class UNKNOWN__Enum( + override val rawValue: String, +) : Enum.UNKNOWN__ { + override fun equals(other: Any?): Boolean { + if (other !is UNKNOWN__Enum) return false + return this.rawValue == other.rawValue } + + override fun hashCode(): Int = this.rawValue.hashCode() + + 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 8b786a31910..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 @@ -5,16 +5,13 @@ // package com.example.enums_as_sealed.type.adapter -import com.apollographql.apollo3.annotations.ApolloUnknownEnum import com.apollographql.apollo3.api.Adapter 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.OptIn public object Enum_ResponseAdapter : Adapter { - @OptIn(ApolloUnknownEnum::class) override fun fromJson(reader: JsonReader, customScalarAdapters: CustomScalarAdapters): Enum { val rawValue = reader.nextString()!! return Enum.safeValueOf(rawValue) diff --git a/libraries/apollo-compiler/src/test/graphql/com/example/fragment_with_inline_fragment/kotlin/operationBased/fragment_with_inline_fragment/type/Episode.kt.expected b/libraries/apollo-compiler/src/test/graphql/com/example/fragment_with_inline_fragment/kotlin/operationBased/fragment_with_inline_fragment/type/Episode.kt.expected index 589d578b016..72186515573 100644 --- a/libraries/apollo-compiler/src/test/graphql/com/example/fragment_with_inline_fragment/kotlin/operationBased/fragment_with_inline_fragment/type/Episode.kt.expected +++ b/libraries/apollo-compiler/src/test/graphql/com/example/fragment_with_inline_fragment/kotlin/operationBased/fragment_with_inline_fragment/type/Episode.kt.expected @@ -5,7 +5,6 @@ // package com.example.fragment_with_inline_fragment.type -import com.apollographql.apollo3.annotations.ApolloUnknownEnum import com.apollographql.apollo3.api.EnumType import kotlin.Array import kotlin.Deprecated @@ -77,7 +76,6 @@ public enum class Episode( * Note: unknown values of [rawValue] will return [UNKNOWN__]. You may want to update your * schema instead of calling this function directly. */ - @ApolloUnknownEnum public fun safeValueOf(rawValue: String): Episode = values().find { it.rawValue == rawValue } ?: UNKNOWN__ } 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 d4c20e64f05..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 @@ -5,16 +5,13 @@ // package com.example.fragment_with_inline_fragment.type.adapter -import com.apollographql.apollo3.annotations.ApolloUnknownEnum import com.apollographql.apollo3.api.Adapter 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.OptIn public object Episode_ResponseAdapter : Adapter { - @OptIn(ApolloUnknownEnum::class) override fun fromJson(reader: JsonReader, customScalarAdapters: CustomScalarAdapters): Episode { val rawValue = reader.nextString()!! return Episode.safeValueOf(rawValue) diff --git a/libraries/apollo-compiler/src/test/graphql/com/example/fragment_with_inline_fragment/kotlin/responseBased/fragment_with_inline_fragment/type/Episode.kt.expected b/libraries/apollo-compiler/src/test/graphql/com/example/fragment_with_inline_fragment/kotlin/responseBased/fragment_with_inline_fragment/type/Episode.kt.expected index 589d578b016..72186515573 100644 --- a/libraries/apollo-compiler/src/test/graphql/com/example/fragment_with_inline_fragment/kotlin/responseBased/fragment_with_inline_fragment/type/Episode.kt.expected +++ b/libraries/apollo-compiler/src/test/graphql/com/example/fragment_with_inline_fragment/kotlin/responseBased/fragment_with_inline_fragment/type/Episode.kt.expected @@ -5,7 +5,6 @@ // package com.example.fragment_with_inline_fragment.type -import com.apollographql.apollo3.annotations.ApolloUnknownEnum import com.apollographql.apollo3.api.EnumType import kotlin.Array import kotlin.Deprecated @@ -77,7 +76,6 @@ public enum class Episode( * Note: unknown values of [rawValue] will return [UNKNOWN__]. You may want to update your * schema instead of calling this function directly. */ - @ApolloUnknownEnum public fun safeValueOf(rawValue: String): Episode = values().find { it.rawValue == rawValue } ?: UNKNOWN__ } 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 d4c20e64f05..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 @@ -5,16 +5,13 @@ // package com.example.fragment_with_inline_fragment.type.adapter -import com.apollographql.apollo3.annotations.ApolloUnknownEnum import com.apollographql.apollo3.api.Adapter 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.OptIn public object Episode_ResponseAdapter : Adapter { - @OptIn(ApolloUnknownEnum::class) override fun fromJson(reader: JsonReader, customScalarAdapters: CustomScalarAdapters): Episode { val rawValue = reader.nextString()!! return Episode.safeValueOf(rawValue) 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 af55b6fd5e1..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 @@ -5,16 +5,13 @@ // package com.example.hero_details.type.adapter -import com.apollographql.apollo3.annotations.ApolloUnknownEnum import com.apollographql.apollo3.api.Adapter 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.OptIn public object Hero_type_ResponseAdapter : Adapter { - @OptIn(ApolloUnknownEnum::class) override fun fromJson(reader: JsonReader, customScalarAdapters: CustomScalarAdapters): Hero_type { val rawValue = reader.nextString()!! return Hero_type.safeValueOf(rawValue) diff --git a/libraries/apollo-compiler/src/test/graphql/com/example/hero_details/kotlin/responseBased/hero_details/type/hero_type.kt.expected b/libraries/apollo-compiler/src/test/graphql/com/example/hero_details/kotlin/responseBased/hero_details/type/hero_type.kt.expected index 3776fd65dbf..10c01a9daf7 100644 --- a/libraries/apollo-compiler/src/test/graphql/com/example/hero_details/kotlin/responseBased/hero_details/type/hero_type.kt.expected +++ b/libraries/apollo-compiler/src/test/graphql/com/example/hero_details/kotlin/responseBased/hero_details/type/hero_type.kt.expected @@ -5,7 +5,6 @@ // package com.example.hero_details.type -import com.apollographql.apollo3.annotations.ApolloUnknownEnum import com.apollographql.apollo3.api.EnumType import kotlin.Array import kotlin.Deprecated @@ -51,7 +50,6 @@ public enum class Hero_type( * Note: unknown values of [rawValue] will return [UNKNOWN__]. You may want to update your * schema instead of calling this function directly. */ - @ApolloUnknownEnum public fun safeValueOf(rawValue: String): Hero_type = values().find { it.rawValue == rawValue } ?: UNKNOWN__ } diff --git a/libraries/apollo-compiler/src/test/graphql/com/example/hero_name_query_long_name/kotlin/responseBased/hero_name_query_long_name/type/Episode.kt.expected b/libraries/apollo-compiler/src/test/graphql/com/example/hero_name_query_long_name/kotlin/responseBased/hero_name_query_long_name/type/Episode.kt.expected index 5cdddf21c20..bf470efda6c 100644 --- a/libraries/apollo-compiler/src/test/graphql/com/example/hero_name_query_long_name/kotlin/responseBased/hero_name_query_long_name/type/Episode.kt.expected +++ b/libraries/apollo-compiler/src/test/graphql/com/example/hero_name_query_long_name/kotlin/responseBased/hero_name_query_long_name/type/Episode.kt.expected @@ -5,7 +5,6 @@ // package com.example.hero_name_query_long_name.type -import com.apollographql.apollo3.annotations.ApolloUnknownEnum import com.apollographql.apollo3.api.EnumType import kotlin.Array import kotlin.Deprecated @@ -77,7 +76,6 @@ public enum class Episode( * Note: unknown values of [rawValue] will return [UNKNOWN__]. You may want to update your * schema instead of calling this function directly. */ - @ApolloUnknownEnum public fun safeValueOf(rawValue: String): Episode = values().find { it.rawValue == rawValue } ?: UNKNOWN__ } 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 eb0ef4a5c2e..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 @@ -5,16 +5,13 @@ // package com.example.hero_name_query_long_name.type.adapter -import com.apollographql.apollo3.annotations.ApolloUnknownEnum import com.apollographql.apollo3.api.Adapter 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.OptIn public object Episode_ResponseAdapter : Adapter { - @OptIn(ApolloUnknownEnum::class) override fun fromJson(reader: JsonReader, customScalarAdapters: CustomScalarAdapters): Episode { val rawValue = reader.nextString()!! return Episode.safeValueOf(rawValue) diff --git a/libraries/apollo-compiler/src/test/graphql/com/example/hero_with_review/kotlin/responseBased/hero_with_review/type/Episode.kt.expected b/libraries/apollo-compiler/src/test/graphql/com/example/hero_with_review/kotlin/responseBased/hero_with_review/type/Episode.kt.expected index e4b9a539ae3..83d113c0abf 100644 --- a/libraries/apollo-compiler/src/test/graphql/com/example/hero_with_review/kotlin/responseBased/hero_with_review/type/Episode.kt.expected +++ b/libraries/apollo-compiler/src/test/graphql/com/example/hero_with_review/kotlin/responseBased/hero_with_review/type/Episode.kt.expected @@ -5,7 +5,6 @@ // package com.example.hero_with_review.type -import com.apollographql.apollo3.annotations.ApolloUnknownEnum import com.apollographql.apollo3.api.EnumType import kotlin.Array import kotlin.Deprecated @@ -77,7 +76,6 @@ public enum class Episode( * Note: unknown values of [rawValue] will return [UNKNOWN__]. You may want to update your * schema instead of calling this function directly. */ - @ApolloUnknownEnum public fun safeValueOf(rawValue: String): Episode = values().find { it.rawValue == rawValue } ?: UNKNOWN__ } 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 3854c15fb8b..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 @@ -5,16 +5,13 @@ // package com.example.hero_with_review.type.adapter -import com.apollographql.apollo3.annotations.ApolloUnknownEnum import com.apollographql.apollo3.api.Adapter 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.OptIn public object Episode_ResponseAdapter : Adapter { - @OptIn(ApolloUnknownEnum::class) override fun fromJson(reader: JsonReader, customScalarAdapters: CustomScalarAdapters): Episode { val rawValue = reader.nextString()!! return Episode.safeValueOf(rawValue) diff --git a/libraries/apollo-compiler/src/test/graphql/com/example/inline_fragment_intersection/kotlin/operationBased/inline_fragment_intersection/type/Race.kt.expected b/libraries/apollo-compiler/src/test/graphql/com/example/inline_fragment_intersection/kotlin/operationBased/inline_fragment_intersection/type/Race.kt.expected index 4caa331a3c0..0c007889015 100644 --- a/libraries/apollo-compiler/src/test/graphql/com/example/inline_fragment_intersection/kotlin/operationBased/inline_fragment_intersection/type/Race.kt.expected +++ b/libraries/apollo-compiler/src/test/graphql/com/example/inline_fragment_intersection/kotlin/operationBased/inline_fragment_intersection/type/Race.kt.expected @@ -5,7 +5,6 @@ // package com.example.inline_fragment_intersection.type -import com.apollographql.apollo3.annotations.ApolloUnknownEnum import com.apollographql.apollo3.api.EnumType import kotlin.Array import kotlin.Deprecated @@ -50,7 +49,6 @@ public enum class Race( * Note: unknown values of [rawValue] will return [UNKNOWN__]. You may want to update your * schema instead of calling this function directly. */ - @ApolloUnknownEnum public fun safeValueOf(rawValue: String): Race = values().find { it.rawValue == rawValue } ?: UNKNOWN__ } 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 b80342c5f7d..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 @@ -5,16 +5,13 @@ // package com.example.inline_fragment_intersection.type.adapter -import com.apollographql.apollo3.annotations.ApolloUnknownEnum import com.apollographql.apollo3.api.Adapter 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.OptIn public object Race_ResponseAdapter : Adapter { - @OptIn(ApolloUnknownEnum::class) override fun fromJson(reader: JsonReader, customScalarAdapters: CustomScalarAdapters): Race { val rawValue = reader.nextString()!! return Race.safeValueOf(rawValue) diff --git a/libraries/apollo-compiler/src/test/graphql/com/example/inline_fragment_intersection/kotlin/responseBased/inline_fragment_intersection/type/Race.kt.expected b/libraries/apollo-compiler/src/test/graphql/com/example/inline_fragment_intersection/kotlin/responseBased/inline_fragment_intersection/type/Race.kt.expected index 4caa331a3c0..0c007889015 100644 --- a/libraries/apollo-compiler/src/test/graphql/com/example/inline_fragment_intersection/kotlin/responseBased/inline_fragment_intersection/type/Race.kt.expected +++ b/libraries/apollo-compiler/src/test/graphql/com/example/inline_fragment_intersection/kotlin/responseBased/inline_fragment_intersection/type/Race.kt.expected @@ -5,7 +5,6 @@ // package com.example.inline_fragment_intersection.type -import com.apollographql.apollo3.annotations.ApolloUnknownEnum import com.apollographql.apollo3.api.EnumType import kotlin.Array import kotlin.Deprecated @@ -50,7 +49,6 @@ public enum class Race( * Note: unknown values of [rawValue] will return [UNKNOWN__]. You may want to update your * schema instead of calling this function directly. */ - @ApolloUnknownEnum public fun safeValueOf(rawValue: String): Race = values().find { it.rawValue == rawValue } ?: UNKNOWN__ } 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 b80342c5f7d..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 @@ -5,16 +5,13 @@ // package com.example.inline_fragment_intersection.type.adapter -import com.apollographql.apollo3.annotations.ApolloUnknownEnum import com.apollographql.apollo3.api.Adapter 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.OptIn public object Race_ResponseAdapter : Adapter { - @OptIn(ApolloUnknownEnum::class) override fun fromJson(reader: JsonReader, customScalarAdapters: CustomScalarAdapters): Race { val rawValue = reader.nextString()!! return Race.safeValueOf(rawValue) diff --git a/libraries/apollo-compiler/src/test/graphql/com/example/inline_fragments_with_friends/kotlin/operationBased/inline_fragments_with_friends/type/Episode.kt.expected b/libraries/apollo-compiler/src/test/graphql/com/example/inline_fragments_with_friends/kotlin/operationBased/inline_fragments_with_friends/type/Episode.kt.expected index 99734f67bde..4dbce125c90 100644 --- a/libraries/apollo-compiler/src/test/graphql/com/example/inline_fragments_with_friends/kotlin/operationBased/inline_fragments_with_friends/type/Episode.kt.expected +++ b/libraries/apollo-compiler/src/test/graphql/com/example/inline_fragments_with_friends/kotlin/operationBased/inline_fragments_with_friends/type/Episode.kt.expected @@ -5,7 +5,6 @@ // package com.example.inline_fragments_with_friends.type -import com.apollographql.apollo3.annotations.ApolloUnknownEnum import com.apollographql.apollo3.api.EnumType import kotlin.Array import kotlin.Deprecated @@ -77,7 +76,6 @@ public enum class Episode( * Note: unknown values of [rawValue] will return [UNKNOWN__]. You may want to update your * schema instead of calling this function directly. */ - @ApolloUnknownEnum public fun safeValueOf(rawValue: String): Episode = values().find { it.rawValue == rawValue } ?: UNKNOWN__ } 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 1866e8a8771..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 @@ -5,16 +5,13 @@ // package com.example.inline_fragments_with_friends.type.adapter -import com.apollographql.apollo3.annotations.ApolloUnknownEnum import com.apollographql.apollo3.api.Adapter 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.OptIn public object Episode_ResponseAdapter : Adapter { - @OptIn(ApolloUnknownEnum::class) override fun fromJson(reader: JsonReader, customScalarAdapters: CustomScalarAdapters): Episode { val rawValue = reader.nextString()!! return Episode.safeValueOf(rawValue) diff --git a/libraries/apollo-compiler/src/test/graphql/com/example/inline_fragments_with_friends/kotlin/responseBased/inline_fragments_with_friends/type/Episode.kt.expected b/libraries/apollo-compiler/src/test/graphql/com/example/inline_fragments_with_friends/kotlin/responseBased/inline_fragments_with_friends/type/Episode.kt.expected index 99734f67bde..4dbce125c90 100644 --- a/libraries/apollo-compiler/src/test/graphql/com/example/inline_fragments_with_friends/kotlin/responseBased/inline_fragments_with_friends/type/Episode.kt.expected +++ b/libraries/apollo-compiler/src/test/graphql/com/example/inline_fragments_with_friends/kotlin/responseBased/inline_fragments_with_friends/type/Episode.kt.expected @@ -5,7 +5,6 @@ // package com.example.inline_fragments_with_friends.type -import com.apollographql.apollo3.annotations.ApolloUnknownEnum import com.apollographql.apollo3.api.EnumType import kotlin.Array import kotlin.Deprecated @@ -77,7 +76,6 @@ public enum class Episode( * Note: unknown values of [rawValue] will return [UNKNOWN__]. You may want to update your * schema instead of calling this function directly. */ - @ApolloUnknownEnum public fun safeValueOf(rawValue: String): Episode = values().find { it.rawValue == rawValue } ?: UNKNOWN__ } 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 1866e8a8771..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 @@ -5,16 +5,13 @@ // package com.example.inline_fragments_with_friends.type.adapter -import com.apollographql.apollo3.annotations.ApolloUnknownEnum import com.apollographql.apollo3.api.Adapter 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.OptIn public object Episode_ResponseAdapter : Adapter { - @OptIn(ApolloUnknownEnum::class) override fun fromJson(reader: JsonReader, customScalarAdapters: CustomScalarAdapters): Episode { val rawValue = reader.nextString()!! return Episode.safeValueOf(rawValue) diff --git a/libraries/apollo-compiler/src/test/graphql/com/example/input_object_type/kotlin/responseBased/input_object_type/type/Episode.kt.expected b/libraries/apollo-compiler/src/test/graphql/com/example/input_object_type/kotlin/responseBased/input_object_type/type/Episode.kt.expected index 915a978488b..dda92079a63 100644 --- a/libraries/apollo-compiler/src/test/graphql/com/example/input_object_type/kotlin/responseBased/input_object_type/type/Episode.kt.expected +++ b/libraries/apollo-compiler/src/test/graphql/com/example/input_object_type/kotlin/responseBased/input_object_type/type/Episode.kt.expected @@ -5,7 +5,6 @@ // package com.example.input_object_type.type -import com.apollographql.apollo3.annotations.ApolloUnknownEnum import com.apollographql.apollo3.api.EnumType import kotlin.Array import kotlin.Deprecated @@ -77,7 +76,6 @@ public enum class Episode( * Note: unknown values of [rawValue] will return [UNKNOWN__]. You may want to update your * schema instead of calling this function directly. */ - @ApolloUnknownEnum public fun safeValueOf(rawValue: String): Episode = values().find { it.rawValue == rawValue } ?: UNKNOWN__ } 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 b397ab531f9..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 @@ -5,16 +5,13 @@ // package com.example.input_object_type.type.adapter -import com.apollographql.apollo3.annotations.ApolloUnknownEnum import com.apollographql.apollo3.api.Adapter 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.OptIn public object Episode_ResponseAdapter : Adapter { - @OptIn(ApolloUnknownEnum::class) override fun fromJson(reader: JsonReader, customScalarAdapters: CustomScalarAdapters): Episode { val rawValue = reader.nextString()!! return Episode.safeValueOf(rawValue) diff --git a/libraries/apollo-compiler/src/test/graphql/com/example/input_object_variable_and_argument/kotlin/responseBased/input_object_variable_and_argument/type/Episode.kt.expected b/libraries/apollo-compiler/src/test/graphql/com/example/input_object_variable_and_argument/kotlin/responseBased/input_object_variable_and_argument/type/Episode.kt.expected index 9c15136d31a..fb0c3790b22 100644 --- a/libraries/apollo-compiler/src/test/graphql/com/example/input_object_variable_and_argument/kotlin/responseBased/input_object_variable_and_argument/type/Episode.kt.expected +++ b/libraries/apollo-compiler/src/test/graphql/com/example/input_object_variable_and_argument/kotlin/responseBased/input_object_variable_and_argument/type/Episode.kt.expected @@ -5,7 +5,6 @@ // package com.example.input_object_variable_and_argument.type -import com.apollographql.apollo3.annotations.ApolloUnknownEnum import com.apollographql.apollo3.api.EnumType import kotlin.Array import kotlin.Deprecated @@ -77,7 +76,6 @@ public enum class Episode( * Note: unknown values of [rawValue] will return [UNKNOWN__]. You may want to update your * schema instead of calling this function directly. */ - @ApolloUnknownEnum public fun safeValueOf(rawValue: String): Episode = values().find { it.rawValue == rawValue } ?: UNKNOWN__ } 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 7e9a662473e..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 @@ -5,16 +5,13 @@ // package com.example.input_object_variable_and_argument.type.adapter -import com.apollographql.apollo3.annotations.ApolloUnknownEnum import com.apollographql.apollo3.api.Adapter 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.OptIn public object Episode_ResponseAdapter : Adapter { - @OptIn(ApolloUnknownEnum::class) override fun fromJson(reader: JsonReader, customScalarAdapters: CustomScalarAdapters): Episode { val rawValue = reader.nextString()!! return Episode.safeValueOf(rawValue) diff --git a/libraries/apollo-compiler/src/test/graphql/com/example/input_object_variable_and_argument_with_generated_methods/kotlin/responseBased/input_object_variable_and_argument_with_generated_methods/type/Episode.kt.expected b/libraries/apollo-compiler/src/test/graphql/com/example/input_object_variable_and_argument_with_generated_methods/kotlin/responseBased/input_object_variable_and_argument_with_generated_methods/type/Episode.kt.expected index b539206b754..6b697e86b5a 100644 --- a/libraries/apollo-compiler/src/test/graphql/com/example/input_object_variable_and_argument_with_generated_methods/kotlin/responseBased/input_object_variable_and_argument_with_generated_methods/type/Episode.kt.expected +++ b/libraries/apollo-compiler/src/test/graphql/com/example/input_object_variable_and_argument_with_generated_methods/kotlin/responseBased/input_object_variable_and_argument_with_generated_methods/type/Episode.kt.expected @@ -5,7 +5,6 @@ // package com.example.input_object_variable_and_argument_with_generated_methods.type -import com.apollographql.apollo3.annotations.ApolloUnknownEnum import com.apollographql.apollo3.api.EnumType import kotlin.Array import kotlin.Deprecated @@ -77,7 +76,6 @@ public enum class Episode( * Note: unknown values of [rawValue] will return [UNKNOWN__]. You may want to update your * schema instead of calling this function directly. */ - @ApolloUnknownEnum public fun safeValueOf(rawValue: String): Episode = values().find { it.rawValue == rawValue } ?: UNKNOWN__ } diff --git a/libraries/apollo-compiler/src/test/graphql/com/example/input_object_variable_and_argument_with_generated_methods/kotlin/responseBased/input_object_variable_and_argument_with_generated_methods/type/adapter/Episode_ResponseAdapter.kt.expected b/libraries/apollo-compiler/src/test/graphql/com/example/input_object_variable_and_argument_with_generated_methods/kotlin/responseBased/input_object_variable_and_argument_with_generated_methods/type/adapter/Episode_ResponseAdapter.kt.expected index 42be5a07863..9c688f79ee3 100644 --- a/libraries/apollo-compiler/src/test/graphql/com/example/input_object_variable_and_argument_with_generated_methods/kotlin/responseBased/input_object_variable_and_argument_with_generated_methods/type/adapter/Episode_ResponseAdapter.kt.expected +++ b/libraries/apollo-compiler/src/test/graphql/com/example/input_object_variable_and_argument_with_generated_methods/kotlin/responseBased/input_object_variable_and_argument_with_generated_methods/type/adapter/Episode_ResponseAdapter.kt.expected @@ -5,16 +5,13 @@ // package com.example.input_object_variable_and_argument_with_generated_methods.type.adapter -import com.apollographql.apollo3.annotations.ApolloUnknownEnum import com.apollographql.apollo3.api.Adapter 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_with_generated_methods.type.Episode -import kotlin.OptIn public object Episode_ResponseAdapter : Adapter { - @OptIn(ApolloUnknownEnum::class) override fun fromJson(reader: JsonReader, customScalarAdapters: CustomScalarAdapters): Episode { val rawValue = reader.nextString()!! return Episode.safeValueOf(rawValue) diff --git a/libraries/apollo-compiler/src/test/graphql/com/example/introspection_query/kotlin/responseBased/introspection_query/type/__TypeKind.kt.expected b/libraries/apollo-compiler/src/test/graphql/com/example/introspection_query/kotlin/responseBased/introspection_query/type/__TypeKind.kt.expected index 361eeae6ca9..eaa4b0c20de 100644 --- a/libraries/apollo-compiler/src/test/graphql/com/example/introspection_query/kotlin/responseBased/introspection_query/type/__TypeKind.kt.expected +++ b/libraries/apollo-compiler/src/test/graphql/com/example/introspection_query/kotlin/responseBased/introspection_query/type/__TypeKind.kt.expected @@ -5,7 +5,6 @@ // package com.example.introspection_query.type -import com.apollographql.apollo3.annotations.ApolloUnknownEnum import com.apollographql.apollo3.api.EnumType import kotlin.Array import kotlin.Deprecated @@ -61,7 +60,6 @@ public enum class __TypeKind( * Note: unknown values of [rawValue] will return [UNKNOWN__]. You may want to update your * schema instead of calling this function directly. */ - @ApolloUnknownEnum public fun safeValueOf(rawValue: String): __TypeKind = values().find { it.rawValue == rawValue } ?: UNKNOWN__ } 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 d129ee74482..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 @@ -5,16 +5,13 @@ // package com.example.introspection_query.type.adapter -import com.apollographql.apollo3.annotations.ApolloUnknownEnum import com.apollographql.apollo3.api.Adapter 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.OptIn public object __TypeKind_ResponseAdapter : Adapter<__TypeKind> { - @OptIn(ApolloUnknownEnum::class) override fun fromJson(reader: JsonReader, customScalarAdapters: CustomScalarAdapters): __TypeKind { val rawValue = reader.nextString()!! diff --git a/libraries/apollo-compiler/src/test/graphql/com/example/list_field_clash/kotlin/responseBased/list_field_clash/type/AmenityCategory.kt.expected b/libraries/apollo-compiler/src/test/graphql/com/example/list_field_clash/kotlin/responseBased/list_field_clash/type/AmenityCategory.kt.expected index e770ef314a3..d3d26b091b4 100644 --- a/libraries/apollo-compiler/src/test/graphql/com/example/list_field_clash/kotlin/responseBased/list_field_clash/type/AmenityCategory.kt.expected +++ b/libraries/apollo-compiler/src/test/graphql/com/example/list_field_clash/kotlin/responseBased/list_field_clash/type/AmenityCategory.kt.expected @@ -5,7 +5,6 @@ // package com.example.list_field_clash.type -import com.apollographql.apollo3.annotations.ApolloUnknownEnum import com.apollographql.apollo3.api.EnumType import kotlin.Array import kotlin.Deprecated @@ -48,7 +47,6 @@ public enum class AmenityCategory( * Note: unknown values of [rawValue] will return [UNKNOWN__]. You may want to update your * schema instead of calling this function directly. */ - @ApolloUnknownEnum public fun safeValueOf(rawValue: String): AmenityCategory = values().find { it.rawValue == rawValue } ?: UNKNOWN__ } diff --git a/libraries/apollo-compiler/src/test/graphql/com/example/list_field_clash/kotlin/responseBased/list_field_clash/type/adapter/AmenityCategory_ResponseAdapter.kt.expected b/libraries/apollo-compiler/src/test/graphql/com/example/list_field_clash/kotlin/responseBased/list_field_clash/type/adapter/AmenityCategory_ResponseAdapter.kt.expected index 794f3598956..161957161fb 100644 --- a/libraries/apollo-compiler/src/test/graphql/com/example/list_field_clash/kotlin/responseBased/list_field_clash/type/adapter/AmenityCategory_ResponseAdapter.kt.expected +++ b/libraries/apollo-compiler/src/test/graphql/com/example/list_field_clash/kotlin/responseBased/list_field_clash/type/adapter/AmenityCategory_ResponseAdapter.kt.expected @@ -5,16 +5,13 @@ // package com.example.list_field_clash.type.adapter -import com.apollographql.apollo3.annotations.ApolloUnknownEnum import com.apollographql.apollo3.api.Adapter import com.apollographql.apollo3.api.CustomScalarAdapters import com.apollographql.apollo3.api.json.JsonReader import com.apollographql.apollo3.api.json.JsonWriter import com.example.list_field_clash.type.AmenityCategory -import kotlin.OptIn public object AmenityCategory_ResponseAdapter : Adapter { - @OptIn(ApolloUnknownEnum::class) override fun fromJson(reader: JsonReader, customScalarAdapters: CustomScalarAdapters): AmenityCategory { val rawValue = reader.nextString()!! diff --git a/libraries/apollo-compiler/src/test/graphql/com/example/measurements b/libraries/apollo-compiler/src/test/graphql/com/example/measurements index 60eae506a9b..c2dcd19146a 100644 --- a/libraries/apollo-compiler/src/test/graphql/com/example/measurements +++ b/libraries/apollo-compiler/src/test/graphql/com/example/measurements @@ -2,16 +2,16 @@ // If you updated the codegen and test fixtures, you should commit this file too. Test: Total LOC: -aggregate-all 204877 -aggregate-kotlin-responseBased 66062 -aggregate-kotlin-operationBased 42498 +aggregate-all 204708 +aggregate-kotlin-responseBased 65938 +aggregate-kotlin-operationBased 42453 aggregate-kotlin-compat 0 aggregate-java-operationBased 96317 java-operationBased-fragments_with_defer_and_include_directives 5600 kotlin-operationBased-fragments_with_defer_and_include_directives 3488 java-operationBased-data_builders 3031 -kotlin-responseBased-fragment_with_inline_fragment 2432 +kotlin-responseBased-fragment_with_inline_fragment 2427 java-operationBased-mutation_create_review 2421 kotlin-responseBased-data_builders 2355 java-operationBased-fragment_with_inline_fragment 2247 @@ -27,40 +27,40 @@ java-operationBased-root_query_fragment_with_nested_fragments java-operationBased-mutation_create_review_semantic_naming 1595 java-operationBased-simple_fragment 1505 java-operationBased-named_fragment_delegate 1493 -kotlin-responseBased-mutation_create_review 1464 +kotlin-responseBased-mutation_create_review 1459 java-operationBased-named_fragment_with_variables 1405 kotlin-responseBased-named_fragment_delegate 1371 -kotlin-responseBased-unique_type_name 1364 +kotlin-responseBased-unique_type_name 1359 java-operationBased-nested_conditional_inline 1330 -kotlin-operationBased-fragment_with_inline_fragment 1307 java-operationBased-fragment_used_twice 1305 +kotlin-operationBased-fragment_with_inline_fragment 1302 java-operationBased-multiple_fragments 1294 -kotlin-responseBased-input_object_type 1288 kotlin-responseBased-root_query_fragment_with_nested_fragments 1287 +kotlin-responseBased-input_object_type 1283 java-operationBased-nested_field_with_multiple_fieldsets 1271 kotlin-operationBased-nested_named_fragments 1269 -kotlin-responseBased-inline_fragment_intersection 1255 +kotlin-responseBased-inline_fragment_intersection 1250 java-operationBased-two_heroes_with_friends 1241 java-operationBased-inline_fragment_merge_fields 1229 kotlin-responseBased-simple_fragment 1195 java-operationBased-fragments_with_type_condition 1183 java-operationBased-named_fragment_inside_inline_fragment 1172 -kotlin-operationBased-inline_fragment_intersection 1164 +kotlin-operationBased-inline_fragment_intersection 1159 kotlin-responseBased-fragment_used_twice 1157 -kotlin-operationBased-union_inline_fragments 1157 -kotlin-responseBased-union_inline_fragments 1157 java-operationBased-java_jetbrains_annotations 1154 java-operationBased-target_name 1154 +kotlin-operationBased-union_inline_fragments 1152 +kotlin-responseBased-union_inline_fragments 1152 java-operationBased-java_android_annotations 1151 java-operationBased-java_jsr305_annotations 1151 java-operationBased-java_guava_optionals 1135 java-operationBased-java_java_optionals 1135 java-operationBased-java_apollo_optionals 1134 kotlin-operationBased-fragment_spread_with_include_directive 1121 -kotlin-operationBased-unique_type_name 1119 +kotlin-operationBased-unique_type_name 1114 java-operationBased-root_query_inline_fragment 1108 kotlin-responseBased-fragments_with_type_condition 1102 -kotlin-responseBased-nested_conditional_inline 1095 +kotlin-responseBased-nested_conditional_inline 1090 java-operationBased-java_primitive_types 1077 kotlin-responseBased-multiple_fragments 1074 kotlin-responseBased-named_fragment_with_variables 1067 @@ -76,13 +76,13 @@ java-operationBased-decapitalized_fields java-operationBased-simple_union 975 java-operationBased-fragments_same_type_condition 973 kotlin-responseBased-operationbased2_ex8 961 -kotlin-operationBased-nested_conditional_inline 958 +kotlin-operationBased-nested_conditional_inline 953 java-operationBased-deprecated_merged_field 950 java-operationBased-input_object_oneof 943 java-operationBased-used_arguments 941 java-operationBased-not_all_combinations_are_needed 938 -kotlin-responseBased-mutation_create_review_semantic_naming 928 java-operationBased-hero_details 927 +kotlin-responseBased-mutation_create_review_semantic_naming 923 java-operationBased-simple_inline_fragment 919 kotlin-operationBased-named_fragment_with_variables 918 java-operationBased-fieldset_with_multiple_super 915 @@ -97,26 +97,26 @@ kotlin-operationBased-multiple_fragments kotlin-responseBased-nested_field_with_multiple_fieldsets 844 java-operationBased-named_fragment_without_implementation 840 kotlin-operationBased-fragments_with_type_condition 833 -kotlin-responseBased-target_name 827 -kotlin-operationBased-named_fragment_inside_inline_fragment 814 +kotlin-responseBased-target_name 822 kotlin-operationBased-nested_field_with_multiple_fieldsets 814 +kotlin-operationBased-named_fragment_inside_inline_fragment 809 kotlin-responseBased-two_heroes_with_friends 808 java-operationBased-fragment_with_multiple_fieldsets 804 java-operationBased-hero_details_semantic_naming 803 -kotlin-operationBased-root_query_inline_fragment 803 -kotlin-responseBased-inline_fragments_with_friends 800 kotlin-operationBased-inline_fragment_merge_fields 799 -kotlin-operationBased-target_name 799 java-operationBased-operationbased2_ex7 798 -kotlin-responseBased-named_fragment_inside_inline_fragment 795 +kotlin-operationBased-root_query_inline_fragment 798 +kotlin-responseBased-inline_fragments_with_friends 795 +kotlin-operationBased-target_name 794 +kotlin-responseBased-named_fragment_inside_inline_fragment 790 kotlin-responseBased-deprecated_merged_field 786 java-operationBased-suppressed_warnings 783 -kotlin-responseBased-root_query_inline_fragment 779 java-operationBased-path_vs_flat_accessors 776 +kotlin-responseBased-root_query_inline_fragment 774 java-operationBased-reserved_keywords 772 kotlin-responseBased-simple_union 769 java-operationBased-typename_always_first 754 -kotlin-operationBased-inline_fragments_with_friends 749 +kotlin-operationBased-inline_fragments_with_friends 744 kotlin-responseBased-fragments_same_type_condition 738 java-operationBased-interface_on_interface 736 java-operationBased-input_object_variable_and_argument 722 @@ -124,7 +124,7 @@ java-operationBased-input_object_variable_and_argument_with_generated_methods java-operationBased-root_query_fragment 717 kotlin-operationBased-simple_fragment_with_inline_fragments 714 kotlin-operationBased-fragment_spread_with_nested_fields 705 -kotlin-responseBased-input_object_variable_and_argument_with_generated_methods 703 +kotlin-responseBased-input_object_variable_and_argument_with_generated_methods 698 java-operationBased-monomorphic 689 kotlin-operationBased-operationbased2_ex8 685 java-operationBased-interface_always_nested 683 @@ -141,8 +141,8 @@ java-operationBased-capitalized_fields kotlin-operationBased-simple_union 665 java-operationBased-recursive_selection 661 kotlin-responseBased-fragment_with_multiple_fieldsets 659 -kotlin-responseBased-hero_details 657 kotlin-responseBased-test_inline 657 +kotlin-responseBased-hero_details 652 java-operationBased-hero_with_review 652 kotlin-responseBased-named_fragment_without_implementation 651 kotlin-operationBased-used_arguments 651 @@ -160,17 +160,17 @@ kotlin-responseBased-inline_fragment_merge_fields java-operationBased-hero_name_query_long_name 627 kotlin-operationBased-inline_fragment_with_include_directive 627 java-operationBased-hero_name 626 -kotlin-responseBased-introspection_query 625 java-operationBased-variable_default_value 624 kotlin-operationBased-fieldset_with_multiple_super 620 +kotlin-responseBased-introspection_query 620 kotlin-operationBased-simple_inline_fragment 618 kotlin-operationBased-named_fragment_without_implementation 616 kotlin-responseBased-operationbased2_ex7 616 -kotlin-responseBased-input_object_variable_and_argument 614 java-operationBased-java8annotation 614 kotlin-responseBased-not_all_combinations_are_needed 612 kotlin-responseBased-simple_inline_fragment 611 kotlin-responseBased-decapitalized_fields 610 +kotlin-responseBased-input_object_variable_and_argument 609 kotlin-responseBased-fieldset_with_multiple_super 607 java-operationBased-inline_fragment_for_non_optional_field 602 kotlin-responseBased-reserved_keywords 600 @@ -182,10 +182,10 @@ kotlin-operationBased-test_inline java-operationBased-inline_fragment_simple 573 kotlin-operationBased-reserved_keywords 573 java-operationBased-list_field_clash 562 -kotlin-responseBased-hero_with_review 561 kotlin-responseBased-path_vs_flat_accessors 558 -kotlin-responseBased-suppressed_warnings 552 +kotlin-responseBased-hero_with_review 556 kotlin-responseBased-hero_details_semantic_naming 548 +kotlin-responseBased-suppressed_warnings 547 kotlin-operationBased-fragment_with_multiple_fieldsets 543 java-operationBased-starships 543 kotlin-responseBased-root_query_fragment 542 @@ -198,22 +198,22 @@ kotlin-operationBased-typename_always_first kotlin-operationBased-path_vs_flat_accessors 527 java-operationBased-antlr_tokens 526 java-operationBased-subscriptions 525 -kotlin-responseBased-hero_name_query_long_name 524 +kotlin-responseBased-hero_name_query_long_name 519 kotlin-operationBased-interface_on_interface 515 kotlin-responseBased-hero_name 512 kotlin-responseBased-interface_always_nested 502 -kotlin-responseBased-variable_default_value 498 kotlin-responseBased-custom_scalar_type 497 -kotlin-responseBased-deprecation 493 +kotlin-responseBased-variable_default_value 493 kotlin-operationBased-root_query_fragment 491 -kotlin-responseBased-enum_field 489 +kotlin-responseBased-deprecation 488 +kotlin-responseBased-enum_field 479 java-operationBased-merged_include 478 java-operationBased-operation_id_generator 478 kotlin-responseBased-inline_fragment_for_non_optional_field 477 kotlin-operationBased-monomorphic 475 kotlin-responseBased-monomorphic 475 kotlin-operationBased-interface_always_nested 474 -kotlin-responseBased-optional 470 +kotlin-responseBased-optional 465 java-operationBased-nonnull 457 kotlin-operationBased-hero_name 455 kotlin-operationBased-capitalized_fields 454 @@ -227,7 +227,7 @@ kotlin-responseBased-recursive_selection kotlin-operationBased-inline_fragment_for_non_optional_field 434 kotlin-responseBased-inline_fragment_simple 433 kotlin-responseBased-arguments_hardcoded 429 -kotlin-responseBased-list_field_clash 428 +kotlin-responseBased-list_field_clash 423 kotlin-responseBased-two_heroes_unique 419 kotlin-responseBased-capitalized_fields 416 kotlin-operationBased-inline_fragment_type_coercion 413 @@ -236,8 +236,8 @@ kotlin-responseBased-starships kotlin-responseBased-java8annotation 403 kotlin-responseBased-antlr_tokens 398 kotlin-responseBased-subscriptions 391 -kotlin-responseBased-enums_as_sealed 371 -kotlin-responseBased-case_sensitive_enum 352 +kotlin-responseBased-enums_as_sealed 377 +kotlin-responseBased-case_sensitive_enum 347 kotlin-responseBased-operation_id_generator 346 kotlin-responseBased-big_query 344 kotlin-responseBased-merged_include 344 diff --git a/libraries/apollo-compiler/src/test/graphql/com/example/mutation_create_review/kotlin/responseBased/mutation_create_review/type/Episode.kt.expected b/libraries/apollo-compiler/src/test/graphql/com/example/mutation_create_review/kotlin/responseBased/mutation_create_review/type/Episode.kt.expected index 22eb0a37a5f..7f31bf51849 100644 --- a/libraries/apollo-compiler/src/test/graphql/com/example/mutation_create_review/kotlin/responseBased/mutation_create_review/type/Episode.kt.expected +++ b/libraries/apollo-compiler/src/test/graphql/com/example/mutation_create_review/kotlin/responseBased/mutation_create_review/type/Episode.kt.expected @@ -5,7 +5,6 @@ // package com.example.mutation_create_review.type -import com.apollographql.apollo3.annotations.ApolloUnknownEnum import com.apollographql.apollo3.api.EnumType import kotlin.Array import kotlin.Deprecated @@ -77,7 +76,6 @@ internal enum class Episode( * Note: unknown values of [rawValue] will return [UNKNOWN__]. You may want to update your * schema instead of calling this function directly. */ - @ApolloUnknownEnum public fun safeValueOf(rawValue: String): Episode = values().find { it.rawValue == rawValue } ?: UNKNOWN__ } 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 063c66af47b..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 @@ -5,16 +5,13 @@ // package com.example.mutation_create_review.type.adapter -import com.apollographql.apollo3.annotations.ApolloUnknownEnum import com.apollographql.apollo3.api.Adapter 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.OptIn internal object Episode_ResponseAdapter : Adapter { - @OptIn(ApolloUnknownEnum::class) override fun fromJson(reader: JsonReader, customScalarAdapters: CustomScalarAdapters): Episode { val rawValue = reader.nextString()!! return Episode.safeValueOf(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/Episode.kt.expected b/libraries/apollo-compiler/src/test/graphql/com/example/mutation_create_review_semantic_naming/kotlin/responseBased/mutation_create_review_semantic_naming/type/Episode.kt.expected index 2f51c17f141..635cb849fb9 100644 --- a/libraries/apollo-compiler/src/test/graphql/com/example/mutation_create_review_semantic_naming/kotlin/responseBased/mutation_create_review_semantic_naming/type/Episode.kt.expected +++ b/libraries/apollo-compiler/src/test/graphql/com/example/mutation_create_review_semantic_naming/kotlin/responseBased/mutation_create_review_semantic_naming/type/Episode.kt.expected @@ -5,7 +5,6 @@ // package com.example.mutation_create_review_semantic_naming.type -import com.apollographql.apollo3.annotations.ApolloUnknownEnum import com.apollographql.apollo3.api.EnumType import kotlin.Array import kotlin.Deprecated @@ -77,7 +76,6 @@ public enum class Episode( * Note: unknown values of [rawValue] will return [UNKNOWN__]. You may want to update your * schema instead of calling this function directly. */ - @ApolloUnknownEnum public fun safeValueOf(rawValue: String): Episode = values().find { it.rawValue == rawValue } ?: UNKNOWN__ } 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 309602bcd26..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 @@ -5,16 +5,13 @@ // package com.example.mutation_create_review_semantic_naming.type.adapter -import com.apollographql.apollo3.annotations.ApolloUnknownEnum import com.apollographql.apollo3.api.Adapter 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.OptIn public object Episode_ResponseAdapter : Adapter { - @OptIn(ApolloUnknownEnum::class) override fun fromJson(reader: JsonReader, customScalarAdapters: CustomScalarAdapters): Episode { val rawValue = reader.nextString()!! return Episode.safeValueOf(rawValue) diff --git a/libraries/apollo-compiler/src/test/graphql/com/example/named_fragment_inside_inline_fragment/kotlin/operationBased/named_fragment_inside_inline_fragment/type/Episode.kt.expected b/libraries/apollo-compiler/src/test/graphql/com/example/named_fragment_inside_inline_fragment/kotlin/operationBased/named_fragment_inside_inline_fragment/type/Episode.kt.expected index 80fab72b587..a7cd53c9b50 100644 --- a/libraries/apollo-compiler/src/test/graphql/com/example/named_fragment_inside_inline_fragment/kotlin/operationBased/named_fragment_inside_inline_fragment/type/Episode.kt.expected +++ b/libraries/apollo-compiler/src/test/graphql/com/example/named_fragment_inside_inline_fragment/kotlin/operationBased/named_fragment_inside_inline_fragment/type/Episode.kt.expected @@ -5,7 +5,6 @@ // package com.example.named_fragment_inside_inline_fragment.type -import com.apollographql.apollo3.annotations.ApolloUnknownEnum import com.apollographql.apollo3.api.EnumType import kotlin.Array import kotlin.Deprecated @@ -77,7 +76,6 @@ public enum class Episode( * Note: unknown values of [rawValue] will return [UNKNOWN__]. You may want to update your * schema instead of calling this function directly. */ - @ApolloUnknownEnum public fun safeValueOf(rawValue: String): Episode = values().find { it.rawValue == rawValue } ?: UNKNOWN__ } 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 7560db47e4f..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 @@ -5,16 +5,13 @@ // package com.example.named_fragment_inside_inline_fragment.type.adapter -import com.apollographql.apollo3.annotations.ApolloUnknownEnum import com.apollographql.apollo3.api.Adapter 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.OptIn public object Episode_ResponseAdapter : Adapter { - @OptIn(ApolloUnknownEnum::class) override fun fromJson(reader: JsonReader, customScalarAdapters: CustomScalarAdapters): Episode { val rawValue = reader.nextString()!! return Episode.safeValueOf(rawValue) diff --git a/libraries/apollo-compiler/src/test/graphql/com/example/named_fragment_inside_inline_fragment/kotlin/responseBased/named_fragment_inside_inline_fragment/type/Episode.kt.expected b/libraries/apollo-compiler/src/test/graphql/com/example/named_fragment_inside_inline_fragment/kotlin/responseBased/named_fragment_inside_inline_fragment/type/Episode.kt.expected index 80fab72b587..a7cd53c9b50 100644 --- a/libraries/apollo-compiler/src/test/graphql/com/example/named_fragment_inside_inline_fragment/kotlin/responseBased/named_fragment_inside_inline_fragment/type/Episode.kt.expected +++ b/libraries/apollo-compiler/src/test/graphql/com/example/named_fragment_inside_inline_fragment/kotlin/responseBased/named_fragment_inside_inline_fragment/type/Episode.kt.expected @@ -5,7 +5,6 @@ // package com.example.named_fragment_inside_inline_fragment.type -import com.apollographql.apollo3.annotations.ApolloUnknownEnum import com.apollographql.apollo3.api.EnumType import kotlin.Array import kotlin.Deprecated @@ -77,7 +76,6 @@ public enum class Episode( * Note: unknown values of [rawValue] will return [UNKNOWN__]. You may want to update your * schema instead of calling this function directly. */ - @ApolloUnknownEnum public fun safeValueOf(rawValue: String): Episode = values().find { it.rawValue == rawValue } ?: UNKNOWN__ } 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 7560db47e4f..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 @@ -5,16 +5,13 @@ // package com.example.named_fragment_inside_inline_fragment.type.adapter -import com.apollographql.apollo3.annotations.ApolloUnknownEnum import com.apollographql.apollo3.api.Adapter 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.OptIn public object Episode_ResponseAdapter : Adapter { - @OptIn(ApolloUnknownEnum::class) override fun fromJson(reader: JsonReader, customScalarAdapters: CustomScalarAdapters): Episode { val rawValue = reader.nextString()!! return Episode.safeValueOf(rawValue) diff --git a/libraries/apollo-compiler/src/test/graphql/com/example/nested_conditional_inline/kotlin/operationBased/nested_conditional_inline/type/Episode.kt.expected b/libraries/apollo-compiler/src/test/graphql/com/example/nested_conditional_inline/kotlin/operationBased/nested_conditional_inline/type/Episode.kt.expected index 268ab941f2c..ccca391cf02 100644 --- a/libraries/apollo-compiler/src/test/graphql/com/example/nested_conditional_inline/kotlin/operationBased/nested_conditional_inline/type/Episode.kt.expected +++ b/libraries/apollo-compiler/src/test/graphql/com/example/nested_conditional_inline/kotlin/operationBased/nested_conditional_inline/type/Episode.kt.expected @@ -5,7 +5,6 @@ // package com.example.nested_conditional_inline.type -import com.apollographql.apollo3.annotations.ApolloUnknownEnum import com.apollographql.apollo3.api.EnumType import kotlin.Array import kotlin.Deprecated @@ -77,7 +76,6 @@ public enum class Episode( * Note: unknown values of [rawValue] will return [UNKNOWN__]. You may want to update your * schema instead of calling this function directly. */ - @ApolloUnknownEnum public fun safeValueOf(rawValue: String): Episode = values().find { it.rawValue == rawValue } ?: UNKNOWN__ } 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 1866b57e279..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 @@ -5,16 +5,13 @@ // package com.example.nested_conditional_inline.type.adapter -import com.apollographql.apollo3.annotations.ApolloUnknownEnum import com.apollographql.apollo3.api.Adapter 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.OptIn public object Episode_ResponseAdapter : Adapter { - @OptIn(ApolloUnknownEnum::class) override fun fromJson(reader: JsonReader, customScalarAdapters: CustomScalarAdapters): Episode { val rawValue = reader.nextString()!! return Episode.safeValueOf(rawValue) diff --git a/libraries/apollo-compiler/src/test/graphql/com/example/nested_conditional_inline/kotlin/responseBased/nested_conditional_inline/type/Episode.kt.expected b/libraries/apollo-compiler/src/test/graphql/com/example/nested_conditional_inline/kotlin/responseBased/nested_conditional_inline/type/Episode.kt.expected index 268ab941f2c..ccca391cf02 100644 --- a/libraries/apollo-compiler/src/test/graphql/com/example/nested_conditional_inline/kotlin/responseBased/nested_conditional_inline/type/Episode.kt.expected +++ b/libraries/apollo-compiler/src/test/graphql/com/example/nested_conditional_inline/kotlin/responseBased/nested_conditional_inline/type/Episode.kt.expected @@ -5,7 +5,6 @@ // package com.example.nested_conditional_inline.type -import com.apollographql.apollo3.annotations.ApolloUnknownEnum import com.apollographql.apollo3.api.EnumType import kotlin.Array import kotlin.Deprecated @@ -77,7 +76,6 @@ public enum class Episode( * Note: unknown values of [rawValue] will return [UNKNOWN__]. You may want to update your * schema instead of calling this function directly. */ - @ApolloUnknownEnum public fun safeValueOf(rawValue: String): Episode = values().find { it.rawValue == rawValue } ?: UNKNOWN__ } 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 1866b57e279..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 @@ -5,16 +5,13 @@ // package com.example.nested_conditional_inline.type.adapter -import com.apollographql.apollo3.annotations.ApolloUnknownEnum import com.apollographql.apollo3.api.Adapter 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.OptIn public object Episode_ResponseAdapter : Adapter { - @OptIn(ApolloUnknownEnum::class) override fun fromJson(reader: JsonReader, customScalarAdapters: CustomScalarAdapters): Episode { val rawValue = reader.nextString()!! return Episode.safeValueOf(rawValue) diff --git a/libraries/apollo-compiler/src/test/graphql/com/example/optional/kotlin/responseBased/optional/type/Episode.kt.expected b/libraries/apollo-compiler/src/test/graphql/com/example/optional/kotlin/responseBased/optional/type/Episode.kt.expected index 1f8cf7292ba..d8e23dc27a9 100644 --- a/libraries/apollo-compiler/src/test/graphql/com/example/optional/kotlin/responseBased/optional/type/Episode.kt.expected +++ b/libraries/apollo-compiler/src/test/graphql/com/example/optional/kotlin/responseBased/optional/type/Episode.kt.expected @@ -5,7 +5,6 @@ // package com.example.optional.type -import com.apollographql.apollo3.annotations.ApolloUnknownEnum import com.apollographql.apollo3.api.EnumType import kotlin.Array import kotlin.Deprecated @@ -77,7 +76,6 @@ public enum class Episode( * Note: unknown values of [rawValue] will return [UNKNOWN__]. You may want to update your * schema instead of calling this function directly. */ - @ApolloUnknownEnum public fun safeValueOf(rawValue: String): Episode = values().find { it.rawValue == rawValue } ?: UNKNOWN__ } 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 c529a97ed9c..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 @@ -5,16 +5,13 @@ // package com.example.optional.type.adapter -import com.apollographql.apollo3.annotations.ApolloUnknownEnum import com.apollographql.apollo3.api.Adapter 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.OptIn public object Episode_ResponseAdapter : Adapter { - @OptIn(ApolloUnknownEnum::class) override fun fromJson(reader: JsonReader, customScalarAdapters: CustomScalarAdapters): Episode { val rawValue = reader.nextString()!! return Episode.safeValueOf(rawValue) diff --git a/libraries/apollo-compiler/src/test/graphql/com/example/root_query_inline_fragment/kotlin/operationBased/root_query_inline_fragment/type/Episode.kt.expected b/libraries/apollo-compiler/src/test/graphql/com/example/root_query_inline_fragment/kotlin/operationBased/root_query_inline_fragment/type/Episode.kt.expected index e2bdb228ddb..caf879bf6dd 100644 --- a/libraries/apollo-compiler/src/test/graphql/com/example/root_query_inline_fragment/kotlin/operationBased/root_query_inline_fragment/type/Episode.kt.expected +++ b/libraries/apollo-compiler/src/test/graphql/com/example/root_query_inline_fragment/kotlin/operationBased/root_query_inline_fragment/type/Episode.kt.expected @@ -5,7 +5,6 @@ // package com.example.root_query_inline_fragment.type -import com.apollographql.apollo3.annotations.ApolloUnknownEnum import com.apollographql.apollo3.api.EnumType import kotlin.Array import kotlin.Deprecated @@ -77,7 +76,6 @@ public enum class Episode( * Note: unknown values of [rawValue] will return [UNKNOWN__]. You may want to update your * schema instead of calling this function directly. */ - @ApolloUnknownEnum public fun safeValueOf(rawValue: String): Episode = values().find { it.rawValue == rawValue } ?: UNKNOWN__ } 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 1a7a13f22fd..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 @@ -5,16 +5,13 @@ // package com.example.root_query_inline_fragment.type.adapter -import com.apollographql.apollo3.annotations.ApolloUnknownEnum import com.apollographql.apollo3.api.Adapter 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.OptIn public object Episode_ResponseAdapter : Adapter { - @OptIn(ApolloUnknownEnum::class) override fun fromJson(reader: JsonReader, customScalarAdapters: CustomScalarAdapters): Episode { val rawValue = reader.nextString()!! return Episode.safeValueOf(rawValue) diff --git a/libraries/apollo-compiler/src/test/graphql/com/example/root_query_inline_fragment/kotlin/responseBased/root_query_inline_fragment/type/Episode.kt.expected b/libraries/apollo-compiler/src/test/graphql/com/example/root_query_inline_fragment/kotlin/responseBased/root_query_inline_fragment/type/Episode.kt.expected index e2bdb228ddb..caf879bf6dd 100644 --- a/libraries/apollo-compiler/src/test/graphql/com/example/root_query_inline_fragment/kotlin/responseBased/root_query_inline_fragment/type/Episode.kt.expected +++ b/libraries/apollo-compiler/src/test/graphql/com/example/root_query_inline_fragment/kotlin/responseBased/root_query_inline_fragment/type/Episode.kt.expected @@ -5,7 +5,6 @@ // package com.example.root_query_inline_fragment.type -import com.apollographql.apollo3.annotations.ApolloUnknownEnum import com.apollographql.apollo3.api.EnumType import kotlin.Array import kotlin.Deprecated @@ -77,7 +76,6 @@ public enum class Episode( * Note: unknown values of [rawValue] will return [UNKNOWN__]. You may want to update your * schema instead of calling this function directly. */ - @ApolloUnknownEnum public fun safeValueOf(rawValue: String): Episode = values().find { it.rawValue == rawValue } ?: UNKNOWN__ } 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 1a7a13f22fd..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 @@ -5,16 +5,13 @@ // package com.example.root_query_inline_fragment.type.adapter -import com.apollographql.apollo3.annotations.ApolloUnknownEnum import com.apollographql.apollo3.api.Adapter 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.OptIn public object Episode_ResponseAdapter : Adapter { - @OptIn(ApolloUnknownEnum::class) override fun fromJson(reader: JsonReader, customScalarAdapters: CustomScalarAdapters): Episode { val rawValue = reader.nextString()!! return Episode.safeValueOf(rawValue) diff --git a/libraries/apollo-compiler/src/test/graphql/com/example/suppressed_warnings/kotlin/responseBased/suppressed_warnings/type/Direction.kt.expected b/libraries/apollo-compiler/src/test/graphql/com/example/suppressed_warnings/kotlin/responseBased/suppressed_warnings/type/Direction.kt.expected index d433a794dce..01eb9589f49 100644 --- a/libraries/apollo-compiler/src/test/graphql/com/example/suppressed_warnings/kotlin/responseBased/suppressed_warnings/type/Direction.kt.expected +++ b/libraries/apollo-compiler/src/test/graphql/com/example/suppressed_warnings/kotlin/responseBased/suppressed_warnings/type/Direction.kt.expected @@ -6,7 +6,6 @@ package com.example.suppressed_warnings.type import com.apollographql.apollo3.annotations.ApolloRequiresOptIn -import com.apollographql.apollo3.annotations.ApolloUnknownEnum import com.apollographql.apollo3.api.EnumType import kotlin.Array import kotlin.Deprecated @@ -57,7 +56,6 @@ public enum class Direction( * Note: unknown values of [rawValue] will return [UNKNOWN__]. You may want to update your * schema instead of calling this function directly. */ - @ApolloUnknownEnum public fun safeValueOf(rawValue: String): Direction = values().find { it.rawValue == rawValue } ?: UNKNOWN__ } 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 91e6fc18e64..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 @@ -5,16 +5,13 @@ // package com.example.suppressed_warnings.type.adapter -import com.apollographql.apollo3.annotations.ApolloUnknownEnum import com.apollographql.apollo3.api.Adapter 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.OptIn public object Direction_ResponseAdapter : Adapter { - @OptIn(ApolloUnknownEnum::class) override fun fromJson(reader: JsonReader, customScalarAdapters: CustomScalarAdapters): Direction { val rawValue = reader.nextString()!! return Direction.safeValueOf(rawValue) 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 f39971b1e6b..dceaf7f9222 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 @@ -5,16 +5,13 @@ // package com.example.target_name.type.adapter -import com.apollographql.apollo3.annotations.ApolloUnknownEnum import com.apollographql.apollo3.api.Adapter 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.OptIn public object RenamedEnum_ResponseAdapter : Adapter { - @OptIn(ApolloUnknownEnum::class) override fun fromJson(reader: JsonReader, customScalarAdapters: CustomScalarAdapters): RenamedEnum { val rawValue = reader.nextString()!! diff --git a/libraries/apollo-compiler/src/test/graphql/com/example/target_name/kotlin/operationBased/target_name/type/renamedEnum.kt.expected b/libraries/apollo-compiler/src/test/graphql/com/example/target_name/kotlin/operationBased/target_name/type/renamedEnum.kt.expected index e2f345cd9fd..b54cae02646 100644 --- a/libraries/apollo-compiler/src/test/graphql/com/example/target_name/kotlin/operationBased/target_name/type/renamedEnum.kt.expected +++ b/libraries/apollo-compiler/src/test/graphql/com/example/target_name/kotlin/operationBased/target_name/type/renamedEnum.kt.expected @@ -5,7 +5,6 @@ // package com.example.target_name.type -import com.apollographql.apollo3.annotations.ApolloUnknownEnum import com.apollographql.apollo3.api.EnumType import kotlin.Array import kotlin.Deprecated @@ -46,7 +45,6 @@ public enum class RenamedEnum( * Note: unknown values of [rawValue] will return [UNKNOWN__]. You may want to update your * schema instead of calling this function directly. */ - @ApolloUnknownEnum public fun safeValueOf(rawValue: String): RenamedEnum = values().find { it.rawValue == rawValue } ?: UNKNOWN__ } 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 f39971b1e6b..dceaf7f9222 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 @@ -5,16 +5,13 @@ // package com.example.target_name.type.adapter -import com.apollographql.apollo3.annotations.ApolloUnknownEnum import com.apollographql.apollo3.api.Adapter 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.OptIn public object RenamedEnum_ResponseAdapter : Adapter { - @OptIn(ApolloUnknownEnum::class) override fun fromJson(reader: JsonReader, customScalarAdapters: CustomScalarAdapters): RenamedEnum { val rawValue = reader.nextString()!! diff --git a/libraries/apollo-compiler/src/test/graphql/com/example/target_name/kotlin/responseBased/target_name/type/renamedEnum.kt.expected b/libraries/apollo-compiler/src/test/graphql/com/example/target_name/kotlin/responseBased/target_name/type/renamedEnum.kt.expected index e2f345cd9fd..b54cae02646 100644 --- a/libraries/apollo-compiler/src/test/graphql/com/example/target_name/kotlin/responseBased/target_name/type/renamedEnum.kt.expected +++ b/libraries/apollo-compiler/src/test/graphql/com/example/target_name/kotlin/responseBased/target_name/type/renamedEnum.kt.expected @@ -5,7 +5,6 @@ // package com.example.target_name.type -import com.apollographql.apollo3.annotations.ApolloUnknownEnum import com.apollographql.apollo3.api.EnumType import kotlin.Array import kotlin.Deprecated @@ -46,7 +45,6 @@ public enum class RenamedEnum( * Note: unknown values of [rawValue] will return [UNKNOWN__]. You may want to update your * schema instead of calling this function directly. */ - @ApolloUnknownEnum public fun safeValueOf(rawValue: String): RenamedEnum = values().find { it.rawValue == rawValue } ?: UNKNOWN__ } diff --git a/libraries/apollo-compiler/src/test/graphql/com/example/union_inline_fragments/kotlin/operationBased/union_inline_fragments/type/Episode.kt.expected b/libraries/apollo-compiler/src/test/graphql/com/example/union_inline_fragments/kotlin/operationBased/union_inline_fragments/type/Episode.kt.expected index 9382db946ee..19ebdf4be6b 100644 --- a/libraries/apollo-compiler/src/test/graphql/com/example/union_inline_fragments/kotlin/operationBased/union_inline_fragments/type/Episode.kt.expected +++ b/libraries/apollo-compiler/src/test/graphql/com/example/union_inline_fragments/kotlin/operationBased/union_inline_fragments/type/Episode.kt.expected @@ -5,7 +5,6 @@ // package com.example.union_inline_fragments.type -import com.apollographql.apollo3.annotations.ApolloUnknownEnum import com.apollographql.apollo3.api.EnumType import kotlin.Array import kotlin.Deprecated @@ -77,7 +76,6 @@ public enum class Episode( * Note: unknown values of [rawValue] will return [UNKNOWN__]. You may want to update your * schema instead of calling this function directly. */ - @ApolloUnknownEnum public fun safeValueOf(rawValue: String): Episode = values().find { it.rawValue == rawValue } ?: UNKNOWN__ } 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 c0ad49d612c..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 @@ -5,16 +5,13 @@ // package com.example.union_inline_fragments.type.adapter -import com.apollographql.apollo3.annotations.ApolloUnknownEnum import com.apollographql.apollo3.api.Adapter 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.OptIn public object Episode_ResponseAdapter : Adapter { - @OptIn(ApolloUnknownEnum::class) override fun fromJson(reader: JsonReader, customScalarAdapters: CustomScalarAdapters): Episode { val rawValue = reader.nextString()!! return Episode.safeValueOf(rawValue) diff --git a/libraries/apollo-compiler/src/test/graphql/com/example/union_inline_fragments/kotlin/responseBased/union_inline_fragments/type/Episode.kt.expected b/libraries/apollo-compiler/src/test/graphql/com/example/union_inline_fragments/kotlin/responseBased/union_inline_fragments/type/Episode.kt.expected index 9382db946ee..19ebdf4be6b 100644 --- a/libraries/apollo-compiler/src/test/graphql/com/example/union_inline_fragments/kotlin/responseBased/union_inline_fragments/type/Episode.kt.expected +++ b/libraries/apollo-compiler/src/test/graphql/com/example/union_inline_fragments/kotlin/responseBased/union_inline_fragments/type/Episode.kt.expected @@ -5,7 +5,6 @@ // package com.example.union_inline_fragments.type -import com.apollographql.apollo3.annotations.ApolloUnknownEnum import com.apollographql.apollo3.api.EnumType import kotlin.Array import kotlin.Deprecated @@ -77,7 +76,6 @@ public enum class Episode( * Note: unknown values of [rawValue] will return [UNKNOWN__]. You may want to update your * schema instead of calling this function directly. */ - @ApolloUnknownEnum public fun safeValueOf(rawValue: String): Episode = values().find { it.rawValue == rawValue } ?: UNKNOWN__ } 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 c0ad49d612c..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 @@ -5,16 +5,13 @@ // package com.example.union_inline_fragments.type.adapter -import com.apollographql.apollo3.annotations.ApolloUnknownEnum import com.apollographql.apollo3.api.Adapter 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.OptIn public object Episode_ResponseAdapter : Adapter { - @OptIn(ApolloUnknownEnum::class) override fun fromJson(reader: JsonReader, customScalarAdapters: CustomScalarAdapters): Episode { val rawValue = reader.nextString()!! return Episode.safeValueOf(rawValue) diff --git a/libraries/apollo-compiler/src/test/graphql/com/example/unique_type_name/kotlin/operationBased/unique_type_name/type/Episode.kt.expected b/libraries/apollo-compiler/src/test/graphql/com/example/unique_type_name/kotlin/operationBased/unique_type_name/type/Episode.kt.expected index 61030563d67..95f92c82d37 100644 --- a/libraries/apollo-compiler/src/test/graphql/com/example/unique_type_name/kotlin/operationBased/unique_type_name/type/Episode.kt.expected +++ b/libraries/apollo-compiler/src/test/graphql/com/example/unique_type_name/kotlin/operationBased/unique_type_name/type/Episode.kt.expected @@ -5,7 +5,6 @@ // package com.example.unique_type_name.type -import com.apollographql.apollo3.annotations.ApolloUnknownEnum import com.apollographql.apollo3.api.EnumType import kotlin.Array import kotlin.Deprecated @@ -77,7 +76,6 @@ public enum class Episode( * Note: unknown values of [rawValue] will return [UNKNOWN__]. You may want to update your * schema instead of calling this function directly. */ - @ApolloUnknownEnum public fun safeValueOf(rawValue: String): Episode = values().find { it.rawValue == rawValue } ?: UNKNOWN__ } 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 8e1c9ca77f5..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 @@ -5,16 +5,13 @@ // package com.example.unique_type_name.type.adapter -import com.apollographql.apollo3.annotations.ApolloUnknownEnum import com.apollographql.apollo3.api.Adapter 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.OptIn public object Episode_ResponseAdapter : Adapter { - @OptIn(ApolloUnknownEnum::class) override fun fromJson(reader: JsonReader, customScalarAdapters: CustomScalarAdapters): Episode { val rawValue = reader.nextString()!! return Episode.safeValueOf(rawValue) diff --git a/libraries/apollo-compiler/src/test/graphql/com/example/unique_type_name/kotlin/responseBased/unique_type_name/type/Episode.kt.expected b/libraries/apollo-compiler/src/test/graphql/com/example/unique_type_name/kotlin/responseBased/unique_type_name/type/Episode.kt.expected index 61030563d67..95f92c82d37 100644 --- a/libraries/apollo-compiler/src/test/graphql/com/example/unique_type_name/kotlin/responseBased/unique_type_name/type/Episode.kt.expected +++ b/libraries/apollo-compiler/src/test/graphql/com/example/unique_type_name/kotlin/responseBased/unique_type_name/type/Episode.kt.expected @@ -5,7 +5,6 @@ // package com.example.unique_type_name.type -import com.apollographql.apollo3.annotations.ApolloUnknownEnum import com.apollographql.apollo3.api.EnumType import kotlin.Array import kotlin.Deprecated @@ -77,7 +76,6 @@ public enum class Episode( * Note: unknown values of [rawValue] will return [UNKNOWN__]. You may want to update your * schema instead of calling this function directly. */ - @ApolloUnknownEnum public fun safeValueOf(rawValue: String): Episode = values().find { it.rawValue == rawValue } ?: UNKNOWN__ } 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 8e1c9ca77f5..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 @@ -5,16 +5,13 @@ // package com.example.unique_type_name.type.adapter -import com.apollographql.apollo3.annotations.ApolloUnknownEnum import com.apollographql.apollo3.api.Adapter 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.OptIn public object Episode_ResponseAdapter : Adapter { - @OptIn(ApolloUnknownEnum::class) override fun fromJson(reader: JsonReader, customScalarAdapters: CustomScalarAdapters): Episode { val rawValue = reader.nextString()!! return Episode.safeValueOf(rawValue) diff --git a/libraries/apollo-compiler/src/test/graphql/com/example/variable_default_value/kotlin/responseBased/variable_default_value/type/Episode.kt.expected b/libraries/apollo-compiler/src/test/graphql/com/example/variable_default_value/kotlin/responseBased/variable_default_value/type/Episode.kt.expected index 7059dd63cc6..cbdebe68c53 100644 --- a/libraries/apollo-compiler/src/test/graphql/com/example/variable_default_value/kotlin/responseBased/variable_default_value/type/Episode.kt.expected +++ b/libraries/apollo-compiler/src/test/graphql/com/example/variable_default_value/kotlin/responseBased/variable_default_value/type/Episode.kt.expected @@ -5,7 +5,6 @@ // package com.example.variable_default_value.type -import com.apollographql.apollo3.annotations.ApolloUnknownEnum import com.apollographql.apollo3.api.EnumType import kotlin.Array import kotlin.Deprecated @@ -77,7 +76,6 @@ public enum class Episode( * Note: unknown values of [rawValue] will return [UNKNOWN__]. You may want to update your * schema instead of calling this function directly. */ - @ApolloUnknownEnum public fun safeValueOf(rawValue: String): Episode = values().find { it.rawValue == rawValue } ?: UNKNOWN__ } 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 ea73e5b091e..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 @@ -5,16 +5,13 @@ // package com.example.variable_default_value.type.adapter -import com.apollographql.apollo3.annotations.ApolloUnknownEnum import com.apollographql.apollo3.api.Adapter 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.OptIn public object Episode_ResponseAdapter : Adapter { - @OptIn(ApolloUnknownEnum::class) override fun fromJson(reader: JsonReader, customScalarAdapters: CustomScalarAdapters): Episode { val rawValue = reader.nextString()!! return Episode.safeValueOf(rawValue) diff --git a/tests/enums/src/test/kotlin/test/EnumsTest.kt b/tests/enums/src/test/kotlin/test/EnumsTest.kt index 061c3eb6bbe..7c1077da4f2 100644 --- a/tests/enums/src/test/kotlin/test/EnumsTest.kt +++ b/tests/enums/src/test/kotlin/test/EnumsTest.kt @@ -1,6 +1,5 @@ package test -import com.apollographql.apollo3.annotations.ApolloUnknownEnum import enums.kotlin15.type.Direction import enums.kotlin15.type.Foo import enums.kotlin15.type.FooEnum @@ -14,7 +13,6 @@ import kotlin.test.assertNotEquals class EnumsTest { @Test - @OptIn(ApolloUnknownEnum::class) fun kotlinEnums() { assertEquals(Direction.NORTH, Direction.safeValueOf("NORTH")) @Suppress("DEPRECATION") @@ -28,17 +26,15 @@ class EnumsTest { @Test fun kotlin19Enums() { - @OptIn(ApolloUnknownEnum::class) assertEquals(enums.kotlin19.type.Direction.safeValueOf("NORTH"), enums.kotlin19.type.Direction.NORTH) } @Test - @OptIn(ApolloUnknownEnum::class) fun kotlinSealedClasses() { assertEquals(Gravity.TOP, Gravity.safeValueOf("TOP")) @Suppress("DEPRECATION") assertEquals(Gravity.top2, Gravity.safeValueOf("top2")) - assertEquals(Gravity.UNKNOWN__("newGravity"), Gravity.safeValueOf("newGravity")) + assertIs(Gravity.safeValueOf("newGravity")) assertEquals(Gravity.name, Gravity.safeValueOf("name")) assertEquals(Gravity.ordinal, Gravity.safeValueOf("ordinal")) assertEquals(Gravity.type__, Gravity.safeValueOf("type")) @@ -89,7 +85,6 @@ class EnumsTest { } @Test - @OptIn(ApolloUnknownEnum::class) fun type() { assertEquals(Direction.type__, Direction.safeValueOf("type")) assertEquals(Gravity.type__, Gravity.safeValueOf("type")) diff --git a/tests/integration-tests/src/commonTest/kotlin/test/EnumTest.kt b/tests/integration-tests/src/commonTest/kotlin/test/EnumTest.kt index e3cefc44348..e9c203c2103 100644 --- a/tests/integration-tests/src/commonTest/kotlin/test/EnumTest.kt +++ b/tests/integration-tests/src/commonTest/kotlin/test/EnumTest.kt @@ -3,11 +3,12 @@ package test import com.apollographql.apollo3.integration.normalizer.type.Episode import kotlin.test.Test import kotlin.test.assertEquals +import kotlin.test.assertIs class EnumTest { @Test fun safeValueOf() { assertEquals(Episode.EMPIRE, Episode.safeValueOf("EMPIRE")) - assertEquals(Episode.UNKNOWN__::class, Episode.safeValueOf("NEW_EPISODE")::class) + assertIs(Episode.safeValueOf("NEW_EPISODE")) } }