diff --git a/libraries/apollo-api/api/apollo-api.api b/libraries/apollo-api/api/apollo-api.api index decbf1509df..0cc84f52663 100644 --- a/libraries/apollo-api/api/apollo-api.api +++ b/libraries/apollo-api/api/apollo-api.api @@ -270,16 +270,17 @@ public abstract interface class com/apollographql/apollo3/api/BuilderScope { } public final class com/apollographql/apollo3/api/CompiledArgument { - public synthetic fun (Ljava/lang/String;Ljava/lang/Object;ZZLkotlin/jvm/internal/DefaultConstructorMarker;)V + public synthetic fun (Ljava/lang/String;Lcom/apollographql/apollo3/api/Optional;ZZLkotlin/jvm/internal/DefaultConstructorMarker;)V public final fun getName ()Ljava/lang/String; - public final fun getValue ()Ljava/lang/Object; + public final fun getValue ()Lcom/apollographql/apollo3/api/Optional; public final fun isKey ()Z } public final class com/apollographql/apollo3/api/CompiledArgument$Builder { - public fun (Ljava/lang/String;Ljava/lang/Object;)V + public fun (Ljava/lang/String;)V public final fun build ()Lcom/apollographql/apollo3/api/CompiledArgument; public final fun isKey (Z)Lcom/apollographql/apollo3/api/CompiledArgument$Builder; + public final fun value (Ljava/lang/Object;)Lcom/apollographql/apollo3/api/CompiledArgument$Builder; } public final class com/apollographql/apollo3/api/CompiledCondition { @@ -305,7 +306,7 @@ public final class com/apollographql/apollo3/api/CompiledField : com/apollograph public final fun getType ()Lcom/apollographql/apollo3/api/CompiledType; public final fun nameWithArguments (Lcom/apollographql/apollo3/api/Executable$Variables;)Ljava/lang/String; public final fun newBuilder ()Lcom/apollographql/apollo3/api/CompiledField$Builder; - public final fun resolveArgument (Ljava/lang/String;Lcom/apollographql/apollo3/api/Executable$Variables;)Ljava/lang/Object; + public final fun resolveArgument (Ljava/lang/String;Lcom/apollographql/apollo3/api/Executable$Variables;)Lcom/apollographql/apollo3/api/Optional; } public final class com/apollographql/apollo3/api/CompiledField$Builder { @@ -351,7 +352,6 @@ public final class com/apollographql/apollo3/api/CompiledGraphQL { public static final fun -notNull (Lcom/apollographql/apollo3/api/CompiledType;)Lcom/apollographql/apollo3/api/CompiledNotNullType; public static final fun isComposite (Lcom/apollographql/apollo3/api/CompiledNamedType;)Z public static final fun keyFields (Lcom/apollographql/apollo3/api/CompiledNamedType;)Ljava/util/List; - public static final fun resolveVariables (Ljava/lang/Object;Lcom/apollographql/apollo3/api/Executable$Variables;)Ljava/lang/Object; } public final class com/apollographql/apollo3/api/CompiledListType : com/apollographql/apollo3/api/CompiledType { diff --git a/libraries/apollo-api/src/commonMain/kotlin/com/apollographql/apollo3/api/CompiledGraphQL.kt b/libraries/apollo-api/src/commonMain/kotlin/com/apollographql/apollo3/api/CompiledGraphQL.kt index f6429f8364c..49c2e19cd88 100644 --- a/libraries/apollo-api/src/commonMain/kotlin/com/apollographql/apollo3/api/CompiledGraphQL.kt +++ b/libraries/apollo-api/src/commonMain/kotlin/com/apollographql/apollo3/api/CompiledGraphQL.kt @@ -5,6 +5,7 @@ package com.apollographql.apollo3.api import com.apollographql.apollo3.annotations.ApolloDeprecatedSince import com.apollographql.apollo3.annotations.ApolloDeprecatedSince.Version.v4_0_0 import com.apollographql.apollo3.annotations.ApolloExperimental +import com.apollographql.apollo3.api.json.ApolloJsonElement import com.apollographql.apollo3.api.json.BufferedSinkJsonWriter import com.apollographql.apollo3.api.json.writeAny import okio.Buffer @@ -28,13 +29,48 @@ class CompiledField internal constructor( get() = alias ?: name /** - * Resolves field argument value by [name]. If the argument contains variables, replace them with their actual value + * Resolves field argument value by [name]. + * + * @return [Optional.Absent] if no runtime value is present for this argument else returns the argument + * value with variables substituted for their values. */ fun resolveArgument( name: String, variables: Executable.Variables, - ): Any? { - return resolveVariables(arguments.firstOrNull { it.name == name }?.value, variables) + ): Optional { + val argument = arguments.firstOrNull { it.name == name } + if (argument == null) { + // no such argument + return Optional.Absent + } + if (argument.value is Optional.Absent) { + // this argument has no value + return Optional.Absent + } + + val result = resolveVariables(argument.value.getOrThrow(), variables) + if (result is Optional.Absent) { + // this argument has a variable value that is absent + return Optional.Absent + } + return Optional.present(result) + } + + /** + * @return a map where the key is the name of the argument and the value the JSON value of that argument + * + * Absent arguments are not returned + */ + @ApolloExperimental + fun resolveArguments(variables: Executable.Variables, filter: (CompiledArgument) -> Boolean= {true}): Map { + val arguments = arguments.filter(filter).filter { it.value is Optional.Present<*> } + if (arguments.isEmpty()) { + return emptyMap() + } + val map = arguments.associate { it.name to it.value.getOrThrow() } + + @Suppress("UNCHECKED_CAST") + return resolveVariables(map, variables) as Map } /** @@ -43,21 +79,15 @@ class CompiledField internal constructor( * This is mostly used internally to compute records */ fun nameWithArguments(variables: Executable.Variables): String { - val filterOutPaginationArguments = arguments.any { it.isPagination } - val arguments = if (filterOutPaginationArguments) { - this.arguments.filterNot { it.isPagination } - } else { - this.arguments - } + val arguments = resolveArguments(variables) { !it.isPagination } if (arguments.isEmpty()) { return name } - val map = arguments.associateBy { it.name }.mapValues { it.value.value } - val resolvedArguments = resolveVariables(map, variables) + return try { val buffer = Buffer() val jsonWriter = BufferedSinkJsonWriter(buffer) - jsonWriter.writeAny(resolvedArguments) + jsonWriter.writeAny(arguments) jsonWriter.close() "${name}(${buffer.readUtf8()})" } catch (e: Exception) { @@ -281,7 +311,7 @@ class InputObjectType( class EnumType( name: String, - val values: List + val values: List, ) : CompiledNamedType(name) /** @@ -304,28 +334,35 @@ fun CompiledType.list() = CompiledListType(this) class CompiledVariable(val name: String) /** - * The Kotlin representation of a GraphQL argument + * The Kotlin representation of a GraphQL value * - * value can be - * - String, Int, Double, Boolean - * - null - * - Map - * - List - * - [CompiledVariable] + * [CompiledValue] can be any of [ApolloJsonElement] or [CompiledVariable] * - * Note: for now, enums are mapped to Strings + * Enum values are mapped to strings + * Int and Float values are mapped to [com.apollographql.apollo3.api.json.JsonNumber] */ +typealias CompiledValue = Any? + class CompiledArgument private constructor( val name: String, - val value: Any?, + /** + * The compile-time value of that argument. + * + * Can be the defaultValue if no argument is defined in the operation. + * Can contain variables. + * Can be [Optional.Absent] if: + * - no value is passed and no default value is present + * - or if a variable value is passed but no variable with that name is present + */ + val value: Optional, val isKey: Boolean = false, @ApolloExperimental val isPagination: Boolean = false, ) { class Builder( private val name: String, - private val value: Any?, ) { + private var value: Optional = Optional.absent() private var isKey: Boolean = false private var isPagination: Boolean = false @@ -333,11 +370,16 @@ class CompiledArgument private constructor( this.isKey = isKey } + fun value(value: CompiledValue) = apply { + this.value = Optional.present(value) + } + @ApolloExperimental fun isPagination(isPagination: Boolean) = apply { this.isPagination = isPagination } + fun build(): CompiledArgument = CompiledArgument( name = name, value = value, @@ -349,27 +391,53 @@ class CompiledArgument private constructor( /** * Resolve all variables that may be contained inside `value` + * + * If a variable is absent, the key is removed from the containing Map or List. + * + * @param value an [ApolloJsonElement] or [CompiledVariable] instance + * + * @return [ApolloJsonElement] or [Optional.Absent] if a variable is absent */ @Suppress("UNCHECKED_CAST") -fun resolveVariables(value: Any?, variables: Executable.Variables): Any? { +private fun resolveVariables(value: Any?, variables: Executable.Variables): Any? { return when (value) { null -> null is CompiledVariable -> { - variables.valueMap[value.name] + if (variables.valueMap.containsKey(value.name)) { + variables.valueMap[value.name] + } else { + Optional.Absent + } } + is Map<*, *> -> { value as Map value.mapValues { resolveVariables(it.value, variables) - }.toList() + }.filter { it.value !is Optional.Absent } + .toList() .sortedBy { it.first } .toMap() } + is List<*> -> { value.map { resolveVariables(it, variables) + }.filter { + /** + * Not sure if this is correct + * + * ``` + * { + * # what if c is not present? + * a(b: [$c]) + * } + * ``` + */ + it !is Optional.Absent } } + else -> value } } @@ -410,6 +478,7 @@ fun CompiledNamedType.isComposite(): Boolean { is InterfaceType, is ObjectType, -> true + else -> false } diff --git a/libraries/apollo-api/src/commonMain/kotlin/com/apollographql/apollo3/api/Executable.kt b/libraries/apollo-api/src/commonMain/kotlin/com/apollographql/apollo3/api/Executable.kt index ea997bee8fb..600d4642526 100644 --- a/libraries/apollo-api/src/commonMain/kotlin/com/apollographql/apollo3/api/Executable.kt +++ b/libraries/apollo-api/src/commonMain/kotlin/com/apollographql/apollo3/api/Executable.kt @@ -1,6 +1,7 @@ package com.apollographql.apollo3.api import com.apollographql.apollo3.api.Executable.Variables +import com.apollographql.apollo3.api.json.ApolloJsonElement import com.apollographql.apollo3.api.json.JsonWriter import okio.IOException @@ -21,7 +22,7 @@ interface Executable { * Serializes the variables of this operation to a json */ @Throws(IOException::class) - fun serializeVariables(writer: JsonWriter, customScalarAdapters: CustomScalarAdapters, withBooleanDefaultValues: Boolean) + fun serializeVariables(writer: JsonWriter, customScalarAdapters: CustomScalarAdapters, withDefaultValues: Boolean) /** * A list of [CompiledSelection]. Used when reading from the cache and/or normalizing a model. @@ -41,5 +42,10 @@ interface Executable { * serialized to their json representation (String/Map most of the time). * Input objects are serialized to Map */ - class Variables(val valueMap: Map) + class Variables(val valueMap: VariablesJson) } + +/** + * The variables as a Json representation. If some + */ +typealias VariablesJson = Map \ No newline at end of file diff --git a/libraries/apollo-api/src/commonMain/kotlin/com/apollographql/apollo3/api/Executables.kt b/libraries/apollo-api/src/commonMain/kotlin/com/apollographql/apollo3/api/Executables.kt index b1a5c20587e..599a46035f9 100644 --- a/libraries/apollo-api/src/commonMain/kotlin/com/apollographql/apollo3/api/Executables.kt +++ b/libraries/apollo-api/src/commonMain/kotlin/com/apollographql/apollo3/api/Executables.kt @@ -56,13 +56,13 @@ fun Executable.falseVariables(customScalarAdapters: Cus @ApolloInternal fun Executable.variables( customScalarAdapters: CustomScalarAdapters, - withBooleanDefaultValues: Boolean, + withDefaultValues: Boolean, ): Executable.Variables { val valueMap = MapJsonWriter().apply { beginObject() - serializeVariables(this, customScalarAdapters, withBooleanDefaultValues) + serializeVariables(this, customScalarAdapters, withDefaultValues) endObject() - }.root() as Map + }.root() as VariablesJson return Executable.Variables(valueMap) } diff --git a/libraries/apollo-api/src/commonMain/kotlin/com/apollographql/apollo3/api/Fragment.kt b/libraries/apollo-api/src/commonMain/kotlin/com/apollographql/apollo3/api/Fragment.kt index 612b604e68f..da7ff5e8fcb 100644 --- a/libraries/apollo-api/src/commonMain/kotlin/com/apollographql/apollo3/api/Fragment.kt +++ b/libraries/apollo-api/src/commonMain/kotlin/com/apollographql/apollo3/api/Fragment.kt @@ -10,7 +10,7 @@ import okio.IOException */ interface Fragment : Executable { @Throws(IOException::class) - override fun serializeVariables(writer: JsonWriter, customScalarAdapters: CustomScalarAdapters, withBooleanDefaultValues: Boolean) + override fun serializeVariables(writer: JsonWriter, customScalarAdapters: CustomScalarAdapters, withDefaultValues: Boolean) override fun adapter(): CompositeAdapter diff --git a/libraries/apollo-api/src/commonMain/kotlin/com/apollographql/apollo3/api/Operation.kt b/libraries/apollo-api/src/commonMain/kotlin/com/apollographql/apollo3/api/Operation.kt index 01097687ec8..e3675ecf02b 100644 --- a/libraries/apollo-api/src/commonMain/kotlin/com/apollographql/apollo3/api/Operation.kt +++ b/libraries/apollo-api/src/commonMain/kotlin/com/apollographql/apollo3/api/Operation.kt @@ -32,7 +32,7 @@ interface Operation : Executable { override fun adapter(): CompositeAdapter @Throws(IOException::class) - override fun serializeVariables(writer: JsonWriter, customScalarAdapters: CustomScalarAdapters, withBooleanDefaultValues: Boolean) + override fun serializeVariables(writer: JsonWriter, customScalarAdapters: CustomScalarAdapters, withDefaultValues: Boolean) override fun rootField(): CompiledField diff --git a/libraries/apollo-api/src/commonMain/kotlin/com/apollographql/apollo3/api/Optional.kt b/libraries/apollo-api/src/commonMain/kotlin/com/apollographql/apollo3/api/Optional.kt index 7c311ca1e76..59995a5c5b1 100644 --- a/libraries/apollo-api/src/commonMain/kotlin/com/apollographql/apollo3/api/Optional.kt +++ b/libraries/apollo-api/src/commonMain/kotlin/com/apollographql/apollo3/api/Optional.kt @@ -1,5 +1,6 @@ package com.apollographql.apollo3.api +import com.apollographql.apollo3.annotations.ApolloExperimental import com.apollographql.apollo3.api.Optional.Absent import com.apollographql.apollo3.api.Optional.Present import com.apollographql.apollo3.exception.MissingValueException @@ -46,3 +47,11 @@ sealed class Optional { * Returns the value if this [Optional] is [Present] or null else. */ fun Optional.getOrElse(fallback: V): V = (this as? Present)?.value ?: fallback + +@ApolloExperimental +fun Optional.map(mapper: (V) -> R): Optional { + return when(this) { + is Optional.Absent -> Optional.Absent + is Optional.Present -> Optional.present(mapper(value)) + } +} diff --git a/libraries/apollo-api/src/commonMain/kotlin/com/apollographql/apollo3/api/json/MapJsonReader.kt b/libraries/apollo-api/src/commonMain/kotlin/com/apollographql/apollo3/api/json/MapJsonReader.kt index 66aef2c5c8f..1ad7dc966ea 100644 --- a/libraries/apollo-api/src/commonMain/kotlin/com/apollographql/apollo3/api/json/MapJsonReader.kt +++ b/libraries/apollo-api/src/commonMain/kotlin/com/apollographql/apollo3/api/json/MapJsonReader.kt @@ -9,19 +9,7 @@ import com.apollographql.apollo3.exception.JsonDataException import kotlin.jvm.JvmOverloads /** - * A [JsonReader] that can consumes Kotlin values as Json - * - * values should be any of: - * - String - * - Int - * - Double - * - Long - * - JsonNumber - * - null - * - Map where values are any of these values recursively - * - List where values are any of these values recursively - * - * Anything else is undefined + * A [JsonReader] that can consumes [ApolloJsonElement] values as Json * * To read from a [okio.BufferedSource], see also [BufferedSourceJsonReader] * @@ -423,3 +411,22 @@ constructor( } } } + +/** + * A typealias for a type-unsafe Kotlin representation of JSON. This typealias is + * mainly for internal documentation purposes and low-level manipulations and should + * generally be avoided in application code. + * + * [ApolloJsonElement] can be any of: + * - String + * - Int + * - Double + * - Long + * - JsonNumber + * - null + * - Map where values are any of these values recursively + * - List where values are any of these values recursively + * + * Anything else is undefined + */ +typealias ApolloJsonElement = Any? diff --git a/libraries/apollo-ast/api/apollo-ast.api b/libraries/apollo-ast/api/apollo-ast.api index f4c96971a9a..f9fc3157967 100644 --- a/libraries/apollo-ast/api/apollo-ast.api +++ b/libraries/apollo-ast/api/apollo-ast.api @@ -289,14 +289,14 @@ public final class com/apollographql/apollo3/ast/GQLFieldDefinition : com/apollo } public final class com/apollographql/apollo3/ast/GQLFloatValue : com/apollographql/apollo3/ast/GQLValue { - public fun (Lcom/apollographql/apollo3/ast/SourceLocation;D)V - public synthetic fun (Lcom/apollographql/apollo3/ast/SourceLocation;DILkotlin/jvm/internal/DefaultConstructorMarker;)V - public final fun copy (Lcom/apollographql/apollo3/ast/SourceLocation;D)Lcom/apollographql/apollo3/ast/GQLFloatValue; - public static synthetic fun copy$default (Lcom/apollographql/apollo3/ast/GQLFloatValue;Lcom/apollographql/apollo3/ast/SourceLocation;DILjava/lang/Object;)Lcom/apollographql/apollo3/ast/GQLFloatValue; + public fun (Lcom/apollographql/apollo3/ast/SourceLocation;Ljava/lang/String;)V + public synthetic fun (Lcom/apollographql/apollo3/ast/SourceLocation;Ljava/lang/String;ILkotlin/jvm/internal/DefaultConstructorMarker;)V + public final fun copy (Lcom/apollographql/apollo3/ast/SourceLocation;Ljava/lang/String;)Lcom/apollographql/apollo3/ast/GQLFloatValue; + public static synthetic fun copy$default (Lcom/apollographql/apollo3/ast/GQLFloatValue;Lcom/apollographql/apollo3/ast/SourceLocation;Ljava/lang/String;ILjava/lang/Object;)Lcom/apollographql/apollo3/ast/GQLFloatValue; public fun copyWithNewChildrenInternal (Lcom/apollographql/apollo3/ast/NodeContainer;)Lcom/apollographql/apollo3/ast/GQLNode; public fun getChildren ()Ljava/util/List; public fun getSourceLocation ()Lcom/apollographql/apollo3/ast/SourceLocation; - public final fun getValue ()D + public final fun getValue ()Ljava/lang/String; public fun writeInternal (Lcom/apollographql/apollo3/ast/SDLWriter;)V } @@ -396,14 +396,14 @@ public final class com/apollographql/apollo3/ast/GQLInputValueDefinition : com/a } public final class com/apollographql/apollo3/ast/GQLIntValue : com/apollographql/apollo3/ast/GQLValue { - public fun (Lcom/apollographql/apollo3/ast/SourceLocation;I)V - public synthetic fun (Lcom/apollographql/apollo3/ast/SourceLocation;IILkotlin/jvm/internal/DefaultConstructorMarker;)V - public final fun copy (Lcom/apollographql/apollo3/ast/SourceLocation;I)Lcom/apollographql/apollo3/ast/GQLIntValue; - public static synthetic fun copy$default (Lcom/apollographql/apollo3/ast/GQLIntValue;Lcom/apollographql/apollo3/ast/SourceLocation;IILjava/lang/Object;)Lcom/apollographql/apollo3/ast/GQLIntValue; + public fun (Lcom/apollographql/apollo3/ast/SourceLocation;Ljava/lang/String;)V + public synthetic fun (Lcom/apollographql/apollo3/ast/SourceLocation;Ljava/lang/String;ILkotlin/jvm/internal/DefaultConstructorMarker;)V + public final fun copy (Lcom/apollographql/apollo3/ast/SourceLocation;Ljava/lang/String;)Lcom/apollographql/apollo3/ast/GQLIntValue; + public static synthetic fun copy$default (Lcom/apollographql/apollo3/ast/GQLIntValue;Lcom/apollographql/apollo3/ast/SourceLocation;Ljava/lang/String;ILjava/lang/Object;)Lcom/apollographql/apollo3/ast/GQLIntValue; public fun copyWithNewChildrenInternal (Lcom/apollographql/apollo3/ast/NodeContainer;)Lcom/apollographql/apollo3/ast/GQLNode; public fun getChildren ()Ljava/util/List; public fun getSourceLocation ()Lcom/apollographql/apollo3/ast/SourceLocation; - public final fun getValue ()I + public final fun getValue ()Ljava/lang/String; public fun writeInternal (Lcom/apollographql/apollo3/ast/SDLWriter;)V } diff --git a/libraries/apollo-ast/src/commonMain/kotlin/com/apollographql/apollo3/ast/gql.kt b/libraries/apollo-ast/src/commonMain/kotlin/com/apollographql/apollo3/ast/gql.kt index 10f8217f4d6..83503a454c5 100644 --- a/libraries/apollo-ast/src/commonMain/kotlin/com/apollographql/apollo3/ast/gql.kt +++ b/libraries/apollo-ast/src/commonMain/kotlin/com/apollographql/apollo3/ast/gql.kt @@ -1873,7 +1873,7 @@ class GQLVariableValue( class GQLIntValue( override val sourceLocation: SourceLocation? = null, - val value: Int, + val value: String, ) : GQLValue() { override val children = emptyList() @@ -1886,7 +1886,7 @@ class GQLIntValue( fun copy( sourceLocation: SourceLocation? = this.sourceLocation, - value: Int = this.value, + value: String = this.value, ) = GQLIntValue( sourceLocation = sourceLocation, value = value, @@ -1899,20 +1899,20 @@ class GQLIntValue( class GQLFloatValue( override val sourceLocation: SourceLocation? = null, - val value: Double, + val value: String, ) : GQLValue() { override val children = emptyList() override fun writeInternal(writer: SDLWriter) { with(writer) { - write(value.toString()) + write(value) } } fun copy( sourceLocation: SourceLocation? = this.sourceLocation, - value: Double = this.value, + value: String = this.value, ) = GQLFloatValue( sourceLocation = sourceLocation, value = value, diff --git a/libraries/apollo-ast/src/commonMain/kotlin/com/apollographql/apollo3/ast/internal/InputValueValidationScope.kt b/libraries/apollo-ast/src/commonMain/kotlin/com/apollographql/apollo3/ast/internal/InputValueValidationScope.kt index ee2778d8c16..f2be7e5793b 100644 --- a/libraries/apollo-ast/src/commonMain/kotlin/com/apollographql/apollo3/ast/internal/InputValueValidationScope.kt +++ b/libraries/apollo-ast/src/commonMain/kotlin/com/apollographql/apollo3/ast/internal/InputValueValidationScope.kt @@ -127,18 +127,56 @@ private fun ValidationScope.validateAndCoerceInputObject( return value } - expectedTypeDefinition.inputFields.forEach { inputValueDefinition -> - // 3.10 All required input fields must have a value - if (inputValueDefinition.type is GQLNonNullType - && inputValueDefinition.defaultValue == null - && value.fields.firstOrNull { it.name == inputValueDefinition.name } == null - ) { - registerIssue(message = "No value passed for required inputField `${inputValueDefinition.name}`", sourceLocation = value.sourceLocation) + // 3.10 Input values coercion: extra values are errors + value.fields.forEach { field -> + if (expectedTypeDefinition.inputFields.firstOrNull { it.name == field.name } == null) { + registerIssue(message = "Field '${field.name}' is not an input field of type '${expectedType.pretty()}'", sourceLocation = field.sourceLocation) } } - value.fields.forEach { field -> - val inputValueDefinition = expectedTypeDefinition.inputFields.firstOrNull { it.name == field.name } - if (inputValueDefinition?.directives?.findDeprecationReason() != null) { + + val inputFields = expectedTypeDefinition.inputFields.mapNotNull { inputValueDefinition -> + val field = value.fields.firstOrNull { it.name == inputValueDefinition.name } + + if (field == null) { + if (inputValueDefinition.defaultValue != null) { + /** + * 3.10 + * If no value is provided for a defined input object field and that field definition provides a default value, the default value should be used + */ + // We don't want to report issues in default values defined in the schema + val ignoreIssuesScope = DefaultValidationScope( + typeDefinitions = typeDefinitions, + directiveDefinitions = directiveDefinitions, + issues = null, + foreignNames = foreignNames + ) + return@mapNotNull GQLObjectField( + name = inputValueDefinition.name, + value = ignoreIssuesScope.validateAndCoerceValue( + value = inputValueDefinition.defaultValue, + expectedType = inputValueDefinition.type, + hasLocationDefaultValue = false, + registerVariableUsage = registerVariableUsage + ) + ) + } else if (inputValueDefinition.type is GQLNonNullType) { + /** + * 3.10 + * All required input fields must have a value + */ + registerIssue(message = "No value passed for required inputField `${inputValueDefinition.name}`", sourceLocation = value.sourceLocation) + return@mapNotNull null + } else { + /** + * 3.10 + * No value provided => the key is absent + */ + return@mapNotNull null + } + } + + // An input field was provided + if (inputValueDefinition.directives.findDeprecationReason() != null) { issues.add( DeprecatedUsage( message = "Use of deprecated input field `${inputValueDefinition.name}`", @@ -146,20 +184,14 @@ private fun ValidationScope.validateAndCoerceInputObject( ) ) } - } - return GQLObjectValue(fields = value.fields.mapNotNull { field -> - val inputField = expectedTypeDefinition.inputFields.firstOrNull { it.name == field.name } - if (inputField == null) { - // 3.10 Input values coercion: extra values are errors - registerIssue(message = "Field ${field.name} is not defined by ${expectedType.pretty()}", sourceLocation = field.sourceLocation) - return@mapNotNull null - } GQLObjectField( name = field.name, - value = validateAndCoerceValue(field.value, inputField.type, inputField.defaultValue != null, registerVariableUsage) + value = validateAndCoerceValue(field.value, inputValueDefinition.type, inputValueDefinition.defaultValue != null, registerVariableUsage) ) - }) + } + + return GQLObjectValue(fields = inputFields) } private fun ValidationScope.validateAndCoerceEnum(value: GQLValue, enumTypeDefinition: GQLEnumTypeDefinition): GQLValue { @@ -197,7 +229,7 @@ private fun ValidationScope.validateAndCoerceScalar(value: GQLValue, expectedTyp when (value) { is GQLFloatValue -> value // Int get coerced to floats - is GQLIntValue -> GQLFloatValue(value = value.value.toDouble()) + is GQLIntValue -> GQLFloatValue(value = value.value) else -> { registerIssue(value, expectedType) value diff --git a/libraries/apollo-ast/src/commonMain/kotlin/com/apollographql/apollo3/ast/internal/Lexer.kt b/libraries/apollo-ast/src/commonMain/kotlin/com/apollographql/apollo3/ast/internal/Lexer.kt index da4c55642e7..e5286a756c5 100644 --- a/libraries/apollo-ast/src/commonMain/kotlin/com/apollographql/apollo3/ast/internal/Lexer.kt +++ b/libraries/apollo-ast/src/commonMain/kotlin/com/apollographql/apollo3/ast/internal/Lexer.kt @@ -562,7 +562,7 @@ internal class Lexer(val src: String) { end = pos, line = line, column = column(start), - value = asString.toDouble() + value = asString ) } else { Token.Int( @@ -570,7 +570,7 @@ internal class Lexer(val src: String) { end = pos, line = line, column = column(start), - value = asString.toInt() + value = asString ) } } diff --git a/libraries/apollo-ast/src/commonMain/kotlin/com/apollographql/apollo3/ast/internal/Token.kt b/libraries/apollo-ast/src/commonMain/kotlin/com/apollographql/apollo3/ast/internal/Token.kt index 0c525783b12..2c7c0161f3d 100644 --- a/libraries/apollo-ast/src/commonMain/kotlin/com/apollographql/apollo3/ast/internal/Token.kt +++ b/libraries/apollo-ast/src/commonMain/kotlin/com/apollographql/apollo3/ast/internal/Token.kt @@ -79,11 +79,11 @@ internal sealed class Token(val start: kotlin.Int, val end: kotlin.Int, val line override fun toString() = "name: $value" } - class Int(start: kotlin.Int, end: kotlin.Int, line: kotlin.Int, column: kotlin.Int, val value: kotlin.Int) : Token(start, end, line, column) { + class Int(start: kotlin.Int, end: kotlin.Int, line: kotlin.Int, column: kotlin.Int, val value: kotlin.String) : Token(start, end, line, column) { override fun toString() = "int: $value" } - class Float(start: kotlin.Int, end: kotlin.Int, line: kotlin.Int, column: kotlin.Int, val value: Double) : Token(start, end, line, column) { + class Float(start: kotlin.Int, end: kotlin.Int, line: kotlin.Int, column: kotlin.Int, val value: kotlin.String) : Token(start, end, line, column) { override fun toString() = "float: $value" } diff --git a/libraries/apollo-ast/src/commonTest/kotlin/com/apollographql/apollo3/graphql/ast/test/LexerTest.kt b/libraries/apollo-ast/src/commonTest/kotlin/com/apollographql/apollo3/graphql/ast/test/LexerTest.kt index cb200764552..5583957ce0c 100644 --- a/libraries/apollo-ast/src/commonTest/kotlin/com/apollographql/apollo3/graphql/ast/test/LexerTest.kt +++ b/libraries/apollo-ast/src/commonTest/kotlin/com/apollographql/apollo3/graphql/ast/test/LexerTest.kt @@ -442,69 +442,77 @@ class LexerTest { fun lexesNumbers() { lexFirst("4").apply { assertIs(this) - assertEquals(4, value) + assertEquals("4", value) } lexFirst("4.123").apply { assertIs(this) - assertEquals(4.123, value) + assertEquals("4.123", value) } lexFirst("-4").apply { assertIs(this) - assertEquals(-4, value) + assertEquals("-4", value) } lexFirst("9").apply { assertIs(this) - assertEquals(9, value) + assertEquals("9", value) } lexFirst("0").apply { assertIs(this) - assertEquals(0, value) + assertEquals("0", value) } lexFirst("-4.123").apply { assertIs(this) - assertEquals(-4.123, value) + assertEquals("-4.123", value) } lexFirst("0.123").apply { assertIs(this) - assertEquals(0.123, value) + assertEquals("0.123", value) } lexFirst("123e4").apply { assertIs(this) - assertEquals(123e4, value) + assertEquals("123e4", value) } lexFirst("123E4").apply { assertIs(this) - assertEquals(123E4, value) + assertEquals("123E4", value) } lexFirst("123e-4").apply { assertIs(this) - assertEquals(123e-4, value) + assertEquals("123e-4", value) } lexFirst("123e+4").apply { assertIs(this) - assertEquals(123e+4, value) + assertEquals("123e+4", value) } lexFirst("-1.123e4").apply { assertIs(this) - assertEquals(-1.123e4, value) + assertEquals("-1.123e4", value) } lexFirst("-1.123E4").apply { assertIs(this) - assertEquals(-1.123E4, value) + assertEquals("-1.123E4", value) } lexFirst("-1.123e-4").apply { assertIs(this) - assertEquals(-1.123e-4, value) + assertEquals("-1.123e-4", value) } lexFirst("-1.123e+4").apply { assertIs(this) - assertEquals(-1.123e+4, value) + assertEquals("-1.123e+4", value) } lexFirst("-1.123e4567").apply { assertIs(this) - assertEquals(Double.NEGATIVE_INFINITY, value) + assertEquals("-1.123e4567", value) + } + lexFirst("31536000000").apply { + assertIs(this) + assertEquals("31536000000", value) + } + lexFirst("31536000000.0").apply { + assertIs(this) + assertEquals("31536000000.0", value) } } diff --git a/libraries/apollo-ast/src/commonTest/kotlin/com/apollographql/apollo3/graphql/ast/test/TransformTest.kt b/libraries/apollo-ast/src/commonTest/kotlin/com/apollographql/apollo3/graphql/ast/test/TransformTest.kt index 5187133b568..40978346bc2 100644 --- a/libraries/apollo-ast/src/commonTest/kotlin/com/apollographql/apollo3/graphql/ast/test/TransformTest.kt +++ b/libraries/apollo-ast/src/commonTest/kotlin/com/apollographql/apollo3/graphql/ast/test/TransformTest.kt @@ -64,7 +64,7 @@ class TransformTest { "@since requires an Int argument (is ${argument.value})" } - return value.value + return value.value.toInt() } @Test diff --git a/libraries/apollo-compiler/src/main/kotlin/com/apollographql/apollo3/compiler/codegen/ClassNames.kt b/libraries/apollo-compiler/src/main/kotlin/com/apollographql/apollo3/compiler/codegen/ClassNames.kt index af357588cdd..2da6be646b9 100644 --- a/libraries/apollo-compiler/src/main/kotlin/com/apollographql/apollo3/compiler/codegen/ClassNames.kt +++ b/libraries/apollo-compiler/src/main/kotlin/com/apollographql/apollo3/compiler/codegen/ClassNames.kt @@ -45,6 +45,7 @@ internal object ClassNames { val False = ResolverClassName(apolloApiPackageName, "BooleanExpression", "False") val CompiledArgument = ResolverClassName(apolloApiPackageName, "CompiledArgument", "Builder") val CompiledVariable = ResolverClassName(apolloApiPackageName, "CompiledVariable") + val JsonNumber = ResolverClassName(apolloApiJsonPackageName, "JsonNumber") val CompiledCondition = ResolverClassName(apolloApiPackageName, "CompiledCondition") val CompiledField = ResolverClassName(apolloApiPackageName, "CompiledField") val CompiledFieldBuilder = ResolverClassName(apolloApiPackageName, "CompiledField", "Builder") diff --git a/libraries/apollo-compiler/src/main/kotlin/com/apollographql/apollo3/compiler/codegen/Identifiers.kt b/libraries/apollo-compiler/src/main/kotlin/com/apollographql/apollo3/compiler/codegen/Identifiers.kt index 1d272857a21..64352d71b5d 100644 --- a/libraries/apollo-compiler/src/main/kotlin/com/apollographql/apollo3/compiler/codegen/Identifiers.kt +++ b/libraries/apollo-compiler/src/main/kotlin/com/apollographql/apollo3/compiler/codegen/Identifiers.kt @@ -20,7 +20,7 @@ internal object Identifier { const val fromJson = "fromJson" const val getPath = "getPath" const val serializeVariables = "serializeVariables" - const val withBooleanDefaultValues = "withBooleanDefaultValues" + const val withDefaultValues = "withDefaultValues" const val toJson = "toJson" const val fields = "fields" const val rootField = "rootField" diff --git a/libraries/apollo-compiler/src/main/kotlin/com/apollographql/apollo3/compiler/codegen/java/JavaClassNames.kt b/libraries/apollo-compiler/src/main/kotlin/com/apollographql/apollo3/compiler/codegen/java/JavaClassNames.kt index af068adf6b5..f83107a5d5c 100644 --- a/libraries/apollo-compiler/src/main/kotlin/com/apollographql/apollo3/compiler/codegen/java/JavaClassNames.kt +++ b/libraries/apollo-compiler/src/main/kotlin/com/apollographql/apollo3/compiler/codegen/java/JavaClassNames.kt @@ -44,6 +44,7 @@ internal object JavaClassNames { val False = ClassNames.False.toJavaPoetClassName() val CompiledArgument = ClassNames.CompiledArgument.toJavaPoetClassName() val CompiledVariable = ClassNames.CompiledVariable.toJavaPoetClassName() + val JsonNumber = ClassNames.JsonNumber.toJavaPoetClassName() val CompiledCondition = ClassNames.CompiledCondition.toJavaPoetClassName() val CompiledField = ClassNames.CompiledField.toJavaPoetClassName() val CompiledFieldBuilder = ClassNames.CompiledFieldBuilder.toJavaPoetClassName() diff --git a/libraries/apollo-compiler/src/main/kotlin/com/apollographql/apollo3/compiler/codegen/java/adapter/VariableAdapter.kt b/libraries/apollo-compiler/src/main/kotlin/com/apollographql/apollo3/compiler/codegen/java/adapter/VariablesAdapter.kt similarity index 73% rename from libraries/apollo-compiler/src/main/kotlin/com/apollographql/apollo3/compiler/codegen/java/adapter/VariableAdapter.kt rename to libraries/apollo-compiler/src/main/kotlin/com/apollographql/apollo3/compiler/codegen/java/adapter/VariablesAdapter.kt index ccda09ce490..c9ef0fe753c 100644 --- a/libraries/apollo-compiler/src/main/kotlin/com/apollographql/apollo3/compiler/codegen/java/adapter/VariableAdapter.kt +++ b/libraries/apollo-compiler/src/main/kotlin/com/apollographql/apollo3/compiler/codegen/java/adapter/VariablesAdapter.kt @@ -9,17 +9,16 @@ import com.apollographql.apollo3.compiler.codegen.Identifier.customScalarAdapter import com.apollographql.apollo3.compiler.codegen.Identifier.serializeVariables import com.apollographql.apollo3.compiler.codegen.Identifier.toJson import com.apollographql.apollo3.compiler.codegen.Identifier.value -import com.apollographql.apollo3.compiler.codegen.Identifier.withBooleanDefaultValues +import com.apollographql.apollo3.compiler.codegen.Identifier.withDefaultValues import com.apollographql.apollo3.compiler.codegen.Identifier.writer import com.apollographql.apollo3.compiler.codegen.java.JavaClassNames import com.apollographql.apollo3.compiler.codegen.java.JavaContext import com.apollographql.apollo3.compiler.codegen.java.L import com.apollographql.apollo3.compiler.codegen.java.S import com.apollographql.apollo3.compiler.codegen.java.T -import com.apollographql.apollo3.compiler.codegen.java.helpers.NamedType import com.apollographql.apollo3.compiler.codegen.java.helpers.beginOptionalControlFlow -import com.apollographql.apollo3.compiler.codegen.java.helpers.suppressDeprecatedAnnotation -import com.apollographql.apollo3.compiler.ir.IrBooleanValue +import com.apollographql.apollo3.compiler.codegen.java.helpers.codeBlock +import com.apollographql.apollo3.compiler.ir.IrVariable import com.apollographql.apollo3.compiler.ir.isComposite import com.apollographql.apollo3.compiler.ir.isOptional import com.squareup.javapoet.CodeBlock @@ -28,7 +27,7 @@ import com.squareup.javapoet.TypeName import com.squareup.javapoet.TypeSpec import javax.lang.model.element.Modifier -internal fun List.variableAdapterTypeSpec( +internal fun List.variableAdapterTypeSpec( context: JavaContext, adapterName: String, adaptedTypeName: TypeName, @@ -37,15 +36,10 @@ internal fun List.variableAdapterTypeSpec( .addModifiers(Modifier.PUBLIC) .addEnumConstant("INSTANCE") .addMethod(writeToResponseMethodSpec(context, adaptedTypeName)) - .apply { - if (this@variableAdapterTypeSpec.any { it.deprecationReason != null }) { - addAnnotation(suppressDeprecatedAnnotation()) - } - } .build() } -private fun List.writeToResponseMethodSpec( +private fun List.writeToResponseMethodSpec( context: JavaContext, adaptedTypeName: TypeName, ): MethodSpec { @@ -55,12 +49,12 @@ private fun List.writeToResponseMethodSpec( .addParameter(JavaClassNames.JsonWriter, writer) .addParameter(adaptedTypeName, value) .addParameter(JavaClassNames.CustomScalarAdapters, customScalarAdapters) - .addParameter(TypeName.BOOLEAN, withBooleanDefaultValues) + .addParameter(TypeName.BOOLEAN, withDefaultValues) .addCode(writeToResponseCodeBlock(context)) .build() } -private fun List.writeToResponseCodeBlock(context: JavaContext): CodeBlock { +private fun List.writeToResponseCodeBlock(context: JavaContext): CodeBlock { val builder = CodeBlock.builder() builder.addStatement("$T $adapterContext = new $T.Builder().$customScalarAdapters($customScalarAdapters).build()", JavaClassNames.CompositeAdapterContext, JavaClassNames.CompositeAdapterContext) forEach { @@ -69,16 +63,16 @@ private fun List.writeToResponseCodeBlock(context: JavaContext): Code return builder.build() } -private fun NamedType.writeToResponseCodeBlock(context: JavaContext): CodeBlock { +private fun IrVariable.writeToResponseCodeBlock(context: JavaContext): CodeBlock { val adapterInitializer = context.resolver.adapterInitializer(type, false) val builder = CodeBlock.builder() - val propertyName = context.layout.propertyName(graphQlName) + val propertyName = context.layout.propertyName(name) if (type.isOptional()) { builder.beginOptionalControlFlow(propertyName, context.nullableFieldStyle) } - builder.add("$writer.name($S);\n", graphQlName) + builder.add("$writer.name($S);\n", name) if (!type.rawType().isComposite()) { builder.addStatement("$L.$toJson($writer, $T.$Empty, $value.$propertyName)", adapterInitializer, JavaClassNames.CustomScalarAdapters) } else { @@ -86,14 +80,14 @@ private fun NamedType.writeToResponseCodeBlock(context: JavaContext): CodeBlock } if (type.isOptional()) { builder.endControlFlow() - if (defaultValue is IrBooleanValue) { - builder.beginControlFlow("else if ($withBooleanDefaultValues)") - builder.addStatement("$writer.name($S)", graphQlName) + if (defaultValue != null) { + builder.beginControlFlow("else if ($withDefaultValues)") + builder.addStatement("$writer.name($S)", name) builder.addStatement( "$L.$toJson($writer, $T.$Empty, $L)", - CodeBlock.of("$T.$L", JavaClassNames.Adapters, "BooleanAdapter"), + CodeBlock.of("$T.$L", JavaClassNames.Adapters, "NullableAnyAdapter"), JavaClassNames.CustomScalarAdapters, - defaultValue.value, + defaultValue.codeBlock(), ) builder.endControlFlow() } diff --git a/libraries/apollo-compiler/src/main/kotlin/com/apollographql/apollo3/compiler/codegen/java/file/ExecutableCommon.kt b/libraries/apollo-compiler/src/main/kotlin/com/apollographql/apollo3/compiler/codegen/java/file/ExecutableCommon.kt index d3e52113d27..ee7e6a13ed1 100644 --- a/libraries/apollo-compiler/src/main/kotlin/com/apollographql/apollo3/compiler/codegen/java/file/ExecutableCommon.kt +++ b/libraries/apollo-compiler/src/main/kotlin/com/apollographql/apollo3/compiler/codegen/java/file/ExecutableCommon.kt @@ -5,7 +5,7 @@ import com.apollographql.apollo3.compiler.codegen.Identifier.customScalarAdapter import com.apollographql.apollo3.compiler.codegen.Identifier.root import com.apollographql.apollo3.compiler.codegen.Identifier.rootField import com.apollographql.apollo3.compiler.codegen.Identifier.serializeVariables -import com.apollographql.apollo3.compiler.codegen.Identifier.withBooleanDefaultValues +import com.apollographql.apollo3.compiler.codegen.Identifier.withDefaultValues import com.apollographql.apollo3.compiler.codegen.Identifier.writer import com.apollographql.apollo3.compiler.codegen.java.JavaClassNames import com.apollographql.apollo3.compiler.codegen.java.JavaContext @@ -29,7 +29,7 @@ internal fun serializeVariablesMethodSpec( val body = if (adapterClassName == null) { CodeBlock.of("// $emptyMessage\n") } else { - CodeBlock.of("$T.INSTANCE.$serializeVariables($writer, this, $customScalarAdapters, $withBooleanDefaultValues);\n", adapterClassName) + CodeBlock.of("$T.INSTANCE.$serializeVariables($writer, this, $customScalarAdapters, $withDefaultValues);\n", adapterClassName) } return MethodSpec.methodBuilder(serializeVariables) .addModifiers(Modifier.PUBLIC) @@ -37,7 +37,7 @@ internal fun serializeVariablesMethodSpec( .addAnnotation(JavaClassNames.Override) .addParameter(JavaClassNames.JsonWriter, writer) .addParameter(JavaClassNames.CustomScalarAdapters, customScalarAdapters) - .addParameter(TypeName.BOOLEAN, withBooleanDefaultValues) + .addParameter(TypeName.BOOLEAN, withDefaultValues) .addCode(body) .build() } diff --git a/libraries/apollo-compiler/src/main/kotlin/com/apollographql/apollo3/compiler/codegen/java/file/FragmentVariablesAdapterBuilder.kt b/libraries/apollo-compiler/src/main/kotlin/com/apollographql/apollo3/compiler/codegen/java/file/FragmentVariablesAdapterBuilder.kt index 38e0486e9b6..5bf64b6f229 100644 --- a/libraries/apollo-compiler/src/main/kotlin/com/apollographql/apollo3/compiler/codegen/java/file/FragmentVariablesAdapterBuilder.kt +++ b/libraries/apollo-compiler/src/main/kotlin/com/apollographql/apollo3/compiler/codegen/java/file/FragmentVariablesAdapterBuilder.kt @@ -4,7 +4,6 @@ import com.apollographql.apollo3.compiler.codegen.java.CodegenJavaFile import com.apollographql.apollo3.compiler.codegen.java.JavaClassBuilder import com.apollographql.apollo3.compiler.codegen.java.JavaContext import com.apollographql.apollo3.compiler.codegen.java.adapter.variableAdapterTypeSpec -import com.apollographql.apollo3.compiler.codegen.java.helpers.toNamedType import com.apollographql.apollo3.compiler.ir.IrFragmentDefinition import com.squareup.javapoet.ClassName import com.squareup.javapoet.TypeSpec @@ -31,7 +30,7 @@ internal class FragmentVariablesAdapterBuilder( } private fun typeSpec(): TypeSpec { - return fragment.variables.map { it.toNamedType() } + return fragment.variables .variableAdapterTypeSpec( context = context, adapterName = simpleName, diff --git a/libraries/apollo-compiler/src/main/kotlin/com/apollographql/apollo3/compiler/codegen/java/file/OperationVariablesAdapterBuilder.kt b/libraries/apollo-compiler/src/main/kotlin/com/apollographql/apollo3/compiler/codegen/java/file/OperationVariablesAdapterBuilder.kt index 3b2dfb5e69b..abbebb7afc2 100644 --- a/libraries/apollo-compiler/src/main/kotlin/com/apollographql/apollo3/compiler/codegen/java/file/OperationVariablesAdapterBuilder.kt +++ b/libraries/apollo-compiler/src/main/kotlin/com/apollographql/apollo3/compiler/codegen/java/file/OperationVariablesAdapterBuilder.kt @@ -4,7 +4,6 @@ import com.apollographql.apollo3.compiler.codegen.java.CodegenJavaFile import com.apollographql.apollo3.compiler.codegen.java.JavaClassBuilder import com.apollographql.apollo3.compiler.codegen.java.JavaContext import com.apollographql.apollo3.compiler.codegen.java.adapter.variableAdapterTypeSpec -import com.apollographql.apollo3.compiler.codegen.java.helpers.toNamedType import com.apollographql.apollo3.compiler.ir.IrOperation import com.squareup.javapoet.ClassName import com.squareup.javapoet.TypeSpec @@ -30,7 +29,7 @@ internal class OperationVariablesAdapterBuilder( } private fun typeSpec(): TypeSpec { - return operation.variables.map { it.toNamedType() } + return operation.variables .variableAdapterTypeSpec( context = context, adapterName = simpleName, diff --git a/libraries/apollo-compiler/src/main/kotlin/com/apollographql/apollo3/compiler/codegen/java/helpers/NamedType.kt b/libraries/apollo-compiler/src/main/kotlin/com/apollographql/apollo3/compiler/codegen/java/helpers/NamedType.kt index 7522b83c813..d7caafb9b46 100644 --- a/libraries/apollo-compiler/src/main/kotlin/com/apollographql/apollo3/compiler/codegen/java/helpers/NamedType.kt +++ b/libraries/apollo-compiler/src/main/kotlin/com/apollographql/apollo3/compiler/codegen/java/helpers/NamedType.kt @@ -17,8 +17,6 @@ internal class NamedType( val description: String?, val deprecationReason: String?, val type: IrType, - // Relevant only for variables - val defaultValue: IrValue?, ) @@ -39,7 +37,6 @@ internal fun IrInputField.toNamedType() = NamedType( type = type, description = description, deprecationReason = deprecationReason, - defaultValue = null, ) internal fun IrVariable.toNamedType() = NamedType( @@ -47,7 +44,6 @@ internal fun IrVariable.toNamedType() = NamedType( type = type, description = null, deprecationReason = null, - defaultValue = defaultValue, ) internal fun CodeBlock.Builder.beginOptionalControlFlow(propertyName: String, nullableFieldStyle: JavaNullable) { diff --git a/libraries/apollo-compiler/src/main/kotlin/com/apollographql/apollo3/compiler/codegen/java/helpers/Value.kt b/libraries/apollo-compiler/src/main/kotlin/com/apollographql/apollo3/compiler/codegen/java/helpers/Value.kt index 0d7bbfdf5a0..d71a8935b78 100644 --- a/libraries/apollo-compiler/src/main/kotlin/com/apollographql/apollo3/compiler/codegen/java/helpers/Value.kt +++ b/libraries/apollo-compiler/src/main/kotlin/com/apollographql/apollo3/compiler/codegen/java/helpers/Value.kt @@ -30,13 +30,36 @@ private fun IrObjectValue.codeBlock(): CodeBlock { }.toMapInitializerCodeblock() } +/** + * Converts an [IrValue] to its equivalent Kotlin expression as in `ApolloJsonElement` + * One exception is variables which get mapped to `CompiledVariable` + */ internal fun IrValue.codeBlock(): CodeBlock { return when (this) { is IrObjectValue -> codeBlock() is IrListValue -> codeBlock() - is IrEnumValue -> CodeBlock.of(S, value) // FIXME - is IrIntValue -> CodeBlock.of(L, value) - is IrFloatValue -> CodeBlock.of(L, value) + // Enums are serialized to JSON String + is IrEnumValue -> CodeBlock.of(S, value) + is IrIntValue -> { + val asInt = value.toIntOrNull() + if (asInt != null) { + // The value fits in kotlin Int + CodeBlock.of(L, value) + } else { + CodeBlock.of("new $T($S)", JavaClassNames.JsonNumber, value) + } + } + + is IrFloatValue -> { + val asDouble = value.toIntOrNull() + if (asDouble != null) { + // The value fits in a kotlin Double + CodeBlock.of(L, value) + } else { + CodeBlock.of("new $T($S)", JavaClassNames.JsonNumber, value) + } + } + is IrBooleanValue -> CodeBlock.of(L, value) is IrStringValue -> CodeBlock.of(S, value) is IrVariableValue -> CodeBlock.of("new $T($S)", JavaClassNames.CompiledVariable, name) diff --git a/libraries/apollo-compiler/src/main/kotlin/com/apollographql/apollo3/compiler/codegen/java/selections/CompiledSelectionsBuilder.kt b/libraries/apollo-compiler/src/main/kotlin/com/apollographql/apollo3/compiler/codegen/java/selections/CompiledSelectionsBuilder.kt index 07c7523eed8..0833dacd210 100644 --- a/libraries/apollo-compiler/src/main/kotlin/com/apollographql/apollo3/compiler/codegen/java/selections/CompiledSelectionsBuilder.kt +++ b/libraries/apollo-compiler/src/main/kotlin/com/apollographql/apollo3/compiler/codegen/java/selections/CompiledSelectionsBuilder.kt @@ -120,13 +120,19 @@ internal class CompiledSelectionsBuilder( private fun IrArgument.codeBlock(): CodeBlock { val argumentBuilder = CodeBlock.builder() argumentBuilder.add( - "new $T($S, $L)", + "new $T($S)", JavaClassNames.CompiledArgument, name, - value.codeBlock() ) - if (isKey) argumentBuilder.add(".isKey(true)") - if (isPagination) argumentBuilder.add(".isPagination(true)") + if (this.value != null) { + argumentBuilder.add(".value($L)", value.codeBlock()) + } + if (isKey) { + argumentBuilder.add(".isKey(true)") + } + if (isPagination) { + argumentBuilder.add(".isPagination(true)") + } argumentBuilder.add(".build()") return argumentBuilder.build() 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 d9c8409fbfe..faf795956a1 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 @@ -54,6 +54,7 @@ internal object KotlinSymbols { val False = ClassNames.False.toKotlinPoetClassName() val CompiledArgument = ClassNames.CompiledArgument.toKotlinPoetClassName() val CompiledVariable = ClassNames.CompiledVariable.toKotlinPoetClassName() + val JsonNumber = ClassNames.JsonNumber.toKotlinPoetClassName() val CompiledCondition = ClassNames.CompiledCondition.toKotlinPoetClassName() val CompiledField = ClassNames.CompiledField.toKotlinPoetClassName() val CompiledFieldBuilder = ClassNames.CompiledFieldBuilder.toKotlinPoetClassName() diff --git a/libraries/apollo-compiler/src/main/kotlin/com/apollographql/apollo3/compiler/codegen/kotlin/adapter/InputAdapter.kt b/libraries/apollo-compiler/src/main/kotlin/com/apollographql/apollo3/compiler/codegen/kotlin/adapter/InputAdapter.kt index af14b08f936..b109232ee72 100644 --- a/libraries/apollo-compiler/src/main/kotlin/com/apollographql/apollo3/compiler/codegen/kotlin/adapter/InputAdapter.kt +++ b/libraries/apollo-compiler/src/main/kotlin/com/apollographql/apollo3/compiler/codegen/kotlin/adapter/InputAdapter.kt @@ -49,7 +49,7 @@ internal fun List.inputAdapterTypeSpec( private fun notImplementedFromResponseFunSpec(adaptedTypeName: TypeName) = FunSpec.builder(fromJson) .addModifiers(KModifier.OVERRIDE) .addParameter(Identifier.reader, KotlinSymbols.JsonReader) - .addParameter(Identifier.customScalarAdapters, KotlinSymbols.CustomScalarAdapters) + .addParameter(customScalarAdapters, KotlinSymbols.CustomScalarAdapters) .returns(adaptedTypeName) .addCode("throw %T(%S)", ClassName("kotlin", "IllegalStateException"), "Input type used in output position") .build() @@ -62,7 +62,7 @@ private fun List.writeToResponseFunSpec( return FunSpec.builder(toJson) .addModifiers(KModifier.OVERRIDE) .addParameter(writer, KotlinSymbols.JsonWriter) - .addParameter(Identifier.customScalarAdapters, KotlinSymbols.CustomScalarAdapters) + .addParameter(customScalarAdapters, KotlinSymbols.CustomScalarAdapters) .addParameter(value, adaptedTypeName) .addCode(writeToResponseCodeBlock(context)) .build() diff --git a/libraries/apollo-compiler/src/main/kotlin/com/apollographql/apollo3/compiler/codegen/kotlin/adapter/VariablesAdapter.kt b/libraries/apollo-compiler/src/main/kotlin/com/apollographql/apollo3/compiler/codegen/kotlin/adapter/VariablesAdapter.kt index 5bf7987c0be..d5da76bd2e9 100644 --- a/libraries/apollo-compiler/src/main/kotlin/com/apollographql/apollo3/compiler/codegen/kotlin/adapter/VariablesAdapter.kt +++ b/libraries/apollo-compiler/src/main/kotlin/com/apollographql/apollo3/compiler/codegen/kotlin/adapter/VariablesAdapter.kt @@ -3,14 +3,12 @@ package com.apollographql.apollo3.compiler.codegen.kotlin.adapter import com.apollographql.apollo3.compiler.codegen.Identifier.customScalarAdapters import com.apollographql.apollo3.compiler.codegen.Identifier.serializeVariables import com.apollographql.apollo3.compiler.codegen.Identifier.value -import com.apollographql.apollo3.compiler.codegen.Identifier.withBooleanDefaultValues +import com.apollographql.apollo3.compiler.codegen.Identifier.withDefaultValues import com.apollographql.apollo3.compiler.codegen.Identifier.writer import com.apollographql.apollo3.compiler.codegen.kotlin.KotlinContext import com.apollographql.apollo3.compiler.codegen.kotlin.KotlinSymbols -import com.apollographql.apollo3.compiler.codegen.kotlin.helpers.NamedType -import com.apollographql.apollo3.compiler.codegen.kotlin.helpers.addSuppressions -import com.apollographql.apollo3.compiler.codegen.kotlin.helpers.requiresOptInAnnotation -import com.apollographql.apollo3.compiler.ir.IrBooleanValue +import com.apollographql.apollo3.compiler.codegen.kotlin.helpers.codeBlock +import com.apollographql.apollo3.compiler.ir.IrVariable import com.apollographql.apollo3.compiler.ir.isOptional import com.squareup.kotlinpoet.AnnotationSpec import com.squareup.kotlinpoet.CodeBlock @@ -18,26 +16,17 @@ import com.squareup.kotlinpoet.FunSpec import com.squareup.kotlinpoet.TypeName import com.squareup.kotlinpoet.TypeSpec -internal fun List.variablesAdapterTypeSpec( +internal fun List.variablesAdapterTypeSpec( context: KotlinContext, adapterName: String, adaptedTypeName: TypeName, ): TypeSpec { return TypeSpec.objectBuilder(adapterName) .addFunction(serializeVariablesFunSpec(context, adaptedTypeName)) - .apply { - addSuppressions(this@variablesAdapterTypeSpec.any { it.deprecationReason != null }) - if (any { it.optInFeature != null }) { - val requiresOptInAnnotation = context.resolver.resolveRequiresOptInAnnotation() - if (requiresOptInAnnotation != null) { - addAnnotation(requiresOptInAnnotation(requiresOptInAnnotation)) - } - } - } .build() } -private fun List.serializeVariablesFunSpec( +private fun List.serializeVariablesFunSpec( context: KotlinContext, adaptedTypeName: TypeName, ): FunSpec { @@ -45,13 +34,13 @@ private fun List.serializeVariablesFunSpec( .addParameter(writer, KotlinSymbols.JsonWriter) .addParameter(value, adaptedTypeName) .addParameter(customScalarAdapters, KotlinSymbols.CustomScalarAdapters) - .addParameter(withBooleanDefaultValues, KotlinSymbols.Boolean) + .addParameter(withDefaultValues, KotlinSymbols.Boolean) .addAnnotation(AnnotationSpec.builder(KotlinSymbols.Suppress).addMember("%S", "UNUSED_PARAMETER").addMember("%S", "UNUSED_VARIABLE").build()) .addCode(writeToResponseCodeBlock(context)) .build() } -private fun List.writeToResponseCodeBlock(context: KotlinContext): CodeBlock { +private fun List.writeToResponseCodeBlock(context: KotlinContext): CodeBlock { val builder = CodeBlock.builder() forEach { @@ -60,25 +49,25 @@ private fun List.writeToResponseCodeBlock(context: KotlinContext): Co return builder.build() } -private fun NamedType.writeToResponseCodeBlock(context: KotlinContext): CodeBlock { +private fun IrVariable.writeToResponseCodeBlock(context: KotlinContext): CodeBlock { val adapterInitializer = context.resolver.adapterInitializer(type, false, context.jsExport, customScalarAdapters) val builder = CodeBlock.builder() - val propertyName = context.layout.propertyName(graphQlName) + val propertyName = context.layout.propertyName(name) if (type.isOptional()) { builder.beginControlFlow("if ($value.%N is %T)", propertyName, KotlinSymbols.Present) } - builder.addStatement("$writer.name(%S)", graphQlName) + builder.addStatement("$writer.name(%S)", name) builder.addSerializeStatement(adapterInitializer, propertyName) if (type.isOptional()) { builder.endControlFlow() - if (defaultValue is IrBooleanValue) { - builder.beginControlFlow("else if ($withBooleanDefaultValues)") - builder.addStatement("$writer.name(%S)", graphQlName) + if (defaultValue != null) { + builder.beginControlFlow("else if ($withDefaultValues)") + builder.addStatement("$writer.name(%S)", name) builder.addStatement( "%M.toJson($writer, $customScalarAdapters, %L)", - KotlinSymbols.BooleanAdapter, - defaultValue.value, + KotlinSymbols.NullableAnyAdapter, + defaultValue.codeBlock(), ) builder.endControlFlow() diff --git a/libraries/apollo-compiler/src/main/kotlin/com/apollographql/apollo3/compiler/codegen/kotlin/file/ExecutableCommon.kt b/libraries/apollo-compiler/src/main/kotlin/com/apollographql/apollo3/compiler/codegen/kotlin/file/ExecutableCommon.kt index 5c52f39d0f9..c91072f6b28 100644 --- a/libraries/apollo-compiler/src/main/kotlin/com/apollographql/apollo3/compiler/codegen/kotlin/file/ExecutableCommon.kt +++ b/libraries/apollo-compiler/src/main/kotlin/com/apollographql/apollo3/compiler/codegen/kotlin/file/ExecutableCommon.kt @@ -6,7 +6,7 @@ import com.apollographql.apollo3.compiler.codegen.Identifier.root import com.apollographql.apollo3.compiler.codegen.Identifier.rootField import com.apollographql.apollo3.compiler.codegen.Identifier.selections import com.apollographql.apollo3.compiler.codegen.Identifier.serializeVariables -import com.apollographql.apollo3.compiler.codegen.Identifier.withBooleanDefaultValues +import com.apollographql.apollo3.compiler.codegen.Identifier.withDefaultValues import com.apollographql.apollo3.compiler.codegen.Identifier.writer import com.apollographql.apollo3.compiler.codegen.kotlin.KotlinContext import com.apollographql.apollo3.compiler.codegen.kotlin.KotlinSymbols @@ -31,7 +31,7 @@ internal fun serializeVariablesFunSpec( """.trimIndent()) } else { CodeBlock.of( - "%L.$serializeVariables($writer, this, $customScalarAdapters, $withBooleanDefaultValues)", + "%L.$serializeVariables($writer, this, $customScalarAdapters, $withDefaultValues)", CodeBlock.of("%T", adapterClassName) ) } @@ -39,7 +39,7 @@ internal fun serializeVariablesFunSpec( .addModifiers(KModifier.OVERRIDE) .addParameter(writer, KotlinSymbols.JsonWriter) .addParameter(customScalarAdapters, KotlinSymbols.CustomScalarAdapters) - .addParameter(withBooleanDefaultValues, KotlinSymbols.Boolean) + .addParameter(withDefaultValues, KotlinSymbols.Boolean) .addCode(body) .build() } diff --git a/libraries/apollo-compiler/src/main/kotlin/com/apollographql/apollo3/compiler/codegen/kotlin/file/FragmentVariablesAdapterBuilder.kt b/libraries/apollo-compiler/src/main/kotlin/com/apollographql/apollo3/compiler/codegen/kotlin/file/FragmentVariablesAdapterBuilder.kt index da51f8760e7..0ae757660a7 100644 --- a/libraries/apollo-compiler/src/main/kotlin/com/apollographql/apollo3/compiler/codegen/kotlin/file/FragmentVariablesAdapterBuilder.kt +++ b/libraries/apollo-compiler/src/main/kotlin/com/apollographql/apollo3/compiler/codegen/kotlin/file/FragmentVariablesAdapterBuilder.kt @@ -4,7 +4,6 @@ import com.apollographql.apollo3.compiler.codegen.kotlin.CgFile import com.apollographql.apollo3.compiler.codegen.kotlin.CgFileBuilder import com.apollographql.apollo3.compiler.codegen.kotlin.KotlinContext import com.apollographql.apollo3.compiler.codegen.kotlin.adapter.variablesAdapterTypeSpec -import com.apollographql.apollo3.compiler.codegen.kotlin.helpers.toNamedType import com.apollographql.apollo3.compiler.ir.IrFragmentDefinition import com.squareup.kotlinpoet.ClassName import com.squareup.kotlinpoet.TypeSpec @@ -32,7 +31,7 @@ internal class FragmentVariablesAdapterBuilder( } private fun typeSpec(): TypeSpec { - return fragment.variables.map { it.toNamedType() } + return fragment.variables .variablesAdapterTypeSpec( context = context, adapterName = simpleName, diff --git a/libraries/apollo-compiler/src/main/kotlin/com/apollographql/apollo3/compiler/codegen/kotlin/file/OperationVariablesAdapterBuilder.kt b/libraries/apollo-compiler/src/main/kotlin/com/apollographql/apollo3/compiler/codegen/kotlin/file/OperationVariablesAdapterBuilder.kt index 499ba16ec26..f9f0b27943e 100644 --- a/libraries/apollo-compiler/src/main/kotlin/com/apollographql/apollo3/compiler/codegen/kotlin/file/OperationVariablesAdapterBuilder.kt +++ b/libraries/apollo-compiler/src/main/kotlin/com/apollographql/apollo3/compiler/codegen/kotlin/file/OperationVariablesAdapterBuilder.kt @@ -4,7 +4,6 @@ import com.apollographql.apollo3.compiler.codegen.kotlin.CgFile import com.apollographql.apollo3.compiler.codegen.kotlin.CgFileBuilder import com.apollographql.apollo3.compiler.codegen.kotlin.KotlinContext import com.apollographql.apollo3.compiler.codegen.kotlin.adapter.variablesAdapterTypeSpec -import com.apollographql.apollo3.compiler.codegen.kotlin.helpers.toNamedType import com.apollographql.apollo3.compiler.ir.IrOperation import com.squareup.kotlinpoet.ClassName import com.squareup.kotlinpoet.TypeSpec @@ -31,7 +30,7 @@ internal class OperationVariablesAdapterBuilder( } private fun typeSpec(): TypeSpec { - return operation.variables.map { it.toNamedType() } + return operation.variables .variablesAdapterTypeSpec( context = context, adapterName = simpleName, diff --git a/libraries/apollo-compiler/src/main/kotlin/com/apollographql/apollo3/compiler/codegen/kotlin/helpers/NamedType.kt b/libraries/apollo-compiler/src/main/kotlin/com/apollographql/apollo3/compiler/codegen/kotlin/helpers/NamedType.kt index b1fac178798..2338ccc3960 100644 --- a/libraries/apollo-compiler/src/main/kotlin/com/apollographql/apollo3/compiler/codegen/kotlin/helpers/NamedType.kt +++ b/libraries/apollo-compiler/src/main/kotlin/com/apollographql/apollo3/compiler/codegen/kotlin/helpers/NamedType.kt @@ -22,10 +22,13 @@ internal class NamedType( val deprecationReason: String?, val optInFeature: String?, val type: IrType, - // Relevant only for variables - val defaultValue: IrValue?, ) +/** + * @param withDefaultArguments whether or not to codegen Absent for missing arguments. + * - true for clients + * - false for servers + */ internal fun NamedType.toParameterSpec(context: KotlinContext, withDefaultArguments: Boolean): ParameterSpec { return ParameterSpec .builder( @@ -92,7 +95,6 @@ internal fun IrInputField.toNamedType() = NamedType( description = description, deprecationReason = deprecationReason, optInFeature = optInFeature, - defaultValue = null, ) internal fun IrVariable.toNamedType() = NamedType( @@ -101,5 +103,4 @@ internal fun IrVariable.toNamedType() = NamedType( description = null, deprecationReason = null, optInFeature = null, - defaultValue = defaultValue, ) diff --git a/libraries/apollo-compiler/src/main/kotlin/com/apollographql/apollo3/compiler/codegen/kotlin/helpers/Value.kt b/libraries/apollo-compiler/src/main/kotlin/com/apollographql/apollo3/compiler/codegen/kotlin/helpers/Value.kt index 77e71599561..21c59ef6134 100644 --- a/libraries/apollo-compiler/src/main/kotlin/com/apollographql/apollo3/compiler/codegen/kotlin/helpers/Value.kt +++ b/libraries/apollo-compiler/src/main/kotlin/com/apollographql/apollo3/compiler/codegen/kotlin/helpers/Value.kt @@ -1,15 +1,5 @@ package com.apollographql.apollo3.compiler.codegen.kotlin.helpers -import com.apollographql.apollo3.ast.GQLBooleanValue -import com.apollographql.apollo3.ast.GQLEnumValue -import com.apollographql.apollo3.ast.GQLFloatValue -import com.apollographql.apollo3.ast.GQLIntValue -import com.apollographql.apollo3.ast.GQLListValue -import com.apollographql.apollo3.ast.GQLNullValue -import com.apollographql.apollo3.ast.GQLObjectValue -import com.apollographql.apollo3.ast.GQLStringValue -import com.apollographql.apollo3.ast.GQLValue -import com.apollographql.apollo3.ast.GQLVariableValue import com.apollographql.apollo3.compiler.codegen.kotlin.KotlinSymbols import com.apollographql.apollo3.compiler.ir.IrBooleanValue import com.apollographql.apollo3.compiler.ir.IrEnumValue @@ -41,12 +31,35 @@ private fun IrObjectValue.codeBlock(): CodeBlock { return fields.map { it.name to it.value.codeBlock() }.toMapInitializerCodeblock(true) } +/** + * Converts an [IrValue] to its equivalent Kotlin expression as in `ApolloJsonElement` + * One exception is variables which get mapped to `CompiledVariable` + */ internal fun IrValue.codeBlock(): CodeBlock { return when (this) { is IrBooleanValue -> CodeBlock.of("%L", value) - is IrEnumValue -> CodeBlock.of("%S", value) // FIXME - is IrFloatValue -> CodeBlock.of("%L", value) - is IrIntValue -> CodeBlock.of("%L", value) + // Enums are serialized to JSON String + is IrEnumValue -> CodeBlock.of("%S", value) + is IrIntValue -> { + val asInt = value.toIntOrNull() + if (asInt != null) { + // The value fits in kotlin Int + CodeBlock.of("%L", value) + } else { + CodeBlock.of("%T(%S)", KotlinSymbols.JsonNumber, value) + } + } + + is IrFloatValue -> { + val asDouble = value.toIntOrNull() + if (asDouble != null) { + // The value fits in a kotlin Double + CodeBlock.of("%L", value) + } else { + CodeBlock.of("%T(%S)", KotlinSymbols.JsonNumber, value) + } + } + is IrListValue -> codeBlock() IrNullValue -> CodeBlock.of("null") is IrObjectValue -> codeBlock() diff --git a/libraries/apollo-compiler/src/main/kotlin/com/apollographql/apollo3/compiler/codegen/kotlin/selections/CompiledSelectionsBuilder.kt b/libraries/apollo-compiler/src/main/kotlin/com/apollographql/apollo3/compiler/codegen/kotlin/selections/CompiledSelectionsBuilder.kt index e502c9a793a..5cbdb9b9182 100644 --- a/libraries/apollo-compiler/src/main/kotlin/com/apollographql/apollo3/compiler/codegen/kotlin/selections/CompiledSelectionsBuilder.kt +++ b/libraries/apollo-compiler/src/main/kotlin/com/apollographql/apollo3/compiler/codegen/kotlin/selections/CompiledSelectionsBuilder.kt @@ -125,12 +125,14 @@ internal class CompiledSelectionsBuilder( private fun IrArgument.codeBlock(): CodeBlock { val argumentBuilder = CodeBlock.builder() argumentBuilder.add( - "%T(%S,·%L)", + "%T(%S)", KotlinSymbols.CompiledArgument, name, - value.codeBlock() ) + if (this.value != null) { + argumentBuilder.add(".value(%L)", value.codeBlock()) + } if (isKey) { argumentBuilder.add(".isKey(true)") } diff --git a/libraries/apollo-compiler/src/main/kotlin/com/apollographql/apollo3/compiler/ir/IrOperations.kt b/libraries/apollo-compiler/src/main/kotlin/com/apollographql/apollo3/compiler/ir/IrOperations.kt index 00633c0854b..58716e7151b 100644 --- a/libraries/apollo-compiler/src/main/kotlin/com/apollographql/apollo3/compiler/ir/IrOperations.kt +++ b/libraries/apollo-compiler/src/main/kotlin/com/apollographql/apollo3/compiler/ir/IrOperations.kt @@ -101,9 +101,12 @@ internal data class IrField( @Serializable internal data class IrArgument( val name: String, - val value: IrValue, - val isKey: Boolean = false, - val isPagination: Boolean = false, + /** + * The value for this argument. May be null if the argument is absent + */ + val value: IrValue?, + val isKey: Boolean, + val isPagination: Boolean, ) @Serializable @@ -330,8 +333,11 @@ internal data class IrModelGroup( @Serializable internal data class IrVariable( val name: String, - val defaultValue: IrValue?, val type: IrType, + /** + * Used in `Operation.serializeVariables` + */ + val defaultValue: IrValue? ) private val json = Json { classDiscriminator = "#class" } diff --git a/libraries/apollo-compiler/src/main/kotlin/com/apollographql/apollo3/compiler/ir/IrOperationsBuilder.kt b/libraries/apollo-compiler/src/main/kotlin/com/apollographql/apollo3/compiler/ir/IrOperationsBuilder.kt index 7f394697d1b..f47a7b616ad 100644 --- a/libraries/apollo-compiler/src/main/kotlin/com/apollographql/apollo3/compiler/ir/IrOperationsBuilder.kt +++ b/libraries/apollo-compiler/src/main/kotlin/com/apollographql/apollo3/compiler/ir/IrOperationsBuilder.kt @@ -31,7 +31,6 @@ import com.apollographql.apollo3.ast.InferredVariable import com.apollographql.apollo3.ast.Schema import com.apollographql.apollo3.ast.TransformResult import com.apollographql.apollo3.ast.VariableUsage -import com.apollographql.apollo3.ast.coerceInSchemaContextOrThrow import com.apollographql.apollo3.ast.definitionFromScope import com.apollographql.apollo3.ast.fieldDefinitions import com.apollographql.apollo3.ast.findDeprecationReason @@ -408,22 +407,20 @@ internal class IrOperationsBuilder( } return IrVariable( name = name, - defaultValue = null, type = irType, + defaultValue = null ) } private fun GQLVariableDefinition.toIr(): IrVariable { - val coercedDefaultValue = defaultValue?.coerceInSchemaContextOrThrow(type, schema) - var irType = type.toIr() when { - irType is IrNonNullType && coercedDefaultValue == null -> { + irType is IrNonNullType && defaultValue == null -> { // The variable is non-nullable and has no defaultValue => it must always be sent // Leave irType as-is } - coercedDefaultValue != null -> { + defaultValue != null -> { // the variable has a defaultValue meaning that there is a use case for not providing it irType = irType.makeOptional() } @@ -448,8 +445,8 @@ internal class IrOperationsBuilder( return IrVariable( name = name, - defaultValue = coercedDefaultValue?.toIrValue(), type = irType, + defaultValue = defaultValue?.toIrValue() ) } @@ -700,8 +697,8 @@ internal class IrOperationsBuilder( internal fun GQLValue.toIrValue(): IrValue { return when (this) { is GQLIntValue -> IrIntValue(value = value) - is GQLStringValue -> IrStringValue(value = value) is GQLFloatValue -> IrFloatValue(value = value) + is GQLStringValue -> IrStringValue(value = value) is GQLBooleanValue -> IrBooleanValue(value = value) is GQLEnumValue -> IrEnumValue(value = value) is GQLNullValue -> IrNullValue diff --git a/libraries/apollo-compiler/src/main/kotlin/com/apollographql/apollo3/compiler/ir/IrSchema.kt b/libraries/apollo-compiler/src/main/kotlin/com/apollographql/apollo3/compiler/ir/IrSchema.kt index 897e398e6ef..02c13d9d3b0 100644 --- a/libraries/apollo-compiler/src/main/kotlin/com/apollographql/apollo3/compiler/ir/IrSchema.kt +++ b/libraries/apollo-compiler/src/main/kotlin/com/apollographql/apollo3/compiler/ir/IrSchema.kt @@ -15,7 +15,6 @@ import com.apollographql.apollo3.ast.GQLType import com.apollographql.apollo3.ast.GQLUnionTypeDefinition import com.apollographql.apollo3.ast.Schema import com.apollographql.apollo3.ast.Schema.Companion.TYPE_POLICY -import com.apollographql.apollo3.ast.coerceInExecutableContextOrThrow import com.apollographql.apollo3.ast.findDeprecationReason import com.apollographql.apollo3.ast.findOptInFeature import com.apollographql.apollo3.ast.findTargetName @@ -145,7 +144,6 @@ internal data class IrInputField( val deprecationReason: String?, val optInFeature: String?, val type: IrType, - val defaultValue: IrValue?, ) internal fun GQLEnumTypeDefinition.toIr(schema: Schema): IrEnum { @@ -292,10 +290,8 @@ private fun GQLType.toIrType2(schema: Schema): IrType2 { * This is not named `toIr` as [GQLInputValueDefinition] also maps to variables and arguments */ private fun GQLInputValueDefinition.toIrInputField(schema: Schema): IrInputField { - val coercedDefaultValue = defaultValue?.coerceInExecutableContextOrThrow(type, schema) - var irType = type.toIr(schema) - if (type !is GQLNonNullType || coercedDefaultValue != null) { + if (type !is GQLNonNullType || defaultValue != null) { /** * Contrary to [IrVariable], we default to making input fields optional as they are out of control of the user, and * we don't want to force users to fill all values to define an input object @@ -308,7 +304,6 @@ private fun GQLInputValueDefinition.toIrInputField(schema: Schema): IrInputField deprecationReason = directives.findDeprecationReason(), optInFeature = directives.findOptInFeature(schema), type = irType, - defaultValue = coercedDefaultValue?.toIrValue(), ) } diff --git a/libraries/apollo-compiler/src/main/kotlin/com/apollographql/apollo3/compiler/ir/IrValue.kt b/libraries/apollo-compiler/src/main/kotlin/com/apollographql/apollo3/compiler/ir/IrValue.kt index e0a16dc861d..26794f2ba62 100644 --- a/libraries/apollo-compiler/src/main/kotlin/com/apollographql/apollo3/compiler/ir/IrValue.kt +++ b/libraries/apollo-compiler/src/main/kotlin/com/apollographql/apollo3/compiler/ir/IrValue.kt @@ -3,15 +3,14 @@ package com.apollographql.apollo3.compiler.ir import kotlinx.serialization.SerialName import kotlinx.serialization.Serializable - @Serializable internal sealed class IrValue @Serializable @SerialName("int") -internal data class IrIntValue(val value: Int) : IrValue() +internal data class IrIntValue(val value: String) : IrValue() @Serializable @SerialName("float") -internal data class IrFloatValue(val value: Double) : IrValue() +internal data class IrFloatValue(val value: String) : IrValue() @Serializable @SerialName("string") internal data class IrStringValue(val value: String) : IrValue() diff --git a/libraries/apollo-compiler/src/main/kotlin/com/apollographql/apollo3/compiler/ir/SelectionSetsBuilder.kt b/libraries/apollo-compiler/src/main/kotlin/com/apollographql/apollo3/compiler/ir/SelectionSetsBuilder.kt index ccf0f27e112..d7f7525e947 100644 --- a/libraries/apollo-compiler/src/main/kotlin/com/apollographql/apollo3/compiler/ir/SelectionSetsBuilder.kt +++ b/libraries/apollo-compiler/src/main/kotlin/com/apollographql/apollo3/compiler/ir/SelectionSetsBuilder.kt @@ -11,6 +11,7 @@ import com.apollographql.apollo3.ast.GQLNonNullType import com.apollographql.apollo3.ast.GQLSelection import com.apollographql.apollo3.ast.GQLType import com.apollographql.apollo3.ast.Schema +import com.apollographql.apollo3.ast.coerceInExecutableContextOrThrow import com.apollographql.apollo3.ast.definitionFromScope import com.apollographql.apollo3.ast.rawType import com.apollographql.apollo3.compiler.capitalizeFirstLetter @@ -79,19 +80,35 @@ internal class SelectionSetsBuilder( val fieldDefinition = definitionFromScope(schema, parentType)!! val selectionSetName = resolveNameClashes(usedNames, name) + + /** + * Pull all arguments from the schema as we need them to compute the cache key + */ + val typeDefinition = schema.typeDefinition(parentType) + val actualArguments = fieldDefinition.arguments.map { schemaArgument -> + val operationArgument = arguments.firstOrNull { it.name == schemaArgument.name } + + val keyArgs = typeDefinition.keyArgs(name, schema) + val paginationArgs = typeDefinition.paginationArgs(name, schema) + + /** + * When passed explicitly, the argument values are coerced (but not their default value) + */ + val userValue = operationArgument?.value?.coerceInExecutableContextOrThrow(schemaArgument.type, schema) + IrArgument( + name = schemaArgument.name, + value = (userValue ?: schemaArgument.defaultValue)?.toIrValue(), + isKey = keyArgs.contains(schemaArgument.name), + isPagination = paginationArgs.contains(schemaArgument.name) + ) + } + return WalkResult( self = IrField( name = name, alias = alias, type = fieldDefinition.type.toIrTypeRef(), - arguments = arguments.let { gqlArguments -> - val typeDefinition = schema.typeDefinition(parentType) - val keyArgs = typeDefinition.keyArgs(name, schema) - val paginationArgs = typeDefinition.paginationArgs(name, schema) - gqlArguments.map { gqlArgument -> - gqlArgument.toIr(keyArgs, paginationArgs) - } - }, + arguments = actualArguments, condition = expression, selectionSetName = if (selections.isNotEmpty()) selectionSetName else null ), diff --git a/libraries/apollo-compiler/src/test/graphql/com/example/antlr_tokens/java/operationBased/antlr_tokens/TestQuery.java.expected b/libraries/apollo-compiler/src/test/graphql/com/example/antlr_tokens/java/operationBased/antlr_tokens/TestQuery.java.expected index 524b4ec9652..206ffdd92fd 100644 --- a/libraries/apollo-compiler/src/test/graphql/com/example/antlr_tokens/java/operationBased/antlr_tokens/TestQuery.java.expected +++ b/libraries/apollo-compiler/src/test/graphql/com/example/antlr_tokens/java/operationBased/antlr_tokens/TestQuery.java.expected @@ -106,8 +106,8 @@ public class TestQuery implements Query { @Override public void serializeVariables(JsonWriter writer, CustomScalarAdapters customScalarAdapters, - boolean withBooleanDefaultValues) throws IOException { - TestQuery_VariablesAdapter.INSTANCE.serializeVariables(writer, this, customScalarAdapters, withBooleanDefaultValues); + boolean withDefaultValues) throws IOException { + TestQuery_VariablesAdapter.INSTANCE.serializeVariables(writer, this, customScalarAdapters, withDefaultValues); } @Override diff --git a/libraries/apollo-compiler/src/test/graphql/com/example/antlr_tokens/java/operationBased/antlr_tokens/adapter/TestQuery_VariablesAdapter.java.expected b/libraries/apollo-compiler/src/test/graphql/com/example/antlr_tokens/java/operationBased/antlr_tokens/adapter/TestQuery_VariablesAdapter.java.expected index f4bcad7b437..6965b5e2af0 100644 --- a/libraries/apollo-compiler/src/test/graphql/com/example/antlr_tokens/java/operationBased/antlr_tokens/adapter/TestQuery_VariablesAdapter.java.expected +++ b/libraries/apollo-compiler/src/test/graphql/com/example/antlr_tokens/java/operationBased/antlr_tokens/adapter/TestQuery_VariablesAdapter.java.expected @@ -18,8 +18,7 @@ public enum TestQuery_VariablesAdapter { INSTANCE; public void serializeVariables(JsonWriter writer, TestQuery value, - CustomScalarAdapters customScalarAdapters, boolean withBooleanDefaultValues) throws - IOException { + CustomScalarAdapters customScalarAdapters, boolean withDefaultValues) throws IOException { CompositeAdapterContext adapterContext = new CompositeAdapterContext.Builder().customScalarAdapters(customScalarAdapters).build(); if (value.operation instanceof Optional.Present) { writer.name("operation"); diff --git a/libraries/apollo-compiler/src/test/graphql/com/example/antlr_tokens/java/operationBased/antlr_tokens/selections/TestQuerySelections.java.expected b/libraries/apollo-compiler/src/test/graphql/com/example/antlr_tokens/java/operationBased/antlr_tokens/selections/TestQuerySelections.java.expected index 1ccf3007bf0..6615623e938 100644 --- a/libraries/apollo-compiler/src/test/graphql/com/example/antlr_tokens/java/operationBased/antlr_tokens/selections/TestQuerySelections.java.expected +++ b/libraries/apollo-compiler/src/test/graphql/com/example/antlr_tokens/java/operationBased/antlr_tokens/selections/TestQuerySelections.java.expected @@ -17,8 +17,8 @@ import java.util.List; public class TestQuerySelections { private static List __typeWithGraphQLKeywords = Arrays.asList( new CompiledField.Builder("on", GraphQLString.type).build(), - new CompiledField.Builder("null", GraphQLString.type).arguments(Arrays.asList(new CompiledArgument.Builder("fragment", new CompiledVariable("operation")).build())).build(), - new CompiledField.Builder("null", GraphQLString.type).alias("alias").arguments(Arrays.asList(new CompiledArgument.Builder("fragment", "A string\n" + new CompiledField.Builder("null", GraphQLString.type).arguments(Arrays.asList(new CompiledArgument.Builder("fragment").value(new CompiledVariable("operation")).build())).build(), + new CompiledField.Builder("null", GraphQLString.type).alias("alias").arguments(Arrays.asList(new CompiledArgument.Builder("fragment").value("A string\n" + "with a new line").build())).build() ); diff --git a/libraries/apollo-compiler/src/test/graphql/com/example/antlr_tokens/kotlin/responseBased/antlr_tokens/TestQuery.kt.expected b/libraries/apollo-compiler/src/test/graphql/com/example/antlr_tokens/kotlin/responseBased/antlr_tokens/TestQuery.kt.expected index d821958d971..39b7320b370 100644 --- a/libraries/apollo-compiler/src/test/graphql/com/example/antlr_tokens/kotlin/responseBased/antlr_tokens/TestQuery.kt.expected +++ b/libraries/apollo-compiler/src/test/graphql/com/example/antlr_tokens/kotlin/responseBased/antlr_tokens/TestQuery.kt.expected @@ -32,10 +32,10 @@ public data class TestQuery( override fun serializeVariables( writer: JsonWriter, customScalarAdapters: CustomScalarAdapters, - withBooleanDefaultValues: Boolean, + withDefaultValues: Boolean, ) { TestQuery_VariablesAdapter.serializeVariables(writer, this, customScalarAdapters, - withBooleanDefaultValues) + withDefaultValues) } override fun adapter(): CompositeAdapter = TestQuery_ResponseAdapter.Data.obj() diff --git a/libraries/apollo-compiler/src/test/graphql/com/example/antlr_tokens/kotlin/responseBased/antlr_tokens/adapter/TestQuery_VariablesAdapter.kt.expected b/libraries/apollo-compiler/src/test/graphql/com/example/antlr_tokens/kotlin/responseBased/antlr_tokens/adapter/TestQuery_VariablesAdapter.kt.expected index 3cc576806cf..feba4edfc58 100644 --- a/libraries/apollo-compiler/src/test/graphql/com/example/antlr_tokens/kotlin/responseBased/antlr_tokens/adapter/TestQuery_VariablesAdapter.kt.expected +++ b/libraries/apollo-compiler/src/test/graphql/com/example/antlr_tokens/kotlin/responseBased/antlr_tokens/adapter/TestQuery_VariablesAdapter.kt.expected @@ -23,7 +23,7 @@ public object TestQuery_VariablesAdapter { writer: JsonWriter, `value`: TestQuery, customScalarAdapters: CustomScalarAdapters, - withBooleanDefaultValues: Boolean, + withDefaultValues: Boolean, ) { if (value.operation is Optional.Present) { writer.name("operation") diff --git a/libraries/apollo-compiler/src/test/graphql/com/example/antlr_tokens/kotlin/responseBased/antlr_tokens/selections/TestQuerySelections.kt.expected b/libraries/apollo-compiler/src/test/graphql/com/example/antlr_tokens/kotlin/responseBased/antlr_tokens/selections/TestQuerySelections.kt.expected index 391d5926d64..19029e26631 100644 --- a/libraries/apollo-compiler/src/test/graphql/com/example/antlr_tokens/kotlin/responseBased/antlr_tokens/selections/TestQuerySelections.kt.expected +++ b/libraries/apollo-compiler/src/test/graphql/com/example/antlr_tokens/kotlin/responseBased/antlr_tokens/selections/TestQuerySelections.kt.expected @@ -23,7 +23,7 @@ public object TestQuerySelections { name = "null", type = GraphQLString.type ).arguments(listOf( - CompiledArgument.Builder("fragment", CompiledVariable("operation")).build() + CompiledArgument.Builder("fragment").value(CompiledVariable("operation")).build() )) .build(), CompiledField.Builder( @@ -31,7 +31,7 @@ public object TestQuerySelections { type = GraphQLString.type ).alias("alias") .arguments(listOf( - CompiledArgument.Builder("fragment", """ + CompiledArgument.Builder("fragment").value(""" |A string |with a new line """.trimMargin()).build() diff --git a/libraries/apollo-compiler/src/test/graphql/com/example/arguments_hardcoded/java/operationBased/arguments_hardcoded/TestQuery.java.expected b/libraries/apollo-compiler/src/test/graphql/com/example/arguments_hardcoded/java/operationBased/arguments_hardcoded/TestQuery.java.expected index c2aa6acc9b1..ff9a37a9aa0 100644 --- a/libraries/apollo-compiler/src/test/graphql/com/example/arguments_hardcoded/java/operationBased/arguments_hardcoded/TestQuery.java.expected +++ b/libraries/apollo-compiler/src/test/graphql/com/example/arguments_hardcoded/java/operationBased/arguments_hardcoded/TestQuery.java.expected @@ -100,7 +100,7 @@ public class TestQuery implements Query { @Override public void serializeVariables(JsonWriter writer, CustomScalarAdapters customScalarAdapters, - boolean withBooleanDefaultValues) throws IOException { + boolean withDefaultValues) throws IOException { // This operation doesn't have any variable } diff --git a/libraries/apollo-compiler/src/test/graphql/com/example/arguments_hardcoded/java/operationBased/arguments_hardcoded/selections/TestQuerySelections.java.expected b/libraries/apollo-compiler/src/test/graphql/com/example/arguments_hardcoded/java/operationBased/arguments_hardcoded/selections/TestQuerySelections.java.expected index cd4a010f172..1e05c407207 100644 --- a/libraries/apollo-compiler/src/test/graphql/com/example/arguments_hardcoded/java/operationBased/arguments_hardcoded/selections/TestQuerySelections.java.expected +++ b/libraries/apollo-compiler/src/test/graphql/com/example/arguments_hardcoded/java/operationBased/arguments_hardcoded/selections/TestQuerySelections.java.expected @@ -10,6 +10,7 @@ import com.apollographql.apollo3.api.CompiledField; import com.apollographql.apollo3.api.CompiledListType; import com.apollographql.apollo3.api.CompiledNotNullType; import com.apollographql.apollo3.api.CompiledSelection; +import com.apollographql.apollo3.api.json.JsonNumber; import com.example.arguments_hardcoded.type.GraphQLInt; import com.example.arguments_hardcoded.type.GraphQLString; import com.example.arguments_hardcoded.type.Review; @@ -23,7 +24,7 @@ public class TestQuerySelections { ); public static List __root = Arrays.asList( - new CompiledField.Builder("reviews", new CompiledListType(Review.type)).arguments(Arrays.asList(new CompiledArgument.Builder("episode", "JEDI").build(), new CompiledArgument.Builder("starsFloat", 9.9).build(), new CompiledArgument.Builder("starsInt", 10).build())).selections(__reviews).build(), - new CompiledField.Builder("testNullableArguments", new CompiledNotNullType(GraphQLInt.type)).arguments(Arrays.asList(new CompiledArgument.Builder("boolean", null).build(), new CompiledArgument.Builder("episode", null).build(), new CompiledArgument.Builder("float", null).build(), new CompiledArgument.Builder("int", null).build(), new CompiledArgument.Builder("list", null).build(), new CompiledArgument.Builder("review", null).build(), new CompiledArgument.Builder("string", null).build())).build() + new CompiledField.Builder("reviews", new CompiledListType(Review.type)).arguments(Arrays.asList(new CompiledArgument.Builder("episode").value("JEDI").build(), new CompiledArgument.Builder("starsFloat").value(new JsonNumber("9.9")).build(), new CompiledArgument.Builder("starsInt").value(10).build())).selections(__reviews).build(), + new CompiledField.Builder("testNullableArguments", new CompiledNotNullType(GraphQLInt.type)).arguments(Arrays.asList(new CompiledArgument.Builder("boolean").value(null).build(), new CompiledArgument.Builder("episode").value(null).build(), new CompiledArgument.Builder("float").value(null).build(), new CompiledArgument.Builder("int").value(null).build(), new CompiledArgument.Builder("list").value(null).build(), new CompiledArgument.Builder("review").value(null).build(), new CompiledArgument.Builder("string").value(null).build())).build() ); } diff --git a/libraries/apollo-compiler/src/test/graphql/com/example/arguments_hardcoded/kotlin/responseBased/arguments_hardcoded/TestQuery.kt.expected b/libraries/apollo-compiler/src/test/graphql/com/example/arguments_hardcoded/kotlin/responseBased/arguments_hardcoded/TestQuery.kt.expected index 13614657980..b8b6281e853 100644 --- a/libraries/apollo-compiler/src/test/graphql/com/example/arguments_hardcoded/kotlin/responseBased/arguments_hardcoded/TestQuery.kt.expected +++ b/libraries/apollo-compiler/src/test/graphql/com/example/arguments_hardcoded/kotlin/responseBased/arguments_hardcoded/TestQuery.kt.expected @@ -35,7 +35,7 @@ public class TestQuery() : Query { override fun serializeVariables( writer: JsonWriter, customScalarAdapters: CustomScalarAdapters, - withBooleanDefaultValues: Boolean, + withDefaultValues: Boolean, ) { // This operation doesn't have any variable } diff --git a/libraries/apollo-compiler/src/test/graphql/com/example/arguments_hardcoded/kotlin/responseBased/arguments_hardcoded/selections/TestQuerySelections.kt.expected b/libraries/apollo-compiler/src/test/graphql/com/example/arguments_hardcoded/kotlin/responseBased/arguments_hardcoded/selections/TestQuerySelections.kt.expected index b74b7ea3b14..b689589a69e 100644 --- a/libraries/apollo-compiler/src/test/graphql/com/example/arguments_hardcoded/kotlin/responseBased/arguments_hardcoded/selections/TestQuerySelections.kt.expected +++ b/libraries/apollo-compiler/src/test/graphql/com/example/arguments_hardcoded/kotlin/responseBased/arguments_hardcoded/selections/TestQuerySelections.kt.expected @@ -8,6 +8,7 @@ package com.example.arguments_hardcoded.selections import com.apollographql.apollo3.api.CompiledArgument import com.apollographql.apollo3.api.CompiledField import com.apollographql.apollo3.api.CompiledSelection +import com.apollographql.apollo3.api.json.JsonNumber import com.apollographql.apollo3.api.list import com.apollographql.apollo3.api.notNull import com.example.arguments_hardcoded.type.GraphQLInt @@ -32,9 +33,9 @@ public object TestQuerySelections { name = "reviews", type = Review.type.list() ).arguments(listOf( - CompiledArgument.Builder("episode", "JEDI").build(), - CompiledArgument.Builder("starsFloat", 9.9).build(), - CompiledArgument.Builder("starsInt", 10).build() + CompiledArgument.Builder("episode").value("JEDI").build(), + CompiledArgument.Builder("starsFloat").value(JsonNumber("9.9")).build(), + CompiledArgument.Builder("starsInt").value(10).build() )) .selections(__reviews) .build(), @@ -42,13 +43,13 @@ public object TestQuerySelections { name = "testNullableArguments", type = GraphQLInt.type.notNull() ).arguments(listOf( - CompiledArgument.Builder("boolean", null).build(), - CompiledArgument.Builder("episode", null).build(), - CompiledArgument.Builder("float", null).build(), - CompiledArgument.Builder("int", null).build(), - CompiledArgument.Builder("list", null).build(), - CompiledArgument.Builder("review", null).build(), - CompiledArgument.Builder("string", null).build() + CompiledArgument.Builder("boolean").value(null).build(), + CompiledArgument.Builder("episode").value(null).build(), + CompiledArgument.Builder("float").value(null).build(), + CompiledArgument.Builder("int").value(null).build(), + CompiledArgument.Builder("list").value(null).build(), + CompiledArgument.Builder("review").value(null).build(), + CompiledArgument.Builder("string").value(null).build() )) .build() ) diff --git a/libraries/apollo-compiler/src/test/graphql/com/example/big_query/kotlin/responseBased/big_query/TestQuery.kt.expected b/libraries/apollo-compiler/src/test/graphql/com/example/big_query/kotlin/responseBased/big_query/TestQuery.kt.expected index d534a38122d..3c2fd16dc5e 100644 --- a/libraries/apollo-compiler/src/test/graphql/com/example/big_query/kotlin/responseBased/big_query/TestQuery.kt.expected +++ b/libraries/apollo-compiler/src/test/graphql/com/example/big_query/kotlin/responseBased/big_query/TestQuery.kt.expected @@ -34,7 +34,7 @@ public class TestQuery() : Query { override fun serializeVariables( writer: JsonWriter, customScalarAdapters: CustomScalarAdapters, - withBooleanDefaultValues: Boolean, + withDefaultValues: Boolean, ) { // This operation doesn't have any variable } diff --git a/libraries/apollo-compiler/src/test/graphql/com/example/big_query/kotlin/responseBased/big_query/selections/TestQuerySelections.kt.expected b/libraries/apollo-compiler/src/test/graphql/com/example/big_query/kotlin/responseBased/big_query/selections/TestQuerySelections.kt.expected index f2e1b6a2b6c..30c7738937f 100644 --- a/libraries/apollo-compiler/src/test/graphql/com/example/big_query/kotlin/responseBased/big_query/selections/TestQuerySelections.kt.expected +++ b/libraries/apollo-compiler/src/test/graphql/com/example/big_query/kotlin/responseBased/big_query/selections/TestQuerySelections.kt.expected @@ -26,7 +26,7 @@ public object TestQuerySelections { name = "character", type = Character.type ).arguments(listOf( - CompiledArgument.Builder("id", "vvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoi").build() + CompiledArgument.Builder("id").value("vvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoivvoihoihoihoihoihoihoihoihoihoihoi").build() )) .selections(__character) .build() diff --git a/libraries/apollo-compiler/src/test/graphql/com/example/capitalized_fields/java/operationBased/capitalized_fields/TestQuery.java.expected b/libraries/apollo-compiler/src/test/graphql/com/example/capitalized_fields/java/operationBased/capitalized_fields/TestQuery.java.expected index 8d32c6e21db..f6f7780f53b 100644 --- a/libraries/apollo-compiler/src/test/graphql/com/example/capitalized_fields/java/operationBased/capitalized_fields/TestQuery.java.expected +++ b/libraries/apollo-compiler/src/test/graphql/com/example/capitalized_fields/java/operationBased/capitalized_fields/TestQuery.java.expected @@ -102,7 +102,7 @@ public class TestQuery implements Query { @Override public void serializeVariables(JsonWriter writer, CustomScalarAdapters customScalarAdapters, - boolean withBooleanDefaultValues) throws IOException { + boolean withDefaultValues) throws IOException { // This operation doesn't have any variable } diff --git a/libraries/apollo-compiler/src/test/graphql/com/example/capitalized_fields/kotlin/operationBased/capitalized_fields/TestQuery.kt.expected b/libraries/apollo-compiler/src/test/graphql/com/example/capitalized_fields/kotlin/operationBased/capitalized_fields/TestQuery.kt.expected index 7e1d4eeb02d..61dd6e07d6b 100644 --- a/libraries/apollo-compiler/src/test/graphql/com/example/capitalized_fields/kotlin/operationBased/capitalized_fields/TestQuery.kt.expected +++ b/libraries/apollo-compiler/src/test/graphql/com/example/capitalized_fields/kotlin/operationBased/capitalized_fields/TestQuery.kt.expected @@ -34,7 +34,7 @@ public class TestQuery() : Query { override fun serializeVariables( writer: JsonWriter, customScalarAdapters: CustomScalarAdapters, - withBooleanDefaultValues: Boolean, + withDefaultValues: Boolean, ) { // This operation doesn't have any variable } diff --git a/libraries/apollo-compiler/src/test/graphql/com/example/capitalized_fields/kotlin/responseBased/capitalized_fields/TestQuery.kt.expected b/libraries/apollo-compiler/src/test/graphql/com/example/capitalized_fields/kotlin/responseBased/capitalized_fields/TestQuery.kt.expected index 2ca76cc2033..5c303c3cc2d 100644 --- a/libraries/apollo-compiler/src/test/graphql/com/example/capitalized_fields/kotlin/responseBased/capitalized_fields/TestQuery.kt.expected +++ b/libraries/apollo-compiler/src/test/graphql/com/example/capitalized_fields/kotlin/responseBased/capitalized_fields/TestQuery.kt.expected @@ -34,7 +34,7 @@ public class TestQuery() : Query { override fun serializeVariables( writer: JsonWriter, customScalarAdapters: CustomScalarAdapters, - withBooleanDefaultValues: Boolean, + withDefaultValues: Boolean, ) { // This operation doesn't have any variable } diff --git a/libraries/apollo-compiler/src/test/graphql/com/example/case_sensitive_enum/java/operationBased/case_sensitive_enum/TestQuery.java.expected b/libraries/apollo-compiler/src/test/graphql/com/example/case_sensitive_enum/java/operationBased/case_sensitive_enum/TestQuery.java.expected index e8bc6eafa7a..e509d2b6155 100644 --- a/libraries/apollo-compiler/src/test/graphql/com/example/case_sensitive_enum/java/operationBased/case_sensitive_enum/TestQuery.java.expected +++ b/libraries/apollo-compiler/src/test/graphql/com/example/case_sensitive_enum/java/operationBased/case_sensitive_enum/TestQuery.java.expected @@ -95,7 +95,7 @@ public class TestQuery implements Query { @Override public void serializeVariables(JsonWriter writer, CustomScalarAdapters customScalarAdapters, - boolean withBooleanDefaultValues) throws IOException { + boolean withDefaultValues) throws IOException { // This operation doesn't have any variable } diff --git a/libraries/apollo-compiler/src/test/graphql/com/example/case_sensitive_enum/kotlin/responseBased/case_sensitive_enum/TestQuery.kt.expected b/libraries/apollo-compiler/src/test/graphql/com/example/case_sensitive_enum/kotlin/responseBased/case_sensitive_enum/TestQuery.kt.expected index 742c026e35c..1b02381a6a1 100644 --- a/libraries/apollo-compiler/src/test/graphql/com/example/case_sensitive_enum/kotlin/responseBased/case_sensitive_enum/TestQuery.kt.expected +++ b/libraries/apollo-compiler/src/test/graphql/com/example/case_sensitive_enum/kotlin/responseBased/case_sensitive_enum/TestQuery.kt.expected @@ -35,7 +35,7 @@ public class TestQuery() : Query { override fun serializeVariables( writer: JsonWriter, customScalarAdapters: CustomScalarAdapters, - withBooleanDefaultValues: Boolean, + withDefaultValues: Boolean, ) { // This operation doesn't have any variable } diff --git a/libraries/apollo-compiler/src/test/graphql/com/example/companion/java/operationBased/companion/TestQuery.java.expected b/libraries/apollo-compiler/src/test/graphql/com/example/companion/java/operationBased/companion/TestQuery.java.expected index 0304cfa30ef..a56543a0791 100644 --- a/libraries/apollo-compiler/src/test/graphql/com/example/companion/java/operationBased/companion/TestQuery.java.expected +++ b/libraries/apollo-compiler/src/test/graphql/com/example/companion/java/operationBased/companion/TestQuery.java.expected @@ -97,7 +97,7 @@ public class TestQuery implements Query { @Override public void serializeVariables(JsonWriter writer, CustomScalarAdapters customScalarAdapters, - boolean withBooleanDefaultValues) throws IOException { + boolean withDefaultValues) throws IOException { // This operation doesn't have any variable } diff --git a/libraries/apollo-compiler/src/test/graphql/com/example/companion/kotlin/operationBased/companion/TestQuery.kt.expected b/libraries/apollo-compiler/src/test/graphql/com/example/companion/kotlin/operationBased/companion/TestQuery.kt.expected index 138c2899c84..3e5e6476be9 100644 --- a/libraries/apollo-compiler/src/test/graphql/com/example/companion/kotlin/operationBased/companion/TestQuery.kt.expected +++ b/libraries/apollo-compiler/src/test/graphql/com/example/companion/kotlin/operationBased/companion/TestQuery.kt.expected @@ -34,7 +34,7 @@ public class TestQuery() : Query { override fun serializeVariables( writer: JsonWriter, customScalarAdapters: CustomScalarAdapters, - withBooleanDefaultValues: Boolean, + withDefaultValues: Boolean, ) { // This operation doesn't have any variable } diff --git a/libraries/apollo-compiler/src/test/graphql/com/example/custom_scalar_type/java/operationBased/custom_scalar_type/TestQuery.java.expected b/libraries/apollo-compiler/src/test/graphql/com/example/custom_scalar_type/java/operationBased/custom_scalar_type/TestQuery.java.expected index df1ba12e0a4..2988812dfe4 100644 --- a/libraries/apollo-compiler/src/test/graphql/com/example/custom_scalar_type/java/operationBased/custom_scalar_type/TestQuery.java.expected +++ b/libraries/apollo-compiler/src/test/graphql/com/example/custom_scalar_type/java/operationBased/custom_scalar_type/TestQuery.java.expected @@ -105,7 +105,7 @@ public class TestQuery implements Query { @Override public void serializeVariables(JsonWriter writer, CustomScalarAdapters customScalarAdapters, - boolean withBooleanDefaultValues) throws IOException { + boolean withDefaultValues) throws IOException { // This operation doesn't have any variable } diff --git a/libraries/apollo-compiler/src/test/graphql/com/example/custom_scalar_type/java/operationBased/custom_scalar_type/selections/TestQuerySelections.java.expected b/libraries/apollo-compiler/src/test/graphql/com/example/custom_scalar_type/java/operationBased/custom_scalar_type/selections/TestQuerySelections.java.expected index f75e31e3e85..042f2a8c600 100644 --- a/libraries/apollo-compiler/src/test/graphql/com/example/custom_scalar_type/java/operationBased/custom_scalar_type/selections/TestQuerySelections.java.expected +++ b/libraries/apollo-compiler/src/test/graphql/com/example/custom_scalar_type/java/operationBased/custom_scalar_type/selections/TestQuerySelections.java.expected @@ -5,6 +5,7 @@ // package com.example.custom_scalar_type.selections; +import com.apollographql.apollo3.api.CompiledArgument; import com.apollographql.apollo3.api.CompiledField; import com.apollographql.apollo3.api.CompiledListType; import com.apollographql.apollo3.api.CompiledNotNullType; @@ -30,6 +31,6 @@ public class TestQuerySelections { ); public static List __root = Arrays.asList( - new CompiledField.Builder("hero", Character.type).selections(__hero).build() + new CompiledField.Builder("hero", Character.type).arguments(Arrays.asList(new CompiledArgument.Builder("episode").build(), new CompiledArgument.Builder("listOfListOfStringArgs").build())).selections(__hero).build() ); } diff --git a/libraries/apollo-compiler/src/test/graphql/com/example/custom_scalar_type/kotlin/responseBased/custom_scalar_type/TestQuery.kt.expected b/libraries/apollo-compiler/src/test/graphql/com/example/custom_scalar_type/kotlin/responseBased/custom_scalar_type/TestQuery.kt.expected index 057cf6cc126..b4491f577a8 100644 --- a/libraries/apollo-compiler/src/test/graphql/com/example/custom_scalar_type/kotlin/responseBased/custom_scalar_type/TestQuery.kt.expected +++ b/libraries/apollo-compiler/src/test/graphql/com/example/custom_scalar_type/kotlin/responseBased/custom_scalar_type/TestQuery.kt.expected @@ -37,7 +37,7 @@ public class TestQuery() : Query { override fun serializeVariables( writer: JsonWriter, customScalarAdapters: CustomScalarAdapters, - withBooleanDefaultValues: Boolean, + withDefaultValues: Boolean, ) { // This operation doesn't have any variable } diff --git a/libraries/apollo-compiler/src/test/graphql/com/example/custom_scalar_type/kotlin/responseBased/custom_scalar_type/selections/TestQuerySelections.kt.expected b/libraries/apollo-compiler/src/test/graphql/com/example/custom_scalar_type/kotlin/responseBased/custom_scalar_type/selections/TestQuerySelections.kt.expected index 6ae523d838e..5103763326e 100644 --- a/libraries/apollo-compiler/src/test/graphql/com/example/custom_scalar_type/kotlin/responseBased/custom_scalar_type/selections/TestQuerySelections.kt.expected +++ b/libraries/apollo-compiler/src/test/graphql/com/example/custom_scalar_type/kotlin/responseBased/custom_scalar_type/selections/TestQuerySelections.kt.expected @@ -5,6 +5,7 @@ // package com.example.custom_scalar_type.selections +import com.apollographql.apollo3.api.CompiledArgument import com.apollographql.apollo3.api.CompiledField import com.apollographql.apollo3.api.CompiledSelection import com.apollographql.apollo3.api.list @@ -53,7 +54,11 @@ public object TestQuerySelections { CompiledField.Builder( name = "hero", type = Character.type - ).selections(__hero) + ).arguments(listOf( + CompiledArgument.Builder("episode").build(), + CompiledArgument.Builder("listOfListOfStringArgs").build() + )) + .selections(__hero) .build() ) } diff --git a/libraries/apollo-compiler/src/test/graphql/com/example/data_builders/java/operationBased/data_builders/AnimalQuery.java.expected b/libraries/apollo-compiler/src/test/graphql/com/example/data_builders/java/operationBased/data_builders/AnimalQuery.java.expected index 9bc7631dd07..9f9270a89b7 100644 --- a/libraries/apollo-compiler/src/test/graphql/com/example/data_builders/java/operationBased/data_builders/AnimalQuery.java.expected +++ b/libraries/apollo-compiler/src/test/graphql/com/example/data_builders/java/operationBased/data_builders/AnimalQuery.java.expected @@ -113,7 +113,7 @@ public class AnimalQuery implements Query { @Override public void serializeVariables(JsonWriter writer, CustomScalarAdapters customScalarAdapters, - boolean withBooleanDefaultValues) throws IOException { + boolean withDefaultValues) throws IOException { // This operation doesn't have any variable } diff --git a/libraries/apollo-compiler/src/test/graphql/com/example/data_builders/java/operationBased/data_builders/CharacterQuery.java.expected b/libraries/apollo-compiler/src/test/graphql/com/example/data_builders/java/operationBased/data_builders/CharacterQuery.java.expected index f230e0b45dc..151b355c1e8 100644 --- a/libraries/apollo-compiler/src/test/graphql/com/example/data_builders/java/operationBased/data_builders/CharacterQuery.java.expected +++ b/libraries/apollo-compiler/src/test/graphql/com/example/data_builders/java/operationBased/data_builders/CharacterQuery.java.expected @@ -115,7 +115,7 @@ public class CharacterQuery implements Query { @Override public void serializeVariables(JsonWriter writer, CustomScalarAdapters customScalarAdapters, - boolean withBooleanDefaultValues) throws IOException { + boolean withDefaultValues) throws IOException { // This operation doesn't have any variable } diff --git a/libraries/apollo-compiler/src/test/graphql/com/example/data_builders/java/operationBased/data_builders/NodeQuery.java.expected b/libraries/apollo-compiler/src/test/graphql/com/example/data_builders/java/operationBased/data_builders/NodeQuery.java.expected index f6ec39fb90c..16f82c30107 100644 --- a/libraries/apollo-compiler/src/test/graphql/com/example/data_builders/java/operationBased/data_builders/NodeQuery.java.expected +++ b/libraries/apollo-compiler/src/test/graphql/com/example/data_builders/java/operationBased/data_builders/NodeQuery.java.expected @@ -114,7 +114,7 @@ public class NodeQuery implements Query { @Override public void serializeVariables(JsonWriter writer, CustomScalarAdapters customScalarAdapters, - boolean withBooleanDefaultValues) throws IOException { + boolean withDefaultValues) throws IOException { // This operation doesn't have any variable } diff --git a/libraries/apollo-compiler/src/test/graphql/com/example/data_builders/java/operationBased/data_builders/fragment/CatFragmentImpl.java.expected b/libraries/apollo-compiler/src/test/graphql/com/example/data_builders/java/operationBased/data_builders/fragment/CatFragmentImpl.java.expected index f19dd4803bc..9ff685363a4 100644 --- a/libraries/apollo-compiler/src/test/graphql/com/example/data_builders/java/operationBased/data_builders/fragment/CatFragmentImpl.java.expected +++ b/libraries/apollo-compiler/src/test/graphql/com/example/data_builders/java/operationBased/data_builders/fragment/CatFragmentImpl.java.expected @@ -61,7 +61,7 @@ public class CatFragmentImpl implements Fragment { @Override public void serializeVariables(JsonWriter writer, CustomScalarAdapters customScalarAdapters, - boolean withBooleanDefaultValues) throws IOException { + boolean withDefaultValues) throws IOException { // This fragment doesn't have any variable } diff --git a/libraries/apollo-compiler/src/test/graphql/com/example/data_builders/java/operationBased/data_builders/fragment/DogFragmentImpl.java.expected b/libraries/apollo-compiler/src/test/graphql/com/example/data_builders/java/operationBased/data_builders/fragment/DogFragmentImpl.java.expected index 05744e05660..1efe083d559 100644 --- a/libraries/apollo-compiler/src/test/graphql/com/example/data_builders/java/operationBased/data_builders/fragment/DogFragmentImpl.java.expected +++ b/libraries/apollo-compiler/src/test/graphql/com/example/data_builders/java/operationBased/data_builders/fragment/DogFragmentImpl.java.expected @@ -61,7 +61,7 @@ public class DogFragmentImpl implements Fragment { @Override public void serializeVariables(JsonWriter writer, CustomScalarAdapters customScalarAdapters, - boolean withBooleanDefaultValues) throws IOException { + boolean withDefaultValues) throws IOException { // This fragment doesn't have any variable } diff --git a/libraries/apollo-compiler/src/test/graphql/com/example/data_builders/java/operationBased/data_builders/fragment/DroidFragmentImpl.java.expected b/libraries/apollo-compiler/src/test/graphql/com/example/data_builders/java/operationBased/data_builders/fragment/DroidFragmentImpl.java.expected index 4fa93d4143d..fcc271ac561 100644 --- a/libraries/apollo-compiler/src/test/graphql/com/example/data_builders/java/operationBased/data_builders/fragment/DroidFragmentImpl.java.expected +++ b/libraries/apollo-compiler/src/test/graphql/com/example/data_builders/java/operationBased/data_builders/fragment/DroidFragmentImpl.java.expected @@ -61,7 +61,7 @@ public class DroidFragmentImpl implements Fragment { @Override public void serializeVariables(JsonWriter writer, CustomScalarAdapters customScalarAdapters, - boolean withBooleanDefaultValues) throws IOException { + boolean withDefaultValues) throws IOException { // This fragment doesn't have any variable } diff --git a/libraries/apollo-compiler/src/test/graphql/com/example/data_builders/java/operationBased/data_builders/fragment/HumanFragmentImpl.java.expected b/libraries/apollo-compiler/src/test/graphql/com/example/data_builders/java/operationBased/data_builders/fragment/HumanFragmentImpl.java.expected index 2732ed210ea..b904edf954d 100644 --- a/libraries/apollo-compiler/src/test/graphql/com/example/data_builders/java/operationBased/data_builders/fragment/HumanFragmentImpl.java.expected +++ b/libraries/apollo-compiler/src/test/graphql/com/example/data_builders/java/operationBased/data_builders/fragment/HumanFragmentImpl.java.expected @@ -61,7 +61,7 @@ public class HumanFragmentImpl implements Fragment { @Override public void serializeVariables(JsonWriter writer, CustomScalarAdapters customScalarAdapters, - boolean withBooleanDefaultValues) throws IOException { + boolean withDefaultValues) throws IOException { // This fragment doesn't have any variable } diff --git a/libraries/apollo-compiler/src/test/graphql/com/example/data_builders/kotlin/operationBased/data_builders/AnimalQuery.kt.expected b/libraries/apollo-compiler/src/test/graphql/com/example/data_builders/kotlin/operationBased/data_builders/AnimalQuery.kt.expected index 99ebb0ad02e..f95365ceeb2 100644 --- a/libraries/apollo-compiler/src/test/graphql/com/example/data_builders/kotlin/operationBased/data_builders/AnimalQuery.kt.expected +++ b/libraries/apollo-compiler/src/test/graphql/com/example/data_builders/kotlin/operationBased/data_builders/AnimalQuery.kt.expected @@ -43,7 +43,7 @@ public class AnimalQuery() : Query { override fun serializeVariables( writer: JsonWriter, customScalarAdapters: CustomScalarAdapters, - withBooleanDefaultValues: Boolean, + withDefaultValues: Boolean, ) { // This operation doesn't have any variable } diff --git a/libraries/apollo-compiler/src/test/graphql/com/example/data_builders/kotlin/operationBased/data_builders/CharacterQuery.kt.expected b/libraries/apollo-compiler/src/test/graphql/com/example/data_builders/kotlin/operationBased/data_builders/CharacterQuery.kt.expected index 3b3f8387bfd..394b78d8413 100644 --- a/libraries/apollo-compiler/src/test/graphql/com/example/data_builders/kotlin/operationBased/data_builders/CharacterQuery.kt.expected +++ b/libraries/apollo-compiler/src/test/graphql/com/example/data_builders/kotlin/operationBased/data_builders/CharacterQuery.kt.expected @@ -43,7 +43,7 @@ public class CharacterQuery() : Query { override fun serializeVariables( writer: JsonWriter, customScalarAdapters: CustomScalarAdapters, - withBooleanDefaultValues: Boolean, + withDefaultValues: Boolean, ) { // This operation doesn't have any variable } diff --git a/libraries/apollo-compiler/src/test/graphql/com/example/data_builders/kotlin/operationBased/data_builders/NodeQuery.kt.expected b/libraries/apollo-compiler/src/test/graphql/com/example/data_builders/kotlin/operationBased/data_builders/NodeQuery.kt.expected index db1db1a7320..07c927eb11d 100644 --- a/libraries/apollo-compiler/src/test/graphql/com/example/data_builders/kotlin/operationBased/data_builders/NodeQuery.kt.expected +++ b/libraries/apollo-compiler/src/test/graphql/com/example/data_builders/kotlin/operationBased/data_builders/NodeQuery.kt.expected @@ -43,7 +43,7 @@ public class NodeQuery() : Query { override fun serializeVariables( writer: JsonWriter, customScalarAdapters: CustomScalarAdapters, - withBooleanDefaultValues: Boolean, + withDefaultValues: Boolean, ) { // This operation doesn't have any variable } diff --git a/libraries/apollo-compiler/src/test/graphql/com/example/data_builders/kotlin/operationBased/data_builders/fragment/CatFragmentImpl.kt.expected b/libraries/apollo-compiler/src/test/graphql/com/example/data_builders/kotlin/operationBased/data_builders/fragment/CatFragmentImpl.kt.expected index 7a8f1b56902..f13f763a748 100644 --- a/libraries/apollo-compiler/src/test/graphql/com/example/data_builders/kotlin/operationBased/data_builders/fragment/CatFragmentImpl.kt.expected +++ b/libraries/apollo-compiler/src/test/graphql/com/example/data_builders/kotlin/operationBased/data_builders/fragment/CatFragmentImpl.kt.expected @@ -32,7 +32,7 @@ public class CatFragmentImpl() : Fragment { override fun serializeVariables( writer: JsonWriter, customScalarAdapters: CustomScalarAdapters, - withBooleanDefaultValues: Boolean, + withDefaultValues: Boolean, ) { // This fragment doesn't have any variable } diff --git a/libraries/apollo-compiler/src/test/graphql/com/example/data_builders/kotlin/operationBased/data_builders/fragment/DogFragmentImpl.kt.expected b/libraries/apollo-compiler/src/test/graphql/com/example/data_builders/kotlin/operationBased/data_builders/fragment/DogFragmentImpl.kt.expected index 59571d383f6..9fde846a18d 100644 --- a/libraries/apollo-compiler/src/test/graphql/com/example/data_builders/kotlin/operationBased/data_builders/fragment/DogFragmentImpl.kt.expected +++ b/libraries/apollo-compiler/src/test/graphql/com/example/data_builders/kotlin/operationBased/data_builders/fragment/DogFragmentImpl.kt.expected @@ -32,7 +32,7 @@ public class DogFragmentImpl() : Fragment { override fun serializeVariables( writer: JsonWriter, customScalarAdapters: CustomScalarAdapters, - withBooleanDefaultValues: Boolean, + withDefaultValues: Boolean, ) { // This fragment doesn't have any variable } diff --git a/libraries/apollo-compiler/src/test/graphql/com/example/data_builders/kotlin/operationBased/data_builders/fragment/DroidFragmentImpl.kt.expected b/libraries/apollo-compiler/src/test/graphql/com/example/data_builders/kotlin/operationBased/data_builders/fragment/DroidFragmentImpl.kt.expected index 85a31a37fce..2c5fd7dc1f0 100644 --- a/libraries/apollo-compiler/src/test/graphql/com/example/data_builders/kotlin/operationBased/data_builders/fragment/DroidFragmentImpl.kt.expected +++ b/libraries/apollo-compiler/src/test/graphql/com/example/data_builders/kotlin/operationBased/data_builders/fragment/DroidFragmentImpl.kt.expected @@ -32,7 +32,7 @@ public class DroidFragmentImpl() : Fragment { override fun serializeVariables( writer: JsonWriter, customScalarAdapters: CustomScalarAdapters, - withBooleanDefaultValues: Boolean, + withDefaultValues: Boolean, ) { // This fragment doesn't have any variable } diff --git a/libraries/apollo-compiler/src/test/graphql/com/example/data_builders/kotlin/operationBased/data_builders/fragment/HumanFragmentImpl.kt.expected b/libraries/apollo-compiler/src/test/graphql/com/example/data_builders/kotlin/operationBased/data_builders/fragment/HumanFragmentImpl.kt.expected index 8ef51647835..a432c37f8f1 100644 --- a/libraries/apollo-compiler/src/test/graphql/com/example/data_builders/kotlin/operationBased/data_builders/fragment/HumanFragmentImpl.kt.expected +++ b/libraries/apollo-compiler/src/test/graphql/com/example/data_builders/kotlin/operationBased/data_builders/fragment/HumanFragmentImpl.kt.expected @@ -32,7 +32,7 @@ public class HumanFragmentImpl() : Fragment { override fun serializeVariables( writer: JsonWriter, customScalarAdapters: CustomScalarAdapters, - withBooleanDefaultValues: Boolean, + withDefaultValues: Boolean, ) { // This fragment doesn't have any variable } diff --git a/libraries/apollo-compiler/src/test/graphql/com/example/data_builders/kotlin/responseBased/data_builders/AnimalQuery.kt.expected b/libraries/apollo-compiler/src/test/graphql/com/example/data_builders/kotlin/responseBased/data_builders/AnimalQuery.kt.expected index 51757271d3a..26bc4e4f83a 100644 --- a/libraries/apollo-compiler/src/test/graphql/com/example/data_builders/kotlin/responseBased/data_builders/AnimalQuery.kt.expected +++ b/libraries/apollo-compiler/src/test/graphql/com/example/data_builders/kotlin/responseBased/data_builders/AnimalQuery.kt.expected @@ -44,7 +44,7 @@ public class AnimalQuery() : Query { override fun serializeVariables( writer: JsonWriter, customScalarAdapters: CustomScalarAdapters, - withBooleanDefaultValues: Boolean, + withDefaultValues: Boolean, ) { // This operation doesn't have any variable } diff --git a/libraries/apollo-compiler/src/test/graphql/com/example/data_builders/kotlin/responseBased/data_builders/CharacterQuery.kt.expected b/libraries/apollo-compiler/src/test/graphql/com/example/data_builders/kotlin/responseBased/data_builders/CharacterQuery.kt.expected index 78df99507c5..502fe407db0 100644 --- a/libraries/apollo-compiler/src/test/graphql/com/example/data_builders/kotlin/responseBased/data_builders/CharacterQuery.kt.expected +++ b/libraries/apollo-compiler/src/test/graphql/com/example/data_builders/kotlin/responseBased/data_builders/CharacterQuery.kt.expected @@ -44,7 +44,7 @@ public class CharacterQuery() : Query { override fun serializeVariables( writer: JsonWriter, customScalarAdapters: CustomScalarAdapters, - withBooleanDefaultValues: Boolean, + withDefaultValues: Boolean, ) { // This operation doesn't have any variable } diff --git a/libraries/apollo-compiler/src/test/graphql/com/example/data_builders/kotlin/responseBased/data_builders/NodeQuery.kt.expected b/libraries/apollo-compiler/src/test/graphql/com/example/data_builders/kotlin/responseBased/data_builders/NodeQuery.kt.expected index 5efa17cc41e..056fbd662bb 100644 --- a/libraries/apollo-compiler/src/test/graphql/com/example/data_builders/kotlin/responseBased/data_builders/NodeQuery.kt.expected +++ b/libraries/apollo-compiler/src/test/graphql/com/example/data_builders/kotlin/responseBased/data_builders/NodeQuery.kt.expected @@ -44,7 +44,7 @@ public class NodeQuery() : Query { override fun serializeVariables( writer: JsonWriter, customScalarAdapters: CustomScalarAdapters, - withBooleanDefaultValues: Boolean, + withDefaultValues: Boolean, ) { // This operation doesn't have any variable } diff --git a/libraries/apollo-compiler/src/test/graphql/com/example/data_builders/kotlin/responseBased/data_builders/fragment/CatFragmentImpl.kt.expected b/libraries/apollo-compiler/src/test/graphql/com/example/data_builders/kotlin/responseBased/data_builders/fragment/CatFragmentImpl.kt.expected index c7a240d165b..7439efc74bf 100644 --- a/libraries/apollo-compiler/src/test/graphql/com/example/data_builders/kotlin/responseBased/data_builders/fragment/CatFragmentImpl.kt.expected +++ b/libraries/apollo-compiler/src/test/graphql/com/example/data_builders/kotlin/responseBased/data_builders/fragment/CatFragmentImpl.kt.expected @@ -33,7 +33,7 @@ public class CatFragmentImpl() : Fragment { override fun serializeVariables( writer: JsonWriter, customScalarAdapters: CustomScalarAdapters, - withBooleanDefaultValues: Boolean, + withDefaultValues: Boolean, ) { // This fragment doesn't have any variable } diff --git a/libraries/apollo-compiler/src/test/graphql/com/example/data_builders/kotlin/responseBased/data_builders/fragment/DogFragmentImpl.kt.expected b/libraries/apollo-compiler/src/test/graphql/com/example/data_builders/kotlin/responseBased/data_builders/fragment/DogFragmentImpl.kt.expected index 92910f698bd..87af997782d 100644 --- a/libraries/apollo-compiler/src/test/graphql/com/example/data_builders/kotlin/responseBased/data_builders/fragment/DogFragmentImpl.kt.expected +++ b/libraries/apollo-compiler/src/test/graphql/com/example/data_builders/kotlin/responseBased/data_builders/fragment/DogFragmentImpl.kt.expected @@ -33,7 +33,7 @@ public class DogFragmentImpl() : Fragment { override fun serializeVariables( writer: JsonWriter, customScalarAdapters: CustomScalarAdapters, - withBooleanDefaultValues: Boolean, + withDefaultValues: Boolean, ) { // This fragment doesn't have any variable } diff --git a/libraries/apollo-compiler/src/test/graphql/com/example/data_builders/kotlin/responseBased/data_builders/fragment/DroidFragmentImpl.kt.expected b/libraries/apollo-compiler/src/test/graphql/com/example/data_builders/kotlin/responseBased/data_builders/fragment/DroidFragmentImpl.kt.expected index d1690222c41..356d66ab7b7 100644 --- a/libraries/apollo-compiler/src/test/graphql/com/example/data_builders/kotlin/responseBased/data_builders/fragment/DroidFragmentImpl.kt.expected +++ b/libraries/apollo-compiler/src/test/graphql/com/example/data_builders/kotlin/responseBased/data_builders/fragment/DroidFragmentImpl.kt.expected @@ -33,7 +33,7 @@ public class DroidFragmentImpl() : Fragment { override fun serializeVariables( writer: JsonWriter, customScalarAdapters: CustomScalarAdapters, - withBooleanDefaultValues: Boolean, + withDefaultValues: Boolean, ) { // This fragment doesn't have any variable } diff --git a/libraries/apollo-compiler/src/test/graphql/com/example/data_builders/kotlin/responseBased/data_builders/fragment/HumanFragmentImpl.kt.expected b/libraries/apollo-compiler/src/test/graphql/com/example/data_builders/kotlin/responseBased/data_builders/fragment/HumanFragmentImpl.kt.expected index 12e2d0c902f..3e398811fda 100644 --- a/libraries/apollo-compiler/src/test/graphql/com/example/data_builders/kotlin/responseBased/data_builders/fragment/HumanFragmentImpl.kt.expected +++ b/libraries/apollo-compiler/src/test/graphql/com/example/data_builders/kotlin/responseBased/data_builders/fragment/HumanFragmentImpl.kt.expected @@ -33,7 +33,7 @@ public class HumanFragmentImpl() : Fragment { override fun serializeVariables( writer: JsonWriter, customScalarAdapters: CustomScalarAdapters, - withBooleanDefaultValues: Boolean, + withDefaultValues: Boolean, ) { // This fragment doesn't have any variable } diff --git a/libraries/apollo-compiler/src/test/graphql/com/example/decapitalized_fields/java/operationBased/decapitalized_fields/TestQuery.java.expected b/libraries/apollo-compiler/src/test/graphql/com/example/decapitalized_fields/java/operationBased/decapitalized_fields/TestQuery.java.expected index 1fddf664b85..d5d7b35657d 100644 --- a/libraries/apollo-compiler/src/test/graphql/com/example/decapitalized_fields/java/operationBased/decapitalized_fields/TestQuery.java.expected +++ b/libraries/apollo-compiler/src/test/graphql/com/example/decapitalized_fields/java/operationBased/decapitalized_fields/TestQuery.java.expected @@ -110,7 +110,7 @@ public class TestQuery implements Query { @Override public void serializeVariables(JsonWriter writer, CustomScalarAdapters customScalarAdapters, - boolean withBooleanDefaultValues) throws IOException { + boolean withDefaultValues) throws IOException { // This operation doesn't have any variable } diff --git a/libraries/apollo-compiler/src/test/graphql/com/example/decapitalized_fields/java/operationBased/decapitalized_fields/fragment/HorseFragmentImpl.java.expected b/libraries/apollo-compiler/src/test/graphql/com/example/decapitalized_fields/java/operationBased/decapitalized_fields/fragment/HorseFragmentImpl.java.expected index 1993323c987..4c2bdd9dcc7 100644 --- a/libraries/apollo-compiler/src/test/graphql/com/example/decapitalized_fields/java/operationBased/decapitalized_fields/fragment/HorseFragmentImpl.java.expected +++ b/libraries/apollo-compiler/src/test/graphql/com/example/decapitalized_fields/java/operationBased/decapitalized_fields/fragment/HorseFragmentImpl.java.expected @@ -61,7 +61,7 @@ public class HorseFragmentImpl implements Fragment { @Override public void serializeVariables(JsonWriter writer, CustomScalarAdapters customScalarAdapters, - boolean withBooleanDefaultValues) throws IOException { + boolean withDefaultValues) throws IOException { // This fragment doesn't have any variable } diff --git a/libraries/apollo-compiler/src/test/graphql/com/example/decapitalized_fields/kotlin/operationBased/decapitalized_fields/TestQuery.kt.expected b/libraries/apollo-compiler/src/test/graphql/com/example/decapitalized_fields/kotlin/operationBased/decapitalized_fields/TestQuery.kt.expected index df0f81c4fa8..927b8423ffd 100644 --- a/libraries/apollo-compiler/src/test/graphql/com/example/decapitalized_fields/kotlin/operationBased/decapitalized_fields/TestQuery.kt.expected +++ b/libraries/apollo-compiler/src/test/graphql/com/example/decapitalized_fields/kotlin/operationBased/decapitalized_fields/TestQuery.kt.expected @@ -35,7 +35,7 @@ public class TestQuery() : Query { override fun serializeVariables( writer: JsonWriter, customScalarAdapters: CustomScalarAdapters, - withBooleanDefaultValues: Boolean, + withDefaultValues: Boolean, ) { // This operation doesn't have any variable } diff --git a/libraries/apollo-compiler/src/test/graphql/com/example/decapitalized_fields/kotlin/operationBased/decapitalized_fields/fragment/HorseFragmentImpl.kt.expected b/libraries/apollo-compiler/src/test/graphql/com/example/decapitalized_fields/kotlin/operationBased/decapitalized_fields/fragment/HorseFragmentImpl.kt.expected index 7263a031dcd..2552aa8a3ad 100644 --- a/libraries/apollo-compiler/src/test/graphql/com/example/decapitalized_fields/kotlin/operationBased/decapitalized_fields/fragment/HorseFragmentImpl.kt.expected +++ b/libraries/apollo-compiler/src/test/graphql/com/example/decapitalized_fields/kotlin/operationBased/decapitalized_fields/fragment/HorseFragmentImpl.kt.expected @@ -25,7 +25,7 @@ public class HorseFragmentImpl() : Fragment { override fun serializeVariables( writer: JsonWriter, customScalarAdapters: CustomScalarAdapters, - withBooleanDefaultValues: Boolean, + withDefaultValues: Boolean, ) { // This fragment doesn't have any variable } diff --git a/libraries/apollo-compiler/src/test/graphql/com/example/decapitalized_fields/kotlin/responseBased/decapitalized_fields/TestQuery.kt.expected b/libraries/apollo-compiler/src/test/graphql/com/example/decapitalized_fields/kotlin/responseBased/decapitalized_fields/TestQuery.kt.expected index ef2a2837a84..34e77d7cdcc 100644 --- a/libraries/apollo-compiler/src/test/graphql/com/example/decapitalized_fields/kotlin/responseBased/decapitalized_fields/TestQuery.kt.expected +++ b/libraries/apollo-compiler/src/test/graphql/com/example/decapitalized_fields/kotlin/responseBased/decapitalized_fields/TestQuery.kt.expected @@ -36,7 +36,7 @@ public class TestQuery() : Query { override fun serializeVariables( writer: JsonWriter, customScalarAdapters: CustomScalarAdapters, - withBooleanDefaultValues: Boolean, + withDefaultValues: Boolean, ) { // This operation doesn't have any variable } diff --git a/libraries/apollo-compiler/src/test/graphql/com/example/decapitalized_fields/kotlin/responseBased/decapitalized_fields/fragment/HorseFragmentImpl.kt.expected b/libraries/apollo-compiler/src/test/graphql/com/example/decapitalized_fields/kotlin/responseBased/decapitalized_fields/fragment/HorseFragmentImpl.kt.expected index 52d179a2662..13a3acd7b65 100644 --- a/libraries/apollo-compiler/src/test/graphql/com/example/decapitalized_fields/kotlin/responseBased/decapitalized_fields/fragment/HorseFragmentImpl.kt.expected +++ b/libraries/apollo-compiler/src/test/graphql/com/example/decapitalized_fields/kotlin/responseBased/decapitalized_fields/fragment/HorseFragmentImpl.kt.expected @@ -26,7 +26,7 @@ public class HorseFragmentImpl() : Fragment { override fun serializeVariables( writer: JsonWriter, customScalarAdapters: CustomScalarAdapters, - withBooleanDefaultValues: Boolean, + withDefaultValues: Boolean, ) { // This fragment doesn't have any variable } diff --git a/libraries/apollo-compiler/src/test/graphql/com/example/deprecated_merged_field/java/operationBased/deprecated_merged_field/CatQuery.java.expected b/libraries/apollo-compiler/src/test/graphql/com/example/deprecated_merged_field/java/operationBased/deprecated_merged_field/CatQuery.java.expected index ee9b38efce4..f236a46ed45 100644 --- a/libraries/apollo-compiler/src/test/graphql/com/example/deprecated_merged_field/java/operationBased/deprecated_merged_field/CatQuery.java.expected +++ b/libraries/apollo-compiler/src/test/graphql/com/example/deprecated_merged_field/java/operationBased/deprecated_merged_field/CatQuery.java.expected @@ -108,7 +108,7 @@ public class CatQuery implements Query { @Override public void serializeVariables(JsonWriter writer, CustomScalarAdapters customScalarAdapters, - boolean withBooleanDefaultValues) throws IOException { + boolean withDefaultValues) throws IOException { // This operation doesn't have any variable } diff --git a/libraries/apollo-compiler/src/test/graphql/com/example/deprecated_merged_field/java/operationBased/deprecated_merged_field/fragment/AnimalFragmentImpl.java.expected b/libraries/apollo-compiler/src/test/graphql/com/example/deprecated_merged_field/java/operationBased/deprecated_merged_field/fragment/AnimalFragmentImpl.java.expected index 1e078a8c9c2..3e5633e3960 100644 --- a/libraries/apollo-compiler/src/test/graphql/com/example/deprecated_merged_field/java/operationBased/deprecated_merged_field/fragment/AnimalFragmentImpl.java.expected +++ b/libraries/apollo-compiler/src/test/graphql/com/example/deprecated_merged_field/java/operationBased/deprecated_merged_field/fragment/AnimalFragmentImpl.java.expected @@ -61,7 +61,7 @@ public class AnimalFragmentImpl implements Fragment { @Override public void serializeVariables(JsonWriter writer, CustomScalarAdapters customScalarAdapters, - boolean withBooleanDefaultValues) throws IOException { + boolean withDefaultValues) throws IOException { // This fragment doesn't have any variable } diff --git a/libraries/apollo-compiler/src/test/graphql/com/example/deprecated_merged_field/kotlin/operationBased/deprecated_merged_field/CatQuery.kt.expected b/libraries/apollo-compiler/src/test/graphql/com/example/deprecated_merged_field/kotlin/operationBased/deprecated_merged_field/CatQuery.kt.expected index 5c0c3d74170..74aa528d818 100644 --- a/libraries/apollo-compiler/src/test/graphql/com/example/deprecated_merged_field/kotlin/operationBased/deprecated_merged_field/CatQuery.kt.expected +++ b/libraries/apollo-compiler/src/test/graphql/com/example/deprecated_merged_field/kotlin/operationBased/deprecated_merged_field/CatQuery.kt.expected @@ -35,7 +35,7 @@ public class CatQuery() : Query { override fun serializeVariables( writer: JsonWriter, customScalarAdapters: CustomScalarAdapters, - withBooleanDefaultValues: Boolean, + withDefaultValues: Boolean, ) { // This operation doesn't have any variable } diff --git a/libraries/apollo-compiler/src/test/graphql/com/example/deprecated_merged_field/kotlin/operationBased/deprecated_merged_field/fragment/AnimalFragmentImpl.kt.expected b/libraries/apollo-compiler/src/test/graphql/com/example/deprecated_merged_field/kotlin/operationBased/deprecated_merged_field/fragment/AnimalFragmentImpl.kt.expected index edd2122916f..091b17bcf27 100644 --- a/libraries/apollo-compiler/src/test/graphql/com/example/deprecated_merged_field/kotlin/operationBased/deprecated_merged_field/fragment/AnimalFragmentImpl.kt.expected +++ b/libraries/apollo-compiler/src/test/graphql/com/example/deprecated_merged_field/kotlin/operationBased/deprecated_merged_field/fragment/AnimalFragmentImpl.kt.expected @@ -25,7 +25,7 @@ public class AnimalFragmentImpl() : Fragment { override fun serializeVariables( writer: JsonWriter, customScalarAdapters: CustomScalarAdapters, - withBooleanDefaultValues: Boolean, + withDefaultValues: Boolean, ) { // This fragment doesn't have any variable } diff --git a/libraries/apollo-compiler/src/test/graphql/com/example/deprecated_merged_field/kotlin/responseBased/deprecated_merged_field/CatQuery.kt.expected b/libraries/apollo-compiler/src/test/graphql/com/example/deprecated_merged_field/kotlin/responseBased/deprecated_merged_field/CatQuery.kt.expected index 5a05856cf9d..67e8fed2248 100644 --- a/libraries/apollo-compiler/src/test/graphql/com/example/deprecated_merged_field/kotlin/responseBased/deprecated_merged_field/CatQuery.kt.expected +++ b/libraries/apollo-compiler/src/test/graphql/com/example/deprecated_merged_field/kotlin/responseBased/deprecated_merged_field/CatQuery.kt.expected @@ -39,7 +39,7 @@ public class CatQuery() : Query { override fun serializeVariables( writer: JsonWriter, customScalarAdapters: CustomScalarAdapters, - withBooleanDefaultValues: Boolean, + withDefaultValues: Boolean, ) { // This operation doesn't have any variable } diff --git a/libraries/apollo-compiler/src/test/graphql/com/example/deprecated_merged_field/kotlin/responseBased/deprecated_merged_field/fragment/AnimalFragmentImpl.kt.expected b/libraries/apollo-compiler/src/test/graphql/com/example/deprecated_merged_field/kotlin/responseBased/deprecated_merged_field/fragment/AnimalFragmentImpl.kt.expected index 84203610237..8ddef239a9d 100644 --- a/libraries/apollo-compiler/src/test/graphql/com/example/deprecated_merged_field/kotlin/responseBased/deprecated_merged_field/fragment/AnimalFragmentImpl.kt.expected +++ b/libraries/apollo-compiler/src/test/graphql/com/example/deprecated_merged_field/kotlin/responseBased/deprecated_merged_field/fragment/AnimalFragmentImpl.kt.expected @@ -28,7 +28,7 @@ public class AnimalFragmentImpl() : Fragment { override fun serializeVariables( writer: JsonWriter, customScalarAdapters: CustomScalarAdapters, - withBooleanDefaultValues: Boolean, + withDefaultValues: Boolean, ) { // This fragment doesn't have any variable } diff --git a/libraries/apollo-compiler/src/test/graphql/com/example/deprecation/java/operationBased/deprecation/TestQuery.java.expected b/libraries/apollo-compiler/src/test/graphql/com/example/deprecation/java/operationBased/deprecation/TestQuery.java.expected index 082fb13bef8..3e11cfcd8ae 100644 --- a/libraries/apollo-compiler/src/test/graphql/com/example/deprecation/java/operationBased/deprecation/TestQuery.java.expected +++ b/libraries/apollo-compiler/src/test/graphql/com/example/deprecation/java/operationBased/deprecation/TestQuery.java.expected @@ -109,8 +109,8 @@ public class TestQuery implements Query { @Override public void serializeVariables(JsonWriter writer, CustomScalarAdapters customScalarAdapters, - boolean withBooleanDefaultValues) throws IOException { - TestQuery_VariablesAdapter.INSTANCE.serializeVariables(writer, this, customScalarAdapters, withBooleanDefaultValues); + boolean withDefaultValues) throws IOException { + TestQuery_VariablesAdapter.INSTANCE.serializeVariables(writer, this, customScalarAdapters, withDefaultValues); } @Override diff --git a/libraries/apollo-compiler/src/test/graphql/com/example/deprecation/java/operationBased/deprecation/adapter/TestQuery_VariablesAdapter.java.expected b/libraries/apollo-compiler/src/test/graphql/com/example/deprecation/java/operationBased/deprecation/adapter/TestQuery_VariablesAdapter.java.expected index 31114e5adca..0b4f0a1a0dd 100644 --- a/libraries/apollo-compiler/src/test/graphql/com/example/deprecation/java/operationBased/deprecation/adapter/TestQuery_VariablesAdapter.java.expected +++ b/libraries/apollo-compiler/src/test/graphql/com/example/deprecation/java/operationBased/deprecation/adapter/TestQuery_VariablesAdapter.java.expected @@ -19,8 +19,7 @@ public enum TestQuery_VariablesAdapter { INSTANCE; public void serializeVariables(JsonWriter writer, TestQuery value, - CustomScalarAdapters customScalarAdapters, boolean withBooleanDefaultValues) throws - IOException { + CustomScalarAdapters customScalarAdapters, boolean withDefaultValues) throws IOException { CompositeAdapterContext adapterContext = new CompositeAdapterContext.Builder().customScalarAdapters(customScalarAdapters).build(); if (value.episode instanceof Optional.Present) { writer.name("episode"); diff --git a/libraries/apollo-compiler/src/test/graphql/com/example/deprecation/java/operationBased/deprecation/selections/TestQuerySelections.java.expected b/libraries/apollo-compiler/src/test/graphql/com/example/deprecation/java/operationBased/deprecation/selections/TestQuerySelections.java.expected index ea0ac1e6071..cbbebf9c94f 100644 --- a/libraries/apollo-compiler/src/test/graphql/com/example/deprecation/java/operationBased/deprecation/selections/TestQuerySelections.java.expected +++ b/libraries/apollo-compiler/src/test/graphql/com/example/deprecation/java/operationBased/deprecation/selections/TestQuerySelections.java.expected @@ -24,6 +24,6 @@ public class TestQuerySelections { ); public static List __root = Arrays.asList( - new CompiledField.Builder("hero", Character.type).arguments(Arrays.asList(new CompiledArgument.Builder("episode", new CompiledVariable("episode")).build())).selections(__hero).build() + new CompiledField.Builder("hero", Character.type).arguments(Arrays.asList(new CompiledArgument.Builder("episode").value(new CompiledVariable("episode")).build())).selections(__hero).build() ); } diff --git a/libraries/apollo-compiler/src/test/graphql/com/example/deprecation/kotlin/responseBased/deprecation/TestQuery.kt.expected b/libraries/apollo-compiler/src/test/graphql/com/example/deprecation/kotlin/responseBased/deprecation/TestQuery.kt.expected index 432efc7a3a2..32ad3140f1e 100644 --- a/libraries/apollo-compiler/src/test/graphql/com/example/deprecation/kotlin/responseBased/deprecation/TestQuery.kt.expected +++ b/libraries/apollo-compiler/src/test/graphql/com/example/deprecation/kotlin/responseBased/deprecation/TestQuery.kt.expected @@ -34,10 +34,10 @@ public data class TestQuery( override fun serializeVariables( writer: JsonWriter, customScalarAdapters: CustomScalarAdapters, - withBooleanDefaultValues: Boolean, + withDefaultValues: Boolean, ) { TestQuery_VariablesAdapter.serializeVariables(writer, this, customScalarAdapters, - withBooleanDefaultValues) + withDefaultValues) } override fun adapter(): CompositeAdapter = TestQuery_ResponseAdapter.Data.obj() diff --git a/libraries/apollo-compiler/src/test/graphql/com/example/deprecation/kotlin/responseBased/deprecation/adapter/TestQuery_VariablesAdapter.kt.expected b/libraries/apollo-compiler/src/test/graphql/com/example/deprecation/kotlin/responseBased/deprecation/adapter/TestQuery_VariablesAdapter.kt.expected index f81ffe5a2c6..9291a29534c 100644 --- a/libraries/apollo-compiler/src/test/graphql/com/example/deprecation/kotlin/responseBased/deprecation/adapter/TestQuery_VariablesAdapter.kt.expected +++ b/libraries/apollo-compiler/src/test/graphql/com/example/deprecation/kotlin/responseBased/deprecation/adapter/TestQuery_VariablesAdapter.kt.expected @@ -24,7 +24,7 @@ public object TestQuery_VariablesAdapter { writer: JsonWriter, `value`: TestQuery, customScalarAdapters: CustomScalarAdapters, - withBooleanDefaultValues: Boolean, + withDefaultValues: Boolean, ) { if (value.episode is Optional.Present) { writer.name("episode") diff --git a/libraries/apollo-compiler/src/test/graphql/com/example/deprecation/kotlin/responseBased/deprecation/selections/TestQuerySelections.kt.expected b/libraries/apollo-compiler/src/test/graphql/com/example/deprecation/kotlin/responseBased/deprecation/selections/TestQuerySelections.kt.expected index a8e37d717c1..c019a63de34 100644 --- a/libraries/apollo-compiler/src/test/graphql/com/example/deprecation/kotlin/responseBased/deprecation/selections/TestQuerySelections.kt.expected +++ b/libraries/apollo-compiler/src/test/graphql/com/example/deprecation/kotlin/responseBased/deprecation/selections/TestQuerySelections.kt.expected @@ -36,7 +36,7 @@ public object TestQuerySelections { name = "hero", type = Character.type ).arguments(listOf( - CompiledArgument.Builder("episode", CompiledVariable("episode")).build() + CompiledArgument.Builder("episode").value(CompiledVariable("episode")).build() )) .selections(__hero) .build() diff --git a/libraries/apollo-compiler/src/test/graphql/com/example/enum_field/java/operationBased/enum_field/TestQuery.java.expected b/libraries/apollo-compiler/src/test/graphql/com/example/enum_field/java/operationBased/enum_field/TestQuery.java.expected index 46669a8d350..2b5122fbe71 100644 --- a/libraries/apollo-compiler/src/test/graphql/com/example/enum_field/java/operationBased/enum_field/TestQuery.java.expected +++ b/libraries/apollo-compiler/src/test/graphql/com/example/enum_field/java/operationBased/enum_field/TestQuery.java.expected @@ -97,7 +97,7 @@ public class TestQuery implements Query { @Override public void serializeVariables(JsonWriter writer, CustomScalarAdapters customScalarAdapters, - boolean withBooleanDefaultValues) throws IOException { + boolean withDefaultValues) throws IOException { // This operation doesn't have any variable } diff --git a/libraries/apollo-compiler/src/test/graphql/com/example/enum_field/kotlin/responseBased/enum_field/TestQuery.kt.expected b/libraries/apollo-compiler/src/test/graphql/com/example/enum_field/kotlin/responseBased/enum_field/TestQuery.kt.expected index db6679536c8..0ed3323b71f 100644 --- a/libraries/apollo-compiler/src/test/graphql/com/example/enum_field/kotlin/responseBased/enum_field/TestQuery.kt.expected +++ b/libraries/apollo-compiler/src/test/graphql/com/example/enum_field/kotlin/responseBased/enum_field/TestQuery.kt.expected @@ -36,7 +36,7 @@ public class TestQuery() : Query { override fun serializeVariables( writer: JsonWriter, customScalarAdapters: CustomScalarAdapters, - withBooleanDefaultValues: Boolean, + withDefaultValues: Boolean, ) { // This operation doesn't have any variable } diff --git a/libraries/apollo-compiler/src/test/graphql/com/example/enums_as_sealed/java/operationBased/enums_as_sealed/TestQuery.java.expected b/libraries/apollo-compiler/src/test/graphql/com/example/enums_as_sealed/java/operationBased/enums_as_sealed/TestQuery.java.expected index e160f28114a..f380638129d 100644 --- a/libraries/apollo-compiler/src/test/graphql/com/example/enums_as_sealed/java/operationBased/enums_as_sealed/TestQuery.java.expected +++ b/libraries/apollo-compiler/src/test/graphql/com/example/enums_as_sealed/java/operationBased/enums_as_sealed/TestQuery.java.expected @@ -95,7 +95,7 @@ public class TestQuery implements Query { @Override public void serializeVariables(JsonWriter writer, CustomScalarAdapters customScalarAdapters, - boolean withBooleanDefaultValues) throws IOException { + boolean withDefaultValues) throws IOException { // This operation doesn't have any variable } diff --git a/libraries/apollo-compiler/src/test/graphql/com/example/enums_as_sealed/kotlin/responseBased/enums_as_sealed/TestQuery.kt.expected b/libraries/apollo-compiler/src/test/graphql/com/example/enums_as_sealed/kotlin/responseBased/enums_as_sealed/TestQuery.kt.expected index 1fd9e4de8b9..7ef57b2b45b 100644 --- a/libraries/apollo-compiler/src/test/graphql/com/example/enums_as_sealed/kotlin/responseBased/enums_as_sealed/TestQuery.kt.expected +++ b/libraries/apollo-compiler/src/test/graphql/com/example/enums_as_sealed/kotlin/responseBased/enums_as_sealed/TestQuery.kt.expected @@ -35,7 +35,7 @@ public class TestQuery() : Query { override fun serializeVariables( writer: JsonWriter, customScalarAdapters: CustomScalarAdapters, - withBooleanDefaultValues: Boolean, + withDefaultValues: Boolean, ) { // This operation doesn't have any variable } diff --git a/libraries/apollo-compiler/src/test/graphql/com/example/field_with_include_directive/java/operationBased/field_with_include_directive/TestQuery.java.expected b/libraries/apollo-compiler/src/test/graphql/com/example/field_with_include_directive/java/operationBased/field_with_include_directive/TestQuery.java.expected index 1aa4f277f5e..a02165debce 100644 --- a/libraries/apollo-compiler/src/test/graphql/com/example/field_with_include_directive/java/operationBased/field_with_include_directive/TestQuery.java.expected +++ b/libraries/apollo-compiler/src/test/graphql/com/example/field_with_include_directive/java/operationBased/field_with_include_directive/TestQuery.java.expected @@ -115,8 +115,8 @@ public class TestQuery implements Query { @Override public void serializeVariables(JsonWriter writer, CustomScalarAdapters customScalarAdapters, - boolean withBooleanDefaultValues) throws IOException { - TestQuery_VariablesAdapter.INSTANCE.serializeVariables(writer, this, customScalarAdapters, withBooleanDefaultValues); + boolean withDefaultValues) throws IOException { + TestQuery_VariablesAdapter.INSTANCE.serializeVariables(writer, this, customScalarAdapters, withDefaultValues); } @Override diff --git a/libraries/apollo-compiler/src/test/graphql/com/example/field_with_include_directive/java/operationBased/field_with_include_directive/adapter/TestQuery_VariablesAdapter.java.expected b/libraries/apollo-compiler/src/test/graphql/com/example/field_with_include_directive/java/operationBased/field_with_include_directive/adapter/TestQuery_VariablesAdapter.java.expected index 6a47973f909..d9b576290f4 100644 --- a/libraries/apollo-compiler/src/test/graphql/com/example/field_with_include_directive/java/operationBased/field_with_include_directive/adapter/TestQuery_VariablesAdapter.java.expected +++ b/libraries/apollo-compiler/src/test/graphql/com/example/field_with_include_directive/java/operationBased/field_with_include_directive/adapter/TestQuery_VariablesAdapter.java.expected @@ -16,8 +16,7 @@ public enum TestQuery_VariablesAdapter { INSTANCE; public void serializeVariables(JsonWriter writer, TestQuery value, - CustomScalarAdapters customScalarAdapters, boolean withBooleanDefaultValues) throws - IOException { + CustomScalarAdapters customScalarAdapters, boolean withDefaultValues) throws IOException { CompositeAdapterContext adapterContext = new CompositeAdapterContext.Builder().customScalarAdapters(customScalarAdapters).build(); writer.name("includeName"); Adapters.BooleanAdapter.toJson(writer, CustomScalarAdapters.Empty, value.includeName); diff --git a/libraries/apollo-compiler/src/test/graphql/com/example/field_with_include_directive/java/operationBased/field_with_include_directive/selections/TestQuerySelections.java.expected b/libraries/apollo-compiler/src/test/graphql/com/example/field_with_include_directive/java/operationBased/field_with_include_directive/selections/TestQuerySelections.java.expected index a95d8efee90..ab23e2ec5e2 100644 --- a/libraries/apollo-compiler/src/test/graphql/com/example/field_with_include_directive/java/operationBased/field_with_include_directive/selections/TestQuerySelections.java.expected +++ b/libraries/apollo-compiler/src/test/graphql/com/example/field_with_include_directive/java/operationBased/field_with_include_directive/selections/TestQuerySelections.java.expected @@ -5,6 +5,7 @@ // package com.example.field_with_include_directive.selections; +import com.apollographql.apollo3.api.CompiledArgument; import com.apollographql.apollo3.api.CompiledCondition; import com.apollographql.apollo3.api.CompiledField; import com.apollographql.apollo3.api.CompiledNotNullType; @@ -23,10 +24,10 @@ public class TestQuerySelections { private static List __hero = Arrays.asList( new CompiledField.Builder("name", new CompiledNotNullType(GraphQLString.type)).condition(Arrays.asList(new CompiledCondition("includeName", false))).build(), - new CompiledField.Builder("friendsConnection", new CompiledNotNullType(FriendsConnection.type)).condition(Arrays.asList(new CompiledCondition("skipFriends", true))).selections(__friendsConnection).build() + new CompiledField.Builder("friendsConnection", new CompiledNotNullType(FriendsConnection.type)).condition(Arrays.asList(new CompiledCondition("skipFriends", true))).arguments(Arrays.asList(new CompiledArgument.Builder("after").build(), new CompiledArgument.Builder("first").build())).selections(__friendsConnection).build() ); public static List __root = Arrays.asList( - new CompiledField.Builder("hero", Character.type).selections(__hero).build() + new CompiledField.Builder("hero", Character.type).arguments(Arrays.asList(new CompiledArgument.Builder("episode").build(), new CompiledArgument.Builder("listOfListOfStringArgs").build())).selections(__hero).build() ); } diff --git a/libraries/apollo-compiler/src/test/graphql/com/example/field_with_include_directive/kotlin/responseBased/field_with_include_directive/TestQuery.kt.expected b/libraries/apollo-compiler/src/test/graphql/com/example/field_with_include_directive/kotlin/responseBased/field_with_include_directive/TestQuery.kt.expected index 30c66d03b08..63395ac29f8 100644 --- a/libraries/apollo-compiler/src/test/graphql/com/example/field_with_include_directive/kotlin/responseBased/field_with_include_directive/TestQuery.kt.expected +++ b/libraries/apollo-compiler/src/test/graphql/com/example/field_with_include_directive/kotlin/responseBased/field_with_include_directive/TestQuery.kt.expected @@ -33,10 +33,10 @@ public data class TestQuery( override fun serializeVariables( writer: JsonWriter, customScalarAdapters: CustomScalarAdapters, - withBooleanDefaultValues: Boolean, + withDefaultValues: Boolean, ) { TestQuery_VariablesAdapter.serializeVariables(writer, this, customScalarAdapters, - withBooleanDefaultValues) + withDefaultValues) } override fun adapter(): CompositeAdapter = TestQuery_ResponseAdapter.Data.obj() diff --git a/libraries/apollo-compiler/src/test/graphql/com/example/field_with_include_directive/kotlin/responseBased/field_with_include_directive/adapter/TestQuery_VariablesAdapter.kt.expected b/libraries/apollo-compiler/src/test/graphql/com/example/field_with_include_directive/kotlin/responseBased/field_with_include_directive/adapter/TestQuery_VariablesAdapter.kt.expected index d51e1797cff..99e3a4c0f35 100644 --- a/libraries/apollo-compiler/src/test/graphql/com/example/field_with_include_directive/kotlin/responseBased/field_with_include_directive/adapter/TestQuery_VariablesAdapter.kt.expected +++ b/libraries/apollo-compiler/src/test/graphql/com/example/field_with_include_directive/kotlin/responseBased/field_with_include_directive/adapter/TestQuery_VariablesAdapter.kt.expected @@ -21,7 +21,7 @@ public object TestQuery_VariablesAdapter { writer: JsonWriter, `value`: TestQuery, customScalarAdapters: CustomScalarAdapters, - withBooleanDefaultValues: Boolean, + withDefaultValues: Boolean, ) { writer.name("includeName") BooleanAdapter.toJson(writer, customScalarAdapters, value.includeName) diff --git a/libraries/apollo-compiler/src/test/graphql/com/example/field_with_include_directive/kotlin/responseBased/field_with_include_directive/selections/TestQuerySelections.kt.expected b/libraries/apollo-compiler/src/test/graphql/com/example/field_with_include_directive/kotlin/responseBased/field_with_include_directive/selections/TestQuerySelections.kt.expected index 003b6950f0f..a55e1ca8752 100644 --- a/libraries/apollo-compiler/src/test/graphql/com/example/field_with_include_directive/kotlin/responseBased/field_with_include_directive/selections/TestQuerySelections.kt.expected +++ b/libraries/apollo-compiler/src/test/graphql/com/example/field_with_include_directive/kotlin/responseBased/field_with_include_directive/selections/TestQuerySelections.kt.expected @@ -5,6 +5,7 @@ // package com.example.field_with_include_directive.selections +import com.apollographql.apollo3.api.CompiledArgument import com.apollographql.apollo3.api.CompiledCondition import com.apollographql.apollo3.api.CompiledField import com.apollographql.apollo3.api.CompiledSelection @@ -33,6 +34,10 @@ public object TestQuerySelections { name = "friendsConnection", type = FriendsConnection.type.notNull() ).condition(listOf(CompiledCondition("skipFriends", true))) + .arguments(listOf( + CompiledArgument.Builder("after").build(), + CompiledArgument.Builder("first").build() + )) .selections(__friendsConnection) .build() ) @@ -41,7 +46,11 @@ public object TestQuerySelections { CompiledField.Builder( name = "hero", type = Character.type - ).selections(__hero) + ).arguments(listOf( + CompiledArgument.Builder("episode").build(), + CompiledArgument.Builder("listOfListOfStringArgs").build() + )) + .selections(__hero) .build() ) } diff --git a/libraries/apollo-compiler/src/test/graphql/com/example/fieldset_with_multiple_super/java/operationBased/fieldset_with_multiple_super/TestQuery.java.expected b/libraries/apollo-compiler/src/test/graphql/com/example/fieldset_with_multiple_super/java/operationBased/fieldset_with_multiple_super/TestQuery.java.expected index 00683345983..6ad265a0aaf 100644 --- a/libraries/apollo-compiler/src/test/graphql/com/example/fieldset_with_multiple_super/java/operationBased/fieldset_with_multiple_super/TestQuery.java.expected +++ b/libraries/apollo-compiler/src/test/graphql/com/example/fieldset_with_multiple_super/java/operationBased/fieldset_with_multiple_super/TestQuery.java.expected @@ -110,7 +110,7 @@ public class TestQuery implements Query { @Override public void serializeVariables(JsonWriter writer, CustomScalarAdapters customScalarAdapters, - boolean withBooleanDefaultValues) throws IOException { + boolean withDefaultValues) throws IOException { // This operation doesn't have any variable } diff --git a/libraries/apollo-compiler/src/test/graphql/com/example/fieldset_with_multiple_super/kotlin/operationBased/fieldset_with_multiple_super/TestQuery.kt.expected b/libraries/apollo-compiler/src/test/graphql/com/example/fieldset_with_multiple_super/kotlin/operationBased/fieldset_with_multiple_super/TestQuery.kt.expected index feedbca5a97..990ac013d33 100644 --- a/libraries/apollo-compiler/src/test/graphql/com/example/fieldset_with_multiple_super/kotlin/operationBased/fieldset_with_multiple_super/TestQuery.kt.expected +++ b/libraries/apollo-compiler/src/test/graphql/com/example/fieldset_with_multiple_super/kotlin/operationBased/fieldset_with_multiple_super/TestQuery.kt.expected @@ -34,7 +34,7 @@ public class TestQuery() : Query { override fun serializeVariables( writer: JsonWriter, customScalarAdapters: CustomScalarAdapters, - withBooleanDefaultValues: Boolean, + withDefaultValues: Boolean, ) { // This operation doesn't have any variable } diff --git a/libraries/apollo-compiler/src/test/graphql/com/example/fieldset_with_multiple_super/kotlin/responseBased/fieldset_with_multiple_super/TestQuery.kt.expected b/libraries/apollo-compiler/src/test/graphql/com/example/fieldset_with_multiple_super/kotlin/responseBased/fieldset_with_multiple_super/TestQuery.kt.expected index ec8c20dd872..bf993e4d7bf 100644 --- a/libraries/apollo-compiler/src/test/graphql/com/example/fieldset_with_multiple_super/kotlin/responseBased/fieldset_with_multiple_super/TestQuery.kt.expected +++ b/libraries/apollo-compiler/src/test/graphql/com/example/fieldset_with_multiple_super/kotlin/responseBased/fieldset_with_multiple_super/TestQuery.kt.expected @@ -35,7 +35,7 @@ public class TestQuery() : Query { override fun serializeVariables( writer: JsonWriter, customScalarAdapters: CustomScalarAdapters, - withBooleanDefaultValues: Boolean, + withDefaultValues: Boolean, ) { // This operation doesn't have any variable } diff --git a/libraries/apollo-compiler/src/test/graphql/com/example/fragment_spread_with_include_directive/java/operationBased/fragment_spread_with_include_directive/TestQuery.java.expected b/libraries/apollo-compiler/src/test/graphql/com/example/fragment_spread_with_include_directive/java/operationBased/fragment_spread_with_include_directive/TestQuery.java.expected index 75aa26518a7..6839346d2d7 100644 --- a/libraries/apollo-compiler/src/test/graphql/com/example/fragment_spread_with_include_directive/java/operationBased/fragment_spread_with_include_directive/TestQuery.java.expected +++ b/libraries/apollo-compiler/src/test/graphql/com/example/fragment_spread_with_include_directive/java/operationBased/fragment_spread_with_include_directive/TestQuery.java.expected @@ -161,8 +161,8 @@ public class TestQuery implements Query { @Override public void serializeVariables(JsonWriter writer, CustomScalarAdapters customScalarAdapters, - boolean withBooleanDefaultValues) throws IOException { - TestQuery_VariablesAdapter.INSTANCE.serializeVariables(writer, this, customScalarAdapters, withBooleanDefaultValues); + boolean withDefaultValues) throws IOException { + TestQuery_VariablesAdapter.INSTANCE.serializeVariables(writer, this, customScalarAdapters, withDefaultValues); } @Override diff --git a/libraries/apollo-compiler/src/test/graphql/com/example/fragment_spread_with_include_directive/java/operationBased/fragment_spread_with_include_directive/adapter/TestQuery_VariablesAdapter.java.expected b/libraries/apollo-compiler/src/test/graphql/com/example/fragment_spread_with_include_directive/java/operationBased/fragment_spread_with_include_directive/adapter/TestQuery_VariablesAdapter.java.expected index b8bc2050cad..fe872ebab1d 100644 --- a/libraries/apollo-compiler/src/test/graphql/com/example/fragment_spread_with_include_directive/java/operationBased/fragment_spread_with_include_directive/adapter/TestQuery_VariablesAdapter.java.expected +++ b/libraries/apollo-compiler/src/test/graphql/com/example/fragment_spread_with_include_directive/java/operationBased/fragment_spread_with_include_directive/adapter/TestQuery_VariablesAdapter.java.expected @@ -18,8 +18,7 @@ public enum TestQuery_VariablesAdapter { INSTANCE; public void serializeVariables(JsonWriter writer, TestQuery value, - CustomScalarAdapters customScalarAdapters, boolean withBooleanDefaultValues) throws - IOException { + CustomScalarAdapters customScalarAdapters, boolean withDefaultValues) throws IOException { CompositeAdapterContext adapterContext = new CompositeAdapterContext.Builder().customScalarAdapters(customScalarAdapters).build(); writer.name("withDetails"); Adapters.BooleanAdapter.toJson(writer, CustomScalarAdapters.Empty, value.withDetails); @@ -29,17 +28,17 @@ public enum TestQuery_VariablesAdapter { writer.name("optionalWithDefaultFalse"); new ApolloOptionalAdapter<>(Adapters.NullableBooleanAdapter).toJson(writer, CustomScalarAdapters.Empty, value.optionalWithDefaultFalse); } - else if (withBooleanDefaultValues) { + else if (withDefaultValues) { writer.name("optionalWithDefaultFalse"); - Adapters.BooleanAdapter.toJson(writer, CustomScalarAdapters.Empty, false); + Adapters.NullableAnyAdapter.toJson(writer, CustomScalarAdapters.Empty, false); } if (value.optionalWithDefaultTrue instanceof Optional.Present) { writer.name("optionalWithDefaultTrue"); new ApolloOptionalAdapter<>(Adapters.NullableBooleanAdapter).toJson(writer, CustomScalarAdapters.Empty, value.optionalWithDefaultTrue); } - else if (withBooleanDefaultValues) { + else if (withDefaultValues) { writer.name("optionalWithDefaultTrue"); - Adapters.BooleanAdapter.toJson(writer, CustomScalarAdapters.Empty, true); + Adapters.NullableAnyAdapter.toJson(writer, CustomScalarAdapters.Empty, true); } if (value.optionalWithNoDefault instanceof Optional.Present) { writer.name("optionalWithNoDefault"); diff --git a/libraries/apollo-compiler/src/test/graphql/com/example/fragment_spread_with_include_directive/java/operationBased/fragment_spread_with_include_directive/fragment/DroidDetailsImpl.java.expected b/libraries/apollo-compiler/src/test/graphql/com/example/fragment_spread_with_include_directive/java/operationBased/fragment_spread_with_include_directive/fragment/DroidDetailsImpl.java.expected index 79111903f34..bd57a5d8238 100644 --- a/libraries/apollo-compiler/src/test/graphql/com/example/fragment_spread_with_include_directive/java/operationBased/fragment_spread_with_include_directive/fragment/DroidDetailsImpl.java.expected +++ b/libraries/apollo-compiler/src/test/graphql/com/example/fragment_spread_with_include_directive/java/operationBased/fragment_spread_with_include_directive/fragment/DroidDetailsImpl.java.expected @@ -61,7 +61,7 @@ public class DroidDetailsImpl implements Fragment { @Override public void serializeVariables(JsonWriter writer, CustomScalarAdapters customScalarAdapters, - boolean withBooleanDefaultValues) throws IOException { + boolean withDefaultValues) throws IOException { // This fragment doesn't have any variable } diff --git a/libraries/apollo-compiler/src/test/graphql/com/example/fragment_spread_with_include_directive/java/operationBased/fragment_spread_with_include_directive/fragment/HeroDetailsImpl.java.expected b/libraries/apollo-compiler/src/test/graphql/com/example/fragment_spread_with_include_directive/java/operationBased/fragment_spread_with_include_directive/fragment/HeroDetailsImpl.java.expected index a0b58860037..e3371e7e6d5 100644 --- a/libraries/apollo-compiler/src/test/graphql/com/example/fragment_spread_with_include_directive/java/operationBased/fragment_spread_with_include_directive/fragment/HeroDetailsImpl.java.expected +++ b/libraries/apollo-compiler/src/test/graphql/com/example/fragment_spread_with_include_directive/java/operationBased/fragment_spread_with_include_directive/fragment/HeroDetailsImpl.java.expected @@ -61,7 +61,7 @@ public class HeroDetailsImpl implements Fragment { @Override public void serializeVariables(JsonWriter writer, CustomScalarAdapters customScalarAdapters, - boolean withBooleanDefaultValues) throws IOException { + boolean withDefaultValues) throws IOException { // This fragment doesn't have any variable } diff --git a/libraries/apollo-compiler/src/test/graphql/com/example/fragment_spread_with_include_directive/java/operationBased/fragment_spread_with_include_directive/fragment/HumanDetailsImpl.java.expected b/libraries/apollo-compiler/src/test/graphql/com/example/fragment_spread_with_include_directive/java/operationBased/fragment_spread_with_include_directive/fragment/HumanDetailsImpl.java.expected index 97ebb2b8a6f..6154a71c92d 100644 --- a/libraries/apollo-compiler/src/test/graphql/com/example/fragment_spread_with_include_directive/java/operationBased/fragment_spread_with_include_directive/fragment/HumanDetailsImpl.java.expected +++ b/libraries/apollo-compiler/src/test/graphql/com/example/fragment_spread_with_include_directive/java/operationBased/fragment_spread_with_include_directive/fragment/HumanDetailsImpl.java.expected @@ -61,7 +61,7 @@ public class HumanDetailsImpl implements Fragment { @Override public void serializeVariables(JsonWriter writer, CustomScalarAdapters customScalarAdapters, - boolean withBooleanDefaultValues) throws IOException { + boolean withDefaultValues) throws IOException { // This fragment doesn't have any variable } diff --git a/libraries/apollo-compiler/src/test/graphql/com/example/fragment_spread_with_include_directive/java/operationBased/fragment_spread_with_include_directive/fragment/OtherDroidDetailsImpl.java.expected b/libraries/apollo-compiler/src/test/graphql/com/example/fragment_spread_with_include_directive/java/operationBased/fragment_spread_with_include_directive/fragment/OtherDroidDetailsImpl.java.expected index f554b4754bf..6394f05024f 100644 --- a/libraries/apollo-compiler/src/test/graphql/com/example/fragment_spread_with_include_directive/java/operationBased/fragment_spread_with_include_directive/fragment/OtherDroidDetailsImpl.java.expected +++ b/libraries/apollo-compiler/src/test/graphql/com/example/fragment_spread_with_include_directive/java/operationBased/fragment_spread_with_include_directive/fragment/OtherDroidDetailsImpl.java.expected @@ -61,7 +61,7 @@ public class OtherDroidDetailsImpl implements Fragment { @Override public void serializeVariables(JsonWriter writer, CustomScalarAdapters customScalarAdapters, - boolean withBooleanDefaultValues) throws IOException { + boolean withDefaultValues) throws IOException { // This fragment doesn't have any variable } diff --git a/libraries/apollo-compiler/src/test/graphql/com/example/fragment_spread_with_include_directive/java/operationBased/fragment_spread_with_include_directive/selections/TestQuerySelections.java.expected b/libraries/apollo-compiler/src/test/graphql/com/example/fragment_spread_with_include_directive/java/operationBased/fragment_spread_with_include_directive/selections/TestQuerySelections.java.expected index f8b5ad2919d..739815de090 100644 --- a/libraries/apollo-compiler/src/test/graphql/com/example/fragment_spread_with_include_directive/java/operationBased/fragment_spread_with_include_directive/selections/TestQuerySelections.java.expected +++ b/libraries/apollo-compiler/src/test/graphql/com/example/fragment_spread_with_include_directive/java/operationBased/fragment_spread_with_include_directive/selections/TestQuerySelections.java.expected @@ -34,7 +34,7 @@ public class TestQuerySelections { ); public static List __root = Arrays.asList( - new CompiledField.Builder("hero", Character.type).selections(__hero).build(), - new CompiledField.Builder("getBoolean", GraphQLBoolean.type).arguments(Arrays.asList(new CompiledArgument.Builder("booleanArg", new CompiledVariable("optionalWithNoDefault")).build())).build() + new CompiledField.Builder("hero", Character.type).arguments(Arrays.asList(new CompiledArgument.Builder("episode").build(), new CompiledArgument.Builder("listOfListOfStringArgs").build())).selections(__hero).build(), + new CompiledField.Builder("getBoolean", GraphQLBoolean.type).arguments(Arrays.asList(new CompiledArgument.Builder("booleanArg").value(new CompiledVariable("optionalWithNoDefault")).build())).build() ); } diff --git a/libraries/apollo-compiler/src/test/graphql/com/example/fragment_spread_with_include_directive/kotlin/operationBased/fragment_spread_with_include_directive/TestQuery.kt.expected b/libraries/apollo-compiler/src/test/graphql/com/example/fragment_spread_with_include_directive/kotlin/operationBased/fragment_spread_with_include_directive/TestQuery.kt.expected index a237a9be7b3..1720c5a99bd 100644 --- a/libraries/apollo-compiler/src/test/graphql/com/example/fragment_spread_with_include_directive/kotlin/operationBased/fragment_spread_with_include_directive/TestQuery.kt.expected +++ b/libraries/apollo-compiler/src/test/graphql/com/example/fragment_spread_with_include_directive/kotlin/operationBased/fragment_spread_with_include_directive/TestQuery.kt.expected @@ -40,10 +40,10 @@ public data class TestQuery( override fun serializeVariables( writer: JsonWriter, customScalarAdapters: CustomScalarAdapters, - withBooleanDefaultValues: Boolean, + withDefaultValues: Boolean, ) { TestQuery_VariablesAdapter.serializeVariables(writer, this, customScalarAdapters, - withBooleanDefaultValues) + withDefaultValues) } override fun adapter(): CompositeAdapter = TestQuery_ResponseAdapter.Data.obj() diff --git a/libraries/apollo-compiler/src/test/graphql/com/example/fragment_spread_with_include_directive/kotlin/operationBased/fragment_spread_with_include_directive/adapter/TestQuery_VariablesAdapter.kt.expected b/libraries/apollo-compiler/src/test/graphql/com/example/fragment_spread_with_include_directive/kotlin/operationBased/fragment_spread_with_include_directive/adapter/TestQuery_VariablesAdapter.kt.expected index f4598dd7f3c..48417018804 100644 --- a/libraries/apollo-compiler/src/test/graphql/com/example/fragment_spread_with_include_directive/kotlin/operationBased/fragment_spread_with_include_directive/adapter/TestQuery_VariablesAdapter.kt.expected +++ b/libraries/apollo-compiler/src/test/graphql/com/example/fragment_spread_with_include_directive/kotlin/operationBased/fragment_spread_with_include_directive/adapter/TestQuery_VariablesAdapter.kt.expected @@ -7,6 +7,7 @@ package com.example.fragment_spread_with_include_directive.adapter import com.apollographql.apollo3.api.BooleanAdapter import com.apollographql.apollo3.api.CustomScalarAdapters +import com.apollographql.apollo3.api.NullableAnyAdapter import com.apollographql.apollo3.api.NullableBooleanAdapter import com.apollographql.apollo3.api.Optional import com.apollographql.apollo3.api.json.JsonWriter @@ -24,7 +25,7 @@ public object TestQuery_VariablesAdapter { writer: JsonWriter, `value`: TestQuery, customScalarAdapters: CustomScalarAdapters, - withBooleanDefaultValues: Boolean, + withDefaultValues: Boolean, ) { writer.name("withDetails") BooleanAdapter.toJson(writer, customScalarAdapters, value.withDetails) @@ -35,18 +36,18 @@ public object TestQuery_VariablesAdapter { NullableBooleanAdapter.present().toJson(writer, customScalarAdapters, value.optionalWithDefaultFalse) } - else if (withBooleanDefaultValues) { + else if (withDefaultValues) { writer.name("optionalWithDefaultFalse") - BooleanAdapter.toJson(writer, customScalarAdapters, false) + NullableAnyAdapter.toJson(writer, customScalarAdapters, false) } if (value.optionalWithDefaultTrue is Optional.Present) { writer.name("optionalWithDefaultTrue") NullableBooleanAdapter.present().toJson(writer, customScalarAdapters, value.optionalWithDefaultTrue) } - else if (withBooleanDefaultValues) { + else if (withDefaultValues) { writer.name("optionalWithDefaultTrue") - BooleanAdapter.toJson(writer, customScalarAdapters, true) + NullableAnyAdapter.toJson(writer, customScalarAdapters, true) } if (value.optionalWithNoDefault is Optional.Present) { writer.name("optionalWithNoDefault") diff --git a/libraries/apollo-compiler/src/test/graphql/com/example/fragment_spread_with_include_directive/kotlin/operationBased/fragment_spread_with_include_directive/fragment/DroidDetailsImpl.kt.expected b/libraries/apollo-compiler/src/test/graphql/com/example/fragment_spread_with_include_directive/kotlin/operationBased/fragment_spread_with_include_directive/fragment/DroidDetailsImpl.kt.expected index 99a8257ae80..536eccd1378 100644 --- a/libraries/apollo-compiler/src/test/graphql/com/example/fragment_spread_with_include_directive/kotlin/operationBased/fragment_spread_with_include_directive/fragment/DroidDetailsImpl.kt.expected +++ b/libraries/apollo-compiler/src/test/graphql/com/example/fragment_spread_with_include_directive/kotlin/operationBased/fragment_spread_with_include_directive/fragment/DroidDetailsImpl.kt.expected @@ -25,7 +25,7 @@ public class DroidDetailsImpl() : Fragment { override fun serializeVariables( writer: JsonWriter, customScalarAdapters: CustomScalarAdapters, - withBooleanDefaultValues: Boolean, + withDefaultValues: Boolean, ) { // This fragment doesn't have any variable } diff --git a/libraries/apollo-compiler/src/test/graphql/com/example/fragment_spread_with_include_directive/kotlin/operationBased/fragment_spread_with_include_directive/fragment/HeroDetailsImpl.kt.expected b/libraries/apollo-compiler/src/test/graphql/com/example/fragment_spread_with_include_directive/kotlin/operationBased/fragment_spread_with_include_directive/fragment/HeroDetailsImpl.kt.expected index 68848127aaf..a1ad615e53b 100644 --- a/libraries/apollo-compiler/src/test/graphql/com/example/fragment_spread_with_include_directive/kotlin/operationBased/fragment_spread_with_include_directive/fragment/HeroDetailsImpl.kt.expected +++ b/libraries/apollo-compiler/src/test/graphql/com/example/fragment_spread_with_include_directive/kotlin/operationBased/fragment_spread_with_include_directive/fragment/HeroDetailsImpl.kt.expected @@ -25,7 +25,7 @@ public class HeroDetailsImpl() : Fragment { override fun serializeVariables( writer: JsonWriter, customScalarAdapters: CustomScalarAdapters, - withBooleanDefaultValues: Boolean, + withDefaultValues: Boolean, ) { // This fragment doesn't have any variable } diff --git a/libraries/apollo-compiler/src/test/graphql/com/example/fragment_spread_with_include_directive/kotlin/operationBased/fragment_spread_with_include_directive/fragment/HumanDetailsImpl.kt.expected b/libraries/apollo-compiler/src/test/graphql/com/example/fragment_spread_with_include_directive/kotlin/operationBased/fragment_spread_with_include_directive/fragment/HumanDetailsImpl.kt.expected index 70293b010c9..2f1ade511de 100644 --- a/libraries/apollo-compiler/src/test/graphql/com/example/fragment_spread_with_include_directive/kotlin/operationBased/fragment_spread_with_include_directive/fragment/HumanDetailsImpl.kt.expected +++ b/libraries/apollo-compiler/src/test/graphql/com/example/fragment_spread_with_include_directive/kotlin/operationBased/fragment_spread_with_include_directive/fragment/HumanDetailsImpl.kt.expected @@ -25,7 +25,7 @@ public class HumanDetailsImpl() : Fragment { override fun serializeVariables( writer: JsonWriter, customScalarAdapters: CustomScalarAdapters, - withBooleanDefaultValues: Boolean, + withDefaultValues: Boolean, ) { // This fragment doesn't have any variable } diff --git a/libraries/apollo-compiler/src/test/graphql/com/example/fragment_spread_with_include_directive/kotlin/operationBased/fragment_spread_with_include_directive/fragment/OtherDroidDetailsImpl.kt.expected b/libraries/apollo-compiler/src/test/graphql/com/example/fragment_spread_with_include_directive/kotlin/operationBased/fragment_spread_with_include_directive/fragment/OtherDroidDetailsImpl.kt.expected index 2bbc3ac7c61..cd6ad7566d4 100644 --- a/libraries/apollo-compiler/src/test/graphql/com/example/fragment_spread_with_include_directive/kotlin/operationBased/fragment_spread_with_include_directive/fragment/OtherDroidDetailsImpl.kt.expected +++ b/libraries/apollo-compiler/src/test/graphql/com/example/fragment_spread_with_include_directive/kotlin/operationBased/fragment_spread_with_include_directive/fragment/OtherDroidDetailsImpl.kt.expected @@ -25,7 +25,7 @@ public class OtherDroidDetailsImpl() : Fragment { override fun serializeVariables( writer: JsonWriter, customScalarAdapters: CustomScalarAdapters, - withBooleanDefaultValues: Boolean, + withDefaultValues: Boolean, ) { // This fragment doesn't have any variable } diff --git a/libraries/apollo-compiler/src/test/graphql/com/example/fragment_spread_with_include_directive/kotlin/operationBased/fragment_spread_with_include_directive/selections/TestQuerySelections.kt.expected b/libraries/apollo-compiler/src/test/graphql/com/example/fragment_spread_with_include_directive/kotlin/operationBased/fragment_spread_with_include_directive/selections/TestQuerySelections.kt.expected index deb27e29b95..7da6ae99949 100644 --- a/libraries/apollo-compiler/src/test/graphql/com/example/fragment_spread_with_include_directive/kotlin/operationBased/fragment_spread_with_include_directive/selections/TestQuerySelections.kt.expected +++ b/libraries/apollo-compiler/src/test/graphql/com/example/fragment_spread_with_include_directive/kotlin/operationBased/fragment_spread_with_include_directive/selections/TestQuerySelections.kt.expected @@ -63,13 +63,17 @@ public object TestQuerySelections { CompiledField.Builder( name = "hero", type = Character.type - ).selections(__hero) + ).arguments(listOf( + CompiledArgument.Builder("episode").build(), + CompiledArgument.Builder("listOfListOfStringArgs").build() + )) + .selections(__hero) .build(), CompiledField.Builder( name = "getBoolean", type = GraphQLBoolean.type ).arguments(listOf( - CompiledArgument.Builder("booleanArg", CompiledVariable("optionalWithNoDefault")).build() + CompiledArgument.Builder("booleanArg").value(CompiledVariable("optionalWithNoDefault")).build() )) .build() ) diff --git a/libraries/apollo-compiler/src/test/graphql/com/example/fragment_spread_with_nested_fields/java/operationBased/fragment_spread_with_nested_fields/TestQuery.java.expected b/libraries/apollo-compiler/src/test/graphql/com/example/fragment_spread_with_nested_fields/java/operationBased/fragment_spread_with_nested_fields/TestQuery.java.expected index 7f075436ee3..4e17a6b58de 100644 --- a/libraries/apollo-compiler/src/test/graphql/com/example/fragment_spread_with_nested_fields/java/operationBased/fragment_spread_with_nested_fields/TestQuery.java.expected +++ b/libraries/apollo-compiler/src/test/graphql/com/example/fragment_spread_with_nested_fields/java/operationBased/fragment_spread_with_nested_fields/TestQuery.java.expected @@ -110,7 +110,7 @@ public class TestQuery implements Query { @Override public void serializeVariables(JsonWriter writer, CustomScalarAdapters customScalarAdapters, - boolean withBooleanDefaultValues) throws IOException { + boolean withDefaultValues) throws IOException { // This operation doesn't have any variable } diff --git a/libraries/apollo-compiler/src/test/graphql/com/example/fragment_spread_with_nested_fields/java/operationBased/fragment_spread_with_nested_fields/fragment/HeroDetailsImpl.java.expected b/libraries/apollo-compiler/src/test/graphql/com/example/fragment_spread_with_nested_fields/java/operationBased/fragment_spread_with_nested_fields/fragment/HeroDetailsImpl.java.expected index 3253ef30ca7..6a249e26812 100644 --- a/libraries/apollo-compiler/src/test/graphql/com/example/fragment_spread_with_nested_fields/java/operationBased/fragment_spread_with_nested_fields/fragment/HeroDetailsImpl.java.expected +++ b/libraries/apollo-compiler/src/test/graphql/com/example/fragment_spread_with_nested_fields/java/operationBased/fragment_spread_with_nested_fields/fragment/HeroDetailsImpl.java.expected @@ -61,7 +61,7 @@ public class HeroDetailsImpl implements Fragment { @Override public void serializeVariables(JsonWriter writer, CustomScalarAdapters customScalarAdapters, - boolean withBooleanDefaultValues) throws IOException { + boolean withDefaultValues) throws IOException { // This fragment doesn't have any variable } diff --git a/libraries/apollo-compiler/src/test/graphql/com/example/fragment_spread_with_nested_fields/java/operationBased/fragment_spread_with_nested_fields/fragment/selections/HeroDetailsSelections.java.expected b/libraries/apollo-compiler/src/test/graphql/com/example/fragment_spread_with_nested_fields/java/operationBased/fragment_spread_with_nested_fields/fragment/selections/HeroDetailsSelections.java.expected index ade4a5a92a2..326811e2697 100644 --- a/libraries/apollo-compiler/src/test/graphql/com/example/fragment_spread_with_nested_fields/java/operationBased/fragment_spread_with_nested_fields/fragment/selections/HeroDetailsSelections.java.expected +++ b/libraries/apollo-compiler/src/test/graphql/com/example/fragment_spread_with_nested_fields/java/operationBased/fragment_spread_with_nested_fields/fragment/selections/HeroDetailsSelections.java.expected @@ -5,6 +5,7 @@ // package com.example.fragment_spread_with_nested_fields.fragment.selections; +import com.apollographql.apollo3.api.CompiledArgument; import com.apollographql.apollo3.api.CompiledField; import com.apollographql.apollo3.api.CompiledListType; import com.apollographql.apollo3.api.CompiledNotNullType; @@ -33,6 +34,6 @@ public class HeroDetailsSelections { public static List __root = Arrays.asList( new CompiledField.Builder("name", new CompiledNotNullType(GraphQLString.type)).build(), - new CompiledField.Builder("friendsConnection", new CompiledNotNullType(FriendsConnection.type)).selections(__friendsConnection).build() + new CompiledField.Builder("friendsConnection", new CompiledNotNullType(FriendsConnection.type)).arguments(Arrays.asList(new CompiledArgument.Builder("after").build(), new CompiledArgument.Builder("first").build())).selections(__friendsConnection).build() ); } diff --git a/libraries/apollo-compiler/src/test/graphql/com/example/fragment_spread_with_nested_fields/java/operationBased/fragment_spread_with_nested_fields/selections/TestQuerySelections.java.expected b/libraries/apollo-compiler/src/test/graphql/com/example/fragment_spread_with_nested_fields/java/operationBased/fragment_spread_with_nested_fields/selections/TestQuerySelections.java.expected index ac616ee07f2..7414d5c945c 100644 --- a/libraries/apollo-compiler/src/test/graphql/com/example/fragment_spread_with_nested_fields/java/operationBased/fragment_spread_with_nested_fields/selections/TestQuerySelections.java.expected +++ b/libraries/apollo-compiler/src/test/graphql/com/example/fragment_spread_with_nested_fields/java/operationBased/fragment_spread_with_nested_fields/selections/TestQuerySelections.java.expected @@ -5,6 +5,7 @@ // package com.example.fragment_spread_with_nested_fields.selections; +import com.apollographql.apollo3.api.CompiledArgument; import com.apollographql.apollo3.api.CompiledField; import com.apollographql.apollo3.api.CompiledFragment; import com.apollographql.apollo3.api.CompiledNotNullType; @@ -22,6 +23,6 @@ public class TestQuerySelections { ); public static List __root = Arrays.asList( - new CompiledField.Builder("hero", Character.type).selections(__hero).build() + new CompiledField.Builder("hero", Character.type).arguments(Arrays.asList(new CompiledArgument.Builder("episode").build(), new CompiledArgument.Builder("listOfListOfStringArgs").build())).selections(__hero).build() ); } diff --git a/libraries/apollo-compiler/src/test/graphql/com/example/fragment_spread_with_nested_fields/kotlin/operationBased/fragment_spread_with_nested_fields/TestQuery.kt.expected b/libraries/apollo-compiler/src/test/graphql/com/example/fragment_spread_with_nested_fields/kotlin/operationBased/fragment_spread_with_nested_fields/TestQuery.kt.expected index 047739209b6..be609508c11 100644 --- a/libraries/apollo-compiler/src/test/graphql/com/example/fragment_spread_with_nested_fields/kotlin/operationBased/fragment_spread_with_nested_fields/TestQuery.kt.expected +++ b/libraries/apollo-compiler/src/test/graphql/com/example/fragment_spread_with_nested_fields/kotlin/operationBased/fragment_spread_with_nested_fields/TestQuery.kt.expected @@ -35,7 +35,7 @@ public class TestQuery() : Query { override fun serializeVariables( writer: JsonWriter, customScalarAdapters: CustomScalarAdapters, - withBooleanDefaultValues: Boolean, + withDefaultValues: Boolean, ) { // This operation doesn't have any variable } diff --git a/libraries/apollo-compiler/src/test/graphql/com/example/fragment_spread_with_nested_fields/kotlin/operationBased/fragment_spread_with_nested_fields/fragment/HeroDetailsImpl.kt.expected b/libraries/apollo-compiler/src/test/graphql/com/example/fragment_spread_with_nested_fields/kotlin/operationBased/fragment_spread_with_nested_fields/fragment/HeroDetailsImpl.kt.expected index 910723dfefc..614483f773e 100644 --- a/libraries/apollo-compiler/src/test/graphql/com/example/fragment_spread_with_nested_fields/kotlin/operationBased/fragment_spread_with_nested_fields/fragment/HeroDetailsImpl.kt.expected +++ b/libraries/apollo-compiler/src/test/graphql/com/example/fragment_spread_with_nested_fields/kotlin/operationBased/fragment_spread_with_nested_fields/fragment/HeroDetailsImpl.kt.expected @@ -25,7 +25,7 @@ public class HeroDetailsImpl() : Fragment { override fun serializeVariables( writer: JsonWriter, customScalarAdapters: CustomScalarAdapters, - withBooleanDefaultValues: Boolean, + withDefaultValues: Boolean, ) { // This fragment doesn't have any variable } diff --git a/libraries/apollo-compiler/src/test/graphql/com/example/fragment_spread_with_nested_fields/kotlin/operationBased/fragment_spread_with_nested_fields/fragment/selections/HeroDetailsSelections.kt.expected b/libraries/apollo-compiler/src/test/graphql/com/example/fragment_spread_with_nested_fields/kotlin/operationBased/fragment_spread_with_nested_fields/fragment/selections/HeroDetailsSelections.kt.expected index d089186edf9..0a083f0d0d8 100644 --- a/libraries/apollo-compiler/src/test/graphql/com/example/fragment_spread_with_nested_fields/kotlin/operationBased/fragment_spread_with_nested_fields/fragment/selections/HeroDetailsSelections.kt.expected +++ b/libraries/apollo-compiler/src/test/graphql/com/example/fragment_spread_with_nested_fields/kotlin/operationBased/fragment_spread_with_nested_fields/fragment/selections/HeroDetailsSelections.kt.expected @@ -5,6 +5,7 @@ // package com.example.fragment_spread_with_nested_fields.fragment.selections +import com.apollographql.apollo3.api.CompiledArgument import com.apollographql.apollo3.api.CompiledField import com.apollographql.apollo3.api.CompiledSelection import com.apollographql.apollo3.api.list @@ -52,7 +53,11 @@ public object HeroDetailsSelections { CompiledField.Builder( name = "friendsConnection", type = FriendsConnection.type.notNull() - ).selections(__friendsConnection) + ).arguments(listOf( + CompiledArgument.Builder("after").build(), + CompiledArgument.Builder("first").build() + )) + .selections(__friendsConnection) .build() ) } diff --git a/libraries/apollo-compiler/src/test/graphql/com/example/fragment_spread_with_nested_fields/kotlin/operationBased/fragment_spread_with_nested_fields/selections/TestQuerySelections.kt.expected b/libraries/apollo-compiler/src/test/graphql/com/example/fragment_spread_with_nested_fields/kotlin/operationBased/fragment_spread_with_nested_fields/selections/TestQuerySelections.kt.expected index 37c1043d248..ebb0432dba0 100644 --- a/libraries/apollo-compiler/src/test/graphql/com/example/fragment_spread_with_nested_fields/kotlin/operationBased/fragment_spread_with_nested_fields/selections/TestQuerySelections.kt.expected +++ b/libraries/apollo-compiler/src/test/graphql/com/example/fragment_spread_with_nested_fields/kotlin/operationBased/fragment_spread_with_nested_fields/selections/TestQuerySelections.kt.expected @@ -5,6 +5,7 @@ // package com.example.fragment_spread_with_nested_fields.selections +import com.apollographql.apollo3.api.CompiledArgument import com.apollographql.apollo3.api.CompiledField import com.apollographql.apollo3.api.CompiledFragment import com.apollographql.apollo3.api.CompiledSelection @@ -31,7 +32,11 @@ public object TestQuerySelections { CompiledField.Builder( name = "hero", type = Character.type - ).selections(__hero) + ).arguments(listOf( + CompiledArgument.Builder("episode").build(), + CompiledArgument.Builder("listOfListOfStringArgs").build() + )) + .selections(__hero) .build() ) } diff --git a/libraries/apollo-compiler/src/test/graphql/com/example/fragment_spread_with_nested_fields/kotlin/responseBased/fragment_spread_with_nested_fields/TestQuery.kt.expected b/libraries/apollo-compiler/src/test/graphql/com/example/fragment_spread_with_nested_fields/kotlin/responseBased/fragment_spread_with_nested_fields/TestQuery.kt.expected index d430ff7745f..d9669da9dce 100644 --- a/libraries/apollo-compiler/src/test/graphql/com/example/fragment_spread_with_nested_fields/kotlin/responseBased/fragment_spread_with_nested_fields/TestQuery.kt.expected +++ b/libraries/apollo-compiler/src/test/graphql/com/example/fragment_spread_with_nested_fields/kotlin/responseBased/fragment_spread_with_nested_fields/TestQuery.kt.expected @@ -37,7 +37,7 @@ public class TestQuery() : Query { override fun serializeVariables( writer: JsonWriter, customScalarAdapters: CustomScalarAdapters, - withBooleanDefaultValues: Boolean, + withDefaultValues: Boolean, ) { // This operation doesn't have any variable } diff --git a/libraries/apollo-compiler/src/test/graphql/com/example/fragment_spread_with_nested_fields/kotlin/responseBased/fragment_spread_with_nested_fields/fragment/HeroDetailsImpl.kt.expected b/libraries/apollo-compiler/src/test/graphql/com/example/fragment_spread_with_nested_fields/kotlin/responseBased/fragment_spread_with_nested_fields/fragment/HeroDetailsImpl.kt.expected index d6b27ceaa26..cbf3115d39c 100644 --- a/libraries/apollo-compiler/src/test/graphql/com/example/fragment_spread_with_nested_fields/kotlin/responseBased/fragment_spread_with_nested_fields/fragment/HeroDetailsImpl.kt.expected +++ b/libraries/apollo-compiler/src/test/graphql/com/example/fragment_spread_with_nested_fields/kotlin/responseBased/fragment_spread_with_nested_fields/fragment/HeroDetailsImpl.kt.expected @@ -27,7 +27,7 @@ public class HeroDetailsImpl() : Fragment { override fun serializeVariables( writer: JsonWriter, customScalarAdapters: CustomScalarAdapters, - withBooleanDefaultValues: Boolean, + withDefaultValues: Boolean, ) { // This fragment doesn't have any variable } diff --git a/libraries/apollo-compiler/src/test/graphql/com/example/fragment_spread_with_nested_fields/kotlin/responseBased/fragment_spread_with_nested_fields/fragment/selections/HeroDetailsSelections.kt.expected b/libraries/apollo-compiler/src/test/graphql/com/example/fragment_spread_with_nested_fields/kotlin/responseBased/fragment_spread_with_nested_fields/fragment/selections/HeroDetailsSelections.kt.expected index d089186edf9..0a083f0d0d8 100644 --- a/libraries/apollo-compiler/src/test/graphql/com/example/fragment_spread_with_nested_fields/kotlin/responseBased/fragment_spread_with_nested_fields/fragment/selections/HeroDetailsSelections.kt.expected +++ b/libraries/apollo-compiler/src/test/graphql/com/example/fragment_spread_with_nested_fields/kotlin/responseBased/fragment_spread_with_nested_fields/fragment/selections/HeroDetailsSelections.kt.expected @@ -5,6 +5,7 @@ // package com.example.fragment_spread_with_nested_fields.fragment.selections +import com.apollographql.apollo3.api.CompiledArgument import com.apollographql.apollo3.api.CompiledField import com.apollographql.apollo3.api.CompiledSelection import com.apollographql.apollo3.api.list @@ -52,7 +53,11 @@ public object HeroDetailsSelections { CompiledField.Builder( name = "friendsConnection", type = FriendsConnection.type.notNull() - ).selections(__friendsConnection) + ).arguments(listOf( + CompiledArgument.Builder("after").build(), + CompiledArgument.Builder("first").build() + )) + .selections(__friendsConnection) .build() ) } diff --git a/libraries/apollo-compiler/src/test/graphql/com/example/fragment_spread_with_nested_fields/kotlin/responseBased/fragment_spread_with_nested_fields/selections/TestQuerySelections.kt.expected b/libraries/apollo-compiler/src/test/graphql/com/example/fragment_spread_with_nested_fields/kotlin/responseBased/fragment_spread_with_nested_fields/selections/TestQuerySelections.kt.expected index 37c1043d248..ebb0432dba0 100644 --- a/libraries/apollo-compiler/src/test/graphql/com/example/fragment_spread_with_nested_fields/kotlin/responseBased/fragment_spread_with_nested_fields/selections/TestQuerySelections.kt.expected +++ b/libraries/apollo-compiler/src/test/graphql/com/example/fragment_spread_with_nested_fields/kotlin/responseBased/fragment_spread_with_nested_fields/selections/TestQuerySelections.kt.expected @@ -5,6 +5,7 @@ // package com.example.fragment_spread_with_nested_fields.selections +import com.apollographql.apollo3.api.CompiledArgument import com.apollographql.apollo3.api.CompiledField import com.apollographql.apollo3.api.CompiledFragment import com.apollographql.apollo3.api.CompiledSelection @@ -31,7 +32,11 @@ public object TestQuerySelections { CompiledField.Builder( name = "hero", type = Character.type - ).selections(__hero) + ).arguments(listOf( + CompiledArgument.Builder("episode").build(), + CompiledArgument.Builder("listOfListOfStringArgs").build() + )) + .selections(__hero) .build() ) } diff --git a/libraries/apollo-compiler/src/test/graphql/com/example/fragment_used_twice/java/operationBased/fragment_used_twice/TestQuery.java.expected b/libraries/apollo-compiler/src/test/graphql/com/example/fragment_used_twice/java/operationBased/fragment_used_twice/TestQuery.java.expected index e7ba9af9f99..838955d587c 100644 --- a/libraries/apollo-compiler/src/test/graphql/com/example/fragment_used_twice/java/operationBased/fragment_used_twice/TestQuery.java.expected +++ b/libraries/apollo-compiler/src/test/graphql/com/example/fragment_used_twice/java/operationBased/fragment_used_twice/TestQuery.java.expected @@ -117,7 +117,7 @@ public class TestQuery implements Query { @Override public void serializeVariables(JsonWriter writer, CustomScalarAdapters customScalarAdapters, - boolean withBooleanDefaultValues) throws IOException { + boolean withDefaultValues) throws IOException { // This operation doesn't have any variable } diff --git a/libraries/apollo-compiler/src/test/graphql/com/example/fragment_used_twice/java/operationBased/fragment_used_twice/fragment/CharacterDetailsImpl.java.expected b/libraries/apollo-compiler/src/test/graphql/com/example/fragment_used_twice/java/operationBased/fragment_used_twice/fragment/CharacterDetailsImpl.java.expected index 497b12f05dd..d73eca7f492 100644 --- a/libraries/apollo-compiler/src/test/graphql/com/example/fragment_used_twice/java/operationBased/fragment_used_twice/fragment/CharacterDetailsImpl.java.expected +++ b/libraries/apollo-compiler/src/test/graphql/com/example/fragment_used_twice/java/operationBased/fragment_used_twice/fragment/CharacterDetailsImpl.java.expected @@ -61,7 +61,7 @@ public class CharacterDetailsImpl implements Fragment { @Override public void serializeVariables(JsonWriter writer, CustomScalarAdapters customScalarAdapters, - boolean withBooleanDefaultValues) throws IOException { + boolean withDefaultValues) throws IOException { // This fragment doesn't have any variable } diff --git a/libraries/apollo-compiler/src/test/graphql/com/example/fragment_used_twice/java/operationBased/fragment_used_twice/fragment/HeroDetailsImpl.java.expected b/libraries/apollo-compiler/src/test/graphql/com/example/fragment_used_twice/java/operationBased/fragment_used_twice/fragment/HeroDetailsImpl.java.expected index 1f372416349..ff14d2f7fbb 100644 --- a/libraries/apollo-compiler/src/test/graphql/com/example/fragment_used_twice/java/operationBased/fragment_used_twice/fragment/HeroDetailsImpl.java.expected +++ b/libraries/apollo-compiler/src/test/graphql/com/example/fragment_used_twice/java/operationBased/fragment_used_twice/fragment/HeroDetailsImpl.java.expected @@ -61,7 +61,7 @@ public class HeroDetailsImpl implements Fragment { @Override public void serializeVariables(JsonWriter writer, CustomScalarAdapters customScalarAdapters, - boolean withBooleanDefaultValues) throws IOException { + boolean withDefaultValues) throws IOException { // This fragment doesn't have any variable } diff --git a/libraries/apollo-compiler/src/test/graphql/com/example/fragment_used_twice/java/operationBased/fragment_used_twice/fragment/HumanDetailsImpl.java.expected b/libraries/apollo-compiler/src/test/graphql/com/example/fragment_used_twice/java/operationBased/fragment_used_twice/fragment/HumanDetailsImpl.java.expected index a627045ad87..d0120b436db 100644 --- a/libraries/apollo-compiler/src/test/graphql/com/example/fragment_used_twice/java/operationBased/fragment_used_twice/fragment/HumanDetailsImpl.java.expected +++ b/libraries/apollo-compiler/src/test/graphql/com/example/fragment_used_twice/java/operationBased/fragment_used_twice/fragment/HumanDetailsImpl.java.expected @@ -61,7 +61,7 @@ public class HumanDetailsImpl implements Fragment { @Override public void serializeVariables(JsonWriter writer, CustomScalarAdapters customScalarAdapters, - boolean withBooleanDefaultValues) throws IOException { + boolean withDefaultValues) throws IOException { // This fragment doesn't have any variable } diff --git a/libraries/apollo-compiler/src/test/graphql/com/example/fragment_used_twice/java/operationBased/fragment_used_twice/selections/TestQuerySelections.java.expected b/libraries/apollo-compiler/src/test/graphql/com/example/fragment_used_twice/java/operationBased/fragment_used_twice/selections/TestQuerySelections.java.expected index 90556cc31ab..e4f4e65a846 100644 --- a/libraries/apollo-compiler/src/test/graphql/com/example/fragment_used_twice/java/operationBased/fragment_used_twice/selections/TestQuerySelections.java.expected +++ b/libraries/apollo-compiler/src/test/graphql/com/example/fragment_used_twice/java/operationBased/fragment_used_twice/selections/TestQuerySelections.java.expected @@ -5,6 +5,7 @@ // package com.example.fragment_used_twice.selections; +import com.apollographql.apollo3.api.CompiledArgument; import com.apollographql.apollo3.api.CompiledField; import com.apollographql.apollo3.api.CompiledFragment; import com.apollographql.apollo3.api.CompiledNotNullType; @@ -24,6 +25,6 @@ public class TestQuerySelections { ); public static List __root = Arrays.asList( - new CompiledField.Builder("hero", Character.type).selections(__hero).build() + new CompiledField.Builder("hero", Character.type).arguments(Arrays.asList(new CompiledArgument.Builder("episode").build(), new CompiledArgument.Builder("listOfListOfStringArgs").build())).selections(__hero).build() ); } diff --git a/libraries/apollo-compiler/src/test/graphql/com/example/fragment_used_twice/kotlin/operationBased/fragment_used_twice/TestQuery.kt.expected b/libraries/apollo-compiler/src/test/graphql/com/example/fragment_used_twice/kotlin/operationBased/fragment_used_twice/TestQuery.kt.expected index ac166ccefce..1e07813def0 100644 --- a/libraries/apollo-compiler/src/test/graphql/com/example/fragment_used_twice/kotlin/operationBased/fragment_used_twice/TestQuery.kt.expected +++ b/libraries/apollo-compiler/src/test/graphql/com/example/fragment_used_twice/kotlin/operationBased/fragment_used_twice/TestQuery.kt.expected @@ -36,7 +36,7 @@ public class TestQuery() : Query { override fun serializeVariables( writer: JsonWriter, customScalarAdapters: CustomScalarAdapters, - withBooleanDefaultValues: Boolean, + withDefaultValues: Boolean, ) { // This operation doesn't have any variable } diff --git a/libraries/apollo-compiler/src/test/graphql/com/example/fragment_used_twice/kotlin/operationBased/fragment_used_twice/fragment/CharacterDetailsImpl.kt.expected b/libraries/apollo-compiler/src/test/graphql/com/example/fragment_used_twice/kotlin/operationBased/fragment_used_twice/fragment/CharacterDetailsImpl.kt.expected index 90df3114655..8f5cf8e0080 100644 --- a/libraries/apollo-compiler/src/test/graphql/com/example/fragment_used_twice/kotlin/operationBased/fragment_used_twice/fragment/CharacterDetailsImpl.kt.expected +++ b/libraries/apollo-compiler/src/test/graphql/com/example/fragment_used_twice/kotlin/operationBased/fragment_used_twice/fragment/CharacterDetailsImpl.kt.expected @@ -25,7 +25,7 @@ public class CharacterDetailsImpl() : Fragment { override fun serializeVariables( writer: JsonWriter, customScalarAdapters: CustomScalarAdapters, - withBooleanDefaultValues: Boolean, + withDefaultValues: Boolean, ) { // This fragment doesn't have any variable } diff --git a/libraries/apollo-compiler/src/test/graphql/com/example/fragment_used_twice/kotlin/operationBased/fragment_used_twice/fragment/HeroDetailsImpl.kt.expected b/libraries/apollo-compiler/src/test/graphql/com/example/fragment_used_twice/kotlin/operationBased/fragment_used_twice/fragment/HeroDetailsImpl.kt.expected index 9a2394d25ba..b32a7005429 100644 --- a/libraries/apollo-compiler/src/test/graphql/com/example/fragment_used_twice/kotlin/operationBased/fragment_used_twice/fragment/HeroDetailsImpl.kt.expected +++ b/libraries/apollo-compiler/src/test/graphql/com/example/fragment_used_twice/kotlin/operationBased/fragment_used_twice/fragment/HeroDetailsImpl.kt.expected @@ -25,7 +25,7 @@ public class HeroDetailsImpl() : Fragment { override fun serializeVariables( writer: JsonWriter, customScalarAdapters: CustomScalarAdapters, - withBooleanDefaultValues: Boolean, + withDefaultValues: Boolean, ) { // This fragment doesn't have any variable } diff --git a/libraries/apollo-compiler/src/test/graphql/com/example/fragment_used_twice/kotlin/operationBased/fragment_used_twice/fragment/HumanDetailsImpl.kt.expected b/libraries/apollo-compiler/src/test/graphql/com/example/fragment_used_twice/kotlin/operationBased/fragment_used_twice/fragment/HumanDetailsImpl.kt.expected index d7e46e8ee60..c44983374f9 100644 --- a/libraries/apollo-compiler/src/test/graphql/com/example/fragment_used_twice/kotlin/operationBased/fragment_used_twice/fragment/HumanDetailsImpl.kt.expected +++ b/libraries/apollo-compiler/src/test/graphql/com/example/fragment_used_twice/kotlin/operationBased/fragment_used_twice/fragment/HumanDetailsImpl.kt.expected @@ -25,7 +25,7 @@ public class HumanDetailsImpl() : Fragment { override fun serializeVariables( writer: JsonWriter, customScalarAdapters: CustomScalarAdapters, - withBooleanDefaultValues: Boolean, + withDefaultValues: Boolean, ) { // This fragment doesn't have any variable } diff --git a/libraries/apollo-compiler/src/test/graphql/com/example/fragment_used_twice/kotlin/operationBased/fragment_used_twice/selections/TestQuerySelections.kt.expected b/libraries/apollo-compiler/src/test/graphql/com/example/fragment_used_twice/kotlin/operationBased/fragment_used_twice/selections/TestQuerySelections.kt.expected index 23a4f66c79d..0f0c5d45704 100644 --- a/libraries/apollo-compiler/src/test/graphql/com/example/fragment_used_twice/kotlin/operationBased/fragment_used_twice/selections/TestQuerySelections.kt.expected +++ b/libraries/apollo-compiler/src/test/graphql/com/example/fragment_used_twice/kotlin/operationBased/fragment_used_twice/selections/TestQuerySelections.kt.expected @@ -5,6 +5,7 @@ // package com.example.fragment_used_twice.selections +import com.apollographql.apollo3.api.CompiledArgument import com.apollographql.apollo3.api.CompiledField import com.apollographql.apollo3.api.CompiledFragment import com.apollographql.apollo3.api.CompiledSelection @@ -37,7 +38,11 @@ public object TestQuerySelections { CompiledField.Builder( name = "hero", type = Character.type - ).selections(__hero) + ).arguments(listOf( + CompiledArgument.Builder("episode").build(), + CompiledArgument.Builder("listOfListOfStringArgs").build() + )) + .selections(__hero) .build() ) } diff --git a/libraries/apollo-compiler/src/test/graphql/com/example/fragment_used_twice/kotlin/responseBased/fragment_used_twice/TestQuery.kt.expected b/libraries/apollo-compiler/src/test/graphql/com/example/fragment_used_twice/kotlin/responseBased/fragment_used_twice/TestQuery.kt.expected index 74af153716a..e4f74228c3c 100644 --- a/libraries/apollo-compiler/src/test/graphql/com/example/fragment_used_twice/kotlin/responseBased/fragment_used_twice/TestQuery.kt.expected +++ b/libraries/apollo-compiler/src/test/graphql/com/example/fragment_used_twice/kotlin/responseBased/fragment_used_twice/TestQuery.kt.expected @@ -38,7 +38,7 @@ public class TestQuery() : Query { override fun serializeVariables( writer: JsonWriter, customScalarAdapters: CustomScalarAdapters, - withBooleanDefaultValues: Boolean, + withDefaultValues: Boolean, ) { // This operation doesn't have any variable } diff --git a/libraries/apollo-compiler/src/test/graphql/com/example/fragment_used_twice/kotlin/responseBased/fragment_used_twice/fragment/CharacterDetailsImpl.kt.expected b/libraries/apollo-compiler/src/test/graphql/com/example/fragment_used_twice/kotlin/responseBased/fragment_used_twice/fragment/CharacterDetailsImpl.kt.expected index f80cf8e09fc..3a357f82a36 100644 --- a/libraries/apollo-compiler/src/test/graphql/com/example/fragment_used_twice/kotlin/responseBased/fragment_used_twice/fragment/CharacterDetailsImpl.kt.expected +++ b/libraries/apollo-compiler/src/test/graphql/com/example/fragment_used_twice/kotlin/responseBased/fragment_used_twice/fragment/CharacterDetailsImpl.kt.expected @@ -26,7 +26,7 @@ public class CharacterDetailsImpl() : Fragment { override fun serializeVariables( writer: JsonWriter, customScalarAdapters: CustomScalarAdapters, - withBooleanDefaultValues: Boolean, + withDefaultValues: Boolean, ) { // This fragment doesn't have any variable } diff --git a/libraries/apollo-compiler/src/test/graphql/com/example/fragment_used_twice/kotlin/responseBased/fragment_used_twice/fragment/HeroDetailsImpl.kt.expected b/libraries/apollo-compiler/src/test/graphql/com/example/fragment_used_twice/kotlin/responseBased/fragment_used_twice/fragment/HeroDetailsImpl.kt.expected index eba01df781b..062cd16ae5b 100644 --- a/libraries/apollo-compiler/src/test/graphql/com/example/fragment_used_twice/kotlin/responseBased/fragment_used_twice/fragment/HeroDetailsImpl.kt.expected +++ b/libraries/apollo-compiler/src/test/graphql/com/example/fragment_used_twice/kotlin/responseBased/fragment_used_twice/fragment/HeroDetailsImpl.kt.expected @@ -27,7 +27,7 @@ public class HeroDetailsImpl() : Fragment { override fun serializeVariables( writer: JsonWriter, customScalarAdapters: CustomScalarAdapters, - withBooleanDefaultValues: Boolean, + withDefaultValues: Boolean, ) { // This fragment doesn't have any variable } diff --git a/libraries/apollo-compiler/src/test/graphql/com/example/fragment_used_twice/kotlin/responseBased/fragment_used_twice/fragment/HumanDetailsImpl.kt.expected b/libraries/apollo-compiler/src/test/graphql/com/example/fragment_used_twice/kotlin/responseBased/fragment_used_twice/fragment/HumanDetailsImpl.kt.expected index da46109f494..caa10e16879 100644 --- a/libraries/apollo-compiler/src/test/graphql/com/example/fragment_used_twice/kotlin/responseBased/fragment_used_twice/fragment/HumanDetailsImpl.kt.expected +++ b/libraries/apollo-compiler/src/test/graphql/com/example/fragment_used_twice/kotlin/responseBased/fragment_used_twice/fragment/HumanDetailsImpl.kt.expected @@ -27,7 +27,7 @@ public class HumanDetailsImpl() : Fragment { override fun serializeVariables( writer: JsonWriter, customScalarAdapters: CustomScalarAdapters, - withBooleanDefaultValues: Boolean, + withDefaultValues: Boolean, ) { // This fragment doesn't have any variable } diff --git a/libraries/apollo-compiler/src/test/graphql/com/example/fragment_used_twice/kotlin/responseBased/fragment_used_twice/selections/TestQuerySelections.kt.expected b/libraries/apollo-compiler/src/test/graphql/com/example/fragment_used_twice/kotlin/responseBased/fragment_used_twice/selections/TestQuerySelections.kt.expected index 23a4f66c79d..0f0c5d45704 100644 --- a/libraries/apollo-compiler/src/test/graphql/com/example/fragment_used_twice/kotlin/responseBased/fragment_used_twice/selections/TestQuerySelections.kt.expected +++ b/libraries/apollo-compiler/src/test/graphql/com/example/fragment_used_twice/kotlin/responseBased/fragment_used_twice/selections/TestQuerySelections.kt.expected @@ -5,6 +5,7 @@ // package com.example.fragment_used_twice.selections +import com.apollographql.apollo3.api.CompiledArgument import com.apollographql.apollo3.api.CompiledField import com.apollographql.apollo3.api.CompiledFragment import com.apollographql.apollo3.api.CompiledSelection @@ -37,7 +38,11 @@ public object TestQuerySelections { CompiledField.Builder( name = "hero", type = Character.type - ).selections(__hero) + ).arguments(listOf( + CompiledArgument.Builder("episode").build(), + CompiledArgument.Builder("listOfListOfStringArgs").build() + )) + .selections(__hero) .build() ) } diff --git a/libraries/apollo-compiler/src/test/graphql/com/example/fragment_with_inline_fragment/java/operationBased/fragment_with_inline_fragment/TestQuery.java.expected b/libraries/apollo-compiler/src/test/graphql/com/example/fragment_with_inline_fragment/java/operationBased/fragment_with_inline_fragment/TestQuery.java.expected index 645d5f77aaf..8c9f86aa916 100644 --- a/libraries/apollo-compiler/src/test/graphql/com/example/fragment_with_inline_fragment/java/operationBased/fragment_with_inline_fragment/TestQuery.java.expected +++ b/libraries/apollo-compiler/src/test/graphql/com/example/fragment_with_inline_fragment/java/operationBased/fragment_with_inline_fragment/TestQuery.java.expected @@ -129,7 +129,7 @@ public class TestQuery implements Query { @Override public void serializeVariables(JsonWriter writer, CustomScalarAdapters customScalarAdapters, - boolean withBooleanDefaultValues) throws IOException { + boolean withDefaultValues) throws IOException { // This operation doesn't have any variable } diff --git a/libraries/apollo-compiler/src/test/graphql/com/example/fragment_with_inline_fragment/java/operationBased/fragment_with_inline_fragment/fragment/DroidDetailsImpl.java.expected b/libraries/apollo-compiler/src/test/graphql/com/example/fragment_with_inline_fragment/java/operationBased/fragment_with_inline_fragment/fragment/DroidDetailsImpl.java.expected index 7961b8bd5c0..5f223729755 100644 --- a/libraries/apollo-compiler/src/test/graphql/com/example/fragment_with_inline_fragment/java/operationBased/fragment_with_inline_fragment/fragment/DroidDetailsImpl.java.expected +++ b/libraries/apollo-compiler/src/test/graphql/com/example/fragment_with_inline_fragment/java/operationBased/fragment_with_inline_fragment/fragment/DroidDetailsImpl.java.expected @@ -61,7 +61,7 @@ public class DroidDetailsImpl implements Fragment { @Override public void serializeVariables(JsonWriter writer, CustomScalarAdapters customScalarAdapters, - boolean withBooleanDefaultValues) throws IOException { + boolean withDefaultValues) throws IOException { // This fragment doesn't have any variable } diff --git a/libraries/apollo-compiler/src/test/graphql/com/example/fragment_with_inline_fragment/java/operationBased/fragment_with_inline_fragment/fragment/HeroDetailsImpl.java.expected b/libraries/apollo-compiler/src/test/graphql/com/example/fragment_with_inline_fragment/java/operationBased/fragment_with_inline_fragment/fragment/HeroDetailsImpl.java.expected index bdf7a603dc3..cafaa86ba5c 100644 --- a/libraries/apollo-compiler/src/test/graphql/com/example/fragment_with_inline_fragment/java/operationBased/fragment_with_inline_fragment/fragment/HeroDetailsImpl.java.expected +++ b/libraries/apollo-compiler/src/test/graphql/com/example/fragment_with_inline_fragment/java/operationBased/fragment_with_inline_fragment/fragment/HeroDetailsImpl.java.expected @@ -61,7 +61,7 @@ public class HeroDetailsImpl implements Fragment { @Override public void serializeVariables(JsonWriter writer, CustomScalarAdapters customScalarAdapters, - boolean withBooleanDefaultValues) throws IOException { + boolean withDefaultValues) throws IOException { // This fragment doesn't have any variable } diff --git a/libraries/apollo-compiler/src/test/graphql/com/example/fragment_with_inline_fragment/java/operationBased/fragment_with_inline_fragment/fragment/HumanDetailsImpl.java.expected b/libraries/apollo-compiler/src/test/graphql/com/example/fragment_with_inline_fragment/java/operationBased/fragment_with_inline_fragment/fragment/HumanDetailsImpl.java.expected index b03a41f8778..83878a35450 100644 --- a/libraries/apollo-compiler/src/test/graphql/com/example/fragment_with_inline_fragment/java/operationBased/fragment_with_inline_fragment/fragment/HumanDetailsImpl.java.expected +++ b/libraries/apollo-compiler/src/test/graphql/com/example/fragment_with_inline_fragment/java/operationBased/fragment_with_inline_fragment/fragment/HumanDetailsImpl.java.expected @@ -61,7 +61,7 @@ public class HumanDetailsImpl implements Fragment { @Override public void serializeVariables(JsonWriter writer, CustomScalarAdapters customScalarAdapters, - boolean withBooleanDefaultValues) throws IOException { + boolean withDefaultValues) throws IOException { // This fragment doesn't have any variable } diff --git a/libraries/apollo-compiler/src/test/graphql/com/example/fragment_with_inline_fragment/java/operationBased/fragment_with_inline_fragment/fragment/selections/HeroDetailsSelections.java.expected b/libraries/apollo-compiler/src/test/graphql/com/example/fragment_with_inline_fragment/java/operationBased/fragment_with_inline_fragment/fragment/selections/HeroDetailsSelections.java.expected index db150cbf829..b820eaf1383 100644 --- a/libraries/apollo-compiler/src/test/graphql/com/example/fragment_with_inline_fragment/java/operationBased/fragment_with_inline_fragment/fragment/selections/HeroDetailsSelections.java.expected +++ b/libraries/apollo-compiler/src/test/graphql/com/example/fragment_with_inline_fragment/java/operationBased/fragment_with_inline_fragment/fragment/selections/HeroDetailsSelections.java.expected @@ -5,6 +5,7 @@ // package com.example.fragment_with_inline_fragment.fragment.selections; +import com.apollographql.apollo3.api.CompiledArgument; import com.apollographql.apollo3.api.CompiledField; import com.apollographql.apollo3.api.CompiledFragment; import com.apollographql.apollo3.api.CompiledListType; @@ -42,6 +43,6 @@ public class HeroDetailsSelections { new CompiledFragment.Builder("Human", Arrays.asList("Human")).selections(HumanDetailsSelections.__root).build(), new CompiledFragment.Builder("Droid", Arrays.asList("Droid")).selections(__onDroid).build(), new CompiledField.Builder("name", new CompiledNotNullType(GraphQLString.type)).build(), - new CompiledField.Builder("friendsConnection", new CompiledNotNullType(FriendsConnection.type)).selections(__friendsConnection).build() + new CompiledField.Builder("friendsConnection", new CompiledNotNullType(FriendsConnection.type)).arguments(Arrays.asList(new CompiledArgument.Builder("after").build(), new CompiledArgument.Builder("first").build())).selections(__friendsConnection).build() ); } diff --git a/libraries/apollo-compiler/src/test/graphql/com/example/fragment_with_inline_fragment/java/operationBased/fragment_with_inline_fragment/selections/TestQuerySelections.java.expected b/libraries/apollo-compiler/src/test/graphql/com/example/fragment_with_inline_fragment/java/operationBased/fragment_with_inline_fragment/selections/TestQuerySelections.java.expected index df8c7e5dc36..958cab2ecf9 100644 --- a/libraries/apollo-compiler/src/test/graphql/com/example/fragment_with_inline_fragment/java/operationBased/fragment_with_inline_fragment/selections/TestQuerySelections.java.expected +++ b/libraries/apollo-compiler/src/test/graphql/com/example/fragment_with_inline_fragment/java/operationBased/fragment_with_inline_fragment/selections/TestQuerySelections.java.expected @@ -5,6 +5,7 @@ // package com.example.fragment_with_inline_fragment.selections; +import com.apollographql.apollo3.api.CompiledArgument; import com.apollographql.apollo3.api.CompiledField; import com.apollographql.apollo3.api.CompiledFragment; import com.apollographql.apollo3.api.CompiledListType; @@ -26,6 +27,6 @@ public class TestQuerySelections { ); public static List __root = Arrays.asList( - new CompiledField.Builder("hero", Character.type).selections(__hero).build() + new CompiledField.Builder("hero", Character.type).arguments(Arrays.asList(new CompiledArgument.Builder("episode").build(), new CompiledArgument.Builder("listOfListOfStringArgs").build())).selections(__hero).build() ); } diff --git a/libraries/apollo-compiler/src/test/graphql/com/example/fragment_with_inline_fragment/kotlin/operationBased/fragment_with_inline_fragment/TestQuery.kt.expected b/libraries/apollo-compiler/src/test/graphql/com/example/fragment_with_inline_fragment/kotlin/operationBased/fragment_with_inline_fragment/TestQuery.kt.expected index bb3442319a6..66c6d850768 100644 --- a/libraries/apollo-compiler/src/test/graphql/com/example/fragment_with_inline_fragment/kotlin/operationBased/fragment_with_inline_fragment/TestQuery.kt.expected +++ b/libraries/apollo-compiler/src/test/graphql/com/example/fragment_with_inline_fragment/kotlin/operationBased/fragment_with_inline_fragment/TestQuery.kt.expected @@ -37,7 +37,7 @@ public class TestQuery() : Query { override fun serializeVariables( writer: JsonWriter, customScalarAdapters: CustomScalarAdapters, - withBooleanDefaultValues: Boolean, + withDefaultValues: Boolean, ) { // This operation doesn't have any variable } diff --git a/libraries/apollo-compiler/src/test/graphql/com/example/fragment_with_inline_fragment/kotlin/operationBased/fragment_with_inline_fragment/fragment/DroidDetailsImpl.kt.expected b/libraries/apollo-compiler/src/test/graphql/com/example/fragment_with_inline_fragment/kotlin/operationBased/fragment_with_inline_fragment/fragment/DroidDetailsImpl.kt.expected index 2d289852397..19085b53be8 100644 --- a/libraries/apollo-compiler/src/test/graphql/com/example/fragment_with_inline_fragment/kotlin/operationBased/fragment_with_inline_fragment/fragment/DroidDetailsImpl.kt.expected +++ b/libraries/apollo-compiler/src/test/graphql/com/example/fragment_with_inline_fragment/kotlin/operationBased/fragment_with_inline_fragment/fragment/DroidDetailsImpl.kt.expected @@ -25,7 +25,7 @@ public class DroidDetailsImpl() : Fragment { override fun serializeVariables( writer: JsonWriter, customScalarAdapters: CustomScalarAdapters, - withBooleanDefaultValues: Boolean, + withDefaultValues: Boolean, ) { // This fragment doesn't have any variable } diff --git a/libraries/apollo-compiler/src/test/graphql/com/example/fragment_with_inline_fragment/kotlin/operationBased/fragment_with_inline_fragment/fragment/HeroDetailsImpl.kt.expected b/libraries/apollo-compiler/src/test/graphql/com/example/fragment_with_inline_fragment/kotlin/operationBased/fragment_with_inline_fragment/fragment/HeroDetailsImpl.kt.expected index 8d19e8222c8..28e74fa4c45 100644 --- a/libraries/apollo-compiler/src/test/graphql/com/example/fragment_with_inline_fragment/kotlin/operationBased/fragment_with_inline_fragment/fragment/HeroDetailsImpl.kt.expected +++ b/libraries/apollo-compiler/src/test/graphql/com/example/fragment_with_inline_fragment/kotlin/operationBased/fragment_with_inline_fragment/fragment/HeroDetailsImpl.kt.expected @@ -25,7 +25,7 @@ public class HeroDetailsImpl() : Fragment { override fun serializeVariables( writer: JsonWriter, customScalarAdapters: CustomScalarAdapters, - withBooleanDefaultValues: Boolean, + withDefaultValues: Boolean, ) { // This fragment doesn't have any variable } diff --git a/libraries/apollo-compiler/src/test/graphql/com/example/fragment_with_inline_fragment/kotlin/operationBased/fragment_with_inline_fragment/fragment/HumanDetailsImpl.kt.expected b/libraries/apollo-compiler/src/test/graphql/com/example/fragment_with_inline_fragment/kotlin/operationBased/fragment_with_inline_fragment/fragment/HumanDetailsImpl.kt.expected index c7631672587..0a913526f6f 100644 --- a/libraries/apollo-compiler/src/test/graphql/com/example/fragment_with_inline_fragment/kotlin/operationBased/fragment_with_inline_fragment/fragment/HumanDetailsImpl.kt.expected +++ b/libraries/apollo-compiler/src/test/graphql/com/example/fragment_with_inline_fragment/kotlin/operationBased/fragment_with_inline_fragment/fragment/HumanDetailsImpl.kt.expected @@ -25,7 +25,7 @@ public class HumanDetailsImpl() : Fragment { override fun serializeVariables( writer: JsonWriter, customScalarAdapters: CustomScalarAdapters, - withBooleanDefaultValues: Boolean, + withDefaultValues: Boolean, ) { // This fragment doesn't have any variable } diff --git a/libraries/apollo-compiler/src/test/graphql/com/example/fragment_with_inline_fragment/kotlin/operationBased/fragment_with_inline_fragment/fragment/selections/HeroDetailsSelections.kt.expected b/libraries/apollo-compiler/src/test/graphql/com/example/fragment_with_inline_fragment/kotlin/operationBased/fragment_with_inline_fragment/fragment/selections/HeroDetailsSelections.kt.expected index bac9c08c988..38b4b77010d 100644 --- a/libraries/apollo-compiler/src/test/graphql/com/example/fragment_with_inline_fragment/kotlin/operationBased/fragment_with_inline_fragment/fragment/selections/HeroDetailsSelections.kt.expected +++ b/libraries/apollo-compiler/src/test/graphql/com/example/fragment_with_inline_fragment/kotlin/operationBased/fragment_with_inline_fragment/fragment/selections/HeroDetailsSelections.kt.expected @@ -5,6 +5,7 @@ // package com.example.fragment_with_inline_fragment.fragment.selections +import com.apollographql.apollo3.api.CompiledArgument import com.apollographql.apollo3.api.CompiledField import com.apollographql.apollo3.api.CompiledFragment import com.apollographql.apollo3.api.CompiledSelection @@ -79,7 +80,11 @@ public object HeroDetailsSelections { CompiledField.Builder( name = "friendsConnection", type = FriendsConnection.type.notNull() - ).selections(__friendsConnection) + ).arguments(listOf( + CompiledArgument.Builder("after").build(), + CompiledArgument.Builder("first").build() + )) + .selections(__friendsConnection) .build() ) } diff --git a/libraries/apollo-compiler/src/test/graphql/com/example/fragment_with_inline_fragment/kotlin/operationBased/fragment_with_inline_fragment/selections/TestQuerySelections.kt.expected b/libraries/apollo-compiler/src/test/graphql/com/example/fragment_with_inline_fragment/kotlin/operationBased/fragment_with_inline_fragment/selections/TestQuerySelections.kt.expected index 34921dfa7fb..614818edbd8 100644 --- a/libraries/apollo-compiler/src/test/graphql/com/example/fragment_with_inline_fragment/kotlin/operationBased/fragment_with_inline_fragment/selections/TestQuerySelections.kt.expected +++ b/libraries/apollo-compiler/src/test/graphql/com/example/fragment_with_inline_fragment/kotlin/operationBased/fragment_with_inline_fragment/selections/TestQuerySelections.kt.expected @@ -5,6 +5,7 @@ // package com.example.fragment_with_inline_fragment.selections +import com.apollographql.apollo3.api.CompiledArgument import com.apollographql.apollo3.api.CompiledField import com.apollographql.apollo3.api.CompiledFragment import com.apollographql.apollo3.api.CompiledSelection @@ -41,7 +42,11 @@ public object TestQuerySelections { CompiledField.Builder( name = "hero", type = Character.type - ).selections(__hero) + ).arguments(listOf( + CompiledArgument.Builder("episode").build(), + CompiledArgument.Builder("listOfListOfStringArgs").build() + )) + .selections(__hero) .build() ) } diff --git a/libraries/apollo-compiler/src/test/graphql/com/example/fragment_with_inline_fragment/kotlin/responseBased/fragment_with_inline_fragment/TestQuery.kt.expected b/libraries/apollo-compiler/src/test/graphql/com/example/fragment_with_inline_fragment/kotlin/responseBased/fragment_with_inline_fragment/TestQuery.kt.expected index b55578171e1..94aabeb7370 100644 --- a/libraries/apollo-compiler/src/test/graphql/com/example/fragment_with_inline_fragment/kotlin/responseBased/fragment_with_inline_fragment/TestQuery.kt.expected +++ b/libraries/apollo-compiler/src/test/graphql/com/example/fragment_with_inline_fragment/kotlin/responseBased/fragment_with_inline_fragment/TestQuery.kt.expected @@ -40,7 +40,7 @@ public class TestQuery() : Query { override fun serializeVariables( writer: JsonWriter, customScalarAdapters: CustomScalarAdapters, - withBooleanDefaultValues: Boolean, + withDefaultValues: Boolean, ) { // This operation doesn't have any variable } diff --git a/libraries/apollo-compiler/src/test/graphql/com/example/fragment_with_inline_fragment/kotlin/responseBased/fragment_with_inline_fragment/fragment/DroidDetailsImpl.kt.expected b/libraries/apollo-compiler/src/test/graphql/com/example/fragment_with_inline_fragment/kotlin/responseBased/fragment_with_inline_fragment/fragment/DroidDetailsImpl.kt.expected index 1b66c9c2b8a..8b19113cd55 100644 --- a/libraries/apollo-compiler/src/test/graphql/com/example/fragment_with_inline_fragment/kotlin/responseBased/fragment_with_inline_fragment/fragment/DroidDetailsImpl.kt.expected +++ b/libraries/apollo-compiler/src/test/graphql/com/example/fragment_with_inline_fragment/kotlin/responseBased/fragment_with_inline_fragment/fragment/DroidDetailsImpl.kt.expected @@ -26,7 +26,7 @@ public class DroidDetailsImpl() : Fragment { override fun serializeVariables( writer: JsonWriter, customScalarAdapters: CustomScalarAdapters, - withBooleanDefaultValues: Boolean, + withDefaultValues: Boolean, ) { // This fragment doesn't have any variable } diff --git a/libraries/apollo-compiler/src/test/graphql/com/example/fragment_with_inline_fragment/kotlin/responseBased/fragment_with_inline_fragment/fragment/HeroDetailsImpl.kt.expected b/libraries/apollo-compiler/src/test/graphql/com/example/fragment_with_inline_fragment/kotlin/responseBased/fragment_with_inline_fragment/fragment/HeroDetailsImpl.kt.expected index 497f47f4e12..84e92925945 100644 --- a/libraries/apollo-compiler/src/test/graphql/com/example/fragment_with_inline_fragment/kotlin/responseBased/fragment_with_inline_fragment/fragment/HeroDetailsImpl.kt.expected +++ b/libraries/apollo-compiler/src/test/graphql/com/example/fragment_with_inline_fragment/kotlin/responseBased/fragment_with_inline_fragment/fragment/HeroDetailsImpl.kt.expected @@ -28,7 +28,7 @@ public class HeroDetailsImpl() : Fragment { override fun serializeVariables( writer: JsonWriter, customScalarAdapters: CustomScalarAdapters, - withBooleanDefaultValues: Boolean, + withDefaultValues: Boolean, ) { // This fragment doesn't have any variable } diff --git a/libraries/apollo-compiler/src/test/graphql/com/example/fragment_with_inline_fragment/kotlin/responseBased/fragment_with_inline_fragment/fragment/HumanDetailsImpl.kt.expected b/libraries/apollo-compiler/src/test/graphql/com/example/fragment_with_inline_fragment/kotlin/responseBased/fragment_with_inline_fragment/fragment/HumanDetailsImpl.kt.expected index cefe40feefb..6eeccb98751 100644 --- a/libraries/apollo-compiler/src/test/graphql/com/example/fragment_with_inline_fragment/kotlin/responseBased/fragment_with_inline_fragment/fragment/HumanDetailsImpl.kt.expected +++ b/libraries/apollo-compiler/src/test/graphql/com/example/fragment_with_inline_fragment/kotlin/responseBased/fragment_with_inline_fragment/fragment/HumanDetailsImpl.kt.expected @@ -26,7 +26,7 @@ public class HumanDetailsImpl() : Fragment { override fun serializeVariables( writer: JsonWriter, customScalarAdapters: CustomScalarAdapters, - withBooleanDefaultValues: Boolean, + withDefaultValues: Boolean, ) { // This fragment doesn't have any variable } diff --git a/libraries/apollo-compiler/src/test/graphql/com/example/fragment_with_inline_fragment/kotlin/responseBased/fragment_with_inline_fragment/fragment/selections/HeroDetailsSelections.kt.expected b/libraries/apollo-compiler/src/test/graphql/com/example/fragment_with_inline_fragment/kotlin/responseBased/fragment_with_inline_fragment/fragment/selections/HeroDetailsSelections.kt.expected index bac9c08c988..38b4b77010d 100644 --- a/libraries/apollo-compiler/src/test/graphql/com/example/fragment_with_inline_fragment/kotlin/responseBased/fragment_with_inline_fragment/fragment/selections/HeroDetailsSelections.kt.expected +++ b/libraries/apollo-compiler/src/test/graphql/com/example/fragment_with_inline_fragment/kotlin/responseBased/fragment_with_inline_fragment/fragment/selections/HeroDetailsSelections.kt.expected @@ -5,6 +5,7 @@ // package com.example.fragment_with_inline_fragment.fragment.selections +import com.apollographql.apollo3.api.CompiledArgument import com.apollographql.apollo3.api.CompiledField import com.apollographql.apollo3.api.CompiledFragment import com.apollographql.apollo3.api.CompiledSelection @@ -79,7 +80,11 @@ public object HeroDetailsSelections { CompiledField.Builder( name = "friendsConnection", type = FriendsConnection.type.notNull() - ).selections(__friendsConnection) + ).arguments(listOf( + CompiledArgument.Builder("after").build(), + CompiledArgument.Builder("first").build() + )) + .selections(__friendsConnection) .build() ) } diff --git a/libraries/apollo-compiler/src/test/graphql/com/example/fragment_with_inline_fragment/kotlin/responseBased/fragment_with_inline_fragment/selections/TestQuerySelections.kt.expected b/libraries/apollo-compiler/src/test/graphql/com/example/fragment_with_inline_fragment/kotlin/responseBased/fragment_with_inline_fragment/selections/TestQuerySelections.kt.expected index 34921dfa7fb..614818edbd8 100644 --- a/libraries/apollo-compiler/src/test/graphql/com/example/fragment_with_inline_fragment/kotlin/responseBased/fragment_with_inline_fragment/selections/TestQuerySelections.kt.expected +++ b/libraries/apollo-compiler/src/test/graphql/com/example/fragment_with_inline_fragment/kotlin/responseBased/fragment_with_inline_fragment/selections/TestQuerySelections.kt.expected @@ -5,6 +5,7 @@ // package com.example.fragment_with_inline_fragment.selections +import com.apollographql.apollo3.api.CompiledArgument import com.apollographql.apollo3.api.CompiledField import com.apollographql.apollo3.api.CompiledFragment import com.apollographql.apollo3.api.CompiledSelection @@ -41,7 +42,11 @@ public object TestQuerySelections { CompiledField.Builder( name = "hero", type = Character.type - ).selections(__hero) + ).arguments(listOf( + CompiledArgument.Builder("episode").build(), + CompiledArgument.Builder("listOfListOfStringArgs").build() + )) + .selections(__hero) .build() ) } diff --git a/libraries/apollo-compiler/src/test/graphql/com/example/fragment_with_multiple_fieldsets/java/operationBased/fragment_with_multiple_fieldsets/TestQuery.java.expected b/libraries/apollo-compiler/src/test/graphql/com/example/fragment_with_multiple_fieldsets/java/operationBased/fragment_with_multiple_fieldsets/TestQuery.java.expected index ba4eaf06763..f7ed0ce5944 100644 --- a/libraries/apollo-compiler/src/test/graphql/com/example/fragment_with_multiple_fieldsets/java/operationBased/fragment_with_multiple_fieldsets/TestQuery.java.expected +++ b/libraries/apollo-compiler/src/test/graphql/com/example/fragment_with_multiple_fieldsets/java/operationBased/fragment_with_multiple_fieldsets/TestQuery.java.expected @@ -105,7 +105,7 @@ public class TestQuery implements Query { @Override public void serializeVariables(JsonWriter writer, CustomScalarAdapters customScalarAdapters, - boolean withBooleanDefaultValues) throws IOException { + boolean withDefaultValues) throws IOException { // This operation doesn't have any variable } diff --git a/libraries/apollo-compiler/src/test/graphql/com/example/fragment_with_multiple_fieldsets/java/operationBased/fragment_with_multiple_fieldsets/fragment/IFragmentImpl.java.expected b/libraries/apollo-compiler/src/test/graphql/com/example/fragment_with_multiple_fieldsets/java/operationBased/fragment_with_multiple_fieldsets/fragment/IFragmentImpl.java.expected index b9919a73739..e5692477b94 100644 --- a/libraries/apollo-compiler/src/test/graphql/com/example/fragment_with_multiple_fieldsets/java/operationBased/fragment_with_multiple_fieldsets/fragment/IFragmentImpl.java.expected +++ b/libraries/apollo-compiler/src/test/graphql/com/example/fragment_with_multiple_fieldsets/java/operationBased/fragment_with_multiple_fieldsets/fragment/IFragmentImpl.java.expected @@ -61,7 +61,7 @@ public class IFragmentImpl implements Fragment { @Override public void serializeVariables(JsonWriter writer, CustomScalarAdapters customScalarAdapters, - boolean withBooleanDefaultValues) throws IOException { + boolean withDefaultValues) throws IOException { // This fragment doesn't have any variable } diff --git a/libraries/apollo-compiler/src/test/graphql/com/example/fragment_with_multiple_fieldsets/kotlin/operationBased/fragment_with_multiple_fieldsets/TestQuery.kt.expected b/libraries/apollo-compiler/src/test/graphql/com/example/fragment_with_multiple_fieldsets/kotlin/operationBased/fragment_with_multiple_fieldsets/TestQuery.kt.expected index f4ba067fc89..4fe8984f9f4 100644 --- a/libraries/apollo-compiler/src/test/graphql/com/example/fragment_with_multiple_fieldsets/kotlin/operationBased/fragment_with_multiple_fieldsets/TestQuery.kt.expected +++ b/libraries/apollo-compiler/src/test/graphql/com/example/fragment_with_multiple_fieldsets/kotlin/operationBased/fragment_with_multiple_fieldsets/TestQuery.kt.expected @@ -35,7 +35,7 @@ public class TestQuery() : Query { override fun serializeVariables( writer: JsonWriter, customScalarAdapters: CustomScalarAdapters, - withBooleanDefaultValues: Boolean, + withDefaultValues: Boolean, ) { // This operation doesn't have any variable } diff --git a/libraries/apollo-compiler/src/test/graphql/com/example/fragment_with_multiple_fieldsets/kotlin/operationBased/fragment_with_multiple_fieldsets/fragment/IFragmentImpl.kt.expected b/libraries/apollo-compiler/src/test/graphql/com/example/fragment_with_multiple_fieldsets/kotlin/operationBased/fragment_with_multiple_fieldsets/fragment/IFragmentImpl.kt.expected index 9de1d61c48a..8561017a639 100644 --- a/libraries/apollo-compiler/src/test/graphql/com/example/fragment_with_multiple_fieldsets/kotlin/operationBased/fragment_with_multiple_fieldsets/fragment/IFragmentImpl.kt.expected +++ b/libraries/apollo-compiler/src/test/graphql/com/example/fragment_with_multiple_fieldsets/kotlin/operationBased/fragment_with_multiple_fieldsets/fragment/IFragmentImpl.kt.expected @@ -25,7 +25,7 @@ public class IFragmentImpl() : Fragment { override fun serializeVariables( writer: JsonWriter, customScalarAdapters: CustomScalarAdapters, - withBooleanDefaultValues: Boolean, + withDefaultValues: Boolean, ) { // This fragment doesn't have any variable } diff --git a/libraries/apollo-compiler/src/test/graphql/com/example/fragment_with_multiple_fieldsets/kotlin/responseBased/fragment_with_multiple_fieldsets/TestQuery.kt.expected b/libraries/apollo-compiler/src/test/graphql/com/example/fragment_with_multiple_fieldsets/kotlin/responseBased/fragment_with_multiple_fieldsets/TestQuery.kt.expected index 9a66983d5ea..e089b3b776c 100644 --- a/libraries/apollo-compiler/src/test/graphql/com/example/fragment_with_multiple_fieldsets/kotlin/responseBased/fragment_with_multiple_fieldsets/TestQuery.kt.expected +++ b/libraries/apollo-compiler/src/test/graphql/com/example/fragment_with_multiple_fieldsets/kotlin/responseBased/fragment_with_multiple_fieldsets/TestQuery.kt.expected @@ -37,7 +37,7 @@ public class TestQuery() : Query { override fun serializeVariables( writer: JsonWriter, customScalarAdapters: CustomScalarAdapters, - withBooleanDefaultValues: Boolean, + withDefaultValues: Boolean, ) { // This operation doesn't have any variable } diff --git a/libraries/apollo-compiler/src/test/graphql/com/example/fragment_with_multiple_fieldsets/kotlin/responseBased/fragment_with_multiple_fieldsets/fragment/IFragmentImpl.kt.expected b/libraries/apollo-compiler/src/test/graphql/com/example/fragment_with_multiple_fieldsets/kotlin/responseBased/fragment_with_multiple_fieldsets/fragment/IFragmentImpl.kt.expected index 7a05af57886..ed12d938ff6 100644 --- a/libraries/apollo-compiler/src/test/graphql/com/example/fragment_with_multiple_fieldsets/kotlin/responseBased/fragment_with_multiple_fieldsets/fragment/IFragmentImpl.kt.expected +++ b/libraries/apollo-compiler/src/test/graphql/com/example/fragment_with_multiple_fieldsets/kotlin/responseBased/fragment_with_multiple_fieldsets/fragment/IFragmentImpl.kt.expected @@ -27,7 +27,7 @@ public class IFragmentImpl() : Fragment { override fun serializeVariables( writer: JsonWriter, customScalarAdapters: CustomScalarAdapters, - withBooleanDefaultValues: Boolean, + withDefaultValues: Boolean, ) { // This fragment doesn't have any variable } diff --git a/libraries/apollo-compiler/src/test/graphql/com/example/fragments_same_type_condition/java/operationBased/fragments_same_type_condition/TestQuery.java.expected b/libraries/apollo-compiler/src/test/graphql/com/example/fragments_same_type_condition/java/operationBased/fragments_same_type_condition/TestQuery.java.expected index a8ee9797b30..08c57f48b9d 100644 --- a/libraries/apollo-compiler/src/test/graphql/com/example/fragments_same_type_condition/java/operationBased/fragments_same_type_condition/TestQuery.java.expected +++ b/libraries/apollo-compiler/src/test/graphql/com/example/fragments_same_type_condition/java/operationBased/fragments_same_type_condition/TestQuery.java.expected @@ -108,7 +108,7 @@ public class TestQuery implements Query { @Override public void serializeVariables(JsonWriter writer, CustomScalarAdapters customScalarAdapters, - boolean withBooleanDefaultValues) throws IOException { + boolean withDefaultValues) throws IOException { // This operation doesn't have any variable } diff --git a/libraries/apollo-compiler/src/test/graphql/com/example/fragments_same_type_condition/java/operationBased/fragments_same_type_condition/fragment/DroidDetails1Impl.java.expected b/libraries/apollo-compiler/src/test/graphql/com/example/fragments_same_type_condition/java/operationBased/fragments_same_type_condition/fragment/DroidDetails1Impl.java.expected index 4f8765de5c0..e7d695c6b9a 100644 --- a/libraries/apollo-compiler/src/test/graphql/com/example/fragments_same_type_condition/java/operationBased/fragments_same_type_condition/fragment/DroidDetails1Impl.java.expected +++ b/libraries/apollo-compiler/src/test/graphql/com/example/fragments_same_type_condition/java/operationBased/fragments_same_type_condition/fragment/DroidDetails1Impl.java.expected @@ -61,7 +61,7 @@ public class DroidDetails1Impl implements Fragment { @Override public void serializeVariables(JsonWriter writer, CustomScalarAdapters customScalarAdapters, - boolean withBooleanDefaultValues) throws IOException { + boolean withDefaultValues) throws IOException { // This fragment doesn't have any variable } diff --git a/libraries/apollo-compiler/src/test/graphql/com/example/fragments_same_type_condition/java/operationBased/fragments_same_type_condition/fragment/DroidDetails2Impl.java.expected b/libraries/apollo-compiler/src/test/graphql/com/example/fragments_same_type_condition/java/operationBased/fragments_same_type_condition/fragment/DroidDetails2Impl.java.expected index 677892a8b19..39b41646593 100644 --- a/libraries/apollo-compiler/src/test/graphql/com/example/fragments_same_type_condition/java/operationBased/fragments_same_type_condition/fragment/DroidDetails2Impl.java.expected +++ b/libraries/apollo-compiler/src/test/graphql/com/example/fragments_same_type_condition/java/operationBased/fragments_same_type_condition/fragment/DroidDetails2Impl.java.expected @@ -61,7 +61,7 @@ public class DroidDetails2Impl implements Fragment { @Override public void serializeVariables(JsonWriter writer, CustomScalarAdapters customScalarAdapters, - boolean withBooleanDefaultValues) throws IOException { + boolean withDefaultValues) throws IOException { // This fragment doesn't have any variable } diff --git a/libraries/apollo-compiler/src/test/graphql/com/example/fragments_same_type_condition/java/operationBased/fragments_same_type_condition/selections/TestQuerySelections.java.expected b/libraries/apollo-compiler/src/test/graphql/com/example/fragments_same_type_condition/java/operationBased/fragments_same_type_condition/selections/TestQuerySelections.java.expected index 2a589ee552f..dec5110ee7c 100644 --- a/libraries/apollo-compiler/src/test/graphql/com/example/fragments_same_type_condition/java/operationBased/fragments_same_type_condition/selections/TestQuerySelections.java.expected +++ b/libraries/apollo-compiler/src/test/graphql/com/example/fragments_same_type_condition/java/operationBased/fragments_same_type_condition/selections/TestQuerySelections.java.expected @@ -5,6 +5,7 @@ // package com.example.fragments_same_type_condition.selections; +import com.apollographql.apollo3.api.CompiledArgument; import com.apollographql.apollo3.api.CompiledField; import com.apollographql.apollo3.api.CompiledFragment; import com.apollographql.apollo3.api.CompiledNotNullType; @@ -24,6 +25,6 @@ public class TestQuerySelections { ); public static List __root = Arrays.asList( - new CompiledField.Builder("hero", Character.type).selections(__hero).build() + new CompiledField.Builder("hero", Character.type).arguments(Arrays.asList(new CompiledArgument.Builder("episode").build(), new CompiledArgument.Builder("listOfListOfStringArgs").build())).selections(__hero).build() ); } diff --git a/libraries/apollo-compiler/src/test/graphql/com/example/fragments_same_type_condition/kotlin/operationBased/fragments_same_type_condition/TestQuery.kt.expected b/libraries/apollo-compiler/src/test/graphql/com/example/fragments_same_type_condition/kotlin/operationBased/fragments_same_type_condition/TestQuery.kt.expected index 99ffa73f0ca..df552d824ec 100644 --- a/libraries/apollo-compiler/src/test/graphql/com/example/fragments_same_type_condition/kotlin/operationBased/fragments_same_type_condition/TestQuery.kt.expected +++ b/libraries/apollo-compiler/src/test/graphql/com/example/fragments_same_type_condition/kotlin/operationBased/fragments_same_type_condition/TestQuery.kt.expected @@ -36,7 +36,7 @@ public class TestQuery() : Query { override fun serializeVariables( writer: JsonWriter, customScalarAdapters: CustomScalarAdapters, - withBooleanDefaultValues: Boolean, + withDefaultValues: Boolean, ) { // This operation doesn't have any variable } diff --git a/libraries/apollo-compiler/src/test/graphql/com/example/fragments_same_type_condition/kotlin/operationBased/fragments_same_type_condition/fragment/DroidDetails1Impl.kt.expected b/libraries/apollo-compiler/src/test/graphql/com/example/fragments_same_type_condition/kotlin/operationBased/fragments_same_type_condition/fragment/DroidDetails1Impl.kt.expected index 555098ae888..195edb148b7 100644 --- a/libraries/apollo-compiler/src/test/graphql/com/example/fragments_same_type_condition/kotlin/operationBased/fragments_same_type_condition/fragment/DroidDetails1Impl.kt.expected +++ b/libraries/apollo-compiler/src/test/graphql/com/example/fragments_same_type_condition/kotlin/operationBased/fragments_same_type_condition/fragment/DroidDetails1Impl.kt.expected @@ -25,7 +25,7 @@ public class DroidDetails1Impl() : Fragment { override fun serializeVariables( writer: JsonWriter, customScalarAdapters: CustomScalarAdapters, - withBooleanDefaultValues: Boolean, + withDefaultValues: Boolean, ) { // This fragment doesn't have any variable } diff --git a/libraries/apollo-compiler/src/test/graphql/com/example/fragments_same_type_condition/kotlin/operationBased/fragments_same_type_condition/fragment/DroidDetails2Impl.kt.expected b/libraries/apollo-compiler/src/test/graphql/com/example/fragments_same_type_condition/kotlin/operationBased/fragments_same_type_condition/fragment/DroidDetails2Impl.kt.expected index 5ee3f0cbaed..8157ac748ce 100644 --- a/libraries/apollo-compiler/src/test/graphql/com/example/fragments_same_type_condition/kotlin/operationBased/fragments_same_type_condition/fragment/DroidDetails2Impl.kt.expected +++ b/libraries/apollo-compiler/src/test/graphql/com/example/fragments_same_type_condition/kotlin/operationBased/fragments_same_type_condition/fragment/DroidDetails2Impl.kt.expected @@ -25,7 +25,7 @@ public class DroidDetails2Impl() : Fragment { override fun serializeVariables( writer: JsonWriter, customScalarAdapters: CustomScalarAdapters, - withBooleanDefaultValues: Boolean, + withDefaultValues: Boolean, ) { // This fragment doesn't have any variable } diff --git a/libraries/apollo-compiler/src/test/graphql/com/example/fragments_same_type_condition/kotlin/operationBased/fragments_same_type_condition/selections/TestQuerySelections.kt.expected b/libraries/apollo-compiler/src/test/graphql/com/example/fragments_same_type_condition/kotlin/operationBased/fragments_same_type_condition/selections/TestQuerySelections.kt.expected index aa2b629768f..45635c58f9c 100644 --- a/libraries/apollo-compiler/src/test/graphql/com/example/fragments_same_type_condition/kotlin/operationBased/fragments_same_type_condition/selections/TestQuerySelections.kt.expected +++ b/libraries/apollo-compiler/src/test/graphql/com/example/fragments_same_type_condition/kotlin/operationBased/fragments_same_type_condition/selections/TestQuerySelections.kt.expected @@ -5,6 +5,7 @@ // package com.example.fragments_same_type_condition.selections +import com.apollographql.apollo3.api.CompiledArgument import com.apollographql.apollo3.api.CompiledField import com.apollographql.apollo3.api.CompiledFragment import com.apollographql.apollo3.api.CompiledSelection @@ -37,7 +38,11 @@ public object TestQuerySelections { CompiledField.Builder( name = "hero", type = Character.type - ).selections(__hero) + ).arguments(listOf( + CompiledArgument.Builder("episode").build(), + CompiledArgument.Builder("listOfListOfStringArgs").build() + )) + .selections(__hero) .build() ) } diff --git a/libraries/apollo-compiler/src/test/graphql/com/example/fragments_same_type_condition/kotlin/responseBased/fragments_same_type_condition/TestQuery.kt.expected b/libraries/apollo-compiler/src/test/graphql/com/example/fragments_same_type_condition/kotlin/responseBased/fragments_same_type_condition/TestQuery.kt.expected index ecd5833a861..4847991bb4c 100644 --- a/libraries/apollo-compiler/src/test/graphql/com/example/fragments_same_type_condition/kotlin/responseBased/fragments_same_type_condition/TestQuery.kt.expected +++ b/libraries/apollo-compiler/src/test/graphql/com/example/fragments_same_type_condition/kotlin/responseBased/fragments_same_type_condition/TestQuery.kt.expected @@ -37,7 +37,7 @@ public class TestQuery() : Query { override fun serializeVariables( writer: JsonWriter, customScalarAdapters: CustomScalarAdapters, - withBooleanDefaultValues: Boolean, + withDefaultValues: Boolean, ) { // This operation doesn't have any variable } diff --git a/libraries/apollo-compiler/src/test/graphql/com/example/fragments_same_type_condition/kotlin/responseBased/fragments_same_type_condition/fragment/DroidDetails1Impl.kt.expected b/libraries/apollo-compiler/src/test/graphql/com/example/fragments_same_type_condition/kotlin/responseBased/fragments_same_type_condition/fragment/DroidDetails1Impl.kt.expected index 669a5c41f7d..02f64cd88a0 100644 --- a/libraries/apollo-compiler/src/test/graphql/com/example/fragments_same_type_condition/kotlin/responseBased/fragments_same_type_condition/fragment/DroidDetails1Impl.kt.expected +++ b/libraries/apollo-compiler/src/test/graphql/com/example/fragments_same_type_condition/kotlin/responseBased/fragments_same_type_condition/fragment/DroidDetails1Impl.kt.expected @@ -26,7 +26,7 @@ public class DroidDetails1Impl() : Fragment { override fun serializeVariables( writer: JsonWriter, customScalarAdapters: CustomScalarAdapters, - withBooleanDefaultValues: Boolean, + withDefaultValues: Boolean, ) { // This fragment doesn't have any variable } diff --git a/libraries/apollo-compiler/src/test/graphql/com/example/fragments_same_type_condition/kotlin/responseBased/fragments_same_type_condition/fragment/DroidDetails2Impl.kt.expected b/libraries/apollo-compiler/src/test/graphql/com/example/fragments_same_type_condition/kotlin/responseBased/fragments_same_type_condition/fragment/DroidDetails2Impl.kt.expected index ddd07a1ab4a..75ca428071d 100644 --- a/libraries/apollo-compiler/src/test/graphql/com/example/fragments_same_type_condition/kotlin/responseBased/fragments_same_type_condition/fragment/DroidDetails2Impl.kt.expected +++ b/libraries/apollo-compiler/src/test/graphql/com/example/fragments_same_type_condition/kotlin/responseBased/fragments_same_type_condition/fragment/DroidDetails2Impl.kt.expected @@ -26,7 +26,7 @@ public class DroidDetails2Impl() : Fragment { override fun serializeVariables( writer: JsonWriter, customScalarAdapters: CustomScalarAdapters, - withBooleanDefaultValues: Boolean, + withDefaultValues: Boolean, ) { // This fragment doesn't have any variable } diff --git a/libraries/apollo-compiler/src/test/graphql/com/example/fragments_same_type_condition/kotlin/responseBased/fragments_same_type_condition/selections/TestQuerySelections.kt.expected b/libraries/apollo-compiler/src/test/graphql/com/example/fragments_same_type_condition/kotlin/responseBased/fragments_same_type_condition/selections/TestQuerySelections.kt.expected index aa2b629768f..45635c58f9c 100644 --- a/libraries/apollo-compiler/src/test/graphql/com/example/fragments_same_type_condition/kotlin/responseBased/fragments_same_type_condition/selections/TestQuerySelections.kt.expected +++ b/libraries/apollo-compiler/src/test/graphql/com/example/fragments_same_type_condition/kotlin/responseBased/fragments_same_type_condition/selections/TestQuerySelections.kt.expected @@ -5,6 +5,7 @@ // package com.example.fragments_same_type_condition.selections +import com.apollographql.apollo3.api.CompiledArgument import com.apollographql.apollo3.api.CompiledField import com.apollographql.apollo3.api.CompiledFragment import com.apollographql.apollo3.api.CompiledSelection @@ -37,7 +38,11 @@ public object TestQuerySelections { CompiledField.Builder( name = "hero", type = Character.type - ).selections(__hero) + ).arguments(listOf( + CompiledArgument.Builder("episode").build(), + CompiledArgument.Builder("listOfListOfStringArgs").build() + )) + .selections(__hero) .build() ) } diff --git a/libraries/apollo-compiler/src/test/graphql/com/example/fragments_with_defer_and_include_directives/java/operationBased/fragments_with_defer_and_include_directives/InlineMultipleWithDefer.java.expected b/libraries/apollo-compiler/src/test/graphql/com/example/fragments_with_defer_and_include_directives/java/operationBased/fragments_with_defer_and_include_directives/InlineMultipleWithDefer.java.expected index d6ba400f86e..3cb2b9b7660 100644 --- a/libraries/apollo-compiler/src/test/graphql/com/example/fragments_with_defer_and_include_directives/java/operationBased/fragments_with_defer_and_include_directives/InlineMultipleWithDefer.java.expected +++ b/libraries/apollo-compiler/src/test/graphql/com/example/fragments_with_defer_and_include_directives/java/operationBased/fragments_with_defer_and_include_directives/InlineMultipleWithDefer.java.expected @@ -102,7 +102,7 @@ public class InlineMultipleWithDefer implements Query @Override public void serializeVariables(JsonWriter writer, CustomScalarAdapters customScalarAdapters, - boolean withBooleanDefaultValues) throws IOException { + boolean withDefaultValues) throws IOException { // This operation doesn't have any variable } diff --git a/libraries/apollo-compiler/src/test/graphql/com/example/fragments_with_defer_and_include_directives/java/operationBased/fragments_with_defer_and_include_directives/SpreadMultipleWithDefer.java.expected b/libraries/apollo-compiler/src/test/graphql/com/example/fragments_with_defer_and_include_directives/java/operationBased/fragments_with_defer_and_include_directives/SpreadMultipleWithDefer.java.expected index 6b34815c62f..dec41267ef9 100644 --- a/libraries/apollo-compiler/src/test/graphql/com/example/fragments_with_defer_and_include_directives/java/operationBased/fragments_with_defer_and_include_directives/SpreadMultipleWithDefer.java.expected +++ b/libraries/apollo-compiler/src/test/graphql/com/example/fragments_with_defer_and_include_directives/java/operationBased/fragments_with_defer_and_include_directives/SpreadMultipleWithDefer.java.expected @@ -103,7 +103,7 @@ public class SpreadMultipleWithDefer implements Query @Override public void serializeVariables(JsonWriter writer, CustomScalarAdapters customScalarAdapters, - boolean withBooleanDefaultValues) throws IOException { + boolean withDefaultValues) throws IOException { // This operation doesn't have any variable } diff --git a/libraries/apollo-compiler/src/test/graphql/com/example/fragments_with_defer_and_include_directives/java/operationBased/fragments_with_defer_and_include_directives/adapter/InlineMultipleWithDeferAndInclude_VariablesAdapter.java.expected b/libraries/apollo-compiler/src/test/graphql/com/example/fragments_with_defer_and_include_directives/java/operationBased/fragments_with_defer_and_include_directives/adapter/InlineMultipleWithDeferAndInclude_VariablesAdapter.java.expected index 7c7049497a8..4d743b293f2 100644 --- a/libraries/apollo-compiler/src/test/graphql/com/example/fragments_with_defer_and_include_directives/java/operationBased/fragments_with_defer_and_include_directives/adapter/InlineMultipleWithDeferAndInclude_VariablesAdapter.java.expected +++ b/libraries/apollo-compiler/src/test/graphql/com/example/fragments_with_defer_and_include_directives/java/operationBased/fragments_with_defer_and_include_directives/adapter/InlineMultipleWithDeferAndInclude_VariablesAdapter.java.expected @@ -16,8 +16,7 @@ public enum InlineMultipleWithDeferAndInclude_VariablesAdapter { INSTANCE; public void serializeVariables(JsonWriter writer, InlineMultipleWithDeferAndInclude value, - CustomScalarAdapters customScalarAdapters, boolean withBooleanDefaultValues) throws - IOException { + CustomScalarAdapters customScalarAdapters, boolean withDefaultValues) throws IOException { CompositeAdapterContext adapterContext = new CompositeAdapterContext.Builder().customScalarAdapters(customScalarAdapters).build(); writer.name("cond1"); Adapters.BooleanAdapter.toJson(writer, CustomScalarAdapters.Empty, value.cond1); diff --git a/libraries/apollo-compiler/src/test/graphql/com/example/fragments_with_defer_and_include_directives/java/operationBased/fragments_with_defer_and_include_directives/adapter/InlineMultipleWithDeferWithIf_VariablesAdapter.java.expected b/libraries/apollo-compiler/src/test/graphql/com/example/fragments_with_defer_and_include_directives/java/operationBased/fragments_with_defer_and_include_directives/adapter/InlineMultipleWithDeferWithIf_VariablesAdapter.java.expected index fa638dd0d3f..dde834546a3 100644 --- a/libraries/apollo-compiler/src/test/graphql/com/example/fragments_with_defer_and_include_directives/java/operationBased/fragments_with_defer_and_include_directives/adapter/InlineMultipleWithDeferWithIf_VariablesAdapter.java.expected +++ b/libraries/apollo-compiler/src/test/graphql/com/example/fragments_with_defer_and_include_directives/java/operationBased/fragments_with_defer_and_include_directives/adapter/InlineMultipleWithDeferWithIf_VariablesAdapter.java.expected @@ -16,8 +16,7 @@ public enum InlineMultipleWithDeferWithIf_VariablesAdapter { INSTANCE; public void serializeVariables(JsonWriter writer, InlineMultipleWithDeferWithIf value, - CustomScalarAdapters customScalarAdapters, boolean withBooleanDefaultValues) throws - IOException { + CustomScalarAdapters customScalarAdapters, boolean withDefaultValues) throws IOException { CompositeAdapterContext adapterContext = new CompositeAdapterContext.Builder().customScalarAdapters(customScalarAdapters).build(); writer.name("cond"); Adapters.BooleanAdapter.toJson(writer, CustomScalarAdapters.Empty, value.cond); diff --git a/libraries/apollo-compiler/src/test/graphql/com/example/fragments_with_defer_and_include_directives/java/operationBased/fragments_with_defer_and_include_directives/adapter/SpreadMultipleWithDeferAndInclude_VariablesAdapter.java.expected b/libraries/apollo-compiler/src/test/graphql/com/example/fragments_with_defer_and_include_directives/java/operationBased/fragments_with_defer_and_include_directives/adapter/SpreadMultipleWithDeferAndInclude_VariablesAdapter.java.expected index a4b15746bd8..e78a1a3a253 100644 --- a/libraries/apollo-compiler/src/test/graphql/com/example/fragments_with_defer_and_include_directives/java/operationBased/fragments_with_defer_and_include_directives/adapter/SpreadMultipleWithDeferAndInclude_VariablesAdapter.java.expected +++ b/libraries/apollo-compiler/src/test/graphql/com/example/fragments_with_defer_and_include_directives/java/operationBased/fragments_with_defer_and_include_directives/adapter/SpreadMultipleWithDeferAndInclude_VariablesAdapter.java.expected @@ -16,8 +16,7 @@ public enum SpreadMultipleWithDeferAndInclude_VariablesAdapter { INSTANCE; public void serializeVariables(JsonWriter writer, SpreadMultipleWithDeferAndInclude value, - CustomScalarAdapters customScalarAdapters, boolean withBooleanDefaultValues) throws - IOException { + CustomScalarAdapters customScalarAdapters, boolean withDefaultValues) throws IOException { CompositeAdapterContext adapterContext = new CompositeAdapterContext.Builder().customScalarAdapters(customScalarAdapters).build(); writer.name("cond1"); Adapters.BooleanAdapter.toJson(writer, CustomScalarAdapters.Empty, value.cond1); diff --git a/libraries/apollo-compiler/src/test/graphql/com/example/fragments_with_defer_and_include_directives/java/operationBased/fragments_with_defer_and_include_directives/adapter/SpreadMultipleWithDeferWithIf_VariablesAdapter.java.expected b/libraries/apollo-compiler/src/test/graphql/com/example/fragments_with_defer_and_include_directives/java/operationBased/fragments_with_defer_and_include_directives/adapter/SpreadMultipleWithDeferWithIf_VariablesAdapter.java.expected index 5932f13f8af..af284c4ef13 100644 --- a/libraries/apollo-compiler/src/test/graphql/com/example/fragments_with_defer_and_include_directives/java/operationBased/fragments_with_defer_and_include_directives/adapter/SpreadMultipleWithDeferWithIf_VariablesAdapter.java.expected +++ b/libraries/apollo-compiler/src/test/graphql/com/example/fragments_with_defer_and_include_directives/java/operationBased/fragments_with_defer_and_include_directives/adapter/SpreadMultipleWithDeferWithIf_VariablesAdapter.java.expected @@ -16,8 +16,7 @@ public enum SpreadMultipleWithDeferWithIf_VariablesAdapter { INSTANCE; public void serializeVariables(JsonWriter writer, SpreadMultipleWithDeferWithIf value, - CustomScalarAdapters customScalarAdapters, boolean withBooleanDefaultValues) throws - IOException { + CustomScalarAdapters customScalarAdapters, boolean withDefaultValues) throws IOException { CompositeAdapterContext adapterContext = new CompositeAdapterContext.Builder().customScalarAdapters(customScalarAdapters).build(); writer.name("cond"); Adapters.BooleanAdapter.toJson(writer, CustomScalarAdapters.Empty, value.cond); diff --git a/libraries/apollo-compiler/src/test/graphql/com/example/fragments_with_defer_and_include_directives/java/operationBased/fragments_with_defer_and_include_directives/fragment/CharacterDetails2Impl.java.expected b/libraries/apollo-compiler/src/test/graphql/com/example/fragments_with_defer_and_include_directives/java/operationBased/fragments_with_defer_and_include_directives/fragment/CharacterDetails2Impl.java.expected index c0667f506e4..42b1e586815 100644 --- a/libraries/apollo-compiler/src/test/graphql/com/example/fragments_with_defer_and_include_directives/java/operationBased/fragments_with_defer_and_include_directives/fragment/CharacterDetails2Impl.java.expected +++ b/libraries/apollo-compiler/src/test/graphql/com/example/fragments_with_defer_and_include_directives/java/operationBased/fragments_with_defer_and_include_directives/fragment/CharacterDetails2Impl.java.expected @@ -61,7 +61,7 @@ public class CharacterDetails2Impl implements Fragment { @Override public void serializeVariables(JsonWriter writer, CustomScalarAdapters customScalarAdapters, - boolean withBooleanDefaultValues) throws IOException { + boolean withDefaultValues) throws IOException { // This fragment doesn't have any variable } diff --git a/libraries/apollo-compiler/src/test/graphql/com/example/fragments_with_defer_and_include_directives/java/operationBased/fragments_with_defer_and_include_directives/fragment/CharacterDetails3Impl.java.expected b/libraries/apollo-compiler/src/test/graphql/com/example/fragments_with_defer_and_include_directives/java/operationBased/fragments_with_defer_and_include_directives/fragment/CharacterDetails3Impl.java.expected index 8aba7806c80..0b620fabf23 100644 --- a/libraries/apollo-compiler/src/test/graphql/com/example/fragments_with_defer_and_include_directives/java/operationBased/fragments_with_defer_and_include_directives/fragment/CharacterDetails3Impl.java.expected +++ b/libraries/apollo-compiler/src/test/graphql/com/example/fragments_with_defer_and_include_directives/java/operationBased/fragments_with_defer_and_include_directives/fragment/CharacterDetails3Impl.java.expected @@ -61,7 +61,7 @@ public class CharacterDetails3Impl implements Fragment { @Override public void serializeVariables(JsonWriter writer, CustomScalarAdapters customScalarAdapters, - boolean withBooleanDefaultValues) throws IOException { + boolean withDefaultValues) throws IOException { // This fragment doesn't have any variable } diff --git a/libraries/apollo-compiler/src/test/graphql/com/example/fragments_with_defer_and_include_directives/java/operationBased/fragments_with_defer_and_include_directives/fragment/CharacterDetailsImpl.java.expected b/libraries/apollo-compiler/src/test/graphql/com/example/fragments_with_defer_and_include_directives/java/operationBased/fragments_with_defer_and_include_directives/fragment/CharacterDetailsImpl.java.expected index 490d50aa753..49e26b53ffb 100644 --- a/libraries/apollo-compiler/src/test/graphql/com/example/fragments_with_defer_and_include_directives/java/operationBased/fragments_with_defer_and_include_directives/fragment/CharacterDetailsImpl.java.expected +++ b/libraries/apollo-compiler/src/test/graphql/com/example/fragments_with_defer_and_include_directives/java/operationBased/fragments_with_defer_and_include_directives/fragment/CharacterDetailsImpl.java.expected @@ -61,7 +61,7 @@ public class CharacterDetailsImpl implements Fragment { @Override public void serializeVariables(JsonWriter writer, CustomScalarAdapters customScalarAdapters, - boolean withBooleanDefaultValues) throws IOException { + boolean withDefaultValues) throws IOException { // This fragment doesn't have any variable } diff --git a/libraries/apollo-compiler/src/test/graphql/com/example/fragments_with_defer_and_include_directives/java/operationBased/fragments_with_defer_and_include_directives/fragment/DroidDetailsImpl.java.expected b/libraries/apollo-compiler/src/test/graphql/com/example/fragments_with_defer_and_include_directives/java/operationBased/fragments_with_defer_and_include_directives/fragment/DroidDetailsImpl.java.expected index 1585254b7ea..05dfa919383 100644 --- a/libraries/apollo-compiler/src/test/graphql/com/example/fragments_with_defer_and_include_directives/java/operationBased/fragments_with_defer_and_include_directives/fragment/DroidDetailsImpl.java.expected +++ b/libraries/apollo-compiler/src/test/graphql/com/example/fragments_with_defer_and_include_directives/java/operationBased/fragments_with_defer_and_include_directives/fragment/DroidDetailsImpl.java.expected @@ -61,7 +61,7 @@ public class DroidDetailsImpl implements Fragment { @Override public void serializeVariables(JsonWriter writer, CustomScalarAdapters customScalarAdapters, - boolean withBooleanDefaultValues) throws IOException { + boolean withDefaultValues) throws IOException { // This fragment doesn't have any variable } diff --git a/libraries/apollo-compiler/src/test/graphql/com/example/fragments_with_defer_and_include_directives/java/operationBased/fragments_with_defer_and_include_directives/selections/InlineMultipleWithDeferAndIncludeSelections.java.expected b/libraries/apollo-compiler/src/test/graphql/com/example/fragments_with_defer_and_include_directives/java/operationBased/fragments_with_defer_and_include_directives/selections/InlineMultipleWithDeferAndIncludeSelections.java.expected index 2b28f025065..a04b8c8505d 100644 --- a/libraries/apollo-compiler/src/test/graphql/com/example/fragments_with_defer_and_include_directives/java/operationBased/fragments_with_defer_and_include_directives/selections/InlineMultipleWithDeferAndIncludeSelections.java.expected +++ b/libraries/apollo-compiler/src/test/graphql/com/example/fragments_with_defer_and_include_directives/java/operationBased/fragments_with_defer_and_include_directives/selections/InlineMultipleWithDeferAndIncludeSelections.java.expected @@ -5,6 +5,7 @@ // package com.example.fragments_with_defer_and_include_directives.selections; +import com.apollographql.apollo3.api.CompiledArgument; import com.apollographql.apollo3.api.CompiledCondition; import com.apollographql.apollo3.api.CompiledField; import com.apollographql.apollo3.api.CompiledFragment; @@ -52,6 +53,6 @@ public class InlineMultipleWithDeferAndIncludeSelections { ); public static List __root = Arrays.asList( - new CompiledField.Builder("hero", Character.type).selections(__hero).build() + new CompiledField.Builder("hero", Character.type).arguments(Arrays.asList(new CompiledArgument.Builder("episode").build(), new CompiledArgument.Builder("listOfListOfStringArgs").build())).selections(__hero).build() ); } diff --git a/libraries/apollo-compiler/src/test/graphql/com/example/fragments_with_defer_and_include_directives/java/operationBased/fragments_with_defer_and_include_directives/selections/InlineMultipleWithDeferSelections.java.expected b/libraries/apollo-compiler/src/test/graphql/com/example/fragments_with_defer_and_include_directives/java/operationBased/fragments_with_defer_and_include_directives/selections/InlineMultipleWithDeferSelections.java.expected index aedb9b6f597..7526f185bea 100644 --- a/libraries/apollo-compiler/src/test/graphql/com/example/fragments_with_defer_and_include_directives/java/operationBased/fragments_with_defer_and_include_directives/selections/InlineMultipleWithDeferSelections.java.expected +++ b/libraries/apollo-compiler/src/test/graphql/com/example/fragments_with_defer_and_include_directives/java/operationBased/fragments_with_defer_and_include_directives/selections/InlineMultipleWithDeferSelections.java.expected @@ -5,6 +5,7 @@ // package com.example.fragments_with_defer_and_include_directives.selections; +import com.apollographql.apollo3.api.CompiledArgument; import com.apollographql.apollo3.api.CompiledField; import com.apollographql.apollo3.api.CompiledFragment; import com.apollographql.apollo3.api.CompiledNotNullType; @@ -31,6 +32,6 @@ public class InlineMultipleWithDeferSelections { ); public static List __root = Arrays.asList( - new CompiledField.Builder("hero", Character.type).selections(__hero).build() + new CompiledField.Builder("hero", Character.type).arguments(Arrays.asList(new CompiledArgument.Builder("episode").build(), new CompiledArgument.Builder("listOfListOfStringArgs").build())).selections(__hero).build() ); } diff --git a/libraries/apollo-compiler/src/test/graphql/com/example/fragments_with_defer_and_include_directives/java/operationBased/fragments_with_defer_and_include_directives/selections/InlineMultipleWithDeferWithIfSelections.java.expected b/libraries/apollo-compiler/src/test/graphql/com/example/fragments_with_defer_and_include_directives/java/operationBased/fragments_with_defer_and_include_directives/selections/InlineMultipleWithDeferWithIfSelections.java.expected index 4df66727129..f0c0d714892 100644 --- a/libraries/apollo-compiler/src/test/graphql/com/example/fragments_with_defer_and_include_directives/java/operationBased/fragments_with_defer_and_include_directives/selections/InlineMultipleWithDeferWithIfSelections.java.expected +++ b/libraries/apollo-compiler/src/test/graphql/com/example/fragments_with_defer_and_include_directives/java/operationBased/fragments_with_defer_and_include_directives/selections/InlineMultipleWithDeferWithIfSelections.java.expected @@ -5,6 +5,7 @@ // package com.example.fragments_with_defer_and_include_directives.selections; +import com.apollographql.apollo3.api.CompiledArgument; import com.apollographql.apollo3.api.CompiledField; import com.apollographql.apollo3.api.CompiledFragment; import com.apollographql.apollo3.api.CompiledNotNullType; @@ -36,6 +37,6 @@ public class InlineMultipleWithDeferWithIfSelections { ); public static List __root = Arrays.asList( - new CompiledField.Builder("hero", Character.type).selections(__hero).build() + new CompiledField.Builder("hero", Character.type).arguments(Arrays.asList(new CompiledArgument.Builder("episode").build(), new CompiledArgument.Builder("listOfListOfStringArgs").build())).selections(__hero).build() ); } diff --git a/libraries/apollo-compiler/src/test/graphql/com/example/fragments_with_defer_and_include_directives/java/operationBased/fragments_with_defer_and_include_directives/selections/InlineSingleWithDeferSelections.java.expected b/libraries/apollo-compiler/src/test/graphql/com/example/fragments_with_defer_and_include_directives/java/operationBased/fragments_with_defer_and_include_directives/selections/InlineSingleWithDeferSelections.java.expected index ada9860911f..853d80c6859 100644 --- a/libraries/apollo-compiler/src/test/graphql/com/example/fragments_with_defer_and_include_directives/java/operationBased/fragments_with_defer_and_include_directives/selections/InlineSingleWithDeferSelections.java.expected +++ b/libraries/apollo-compiler/src/test/graphql/com/example/fragments_with_defer_and_include_directives/java/operationBased/fragments_with_defer_and_include_directives/selections/InlineSingleWithDeferSelections.java.expected @@ -5,6 +5,7 @@ // package com.example.fragments_with_defer_and_include_directives.selections; +import com.apollographql.apollo3.api.CompiledArgument; import com.apollographql.apollo3.api.CompiledField; import com.apollographql.apollo3.api.CompiledFragment; import com.apollographql.apollo3.api.CompiledNotNullType; @@ -25,6 +26,6 @@ public class InlineSingleWithDeferSelections { ); public static List __root = Arrays.asList( - new CompiledField.Builder("hero", Character.type).selections(__hero).build() + new CompiledField.Builder("hero", Character.type).arguments(Arrays.asList(new CompiledArgument.Builder("episode").build(), new CompiledArgument.Builder("listOfListOfStringArgs").build())).selections(__hero).build() ); } diff --git a/libraries/apollo-compiler/src/test/graphql/com/example/fragments_with_defer_and_include_directives/java/operationBased/fragments_with_defer_and_include_directives/selections/SpreadMultipleWithDeferAndIncludeSelections.java.expected b/libraries/apollo-compiler/src/test/graphql/com/example/fragments_with_defer_and_include_directives/java/operationBased/fragments_with_defer_and_include_directives/selections/SpreadMultipleWithDeferAndIncludeSelections.java.expected index e4f1525b6b5..ff15e06b498 100644 --- a/libraries/apollo-compiler/src/test/graphql/com/example/fragments_with_defer_and_include_directives/java/operationBased/fragments_with_defer_and_include_directives/selections/SpreadMultipleWithDeferAndIncludeSelections.java.expected +++ b/libraries/apollo-compiler/src/test/graphql/com/example/fragments_with_defer_and_include_directives/java/operationBased/fragments_with_defer_and_include_directives/selections/SpreadMultipleWithDeferAndIncludeSelections.java.expected @@ -5,6 +5,7 @@ // package com.example.fragments_with_defer_and_include_directives.selections; +import com.apollographql.apollo3.api.CompiledArgument; import com.apollographql.apollo3.api.CompiledCondition; import com.apollographql.apollo3.api.CompiledField; import com.apollographql.apollo3.api.CompiledFragment; @@ -28,6 +29,6 @@ public class SpreadMultipleWithDeferAndIncludeSelections { ); public static List __root = Arrays.asList( - new CompiledField.Builder("hero", Character.type).selections(__hero).build() + new CompiledField.Builder("hero", Character.type).arguments(Arrays.asList(new CompiledArgument.Builder("episode").build(), new CompiledArgument.Builder("listOfListOfStringArgs").build())).selections(__hero).build() ); } diff --git a/libraries/apollo-compiler/src/test/graphql/com/example/fragments_with_defer_and_include_directives/java/operationBased/fragments_with_defer_and_include_directives/selections/SpreadMultipleWithDeferSelections.java.expected b/libraries/apollo-compiler/src/test/graphql/com/example/fragments_with_defer_and_include_directives/java/operationBased/fragments_with_defer_and_include_directives/selections/SpreadMultipleWithDeferSelections.java.expected index 4cf0b8b5af6..176abfe4aa7 100644 --- a/libraries/apollo-compiler/src/test/graphql/com/example/fragments_with_defer_and_include_directives/java/operationBased/fragments_with_defer_and_include_directives/selections/SpreadMultipleWithDeferSelections.java.expected +++ b/libraries/apollo-compiler/src/test/graphql/com/example/fragments_with_defer_and_include_directives/java/operationBased/fragments_with_defer_and_include_directives/selections/SpreadMultipleWithDeferSelections.java.expected @@ -5,6 +5,7 @@ // package com.example.fragments_with_defer_and_include_directives.selections; +import com.apollographql.apollo3.api.CompiledArgument; import com.apollographql.apollo3.api.CompiledField; import com.apollographql.apollo3.api.CompiledFragment; import com.apollographql.apollo3.api.CompiledNotNullType; @@ -23,6 +24,6 @@ public class SpreadMultipleWithDeferSelections { ); public static List __root = Arrays.asList( - new CompiledField.Builder("hero", Character.type).selections(__hero).build() + new CompiledField.Builder("hero", Character.type).arguments(Arrays.asList(new CompiledArgument.Builder("episode").build(), new CompiledArgument.Builder("listOfListOfStringArgs").build())).selections(__hero).build() ); } diff --git a/libraries/apollo-compiler/src/test/graphql/com/example/fragments_with_defer_and_include_directives/java/operationBased/fragments_with_defer_and_include_directives/selections/SpreadMultipleWithDeferWithIfSelections.java.expected b/libraries/apollo-compiler/src/test/graphql/com/example/fragments_with_defer_and_include_directives/java/operationBased/fragments_with_defer_and_include_directives/selections/SpreadMultipleWithDeferWithIfSelections.java.expected index 3799812eb68..f9cd553fa9e 100644 --- a/libraries/apollo-compiler/src/test/graphql/com/example/fragments_with_defer_and_include_directives/java/operationBased/fragments_with_defer_and_include_directives/selections/SpreadMultipleWithDeferWithIfSelections.java.expected +++ b/libraries/apollo-compiler/src/test/graphql/com/example/fragments_with_defer_and_include_directives/java/operationBased/fragments_with_defer_and_include_directives/selections/SpreadMultipleWithDeferWithIfSelections.java.expected @@ -5,6 +5,7 @@ // package com.example.fragments_with_defer_and_include_directives.selections; +import com.apollographql.apollo3.api.CompiledArgument; import com.apollographql.apollo3.api.CompiledField; import com.apollographql.apollo3.api.CompiledFragment; import com.apollographql.apollo3.api.CompiledNotNullType; @@ -26,6 +27,6 @@ public class SpreadMultipleWithDeferWithIfSelections { ); public static List __root = Arrays.asList( - new CompiledField.Builder("hero", Character.type).selections(__hero).build() + new CompiledField.Builder("hero", Character.type).arguments(Arrays.asList(new CompiledArgument.Builder("episode").build(), new CompiledArgument.Builder("listOfListOfStringArgs").build())).selections(__hero).build() ); } diff --git a/libraries/apollo-compiler/src/test/graphql/com/example/fragments_with_defer_and_include_directives/java/operationBased/fragments_with_defer_and_include_directives/selections/SpreadSingleWithDeferSelections.java.expected b/libraries/apollo-compiler/src/test/graphql/com/example/fragments_with_defer_and_include_directives/java/operationBased/fragments_with_defer_and_include_directives/selections/SpreadSingleWithDeferSelections.java.expected index b832d7a959a..274e5ec9e4a 100644 --- a/libraries/apollo-compiler/src/test/graphql/com/example/fragments_with_defer_and_include_directives/java/operationBased/fragments_with_defer_and_include_directives/selections/SpreadSingleWithDeferSelections.java.expected +++ b/libraries/apollo-compiler/src/test/graphql/com/example/fragments_with_defer_and_include_directives/java/operationBased/fragments_with_defer_and_include_directives/selections/SpreadSingleWithDeferSelections.java.expected @@ -5,6 +5,7 @@ // package com.example.fragments_with_defer_and_include_directives.selections; +import com.apollographql.apollo3.api.CompiledArgument; import com.apollographql.apollo3.api.CompiledField; import com.apollographql.apollo3.api.CompiledFragment; import com.apollographql.apollo3.api.CompiledNotNullType; @@ -22,6 +23,6 @@ public class SpreadSingleWithDeferSelections { ); public static List __root = Arrays.asList( - new CompiledField.Builder("hero", Character.type).selections(__hero).build() + new CompiledField.Builder("hero", Character.type).arguments(Arrays.asList(new CompiledArgument.Builder("episode").build(), new CompiledArgument.Builder("listOfListOfStringArgs").build())).selections(__hero).build() ); } diff --git a/libraries/apollo-compiler/src/test/graphql/com/example/fragments_with_defer_and_include_directives/kotlin/operationBased/fragments_with_defer_and_include_directives/InlineMultipleWithDefer.kt.expected b/libraries/apollo-compiler/src/test/graphql/com/example/fragments_with_defer_and_include_directives/kotlin/operationBased/fragments_with_defer_and_include_directives/InlineMultipleWithDefer.kt.expected index 311f69e132a..a2986428dd7 100644 --- a/libraries/apollo-compiler/src/test/graphql/com/example/fragments_with_defer_and_include_directives/kotlin/operationBased/fragments_with_defer_and_include_directives/InlineMultipleWithDefer.kt.expected +++ b/libraries/apollo-compiler/src/test/graphql/com/example/fragments_with_defer_and_include_directives/kotlin/operationBased/fragments_with_defer_and_include_directives/InlineMultipleWithDefer.kt.expected @@ -34,7 +34,7 @@ public class InlineMultipleWithDefer() : Query { override fun serializeVariables( writer: JsonWriter, customScalarAdapters: CustomScalarAdapters, - withBooleanDefaultValues: Boolean, + withDefaultValues: Boolean, ) { // This operation doesn't have any variable } diff --git a/libraries/apollo-compiler/src/test/graphql/com/example/fragments_with_defer_and_include_directives/kotlin/operationBased/fragments_with_defer_and_include_directives/InlineMultipleWithDeferAndInclude.kt.expected b/libraries/apollo-compiler/src/test/graphql/com/example/fragments_with_defer_and_include_directives/kotlin/operationBased/fragments_with_defer_and_include_directives/InlineMultipleWithDeferAndInclude.kt.expected index 11c61f3b5f7..7f678f3d377 100644 --- a/libraries/apollo-compiler/src/test/graphql/com/example/fragments_with_defer_and_include_directives/kotlin/operationBased/fragments_with_defer_and_include_directives/InlineMultipleWithDeferAndInclude.kt.expected +++ b/libraries/apollo-compiler/src/test/graphql/com/example/fragments_with_defer_and_include_directives/kotlin/operationBased/fragments_with_defer_and_include_directives/InlineMultipleWithDeferAndInclude.kt.expected @@ -34,10 +34,10 @@ public data class InlineMultipleWithDeferAndInclude( override fun serializeVariables( writer: JsonWriter, customScalarAdapters: CustomScalarAdapters, - withBooleanDefaultValues: Boolean, + withDefaultValues: Boolean, ) { InlineMultipleWithDeferAndInclude_VariablesAdapter.serializeVariables(writer, this, - customScalarAdapters, withBooleanDefaultValues) + customScalarAdapters, withDefaultValues) } override fun adapter(): CompositeAdapter = diff --git a/libraries/apollo-compiler/src/test/graphql/com/example/fragments_with_defer_and_include_directives/kotlin/operationBased/fragments_with_defer_and_include_directives/InlineMultipleWithDeferWithIf.kt.expected b/libraries/apollo-compiler/src/test/graphql/com/example/fragments_with_defer_and_include_directives/kotlin/operationBased/fragments_with_defer_and_include_directives/InlineMultipleWithDeferWithIf.kt.expected index d0d8640f53f..38b3970802a 100644 --- a/libraries/apollo-compiler/src/test/graphql/com/example/fragments_with_defer_and_include_directives/kotlin/operationBased/fragments_with_defer_and_include_directives/InlineMultipleWithDeferWithIf.kt.expected +++ b/libraries/apollo-compiler/src/test/graphql/com/example/fragments_with_defer_and_include_directives/kotlin/operationBased/fragments_with_defer_and_include_directives/InlineMultipleWithDeferWithIf.kt.expected @@ -31,10 +31,10 @@ public data class InlineMultipleWithDeferWithIf( override fun serializeVariables( writer: JsonWriter, customScalarAdapters: CustomScalarAdapters, - withBooleanDefaultValues: Boolean, + withDefaultValues: Boolean, ) { InlineMultipleWithDeferWithIf_VariablesAdapter.serializeVariables(writer, this, - customScalarAdapters, withBooleanDefaultValues) + customScalarAdapters, withDefaultValues) } override fun adapter(): CompositeAdapter = diff --git a/libraries/apollo-compiler/src/test/graphql/com/example/fragments_with_defer_and_include_directives/kotlin/operationBased/fragments_with_defer_and_include_directives/InlineSingleWithDefer.kt.expected b/libraries/apollo-compiler/src/test/graphql/com/example/fragments_with_defer_and_include_directives/kotlin/operationBased/fragments_with_defer_and_include_directives/InlineSingleWithDefer.kt.expected index cb72f4e8a8d..8d8ef3b5c77 100644 --- a/libraries/apollo-compiler/src/test/graphql/com/example/fragments_with_defer_and_include_directives/kotlin/operationBased/fragments_with_defer_and_include_directives/InlineSingleWithDefer.kt.expected +++ b/libraries/apollo-compiler/src/test/graphql/com/example/fragments_with_defer_and_include_directives/kotlin/operationBased/fragments_with_defer_and_include_directives/InlineSingleWithDefer.kt.expected @@ -34,7 +34,7 @@ public class InlineSingleWithDefer() : Query { override fun serializeVariables( writer: JsonWriter, customScalarAdapters: CustomScalarAdapters, - withBooleanDefaultValues: Boolean, + withDefaultValues: Boolean, ) { // This operation doesn't have any variable } diff --git a/libraries/apollo-compiler/src/test/graphql/com/example/fragments_with_defer_and_include_directives/kotlin/operationBased/fragments_with_defer_and_include_directives/SpreadMultipleWithDefer.kt.expected b/libraries/apollo-compiler/src/test/graphql/com/example/fragments_with_defer_and_include_directives/kotlin/operationBased/fragments_with_defer_and_include_directives/SpreadMultipleWithDefer.kt.expected index 625637569ab..b0b7f7c98f1 100644 --- a/libraries/apollo-compiler/src/test/graphql/com/example/fragments_with_defer_and_include_directives/kotlin/operationBased/fragments_with_defer_and_include_directives/SpreadMultipleWithDefer.kt.expected +++ b/libraries/apollo-compiler/src/test/graphql/com/example/fragments_with_defer_and_include_directives/kotlin/operationBased/fragments_with_defer_and_include_directives/SpreadMultipleWithDefer.kt.expected @@ -35,7 +35,7 @@ public class SpreadMultipleWithDefer() : Query { override fun serializeVariables( writer: JsonWriter, customScalarAdapters: CustomScalarAdapters, - withBooleanDefaultValues: Boolean, + withDefaultValues: Boolean, ) { // This operation doesn't have any variable } diff --git a/libraries/apollo-compiler/src/test/graphql/com/example/fragments_with_defer_and_include_directives/kotlin/operationBased/fragments_with_defer_and_include_directives/SpreadMultipleWithDeferAndInclude.kt.expected b/libraries/apollo-compiler/src/test/graphql/com/example/fragments_with_defer_and_include_directives/kotlin/operationBased/fragments_with_defer_and_include_directives/SpreadMultipleWithDeferAndInclude.kt.expected index 6181f77e3b3..809a853a214 100644 --- a/libraries/apollo-compiler/src/test/graphql/com/example/fragments_with_defer_and_include_directives/kotlin/operationBased/fragments_with_defer_and_include_directives/SpreadMultipleWithDeferAndInclude.kt.expected +++ b/libraries/apollo-compiler/src/test/graphql/com/example/fragments_with_defer_and_include_directives/kotlin/operationBased/fragments_with_defer_and_include_directives/SpreadMultipleWithDeferAndInclude.kt.expected @@ -35,10 +35,10 @@ public data class SpreadMultipleWithDeferAndInclude( override fun serializeVariables( writer: JsonWriter, customScalarAdapters: CustomScalarAdapters, - withBooleanDefaultValues: Boolean, + withDefaultValues: Boolean, ) { SpreadMultipleWithDeferAndInclude_VariablesAdapter.serializeVariables(writer, this, - customScalarAdapters, withBooleanDefaultValues) + customScalarAdapters, withDefaultValues) } override fun adapter(): CompositeAdapter = diff --git a/libraries/apollo-compiler/src/test/graphql/com/example/fragments_with_defer_and_include_directives/kotlin/operationBased/fragments_with_defer_and_include_directives/SpreadMultipleWithDeferWithIf.kt.expected b/libraries/apollo-compiler/src/test/graphql/com/example/fragments_with_defer_and_include_directives/kotlin/operationBased/fragments_with_defer_and_include_directives/SpreadMultipleWithDeferWithIf.kt.expected index 083b2baa8fc..8408a155427 100644 --- a/libraries/apollo-compiler/src/test/graphql/com/example/fragments_with_defer_and_include_directives/kotlin/operationBased/fragments_with_defer_and_include_directives/SpreadMultipleWithDeferWithIf.kt.expected +++ b/libraries/apollo-compiler/src/test/graphql/com/example/fragments_with_defer_and_include_directives/kotlin/operationBased/fragments_with_defer_and_include_directives/SpreadMultipleWithDeferWithIf.kt.expected @@ -34,10 +34,10 @@ public data class SpreadMultipleWithDeferWithIf( override fun serializeVariables( writer: JsonWriter, customScalarAdapters: CustomScalarAdapters, - withBooleanDefaultValues: Boolean, + withDefaultValues: Boolean, ) { SpreadMultipleWithDeferWithIf_VariablesAdapter.serializeVariables(writer, this, - customScalarAdapters, withBooleanDefaultValues) + customScalarAdapters, withDefaultValues) } override fun adapter(): CompositeAdapter = diff --git a/libraries/apollo-compiler/src/test/graphql/com/example/fragments_with_defer_and_include_directives/kotlin/operationBased/fragments_with_defer_and_include_directives/SpreadSingleWithDefer.kt.expected b/libraries/apollo-compiler/src/test/graphql/com/example/fragments_with_defer_and_include_directives/kotlin/operationBased/fragments_with_defer_and_include_directives/SpreadSingleWithDefer.kt.expected index d06c7766a09..2227fd99e9e 100644 --- a/libraries/apollo-compiler/src/test/graphql/com/example/fragments_with_defer_and_include_directives/kotlin/operationBased/fragments_with_defer_and_include_directives/SpreadSingleWithDefer.kt.expected +++ b/libraries/apollo-compiler/src/test/graphql/com/example/fragments_with_defer_and_include_directives/kotlin/operationBased/fragments_with_defer_and_include_directives/SpreadSingleWithDefer.kt.expected @@ -35,7 +35,7 @@ public class SpreadSingleWithDefer() : Query { override fun serializeVariables( writer: JsonWriter, customScalarAdapters: CustomScalarAdapters, - withBooleanDefaultValues: Boolean, + withDefaultValues: Boolean, ) { // This operation doesn't have any variable } diff --git a/libraries/apollo-compiler/src/test/graphql/com/example/fragments_with_defer_and_include_directives/kotlin/operationBased/fragments_with_defer_and_include_directives/adapter/InlineMultipleWithDeferAndInclude_VariablesAdapter.kt.expected b/libraries/apollo-compiler/src/test/graphql/com/example/fragments_with_defer_and_include_directives/kotlin/operationBased/fragments_with_defer_and_include_directives/adapter/InlineMultipleWithDeferAndInclude_VariablesAdapter.kt.expected index 1fcf2c362a3..74eb401900c 100644 --- a/libraries/apollo-compiler/src/test/graphql/com/example/fragments_with_defer_and_include_directives/kotlin/operationBased/fragments_with_defer_and_include_directives/adapter/InlineMultipleWithDeferAndInclude_VariablesAdapter.kt.expected +++ b/libraries/apollo-compiler/src/test/graphql/com/example/fragments_with_defer_and_include_directives/kotlin/operationBased/fragments_with_defer_and_include_directives/adapter/InlineMultipleWithDeferAndInclude_VariablesAdapter.kt.expected @@ -21,7 +21,7 @@ public object InlineMultipleWithDeferAndInclude_VariablesAdapter { writer: JsonWriter, `value`: InlineMultipleWithDeferAndInclude, customScalarAdapters: CustomScalarAdapters, - withBooleanDefaultValues: Boolean, + withDefaultValues: Boolean, ) { writer.name("cond1") BooleanAdapter.toJson(writer, customScalarAdapters, value.cond1) diff --git a/libraries/apollo-compiler/src/test/graphql/com/example/fragments_with_defer_and_include_directives/kotlin/operationBased/fragments_with_defer_and_include_directives/adapter/InlineMultipleWithDeferWithIf_VariablesAdapter.kt.expected b/libraries/apollo-compiler/src/test/graphql/com/example/fragments_with_defer_and_include_directives/kotlin/operationBased/fragments_with_defer_and_include_directives/adapter/InlineMultipleWithDeferWithIf_VariablesAdapter.kt.expected index d9fc7212c1c..9f08dc0e8d4 100644 --- a/libraries/apollo-compiler/src/test/graphql/com/example/fragments_with_defer_and_include_directives/kotlin/operationBased/fragments_with_defer_and_include_directives/adapter/InlineMultipleWithDeferWithIf_VariablesAdapter.kt.expected +++ b/libraries/apollo-compiler/src/test/graphql/com/example/fragments_with_defer_and_include_directives/kotlin/operationBased/fragments_with_defer_and_include_directives/adapter/InlineMultipleWithDeferWithIf_VariablesAdapter.kt.expected @@ -21,7 +21,7 @@ public object InlineMultipleWithDeferWithIf_VariablesAdapter { writer: JsonWriter, `value`: InlineMultipleWithDeferWithIf, customScalarAdapters: CustomScalarAdapters, - withBooleanDefaultValues: Boolean, + withDefaultValues: Boolean, ) { writer.name("cond") BooleanAdapter.toJson(writer, customScalarAdapters, value.cond) diff --git a/libraries/apollo-compiler/src/test/graphql/com/example/fragments_with_defer_and_include_directives/kotlin/operationBased/fragments_with_defer_and_include_directives/adapter/SpreadMultipleWithDeferAndInclude_VariablesAdapter.kt.expected b/libraries/apollo-compiler/src/test/graphql/com/example/fragments_with_defer_and_include_directives/kotlin/operationBased/fragments_with_defer_and_include_directives/adapter/SpreadMultipleWithDeferAndInclude_VariablesAdapter.kt.expected index 40cd5949cde..35378be2e72 100644 --- a/libraries/apollo-compiler/src/test/graphql/com/example/fragments_with_defer_and_include_directives/kotlin/operationBased/fragments_with_defer_and_include_directives/adapter/SpreadMultipleWithDeferAndInclude_VariablesAdapter.kt.expected +++ b/libraries/apollo-compiler/src/test/graphql/com/example/fragments_with_defer_and_include_directives/kotlin/operationBased/fragments_with_defer_and_include_directives/adapter/SpreadMultipleWithDeferAndInclude_VariablesAdapter.kt.expected @@ -21,7 +21,7 @@ public object SpreadMultipleWithDeferAndInclude_VariablesAdapter { writer: JsonWriter, `value`: SpreadMultipleWithDeferAndInclude, customScalarAdapters: CustomScalarAdapters, - withBooleanDefaultValues: Boolean, + withDefaultValues: Boolean, ) { writer.name("cond1") BooleanAdapter.toJson(writer, customScalarAdapters, value.cond1) diff --git a/libraries/apollo-compiler/src/test/graphql/com/example/fragments_with_defer_and_include_directives/kotlin/operationBased/fragments_with_defer_and_include_directives/adapter/SpreadMultipleWithDeferWithIf_VariablesAdapter.kt.expected b/libraries/apollo-compiler/src/test/graphql/com/example/fragments_with_defer_and_include_directives/kotlin/operationBased/fragments_with_defer_and_include_directives/adapter/SpreadMultipleWithDeferWithIf_VariablesAdapter.kt.expected index 36e9e209fd8..dafbbf5be50 100644 --- a/libraries/apollo-compiler/src/test/graphql/com/example/fragments_with_defer_and_include_directives/kotlin/operationBased/fragments_with_defer_and_include_directives/adapter/SpreadMultipleWithDeferWithIf_VariablesAdapter.kt.expected +++ b/libraries/apollo-compiler/src/test/graphql/com/example/fragments_with_defer_and_include_directives/kotlin/operationBased/fragments_with_defer_and_include_directives/adapter/SpreadMultipleWithDeferWithIf_VariablesAdapter.kt.expected @@ -21,7 +21,7 @@ public object SpreadMultipleWithDeferWithIf_VariablesAdapter { writer: JsonWriter, `value`: SpreadMultipleWithDeferWithIf, customScalarAdapters: CustomScalarAdapters, - withBooleanDefaultValues: Boolean, + withDefaultValues: Boolean, ) { writer.name("cond") BooleanAdapter.toJson(writer, customScalarAdapters, value.cond) diff --git a/libraries/apollo-compiler/src/test/graphql/com/example/fragments_with_defer_and_include_directives/kotlin/operationBased/fragments_with_defer_and_include_directives/fragment/CharacterDetails2Impl.kt.expected b/libraries/apollo-compiler/src/test/graphql/com/example/fragments_with_defer_and_include_directives/kotlin/operationBased/fragments_with_defer_and_include_directives/fragment/CharacterDetails2Impl.kt.expected index 04002c8379d..7b6b0510054 100644 --- a/libraries/apollo-compiler/src/test/graphql/com/example/fragments_with_defer_and_include_directives/kotlin/operationBased/fragments_with_defer_and_include_directives/fragment/CharacterDetails2Impl.kt.expected +++ b/libraries/apollo-compiler/src/test/graphql/com/example/fragments_with_defer_and_include_directives/kotlin/operationBased/fragments_with_defer_and_include_directives/fragment/CharacterDetails2Impl.kt.expected @@ -25,7 +25,7 @@ public class CharacterDetails2Impl() : Fragment { override fun serializeVariables( writer: JsonWriter, customScalarAdapters: CustomScalarAdapters, - withBooleanDefaultValues: Boolean, + withDefaultValues: Boolean, ) { // This fragment doesn't have any variable } diff --git a/libraries/apollo-compiler/src/test/graphql/com/example/fragments_with_defer_and_include_directives/kotlin/operationBased/fragments_with_defer_and_include_directives/fragment/CharacterDetails3Impl.kt.expected b/libraries/apollo-compiler/src/test/graphql/com/example/fragments_with_defer_and_include_directives/kotlin/operationBased/fragments_with_defer_and_include_directives/fragment/CharacterDetails3Impl.kt.expected index 52d5463058c..333fbfde8e8 100644 --- a/libraries/apollo-compiler/src/test/graphql/com/example/fragments_with_defer_and_include_directives/kotlin/operationBased/fragments_with_defer_and_include_directives/fragment/CharacterDetails3Impl.kt.expected +++ b/libraries/apollo-compiler/src/test/graphql/com/example/fragments_with_defer_and_include_directives/kotlin/operationBased/fragments_with_defer_and_include_directives/fragment/CharacterDetails3Impl.kt.expected @@ -25,7 +25,7 @@ public class CharacterDetails3Impl() : Fragment { override fun serializeVariables( writer: JsonWriter, customScalarAdapters: CustomScalarAdapters, - withBooleanDefaultValues: Boolean, + withDefaultValues: Boolean, ) { // This fragment doesn't have any variable } diff --git a/libraries/apollo-compiler/src/test/graphql/com/example/fragments_with_defer_and_include_directives/kotlin/operationBased/fragments_with_defer_and_include_directives/fragment/CharacterDetailsImpl.kt.expected b/libraries/apollo-compiler/src/test/graphql/com/example/fragments_with_defer_and_include_directives/kotlin/operationBased/fragments_with_defer_and_include_directives/fragment/CharacterDetailsImpl.kt.expected index fe0dc865852..bc1e8d406c4 100644 --- a/libraries/apollo-compiler/src/test/graphql/com/example/fragments_with_defer_and_include_directives/kotlin/operationBased/fragments_with_defer_and_include_directives/fragment/CharacterDetailsImpl.kt.expected +++ b/libraries/apollo-compiler/src/test/graphql/com/example/fragments_with_defer_and_include_directives/kotlin/operationBased/fragments_with_defer_and_include_directives/fragment/CharacterDetailsImpl.kt.expected @@ -25,7 +25,7 @@ public class CharacterDetailsImpl() : Fragment { override fun serializeVariables( writer: JsonWriter, customScalarAdapters: CustomScalarAdapters, - withBooleanDefaultValues: Boolean, + withDefaultValues: Boolean, ) { // This fragment doesn't have any variable } diff --git a/libraries/apollo-compiler/src/test/graphql/com/example/fragments_with_defer_and_include_directives/kotlin/operationBased/fragments_with_defer_and_include_directives/fragment/DroidDetailsImpl.kt.expected b/libraries/apollo-compiler/src/test/graphql/com/example/fragments_with_defer_and_include_directives/kotlin/operationBased/fragments_with_defer_and_include_directives/fragment/DroidDetailsImpl.kt.expected index 62d90d8a914..12bd141c005 100644 --- a/libraries/apollo-compiler/src/test/graphql/com/example/fragments_with_defer_and_include_directives/kotlin/operationBased/fragments_with_defer_and_include_directives/fragment/DroidDetailsImpl.kt.expected +++ b/libraries/apollo-compiler/src/test/graphql/com/example/fragments_with_defer_and_include_directives/kotlin/operationBased/fragments_with_defer_and_include_directives/fragment/DroidDetailsImpl.kt.expected @@ -25,7 +25,7 @@ public class DroidDetailsImpl() : Fragment { override fun serializeVariables( writer: JsonWriter, customScalarAdapters: CustomScalarAdapters, - withBooleanDefaultValues: Boolean, + withDefaultValues: Boolean, ) { // This fragment doesn't have any variable } diff --git a/libraries/apollo-compiler/src/test/graphql/com/example/fragments_with_defer_and_include_directives/kotlin/operationBased/fragments_with_defer_and_include_directives/selections/InlineMultipleWithDeferAndIncludeSelections.kt.expected b/libraries/apollo-compiler/src/test/graphql/com/example/fragments_with_defer_and_include_directives/kotlin/operationBased/fragments_with_defer_and_include_directives/selections/InlineMultipleWithDeferAndIncludeSelections.kt.expected index c258c15c84d..17225f65551 100644 --- a/libraries/apollo-compiler/src/test/graphql/com/example/fragments_with_defer_and_include_directives/kotlin/operationBased/fragments_with_defer_and_include_directives/selections/InlineMultipleWithDeferAndIncludeSelections.kt.expected +++ b/libraries/apollo-compiler/src/test/graphql/com/example/fragments_with_defer_and_include_directives/kotlin/operationBased/fragments_with_defer_and_include_directives/selections/InlineMultipleWithDeferAndIncludeSelections.kt.expected @@ -5,6 +5,7 @@ // package com.example.fragments_with_defer_and_include_directives.selections +import com.apollographql.apollo3.api.CompiledArgument import com.apollographql.apollo3.api.CompiledCondition import com.apollographql.apollo3.api.CompiledField import com.apollographql.apollo3.api.CompiledFragment @@ -103,7 +104,11 @@ public object InlineMultipleWithDeferAndIncludeSelections { CompiledField.Builder( name = "hero", type = Character.type - ).selections(__hero) + ).arguments(listOf( + CompiledArgument.Builder("episode").build(), + CompiledArgument.Builder("listOfListOfStringArgs").build() + )) + .selections(__hero) .build() ) } diff --git a/libraries/apollo-compiler/src/test/graphql/com/example/fragments_with_defer_and_include_directives/kotlin/operationBased/fragments_with_defer_and_include_directives/selections/InlineMultipleWithDeferSelections.kt.expected b/libraries/apollo-compiler/src/test/graphql/com/example/fragments_with_defer_and_include_directives/kotlin/operationBased/fragments_with_defer_and_include_directives/selections/InlineMultipleWithDeferSelections.kt.expected index b6435c00755..0f85764e02b 100644 --- a/libraries/apollo-compiler/src/test/graphql/com/example/fragments_with_defer_and_include_directives/kotlin/operationBased/fragments_with_defer_and_include_directives/selections/InlineMultipleWithDeferSelections.kt.expected +++ b/libraries/apollo-compiler/src/test/graphql/com/example/fragments_with_defer_and_include_directives/kotlin/operationBased/fragments_with_defer_and_include_directives/selections/InlineMultipleWithDeferSelections.kt.expected @@ -5,6 +5,7 @@ // package com.example.fragments_with_defer_and_include_directives.selections +import com.apollographql.apollo3.api.CompiledArgument import com.apollographql.apollo3.api.CompiledField import com.apollographql.apollo3.api.CompiledFragment import com.apollographql.apollo3.api.CompiledSelection @@ -50,7 +51,11 @@ public object InlineMultipleWithDeferSelections { CompiledField.Builder( name = "hero", type = Character.type - ).selections(__hero) + ).arguments(listOf( + CompiledArgument.Builder("episode").build(), + CompiledArgument.Builder("listOfListOfStringArgs").build() + )) + .selections(__hero) .build() ) } diff --git a/libraries/apollo-compiler/src/test/graphql/com/example/fragments_with_defer_and_include_directives/kotlin/operationBased/fragments_with_defer_and_include_directives/selections/InlineMultipleWithDeferWithIfSelections.kt.expected b/libraries/apollo-compiler/src/test/graphql/com/example/fragments_with_defer_and_include_directives/kotlin/operationBased/fragments_with_defer_and_include_directives/selections/InlineMultipleWithDeferWithIfSelections.kt.expected index 01caef0a475..cc34906e4ce 100644 --- a/libraries/apollo-compiler/src/test/graphql/com/example/fragments_with_defer_and_include_directives/kotlin/operationBased/fragments_with_defer_and_include_directives/selections/InlineMultipleWithDeferWithIfSelections.kt.expected +++ b/libraries/apollo-compiler/src/test/graphql/com/example/fragments_with_defer_and_include_directives/kotlin/operationBased/fragments_with_defer_and_include_directives/selections/InlineMultipleWithDeferWithIfSelections.kt.expected @@ -5,6 +5,7 @@ // package com.example.fragments_with_defer_and_include_directives.selections +import com.apollographql.apollo3.api.CompiledArgument import com.apollographql.apollo3.api.CompiledField import com.apollographql.apollo3.api.CompiledFragment import com.apollographql.apollo3.api.CompiledSelection @@ -62,7 +63,11 @@ public object InlineMultipleWithDeferWithIfSelections { CompiledField.Builder( name = "hero", type = Character.type - ).selections(__hero) + ).arguments(listOf( + CompiledArgument.Builder("episode").build(), + CompiledArgument.Builder("listOfListOfStringArgs").build() + )) + .selections(__hero) .build() ) } diff --git a/libraries/apollo-compiler/src/test/graphql/com/example/fragments_with_defer_and_include_directives/kotlin/operationBased/fragments_with_defer_and_include_directives/selections/InlineSingleWithDeferSelections.kt.expected b/libraries/apollo-compiler/src/test/graphql/com/example/fragments_with_defer_and_include_directives/kotlin/operationBased/fragments_with_defer_and_include_directives/selections/InlineSingleWithDeferSelections.kt.expected index e4acaa9c477..1aa01359d7e 100644 --- a/libraries/apollo-compiler/src/test/graphql/com/example/fragments_with_defer_and_include_directives/kotlin/operationBased/fragments_with_defer_and_include_directives/selections/InlineSingleWithDeferSelections.kt.expected +++ b/libraries/apollo-compiler/src/test/graphql/com/example/fragments_with_defer_and_include_directives/kotlin/operationBased/fragments_with_defer_and_include_directives/selections/InlineSingleWithDeferSelections.kt.expected @@ -5,6 +5,7 @@ // package com.example.fragments_with_defer_and_include_directives.selections +import com.apollographql.apollo3.api.CompiledArgument import com.apollographql.apollo3.api.CompiledField import com.apollographql.apollo3.api.CompiledFragment import com.apollographql.apollo3.api.CompiledSelection @@ -37,7 +38,11 @@ public object InlineSingleWithDeferSelections { CompiledField.Builder( name = "hero", type = Character.type - ).selections(__hero) + ).arguments(listOf( + CompiledArgument.Builder("episode").build(), + CompiledArgument.Builder("listOfListOfStringArgs").build() + )) + .selections(__hero) .build() ) } diff --git a/libraries/apollo-compiler/src/test/graphql/com/example/fragments_with_defer_and_include_directives/kotlin/operationBased/fragments_with_defer_and_include_directives/selections/SpreadMultipleWithDeferAndIncludeSelections.kt.expected b/libraries/apollo-compiler/src/test/graphql/com/example/fragments_with_defer_and_include_directives/kotlin/operationBased/fragments_with_defer_and_include_directives/selections/SpreadMultipleWithDeferAndIncludeSelections.kt.expected index 801114a270f..abbd990aba6 100644 --- a/libraries/apollo-compiler/src/test/graphql/com/example/fragments_with_defer_and_include_directives/kotlin/operationBased/fragments_with_defer_and_include_directives/selections/SpreadMultipleWithDeferAndIncludeSelections.kt.expected +++ b/libraries/apollo-compiler/src/test/graphql/com/example/fragments_with_defer_and_include_directives/kotlin/operationBased/fragments_with_defer_and_include_directives/selections/SpreadMultipleWithDeferAndIncludeSelections.kt.expected @@ -5,6 +5,7 @@ // package com.example.fragments_with_defer_and_include_directives.selections +import com.apollographql.apollo3.api.CompiledArgument import com.apollographql.apollo3.api.CompiledCondition import com.apollographql.apollo3.api.CompiledField import com.apollographql.apollo3.api.CompiledFragment @@ -61,7 +62,11 @@ public object SpreadMultipleWithDeferAndIncludeSelections { CompiledField.Builder( name = "hero", type = Character.type - ).selections(__hero) + ).arguments(listOf( + CompiledArgument.Builder("episode").build(), + CompiledArgument.Builder("listOfListOfStringArgs").build() + )) + .selections(__hero) .build() ) } diff --git a/libraries/apollo-compiler/src/test/graphql/com/example/fragments_with_defer_and_include_directives/kotlin/operationBased/fragments_with_defer_and_include_directives/selections/SpreadMultipleWithDeferSelections.kt.expected b/libraries/apollo-compiler/src/test/graphql/com/example/fragments_with_defer_and_include_directives/kotlin/operationBased/fragments_with_defer_and_include_directives/selections/SpreadMultipleWithDeferSelections.kt.expected index 5ca2a70c54b..e68d9366c3d 100644 --- a/libraries/apollo-compiler/src/test/graphql/com/example/fragments_with_defer_and_include_directives/kotlin/operationBased/fragments_with_defer_and_include_directives/selections/SpreadMultipleWithDeferSelections.kt.expected +++ b/libraries/apollo-compiler/src/test/graphql/com/example/fragments_with_defer_and_include_directives/kotlin/operationBased/fragments_with_defer_and_include_directives/selections/SpreadMultipleWithDeferSelections.kt.expected @@ -5,6 +5,7 @@ // package com.example.fragments_with_defer_and_include_directives.selections +import com.apollographql.apollo3.api.CompiledArgument import com.apollographql.apollo3.api.CompiledField import com.apollographql.apollo3.api.CompiledFragment import com.apollographql.apollo3.api.CompiledSelection @@ -36,7 +37,11 @@ public object SpreadMultipleWithDeferSelections { CompiledField.Builder( name = "hero", type = Character.type - ).selections(__hero) + ).arguments(listOf( + CompiledArgument.Builder("episode").build(), + CompiledArgument.Builder("listOfListOfStringArgs").build() + )) + .selections(__hero) .build() ) } diff --git a/libraries/apollo-compiler/src/test/graphql/com/example/fragments_with_defer_and_include_directives/kotlin/operationBased/fragments_with_defer_and_include_directives/selections/SpreadMultipleWithDeferWithIfSelections.kt.expected b/libraries/apollo-compiler/src/test/graphql/com/example/fragments_with_defer_and_include_directives/kotlin/operationBased/fragments_with_defer_and_include_directives/selections/SpreadMultipleWithDeferWithIfSelections.kt.expected index a80f02cd02c..fbfdb8cc895 100644 --- a/libraries/apollo-compiler/src/test/graphql/com/example/fragments_with_defer_and_include_directives/kotlin/operationBased/fragments_with_defer_and_include_directives/selections/SpreadMultipleWithDeferWithIfSelections.kt.expected +++ b/libraries/apollo-compiler/src/test/graphql/com/example/fragments_with_defer_and_include_directives/kotlin/operationBased/fragments_with_defer_and_include_directives/selections/SpreadMultipleWithDeferWithIfSelections.kt.expected @@ -5,6 +5,7 @@ // package com.example.fragments_with_defer_and_include_directives.selections +import com.apollographql.apollo3.api.CompiledArgument import com.apollographql.apollo3.api.CompiledField import com.apollographql.apollo3.api.CompiledFragment import com.apollographql.apollo3.api.CompiledSelection @@ -43,7 +44,11 @@ public object SpreadMultipleWithDeferWithIfSelections { CompiledField.Builder( name = "hero", type = Character.type - ).selections(__hero) + ).arguments(listOf( + CompiledArgument.Builder("episode").build(), + CompiledArgument.Builder("listOfListOfStringArgs").build() + )) + .selections(__hero) .build() ) } diff --git a/libraries/apollo-compiler/src/test/graphql/com/example/fragments_with_defer_and_include_directives/kotlin/operationBased/fragments_with_defer_and_include_directives/selections/SpreadSingleWithDeferSelections.kt.expected b/libraries/apollo-compiler/src/test/graphql/com/example/fragments_with_defer_and_include_directives/kotlin/operationBased/fragments_with_defer_and_include_directives/selections/SpreadSingleWithDeferSelections.kt.expected index 63aaeea0ac9..c47bd07da3e 100644 --- a/libraries/apollo-compiler/src/test/graphql/com/example/fragments_with_defer_and_include_directives/kotlin/operationBased/fragments_with_defer_and_include_directives/selections/SpreadSingleWithDeferSelections.kt.expected +++ b/libraries/apollo-compiler/src/test/graphql/com/example/fragments_with_defer_and_include_directives/kotlin/operationBased/fragments_with_defer_and_include_directives/selections/SpreadSingleWithDeferSelections.kt.expected @@ -5,6 +5,7 @@ // package com.example.fragments_with_defer_and_include_directives.selections +import com.apollographql.apollo3.api.CompiledArgument import com.apollographql.apollo3.api.CompiledField import com.apollographql.apollo3.api.CompiledFragment import com.apollographql.apollo3.api.CompiledSelection @@ -31,7 +32,11 @@ public object SpreadSingleWithDeferSelections { CompiledField.Builder( name = "hero", type = Character.type - ).selections(__hero) + ).arguments(listOf( + CompiledArgument.Builder("episode").build(), + CompiledArgument.Builder("listOfListOfStringArgs").build() + )) + .selections(__hero) .build() ) } diff --git a/libraries/apollo-compiler/src/test/graphql/com/example/fragments_with_type_condition/java/operationBased/fragments_with_type_condition/TestQuery.java.expected b/libraries/apollo-compiler/src/test/graphql/com/example/fragments_with_type_condition/java/operationBased/fragments_with_type_condition/TestQuery.java.expected index 9e3560cd12c..425df327a78 100644 --- a/libraries/apollo-compiler/src/test/graphql/com/example/fragments_with_type_condition/java/operationBased/fragments_with_type_condition/TestQuery.java.expected +++ b/libraries/apollo-compiler/src/test/graphql/com/example/fragments_with_type_condition/java/operationBased/fragments_with_type_condition/TestQuery.java.expected @@ -115,7 +115,7 @@ public class TestQuery implements Query { @Override public void serializeVariables(JsonWriter writer, CustomScalarAdapters customScalarAdapters, - boolean withBooleanDefaultValues) throws IOException { + boolean withDefaultValues) throws IOException { // This operation doesn't have any variable } diff --git a/libraries/apollo-compiler/src/test/graphql/com/example/fragments_with_type_condition/java/operationBased/fragments_with_type_condition/fragment/DroidDetailsImpl.java.expected b/libraries/apollo-compiler/src/test/graphql/com/example/fragments_with_type_condition/java/operationBased/fragments_with_type_condition/fragment/DroidDetailsImpl.java.expected index 760705776f3..ede98cba7e3 100644 --- a/libraries/apollo-compiler/src/test/graphql/com/example/fragments_with_type_condition/java/operationBased/fragments_with_type_condition/fragment/DroidDetailsImpl.java.expected +++ b/libraries/apollo-compiler/src/test/graphql/com/example/fragments_with_type_condition/java/operationBased/fragments_with_type_condition/fragment/DroidDetailsImpl.java.expected @@ -61,7 +61,7 @@ public class DroidDetailsImpl implements Fragment { @Override public void serializeVariables(JsonWriter writer, CustomScalarAdapters customScalarAdapters, - boolean withBooleanDefaultValues) throws IOException { + boolean withDefaultValues) throws IOException { // This fragment doesn't have any variable } diff --git a/libraries/apollo-compiler/src/test/graphql/com/example/fragments_with_type_condition/java/operationBased/fragments_with_type_condition/fragment/HumanDetailsImpl.java.expected b/libraries/apollo-compiler/src/test/graphql/com/example/fragments_with_type_condition/java/operationBased/fragments_with_type_condition/fragment/HumanDetailsImpl.java.expected index 9326dfcd197..e106e33fdf7 100644 --- a/libraries/apollo-compiler/src/test/graphql/com/example/fragments_with_type_condition/java/operationBased/fragments_with_type_condition/fragment/HumanDetailsImpl.java.expected +++ b/libraries/apollo-compiler/src/test/graphql/com/example/fragments_with_type_condition/java/operationBased/fragments_with_type_condition/fragment/HumanDetailsImpl.java.expected @@ -61,7 +61,7 @@ public class HumanDetailsImpl implements Fragment { @Override public void serializeVariables(JsonWriter writer, CustomScalarAdapters customScalarAdapters, - boolean withBooleanDefaultValues) throws IOException { + boolean withDefaultValues) throws IOException { // This fragment doesn't have any variable } diff --git a/libraries/apollo-compiler/src/test/graphql/com/example/fragments_with_type_condition/java/operationBased/fragments_with_type_condition/fragment/selections/HumanDetailsSelections.java.expected b/libraries/apollo-compiler/src/test/graphql/com/example/fragments_with_type_condition/java/operationBased/fragments_with_type_condition/fragment/selections/HumanDetailsSelections.java.expected index abca27ae67c..8c3fd17afa8 100644 --- a/libraries/apollo-compiler/src/test/graphql/com/example/fragments_with_type_condition/java/operationBased/fragments_with_type_condition/fragment/selections/HumanDetailsSelections.java.expected +++ b/libraries/apollo-compiler/src/test/graphql/com/example/fragments_with_type_condition/java/operationBased/fragments_with_type_condition/fragment/selections/HumanDetailsSelections.java.expected @@ -5,6 +5,7 @@ // package com.example.fragments_with_type_condition.fragment.selections; +import com.apollographql.apollo3.api.CompiledArgument; import com.apollographql.apollo3.api.CompiledField; import com.apollographql.apollo3.api.CompiledNotNullType; import com.apollographql.apollo3.api.CompiledSelection; @@ -16,6 +17,6 @@ import java.util.List; public class HumanDetailsSelections { public static List __root = Arrays.asList( new CompiledField.Builder("name", new CompiledNotNullType(GraphQLString.type)).build(), - new CompiledField.Builder("height", GraphQLFloat.type).build() + new CompiledField.Builder("height", GraphQLFloat.type).arguments(Arrays.asList(new CompiledArgument.Builder("unit").value("METER").build())).build() ); } diff --git a/libraries/apollo-compiler/src/test/graphql/com/example/fragments_with_type_condition/java/operationBased/fragments_with_type_condition/selections/TestQuerySelections.java.expected b/libraries/apollo-compiler/src/test/graphql/com/example/fragments_with_type_condition/java/operationBased/fragments_with_type_condition/selections/TestQuerySelections.java.expected index e062f0d3bb0..25ae5c54382 100644 --- a/libraries/apollo-compiler/src/test/graphql/com/example/fragments_with_type_condition/java/operationBased/fragments_with_type_condition/selections/TestQuerySelections.java.expected +++ b/libraries/apollo-compiler/src/test/graphql/com/example/fragments_with_type_condition/java/operationBased/fragments_with_type_condition/selections/TestQuerySelections.java.expected @@ -5,6 +5,7 @@ // package com.example.fragments_with_type_condition.selections; +import com.apollographql.apollo3.api.CompiledArgument; import com.apollographql.apollo3.api.CompiledField; import com.apollographql.apollo3.api.CompiledFragment; import com.apollographql.apollo3.api.CompiledNotNullType; @@ -30,7 +31,7 @@ public class TestQuerySelections { ); public static List __root = Arrays.asList( - new CompiledField.Builder("hero", Character.type).alias("r2").selections(__hero).build(), - new CompiledField.Builder("hero", Character.type).alias("luke").selections(__hero1).build() + new CompiledField.Builder("hero", Character.type).alias("r2").arguments(Arrays.asList(new CompiledArgument.Builder("episode").build(), new CompiledArgument.Builder("listOfListOfStringArgs").build())).selections(__hero).build(), + new CompiledField.Builder("hero", Character.type).alias("luke").arguments(Arrays.asList(new CompiledArgument.Builder("episode").build(), new CompiledArgument.Builder("listOfListOfStringArgs").build())).selections(__hero1).build() ); } diff --git a/libraries/apollo-compiler/src/test/graphql/com/example/fragments_with_type_condition/kotlin/operationBased/fragments_with_type_condition/TestQuery.kt.expected b/libraries/apollo-compiler/src/test/graphql/com/example/fragments_with_type_condition/kotlin/operationBased/fragments_with_type_condition/TestQuery.kt.expected index 4e481efb03c..07cb3edf844 100644 --- a/libraries/apollo-compiler/src/test/graphql/com/example/fragments_with_type_condition/kotlin/operationBased/fragments_with_type_condition/TestQuery.kt.expected +++ b/libraries/apollo-compiler/src/test/graphql/com/example/fragments_with_type_condition/kotlin/operationBased/fragments_with_type_condition/TestQuery.kt.expected @@ -36,7 +36,7 @@ public class TestQuery() : Query { override fun serializeVariables( writer: JsonWriter, customScalarAdapters: CustomScalarAdapters, - withBooleanDefaultValues: Boolean, + withDefaultValues: Boolean, ) { // This operation doesn't have any variable } diff --git a/libraries/apollo-compiler/src/test/graphql/com/example/fragments_with_type_condition/kotlin/operationBased/fragments_with_type_condition/fragment/DroidDetailsImpl.kt.expected b/libraries/apollo-compiler/src/test/graphql/com/example/fragments_with_type_condition/kotlin/operationBased/fragments_with_type_condition/fragment/DroidDetailsImpl.kt.expected index 00aee1bb353..d159e356cf4 100644 --- a/libraries/apollo-compiler/src/test/graphql/com/example/fragments_with_type_condition/kotlin/operationBased/fragments_with_type_condition/fragment/DroidDetailsImpl.kt.expected +++ b/libraries/apollo-compiler/src/test/graphql/com/example/fragments_with_type_condition/kotlin/operationBased/fragments_with_type_condition/fragment/DroidDetailsImpl.kt.expected @@ -25,7 +25,7 @@ public class DroidDetailsImpl() : Fragment { override fun serializeVariables( writer: JsonWriter, customScalarAdapters: CustomScalarAdapters, - withBooleanDefaultValues: Boolean, + withDefaultValues: Boolean, ) { // This fragment doesn't have any variable } diff --git a/libraries/apollo-compiler/src/test/graphql/com/example/fragments_with_type_condition/kotlin/operationBased/fragments_with_type_condition/fragment/HumanDetailsImpl.kt.expected b/libraries/apollo-compiler/src/test/graphql/com/example/fragments_with_type_condition/kotlin/operationBased/fragments_with_type_condition/fragment/HumanDetailsImpl.kt.expected index 07f9f01a90f..99bd9e792a2 100644 --- a/libraries/apollo-compiler/src/test/graphql/com/example/fragments_with_type_condition/kotlin/operationBased/fragments_with_type_condition/fragment/HumanDetailsImpl.kt.expected +++ b/libraries/apollo-compiler/src/test/graphql/com/example/fragments_with_type_condition/kotlin/operationBased/fragments_with_type_condition/fragment/HumanDetailsImpl.kt.expected @@ -25,7 +25,7 @@ public class HumanDetailsImpl() : Fragment { override fun serializeVariables( writer: JsonWriter, customScalarAdapters: CustomScalarAdapters, - withBooleanDefaultValues: Boolean, + withDefaultValues: Boolean, ) { // This fragment doesn't have any variable } diff --git a/libraries/apollo-compiler/src/test/graphql/com/example/fragments_with_type_condition/kotlin/operationBased/fragments_with_type_condition/fragment/selections/HumanDetailsSelections.kt.expected b/libraries/apollo-compiler/src/test/graphql/com/example/fragments_with_type_condition/kotlin/operationBased/fragments_with_type_condition/fragment/selections/HumanDetailsSelections.kt.expected index 464fd57ae8b..d93dd0c5bb6 100644 --- a/libraries/apollo-compiler/src/test/graphql/com/example/fragments_with_type_condition/kotlin/operationBased/fragments_with_type_condition/fragment/selections/HumanDetailsSelections.kt.expected +++ b/libraries/apollo-compiler/src/test/graphql/com/example/fragments_with_type_condition/kotlin/operationBased/fragments_with_type_condition/fragment/selections/HumanDetailsSelections.kt.expected @@ -5,6 +5,7 @@ // package com.example.fragments_with_type_condition.fragment.selections +import com.apollographql.apollo3.api.CompiledArgument import com.apollographql.apollo3.api.CompiledField import com.apollographql.apollo3.api.CompiledSelection import com.apollographql.apollo3.api.notNull @@ -21,6 +22,9 @@ public object HumanDetailsSelections { CompiledField.Builder( name = "height", type = GraphQLFloat.type - ).build() + ).arguments(listOf( + CompiledArgument.Builder("unit").value("METER").build() + )) + .build() ) } diff --git a/libraries/apollo-compiler/src/test/graphql/com/example/fragments_with_type_condition/kotlin/operationBased/fragments_with_type_condition/selections/TestQuerySelections.kt.expected b/libraries/apollo-compiler/src/test/graphql/com/example/fragments_with_type_condition/kotlin/operationBased/fragments_with_type_condition/selections/TestQuerySelections.kt.expected index e53581d5525..b3ecced87a5 100644 --- a/libraries/apollo-compiler/src/test/graphql/com/example/fragments_with_type_condition/kotlin/operationBased/fragments_with_type_condition/selections/TestQuerySelections.kt.expected +++ b/libraries/apollo-compiler/src/test/graphql/com/example/fragments_with_type_condition/kotlin/operationBased/fragments_with_type_condition/selections/TestQuerySelections.kt.expected @@ -5,6 +5,7 @@ // package com.example.fragments_with_type_condition.selections +import com.apollographql.apollo3.api.CompiledArgument import com.apollographql.apollo3.api.CompiledField import com.apollographql.apollo3.api.CompiledFragment import com.apollographql.apollo3.api.CompiledSelection @@ -55,12 +56,20 @@ public object TestQuerySelections { name = "hero", type = Character.type ).alias("r2") + .arguments(listOf( + CompiledArgument.Builder("episode").build(), + CompiledArgument.Builder("listOfListOfStringArgs").build() + )) .selections(__hero) .build(), CompiledField.Builder( name = "hero", type = Character.type ).alias("luke") + .arguments(listOf( + CompiledArgument.Builder("episode").build(), + CompiledArgument.Builder("listOfListOfStringArgs").build() + )) .selections(__hero1) .build() ) diff --git a/libraries/apollo-compiler/src/test/graphql/com/example/fragments_with_type_condition/kotlin/responseBased/fragments_with_type_condition/TestQuery.kt.expected b/libraries/apollo-compiler/src/test/graphql/com/example/fragments_with_type_condition/kotlin/responseBased/fragments_with_type_condition/TestQuery.kt.expected index 6c68814416a..36583f3c8c5 100644 --- a/libraries/apollo-compiler/src/test/graphql/com/example/fragments_with_type_condition/kotlin/responseBased/fragments_with_type_condition/TestQuery.kt.expected +++ b/libraries/apollo-compiler/src/test/graphql/com/example/fragments_with_type_condition/kotlin/responseBased/fragments_with_type_condition/TestQuery.kt.expected @@ -38,7 +38,7 @@ public class TestQuery() : Query { override fun serializeVariables( writer: JsonWriter, customScalarAdapters: CustomScalarAdapters, - withBooleanDefaultValues: Boolean, + withDefaultValues: Boolean, ) { // This operation doesn't have any variable } diff --git a/libraries/apollo-compiler/src/test/graphql/com/example/fragments_with_type_condition/kotlin/responseBased/fragments_with_type_condition/fragment/DroidDetailsImpl.kt.expected b/libraries/apollo-compiler/src/test/graphql/com/example/fragments_with_type_condition/kotlin/responseBased/fragments_with_type_condition/fragment/DroidDetailsImpl.kt.expected index f817621988c..4a75656d314 100644 --- a/libraries/apollo-compiler/src/test/graphql/com/example/fragments_with_type_condition/kotlin/responseBased/fragments_with_type_condition/fragment/DroidDetailsImpl.kt.expected +++ b/libraries/apollo-compiler/src/test/graphql/com/example/fragments_with_type_condition/kotlin/responseBased/fragments_with_type_condition/fragment/DroidDetailsImpl.kt.expected @@ -26,7 +26,7 @@ public class DroidDetailsImpl() : Fragment { override fun serializeVariables( writer: JsonWriter, customScalarAdapters: CustomScalarAdapters, - withBooleanDefaultValues: Boolean, + withDefaultValues: Boolean, ) { // This fragment doesn't have any variable } diff --git a/libraries/apollo-compiler/src/test/graphql/com/example/fragments_with_type_condition/kotlin/responseBased/fragments_with_type_condition/fragment/HumanDetailsImpl.kt.expected b/libraries/apollo-compiler/src/test/graphql/com/example/fragments_with_type_condition/kotlin/responseBased/fragments_with_type_condition/fragment/HumanDetailsImpl.kt.expected index dcf331189cc..fffe35219a7 100644 --- a/libraries/apollo-compiler/src/test/graphql/com/example/fragments_with_type_condition/kotlin/responseBased/fragments_with_type_condition/fragment/HumanDetailsImpl.kt.expected +++ b/libraries/apollo-compiler/src/test/graphql/com/example/fragments_with_type_condition/kotlin/responseBased/fragments_with_type_condition/fragment/HumanDetailsImpl.kt.expected @@ -27,7 +27,7 @@ public class HumanDetailsImpl() : Fragment { override fun serializeVariables( writer: JsonWriter, customScalarAdapters: CustomScalarAdapters, - withBooleanDefaultValues: Boolean, + withDefaultValues: Boolean, ) { // This fragment doesn't have any variable } diff --git a/libraries/apollo-compiler/src/test/graphql/com/example/fragments_with_type_condition/kotlin/responseBased/fragments_with_type_condition/fragment/selections/HumanDetailsSelections.kt.expected b/libraries/apollo-compiler/src/test/graphql/com/example/fragments_with_type_condition/kotlin/responseBased/fragments_with_type_condition/fragment/selections/HumanDetailsSelections.kt.expected index 464fd57ae8b..d93dd0c5bb6 100644 --- a/libraries/apollo-compiler/src/test/graphql/com/example/fragments_with_type_condition/kotlin/responseBased/fragments_with_type_condition/fragment/selections/HumanDetailsSelections.kt.expected +++ b/libraries/apollo-compiler/src/test/graphql/com/example/fragments_with_type_condition/kotlin/responseBased/fragments_with_type_condition/fragment/selections/HumanDetailsSelections.kt.expected @@ -5,6 +5,7 @@ // package com.example.fragments_with_type_condition.fragment.selections +import com.apollographql.apollo3.api.CompiledArgument import com.apollographql.apollo3.api.CompiledField import com.apollographql.apollo3.api.CompiledSelection import com.apollographql.apollo3.api.notNull @@ -21,6 +22,9 @@ public object HumanDetailsSelections { CompiledField.Builder( name = "height", type = GraphQLFloat.type - ).build() + ).arguments(listOf( + CompiledArgument.Builder("unit").value("METER").build() + )) + .build() ) } diff --git a/libraries/apollo-compiler/src/test/graphql/com/example/fragments_with_type_condition/kotlin/responseBased/fragments_with_type_condition/selections/TestQuerySelections.kt.expected b/libraries/apollo-compiler/src/test/graphql/com/example/fragments_with_type_condition/kotlin/responseBased/fragments_with_type_condition/selections/TestQuerySelections.kt.expected index e53581d5525..b3ecced87a5 100644 --- a/libraries/apollo-compiler/src/test/graphql/com/example/fragments_with_type_condition/kotlin/responseBased/fragments_with_type_condition/selections/TestQuerySelections.kt.expected +++ b/libraries/apollo-compiler/src/test/graphql/com/example/fragments_with_type_condition/kotlin/responseBased/fragments_with_type_condition/selections/TestQuerySelections.kt.expected @@ -5,6 +5,7 @@ // package com.example.fragments_with_type_condition.selections +import com.apollographql.apollo3.api.CompiledArgument import com.apollographql.apollo3.api.CompiledField import com.apollographql.apollo3.api.CompiledFragment import com.apollographql.apollo3.api.CompiledSelection @@ -55,12 +56,20 @@ public object TestQuerySelections { name = "hero", type = Character.type ).alias("r2") + .arguments(listOf( + CompiledArgument.Builder("episode").build(), + CompiledArgument.Builder("listOfListOfStringArgs").build() + )) .selections(__hero) .build(), CompiledField.Builder( name = "hero", type = Character.type ).alias("luke") + .arguments(listOf( + CompiledArgument.Builder("episode").build(), + CompiledArgument.Builder("listOfListOfStringArgs").build() + )) .selections(__hero1) .build() ) diff --git a/libraries/apollo-compiler/src/test/graphql/com/example/hero_details/java/operationBased/hero_details/HeroDetails.java.expected b/libraries/apollo-compiler/src/test/graphql/com/example/hero_details/java/operationBased/hero_details/HeroDetails.java.expected index 47257526934..28e3dc81e0b 100644 --- a/libraries/apollo-compiler/src/test/graphql/com/example/hero_details/java/operationBased/hero_details/HeroDetails.java.expected +++ b/libraries/apollo-compiler/src/test/graphql/com/example/hero_details/java/operationBased/hero_details/HeroDetails.java.expected @@ -108,7 +108,7 @@ public class HeroDetails implements Query { @Override public void serializeVariables(JsonWriter writer, CustomScalarAdapters customScalarAdapters, - boolean withBooleanDefaultValues) throws IOException { + boolean withDefaultValues) throws IOException { // This operation doesn't have any variable } diff --git a/libraries/apollo-compiler/src/test/graphql/com/example/hero_details/java/operationBased/hero_details/selections/HeroDetailsSelections.java.expected b/libraries/apollo-compiler/src/test/graphql/com/example/hero_details/java/operationBased/hero_details/selections/HeroDetailsSelections.java.expected index c5606a1e432..719e3609a42 100644 --- a/libraries/apollo-compiler/src/test/graphql/com/example/hero_details/java/operationBased/hero_details/selections/HeroDetailsSelections.java.expected +++ b/libraries/apollo-compiler/src/test/graphql/com/example/hero_details/java/operationBased/hero_details/selections/HeroDetailsSelections.java.expected @@ -5,6 +5,7 @@ // package com.example.hero_details.selections; +import com.apollographql.apollo3.api.CompiledArgument; import com.apollographql.apollo3.api.CompiledField; import com.apollographql.apollo3.api.CompiledListType; import com.apollographql.apollo3.api.CompiledNotNullType; @@ -35,10 +36,10 @@ public class HeroDetailsSelections { private static List __hero = Arrays.asList( new CompiledField.Builder("type", new CompiledNotNullType(Hero_type.type)).build(), new CompiledField.Builder("name", new CompiledNotNullType(GraphQLString.type)).build(), - new CompiledField.Builder("friendsConnection", new CompiledNotNullType(FriendsConnection.type)).selections(__friendsConnection).build() + new CompiledField.Builder("friendsConnection", new CompiledNotNullType(FriendsConnection.type)).arguments(Arrays.asList(new CompiledArgument.Builder("after").build(), new CompiledArgument.Builder("first").build())).selections(__friendsConnection).build() ); public static List __root = Arrays.asList( - new CompiledField.Builder("hero", Character.type).selections(__hero).build() + new CompiledField.Builder("hero", Character.type).arguments(Arrays.asList(new CompiledArgument.Builder("episode").build(), new CompiledArgument.Builder("listOfListOfStringArgs").build())).selections(__hero).build() ); } diff --git a/libraries/apollo-compiler/src/test/graphql/com/example/hero_details/kotlin/responseBased/hero_details/HeroDetails.kt.expected b/libraries/apollo-compiler/src/test/graphql/com/example/hero_details/kotlin/responseBased/hero_details/HeroDetails.kt.expected index fcd5a35f887..1b105ee7a54 100644 --- a/libraries/apollo-compiler/src/test/graphql/com/example/hero_details/kotlin/responseBased/hero_details/HeroDetails.kt.expected +++ b/libraries/apollo-compiler/src/test/graphql/com/example/hero_details/kotlin/responseBased/hero_details/HeroDetails.kt.expected @@ -36,7 +36,7 @@ public class HeroDetails() : Query { override fun serializeVariables( writer: JsonWriter, customScalarAdapters: CustomScalarAdapters, - withBooleanDefaultValues: Boolean, + withDefaultValues: Boolean, ) { // This operation doesn't have any variable } diff --git a/libraries/apollo-compiler/src/test/graphql/com/example/hero_details/kotlin/responseBased/hero_details/selections/HeroDetailsSelections.kt.expected b/libraries/apollo-compiler/src/test/graphql/com/example/hero_details/kotlin/responseBased/hero_details/selections/HeroDetailsSelections.kt.expected index a7bc9e70f0f..563aae29ba2 100644 --- a/libraries/apollo-compiler/src/test/graphql/com/example/hero_details/kotlin/responseBased/hero_details/selections/HeroDetailsSelections.kt.expected +++ b/libraries/apollo-compiler/src/test/graphql/com/example/hero_details/kotlin/responseBased/hero_details/selections/HeroDetailsSelections.kt.expected @@ -5,6 +5,7 @@ // package com.example.hero_details.selections +import com.apollographql.apollo3.api.CompiledArgument import com.apollographql.apollo3.api.CompiledField import com.apollographql.apollo3.api.CompiledSelection import com.apollographql.apollo3.api.list @@ -57,7 +58,11 @@ public object HeroDetailsSelections { CompiledField.Builder( name = "friendsConnection", type = FriendsConnection.type.notNull() - ).selections(__friendsConnection) + ).arguments(listOf( + CompiledArgument.Builder("after").build(), + CompiledArgument.Builder("first").build() + )) + .selections(__friendsConnection) .build() ) @@ -65,7 +70,11 @@ public object HeroDetailsSelections { CompiledField.Builder( name = "hero", type = Character.type - ).selections(__hero) + ).arguments(listOf( + CompiledArgument.Builder("episode").build(), + CompiledArgument.Builder("listOfListOfStringArgs").build() + )) + .selections(__hero) .build() ) } diff --git a/libraries/apollo-compiler/src/test/graphql/com/example/hero_details_semantic_naming/java/operationBased/hero_details_semantic_naming/HeroDetailsQuery.java.expected b/libraries/apollo-compiler/src/test/graphql/com/example/hero_details_semantic_naming/java/operationBased/hero_details_semantic_naming/HeroDetailsQuery.java.expected index 91154c4ff19..f37c7613892 100644 --- a/libraries/apollo-compiler/src/test/graphql/com/example/hero_details_semantic_naming/java/operationBased/hero_details_semantic_naming/HeroDetailsQuery.java.expected +++ b/libraries/apollo-compiler/src/test/graphql/com/example/hero_details_semantic_naming/java/operationBased/hero_details_semantic_naming/HeroDetailsQuery.java.expected @@ -106,7 +106,7 @@ public class HeroDetailsQuery implements Query { @Override public void serializeVariables(JsonWriter writer, CustomScalarAdapters customScalarAdapters, - boolean withBooleanDefaultValues) throws IOException { + boolean withDefaultValues) throws IOException { // This operation doesn't have any variable } diff --git a/libraries/apollo-compiler/src/test/graphql/com/example/hero_details_semantic_naming/java/operationBased/hero_details_semantic_naming/selections/HeroDetailsQuerySelections.java.expected b/libraries/apollo-compiler/src/test/graphql/com/example/hero_details_semantic_naming/java/operationBased/hero_details_semantic_naming/selections/HeroDetailsQuerySelections.java.expected index c3edefd92b8..7f050b72c05 100644 --- a/libraries/apollo-compiler/src/test/graphql/com/example/hero_details_semantic_naming/java/operationBased/hero_details_semantic_naming/selections/HeroDetailsQuerySelections.java.expected +++ b/libraries/apollo-compiler/src/test/graphql/com/example/hero_details_semantic_naming/java/operationBased/hero_details_semantic_naming/selections/HeroDetailsQuerySelections.java.expected @@ -5,6 +5,7 @@ // package com.example.hero_details_semantic_naming.selections; +import com.apollographql.apollo3.api.CompiledArgument; import com.apollographql.apollo3.api.CompiledField; import com.apollographql.apollo3.api.CompiledListType; import com.apollographql.apollo3.api.CompiledNotNullType; @@ -33,10 +34,10 @@ public class HeroDetailsQuerySelections { private static List __hero = Arrays.asList( new CompiledField.Builder("name", new CompiledNotNullType(GraphQLString.type)).build(), - new CompiledField.Builder("friendsConnection", new CompiledNotNullType(FriendsConnection.type)).selections(__friendsConnection).build() + new CompiledField.Builder("friendsConnection", new CompiledNotNullType(FriendsConnection.type)).arguments(Arrays.asList(new CompiledArgument.Builder("after").build(), new CompiledArgument.Builder("first").build())).selections(__friendsConnection).build() ); public static List __root = Arrays.asList( - new CompiledField.Builder("hero", Character.type).selections(__hero).build() + new CompiledField.Builder("hero", Character.type).arguments(Arrays.asList(new CompiledArgument.Builder("episode").build(), new CompiledArgument.Builder("listOfListOfStringArgs").build())).selections(__hero).build() ); } diff --git a/libraries/apollo-compiler/src/test/graphql/com/example/hero_details_semantic_naming/kotlin/responseBased/hero_details_semantic_naming/HeroDetailsQuery.kt.expected b/libraries/apollo-compiler/src/test/graphql/com/example/hero_details_semantic_naming/kotlin/responseBased/hero_details_semantic_naming/HeroDetailsQuery.kt.expected index c3a307185d7..f2921da4d83 100644 --- a/libraries/apollo-compiler/src/test/graphql/com/example/hero_details_semantic_naming/kotlin/responseBased/hero_details_semantic_naming/HeroDetailsQuery.kt.expected +++ b/libraries/apollo-compiler/src/test/graphql/com/example/hero_details_semantic_naming/kotlin/responseBased/hero_details_semantic_naming/HeroDetailsQuery.kt.expected @@ -35,7 +35,7 @@ public class HeroDetailsQuery() : Query { override fun serializeVariables( writer: JsonWriter, customScalarAdapters: CustomScalarAdapters, - withBooleanDefaultValues: Boolean, + withDefaultValues: Boolean, ) { // This operation doesn't have any variable } diff --git a/libraries/apollo-compiler/src/test/graphql/com/example/hero_details_semantic_naming/kotlin/responseBased/hero_details_semantic_naming/selections/HeroDetailsQuerySelections.kt.expected b/libraries/apollo-compiler/src/test/graphql/com/example/hero_details_semantic_naming/kotlin/responseBased/hero_details_semantic_naming/selections/HeroDetailsQuerySelections.kt.expected index b896aeb7436..e82d45fe79b 100644 --- a/libraries/apollo-compiler/src/test/graphql/com/example/hero_details_semantic_naming/kotlin/responseBased/hero_details_semantic_naming/selections/HeroDetailsQuerySelections.kt.expected +++ b/libraries/apollo-compiler/src/test/graphql/com/example/hero_details_semantic_naming/kotlin/responseBased/hero_details_semantic_naming/selections/HeroDetailsQuerySelections.kt.expected @@ -5,6 +5,7 @@ // package com.example.hero_details_semantic_naming.selections +import com.apollographql.apollo3.api.CompiledArgument import com.apollographql.apollo3.api.CompiledField import com.apollographql.apollo3.api.CompiledSelection import com.apollographql.apollo3.api.list @@ -52,7 +53,11 @@ public object HeroDetailsQuerySelections { CompiledField.Builder( name = "friendsConnection", type = FriendsConnection.type.notNull() - ).selections(__friendsConnection) + ).arguments(listOf( + CompiledArgument.Builder("after").build(), + CompiledArgument.Builder("first").build() + )) + .selections(__friendsConnection) .build() ) @@ -60,7 +65,11 @@ public object HeroDetailsQuerySelections { CompiledField.Builder( name = "hero", type = Character.type - ).selections(__hero) + ).arguments(listOf( + CompiledArgument.Builder("episode").build(), + CompiledArgument.Builder("listOfListOfStringArgs").build() + )) + .selections(__hero) .build() ) } diff --git a/libraries/apollo-compiler/src/test/graphql/com/example/hero_name/java/operationBased/hero_name/TestQuery.java.expected b/libraries/apollo-compiler/src/test/graphql/com/example/hero_name/java/operationBased/hero_name/TestQuery.java.expected index eb578028311..86118f63ae3 100644 --- a/libraries/apollo-compiler/src/test/graphql/com/example/hero_name/java/operationBased/hero_name/TestQuery.java.expected +++ b/libraries/apollo-compiler/src/test/graphql/com/example/hero_name/java/operationBased/hero_name/TestQuery.java.expected @@ -101,7 +101,7 @@ public class TestQuery implements Query { @Override public void serializeVariables(JsonWriter writer, CustomScalarAdapters customScalarAdapters, - boolean withBooleanDefaultValues) throws IOException { + boolean withDefaultValues) throws IOException { // This operation doesn't have any variable } diff --git a/libraries/apollo-compiler/src/test/graphql/com/example/hero_name/java/operationBased/hero_name/selections/TestQuerySelections.java.expected b/libraries/apollo-compiler/src/test/graphql/com/example/hero_name/java/operationBased/hero_name/selections/TestQuerySelections.java.expected index 31ac85fa8a4..5ecd6771363 100644 --- a/libraries/apollo-compiler/src/test/graphql/com/example/hero_name/java/operationBased/hero_name/selections/TestQuerySelections.java.expected +++ b/libraries/apollo-compiler/src/test/graphql/com/example/hero_name/java/operationBased/hero_name/selections/TestQuerySelections.java.expected @@ -5,6 +5,7 @@ // package com.example.hero_name.selections; +import com.apollographql.apollo3.api.CompiledArgument; import com.apollographql.apollo3.api.CompiledField; import com.apollographql.apollo3.api.CompiledFragment; import com.apollographql.apollo3.api.CompiledNotNullType; @@ -28,6 +29,6 @@ public class TestQuerySelections { ); public static List __root = Arrays.asList( - new CompiledField.Builder("hero", Character.type).selections(__hero).build() + new CompiledField.Builder("hero", Character.type).arguments(Arrays.asList(new CompiledArgument.Builder("episode").build(), new CompiledArgument.Builder("listOfListOfStringArgs").build())).selections(__hero).build() ); } diff --git a/libraries/apollo-compiler/src/test/graphql/com/example/hero_name/kotlin/operationBased/hero_name/TestQuery.kt.expected b/libraries/apollo-compiler/src/test/graphql/com/example/hero_name/kotlin/operationBased/hero_name/TestQuery.kt.expected index dbbd8962933..337794d38c7 100644 --- a/libraries/apollo-compiler/src/test/graphql/com/example/hero_name/kotlin/operationBased/hero_name/TestQuery.kt.expected +++ b/libraries/apollo-compiler/src/test/graphql/com/example/hero_name/kotlin/operationBased/hero_name/TestQuery.kt.expected @@ -34,7 +34,7 @@ public class TestQuery() : Query { override fun serializeVariables( writer: JsonWriter, customScalarAdapters: CustomScalarAdapters, - withBooleanDefaultValues: Boolean, + withDefaultValues: Boolean, ) { // This operation doesn't have any variable } diff --git a/libraries/apollo-compiler/src/test/graphql/com/example/hero_name/kotlin/operationBased/hero_name/selections/TestQuerySelections.kt.expected b/libraries/apollo-compiler/src/test/graphql/com/example/hero_name/kotlin/operationBased/hero_name/selections/TestQuerySelections.kt.expected index 5a9066c5a43..fc1e86109e8 100644 --- a/libraries/apollo-compiler/src/test/graphql/com/example/hero_name/kotlin/operationBased/hero_name/selections/TestQuerySelections.kt.expected +++ b/libraries/apollo-compiler/src/test/graphql/com/example/hero_name/kotlin/operationBased/hero_name/selections/TestQuerySelections.kt.expected @@ -5,6 +5,7 @@ // package com.example.hero_name.selections +import com.apollographql.apollo3.api.CompiledArgument import com.apollographql.apollo3.api.CompiledField import com.apollographql.apollo3.api.CompiledFragment import com.apollographql.apollo3.api.CompiledSelection @@ -46,7 +47,11 @@ public object TestQuerySelections { CompiledField.Builder( name = "hero", type = Character.type - ).selections(__hero) + ).arguments(listOf( + CompiledArgument.Builder("episode").build(), + CompiledArgument.Builder("listOfListOfStringArgs").build() + )) + .selections(__hero) .build() ) } diff --git a/libraries/apollo-compiler/src/test/graphql/com/example/hero_name/kotlin/responseBased/hero_name/TestQuery.kt.expected b/libraries/apollo-compiler/src/test/graphql/com/example/hero_name/kotlin/responseBased/hero_name/TestQuery.kt.expected index 9ac7b21c44e..53a019a4e56 100644 --- a/libraries/apollo-compiler/src/test/graphql/com/example/hero_name/kotlin/responseBased/hero_name/TestQuery.kt.expected +++ b/libraries/apollo-compiler/src/test/graphql/com/example/hero_name/kotlin/responseBased/hero_name/TestQuery.kt.expected @@ -35,7 +35,7 @@ public class TestQuery() : Query { override fun serializeVariables( writer: JsonWriter, customScalarAdapters: CustomScalarAdapters, - withBooleanDefaultValues: Boolean, + withDefaultValues: Boolean, ) { // This operation doesn't have any variable } diff --git a/libraries/apollo-compiler/src/test/graphql/com/example/hero_name/kotlin/responseBased/hero_name/selections/TestQuerySelections.kt.expected b/libraries/apollo-compiler/src/test/graphql/com/example/hero_name/kotlin/responseBased/hero_name/selections/TestQuerySelections.kt.expected index 5a9066c5a43..fc1e86109e8 100644 --- a/libraries/apollo-compiler/src/test/graphql/com/example/hero_name/kotlin/responseBased/hero_name/selections/TestQuerySelections.kt.expected +++ b/libraries/apollo-compiler/src/test/graphql/com/example/hero_name/kotlin/responseBased/hero_name/selections/TestQuerySelections.kt.expected @@ -5,6 +5,7 @@ // package com.example.hero_name.selections +import com.apollographql.apollo3.api.CompiledArgument import com.apollographql.apollo3.api.CompiledField import com.apollographql.apollo3.api.CompiledFragment import com.apollographql.apollo3.api.CompiledSelection @@ -46,7 +47,11 @@ public object TestQuerySelections { CompiledField.Builder( name = "hero", type = Character.type - ).selections(__hero) + ).arguments(listOf( + CompiledArgument.Builder("episode").build(), + CompiledArgument.Builder("listOfListOfStringArgs").build() + )) + .selections(__hero) .build() ) } diff --git a/libraries/apollo-compiler/src/test/graphql/com/example/hero_name_query_long_name/java/operationBased/hero_name_query_long_name/TestQueryWithAVeryAVeryAVeryAVeryAVeryAVeryAVeryAVeryAVeryAVeryAVeryAVeryAVeryLongName.java.expected b/libraries/apollo-compiler/src/test/graphql/com/example/hero_name_query_long_name/java/operationBased/hero_name_query_long_name/TestQueryWithAVeryAVeryAVeryAVeryAVeryAVeryAVeryAVeryAVeryAVeryAVeryAVeryAVeryLongName.java.expected index 23c6cd1a346..ae2af9cee2e 100644 --- a/libraries/apollo-compiler/src/test/graphql/com/example/hero_name_query_long_name/java/operationBased/hero_name_query_long_name/TestQueryWithAVeryAVeryAVeryAVeryAVeryAVeryAVeryAVeryAVeryAVeryAVeryAVeryAVeryLongName.java.expected +++ b/libraries/apollo-compiler/src/test/graphql/com/example/hero_name_query_long_name/java/operationBased/hero_name_query_long_name/TestQueryWithAVeryAVeryAVeryAVeryAVeryAVeryAVeryAVeryAVeryAVeryAVeryAVeryAVeryLongName.java.expected @@ -106,8 +106,8 @@ public class TestQueryWithAVeryAVeryAVeryAVeryAVeryAVeryAVeryAVeryAVeryAVeryAVer @Override public void serializeVariables(JsonWriter writer, CustomScalarAdapters customScalarAdapters, - boolean withBooleanDefaultValues) throws IOException { - TestQueryWithAVeryAVeryAVeryAVeryAVeryAVeryAVeryAVeryAVeryAVeryAVeryAVeryAVeryLongName_VariablesAdapter.INSTANCE.serializeVariables(writer, this, customScalarAdapters, withBooleanDefaultValues); + boolean withDefaultValues) throws IOException { + TestQueryWithAVeryAVeryAVeryAVeryAVeryAVeryAVeryAVeryAVeryAVeryAVeryAVeryAVeryLongName_VariablesAdapter.INSTANCE.serializeVariables(writer, this, customScalarAdapters, withDefaultValues); } @Override diff --git a/libraries/apollo-compiler/src/test/graphql/com/example/hero_name_query_long_name/java/operationBased/hero_name_query_long_name/adapter/TestQueryWithAVeryAVeryAVeryAVeryAVeryAVeryAVeryAVeryAVeryAVeryAVeryAVeryAVeryLongName_VariablesAdapter.java.expected b/libraries/apollo-compiler/src/test/graphql/com/example/hero_name_query_long_name/java/operationBased/hero_name_query_long_name/adapter/TestQueryWithAVeryAVeryAVeryAVeryAVeryAVeryAVeryAVeryAVeryAVeryAVeryAVeryAVeryLongName_VariablesAdapter.java.expected index cade84164b3..afe2b68d99b 100644 --- a/libraries/apollo-compiler/src/test/graphql/com/example/hero_name_query_long_name/java/operationBased/hero_name_query_long_name/adapter/TestQueryWithAVeryAVeryAVeryAVeryAVeryAVeryAVeryAVeryAVeryAVeryAVeryAVeryAVeryLongName_VariablesAdapter.java.expected +++ b/libraries/apollo-compiler/src/test/graphql/com/example/hero_name_query_long_name/java/operationBased/hero_name_query_long_name/adapter/TestQueryWithAVeryAVeryAVeryAVeryAVeryAVeryAVeryAVeryAVeryAVeryAVeryAVeryAVeryLongName_VariablesAdapter.java.expected @@ -20,8 +20,7 @@ public enum TestQueryWithAVeryAVeryAVeryAVeryAVeryAVeryAVeryAVeryAVeryAVeryAVery public void serializeVariables(JsonWriter writer, TestQueryWithAVeryAVeryAVeryAVeryAVeryAVeryAVeryAVeryAVeryAVeryAVeryAVeryAVeryLongName value, - CustomScalarAdapters customScalarAdapters, boolean withBooleanDefaultValues) throws - IOException { + CustomScalarAdapters customScalarAdapters, boolean withDefaultValues) throws IOException { CompositeAdapterContext adapterContext = new CompositeAdapterContext.Builder().customScalarAdapters(customScalarAdapters).build(); if (value.episodeAVeryAVeryAVeryAVeryAVeryAVeryAVeryAVeryAVeryAVeryAVeryAVeryAVeryAVeryAVeryLongName instanceof Optional.Present) { writer.name("episodeAVeryAVeryAVeryAVeryAVeryAVeryAVeryAVeryAVeryAVeryAVeryAVeryAVeryAVeryAVeryLongName"); diff --git a/libraries/apollo-compiler/src/test/graphql/com/example/hero_name_query_long_name/java/operationBased/hero_name_query_long_name/selections/TestQueryWithAVeryAVeryAVeryAVeryAVeryAVeryAVeryAVeryAVeryAVeryAVeryAVeryAVeryLongNameSelections.java.expected b/libraries/apollo-compiler/src/test/graphql/com/example/hero_name_query_long_name/java/operationBased/hero_name_query_long_name/selections/TestQueryWithAVeryAVeryAVeryAVeryAVeryAVeryAVeryAVeryAVeryAVeryAVeryAVeryAVeryLongNameSelections.java.expected index 04717f6909d..f0f29f4b40b 100644 --- a/libraries/apollo-compiler/src/test/graphql/com/example/hero_name_query_long_name/java/operationBased/hero_name_query_long_name/selections/TestQueryWithAVeryAVeryAVeryAVeryAVeryAVeryAVeryAVeryAVeryAVeryAVeryAVeryAVeryLongNameSelections.java.expected +++ b/libraries/apollo-compiler/src/test/graphql/com/example/hero_name_query_long_name/java/operationBased/hero_name_query_long_name/selections/TestQueryWithAVeryAVeryAVeryAVeryAVeryAVeryAVeryAVeryAVeryAVeryAVeryAVeryAVeryLongNameSelections.java.expected @@ -21,6 +21,6 @@ public class TestQueryWithAVeryAVeryAVeryAVeryAVeryAVeryAVeryAVeryAVeryAVeryAVer ); public static List __root = Arrays.asList( - new CompiledField.Builder("hero", Character.type).alias("heroAVeryAVeryAVeryAVeryAVeryAVeryAV").arguments(Arrays.asList(new CompiledArgument.Builder("episode", new CompiledVariable("episodeAVeryAVeryAVeryAVeryAVeryAVeryAVeryAVeryAVeryAVeryAVeryAVeryAVeryAVeryAVeryLongName")).build())).selections(__hero).build() + new CompiledField.Builder("hero", Character.type).alias("heroAVeryAVeryAVeryAVeryAVeryAVeryAV").arguments(Arrays.asList(new CompiledArgument.Builder("episode").value(new CompiledVariable("episodeAVeryAVeryAVeryAVeryAVeryAVeryAVeryAVeryAVeryAVeryAVeryAVeryAVeryAVeryAVeryLongName")).build(), new CompiledArgument.Builder("listOfListOfStringArgs").build())).selections(__hero).build() ); } diff --git a/libraries/apollo-compiler/src/test/graphql/com/example/hero_name_query_long_name/kotlin/responseBased/hero_name_query_long_name/TestQueryWithAVeryAVeryAVeryAVeryAVeryAVeryAVeryAVeryAVeryAVeryAVeryAVeryAVeryLongName.kt.expected b/libraries/apollo-compiler/src/test/graphql/com/example/hero_name_query_long_name/kotlin/responseBased/hero_name_query_long_name/TestQueryWithAVeryAVeryAVeryAVeryAVeryAVeryAVeryAVeryAVeryAVeryAVeryAVeryAVeryLongName.kt.expected index 823a4bcb03b..afcc5a41435 100644 --- a/libraries/apollo-compiler/src/test/graphql/com/example/hero_name_query_long_name/kotlin/responseBased/hero_name_query_long_name/TestQueryWithAVeryAVeryAVeryAVeryAVeryAVeryAVeryAVeryAVeryAVeryAVeryAVeryAVeryLongName.kt.expected +++ b/libraries/apollo-compiler/src/test/graphql/com/example/hero_name_query_long_name/kotlin/responseBased/hero_name_query_long_name/TestQueryWithAVeryAVeryAVeryAVeryAVeryAVeryAVeryAVeryAVeryAVeryAVeryAVeryAVeryLongName.kt.expected @@ -38,10 +38,10 @@ public data class override fun serializeVariables( writer: JsonWriter, customScalarAdapters: CustomScalarAdapters, - withBooleanDefaultValues: Boolean, + withDefaultValues: Boolean, ) { TestQueryWithAVeryAVeryAVeryAVeryAVeryAVeryAVeryAVeryAVeryAVeryAVeryAVeryAVeryLongName_VariablesAdapter.serializeVariables(writer, - this, customScalarAdapters, withBooleanDefaultValues) + this, customScalarAdapters, withDefaultValues) } override fun adapter(): CompositeAdapter = diff --git a/libraries/apollo-compiler/src/test/graphql/com/example/hero_name_query_long_name/kotlin/responseBased/hero_name_query_long_name/adapter/TestQueryWithAVeryAVeryAVeryAVeryAVeryAVeryAVeryAVeryAVeryAVeryAVeryAVeryAVeryLongName_VariablesAdapter.kt.expected b/libraries/apollo-compiler/src/test/graphql/com/example/hero_name_query_long_name/kotlin/responseBased/hero_name_query_long_name/adapter/TestQueryWithAVeryAVeryAVeryAVeryAVeryAVeryAVeryAVeryAVeryAVeryAVeryAVeryAVeryLongName_VariablesAdapter.kt.expected index e21cd8f90a7..a36e104920e 100644 --- a/libraries/apollo-compiler/src/test/graphql/com/example/hero_name_query_long_name/kotlin/responseBased/hero_name_query_long_name/adapter/TestQueryWithAVeryAVeryAVeryAVeryAVeryAVeryAVeryAVeryAVeryAVeryAVeryAVeryAVeryLongName_VariablesAdapter.kt.expected +++ b/libraries/apollo-compiler/src/test/graphql/com/example/hero_name_query_long_name/kotlin/responseBased/hero_name_query_long_name/adapter/TestQueryWithAVeryAVeryAVeryAVeryAVeryAVeryAVeryAVeryAVeryAVeryAVeryAVeryAVeryLongName_VariablesAdapter.kt.expected @@ -26,7 +26,7 @@ public object writer: JsonWriter, `value`: TestQueryWithAVeryAVeryAVeryAVeryAVeryAVeryAVeryAVeryAVeryAVeryAVeryAVeryAVeryLongName, customScalarAdapters: CustomScalarAdapters, - withBooleanDefaultValues: Boolean, + withDefaultValues: Boolean, ) { if (value.episodeAVeryAVeryAVeryAVeryAVeryAVeryAVeryAVeryAVeryAVeryAVeryAVeryAVeryAVeryAVeryLongName diff --git a/libraries/apollo-compiler/src/test/graphql/com/example/hero_name_query_long_name/kotlin/responseBased/hero_name_query_long_name/selections/TestQueryWithAVeryAVeryAVeryAVeryAVeryAVeryAVeryAVeryAVeryAVeryAVeryAVeryAVeryLongNameSelections.kt.expected b/libraries/apollo-compiler/src/test/graphql/com/example/hero_name_query_long_name/kotlin/responseBased/hero_name_query_long_name/selections/TestQueryWithAVeryAVeryAVeryAVeryAVeryAVeryAVeryAVeryAVeryAVeryAVeryAVeryAVeryLongNameSelections.kt.expected index 5fed389530f..ee0a07e87cc 100644 --- a/libraries/apollo-compiler/src/test/graphql/com/example/hero_name_query_long_name/kotlin/responseBased/hero_name_query_long_name/selections/TestQueryWithAVeryAVeryAVeryAVeryAVeryAVeryAVeryAVeryAVeryAVeryAVeryAVeryAVeryLongNameSelections.kt.expected +++ b/libraries/apollo-compiler/src/test/graphql/com/example/hero_name_query_long_name/kotlin/responseBased/hero_name_query_long_name/selections/TestQueryWithAVeryAVeryAVeryAVeryAVeryAVeryAVeryAVeryAVeryAVeryAVeryAVeryAVeryLongNameSelections.kt.expected @@ -31,7 +31,8 @@ public object type = Character.type ).alias("heroAVeryAVeryAVeryAVeryAVeryAVeryAV") .arguments(listOf( - CompiledArgument.Builder("episode", CompiledVariable("episodeAVeryAVeryAVeryAVeryAVeryAVeryAVeryAVeryAVeryAVeryAVeryAVeryAVeryAVeryAVeryLongName")).build() + CompiledArgument.Builder("episode").value(CompiledVariable("episodeAVeryAVeryAVeryAVeryAVeryAVeryAVeryAVeryAVeryAVeryAVeryAVeryAVeryAVeryAVeryLongName")).build(), + CompiledArgument.Builder("listOfListOfStringArgs").build() )) .selections(__hero) .build() diff --git a/libraries/apollo-compiler/src/test/graphql/com/example/hero_with_review/java/operationBased/hero_with_review/TestQuery.java.expected b/libraries/apollo-compiler/src/test/graphql/com/example/hero_with_review/java/operationBased/hero_with_review/TestQuery.java.expected index 771328979b0..1ebcbaf2e5c 100644 --- a/libraries/apollo-compiler/src/test/graphql/com/example/hero_with_review/java/operationBased/hero_with_review/TestQuery.java.expected +++ b/libraries/apollo-compiler/src/test/graphql/com/example/hero_with_review/java/operationBased/hero_with_review/TestQuery.java.expected @@ -116,8 +116,8 @@ public class TestQuery implements Mutation { @Override public void serializeVariables(JsonWriter writer, CustomScalarAdapters customScalarAdapters, - boolean withBooleanDefaultValues) throws IOException { - TestQuery_VariablesAdapter.INSTANCE.serializeVariables(writer, this, customScalarAdapters, withBooleanDefaultValues); + boolean withDefaultValues) throws IOException { + TestQuery_VariablesAdapter.INSTANCE.serializeVariables(writer, this, customScalarAdapters, withDefaultValues); } @Override diff --git a/libraries/apollo-compiler/src/test/graphql/com/example/hero_with_review/java/operationBased/hero_with_review/adapter/TestQuery_VariablesAdapter.java.expected b/libraries/apollo-compiler/src/test/graphql/com/example/hero_with_review/java/operationBased/hero_with_review/adapter/TestQuery_VariablesAdapter.java.expected index f0a2f7ee258..2dd91b0cf22 100644 --- a/libraries/apollo-compiler/src/test/graphql/com/example/hero_with_review/java/operationBased/hero_with_review/adapter/TestQuery_VariablesAdapter.java.expected +++ b/libraries/apollo-compiler/src/test/graphql/com/example/hero_with_review/java/operationBased/hero_with_review/adapter/TestQuery_VariablesAdapter.java.expected @@ -16,8 +16,7 @@ public enum TestQuery_VariablesAdapter { INSTANCE; public void serializeVariables(JsonWriter writer, TestQuery value, - CustomScalarAdapters customScalarAdapters, boolean withBooleanDefaultValues) throws - IOException { + CustomScalarAdapters customScalarAdapters, boolean withDefaultValues) throws IOException { CompositeAdapterContext adapterContext = new CompositeAdapterContext.Builder().customScalarAdapters(customScalarAdapters).build(); writer.name("ep"); Episode_ResponseAdapter.INSTANCE.toJson(writer, CustomScalarAdapters.Empty, value.ep); diff --git a/libraries/apollo-compiler/src/test/graphql/com/example/hero_with_review/java/operationBased/hero_with_review/selections/TestQuerySelections.java.expected b/libraries/apollo-compiler/src/test/graphql/com/example/hero_with_review/java/operationBased/hero_with_review/selections/TestQuerySelections.java.expected index 1504b9abdf0..f8fe0cca2e0 100644 --- a/libraries/apollo-compiler/src/test/graphql/com/example/hero_with_review/java/operationBased/hero_with_review/selections/TestQuerySelections.java.expected +++ b/libraries/apollo-compiler/src/test/graphql/com/example/hero_with_review/java/operationBased/hero_with_review/selections/TestQuerySelections.java.expected @@ -15,6 +15,7 @@ import com.example.hero_with_review.type.GraphQLInt; import com.example.hero_with_review.type.GraphQLString; import com.example.hero_with_review.type.Review; import java.util.Arrays; +import java.util.Collections; import java.util.List; public class TestQuerySelections { @@ -24,6 +25,6 @@ public class TestQuerySelections { ); public static List __root = Arrays.asList( - new CompiledField.Builder("createReview", Review.type).arguments(Arrays.asList(new CompiledArgument.Builder("episode", new CompiledVariable("ep")).build(), new CompiledArgument.Builder("review", new ImmutableMapBuilder().put("stars", 5).put("listOfEnums", Arrays.asList("JEDI", "EMPIRE", "NEWHOPE")).put("listOfStringNonOptional", Arrays.asList("1", "2", "3")).put("favoriteColor", new ImmutableMapBuilder().put("red", 1).put("blue", 1).build()).build()).build())).selections(__createReview).build() + new CompiledField.Builder("createReview", Review.type).arguments(Arrays.asList(new CompiledArgument.Builder("episode").value(new CompiledVariable("ep")).build(), new CompiledArgument.Builder("review").value(new ImmutableMapBuilder().put("stars", 5).put("nullableIntFieldWithDefaultValue", 10).put("favoriteColor", new ImmutableMapBuilder().put("red", 1).put("green", 0).put("blue", 1).put("enumWithDefaultValue", "new").build()).put("enumWithDefaultValue", "JEDI").put("nonNullableEnumWithDefaultValue", "JEDI").put("listOfCustomScalar", Arrays.asList("1984-06-21", "1984-11-21")).put("customScalar", "1984-06-21").put("listOfEnums", Arrays.asList("JEDI", "EMPIRE", "NEWHOPE")).put("listOfInt", Arrays.asList(1, 2, 3)).put("listOfString", Arrays.asList("test1", "test2", "test3")).put("listOfStringNonOptional", Arrays.asList("1", "2", "3")).put("listOfInputTypes", Collections.emptyList()).put("booleanWithDefaultValue", true).build()).build())).selections(__createReview).build() ); } diff --git a/libraries/apollo-compiler/src/test/graphql/com/example/hero_with_review/kotlin/responseBased/hero_with_review/TestQuery.kt.expected b/libraries/apollo-compiler/src/test/graphql/com/example/hero_with_review/kotlin/responseBased/hero_with_review/TestQuery.kt.expected index 49af4cad2ac..941a47aa3eb 100644 --- a/libraries/apollo-compiler/src/test/graphql/com/example/hero_with_review/kotlin/responseBased/hero_with_review/TestQuery.kt.expected +++ b/libraries/apollo-compiler/src/test/graphql/com/example/hero_with_review/kotlin/responseBased/hero_with_review/TestQuery.kt.expected @@ -33,10 +33,10 @@ public data class TestQuery( override fun serializeVariables( writer: JsonWriter, customScalarAdapters: CustomScalarAdapters, - withBooleanDefaultValues: Boolean, + withDefaultValues: Boolean, ) { TestQuery_VariablesAdapter.serializeVariables(writer, this, customScalarAdapters, - withBooleanDefaultValues) + withDefaultValues) } override fun adapter(): CompositeAdapter = TestQuery_ResponseAdapter.Data.obj() diff --git a/libraries/apollo-compiler/src/test/graphql/com/example/hero_with_review/kotlin/responseBased/hero_with_review/adapter/TestQuery_VariablesAdapter.kt.expected b/libraries/apollo-compiler/src/test/graphql/com/example/hero_with_review/kotlin/responseBased/hero_with_review/adapter/TestQuery_VariablesAdapter.kt.expected index a500aefc07b..009f78f3f60 100644 --- a/libraries/apollo-compiler/src/test/graphql/com/example/hero_with_review/kotlin/responseBased/hero_with_review/adapter/TestQuery_VariablesAdapter.kt.expected +++ b/libraries/apollo-compiler/src/test/graphql/com/example/hero_with_review/kotlin/responseBased/hero_with_review/adapter/TestQuery_VariablesAdapter.kt.expected @@ -21,7 +21,7 @@ public object TestQuery_VariablesAdapter { writer: JsonWriter, `value`: TestQuery, customScalarAdapters: CustomScalarAdapters, - withBooleanDefaultValues: Boolean, + withDefaultValues: Boolean, ) { writer.name("ep") Episode_ResponseAdapter.toJson(writer, customScalarAdapters, value.ep) diff --git a/libraries/apollo-compiler/src/test/graphql/com/example/hero_with_review/kotlin/responseBased/hero_with_review/selections/TestQuerySelections.kt.expected b/libraries/apollo-compiler/src/test/graphql/com/example/hero_with_review/kotlin/responseBased/hero_with_review/selections/TestQuerySelections.kt.expected index e9f7e803944..f38b8f09215 100644 --- a/libraries/apollo-compiler/src/test/graphql/com/example/hero_with_review/kotlin/responseBased/hero_with_review/selections/TestQuerySelections.kt.expected +++ b/libraries/apollo-compiler/src/test/graphql/com/example/hero_with_review/kotlin/responseBased/hero_with_review/selections/TestQuerySelections.kt.expected @@ -32,23 +32,45 @@ public object TestQuerySelections { name = "createReview", type = Review.type ).arguments(listOf( - CompiledArgument.Builder("episode", CompiledVariable("ep")).build(), - CompiledArgument.Builder("review", mapOf( + CompiledArgument.Builder("episode").value(CompiledVariable("ep")).build(), + CompiledArgument.Builder("review").value(mapOf( "stars" to 5, + "nullableIntFieldWithDefaultValue" to 10, + "favoriteColor" to mapOf( + "red" to 1, + "green" to 0, + "blue" to 1, + "enumWithDefaultValue" to "new" + ), + "enumWithDefaultValue" to "JEDI", + "nonNullableEnumWithDefaultValue" to "JEDI", + "listOfCustomScalar" to listOf( + "1984-06-21", + "1984-11-21" + ), + "customScalar" to "1984-06-21", "listOfEnums" to listOf( "JEDI", "EMPIRE", "NEWHOPE" ), + "listOfInt" to listOf( + 1, + 2, + 3 + ), + "listOfString" to listOf( + "test1", + "test2", + "test3" + ), "listOfStringNonOptional" to listOf( "1", "2", "3" ), - "favoriteColor" to mapOf( - "red" to 1, - "blue" to 1 - ) + "listOfInputTypes" to emptyList(), + "booleanWithDefaultValue" to true )).build() )) .selections(__createReview) diff --git a/libraries/apollo-compiler/src/test/graphql/com/example/inline_fragment_for_non_optional_field/java/operationBased/inline_fragment_for_non_optional_field/TestQuery.java.expected b/libraries/apollo-compiler/src/test/graphql/com/example/inline_fragment_for_non_optional_field/java/operationBased/inline_fragment_for_non_optional_field/TestQuery.java.expected index fb9a1120af4..118c0fa8f52 100644 --- a/libraries/apollo-compiler/src/test/graphql/com/example/inline_fragment_for_non_optional_field/java/operationBased/inline_fragment_for_non_optional_field/TestQuery.java.expected +++ b/libraries/apollo-compiler/src/test/graphql/com/example/inline_fragment_for_non_optional_field/java/operationBased/inline_fragment_for_non_optional_field/TestQuery.java.expected @@ -101,7 +101,7 @@ public class TestQuery implements Query { @Override public void serializeVariables(JsonWriter writer, CustomScalarAdapters customScalarAdapters, - boolean withBooleanDefaultValues) throws IOException { + boolean withDefaultValues) throws IOException { // This operation doesn't have any variable } diff --git a/libraries/apollo-compiler/src/test/graphql/com/example/inline_fragment_for_non_optional_field/java/operationBased/inline_fragment_for_non_optional_field/selections/TestQuerySelections.java.expected b/libraries/apollo-compiler/src/test/graphql/com/example/inline_fragment_for_non_optional_field/java/operationBased/inline_fragment_for_non_optional_field/selections/TestQuerySelections.java.expected index 0bcef34f729..8512be8a212 100644 --- a/libraries/apollo-compiler/src/test/graphql/com/example/inline_fragment_for_non_optional_field/java/operationBased/inline_fragment_for_non_optional_field/selections/TestQuerySelections.java.expected +++ b/libraries/apollo-compiler/src/test/graphql/com/example/inline_fragment_for_non_optional_field/java/operationBased/inline_fragment_for_non_optional_field/selections/TestQuerySelections.java.expected @@ -18,7 +18,7 @@ import java.util.List; public class TestQuerySelections { private static List __onHuman = Arrays.asList( - new CompiledField.Builder("height", GraphQLFloat.type).build() + new CompiledField.Builder("height", GraphQLFloat.type).arguments(Arrays.asList(new CompiledArgument.Builder("unit").value("METER").build())).build() ); private static List __nonOptionalHero = Arrays.asList( @@ -28,6 +28,6 @@ public class TestQuerySelections { ); public static List __root = Arrays.asList( - new CompiledField.Builder("nonOptionalHero", new CompiledNotNullType(Character.type)).arguments(Arrays.asList(new CompiledArgument.Builder("episode", "EMPIRE").build())).selections(__nonOptionalHero).build() + new CompiledField.Builder("nonOptionalHero", new CompiledNotNullType(Character.type)).arguments(Arrays.asList(new CompiledArgument.Builder("episode").value("EMPIRE").build())).selections(__nonOptionalHero).build() ); } diff --git a/libraries/apollo-compiler/src/test/graphql/com/example/inline_fragment_for_non_optional_field/kotlin/operationBased/inline_fragment_for_non_optional_field/TestQuery.kt.expected b/libraries/apollo-compiler/src/test/graphql/com/example/inline_fragment_for_non_optional_field/kotlin/operationBased/inline_fragment_for_non_optional_field/TestQuery.kt.expected index ccbfb72bd17..22cf5255407 100644 --- a/libraries/apollo-compiler/src/test/graphql/com/example/inline_fragment_for_non_optional_field/kotlin/operationBased/inline_fragment_for_non_optional_field/TestQuery.kt.expected +++ b/libraries/apollo-compiler/src/test/graphql/com/example/inline_fragment_for_non_optional_field/kotlin/operationBased/inline_fragment_for_non_optional_field/TestQuery.kt.expected @@ -35,7 +35,7 @@ public class TestQuery() : Query { override fun serializeVariables( writer: JsonWriter, customScalarAdapters: CustomScalarAdapters, - withBooleanDefaultValues: Boolean, + withDefaultValues: Boolean, ) { // This operation doesn't have any variable } diff --git a/libraries/apollo-compiler/src/test/graphql/com/example/inline_fragment_for_non_optional_field/kotlin/operationBased/inline_fragment_for_non_optional_field/selections/TestQuerySelections.kt.expected b/libraries/apollo-compiler/src/test/graphql/com/example/inline_fragment_for_non_optional_field/kotlin/operationBased/inline_fragment_for_non_optional_field/selections/TestQuerySelections.kt.expected index 82dd66405c0..a433471c467 100644 --- a/libraries/apollo-compiler/src/test/graphql/com/example/inline_fragment_for_non_optional_field/kotlin/operationBased/inline_fragment_for_non_optional_field/selections/TestQuerySelections.kt.expected +++ b/libraries/apollo-compiler/src/test/graphql/com/example/inline_fragment_for_non_optional_field/kotlin/operationBased/inline_fragment_for_non_optional_field/selections/TestQuerySelections.kt.expected @@ -20,7 +20,10 @@ public object TestQuerySelections { CompiledField.Builder( name = "height", type = GraphQLFloat.type - ).build() + ).arguments(listOf( + CompiledArgument.Builder("unit").value("METER").build() + )) + .build() ) private val __nonOptionalHero: List = listOf( @@ -44,7 +47,7 @@ public object TestQuerySelections { name = "nonOptionalHero", type = Character.type.notNull() ).arguments(listOf( - CompiledArgument.Builder("episode", "EMPIRE").build() + CompiledArgument.Builder("episode").value("EMPIRE").build() )) .selections(__nonOptionalHero) .build() diff --git a/libraries/apollo-compiler/src/test/graphql/com/example/inline_fragment_for_non_optional_field/kotlin/responseBased/inline_fragment_for_non_optional_field/TestQuery.kt.expected b/libraries/apollo-compiler/src/test/graphql/com/example/inline_fragment_for_non_optional_field/kotlin/responseBased/inline_fragment_for_non_optional_field/TestQuery.kt.expected index a21df107618..42a4b1c009e 100644 --- a/libraries/apollo-compiler/src/test/graphql/com/example/inline_fragment_for_non_optional_field/kotlin/responseBased/inline_fragment_for_non_optional_field/TestQuery.kt.expected +++ b/libraries/apollo-compiler/src/test/graphql/com/example/inline_fragment_for_non_optional_field/kotlin/responseBased/inline_fragment_for_non_optional_field/TestQuery.kt.expected @@ -36,7 +36,7 @@ public class TestQuery() : Query { override fun serializeVariables( writer: JsonWriter, customScalarAdapters: CustomScalarAdapters, - withBooleanDefaultValues: Boolean, + withDefaultValues: Boolean, ) { // This operation doesn't have any variable } diff --git a/libraries/apollo-compiler/src/test/graphql/com/example/inline_fragment_for_non_optional_field/kotlin/responseBased/inline_fragment_for_non_optional_field/selections/TestQuerySelections.kt.expected b/libraries/apollo-compiler/src/test/graphql/com/example/inline_fragment_for_non_optional_field/kotlin/responseBased/inline_fragment_for_non_optional_field/selections/TestQuerySelections.kt.expected index 82dd66405c0..a433471c467 100644 --- a/libraries/apollo-compiler/src/test/graphql/com/example/inline_fragment_for_non_optional_field/kotlin/responseBased/inline_fragment_for_non_optional_field/selections/TestQuerySelections.kt.expected +++ b/libraries/apollo-compiler/src/test/graphql/com/example/inline_fragment_for_non_optional_field/kotlin/responseBased/inline_fragment_for_non_optional_field/selections/TestQuerySelections.kt.expected @@ -20,7 +20,10 @@ public object TestQuerySelections { CompiledField.Builder( name = "height", type = GraphQLFloat.type - ).build() + ).arguments(listOf( + CompiledArgument.Builder("unit").value("METER").build() + )) + .build() ) private val __nonOptionalHero: List = listOf( @@ -44,7 +47,7 @@ public object TestQuerySelections { name = "nonOptionalHero", type = Character.type.notNull() ).arguments(listOf( - CompiledArgument.Builder("episode", "EMPIRE").build() + CompiledArgument.Builder("episode").value("EMPIRE").build() )) .selections(__nonOptionalHero) .build() diff --git a/libraries/apollo-compiler/src/test/graphql/com/example/inline_fragment_inside_inline_fragment/java/operationBased/inline_fragment_inside_inline_fragment/TestQuery.java.expected b/libraries/apollo-compiler/src/test/graphql/com/example/inline_fragment_inside_inline_fragment/java/operationBased/inline_fragment_inside_inline_fragment/TestQuery.java.expected index 13ab5f535a0..a48c12090a6 100644 --- a/libraries/apollo-compiler/src/test/graphql/com/example/inline_fragment_inside_inline_fragment/java/operationBased/inline_fragment_inside_inline_fragment/TestQuery.java.expected +++ b/libraries/apollo-compiler/src/test/graphql/com/example/inline_fragment_inside_inline_fragment/java/operationBased/inline_fragment_inside_inline_fragment/TestQuery.java.expected @@ -107,7 +107,7 @@ public class TestQuery implements Query { @Override public void serializeVariables(JsonWriter writer, CustomScalarAdapters customScalarAdapters, - boolean withBooleanDefaultValues) throws IOException { + boolean withDefaultValues) throws IOException { // This operation doesn't have any variable } diff --git a/libraries/apollo-compiler/src/test/graphql/com/example/inline_fragment_inside_inline_fragment/java/operationBased/inline_fragment_inside_inline_fragment/selections/TestQuerySelections.java.expected b/libraries/apollo-compiler/src/test/graphql/com/example/inline_fragment_inside_inline_fragment/java/operationBased/inline_fragment_inside_inline_fragment/selections/TestQuerySelections.java.expected index 92b20a05dad..3c4c9f9088d 100644 --- a/libraries/apollo-compiler/src/test/graphql/com/example/inline_fragment_inside_inline_fragment/java/operationBased/inline_fragment_inside_inline_fragment/selections/TestQuerySelections.java.expected +++ b/libraries/apollo-compiler/src/test/graphql/com/example/inline_fragment_inside_inline_fragment/java/operationBased/inline_fragment_inside_inline_fragment/selections/TestQuerySelections.java.expected @@ -38,6 +38,6 @@ public class TestQuerySelections { ); public static List __root = Arrays.asList( - new CompiledField.Builder("search", new CompiledListType(SearchResult.type)).arguments(Arrays.asList(new CompiledArgument.Builder("text", "bla-bla").build())).selections(__search).build() + new CompiledField.Builder("search", new CompiledListType(SearchResult.type)).arguments(Arrays.asList(new CompiledArgument.Builder("text").value("bla-bla").build())).selections(__search).build() ); } diff --git a/libraries/apollo-compiler/src/test/graphql/com/example/inline_fragment_inside_inline_fragment/kotlin/operationBased/inline_fragment_inside_inline_fragment/TestQuery.kt.expected b/libraries/apollo-compiler/src/test/graphql/com/example/inline_fragment_inside_inline_fragment/kotlin/operationBased/inline_fragment_inside_inline_fragment/TestQuery.kt.expected index 963741f404c..2999306836a 100644 --- a/libraries/apollo-compiler/src/test/graphql/com/example/inline_fragment_inside_inline_fragment/kotlin/operationBased/inline_fragment_inside_inline_fragment/TestQuery.kt.expected +++ b/libraries/apollo-compiler/src/test/graphql/com/example/inline_fragment_inside_inline_fragment/kotlin/operationBased/inline_fragment_inside_inline_fragment/TestQuery.kt.expected @@ -35,7 +35,7 @@ public class TestQuery() : Query { override fun serializeVariables( writer: JsonWriter, customScalarAdapters: CustomScalarAdapters, - withBooleanDefaultValues: Boolean, + withDefaultValues: Boolean, ) { // This operation doesn't have any variable } diff --git a/libraries/apollo-compiler/src/test/graphql/com/example/inline_fragment_inside_inline_fragment/kotlin/operationBased/inline_fragment_inside_inline_fragment/selections/TestQuerySelections.kt.expected b/libraries/apollo-compiler/src/test/graphql/com/example/inline_fragment_inside_inline_fragment/kotlin/operationBased/inline_fragment_inside_inline_fragment/selections/TestQuerySelections.kt.expected index 134fa8339e2..a0be6c147db 100644 --- a/libraries/apollo-compiler/src/test/graphql/com/example/inline_fragment_inside_inline_fragment/kotlin/operationBased/inline_fragment_inside_inline_fragment/selections/TestQuerySelections.kt.expected +++ b/libraries/apollo-compiler/src/test/graphql/com/example/inline_fragment_inside_inline_fragment/kotlin/operationBased/inline_fragment_inside_inline_fragment/selections/TestQuerySelections.kt.expected @@ -68,7 +68,7 @@ public object TestQuerySelections { name = "search", type = SearchResult.type.list() ).arguments(listOf( - CompiledArgument.Builder("text", "bla-bla").build() + CompiledArgument.Builder("text").value("bla-bla").build() )) .selections(__search) .build() diff --git a/libraries/apollo-compiler/src/test/graphql/com/example/inline_fragment_inside_inline_fragment/kotlin/responseBased/inline_fragment_inside_inline_fragment/TestQuery.kt.expected b/libraries/apollo-compiler/src/test/graphql/com/example/inline_fragment_inside_inline_fragment/kotlin/responseBased/inline_fragment_inside_inline_fragment/TestQuery.kt.expected index 9252ec9a466..87c1bde8b07 100644 --- a/libraries/apollo-compiler/src/test/graphql/com/example/inline_fragment_inside_inline_fragment/kotlin/responseBased/inline_fragment_inside_inline_fragment/TestQuery.kt.expected +++ b/libraries/apollo-compiler/src/test/graphql/com/example/inline_fragment_inside_inline_fragment/kotlin/responseBased/inline_fragment_inside_inline_fragment/TestQuery.kt.expected @@ -36,7 +36,7 @@ public class TestQuery() : Query { override fun serializeVariables( writer: JsonWriter, customScalarAdapters: CustomScalarAdapters, - withBooleanDefaultValues: Boolean, + withDefaultValues: Boolean, ) { // This operation doesn't have any variable } diff --git a/libraries/apollo-compiler/src/test/graphql/com/example/inline_fragment_inside_inline_fragment/kotlin/responseBased/inline_fragment_inside_inline_fragment/selections/TestQuerySelections.kt.expected b/libraries/apollo-compiler/src/test/graphql/com/example/inline_fragment_inside_inline_fragment/kotlin/responseBased/inline_fragment_inside_inline_fragment/selections/TestQuerySelections.kt.expected index 134fa8339e2..a0be6c147db 100644 --- a/libraries/apollo-compiler/src/test/graphql/com/example/inline_fragment_inside_inline_fragment/kotlin/responseBased/inline_fragment_inside_inline_fragment/selections/TestQuerySelections.kt.expected +++ b/libraries/apollo-compiler/src/test/graphql/com/example/inline_fragment_inside_inline_fragment/kotlin/responseBased/inline_fragment_inside_inline_fragment/selections/TestQuerySelections.kt.expected @@ -68,7 +68,7 @@ public object TestQuerySelections { name = "search", type = SearchResult.type.list() ).arguments(listOf( - CompiledArgument.Builder("text", "bla-bla").build() + CompiledArgument.Builder("text").value("bla-bla").build() )) .selections(__search) .build() diff --git a/libraries/apollo-compiler/src/test/graphql/com/example/inline_fragment_intersection/java/operationBased/inline_fragment_intersection/TestOperation.java.expected b/libraries/apollo-compiler/src/test/graphql/com/example/inline_fragment_intersection/java/operationBased/inline_fragment_intersection/TestOperation.java.expected index 809f2150bbf..9b26d6bac5d 100644 --- a/libraries/apollo-compiler/src/test/graphql/com/example/inline_fragment_intersection/java/operationBased/inline_fragment_intersection/TestOperation.java.expected +++ b/libraries/apollo-compiler/src/test/graphql/com/example/inline_fragment_intersection/java/operationBased/inline_fragment_intersection/TestOperation.java.expected @@ -135,7 +135,7 @@ public class TestOperation implements Query { @Override public void serializeVariables(JsonWriter writer, CustomScalarAdapters customScalarAdapters, - boolean withBooleanDefaultValues) throws IOException { + boolean withDefaultValues) throws IOException { // This operation doesn't have any variable } diff --git a/libraries/apollo-compiler/src/test/graphql/com/example/inline_fragment_intersection/kotlin/operationBased/inline_fragment_intersection/TestOperation.kt.expected b/libraries/apollo-compiler/src/test/graphql/com/example/inline_fragment_intersection/kotlin/operationBased/inline_fragment_intersection/TestOperation.kt.expected index 22e428b83f9..a3df0623c32 100644 --- a/libraries/apollo-compiler/src/test/graphql/com/example/inline_fragment_intersection/kotlin/operationBased/inline_fragment_intersection/TestOperation.kt.expected +++ b/libraries/apollo-compiler/src/test/graphql/com/example/inline_fragment_intersection/kotlin/operationBased/inline_fragment_intersection/TestOperation.kt.expected @@ -37,7 +37,7 @@ public class TestOperation() : Query { override fun serializeVariables( writer: JsonWriter, customScalarAdapters: CustomScalarAdapters, - withBooleanDefaultValues: Boolean, + withDefaultValues: Boolean, ) { // This operation doesn't have any variable } diff --git a/libraries/apollo-compiler/src/test/graphql/com/example/inline_fragment_intersection/kotlin/responseBased/inline_fragment_intersection/TestOperation.kt.expected b/libraries/apollo-compiler/src/test/graphql/com/example/inline_fragment_intersection/kotlin/responseBased/inline_fragment_intersection/TestOperation.kt.expected index ccab2553e06..b052c539f61 100644 --- a/libraries/apollo-compiler/src/test/graphql/com/example/inline_fragment_intersection/kotlin/responseBased/inline_fragment_intersection/TestOperation.kt.expected +++ b/libraries/apollo-compiler/src/test/graphql/com/example/inline_fragment_intersection/kotlin/responseBased/inline_fragment_intersection/TestOperation.kt.expected @@ -38,7 +38,7 @@ public class TestOperation() : Query { override fun serializeVariables( writer: JsonWriter, customScalarAdapters: CustomScalarAdapters, - withBooleanDefaultValues: Boolean, + withDefaultValues: Boolean, ) { // This operation doesn't have any variable } diff --git a/libraries/apollo-compiler/src/test/graphql/com/example/inline_fragment_merge_fields/java/operationBased/inline_fragment_merge_fields/TestQuery.java.expected b/libraries/apollo-compiler/src/test/graphql/com/example/inline_fragment_merge_fields/java/operationBased/inline_fragment_merge_fields/TestQuery.java.expected index 33191455cbb..b773292c73b 100644 --- a/libraries/apollo-compiler/src/test/graphql/com/example/inline_fragment_merge_fields/java/operationBased/inline_fragment_merge_fields/TestQuery.java.expected +++ b/libraries/apollo-compiler/src/test/graphql/com/example/inline_fragment_merge_fields/java/operationBased/inline_fragment_merge_fields/TestQuery.java.expected @@ -116,7 +116,7 @@ public class TestQuery implements Query { @Override public void serializeVariables(JsonWriter writer, CustomScalarAdapters customScalarAdapters, - boolean withBooleanDefaultValues) throws IOException { + boolean withDefaultValues) throws IOException { // This operation doesn't have any variable } diff --git a/libraries/apollo-compiler/src/test/graphql/com/example/inline_fragment_merge_fields/java/operationBased/inline_fragment_merge_fields/selections/TestQuerySelections.java.expected b/libraries/apollo-compiler/src/test/graphql/com/example/inline_fragment_merge_fields/java/operationBased/inline_fragment_merge_fields/selections/TestQuerySelections.java.expected index 5814709b0fc..66c667e6793 100644 --- a/libraries/apollo-compiler/src/test/graphql/com/example/inline_fragment_merge_fields/java/operationBased/inline_fragment_merge_fields/selections/TestQuerySelections.java.expected +++ b/libraries/apollo-compiler/src/test/graphql/com/example/inline_fragment_merge_fields/java/operationBased/inline_fragment_merge_fields/selections/TestQuerySelections.java.expected @@ -5,6 +5,7 @@ // package com.example.inline_fragment_merge_fields.selections; +import com.apollographql.apollo3.api.CompiledArgument; import com.apollographql.apollo3.api.CompiledField; import com.apollographql.apollo3.api.CompiledFragment; import com.apollographql.apollo3.api.CompiledListType; @@ -46,17 +47,17 @@ public class TestQuerySelections { private static List __onCharacter = Arrays.asList( new CompiledField.Builder("name", new CompiledNotNullType(GraphQLString.type)).build(), new CompiledField.Builder("profileLink", new CompiledNotNullType(URL.type)).build(), - new CompiledField.Builder("friendsConnection", new CompiledNotNullType(FriendsConnection.type)).selections(__friendsConnection1).build() + new CompiledField.Builder("friendsConnection", new CompiledNotNullType(FriendsConnection.type)).arguments(Arrays.asList(new CompiledArgument.Builder("after").build(), new CompiledArgument.Builder("first").build())).selections(__friendsConnection1).build() ); private static List __hero = Arrays.asList( new CompiledField.Builder("__typename", new CompiledNotNullType(GraphQLString.type)).build(), new CompiledField.Builder("name", new CompiledNotNullType(GraphQLString.type)).build(), - new CompiledField.Builder("friendsConnection", new CompiledNotNullType(FriendsConnection.type)).selections(__friendsConnection).build(), + new CompiledField.Builder("friendsConnection", new CompiledNotNullType(FriendsConnection.type)).arguments(Arrays.asList(new CompiledArgument.Builder("after").build(), new CompiledArgument.Builder("first").build())).selections(__friendsConnection).build(), new CompiledFragment.Builder("Character", Arrays.asList("Droid", "Human")).selections(__onCharacter).build() ); public static List __root = Arrays.asList( - new CompiledField.Builder("hero", Character.type).selections(__hero).build() + new CompiledField.Builder("hero", Character.type).arguments(Arrays.asList(new CompiledArgument.Builder("episode").build(), new CompiledArgument.Builder("listOfListOfStringArgs").build())).selections(__hero).build() ); } diff --git a/libraries/apollo-compiler/src/test/graphql/com/example/inline_fragment_merge_fields/kotlin/operationBased/inline_fragment_merge_fields/TestQuery.kt.expected b/libraries/apollo-compiler/src/test/graphql/com/example/inline_fragment_merge_fields/kotlin/operationBased/inline_fragment_merge_fields/TestQuery.kt.expected index 0e10e95a188..e6af31208ad 100644 --- a/libraries/apollo-compiler/src/test/graphql/com/example/inline_fragment_merge_fields/kotlin/operationBased/inline_fragment_merge_fields/TestQuery.kt.expected +++ b/libraries/apollo-compiler/src/test/graphql/com/example/inline_fragment_merge_fields/kotlin/operationBased/inline_fragment_merge_fields/TestQuery.kt.expected @@ -35,7 +35,7 @@ public class TestQuery() : Query { override fun serializeVariables( writer: JsonWriter, customScalarAdapters: CustomScalarAdapters, - withBooleanDefaultValues: Boolean, + withDefaultValues: Boolean, ) { // This operation doesn't have any variable } diff --git a/libraries/apollo-compiler/src/test/graphql/com/example/inline_fragment_merge_fields/kotlin/operationBased/inline_fragment_merge_fields/selections/TestQuerySelections.kt.expected b/libraries/apollo-compiler/src/test/graphql/com/example/inline_fragment_merge_fields/kotlin/operationBased/inline_fragment_merge_fields/selections/TestQuerySelections.kt.expected index 3c7d3c66ce0..98f9a00117c 100644 --- a/libraries/apollo-compiler/src/test/graphql/com/example/inline_fragment_merge_fields/kotlin/operationBased/inline_fragment_merge_fields/selections/TestQuerySelections.kt.expected +++ b/libraries/apollo-compiler/src/test/graphql/com/example/inline_fragment_merge_fields/kotlin/operationBased/inline_fragment_merge_fields/selections/TestQuerySelections.kt.expected @@ -5,6 +5,7 @@ // package com.example.inline_fragment_merge_fields.selections +import com.apollographql.apollo3.api.CompiledArgument import com.apollographql.apollo3.api.CompiledField import com.apollographql.apollo3.api.CompiledFragment import com.apollographql.apollo3.api.CompiledSelection @@ -76,7 +77,11 @@ public object TestQuerySelections { CompiledField.Builder( name = "friendsConnection", type = FriendsConnection.type.notNull() - ).selections(__friendsConnection1) + ).arguments(listOf( + CompiledArgument.Builder("after").build(), + CompiledArgument.Builder("first").build() + )) + .selections(__friendsConnection1) .build() ) @@ -92,7 +97,11 @@ public object TestQuerySelections { CompiledField.Builder( name = "friendsConnection", type = FriendsConnection.type.notNull() - ).selections(__friendsConnection) + ).arguments(listOf( + CompiledArgument.Builder("after").build(), + CompiledArgument.Builder("first").build() + )) + .selections(__friendsConnection) .build(), CompiledFragment.Builder( typeCondition = "Character", @@ -105,7 +114,11 @@ public object TestQuerySelections { CompiledField.Builder( name = "hero", type = Character.type - ).selections(__hero) + ).arguments(listOf( + CompiledArgument.Builder("episode").build(), + CompiledArgument.Builder("listOfListOfStringArgs").build() + )) + .selections(__hero) .build() ) } diff --git a/libraries/apollo-compiler/src/test/graphql/com/example/inline_fragment_merge_fields/kotlin/responseBased/inline_fragment_merge_fields/TestQuery.kt.expected b/libraries/apollo-compiler/src/test/graphql/com/example/inline_fragment_merge_fields/kotlin/responseBased/inline_fragment_merge_fields/TestQuery.kt.expected index df8a5ff6e00..41dca61bc9b 100644 --- a/libraries/apollo-compiler/src/test/graphql/com/example/inline_fragment_merge_fields/kotlin/responseBased/inline_fragment_merge_fields/TestQuery.kt.expected +++ b/libraries/apollo-compiler/src/test/graphql/com/example/inline_fragment_merge_fields/kotlin/responseBased/inline_fragment_merge_fields/TestQuery.kt.expected @@ -35,7 +35,7 @@ public class TestQuery() : Query { override fun serializeVariables( writer: JsonWriter, customScalarAdapters: CustomScalarAdapters, - withBooleanDefaultValues: Boolean, + withDefaultValues: Boolean, ) { // This operation doesn't have any variable } diff --git a/libraries/apollo-compiler/src/test/graphql/com/example/inline_fragment_merge_fields/kotlin/responseBased/inline_fragment_merge_fields/selections/TestQuerySelections.kt.expected b/libraries/apollo-compiler/src/test/graphql/com/example/inline_fragment_merge_fields/kotlin/responseBased/inline_fragment_merge_fields/selections/TestQuerySelections.kt.expected index 3c7d3c66ce0..98f9a00117c 100644 --- a/libraries/apollo-compiler/src/test/graphql/com/example/inline_fragment_merge_fields/kotlin/responseBased/inline_fragment_merge_fields/selections/TestQuerySelections.kt.expected +++ b/libraries/apollo-compiler/src/test/graphql/com/example/inline_fragment_merge_fields/kotlin/responseBased/inline_fragment_merge_fields/selections/TestQuerySelections.kt.expected @@ -5,6 +5,7 @@ // package com.example.inline_fragment_merge_fields.selections +import com.apollographql.apollo3.api.CompiledArgument import com.apollographql.apollo3.api.CompiledField import com.apollographql.apollo3.api.CompiledFragment import com.apollographql.apollo3.api.CompiledSelection @@ -76,7 +77,11 @@ public object TestQuerySelections { CompiledField.Builder( name = "friendsConnection", type = FriendsConnection.type.notNull() - ).selections(__friendsConnection1) + ).arguments(listOf( + CompiledArgument.Builder("after").build(), + CompiledArgument.Builder("first").build() + )) + .selections(__friendsConnection1) .build() ) @@ -92,7 +97,11 @@ public object TestQuerySelections { CompiledField.Builder( name = "friendsConnection", type = FriendsConnection.type.notNull() - ).selections(__friendsConnection) + ).arguments(listOf( + CompiledArgument.Builder("after").build(), + CompiledArgument.Builder("first").build() + )) + .selections(__friendsConnection) .build(), CompiledFragment.Builder( typeCondition = "Character", @@ -105,7 +114,11 @@ public object TestQuerySelections { CompiledField.Builder( name = "hero", type = Character.type - ).selections(__hero) + ).arguments(listOf( + CompiledArgument.Builder("episode").build(), + CompiledArgument.Builder("listOfListOfStringArgs").build() + )) + .selections(__hero) .build() ) } diff --git a/libraries/apollo-compiler/src/test/graphql/com/example/inline_fragment_simple/java/operationBased/inline_fragment_simple/TestQuery.java.expected b/libraries/apollo-compiler/src/test/graphql/com/example/inline_fragment_simple/java/operationBased/inline_fragment_simple/TestQuery.java.expected index 89737dda696..b336909f714 100644 --- a/libraries/apollo-compiler/src/test/graphql/com/example/inline_fragment_simple/java/operationBased/inline_fragment_simple/TestQuery.java.expected +++ b/libraries/apollo-compiler/src/test/graphql/com/example/inline_fragment_simple/java/operationBased/inline_fragment_simple/TestQuery.java.expected @@ -100,7 +100,7 @@ public class TestQuery implements Query { @Override public void serializeVariables(JsonWriter writer, CustomScalarAdapters customScalarAdapters, - boolean withBooleanDefaultValues) throws IOException { + boolean withDefaultValues) throws IOException { // This operation doesn't have any variable } diff --git a/libraries/apollo-compiler/src/test/graphql/com/example/inline_fragment_simple/java/operationBased/inline_fragment_simple/selections/TestQuerySelections.java.expected b/libraries/apollo-compiler/src/test/graphql/com/example/inline_fragment_simple/java/operationBased/inline_fragment_simple/selections/TestQuerySelections.java.expected index b229726978f..9e538a66f53 100644 --- a/libraries/apollo-compiler/src/test/graphql/com/example/inline_fragment_simple/java/operationBased/inline_fragment_simple/selections/TestQuerySelections.java.expected +++ b/libraries/apollo-compiler/src/test/graphql/com/example/inline_fragment_simple/java/operationBased/inline_fragment_simple/selections/TestQuerySelections.java.expected @@ -5,6 +5,7 @@ // package com.example.inline_fragment_simple.selections; +import com.apollographql.apollo3.api.CompiledArgument; import com.apollographql.apollo3.api.CompiledField; import com.apollographql.apollo3.api.CompiledFragment; import com.apollographql.apollo3.api.CompiledNotNullType; @@ -17,7 +18,7 @@ import java.util.List; public class TestQuerySelections { private static List __onHuman = Arrays.asList( - new CompiledField.Builder("height", GraphQLFloat.type).build() + new CompiledField.Builder("height", GraphQLFloat.type).arguments(Arrays.asList(new CompiledArgument.Builder("unit").value("METER").build())).build() ); private static List __hero = Arrays.asList( @@ -26,6 +27,6 @@ public class TestQuerySelections { ); public static List __root = Arrays.asList( - new CompiledField.Builder("hero", Character.type).selections(__hero).build() + new CompiledField.Builder("hero", Character.type).arguments(Arrays.asList(new CompiledArgument.Builder("episode").build(), new CompiledArgument.Builder("listOfListOfStringArgs").build())).selections(__hero).build() ); } diff --git a/libraries/apollo-compiler/src/test/graphql/com/example/inline_fragment_simple/kotlin/operationBased/inline_fragment_simple/TestQuery.kt.expected b/libraries/apollo-compiler/src/test/graphql/com/example/inline_fragment_simple/kotlin/operationBased/inline_fragment_simple/TestQuery.kt.expected index ed3bae1d0bb..6a7e4fc8522 100644 --- a/libraries/apollo-compiler/src/test/graphql/com/example/inline_fragment_simple/kotlin/operationBased/inline_fragment_simple/TestQuery.kt.expected +++ b/libraries/apollo-compiler/src/test/graphql/com/example/inline_fragment_simple/kotlin/operationBased/inline_fragment_simple/TestQuery.kt.expected @@ -35,7 +35,7 @@ public class TestQuery() : Query { override fun serializeVariables( writer: JsonWriter, customScalarAdapters: CustomScalarAdapters, - withBooleanDefaultValues: Boolean, + withDefaultValues: Boolean, ) { // This operation doesn't have any variable } diff --git a/libraries/apollo-compiler/src/test/graphql/com/example/inline_fragment_simple/kotlin/operationBased/inline_fragment_simple/selections/TestQuerySelections.kt.expected b/libraries/apollo-compiler/src/test/graphql/com/example/inline_fragment_simple/kotlin/operationBased/inline_fragment_simple/selections/TestQuerySelections.kt.expected index 6e22ba11054..cbe1dbc2967 100644 --- a/libraries/apollo-compiler/src/test/graphql/com/example/inline_fragment_simple/kotlin/operationBased/inline_fragment_simple/selections/TestQuerySelections.kt.expected +++ b/libraries/apollo-compiler/src/test/graphql/com/example/inline_fragment_simple/kotlin/operationBased/inline_fragment_simple/selections/TestQuerySelections.kt.expected @@ -5,6 +5,7 @@ // package com.example.inline_fragment_simple.selections +import com.apollographql.apollo3.api.CompiledArgument import com.apollographql.apollo3.api.CompiledField import com.apollographql.apollo3.api.CompiledFragment import com.apollographql.apollo3.api.CompiledSelection @@ -19,7 +20,10 @@ public object TestQuerySelections { CompiledField.Builder( name = "height", type = GraphQLFloat.type - ).build() + ).arguments(listOf( + CompiledArgument.Builder("unit").value("METER").build() + )) + .build() ) private val __hero: List = listOf( @@ -38,7 +42,11 @@ public object TestQuerySelections { CompiledField.Builder( name = "hero", type = Character.type - ).selections(__hero) + ).arguments(listOf( + CompiledArgument.Builder("episode").build(), + CompiledArgument.Builder("listOfListOfStringArgs").build() + )) + .selections(__hero) .build() ) } diff --git a/libraries/apollo-compiler/src/test/graphql/com/example/inline_fragment_simple/kotlin/responseBased/inline_fragment_simple/TestQuery.kt.expected b/libraries/apollo-compiler/src/test/graphql/com/example/inline_fragment_simple/kotlin/responseBased/inline_fragment_simple/TestQuery.kt.expected index edc0e1b99a3..9520f316bd5 100644 --- a/libraries/apollo-compiler/src/test/graphql/com/example/inline_fragment_simple/kotlin/responseBased/inline_fragment_simple/TestQuery.kt.expected +++ b/libraries/apollo-compiler/src/test/graphql/com/example/inline_fragment_simple/kotlin/responseBased/inline_fragment_simple/TestQuery.kt.expected @@ -36,7 +36,7 @@ public class TestQuery() : Query { override fun serializeVariables( writer: JsonWriter, customScalarAdapters: CustomScalarAdapters, - withBooleanDefaultValues: Boolean, + withDefaultValues: Boolean, ) { // This operation doesn't have any variable } diff --git a/libraries/apollo-compiler/src/test/graphql/com/example/inline_fragment_simple/kotlin/responseBased/inline_fragment_simple/selections/TestQuerySelections.kt.expected b/libraries/apollo-compiler/src/test/graphql/com/example/inline_fragment_simple/kotlin/responseBased/inline_fragment_simple/selections/TestQuerySelections.kt.expected index 6e22ba11054..cbe1dbc2967 100644 --- a/libraries/apollo-compiler/src/test/graphql/com/example/inline_fragment_simple/kotlin/responseBased/inline_fragment_simple/selections/TestQuerySelections.kt.expected +++ b/libraries/apollo-compiler/src/test/graphql/com/example/inline_fragment_simple/kotlin/responseBased/inline_fragment_simple/selections/TestQuerySelections.kt.expected @@ -5,6 +5,7 @@ // package com.example.inline_fragment_simple.selections +import com.apollographql.apollo3.api.CompiledArgument import com.apollographql.apollo3.api.CompiledField import com.apollographql.apollo3.api.CompiledFragment import com.apollographql.apollo3.api.CompiledSelection @@ -19,7 +20,10 @@ public object TestQuerySelections { CompiledField.Builder( name = "height", type = GraphQLFloat.type - ).build() + ).arguments(listOf( + CompiledArgument.Builder("unit").value("METER").build() + )) + .build() ) private val __hero: List = listOf( @@ -38,7 +42,11 @@ public object TestQuerySelections { CompiledField.Builder( name = "hero", type = Character.type - ).selections(__hero) + ).arguments(listOf( + CompiledArgument.Builder("episode").build(), + CompiledArgument.Builder("listOfListOfStringArgs").build() + )) + .selections(__hero) .build() ) } diff --git a/libraries/apollo-compiler/src/test/graphql/com/example/inline_fragment_type_coercion/java/operationBased/inline_fragment_type_coercion/TestQuery.java.expected b/libraries/apollo-compiler/src/test/graphql/com/example/inline_fragment_type_coercion/java/operationBased/inline_fragment_type_coercion/TestQuery.java.expected index 4740682240a..5f709de1197 100644 --- a/libraries/apollo-compiler/src/test/graphql/com/example/inline_fragment_type_coercion/java/operationBased/inline_fragment_type_coercion/TestQuery.java.expected +++ b/libraries/apollo-compiler/src/test/graphql/com/example/inline_fragment_type_coercion/java/operationBased/inline_fragment_type_coercion/TestQuery.java.expected @@ -100,7 +100,7 @@ public class TestQuery implements Query { @Override public void serializeVariables(JsonWriter writer, CustomScalarAdapters customScalarAdapters, - boolean withBooleanDefaultValues) throws IOException { + boolean withDefaultValues) throws IOException { // This operation doesn't have any variable } diff --git a/libraries/apollo-compiler/src/test/graphql/com/example/inline_fragment_type_coercion/kotlin/operationBased/inline_fragment_type_coercion/TestQuery.kt.expected b/libraries/apollo-compiler/src/test/graphql/com/example/inline_fragment_type_coercion/kotlin/operationBased/inline_fragment_type_coercion/TestQuery.kt.expected index 013bcadd1a6..f041853bc96 100644 --- a/libraries/apollo-compiler/src/test/graphql/com/example/inline_fragment_type_coercion/kotlin/operationBased/inline_fragment_type_coercion/TestQuery.kt.expected +++ b/libraries/apollo-compiler/src/test/graphql/com/example/inline_fragment_type_coercion/kotlin/operationBased/inline_fragment_type_coercion/TestQuery.kt.expected @@ -34,7 +34,7 @@ public class TestQuery() : Query { override fun serializeVariables( writer: JsonWriter, customScalarAdapters: CustomScalarAdapters, - withBooleanDefaultValues: Boolean, + withDefaultValues: Boolean, ) { // This operation doesn't have any variable } diff --git a/libraries/apollo-compiler/src/test/graphql/com/example/inline_fragment_type_coercion/kotlin/responseBased/inline_fragment_type_coercion/TestQuery.kt.expected b/libraries/apollo-compiler/src/test/graphql/com/example/inline_fragment_type_coercion/kotlin/responseBased/inline_fragment_type_coercion/TestQuery.kt.expected index 1b531428e91..3534f22fa74 100644 --- a/libraries/apollo-compiler/src/test/graphql/com/example/inline_fragment_type_coercion/kotlin/responseBased/inline_fragment_type_coercion/TestQuery.kt.expected +++ b/libraries/apollo-compiler/src/test/graphql/com/example/inline_fragment_type_coercion/kotlin/responseBased/inline_fragment_type_coercion/TestQuery.kt.expected @@ -35,7 +35,7 @@ public class TestQuery() : Query { override fun serializeVariables( writer: JsonWriter, customScalarAdapters: CustomScalarAdapters, - withBooleanDefaultValues: Boolean, + withDefaultValues: Boolean, ) { // This operation doesn't have any variable } diff --git a/libraries/apollo-compiler/src/test/graphql/com/example/inline_fragment_with_include_directive/java/operationBased/inline_fragment_with_include_directive/TestQuery.java.expected b/libraries/apollo-compiler/src/test/graphql/com/example/inline_fragment_with_include_directive/java/operationBased/inline_fragment_with_include_directive/TestQuery.java.expected index a477b4d2f4e..6d81b629e2d 100644 --- a/libraries/apollo-compiler/src/test/graphql/com/example/inline_fragment_with_include_directive/java/operationBased/inline_fragment_with_include_directive/TestQuery.java.expected +++ b/libraries/apollo-compiler/src/test/graphql/com/example/inline_fragment_with_include_directive/java/operationBased/inline_fragment_with_include_directive/TestQuery.java.expected @@ -123,8 +123,8 @@ public class TestQuery implements Query { @Override public void serializeVariables(JsonWriter writer, CustomScalarAdapters customScalarAdapters, - boolean withBooleanDefaultValues) throws IOException { - TestQuery_VariablesAdapter.INSTANCE.serializeVariables(writer, this, customScalarAdapters, withBooleanDefaultValues); + boolean withDefaultValues) throws IOException { + TestQuery_VariablesAdapter.INSTANCE.serializeVariables(writer, this, customScalarAdapters, withDefaultValues); } @Override diff --git a/libraries/apollo-compiler/src/test/graphql/com/example/inline_fragment_with_include_directive/java/operationBased/inline_fragment_with_include_directive/adapter/TestQuery_VariablesAdapter.java.expected b/libraries/apollo-compiler/src/test/graphql/com/example/inline_fragment_with_include_directive/java/operationBased/inline_fragment_with_include_directive/adapter/TestQuery_VariablesAdapter.java.expected index d8302b83991..0f259a4b14e 100644 --- a/libraries/apollo-compiler/src/test/graphql/com/example/inline_fragment_with_include_directive/java/operationBased/inline_fragment_with_include_directive/adapter/TestQuery_VariablesAdapter.java.expected +++ b/libraries/apollo-compiler/src/test/graphql/com/example/inline_fragment_with_include_directive/java/operationBased/inline_fragment_with_include_directive/adapter/TestQuery_VariablesAdapter.java.expected @@ -16,8 +16,7 @@ public enum TestQuery_VariablesAdapter { INSTANCE; public void serializeVariables(JsonWriter writer, TestQuery value, - CustomScalarAdapters customScalarAdapters, boolean withBooleanDefaultValues) throws - IOException { + CustomScalarAdapters customScalarAdapters, boolean withDefaultValues) throws IOException { CompositeAdapterContext adapterContext = new CompositeAdapterContext.Builder().customScalarAdapters(customScalarAdapters).build(); writer.name("withDetails"); Adapters.BooleanAdapter.toJson(writer, CustomScalarAdapters.Empty, value.withDetails); diff --git a/libraries/apollo-compiler/src/test/graphql/com/example/inline_fragment_with_include_directive/java/operationBased/inline_fragment_with_include_directive/selections/TestQuerySelections.java.expected b/libraries/apollo-compiler/src/test/graphql/com/example/inline_fragment_with_include_directive/java/operationBased/inline_fragment_with_include_directive/selections/TestQuerySelections.java.expected index 91e334494fd..41dd4bd4c8e 100644 --- a/libraries/apollo-compiler/src/test/graphql/com/example/inline_fragment_with_include_directive/java/operationBased/inline_fragment_with_include_directive/selections/TestQuerySelections.java.expected +++ b/libraries/apollo-compiler/src/test/graphql/com/example/inline_fragment_with_include_directive/java/operationBased/inline_fragment_with_include_directive/selections/TestQuerySelections.java.expected @@ -5,6 +5,7 @@ // package com.example.inline_fragment_with_include_directive.selections; +import com.apollographql.apollo3.api.CompiledArgument; import com.apollographql.apollo3.api.CompiledCondition; import com.apollographql.apollo3.api.CompiledField; import com.apollographql.apollo3.api.CompiledFragment; @@ -40,6 +41,6 @@ public class TestQuerySelections { ); public static List __root = Arrays.asList( - new CompiledField.Builder("hero", Character.type).selections(__hero).build() + new CompiledField.Builder("hero", Character.type).arguments(Arrays.asList(new CompiledArgument.Builder("episode").build(), new CompiledArgument.Builder("listOfListOfStringArgs").build())).selections(__hero).build() ); } diff --git a/libraries/apollo-compiler/src/test/graphql/com/example/inline_fragment_with_include_directive/kotlin/operationBased/inline_fragment_with_include_directive/TestQuery.kt.expected b/libraries/apollo-compiler/src/test/graphql/com/example/inline_fragment_with_include_directive/kotlin/operationBased/inline_fragment_with_include_directive/TestQuery.kt.expected index ad371b19a11..a1ca8bbfa60 100644 --- a/libraries/apollo-compiler/src/test/graphql/com/example/inline_fragment_with_include_directive/kotlin/operationBased/inline_fragment_with_include_directive/TestQuery.kt.expected +++ b/libraries/apollo-compiler/src/test/graphql/com/example/inline_fragment_with_include_directive/kotlin/operationBased/inline_fragment_with_include_directive/TestQuery.kt.expected @@ -32,10 +32,10 @@ public data class TestQuery( override fun serializeVariables( writer: JsonWriter, customScalarAdapters: CustomScalarAdapters, - withBooleanDefaultValues: Boolean, + withDefaultValues: Boolean, ) { TestQuery_VariablesAdapter.serializeVariables(writer, this, customScalarAdapters, - withBooleanDefaultValues) + withDefaultValues) } override fun adapter(): CompositeAdapter = TestQuery_ResponseAdapter.Data.obj() diff --git a/libraries/apollo-compiler/src/test/graphql/com/example/inline_fragment_with_include_directive/kotlin/operationBased/inline_fragment_with_include_directive/adapter/TestQuery_VariablesAdapter.kt.expected b/libraries/apollo-compiler/src/test/graphql/com/example/inline_fragment_with_include_directive/kotlin/operationBased/inline_fragment_with_include_directive/adapter/TestQuery_VariablesAdapter.kt.expected index 434c6384541..3f57c3cd395 100644 --- a/libraries/apollo-compiler/src/test/graphql/com/example/inline_fragment_with_include_directive/kotlin/operationBased/inline_fragment_with_include_directive/adapter/TestQuery_VariablesAdapter.kt.expected +++ b/libraries/apollo-compiler/src/test/graphql/com/example/inline_fragment_with_include_directive/kotlin/operationBased/inline_fragment_with_include_directive/adapter/TestQuery_VariablesAdapter.kt.expected @@ -21,7 +21,7 @@ public object TestQuery_VariablesAdapter { writer: JsonWriter, `value`: TestQuery, customScalarAdapters: CustomScalarAdapters, - withBooleanDefaultValues: Boolean, + withDefaultValues: Boolean, ) { writer.name("withDetails") BooleanAdapter.toJson(writer, customScalarAdapters, value.withDetails) diff --git a/libraries/apollo-compiler/src/test/graphql/com/example/inline_fragment_with_include_directive/kotlin/operationBased/inline_fragment_with_include_directive/selections/TestQuerySelections.kt.expected b/libraries/apollo-compiler/src/test/graphql/com/example/inline_fragment_with_include_directive/kotlin/operationBased/inline_fragment_with_include_directive/selections/TestQuerySelections.kt.expected index 3149075bce3..d7d07f05535 100644 --- a/libraries/apollo-compiler/src/test/graphql/com/example/inline_fragment_with_include_directive/kotlin/operationBased/inline_fragment_with_include_directive/selections/TestQuerySelections.kt.expected +++ b/libraries/apollo-compiler/src/test/graphql/com/example/inline_fragment_with_include_directive/kotlin/operationBased/inline_fragment_with_include_directive/selections/TestQuerySelections.kt.expected @@ -5,6 +5,7 @@ // package com.example.inline_fragment_with_include_directive.selections +import com.apollographql.apollo3.api.CompiledArgument import com.apollographql.apollo3.api.CompiledCondition import com.apollographql.apollo3.api.CompiledField import com.apollographql.apollo3.api.CompiledFragment @@ -79,7 +80,11 @@ public object TestQuerySelections { CompiledField.Builder( name = "hero", type = Character.type - ).selections(__hero) + ).arguments(listOf( + CompiledArgument.Builder("episode").build(), + CompiledArgument.Builder("listOfListOfStringArgs").build() + )) + .selections(__hero) .build() ) } diff --git a/libraries/apollo-compiler/src/test/graphql/com/example/inline_fragments_with_friends/java/operationBased/inline_fragments_with_friends/TestQuery.java.expected b/libraries/apollo-compiler/src/test/graphql/com/example/inline_fragments_with_friends/java/operationBased/inline_fragments_with_friends/TestQuery.java.expected index ebac6766fd1..d86a567a6ce 100644 --- a/libraries/apollo-compiler/src/test/graphql/com/example/inline_fragments_with_friends/java/operationBased/inline_fragments_with_friends/TestQuery.java.expected +++ b/libraries/apollo-compiler/src/test/graphql/com/example/inline_fragments_with_friends/java/operationBased/inline_fragments_with_friends/TestQuery.java.expected @@ -112,7 +112,7 @@ public class TestQuery implements Query { @Override public void serializeVariables(JsonWriter writer, CustomScalarAdapters customScalarAdapters, - boolean withBooleanDefaultValues) throws IOException { + boolean withDefaultValues) throws IOException { // This operation doesn't have any variable } diff --git a/libraries/apollo-compiler/src/test/graphql/com/example/inline_fragments_with_friends/java/operationBased/inline_fragments_with_friends/selections/TestQuerySelections.java.expected b/libraries/apollo-compiler/src/test/graphql/com/example/inline_fragments_with_friends/java/operationBased/inline_fragments_with_friends/selections/TestQuerySelections.java.expected index 192f19c2a8b..cd4e3e4af4e 100644 --- a/libraries/apollo-compiler/src/test/graphql/com/example/inline_fragments_with_friends/java/operationBased/inline_fragments_with_friends/selections/TestQuerySelections.java.expected +++ b/libraries/apollo-compiler/src/test/graphql/com/example/inline_fragments_with_friends/java/operationBased/inline_fragments_with_friends/selections/TestQuerySelections.java.expected @@ -5,6 +5,7 @@ // package com.example.inline_fragments_with_friends.selections; +import com.apollographql.apollo3.api.CompiledArgument; import com.apollographql.apollo3.api.CompiledField; import com.apollographql.apollo3.api.CompiledFragment; import com.apollographql.apollo3.api.CompiledListType; @@ -24,7 +25,7 @@ public class TestQuerySelections { ); private static List __onHuman = Arrays.asList( - new CompiledField.Builder("height", GraphQLFloat.type).build(), + new CompiledField.Builder("height", GraphQLFloat.type).arguments(Arrays.asList(new CompiledArgument.Builder("unit").value("METER").build())).build(), new CompiledField.Builder("friends", new CompiledListType(Character.type)).selections(__friends).build() ); @@ -45,6 +46,6 @@ public class TestQuerySelections { ); public static List __root = Arrays.asList( - new CompiledField.Builder("hero", Character.type).selections(__hero).build() + new CompiledField.Builder("hero", Character.type).arguments(Arrays.asList(new CompiledArgument.Builder("episode").build(), new CompiledArgument.Builder("listOfListOfStringArgs").build())).selections(__hero).build() ); } diff --git a/libraries/apollo-compiler/src/test/graphql/com/example/inline_fragments_with_friends/kotlin/operationBased/inline_fragments_with_friends/TestQuery.kt.expected b/libraries/apollo-compiler/src/test/graphql/com/example/inline_fragments_with_friends/kotlin/operationBased/inline_fragments_with_friends/TestQuery.kt.expected index f38719a5aee..7534f1b0e08 100644 --- a/libraries/apollo-compiler/src/test/graphql/com/example/inline_fragments_with_friends/kotlin/operationBased/inline_fragments_with_friends/TestQuery.kt.expected +++ b/libraries/apollo-compiler/src/test/graphql/com/example/inline_fragments_with_friends/kotlin/operationBased/inline_fragments_with_friends/TestQuery.kt.expected @@ -37,7 +37,7 @@ public class TestQuery() : Query { override fun serializeVariables( writer: JsonWriter, customScalarAdapters: CustomScalarAdapters, - withBooleanDefaultValues: Boolean, + withDefaultValues: Boolean, ) { // This operation doesn't have any variable } diff --git a/libraries/apollo-compiler/src/test/graphql/com/example/inline_fragments_with_friends/kotlin/operationBased/inline_fragments_with_friends/selections/TestQuerySelections.kt.expected b/libraries/apollo-compiler/src/test/graphql/com/example/inline_fragments_with_friends/kotlin/operationBased/inline_fragments_with_friends/selections/TestQuerySelections.kt.expected index 79ed0c09fd7..d3335f4c8f0 100644 --- a/libraries/apollo-compiler/src/test/graphql/com/example/inline_fragments_with_friends/kotlin/operationBased/inline_fragments_with_friends/selections/TestQuerySelections.kt.expected +++ b/libraries/apollo-compiler/src/test/graphql/com/example/inline_fragments_with_friends/kotlin/operationBased/inline_fragments_with_friends/selections/TestQuerySelections.kt.expected @@ -5,6 +5,7 @@ // package com.example.inline_fragments_with_friends.selections +import com.apollographql.apollo3.api.CompiledArgument import com.apollographql.apollo3.api.CompiledField import com.apollographql.apollo3.api.CompiledFragment import com.apollographql.apollo3.api.CompiledSelection @@ -29,7 +30,10 @@ public object TestQuerySelections { CompiledField.Builder( name = "height", type = GraphQLFloat.type - ).build(), + ).arguments(listOf( + CompiledArgument.Builder("unit").value("METER").build() + )) + .build(), CompiledField.Builder( name = "friends", type = Character.type.list() @@ -81,7 +85,11 @@ public object TestQuerySelections { CompiledField.Builder( name = "hero", type = Character.type - ).selections(__hero) + ).arguments(listOf( + CompiledArgument.Builder("episode").build(), + CompiledArgument.Builder("listOfListOfStringArgs").build() + )) + .selections(__hero) .build() ) } diff --git a/libraries/apollo-compiler/src/test/graphql/com/example/inline_fragments_with_friends/kotlin/responseBased/inline_fragments_with_friends/TestQuery.kt.expected b/libraries/apollo-compiler/src/test/graphql/com/example/inline_fragments_with_friends/kotlin/responseBased/inline_fragments_with_friends/TestQuery.kt.expected index b6b9b11da8f..560538f9b97 100644 --- a/libraries/apollo-compiler/src/test/graphql/com/example/inline_fragments_with_friends/kotlin/responseBased/inline_fragments_with_friends/TestQuery.kt.expected +++ b/libraries/apollo-compiler/src/test/graphql/com/example/inline_fragments_with_friends/kotlin/responseBased/inline_fragments_with_friends/TestQuery.kt.expected @@ -38,7 +38,7 @@ public class TestQuery() : Query { override fun serializeVariables( writer: JsonWriter, customScalarAdapters: CustomScalarAdapters, - withBooleanDefaultValues: Boolean, + withDefaultValues: Boolean, ) { // This operation doesn't have any variable } diff --git a/libraries/apollo-compiler/src/test/graphql/com/example/inline_fragments_with_friends/kotlin/responseBased/inline_fragments_with_friends/selections/TestQuerySelections.kt.expected b/libraries/apollo-compiler/src/test/graphql/com/example/inline_fragments_with_friends/kotlin/responseBased/inline_fragments_with_friends/selections/TestQuerySelections.kt.expected index 79ed0c09fd7..d3335f4c8f0 100644 --- a/libraries/apollo-compiler/src/test/graphql/com/example/inline_fragments_with_friends/kotlin/responseBased/inline_fragments_with_friends/selections/TestQuerySelections.kt.expected +++ b/libraries/apollo-compiler/src/test/graphql/com/example/inline_fragments_with_friends/kotlin/responseBased/inline_fragments_with_friends/selections/TestQuerySelections.kt.expected @@ -5,6 +5,7 @@ // package com.example.inline_fragments_with_friends.selections +import com.apollographql.apollo3.api.CompiledArgument import com.apollographql.apollo3.api.CompiledField import com.apollographql.apollo3.api.CompiledFragment import com.apollographql.apollo3.api.CompiledSelection @@ -29,7 +30,10 @@ public object TestQuerySelections { CompiledField.Builder( name = "height", type = GraphQLFloat.type - ).build(), + ).arguments(listOf( + CompiledArgument.Builder("unit").value("METER").build() + )) + .build(), CompiledField.Builder( name = "friends", type = Character.type.list() @@ -81,7 +85,11 @@ public object TestQuerySelections { CompiledField.Builder( name = "hero", type = Character.type - ).selections(__hero) + ).arguments(listOf( + CompiledArgument.Builder("episode").build(), + CompiledArgument.Builder("listOfListOfStringArgs").build() + )) + .selections(__hero) .build() ) } diff --git a/libraries/apollo-compiler/src/test/graphql/com/example/input_object_type/java/operationBased/input_object_type/TestQuery.java.expected b/libraries/apollo-compiler/src/test/graphql/com/example/input_object_type/java/operationBased/input_object_type/TestQuery.java.expected index b97e512862b..62706df08eb 100644 --- a/libraries/apollo-compiler/src/test/graphql/com/example/input_object_type/java/operationBased/input_object_type/TestQuery.java.expected +++ b/libraries/apollo-compiler/src/test/graphql/com/example/input_object_type/java/operationBased/input_object_type/TestQuery.java.expected @@ -114,8 +114,8 @@ public class TestQuery implements Mutation { @Override public void serializeVariables(JsonWriter writer, CustomScalarAdapters customScalarAdapters, - boolean withBooleanDefaultValues) throws IOException { - TestQuery_VariablesAdapter.INSTANCE.serializeVariables(writer, this, customScalarAdapters, withBooleanDefaultValues); + boolean withDefaultValues) throws IOException { + TestQuery_VariablesAdapter.INSTANCE.serializeVariables(writer, this, customScalarAdapters, withDefaultValues); } @Override diff --git a/libraries/apollo-compiler/src/test/graphql/com/example/input_object_type/java/operationBased/input_object_type/adapter/TestQuery_VariablesAdapter.java.expected b/libraries/apollo-compiler/src/test/graphql/com/example/input_object_type/java/operationBased/input_object_type/adapter/TestQuery_VariablesAdapter.java.expected index 24b99859437..e87a2478bc4 100644 --- a/libraries/apollo-compiler/src/test/graphql/com/example/input_object_type/java/operationBased/input_object_type/adapter/TestQuery_VariablesAdapter.java.expected +++ b/libraries/apollo-compiler/src/test/graphql/com/example/input_object_type/java/operationBased/input_object_type/adapter/TestQuery_VariablesAdapter.java.expected @@ -19,8 +19,7 @@ public enum TestQuery_VariablesAdapter { INSTANCE; public void serializeVariables(JsonWriter writer, TestQuery value, - CustomScalarAdapters customScalarAdapters, boolean withBooleanDefaultValues) throws - IOException { + CustomScalarAdapters customScalarAdapters, boolean withDefaultValues) throws IOException { CompositeAdapterContext adapterContext = new CompositeAdapterContext.Builder().customScalarAdapters(customScalarAdapters).build(); writer.name("ep"); Episode_ResponseAdapter.INSTANCE.toJson(writer, CustomScalarAdapters.Empty, value.ep); diff --git a/libraries/apollo-compiler/src/test/graphql/com/example/input_object_type/java/operationBased/input_object_type/selections/TestQuerySelections.java.expected b/libraries/apollo-compiler/src/test/graphql/com/example/input_object_type/java/operationBased/input_object_type/selections/TestQuerySelections.java.expected index d012c351d93..c613b84dd50 100644 --- a/libraries/apollo-compiler/src/test/graphql/com/example/input_object_type/java/operationBased/input_object_type/selections/TestQuerySelections.java.expected +++ b/libraries/apollo-compiler/src/test/graphql/com/example/input_object_type/java/operationBased/input_object_type/selections/TestQuerySelections.java.expected @@ -23,6 +23,6 @@ public class TestQuerySelections { ); public static List __root = Arrays.asList( - new CompiledField.Builder("createReview", Review.type).arguments(Arrays.asList(new CompiledArgument.Builder("episode", new CompiledVariable("ep")).build(), new CompiledArgument.Builder("review", new CompiledVariable("review")).build())).selections(__createReview).build() + new CompiledField.Builder("createReview", Review.type).arguments(Arrays.asList(new CompiledArgument.Builder("episode").value(new CompiledVariable("ep")).build(), new CompiledArgument.Builder("review").value(new CompiledVariable("review")).build())).selections(__createReview).build() ); } diff --git a/libraries/apollo-compiler/src/test/graphql/com/example/input_object_type/kotlin/responseBased/input_object_type/TestQuery.kt.expected b/libraries/apollo-compiler/src/test/graphql/com/example/input_object_type/kotlin/responseBased/input_object_type/TestQuery.kt.expected index 02faef4e5e7..853211a3efd 100644 --- a/libraries/apollo-compiler/src/test/graphql/com/example/input_object_type/kotlin/responseBased/input_object_type/TestQuery.kt.expected +++ b/libraries/apollo-compiler/src/test/graphql/com/example/input_object_type/kotlin/responseBased/input_object_type/TestQuery.kt.expected @@ -35,10 +35,10 @@ public data class TestQuery( override fun serializeVariables( writer: JsonWriter, customScalarAdapters: CustomScalarAdapters, - withBooleanDefaultValues: Boolean, + withDefaultValues: Boolean, ) { TestQuery_VariablesAdapter.serializeVariables(writer, this, customScalarAdapters, - withBooleanDefaultValues) + withDefaultValues) } override fun adapter(): CompositeAdapter = TestQuery_ResponseAdapter.Data.obj() diff --git a/libraries/apollo-compiler/src/test/graphql/com/example/input_object_type/kotlin/responseBased/input_object_type/adapter/TestQuery_VariablesAdapter.kt.expected b/libraries/apollo-compiler/src/test/graphql/com/example/input_object_type/kotlin/responseBased/input_object_type/adapter/TestQuery_VariablesAdapter.kt.expected index 32c95fb7328..9289dc3dcfc 100644 --- a/libraries/apollo-compiler/src/test/graphql/com/example/input_object_type/kotlin/responseBased/input_object_type/adapter/TestQuery_VariablesAdapter.kt.expected +++ b/libraries/apollo-compiler/src/test/graphql/com/example/input_object_type/kotlin/responseBased/input_object_type/adapter/TestQuery_VariablesAdapter.kt.expected @@ -23,7 +23,7 @@ public object TestQuery_VariablesAdapter { writer: JsonWriter, `value`: TestQuery, customScalarAdapters: CustomScalarAdapters, - withBooleanDefaultValues: Boolean, + withDefaultValues: Boolean, ) { writer.name("ep") Episode_ResponseAdapter.toJson(writer, customScalarAdapters, value.ep) diff --git a/libraries/apollo-compiler/src/test/graphql/com/example/input_object_type/kotlin/responseBased/input_object_type/selections/TestQuerySelections.kt.expected b/libraries/apollo-compiler/src/test/graphql/com/example/input_object_type/kotlin/responseBased/input_object_type/selections/TestQuerySelections.kt.expected index 342db2429ad..7de70506479 100644 --- a/libraries/apollo-compiler/src/test/graphql/com/example/input_object_type/kotlin/responseBased/input_object_type/selections/TestQuerySelections.kt.expected +++ b/libraries/apollo-compiler/src/test/graphql/com/example/input_object_type/kotlin/responseBased/input_object_type/selections/TestQuerySelections.kt.expected @@ -32,8 +32,8 @@ public object TestQuerySelections { name = "createReview", type = Review.type ).arguments(listOf( - CompiledArgument.Builder("episode", CompiledVariable("ep")).build(), - CompiledArgument.Builder("review", CompiledVariable("review")).build() + CompiledArgument.Builder("episode").value(CompiledVariable("ep")).build(), + CompiledArgument.Builder("review").value(CompiledVariable("review")).build() )) .selections(__createReview) .build() diff --git a/libraries/apollo-compiler/src/test/graphql/com/example/input_object_variable_and_argument/java/operationBased/input_object_variable_and_argument/TestQuery.java.expected b/libraries/apollo-compiler/src/test/graphql/com/example/input_object_variable_and_argument/java/operationBased/input_object_variable_and_argument/TestQuery.java.expected index 32f999a3849..2e4d4bc2082 100644 --- a/libraries/apollo-compiler/src/test/graphql/com/example/input_object_variable_and_argument/java/operationBased/input_object_variable_and_argument/TestQuery.java.expected +++ b/libraries/apollo-compiler/src/test/graphql/com/example/input_object_variable_and_argument/java/operationBased/input_object_variable_and_argument/TestQuery.java.expected @@ -133,8 +133,8 @@ public class TestQuery implements Query { @Override public void serializeVariables(JsonWriter writer, CustomScalarAdapters customScalarAdapters, - boolean withBooleanDefaultValues) throws IOException { - TestQuery_VariablesAdapter.INSTANCE.serializeVariables(writer, this, customScalarAdapters, withBooleanDefaultValues); + boolean withDefaultValues) throws IOException { + TestQuery_VariablesAdapter.INSTANCE.serializeVariables(writer, this, customScalarAdapters, withDefaultValues); } @Override diff --git a/libraries/apollo-compiler/src/test/graphql/com/example/input_object_variable_and_argument/java/operationBased/input_object_variable_and_argument/adapter/TestQuery_VariablesAdapter.java.expected b/libraries/apollo-compiler/src/test/graphql/com/example/input_object_variable_and_argument/java/operationBased/input_object_variable_and_argument/adapter/TestQuery_VariablesAdapter.java.expected index b8f59fc2305..905f7681ca2 100644 --- a/libraries/apollo-compiler/src/test/graphql/com/example/input_object_variable_and_argument/java/operationBased/input_object_variable_and_argument/adapter/TestQuery_VariablesAdapter.java.expected +++ b/libraries/apollo-compiler/src/test/graphql/com/example/input_object_variable_and_argument/java/operationBased/input_object_variable_and_argument/adapter/TestQuery_VariablesAdapter.java.expected @@ -20,8 +20,7 @@ public enum TestQuery_VariablesAdapter { INSTANCE; public void serializeVariables(JsonWriter writer, TestQuery value, - CustomScalarAdapters customScalarAdapters, boolean withBooleanDefaultValues) throws - IOException { + CustomScalarAdapters customScalarAdapters, boolean withDefaultValues) throws IOException { CompositeAdapterContext adapterContext = new CompositeAdapterContext.Builder().customScalarAdapters(customScalarAdapters).build(); if (value.episode instanceof Optional.Present) { writer.name("episode"); diff --git a/libraries/apollo-compiler/src/test/graphql/com/example/input_object_variable_and_argument/java/operationBased/input_object_variable_and_argument/selections/TestQuerySelections.java.expected b/libraries/apollo-compiler/src/test/graphql/com/example/input_object_variable_and_argument/java/operationBased/input_object_variable_and_argument/selections/TestQuerySelections.java.expected index 3c4c656a162..8399dda93bd 100644 --- a/libraries/apollo-compiler/src/test/graphql/com/example/input_object_variable_and_argument/java/operationBased/input_object_variable_and_argument/selections/TestQuerySelections.java.expected +++ b/libraries/apollo-compiler/src/test/graphql/com/example/input_object_variable_and_argument/java/operationBased/input_object_variable_and_argument/selections/TestQuerySelections.java.expected @@ -21,10 +21,10 @@ import java.util.List; public class TestQuerySelections { private static List __heroWithReview = Arrays.asList( new CompiledField.Builder("name", new CompiledNotNullType(GraphQLString.type)).build(), - new CompiledField.Builder("height", GraphQLFloat.type).arguments(Arrays.asList(new CompiledArgument.Builder("unit", "FOOT").build())).build() + new CompiledField.Builder("height", GraphQLFloat.type).arguments(Arrays.asList(new CompiledArgument.Builder("unit").value("FOOT").build())).build() ); public static List __root = Arrays.asList( - new CompiledField.Builder("heroWithReview", Human.type).arguments(Arrays.asList(new CompiledArgument.Builder("episode", new CompiledVariable("episode")).build(), new CompiledArgument.Builder("listOfInts", Arrays.asList(new CompiledVariable("stars"), new CompiledVariable("stars"))).build(), new CompiledArgument.Builder("review", new ImmutableMapBuilder().put("stars", new CompiledVariable("stars")).put("favoriteColor", new ImmutableMapBuilder().put("red", 0).put("green", new CompiledVariable("greenValue")).put("blue", 0).build()).put("booleanNonOptional", false).put("listOfStringNonOptional", Collections.emptyList()).build()).build())).selections(__heroWithReview).build() + new CompiledField.Builder("heroWithReview", Human.type).arguments(Arrays.asList(new CompiledArgument.Builder("episode").value(new CompiledVariable("episode")).build(), new CompiledArgument.Builder("listOfInts").value(Arrays.asList(new CompiledVariable("stars"), new CompiledVariable("stars"))).build(), new CompiledArgument.Builder("review").value(new ImmutableMapBuilder().put("stars", new CompiledVariable("stars")).put("nullableIntFieldWithDefaultValue", 10).put("favoriteColor", new ImmutableMapBuilder().put("red", 0).put("green", new CompiledVariable("greenValue")).put("blue", 0).put("enumWithDefaultValue", "new").build()).put("enumWithDefaultValue", "JEDI").put("nonNullableEnumWithDefaultValue", "JEDI").put("listOfCustomScalar", Arrays.asList("1984-06-21", "1984-11-21")).put("customScalar", "1984-06-21").put("listOfEnums", Arrays.asList("NEWHOPE", "EMPIRE")).put("listOfInt", Arrays.asList(1, 2, 3)).put("listOfString", Arrays.asList("test1", "test2", "test3")).put("listOfStringNonOptional", Collections.emptyList()).put("listOfInputTypes", Collections.emptyList()).put("booleanWithDefaultValue", true).put("booleanNonOptional", false).build()).build())).selections(__heroWithReview).build() ); } diff --git a/libraries/apollo-compiler/src/test/graphql/com/example/input_object_variable_and_argument/kotlin/responseBased/input_object_variable_and_argument/TestQuery.kt.expected b/libraries/apollo-compiler/src/test/graphql/com/example/input_object_variable_and_argument/kotlin/responseBased/input_object_variable_and_argument/TestQuery.kt.expected index 6f7f3787fd5..9c284aa59e1 100644 --- a/libraries/apollo-compiler/src/test/graphql/com/example/input_object_variable_and_argument/kotlin/responseBased/input_object_variable_and_argument/TestQuery.kt.expected +++ b/libraries/apollo-compiler/src/test/graphql/com/example/input_object_variable_and_argument/kotlin/responseBased/input_object_variable_and_argument/TestQuery.kt.expected @@ -37,10 +37,10 @@ public data class TestQuery( override fun serializeVariables( writer: JsonWriter, customScalarAdapters: CustomScalarAdapters, - withBooleanDefaultValues: Boolean, + withDefaultValues: Boolean, ) { TestQuery_VariablesAdapter.serializeVariables(writer, this, customScalarAdapters, - withBooleanDefaultValues) + withDefaultValues) } override fun adapter(): CompositeAdapter = TestQuery_ResponseAdapter.Data.obj() diff --git a/libraries/apollo-compiler/src/test/graphql/com/example/input_object_variable_and_argument/kotlin/responseBased/input_object_variable_and_argument/adapter/TestQuery_VariablesAdapter.kt.expected b/libraries/apollo-compiler/src/test/graphql/com/example/input_object_variable_and_argument/kotlin/responseBased/input_object_variable_and_argument/adapter/TestQuery_VariablesAdapter.kt.expected index 6b938809141..6a7aac178e4 100644 --- a/libraries/apollo-compiler/src/test/graphql/com/example/input_object_variable_and_argument/kotlin/responseBased/input_object_variable_and_argument/adapter/TestQuery_VariablesAdapter.kt.expected +++ b/libraries/apollo-compiler/src/test/graphql/com/example/input_object_variable_and_argument/kotlin/responseBased/input_object_variable_and_argument/adapter/TestQuery_VariablesAdapter.kt.expected @@ -26,7 +26,7 @@ public object TestQuery_VariablesAdapter { writer: JsonWriter, `value`: TestQuery, customScalarAdapters: CustomScalarAdapters, - withBooleanDefaultValues: Boolean, + withDefaultValues: Boolean, ) { if (value.episode is Optional.Present) { writer.name("episode") diff --git a/libraries/apollo-compiler/src/test/graphql/com/example/input_object_variable_and_argument/kotlin/responseBased/input_object_variable_and_argument/selections/TestQuerySelections.kt.expected b/libraries/apollo-compiler/src/test/graphql/com/example/input_object_variable_and_argument/kotlin/responseBased/input_object_variable_and_argument/selections/TestQuerySelections.kt.expected index 7afae6f85d6..7284f305910 100644 --- a/libraries/apollo-compiler/src/test/graphql/com/example/input_object_variable_and_argument/kotlin/responseBased/input_object_variable_and_argument/selections/TestQuerySelections.kt.expected +++ b/libraries/apollo-compiler/src/test/graphql/com/example/input_object_variable_and_argument/kotlin/responseBased/input_object_variable_and_argument/selections/TestQuerySelections.kt.expected @@ -25,7 +25,7 @@ public object TestQuerySelections { name = "height", type = GraphQLFloat.type ).arguments(listOf( - CompiledArgument.Builder("unit", "FOOT").build() + CompiledArgument.Builder("unit").value("FOOT").build() )) .build() ) @@ -35,20 +35,45 @@ public object TestQuerySelections { name = "heroWithReview", type = Human.type ).arguments(listOf( - CompiledArgument.Builder("episode", CompiledVariable("episode")).build(), - CompiledArgument.Builder("listOfInts", listOf( + CompiledArgument.Builder("episode").value(CompiledVariable("episode")).build(), + CompiledArgument.Builder("listOfInts").value(listOf( CompiledVariable("stars"), CompiledVariable("stars") )).build(), - CompiledArgument.Builder("review", mapOf( + CompiledArgument.Builder("review").value(mapOf( "stars" to CompiledVariable("stars"), + "nullableIntFieldWithDefaultValue" to 10, "favoriteColor" to mapOf( "red" to 0, "green" to CompiledVariable("greenValue"), - "blue" to 0 + "blue" to 0, + "enumWithDefaultValue" to "new" ), - "booleanNonOptional" to false, - "listOfStringNonOptional" to emptyList() + "enumWithDefaultValue" to "JEDI", + "nonNullableEnumWithDefaultValue" to "JEDI", + "listOfCustomScalar" to listOf( + "1984-06-21", + "1984-11-21" + ), + "customScalar" to "1984-06-21", + "listOfEnums" to listOf( + "NEWHOPE", + "EMPIRE" + ), + "listOfInt" to listOf( + 1, + 2, + 3 + ), + "listOfString" to listOf( + "test1", + "test2", + "test3" + ), + "listOfStringNonOptional" to emptyList(), + "listOfInputTypes" to emptyList(), + "booleanWithDefaultValue" to true, + "booleanNonOptional" to false )).build() )) .selections(__heroWithReview) diff --git a/libraries/apollo-compiler/src/test/graphql/com/example/input_object_variable_and_argument_with_generated_methods/java/operationBased/input_object_variable_and_argument_with_generated_methods/TestQuery.java.expected b/libraries/apollo-compiler/src/test/graphql/com/example/input_object_variable_and_argument_with_generated_methods/java/operationBased/input_object_variable_and_argument_with_generated_methods/TestQuery.java.expected index 4443ea8ba96..13ffdc7aa86 100644 --- a/libraries/apollo-compiler/src/test/graphql/com/example/input_object_variable_and_argument_with_generated_methods/java/operationBased/input_object_variable_and_argument_with_generated_methods/TestQuery.java.expected +++ b/libraries/apollo-compiler/src/test/graphql/com/example/input_object_variable_and_argument_with_generated_methods/java/operationBased/input_object_variable_and_argument_with_generated_methods/TestQuery.java.expected @@ -133,8 +133,8 @@ public class TestQuery implements Query { @Override public void serializeVariables(JsonWriter writer, CustomScalarAdapters customScalarAdapters, - boolean withBooleanDefaultValues) throws IOException { - TestQuery_VariablesAdapter.INSTANCE.serializeVariables(writer, this, customScalarAdapters, withBooleanDefaultValues); + boolean withDefaultValues) throws IOException { + TestQuery_VariablesAdapter.INSTANCE.serializeVariables(writer, this, customScalarAdapters, withDefaultValues); } @Override diff --git a/libraries/apollo-compiler/src/test/graphql/com/example/input_object_variable_and_argument_with_generated_methods/java/operationBased/input_object_variable_and_argument_with_generated_methods/adapter/TestQuery_VariablesAdapter.java.expected b/libraries/apollo-compiler/src/test/graphql/com/example/input_object_variable_and_argument_with_generated_methods/java/operationBased/input_object_variable_and_argument_with_generated_methods/adapter/TestQuery_VariablesAdapter.java.expected index 8bbefc706bd..cb647899350 100644 --- a/libraries/apollo-compiler/src/test/graphql/com/example/input_object_variable_and_argument_with_generated_methods/java/operationBased/input_object_variable_and_argument_with_generated_methods/adapter/TestQuery_VariablesAdapter.java.expected +++ b/libraries/apollo-compiler/src/test/graphql/com/example/input_object_variable_and_argument_with_generated_methods/java/operationBased/input_object_variable_and_argument_with_generated_methods/adapter/TestQuery_VariablesAdapter.java.expected @@ -20,8 +20,7 @@ public enum TestQuery_VariablesAdapter { INSTANCE; public void serializeVariables(JsonWriter writer, TestQuery value, - CustomScalarAdapters customScalarAdapters, boolean withBooleanDefaultValues) throws - IOException { + CustomScalarAdapters customScalarAdapters, boolean withDefaultValues) throws IOException { CompositeAdapterContext adapterContext = new CompositeAdapterContext.Builder().customScalarAdapters(customScalarAdapters).build(); if (value.episode instanceof Optional.Present) { writer.name("episode"); diff --git a/libraries/apollo-compiler/src/test/graphql/com/example/input_object_variable_and_argument_with_generated_methods/java/operationBased/input_object_variable_and_argument_with_generated_methods/selections/TestQuerySelections.java.expected b/libraries/apollo-compiler/src/test/graphql/com/example/input_object_variable_and_argument_with_generated_methods/java/operationBased/input_object_variable_and_argument_with_generated_methods/selections/TestQuerySelections.java.expected index d3a19e09591..006605be983 100644 --- a/libraries/apollo-compiler/src/test/graphql/com/example/input_object_variable_and_argument_with_generated_methods/java/operationBased/input_object_variable_and_argument_with_generated_methods/selections/TestQuerySelections.java.expected +++ b/libraries/apollo-compiler/src/test/graphql/com/example/input_object_variable_and_argument_with_generated_methods/java/operationBased/input_object_variable_and_argument_with_generated_methods/selections/TestQuerySelections.java.expected @@ -21,10 +21,10 @@ import java.util.List; public class TestQuerySelections { private static List __heroWithReview = Arrays.asList( new CompiledField.Builder("name", new CompiledNotNullType(GraphQLString.type)).build(), - new CompiledField.Builder("height", GraphQLFloat.type).arguments(Arrays.asList(new CompiledArgument.Builder("unit", "FOOT").build())).build() + new CompiledField.Builder("height", GraphQLFloat.type).arguments(Arrays.asList(new CompiledArgument.Builder("unit").value("FOOT").build())).build() ); public static List __root = Arrays.asList( - new CompiledField.Builder("heroWithReview", Human.type).arguments(Arrays.asList(new CompiledArgument.Builder("episode", new CompiledVariable("episode")).build(), new CompiledArgument.Builder("listOfInts", Arrays.asList(new CompiledVariable("stars"), new CompiledVariable("stars"))).build(), new CompiledArgument.Builder("review", new ImmutableMapBuilder().put("stars", new CompiledVariable("stars")).put("favoriteColor", new ImmutableMapBuilder().put("red", 0).put("green", new CompiledVariable("greenValue")).put("blue", 0).build()).put("booleanNonOptional", false).put("listOfStringNonOptional", Collections.emptyList()).build()).build())).selections(__heroWithReview).build() + new CompiledField.Builder("heroWithReview", Human.type).arguments(Arrays.asList(new CompiledArgument.Builder("episode").value(new CompiledVariable("episode")).build(), new CompiledArgument.Builder("listOfInts").value(Arrays.asList(new CompiledVariable("stars"), new CompiledVariable("stars"))).build(), new CompiledArgument.Builder("review").value(new ImmutableMapBuilder().put("stars", new CompiledVariable("stars")).put("nullableIntFieldWithDefaultValue", 10).put("favoriteColor", new ImmutableMapBuilder().put("red", 0).put("green", new CompiledVariable("greenValue")).put("blue", 0).put("enumWithDefaultValue", "new").build()).put("enumWithDefaultValue", "JEDI").put("nonNullableEnumWithDefaultValue", "JEDI").put("listOfCustomScalar", Arrays.asList("1984-06-21", "1984-11-21")).put("customScalar", "1984-06-21").put("listOfEnums", Arrays.asList("NEWHOPE", "EMPIRE")).put("listOfInt", Arrays.asList(1, 2, 3)).put("listOfString", Arrays.asList("test1", "test2", "test3")).put("listOfStringNonOptional", Collections.emptyList()).put("listOfInputTypes", Collections.emptyList()).put("booleanWithDefaultValue", true).put("booleanNonOptional", false).build()).build())).selections(__heroWithReview).build() ); } 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/TestQuery.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/TestQuery.kt.expected index 991d0786a19..0bf14b22f76 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/TestQuery.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/TestQuery.kt.expected @@ -73,10 +73,10 @@ public class TestQuery( override fun serializeVariables( writer: JsonWriter, customScalarAdapters: CustomScalarAdapters, - withBooleanDefaultValues: Boolean, + withDefaultValues: Boolean, ) { TestQuery_VariablesAdapter.serializeVariables(writer, this, customScalarAdapters, - withBooleanDefaultValues) + withDefaultValues) } override fun adapter(): CompositeAdapter = TestQuery_ResponseAdapter.Data.obj() 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/adapter/TestQuery_VariablesAdapter.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/adapter/TestQuery_VariablesAdapter.kt.expected index 89660c0932e..ff3e28335d2 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/adapter/TestQuery_VariablesAdapter.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/adapter/TestQuery_VariablesAdapter.kt.expected @@ -26,7 +26,7 @@ public object TestQuery_VariablesAdapter { writer: JsonWriter, `value`: TestQuery, customScalarAdapters: CustomScalarAdapters, - withBooleanDefaultValues: Boolean, + withDefaultValues: Boolean, ) { if (value.episode is Optional.Present) { writer.name("episode") 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/selections/TestQuerySelections.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/selections/TestQuerySelections.kt.expected index 66ab1033797..bf42f3b9fbc 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/selections/TestQuerySelections.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/selections/TestQuerySelections.kt.expected @@ -25,7 +25,7 @@ public object TestQuerySelections { name = "height", type = GraphQLFloat.type ).arguments(listOf( - CompiledArgument.Builder("unit", "FOOT").build() + CompiledArgument.Builder("unit").value("FOOT").build() )) .build() ) @@ -35,20 +35,45 @@ public object TestQuerySelections { name = "heroWithReview", type = Human.type ).arguments(listOf( - CompiledArgument.Builder("episode", CompiledVariable("episode")).build(), - CompiledArgument.Builder("listOfInts", listOf( + CompiledArgument.Builder("episode").value(CompiledVariable("episode")).build(), + CompiledArgument.Builder("listOfInts").value(listOf( CompiledVariable("stars"), CompiledVariable("stars") )).build(), - CompiledArgument.Builder("review", mapOf( + CompiledArgument.Builder("review").value(mapOf( "stars" to CompiledVariable("stars"), + "nullableIntFieldWithDefaultValue" to 10, "favoriteColor" to mapOf( "red" to 0, "green" to CompiledVariable("greenValue"), - "blue" to 0 + "blue" to 0, + "enumWithDefaultValue" to "new" ), - "booleanNonOptional" to false, - "listOfStringNonOptional" to emptyList() + "enumWithDefaultValue" to "JEDI", + "nonNullableEnumWithDefaultValue" to "JEDI", + "listOfCustomScalar" to listOf( + "1984-06-21", + "1984-11-21" + ), + "customScalar" to "1984-06-21", + "listOfEnums" to listOf( + "NEWHOPE", + "EMPIRE" + ), + "listOfInt" to listOf( + 1, + 2, + 3 + ), + "listOfString" to listOf( + "test1", + "test2", + "test3" + ), + "listOfStringNonOptional" to emptyList(), + "listOfInputTypes" to emptyList(), + "booleanWithDefaultValue" to true, + "booleanNonOptional" to false )).build() )) .selections(__heroWithReview) diff --git a/libraries/apollo-compiler/src/test/graphql/com/example/interface_always_nested/java/operationBased/interface_always_nested/TestQuery.java.expected b/libraries/apollo-compiler/src/test/graphql/com/example/interface_always_nested/java/operationBased/interface_always_nested/TestQuery.java.expected index 53b41d66642..b2b9d1e91da 100644 --- a/libraries/apollo-compiler/src/test/graphql/com/example/interface_always_nested/java/operationBased/interface_always_nested/TestQuery.java.expected +++ b/libraries/apollo-compiler/src/test/graphql/com/example/interface_always_nested/java/operationBased/interface_always_nested/TestQuery.java.expected @@ -103,7 +103,7 @@ public class TestQuery implements Query { @Override public void serializeVariables(JsonWriter writer, CustomScalarAdapters customScalarAdapters, - boolean withBooleanDefaultValues) throws IOException { + boolean withDefaultValues) throws IOException { // This operation doesn't have any variable } diff --git a/libraries/apollo-compiler/src/test/graphql/com/example/interface_always_nested/kotlin/operationBased/interface_always_nested/TestQuery.kt.expected b/libraries/apollo-compiler/src/test/graphql/com/example/interface_always_nested/kotlin/operationBased/interface_always_nested/TestQuery.kt.expected index 1355f46b6d5..2d39ef34f9a 100644 --- a/libraries/apollo-compiler/src/test/graphql/com/example/interface_always_nested/kotlin/operationBased/interface_always_nested/TestQuery.kt.expected +++ b/libraries/apollo-compiler/src/test/graphql/com/example/interface_always_nested/kotlin/operationBased/interface_always_nested/TestQuery.kt.expected @@ -34,7 +34,7 @@ public class TestQuery() : Query { override fun serializeVariables( writer: JsonWriter, customScalarAdapters: CustomScalarAdapters, - withBooleanDefaultValues: Boolean, + withDefaultValues: Boolean, ) { // This operation doesn't have any variable } diff --git a/libraries/apollo-compiler/src/test/graphql/com/example/interface_always_nested/kotlin/responseBased/interface_always_nested/TestQuery.kt.expected b/libraries/apollo-compiler/src/test/graphql/com/example/interface_always_nested/kotlin/responseBased/interface_always_nested/TestQuery.kt.expected index d575a67cd8f..93a8415aae4 100644 --- a/libraries/apollo-compiler/src/test/graphql/com/example/interface_always_nested/kotlin/responseBased/interface_always_nested/TestQuery.kt.expected +++ b/libraries/apollo-compiler/src/test/graphql/com/example/interface_always_nested/kotlin/responseBased/interface_always_nested/TestQuery.kt.expected @@ -35,7 +35,7 @@ public class TestQuery() : Query { override fun serializeVariables( writer: JsonWriter, customScalarAdapters: CustomScalarAdapters, - withBooleanDefaultValues: Boolean, + withDefaultValues: Boolean, ) { // This operation doesn't have any variable } diff --git a/libraries/apollo-compiler/src/test/graphql/com/example/interface_on_interface/java/operationBased/interface_on_interface/GetHuman.java.expected b/libraries/apollo-compiler/src/test/graphql/com/example/interface_on_interface/java/operationBased/interface_on_interface/GetHuman.java.expected index 609a22954b2..9ff21e5a040 100644 --- a/libraries/apollo-compiler/src/test/graphql/com/example/interface_on_interface/java/operationBased/interface_on_interface/GetHuman.java.expected +++ b/libraries/apollo-compiler/src/test/graphql/com/example/interface_on_interface/java/operationBased/interface_on_interface/GetHuman.java.expected @@ -105,7 +105,7 @@ public class GetHuman implements Query { @Override public void serializeVariables(JsonWriter writer, CustomScalarAdapters customScalarAdapters, - boolean withBooleanDefaultValues) throws IOException { + boolean withDefaultValues) throws IOException { // This operation doesn't have any variable } diff --git a/libraries/apollo-compiler/src/test/graphql/com/example/interface_on_interface/kotlin/operationBased/interface_on_interface/GetHuman.kt.expected b/libraries/apollo-compiler/src/test/graphql/com/example/interface_on_interface/kotlin/operationBased/interface_on_interface/GetHuman.kt.expected index 4da5c95925b..7c719314998 100644 --- a/libraries/apollo-compiler/src/test/graphql/com/example/interface_on_interface/kotlin/operationBased/interface_on_interface/GetHuman.kt.expected +++ b/libraries/apollo-compiler/src/test/graphql/com/example/interface_on_interface/kotlin/operationBased/interface_on_interface/GetHuman.kt.expected @@ -35,7 +35,7 @@ public class GetHuman() : Query { override fun serializeVariables( writer: JsonWriter, customScalarAdapters: CustomScalarAdapters, - withBooleanDefaultValues: Boolean, + withDefaultValues: Boolean, ) { // This operation doesn't have any variable } diff --git a/libraries/apollo-compiler/src/test/graphql/com/example/interface_on_interface/kotlin/responseBased/interface_on_interface/GetHuman.kt.expected b/libraries/apollo-compiler/src/test/graphql/com/example/interface_on_interface/kotlin/responseBased/interface_on_interface/GetHuman.kt.expected index b4883f23c63..e6b36f841e1 100644 --- a/libraries/apollo-compiler/src/test/graphql/com/example/interface_on_interface/kotlin/responseBased/interface_on_interface/GetHuman.kt.expected +++ b/libraries/apollo-compiler/src/test/graphql/com/example/interface_on_interface/kotlin/responseBased/interface_on_interface/GetHuman.kt.expected @@ -36,7 +36,7 @@ public class GetHuman() : Query { override fun serializeVariables( writer: JsonWriter, customScalarAdapters: CustomScalarAdapters, - withBooleanDefaultValues: Boolean, + withDefaultValues: Boolean, ) { // This operation doesn't have any variable } diff --git a/libraries/apollo-compiler/src/test/graphql/com/example/introspection_query/java/operationBased/introspection_query/TestQuery.java.expected b/libraries/apollo-compiler/src/test/graphql/com/example/introspection_query/java/operationBased/introspection_query/TestQuery.java.expected index d73687b9bc4..b3e9eee32d1 100644 --- a/libraries/apollo-compiler/src/test/graphql/com/example/introspection_query/java/operationBased/introspection_query/TestQuery.java.expected +++ b/libraries/apollo-compiler/src/test/graphql/com/example/introspection_query/java/operationBased/introspection_query/TestQuery.java.expected @@ -107,7 +107,7 @@ public class TestQuery implements Query { @Override public void serializeVariables(JsonWriter writer, CustomScalarAdapters customScalarAdapters, - boolean withBooleanDefaultValues) throws IOException { + boolean withDefaultValues) throws IOException { // This operation doesn't have any variable } diff --git a/libraries/apollo-compiler/src/test/graphql/com/example/introspection_query/java/operationBased/introspection_query/selections/TestQuerySelections.java.expected b/libraries/apollo-compiler/src/test/graphql/com/example/introspection_query/java/operationBased/introspection_query/selections/TestQuerySelections.java.expected index 46e41335182..161122a7c20 100644 --- a/libraries/apollo-compiler/src/test/graphql/com/example/introspection_query/java/operationBased/introspection_query/selections/TestQuerySelections.java.expected +++ b/libraries/apollo-compiler/src/test/graphql/com/example/introspection_query/java/operationBased/introspection_query/selections/TestQuerySelections.java.expected @@ -38,6 +38,6 @@ public class TestQuerySelections { public static List __root = Arrays.asList( new CompiledField.Builder("__schema", new CompiledNotNullType(__Schema.type)).selections(____schema).build(), - new CompiledField.Builder("__type", new CompiledNotNullType(__Type.type)).arguments(Arrays.asList(new CompiledArgument.Builder("name", "Vehicle").build())).selections(____type).build() + new CompiledField.Builder("__type", new CompiledNotNullType(__Type.type)).arguments(Arrays.asList(new CompiledArgument.Builder("name").value("Vehicle").build())).selections(____type).build() ); } diff --git a/libraries/apollo-compiler/src/test/graphql/com/example/introspection_query/kotlin/responseBased/introspection_query/TestQuery.kt.expected b/libraries/apollo-compiler/src/test/graphql/com/example/introspection_query/kotlin/responseBased/introspection_query/TestQuery.kt.expected index c321ec64b62..a78ff5a88b5 100644 --- a/libraries/apollo-compiler/src/test/graphql/com/example/introspection_query/kotlin/responseBased/introspection_query/TestQuery.kt.expected +++ b/libraries/apollo-compiler/src/test/graphql/com/example/introspection_query/kotlin/responseBased/introspection_query/TestQuery.kt.expected @@ -36,7 +36,7 @@ public class TestQuery() : Query { override fun serializeVariables( writer: JsonWriter, customScalarAdapters: CustomScalarAdapters, - withBooleanDefaultValues: Boolean, + withDefaultValues: Boolean, ) { // This operation doesn't have any variable } diff --git a/libraries/apollo-compiler/src/test/graphql/com/example/introspection_query/kotlin/responseBased/introspection_query/selections/TestQuerySelections.kt.expected b/libraries/apollo-compiler/src/test/graphql/com/example/introspection_query/kotlin/responseBased/introspection_query/selections/TestQuerySelections.kt.expected index 361ff233a04..744ccb348ba 100644 --- a/libraries/apollo-compiler/src/test/graphql/com/example/introspection_query/kotlin/responseBased/introspection_query/selections/TestQuerySelections.kt.expected +++ b/libraries/apollo-compiler/src/test/graphql/com/example/introspection_query/kotlin/responseBased/introspection_query/selections/TestQuerySelections.kt.expected @@ -65,7 +65,7 @@ public object TestQuerySelections { name = "__type", type = __Type.type.notNull() ).arguments(listOf( - CompiledArgument.Builder("name", "Vehicle").build() + CompiledArgument.Builder("name").value("Vehicle").build() )) .selections(____type) .build() diff --git a/libraries/apollo-compiler/src/test/graphql/com/example/java8annotation/java/operationBased/java8annotation/LoginBarber.java.expected b/libraries/apollo-compiler/src/test/graphql/com/example/java8annotation/java/operationBased/java8annotation/LoginBarber.java.expected index 820c6c9fe4e..a7a471a2f7b 100644 --- a/libraries/apollo-compiler/src/test/graphql/com/example/java8annotation/java/operationBased/java8annotation/LoginBarber.java.expected +++ b/libraries/apollo-compiler/src/test/graphql/com/example/java8annotation/java/operationBased/java8annotation/LoginBarber.java.expected @@ -105,8 +105,8 @@ public class LoginBarber implements Mutation { @Override public void serializeVariables(JsonWriter writer, CustomScalarAdapters customScalarAdapters, - boolean withBooleanDefaultValues) throws IOException { - LoginBarber_VariablesAdapter.INSTANCE.serializeVariables(writer, this, customScalarAdapters, withBooleanDefaultValues); + boolean withDefaultValues) throws IOException { + LoginBarber_VariablesAdapter.INSTANCE.serializeVariables(writer, this, customScalarAdapters, withDefaultValues); } @Override diff --git a/libraries/apollo-compiler/src/test/graphql/com/example/java8annotation/java/operationBased/java8annotation/adapter/LoginBarber_VariablesAdapter.java.expected b/libraries/apollo-compiler/src/test/graphql/com/example/java8annotation/java/operationBased/java8annotation/adapter/LoginBarber_VariablesAdapter.java.expected index 8a637c2e6e3..27f43823b71 100644 --- a/libraries/apollo-compiler/src/test/graphql/com/example/java8annotation/java/operationBased/java8annotation/adapter/LoginBarber_VariablesAdapter.java.expected +++ b/libraries/apollo-compiler/src/test/graphql/com/example/java8annotation/java/operationBased/java8annotation/adapter/LoginBarber_VariablesAdapter.java.expected @@ -18,8 +18,7 @@ public enum LoginBarber_VariablesAdapter { INSTANCE; public void serializeVariables(JsonWriter writer, LoginBarber value, - CustomScalarAdapters customScalarAdapters, boolean withBooleanDefaultValues) throws - IOException { + CustomScalarAdapters customScalarAdapters, boolean withDefaultValues) throws IOException { CompositeAdapterContext adapterContext = new CompositeAdapterContext.Builder().customScalarAdapters(customScalarAdapters).build(); writer.name("input"); new ObjectCompositeAdapter(Login_InputAdapter.INSTANCE, false).toJson(writer, value.input, adapterContext); diff --git a/libraries/apollo-compiler/src/test/graphql/com/example/java8annotation/java/operationBased/java8annotation/selections/LoginBarberSelections.java.expected b/libraries/apollo-compiler/src/test/graphql/com/example/java8annotation/java/operationBased/java8annotation/selections/LoginBarberSelections.java.expected index 73150ceca12..b3e700ba68a 100644 --- a/libraries/apollo-compiler/src/test/graphql/com/example/java8annotation/java/operationBased/java8annotation/selections/LoginBarberSelections.java.expected +++ b/libraries/apollo-compiler/src/test/graphql/com/example/java8annotation/java/operationBased/java8annotation/selections/LoginBarberSelections.java.expected @@ -21,6 +21,6 @@ public class LoginBarberSelections { ); public static List __root = Arrays.asList( - new CompiledField.Builder("login", new CompiledNotNullType(User.type)).arguments(Arrays.asList(new CompiledArgument.Builder("input", new CompiledVariable("input")).build())).selections(__login).build() + new CompiledField.Builder("login", new CompiledNotNullType(User.type)).arguments(Arrays.asList(new CompiledArgument.Builder("input").value(new CompiledVariable("input")).build())).selections(__login).build() ); } diff --git a/libraries/apollo-compiler/src/test/graphql/com/example/java8annotation/kotlin/responseBased/java8annotation/LoginBarber.kt.expected b/libraries/apollo-compiler/src/test/graphql/com/example/java8annotation/kotlin/responseBased/java8annotation/LoginBarber.kt.expected index dadfac2a322..e3410b022b5 100644 --- a/libraries/apollo-compiler/src/test/graphql/com/example/java8annotation/kotlin/responseBased/java8annotation/LoginBarber.kt.expected +++ b/libraries/apollo-compiler/src/test/graphql/com/example/java8annotation/kotlin/responseBased/java8annotation/LoginBarber.kt.expected @@ -32,10 +32,10 @@ public data class LoginBarber( override fun serializeVariables( writer: JsonWriter, customScalarAdapters: CustomScalarAdapters, - withBooleanDefaultValues: Boolean, + withDefaultValues: Boolean, ) { LoginBarber_VariablesAdapter.serializeVariables(writer, this, customScalarAdapters, - withBooleanDefaultValues) + withDefaultValues) } override fun adapter(): CompositeAdapter = LoginBarber_ResponseAdapter.Data.obj() diff --git a/libraries/apollo-compiler/src/test/graphql/com/example/java8annotation/kotlin/responseBased/java8annotation/adapter/LoginBarber_VariablesAdapter.kt.expected b/libraries/apollo-compiler/src/test/graphql/com/example/java8annotation/kotlin/responseBased/java8annotation/adapter/LoginBarber_VariablesAdapter.kt.expected index 7a705988fc2..0fc6a5fab75 100644 --- a/libraries/apollo-compiler/src/test/graphql/com/example/java8annotation/kotlin/responseBased/java8annotation/adapter/LoginBarber_VariablesAdapter.kt.expected +++ b/libraries/apollo-compiler/src/test/graphql/com/example/java8annotation/kotlin/responseBased/java8annotation/adapter/LoginBarber_VariablesAdapter.kt.expected @@ -22,7 +22,7 @@ public object LoginBarber_VariablesAdapter { writer: JsonWriter, `value`: LoginBarber, customScalarAdapters: CustomScalarAdapters, - withBooleanDefaultValues: Boolean, + withDefaultValues: Boolean, ) { writer.name("input") Login_InputAdapter.obj().toJson(writer, customScalarAdapters, value.input) diff --git a/libraries/apollo-compiler/src/test/graphql/com/example/java8annotation/kotlin/responseBased/java8annotation/selections/LoginBarberSelections.kt.expected b/libraries/apollo-compiler/src/test/graphql/com/example/java8annotation/kotlin/responseBased/java8annotation/selections/LoginBarberSelections.kt.expected index 26820e2405c..d54b3c094f8 100644 --- a/libraries/apollo-compiler/src/test/graphql/com/example/java8annotation/kotlin/responseBased/java8annotation/selections/LoginBarberSelections.kt.expected +++ b/libraries/apollo-compiler/src/test/graphql/com/example/java8annotation/kotlin/responseBased/java8annotation/selections/LoginBarberSelections.kt.expected @@ -27,7 +27,7 @@ public object LoginBarberSelections { name = "login", type = User.type.notNull() ).arguments(listOf( - CompiledArgument.Builder("input", CompiledVariable("input")).build() + CompiledArgument.Builder("input").value(CompiledVariable("input")).build() )) .selections(__login) .build() diff --git a/libraries/apollo-compiler/src/test/graphql/com/example/java_android_annotations/java/operationBased/java_android_annotations/MyQuery.java.expected b/libraries/apollo-compiler/src/test/graphql/com/example/java_android_annotations/java/operationBased/java_android_annotations/MyQuery.java.expected index 1720a938fe2..40cbbff05a1 100644 --- a/libraries/apollo-compiler/src/test/graphql/com/example/java_android_annotations/java/operationBased/java_android_annotations/MyQuery.java.expected +++ b/libraries/apollo-compiler/src/test/graphql/com/example/java_android_annotations/java/operationBased/java_android_annotations/MyQuery.java.expected @@ -164,8 +164,8 @@ public class MyQuery implements Query { @Override public void serializeVariables(JsonWriter writer, CustomScalarAdapters customScalarAdapters, - boolean withBooleanDefaultValues) throws IOException { - MyQuery_VariablesAdapter.INSTANCE.serializeVariables(writer, this, customScalarAdapters, withBooleanDefaultValues); + boolean withDefaultValues) throws IOException { + MyQuery_VariablesAdapter.INSTANCE.serializeVariables(writer, this, customScalarAdapters, withDefaultValues); } @Override diff --git a/libraries/apollo-compiler/src/test/graphql/com/example/java_android_annotations/java/operationBased/java_android_annotations/adapter/MyQuery_VariablesAdapter.java.expected b/libraries/apollo-compiler/src/test/graphql/com/example/java_android_annotations/java/operationBased/java_android_annotations/adapter/MyQuery_VariablesAdapter.java.expected index 49c27727214..a4c6520a305 100644 --- a/libraries/apollo-compiler/src/test/graphql/com/example/java_android_annotations/java/operationBased/java_android_annotations/adapter/MyQuery_VariablesAdapter.java.expected +++ b/libraries/apollo-compiler/src/test/graphql/com/example/java_android_annotations/java/operationBased/java_android_annotations/adapter/MyQuery_VariablesAdapter.java.expected @@ -10,6 +10,7 @@ import com.apollographql.apollo3.api.ApolloOptionalAdapter; import com.apollographql.apollo3.api.ApolloOptionalCompositeAdapter; import com.apollographql.apollo3.api.CompositeAdapterContext; import com.apollographql.apollo3.api.CustomScalarAdapters; +import com.apollographql.apollo3.api.ImmutableMapBuilder; import com.apollographql.apollo3.api.NullableCompositeAdapter; import com.apollographql.apollo3.api.ObjectCompositeAdapter; import com.apollographql.apollo3.api.Optional; @@ -23,8 +24,7 @@ public enum MyQuery_VariablesAdapter { INSTANCE; public void serializeVariables(JsonWriter writer, MyQuery value, - CustomScalarAdapters customScalarAdapters, boolean withBooleanDefaultValues) throws - IOException { + CustomScalarAdapters customScalarAdapters, boolean withDefaultValues) throws IOException { CompositeAdapterContext adapterContext = new CompositeAdapterContext.Builder().customScalarAdapters(customScalarAdapters).build(); if (value.nullableInt instanceof Optional.Present) { writer.name("nullableInt"); @@ -36,6 +36,10 @@ public enum MyQuery_VariablesAdapter { writer.name("nonNullableIntWithDefault"); new ApolloOptionalAdapter<>(Adapters.IntAdapter).toJson(writer, CustomScalarAdapters.Empty, value.nonNullableIntWithDefault); } + else if (withDefaultValues) { + writer.name("nonNullableIntWithDefault"); + Adapters.NullableAnyAdapter.toJson(writer, CustomScalarAdapters.Empty, 4); + } if (value.nullableInput instanceof Optional.Present) { writer.name("nullableInput"); new ApolloOptionalCompositeAdapter<>(new NullableCompositeAdapter<>(new ObjectCompositeAdapter(MyInput_InputAdapter.INSTANCE, false))).toJson(writer, value.nullableInput, adapterContext); @@ -46,5 +50,9 @@ public enum MyQuery_VariablesAdapter { writer.name("nonNullableInputWithDefault"); new ApolloOptionalCompositeAdapter<>(new ObjectCompositeAdapter(MyInput_InputAdapter.INSTANCE, false)).toJson(writer, value.nonNullableInputWithDefault, adapterContext); } + else if (withDefaultValues) { + writer.name("nonNullableInputWithDefault"); + Adapters.NullableAnyAdapter.toJson(writer, CustomScalarAdapters.Empty, new ImmutableMapBuilder().put("nonNullableInt", 4).build()); + } } } diff --git a/libraries/apollo-compiler/src/test/graphql/com/example/java_android_annotations/java/operationBased/java_android_annotations/selections/MyQuerySelections.java.expected b/libraries/apollo-compiler/src/test/graphql/com/example/java_android_annotations/java/operationBased/java_android_annotations/selections/MyQuerySelections.java.expected index 5a928fb94bb..2f0fb70df91 100644 --- a/libraries/apollo-compiler/src/test/graphql/com/example/java_android_annotations/java/operationBased/java_android_annotations/selections/MyQuerySelections.java.expected +++ b/libraries/apollo-compiler/src/test/graphql/com/example/java_android_annotations/java/operationBased/java_android_annotations/selections/MyQuerySelections.java.expected @@ -29,8 +29,8 @@ public class MyQuerySelections { ); public static List __root = Arrays.asList( - new CompiledField.Builder("nullableInt", GraphQLInt.type).arguments(Arrays.asList(new CompiledArgument.Builder("nonNullableInput", new CompiledVariable("nonNullableInput")).build(), new CompiledArgument.Builder("nonNullableInputWithDefault", new CompiledVariable("nonNullableInputWithDefault")).build(), new CompiledArgument.Builder("nonNullableInt", new CompiledVariable("nonNullableInt")).build(), new CompiledArgument.Builder("nonNullableIntWithDefault", new CompiledVariable("nonNullableIntWithDefault")).build(), new CompiledArgument.Builder("nullableInput", new CompiledVariable("nullableInput")).build(), new CompiledArgument.Builder("nullableInt", new CompiledVariable("nullableInt")).build())).build(), - new CompiledField.Builder("nonNullableInt", new CompiledNotNullType(GraphQLInt.type)).arguments(Arrays.asList(new CompiledArgument.Builder("nonNullableInput", new CompiledVariable("nonNullableInput")).build(), new CompiledArgument.Builder("nonNullableInputWithDefault", new CompiledVariable("nonNullableInputWithDefault")).build(), new CompiledArgument.Builder("nonNullableInt", new CompiledVariable("nonNullableInt")).build(), new CompiledArgument.Builder("nonNullableIntWithDefault", new CompiledVariable("nonNullableIntWithDefault")).build(), new CompiledArgument.Builder("nullableInput", new CompiledVariable("nullableInput")).build(), new CompiledArgument.Builder("nullableInt", new CompiledVariable("nullableInt")).build())).build(), + new CompiledField.Builder("nullableInt", GraphQLInt.type).arguments(Arrays.asList(new CompiledArgument.Builder("nonNullableInput").value(new CompiledVariable("nonNullableInput")).build(), new CompiledArgument.Builder("nonNullableInputWithDefault").value(new CompiledVariable("nonNullableInputWithDefault")).build(), new CompiledArgument.Builder("nonNullableInt").value(new CompiledVariable("nonNullableInt")).build(), new CompiledArgument.Builder("nonNullableIntWithDefault").value(new CompiledVariable("nonNullableIntWithDefault")).build(), new CompiledArgument.Builder("nullableInput").value(new CompiledVariable("nullableInput")).build(), new CompiledArgument.Builder("nullableInt").value(new CompiledVariable("nullableInt")).build())).build(), + new CompiledField.Builder("nonNullableInt", new CompiledNotNullType(GraphQLInt.type)).arguments(Arrays.asList(new CompiledArgument.Builder("nonNullableInput").value(new CompiledVariable("nonNullableInput")).build(), new CompiledArgument.Builder("nonNullableInputWithDefault").value(new CompiledVariable("nonNullableInputWithDefault")).build(), new CompiledArgument.Builder("nonNullableInt").value(new CompiledVariable("nonNullableInt")).build(), new CompiledArgument.Builder("nonNullableIntWithDefault").value(new CompiledVariable("nonNullableIntWithDefault")).build(), new CompiledArgument.Builder("nullableInput").value(new CompiledVariable("nullableInput")).build(), new CompiledArgument.Builder("nullableInt").value(new CompiledVariable("nullableInt")).build())).build(), new CompiledField.Builder("nullableMyType", MyType.type).selections(__nullableMyType).build(), new CompiledField.Builder("nonNullableMyType", new CompiledNotNullType(MyType.type)).selections(__nonNullableMyType).build(), new CompiledField.Builder("nullableListOfNullableString", new CompiledListType(GraphQLString.type)).build(), diff --git a/libraries/apollo-compiler/src/test/graphql/com/example/java_android_annotations/kotlin/responseBased/java_android_annotations/MyQuery.kt.expected b/libraries/apollo-compiler/src/test/graphql/com/example/java_android_annotations/kotlin/responseBased/java_android_annotations/MyQuery.kt.expected index 1dbb2445f11..be393b38855 100644 --- a/libraries/apollo-compiler/src/test/graphql/com/example/java_android_annotations/kotlin/responseBased/java_android_annotations/MyQuery.kt.expected +++ b/libraries/apollo-compiler/src/test/graphql/com/example/java_android_annotations/kotlin/responseBased/java_android_annotations/MyQuery.kt.expected @@ -40,10 +40,10 @@ public data class MyQuery( override fun serializeVariables( writer: JsonWriter, customScalarAdapters: CustomScalarAdapters, - withBooleanDefaultValues: Boolean, + withDefaultValues: Boolean, ) { MyQuery_VariablesAdapter.serializeVariables(writer, this, customScalarAdapters, - withBooleanDefaultValues) + withDefaultValues) } override fun adapter(): CompositeAdapter = MyQuery_ResponseAdapter.Data.obj() diff --git a/libraries/apollo-compiler/src/test/graphql/com/example/java_android_annotations/kotlin/responseBased/java_android_annotations/adapter/MyQuery_VariablesAdapter.kt.expected b/libraries/apollo-compiler/src/test/graphql/com/example/java_android_annotations/kotlin/responseBased/java_android_annotations/adapter/MyQuery_VariablesAdapter.kt.expected index 050f9416e19..5d2ce35647d 100644 --- a/libraries/apollo-compiler/src/test/graphql/com/example/java_android_annotations/kotlin/responseBased/java_android_annotations/adapter/MyQuery_VariablesAdapter.kt.expected +++ b/libraries/apollo-compiler/src/test/graphql/com/example/java_android_annotations/kotlin/responseBased/java_android_annotations/adapter/MyQuery_VariablesAdapter.kt.expected @@ -7,6 +7,7 @@ package com.example.java_android_annotations.adapter import com.apollographql.apollo3.api.CustomScalarAdapters import com.apollographql.apollo3.api.IntAdapter +import com.apollographql.apollo3.api.NullableAnyAdapter import com.apollographql.apollo3.api.NullableIntAdapter import com.apollographql.apollo3.api.Optional import com.apollographql.apollo3.api.json.JsonWriter @@ -27,7 +28,7 @@ public object MyQuery_VariablesAdapter { writer: JsonWriter, `value`: MyQuery, customScalarAdapters: CustomScalarAdapters, - withBooleanDefaultValues: Boolean, + withDefaultValues: Boolean, ) { if (value.nullableInt is Optional.Present) { writer.name("nullableInt") @@ -39,6 +40,10 @@ public object MyQuery_VariablesAdapter { writer.name("nonNullableIntWithDefault") IntAdapter.present().toJson(writer, customScalarAdapters, value.nonNullableIntWithDefault) } + else if (withDefaultValues) { + writer.name("nonNullableIntWithDefault") + NullableAnyAdapter.toJson(writer, customScalarAdapters, 4) + } if (value.nullableInput is Optional.Present) { writer.name("nullableInput") MyInput_InputAdapter.obj().nullable().present().toJson(writer, customScalarAdapters, @@ -51,5 +56,11 @@ public object MyQuery_VariablesAdapter { MyInput_InputAdapter.obj().present().toJson(writer, customScalarAdapters, value.nonNullableInputWithDefault) } + else if (withDefaultValues) { + writer.name("nonNullableInputWithDefault") + NullableAnyAdapter.toJson(writer, customScalarAdapters, mapOf( + "nonNullableInt" to 4 + )) + } } } diff --git a/libraries/apollo-compiler/src/test/graphql/com/example/java_android_annotations/kotlin/responseBased/java_android_annotations/selections/MyQuerySelections.kt.expected b/libraries/apollo-compiler/src/test/graphql/com/example/java_android_annotations/kotlin/responseBased/java_android_annotations/selections/MyQuerySelections.kt.expected index d0c949427ac..a45bd8af9fa 100644 --- a/libraries/apollo-compiler/src/test/graphql/com/example/java_android_annotations/kotlin/responseBased/java_android_annotations/selections/MyQuerySelections.kt.expected +++ b/libraries/apollo-compiler/src/test/graphql/com/example/java_android_annotations/kotlin/responseBased/java_android_annotations/selections/MyQuerySelections.kt.expected @@ -44,24 +44,24 @@ public object MyQuerySelections { name = "nullableInt", type = GraphQLInt.type ).arguments(listOf( - CompiledArgument.Builder("nonNullableInput", CompiledVariable("nonNullableInput")).build(), - CompiledArgument.Builder("nonNullableInputWithDefault", CompiledVariable("nonNullableInputWithDefault")).build(), - CompiledArgument.Builder("nonNullableInt", CompiledVariable("nonNullableInt")).build(), - CompiledArgument.Builder("nonNullableIntWithDefault", CompiledVariable("nonNullableIntWithDefault")).build(), - CompiledArgument.Builder("nullableInput", CompiledVariable("nullableInput")).build(), - CompiledArgument.Builder("nullableInt", CompiledVariable("nullableInt")).build() + CompiledArgument.Builder("nonNullableInput").value(CompiledVariable("nonNullableInput")).build(), + CompiledArgument.Builder("nonNullableInputWithDefault").value(CompiledVariable("nonNullableInputWithDefault")).build(), + CompiledArgument.Builder("nonNullableInt").value(CompiledVariable("nonNullableInt")).build(), + CompiledArgument.Builder("nonNullableIntWithDefault").value(CompiledVariable("nonNullableIntWithDefault")).build(), + CompiledArgument.Builder("nullableInput").value(CompiledVariable("nullableInput")).build(), + CompiledArgument.Builder("nullableInt").value(CompiledVariable("nullableInt")).build() )) .build(), CompiledField.Builder( name = "nonNullableInt", type = GraphQLInt.type.notNull() ).arguments(listOf( - CompiledArgument.Builder("nonNullableInput", CompiledVariable("nonNullableInput")).build(), - CompiledArgument.Builder("nonNullableInputWithDefault", CompiledVariable("nonNullableInputWithDefault")).build(), - CompiledArgument.Builder("nonNullableInt", CompiledVariable("nonNullableInt")).build(), - CompiledArgument.Builder("nonNullableIntWithDefault", CompiledVariable("nonNullableIntWithDefault")).build(), - CompiledArgument.Builder("nullableInput", CompiledVariable("nullableInput")).build(), - CompiledArgument.Builder("nullableInt", CompiledVariable("nullableInt")).build() + CompiledArgument.Builder("nonNullableInput").value(CompiledVariable("nonNullableInput")).build(), + CompiledArgument.Builder("nonNullableInputWithDefault").value(CompiledVariable("nonNullableInputWithDefault")).build(), + CompiledArgument.Builder("nonNullableInt").value(CompiledVariable("nonNullableInt")).build(), + CompiledArgument.Builder("nonNullableIntWithDefault").value(CompiledVariable("nonNullableIntWithDefault")).build(), + CompiledArgument.Builder("nullableInput").value(CompiledVariable("nullableInput")).build(), + CompiledArgument.Builder("nullableInt").value(CompiledVariable("nullableInt")).build() )) .build(), CompiledField.Builder( diff --git a/libraries/apollo-compiler/src/test/graphql/com/example/java_apollo_optionals/java/operationBased/java_apollo_optionals/MyQuery.java.expected b/libraries/apollo-compiler/src/test/graphql/com/example/java_apollo_optionals/java/operationBased/java_apollo_optionals/MyQuery.java.expected index df15bffb981..7c8e74a0855 100644 --- a/libraries/apollo-compiler/src/test/graphql/com/example/java_apollo_optionals/java/operationBased/java_apollo_optionals/MyQuery.java.expected +++ b/libraries/apollo-compiler/src/test/graphql/com/example/java_apollo_optionals/java/operationBased/java_apollo_optionals/MyQuery.java.expected @@ -157,8 +157,8 @@ public class MyQuery implements Query { @Override public void serializeVariables(JsonWriter writer, CustomScalarAdapters customScalarAdapters, - boolean withBooleanDefaultValues) throws IOException { - MyQuery_VariablesAdapter.INSTANCE.serializeVariables(writer, this, customScalarAdapters, withBooleanDefaultValues); + boolean withDefaultValues) throws IOException { + MyQuery_VariablesAdapter.INSTANCE.serializeVariables(writer, this, customScalarAdapters, withDefaultValues); } @Override diff --git a/libraries/apollo-compiler/src/test/graphql/com/example/java_apollo_optionals/java/operationBased/java_apollo_optionals/adapter/MyQuery_VariablesAdapter.java.expected b/libraries/apollo-compiler/src/test/graphql/com/example/java_apollo_optionals/java/operationBased/java_apollo_optionals/adapter/MyQuery_VariablesAdapter.java.expected index 8f9a6fefadd..03b3f21d772 100644 --- a/libraries/apollo-compiler/src/test/graphql/com/example/java_apollo_optionals/java/operationBased/java_apollo_optionals/adapter/MyQuery_VariablesAdapter.java.expected +++ b/libraries/apollo-compiler/src/test/graphql/com/example/java_apollo_optionals/java/operationBased/java_apollo_optionals/adapter/MyQuery_VariablesAdapter.java.expected @@ -10,6 +10,7 @@ import com.apollographql.apollo3.api.ApolloOptionalAdapter; import com.apollographql.apollo3.api.ApolloOptionalCompositeAdapter; import com.apollographql.apollo3.api.CompositeAdapterContext; import com.apollographql.apollo3.api.CustomScalarAdapters; +import com.apollographql.apollo3.api.ImmutableMapBuilder; import com.apollographql.apollo3.api.ObjectCompositeAdapter; import com.apollographql.apollo3.api.Optional; import com.apollographql.apollo3.api.json.JsonWriter; @@ -22,8 +23,7 @@ public enum MyQuery_VariablesAdapter { INSTANCE; public void serializeVariables(JsonWriter writer, MyQuery value, - CustomScalarAdapters customScalarAdapters, boolean withBooleanDefaultValues) throws - IOException { + CustomScalarAdapters customScalarAdapters, boolean withDefaultValues) throws IOException { CompositeAdapterContext adapterContext = new CompositeAdapterContext.Builder().customScalarAdapters(customScalarAdapters).build(); if (value.nullableInt instanceof Optional.Present) { writer.name("nullableInt"); @@ -35,6 +35,10 @@ public enum MyQuery_VariablesAdapter { writer.name("nonNullableIntWithDefault"); new ApolloOptionalAdapter<>(Adapters.IntAdapter).toJson(writer, CustomScalarAdapters.Empty, value.nonNullableIntWithDefault); } + else if (withDefaultValues) { + writer.name("nonNullableIntWithDefault"); + Adapters.NullableAnyAdapter.toJson(writer, CustomScalarAdapters.Empty, 4); + } if (value.nullableInput instanceof Optional.Present) { writer.name("nullableInput"); new ApolloOptionalCompositeAdapter<>(new ApolloOptionalCompositeAdapter<>(new ObjectCompositeAdapter(MyInput_InputAdapter.INSTANCE, false))).toJson(writer, value.nullableInput, adapterContext); @@ -45,5 +49,9 @@ public enum MyQuery_VariablesAdapter { writer.name("nonNullableInputWithDefault"); new ApolloOptionalCompositeAdapter<>(new ObjectCompositeAdapter(MyInput_InputAdapter.INSTANCE, false)).toJson(writer, value.nonNullableInputWithDefault, adapterContext); } + else if (withDefaultValues) { + writer.name("nonNullableInputWithDefault"); + Adapters.NullableAnyAdapter.toJson(writer, CustomScalarAdapters.Empty, new ImmutableMapBuilder().put("nonNullableInt", 4).build()); + } } } diff --git a/libraries/apollo-compiler/src/test/graphql/com/example/java_apollo_optionals/java/operationBased/java_apollo_optionals/selections/MyQuerySelections.java.expected b/libraries/apollo-compiler/src/test/graphql/com/example/java_apollo_optionals/java/operationBased/java_apollo_optionals/selections/MyQuerySelections.java.expected index b81f0f79bdc..1638a7f67f5 100644 --- a/libraries/apollo-compiler/src/test/graphql/com/example/java_apollo_optionals/java/operationBased/java_apollo_optionals/selections/MyQuerySelections.java.expected +++ b/libraries/apollo-compiler/src/test/graphql/com/example/java_apollo_optionals/java/operationBased/java_apollo_optionals/selections/MyQuerySelections.java.expected @@ -29,8 +29,8 @@ public class MyQuerySelections { ); public static List __root = Arrays.asList( - new CompiledField.Builder("nullableInt", GraphQLInt.type).arguments(Arrays.asList(new CompiledArgument.Builder("nonNullableInput", new CompiledVariable("nonNullableInput")).build(), new CompiledArgument.Builder("nonNullableInputWithDefault", new CompiledVariable("nonNullableInputWithDefault")).build(), new CompiledArgument.Builder("nonNullableInt", new CompiledVariable("nonNullableInt")).build(), new CompiledArgument.Builder("nonNullableIntWithDefault", new CompiledVariable("nonNullableIntWithDefault")).build(), new CompiledArgument.Builder("nullableInput", new CompiledVariable("nullableInput")).build(), new CompiledArgument.Builder("nullableInt", new CompiledVariable("nullableInt")).build())).build(), - new CompiledField.Builder("nonNullableInt", new CompiledNotNullType(GraphQLInt.type)).arguments(Arrays.asList(new CompiledArgument.Builder("nonNullableInput", new CompiledVariable("nonNullableInput")).build(), new CompiledArgument.Builder("nonNullableInputWithDefault", new CompiledVariable("nonNullableInputWithDefault")).build(), new CompiledArgument.Builder("nonNullableInt", new CompiledVariable("nonNullableInt")).build(), new CompiledArgument.Builder("nonNullableIntWithDefault", new CompiledVariable("nonNullableIntWithDefault")).build(), new CompiledArgument.Builder("nullableInput", new CompiledVariable("nullableInput")).build(), new CompiledArgument.Builder("nullableInt", new CompiledVariable("nullableInt")).build())).build(), + new CompiledField.Builder("nullableInt", GraphQLInt.type).arguments(Arrays.asList(new CompiledArgument.Builder("nonNullableInput").value(new CompiledVariable("nonNullableInput")).build(), new CompiledArgument.Builder("nonNullableInputWithDefault").value(new CompiledVariable("nonNullableInputWithDefault")).build(), new CompiledArgument.Builder("nonNullableInt").value(new CompiledVariable("nonNullableInt")).build(), new CompiledArgument.Builder("nonNullableIntWithDefault").value(new CompiledVariable("nonNullableIntWithDefault")).build(), new CompiledArgument.Builder("nullableInput").value(new CompiledVariable("nullableInput")).build(), new CompiledArgument.Builder("nullableInt").value(new CompiledVariable("nullableInt")).build())).build(), + new CompiledField.Builder("nonNullableInt", new CompiledNotNullType(GraphQLInt.type)).arguments(Arrays.asList(new CompiledArgument.Builder("nonNullableInput").value(new CompiledVariable("nonNullableInput")).build(), new CompiledArgument.Builder("nonNullableInputWithDefault").value(new CompiledVariable("nonNullableInputWithDefault")).build(), new CompiledArgument.Builder("nonNullableInt").value(new CompiledVariable("nonNullableInt")).build(), new CompiledArgument.Builder("nonNullableIntWithDefault").value(new CompiledVariable("nonNullableIntWithDefault")).build(), new CompiledArgument.Builder("nullableInput").value(new CompiledVariable("nullableInput")).build(), new CompiledArgument.Builder("nullableInt").value(new CompiledVariable("nullableInt")).build())).build(), new CompiledField.Builder("nullableMyType", MyType.type).selections(__nullableMyType).build(), new CompiledField.Builder("nonNullableMyType", new CompiledNotNullType(MyType.type)).selections(__nonNullableMyType).build(), new CompiledField.Builder("nullableListOfNullableString", new CompiledListType(GraphQLString.type)).build(), diff --git a/libraries/apollo-compiler/src/test/graphql/com/example/java_apollo_optionals/kotlin/responseBased/java_apollo_optionals/MyQuery.kt.expected b/libraries/apollo-compiler/src/test/graphql/com/example/java_apollo_optionals/kotlin/responseBased/java_apollo_optionals/MyQuery.kt.expected index 7c488bca315..6ecd31908eb 100644 --- a/libraries/apollo-compiler/src/test/graphql/com/example/java_apollo_optionals/kotlin/responseBased/java_apollo_optionals/MyQuery.kt.expected +++ b/libraries/apollo-compiler/src/test/graphql/com/example/java_apollo_optionals/kotlin/responseBased/java_apollo_optionals/MyQuery.kt.expected @@ -40,10 +40,10 @@ public data class MyQuery( override fun serializeVariables( writer: JsonWriter, customScalarAdapters: CustomScalarAdapters, - withBooleanDefaultValues: Boolean, + withDefaultValues: Boolean, ) { MyQuery_VariablesAdapter.serializeVariables(writer, this, customScalarAdapters, - withBooleanDefaultValues) + withDefaultValues) } override fun adapter(): CompositeAdapter = MyQuery_ResponseAdapter.Data.obj() diff --git a/libraries/apollo-compiler/src/test/graphql/com/example/java_apollo_optionals/kotlin/responseBased/java_apollo_optionals/adapter/MyQuery_VariablesAdapter.kt.expected b/libraries/apollo-compiler/src/test/graphql/com/example/java_apollo_optionals/kotlin/responseBased/java_apollo_optionals/adapter/MyQuery_VariablesAdapter.kt.expected index 66df40b3108..99e32ef713b 100644 --- a/libraries/apollo-compiler/src/test/graphql/com/example/java_apollo_optionals/kotlin/responseBased/java_apollo_optionals/adapter/MyQuery_VariablesAdapter.kt.expected +++ b/libraries/apollo-compiler/src/test/graphql/com/example/java_apollo_optionals/kotlin/responseBased/java_apollo_optionals/adapter/MyQuery_VariablesAdapter.kt.expected @@ -7,6 +7,7 @@ package com.example.java_apollo_optionals.adapter import com.apollographql.apollo3.api.CustomScalarAdapters import com.apollographql.apollo3.api.IntAdapter +import com.apollographql.apollo3.api.NullableAnyAdapter import com.apollographql.apollo3.api.NullableIntAdapter import com.apollographql.apollo3.api.Optional import com.apollographql.apollo3.api.json.JsonWriter @@ -27,7 +28,7 @@ public object MyQuery_VariablesAdapter { writer: JsonWriter, `value`: MyQuery, customScalarAdapters: CustomScalarAdapters, - withBooleanDefaultValues: Boolean, + withDefaultValues: Boolean, ) { if (value.nullableInt is Optional.Present) { writer.name("nullableInt") @@ -39,6 +40,10 @@ public object MyQuery_VariablesAdapter { writer.name("nonNullableIntWithDefault") IntAdapter.present().toJson(writer, customScalarAdapters, value.nonNullableIntWithDefault) } + else if (withDefaultValues) { + writer.name("nonNullableIntWithDefault") + NullableAnyAdapter.toJson(writer, customScalarAdapters, 4) + } if (value.nullableInput is Optional.Present) { writer.name("nullableInput") MyInput_InputAdapter.obj().nullable().present().toJson(writer, customScalarAdapters, @@ -51,5 +56,11 @@ public object MyQuery_VariablesAdapter { MyInput_InputAdapter.obj().present().toJson(writer, customScalarAdapters, value.nonNullableInputWithDefault) } + else if (withDefaultValues) { + writer.name("nonNullableInputWithDefault") + NullableAnyAdapter.toJson(writer, customScalarAdapters, mapOf( + "nonNullableInt" to 4 + )) + } } } diff --git a/libraries/apollo-compiler/src/test/graphql/com/example/java_apollo_optionals/kotlin/responseBased/java_apollo_optionals/selections/MyQuerySelections.kt.expected b/libraries/apollo-compiler/src/test/graphql/com/example/java_apollo_optionals/kotlin/responseBased/java_apollo_optionals/selections/MyQuerySelections.kt.expected index 66342eb5b97..4ff5f63bfd3 100644 --- a/libraries/apollo-compiler/src/test/graphql/com/example/java_apollo_optionals/kotlin/responseBased/java_apollo_optionals/selections/MyQuerySelections.kt.expected +++ b/libraries/apollo-compiler/src/test/graphql/com/example/java_apollo_optionals/kotlin/responseBased/java_apollo_optionals/selections/MyQuerySelections.kt.expected @@ -44,24 +44,24 @@ public object MyQuerySelections { name = "nullableInt", type = GraphQLInt.type ).arguments(listOf( - CompiledArgument.Builder("nonNullableInput", CompiledVariable("nonNullableInput")).build(), - CompiledArgument.Builder("nonNullableInputWithDefault", CompiledVariable("nonNullableInputWithDefault")).build(), - CompiledArgument.Builder("nonNullableInt", CompiledVariable("nonNullableInt")).build(), - CompiledArgument.Builder("nonNullableIntWithDefault", CompiledVariable("nonNullableIntWithDefault")).build(), - CompiledArgument.Builder("nullableInput", CompiledVariable("nullableInput")).build(), - CompiledArgument.Builder("nullableInt", CompiledVariable("nullableInt")).build() + CompiledArgument.Builder("nonNullableInput").value(CompiledVariable("nonNullableInput")).build(), + CompiledArgument.Builder("nonNullableInputWithDefault").value(CompiledVariable("nonNullableInputWithDefault")).build(), + CompiledArgument.Builder("nonNullableInt").value(CompiledVariable("nonNullableInt")).build(), + CompiledArgument.Builder("nonNullableIntWithDefault").value(CompiledVariable("nonNullableIntWithDefault")).build(), + CompiledArgument.Builder("nullableInput").value(CompiledVariable("nullableInput")).build(), + CompiledArgument.Builder("nullableInt").value(CompiledVariable("nullableInt")).build() )) .build(), CompiledField.Builder( name = "nonNullableInt", type = GraphQLInt.type.notNull() ).arguments(listOf( - CompiledArgument.Builder("nonNullableInput", CompiledVariable("nonNullableInput")).build(), - CompiledArgument.Builder("nonNullableInputWithDefault", CompiledVariable("nonNullableInputWithDefault")).build(), - CompiledArgument.Builder("nonNullableInt", CompiledVariable("nonNullableInt")).build(), - CompiledArgument.Builder("nonNullableIntWithDefault", CompiledVariable("nonNullableIntWithDefault")).build(), - CompiledArgument.Builder("nullableInput", CompiledVariable("nullableInput")).build(), - CompiledArgument.Builder("nullableInt", CompiledVariable("nullableInt")).build() + CompiledArgument.Builder("nonNullableInput").value(CompiledVariable("nonNullableInput")).build(), + CompiledArgument.Builder("nonNullableInputWithDefault").value(CompiledVariable("nonNullableInputWithDefault")).build(), + CompiledArgument.Builder("nonNullableInt").value(CompiledVariable("nonNullableInt")).build(), + CompiledArgument.Builder("nonNullableIntWithDefault").value(CompiledVariable("nonNullableIntWithDefault")).build(), + CompiledArgument.Builder("nullableInput").value(CompiledVariable("nullableInput")).build(), + CompiledArgument.Builder("nullableInt").value(CompiledVariable("nullableInt")).build() )) .build(), CompiledField.Builder( diff --git a/libraries/apollo-compiler/src/test/graphql/com/example/java_guava_optionals/java/operationBased/java_guava_optionals/MyQuery.java.expected b/libraries/apollo-compiler/src/test/graphql/com/example/java_guava_optionals/java/operationBased/java_guava_optionals/MyQuery.java.expected index 1d388adcece..c0290b7829c 100644 --- a/libraries/apollo-compiler/src/test/graphql/com/example/java_guava_optionals/java/operationBased/java_guava_optionals/MyQuery.java.expected +++ b/libraries/apollo-compiler/src/test/graphql/com/example/java_guava_optionals/java/operationBased/java_guava_optionals/MyQuery.java.expected @@ -157,8 +157,8 @@ public class MyQuery implements Query { @Override public void serializeVariables(JsonWriter writer, CustomScalarAdapters customScalarAdapters, - boolean withBooleanDefaultValues) throws IOException { - MyQuery_VariablesAdapter.INSTANCE.serializeVariables(writer, this, customScalarAdapters, withBooleanDefaultValues); + boolean withDefaultValues) throws IOException { + MyQuery_VariablesAdapter.INSTANCE.serializeVariables(writer, this, customScalarAdapters, withDefaultValues); } @Override diff --git a/libraries/apollo-compiler/src/test/graphql/com/example/java_guava_optionals/java/operationBased/java_guava_optionals/adapter/MyQuery_VariablesAdapter.java.expected b/libraries/apollo-compiler/src/test/graphql/com/example/java_guava_optionals/java/operationBased/java_guava_optionals/adapter/MyQuery_VariablesAdapter.java.expected index 2c5e4ff16c1..6a85c22e5bf 100644 --- a/libraries/apollo-compiler/src/test/graphql/com/example/java_guava_optionals/java/operationBased/java_guava_optionals/adapter/MyQuery_VariablesAdapter.java.expected +++ b/libraries/apollo-compiler/src/test/graphql/com/example/java_guava_optionals/java/operationBased/java_guava_optionals/adapter/MyQuery_VariablesAdapter.java.expected @@ -8,6 +8,7 @@ package com.example.java_guava_optionals.adapter; import com.apollographql.apollo3.api.Adapters; import com.apollographql.apollo3.api.CompositeAdapterContext; import com.apollographql.apollo3.api.CustomScalarAdapters; +import com.apollographql.apollo3.api.ImmutableMapBuilder; import com.apollographql.apollo3.api.ObjectCompositeAdapter; import com.apollographql.apollo3.api.java.adapter.GuavaOptionalAdapter; import com.apollographql.apollo3.api.java.adapter.GuavaOptionalAdapters; @@ -22,8 +23,7 @@ public enum MyQuery_VariablesAdapter { INSTANCE; public void serializeVariables(JsonWriter writer, MyQuery value, - CustomScalarAdapters customScalarAdapters, boolean withBooleanDefaultValues) throws - IOException { + CustomScalarAdapters customScalarAdapters, boolean withDefaultValues) throws IOException { CompositeAdapterContext adapterContext = new CompositeAdapterContext.Builder().customScalarAdapters(customScalarAdapters).build(); if (value.nullableInt.isPresent()) { writer.name("nullableInt"); @@ -35,6 +35,10 @@ public enum MyQuery_VariablesAdapter { writer.name("nonNullableIntWithDefault"); new GuavaOptionalAdapter<>(Adapters.IntAdapter).toJson(writer, CustomScalarAdapters.Empty, value.nonNullableIntWithDefault); } + else if (withDefaultValues) { + writer.name("nonNullableIntWithDefault"); + Adapters.NullableAnyAdapter.toJson(writer, CustomScalarAdapters.Empty, 4); + } if (value.nullableInput.isPresent()) { writer.name("nullableInput"); new GuavaOptionalCompositeAdapter<>(new GuavaOptionalCompositeAdapter<>(new ObjectCompositeAdapter(MyInput_InputAdapter.INSTANCE, false))).toJson(writer, value.nullableInput, adapterContext); @@ -45,5 +49,9 @@ public enum MyQuery_VariablesAdapter { writer.name("nonNullableInputWithDefault"); new GuavaOptionalCompositeAdapter<>(new ObjectCompositeAdapter(MyInput_InputAdapter.INSTANCE, false)).toJson(writer, value.nonNullableInputWithDefault, adapterContext); } + else if (withDefaultValues) { + writer.name("nonNullableInputWithDefault"); + Adapters.NullableAnyAdapter.toJson(writer, CustomScalarAdapters.Empty, new ImmutableMapBuilder().put("nonNullableInt", 4).build()); + } } } diff --git a/libraries/apollo-compiler/src/test/graphql/com/example/java_guava_optionals/java/operationBased/java_guava_optionals/selections/MyQuerySelections.java.expected b/libraries/apollo-compiler/src/test/graphql/com/example/java_guava_optionals/java/operationBased/java_guava_optionals/selections/MyQuerySelections.java.expected index 49fbafa7f23..fe25160cba0 100644 --- a/libraries/apollo-compiler/src/test/graphql/com/example/java_guava_optionals/java/operationBased/java_guava_optionals/selections/MyQuerySelections.java.expected +++ b/libraries/apollo-compiler/src/test/graphql/com/example/java_guava_optionals/java/operationBased/java_guava_optionals/selections/MyQuerySelections.java.expected @@ -29,8 +29,8 @@ public class MyQuerySelections { ); public static List __root = Arrays.asList( - new CompiledField.Builder("nullableInt", GraphQLInt.type).arguments(Arrays.asList(new CompiledArgument.Builder("nonNullableInput", new CompiledVariable("nonNullableInput")).build(), new CompiledArgument.Builder("nonNullableInputWithDefault", new CompiledVariable("nonNullableInputWithDefault")).build(), new CompiledArgument.Builder("nonNullableInt", new CompiledVariable("nonNullableInt")).build(), new CompiledArgument.Builder("nonNullableIntWithDefault", new CompiledVariable("nonNullableIntWithDefault")).build(), new CompiledArgument.Builder("nullableInput", new CompiledVariable("nullableInput")).build(), new CompiledArgument.Builder("nullableInt", new CompiledVariable("nullableInt")).build())).build(), - new CompiledField.Builder("nonNullableInt", new CompiledNotNullType(GraphQLInt.type)).arguments(Arrays.asList(new CompiledArgument.Builder("nonNullableInput", new CompiledVariable("nonNullableInput")).build(), new CompiledArgument.Builder("nonNullableInputWithDefault", new CompiledVariable("nonNullableInputWithDefault")).build(), new CompiledArgument.Builder("nonNullableInt", new CompiledVariable("nonNullableInt")).build(), new CompiledArgument.Builder("nonNullableIntWithDefault", new CompiledVariable("nonNullableIntWithDefault")).build(), new CompiledArgument.Builder("nullableInput", new CompiledVariable("nullableInput")).build(), new CompiledArgument.Builder("nullableInt", new CompiledVariable("nullableInt")).build())).build(), + new CompiledField.Builder("nullableInt", GraphQLInt.type).arguments(Arrays.asList(new CompiledArgument.Builder("nonNullableInput").value(new CompiledVariable("nonNullableInput")).build(), new CompiledArgument.Builder("nonNullableInputWithDefault").value(new CompiledVariable("nonNullableInputWithDefault")).build(), new CompiledArgument.Builder("nonNullableInt").value(new CompiledVariable("nonNullableInt")).build(), new CompiledArgument.Builder("nonNullableIntWithDefault").value(new CompiledVariable("nonNullableIntWithDefault")).build(), new CompiledArgument.Builder("nullableInput").value(new CompiledVariable("nullableInput")).build(), new CompiledArgument.Builder("nullableInt").value(new CompiledVariable("nullableInt")).build())).build(), + new CompiledField.Builder("nonNullableInt", new CompiledNotNullType(GraphQLInt.type)).arguments(Arrays.asList(new CompiledArgument.Builder("nonNullableInput").value(new CompiledVariable("nonNullableInput")).build(), new CompiledArgument.Builder("nonNullableInputWithDefault").value(new CompiledVariable("nonNullableInputWithDefault")).build(), new CompiledArgument.Builder("nonNullableInt").value(new CompiledVariable("nonNullableInt")).build(), new CompiledArgument.Builder("nonNullableIntWithDefault").value(new CompiledVariable("nonNullableIntWithDefault")).build(), new CompiledArgument.Builder("nullableInput").value(new CompiledVariable("nullableInput")).build(), new CompiledArgument.Builder("nullableInt").value(new CompiledVariable("nullableInt")).build())).build(), new CompiledField.Builder("nullableMyType", MyType.type).selections(__nullableMyType).build(), new CompiledField.Builder("nonNullableMyType", new CompiledNotNullType(MyType.type)).selections(__nonNullableMyType).build(), new CompiledField.Builder("nullableListOfNullableString", new CompiledListType(GraphQLString.type)).build(), diff --git a/libraries/apollo-compiler/src/test/graphql/com/example/java_guava_optionals/kotlin/responseBased/java_guava_optionals/MyQuery.kt.expected b/libraries/apollo-compiler/src/test/graphql/com/example/java_guava_optionals/kotlin/responseBased/java_guava_optionals/MyQuery.kt.expected index c7ef1ca53a5..f9708f2b43c 100644 --- a/libraries/apollo-compiler/src/test/graphql/com/example/java_guava_optionals/kotlin/responseBased/java_guava_optionals/MyQuery.kt.expected +++ b/libraries/apollo-compiler/src/test/graphql/com/example/java_guava_optionals/kotlin/responseBased/java_guava_optionals/MyQuery.kt.expected @@ -40,10 +40,10 @@ public data class MyQuery( override fun serializeVariables( writer: JsonWriter, customScalarAdapters: CustomScalarAdapters, - withBooleanDefaultValues: Boolean, + withDefaultValues: Boolean, ) { MyQuery_VariablesAdapter.serializeVariables(writer, this, customScalarAdapters, - withBooleanDefaultValues) + withDefaultValues) } override fun adapter(): CompositeAdapter = MyQuery_ResponseAdapter.Data.obj() diff --git a/libraries/apollo-compiler/src/test/graphql/com/example/java_guava_optionals/kotlin/responseBased/java_guava_optionals/adapter/MyQuery_VariablesAdapter.kt.expected b/libraries/apollo-compiler/src/test/graphql/com/example/java_guava_optionals/kotlin/responseBased/java_guava_optionals/adapter/MyQuery_VariablesAdapter.kt.expected index 7299600d77e..51b14015b67 100644 --- a/libraries/apollo-compiler/src/test/graphql/com/example/java_guava_optionals/kotlin/responseBased/java_guava_optionals/adapter/MyQuery_VariablesAdapter.kt.expected +++ b/libraries/apollo-compiler/src/test/graphql/com/example/java_guava_optionals/kotlin/responseBased/java_guava_optionals/adapter/MyQuery_VariablesAdapter.kt.expected @@ -7,6 +7,7 @@ package com.example.java_guava_optionals.adapter import com.apollographql.apollo3.api.CustomScalarAdapters import com.apollographql.apollo3.api.IntAdapter +import com.apollographql.apollo3.api.NullableAnyAdapter import com.apollographql.apollo3.api.NullableIntAdapter import com.apollographql.apollo3.api.Optional import com.apollographql.apollo3.api.json.JsonWriter @@ -27,7 +28,7 @@ public object MyQuery_VariablesAdapter { writer: JsonWriter, `value`: MyQuery, customScalarAdapters: CustomScalarAdapters, - withBooleanDefaultValues: Boolean, + withDefaultValues: Boolean, ) { if (value.nullableInt is Optional.Present) { writer.name("nullableInt") @@ -39,6 +40,10 @@ public object MyQuery_VariablesAdapter { writer.name("nonNullableIntWithDefault") IntAdapter.present().toJson(writer, customScalarAdapters, value.nonNullableIntWithDefault) } + else if (withDefaultValues) { + writer.name("nonNullableIntWithDefault") + NullableAnyAdapter.toJson(writer, customScalarAdapters, 4) + } if (value.nullableInput is Optional.Present) { writer.name("nullableInput") MyInput_InputAdapter.obj().nullable().present().toJson(writer, customScalarAdapters, @@ -51,5 +56,11 @@ public object MyQuery_VariablesAdapter { MyInput_InputAdapter.obj().present().toJson(writer, customScalarAdapters, value.nonNullableInputWithDefault) } + else if (withDefaultValues) { + writer.name("nonNullableInputWithDefault") + NullableAnyAdapter.toJson(writer, customScalarAdapters, mapOf( + "nonNullableInt" to 4 + )) + } } } diff --git a/libraries/apollo-compiler/src/test/graphql/com/example/java_guava_optionals/kotlin/responseBased/java_guava_optionals/selections/MyQuerySelections.kt.expected b/libraries/apollo-compiler/src/test/graphql/com/example/java_guava_optionals/kotlin/responseBased/java_guava_optionals/selections/MyQuerySelections.kt.expected index 1ec0b2606ba..2c508494052 100644 --- a/libraries/apollo-compiler/src/test/graphql/com/example/java_guava_optionals/kotlin/responseBased/java_guava_optionals/selections/MyQuerySelections.kt.expected +++ b/libraries/apollo-compiler/src/test/graphql/com/example/java_guava_optionals/kotlin/responseBased/java_guava_optionals/selections/MyQuerySelections.kt.expected @@ -44,24 +44,24 @@ public object MyQuerySelections { name = "nullableInt", type = GraphQLInt.type ).arguments(listOf( - CompiledArgument.Builder("nonNullableInput", CompiledVariable("nonNullableInput")).build(), - CompiledArgument.Builder("nonNullableInputWithDefault", CompiledVariable("nonNullableInputWithDefault")).build(), - CompiledArgument.Builder("nonNullableInt", CompiledVariable("nonNullableInt")).build(), - CompiledArgument.Builder("nonNullableIntWithDefault", CompiledVariable("nonNullableIntWithDefault")).build(), - CompiledArgument.Builder("nullableInput", CompiledVariable("nullableInput")).build(), - CompiledArgument.Builder("nullableInt", CompiledVariable("nullableInt")).build() + CompiledArgument.Builder("nonNullableInput").value(CompiledVariable("nonNullableInput")).build(), + CompiledArgument.Builder("nonNullableInputWithDefault").value(CompiledVariable("nonNullableInputWithDefault")).build(), + CompiledArgument.Builder("nonNullableInt").value(CompiledVariable("nonNullableInt")).build(), + CompiledArgument.Builder("nonNullableIntWithDefault").value(CompiledVariable("nonNullableIntWithDefault")).build(), + CompiledArgument.Builder("nullableInput").value(CompiledVariable("nullableInput")).build(), + CompiledArgument.Builder("nullableInt").value(CompiledVariable("nullableInt")).build() )) .build(), CompiledField.Builder( name = "nonNullableInt", type = GraphQLInt.type.notNull() ).arguments(listOf( - CompiledArgument.Builder("nonNullableInput", CompiledVariable("nonNullableInput")).build(), - CompiledArgument.Builder("nonNullableInputWithDefault", CompiledVariable("nonNullableInputWithDefault")).build(), - CompiledArgument.Builder("nonNullableInt", CompiledVariable("nonNullableInt")).build(), - CompiledArgument.Builder("nonNullableIntWithDefault", CompiledVariable("nonNullableIntWithDefault")).build(), - CompiledArgument.Builder("nullableInput", CompiledVariable("nullableInput")).build(), - CompiledArgument.Builder("nullableInt", CompiledVariable("nullableInt")).build() + CompiledArgument.Builder("nonNullableInput").value(CompiledVariable("nonNullableInput")).build(), + CompiledArgument.Builder("nonNullableInputWithDefault").value(CompiledVariable("nonNullableInputWithDefault")).build(), + CompiledArgument.Builder("nonNullableInt").value(CompiledVariable("nonNullableInt")).build(), + CompiledArgument.Builder("nonNullableIntWithDefault").value(CompiledVariable("nonNullableIntWithDefault")).build(), + CompiledArgument.Builder("nullableInput").value(CompiledVariable("nullableInput")).build(), + CompiledArgument.Builder("nullableInt").value(CompiledVariable("nullableInt")).build() )) .build(), CompiledField.Builder( diff --git a/libraries/apollo-compiler/src/test/graphql/com/example/java_hashcode/java/operationBased/java_hashcode/TestQuery.java.expected b/libraries/apollo-compiler/src/test/graphql/com/example/java_hashcode/java/operationBased/java_hashcode/TestQuery.java.expected index 650a16acab1..c484ae74e1b 100644 --- a/libraries/apollo-compiler/src/test/graphql/com/example/java_hashcode/java/operationBased/java_hashcode/TestQuery.java.expected +++ b/libraries/apollo-compiler/src/test/graphql/com/example/java_hashcode/java/operationBased/java_hashcode/TestQuery.java.expected @@ -95,7 +95,7 @@ public class TestQuery implements Query { @Override public void serializeVariables(JsonWriter writer, CustomScalarAdapters customScalarAdapters, - boolean withBooleanDefaultValues) throws IOException { + boolean withDefaultValues) throws IOException { // This operation doesn't have any variable } diff --git a/libraries/apollo-compiler/src/test/graphql/com/example/java_hashcode/kotlin/responseBased/java_hashcode/TestQuery.kt.expected b/libraries/apollo-compiler/src/test/graphql/com/example/java_hashcode/kotlin/responseBased/java_hashcode/TestQuery.kt.expected index 942953efaa6..a80ec3aa895 100644 --- a/libraries/apollo-compiler/src/test/graphql/com/example/java_hashcode/kotlin/responseBased/java_hashcode/TestQuery.kt.expected +++ b/libraries/apollo-compiler/src/test/graphql/com/example/java_hashcode/kotlin/responseBased/java_hashcode/TestQuery.kt.expected @@ -34,7 +34,7 @@ public class TestQuery() : Query { override fun serializeVariables( writer: JsonWriter, customScalarAdapters: CustomScalarAdapters, - withBooleanDefaultValues: Boolean, + withDefaultValues: Boolean, ) { // This operation doesn't have any variable } diff --git a/libraries/apollo-compiler/src/test/graphql/com/example/java_java_optionals/java/operationBased/java_java_optionals/MyQuery.java.expected b/libraries/apollo-compiler/src/test/graphql/com/example/java_java_optionals/java/operationBased/java_java_optionals/MyQuery.java.expected index 6e79a4cc1da..6b5d901f67e 100644 --- a/libraries/apollo-compiler/src/test/graphql/com/example/java_java_optionals/java/operationBased/java_java_optionals/MyQuery.java.expected +++ b/libraries/apollo-compiler/src/test/graphql/com/example/java_java_optionals/java/operationBased/java_java_optionals/MyQuery.java.expected @@ -157,8 +157,8 @@ public class MyQuery implements Query { @Override public void serializeVariables(JsonWriter writer, CustomScalarAdapters customScalarAdapters, - boolean withBooleanDefaultValues) throws IOException { - MyQuery_VariablesAdapter.INSTANCE.serializeVariables(writer, this, customScalarAdapters, withBooleanDefaultValues); + boolean withDefaultValues) throws IOException { + MyQuery_VariablesAdapter.INSTANCE.serializeVariables(writer, this, customScalarAdapters, withDefaultValues); } @Override diff --git a/libraries/apollo-compiler/src/test/graphql/com/example/java_java_optionals/java/operationBased/java_java_optionals/adapter/MyQuery_VariablesAdapter.java.expected b/libraries/apollo-compiler/src/test/graphql/com/example/java_java_optionals/java/operationBased/java_java_optionals/adapter/MyQuery_VariablesAdapter.java.expected index cf9e1dc6fe2..e3ab53baf74 100644 --- a/libraries/apollo-compiler/src/test/graphql/com/example/java_java_optionals/java/operationBased/java_java_optionals/adapter/MyQuery_VariablesAdapter.java.expected +++ b/libraries/apollo-compiler/src/test/graphql/com/example/java_java_optionals/java/operationBased/java_java_optionals/adapter/MyQuery_VariablesAdapter.java.expected @@ -8,6 +8,7 @@ package com.example.java_java_optionals.adapter; import com.apollographql.apollo3.api.Adapters; import com.apollographql.apollo3.api.CompositeAdapterContext; import com.apollographql.apollo3.api.CustomScalarAdapters; +import com.apollographql.apollo3.api.ImmutableMapBuilder; import com.apollographql.apollo3.api.ObjectCompositeAdapter; import com.apollographql.apollo3.api.java.adapter.JavaOptionalAdapter; import com.apollographql.apollo3.api.java.adapter.JavaOptionalAdapters; @@ -22,8 +23,7 @@ public enum MyQuery_VariablesAdapter { INSTANCE; public void serializeVariables(JsonWriter writer, MyQuery value, - CustomScalarAdapters customScalarAdapters, boolean withBooleanDefaultValues) throws - IOException { + CustomScalarAdapters customScalarAdapters, boolean withDefaultValues) throws IOException { CompositeAdapterContext adapterContext = new CompositeAdapterContext.Builder().customScalarAdapters(customScalarAdapters).build(); if (value.nullableInt.isPresent()) { writer.name("nullableInt"); @@ -35,6 +35,10 @@ public enum MyQuery_VariablesAdapter { writer.name("nonNullableIntWithDefault"); new JavaOptionalAdapter<>(Adapters.IntAdapter).toJson(writer, CustomScalarAdapters.Empty, value.nonNullableIntWithDefault); } + else if (withDefaultValues) { + writer.name("nonNullableIntWithDefault"); + Adapters.NullableAnyAdapter.toJson(writer, CustomScalarAdapters.Empty, 4); + } if (value.nullableInput.isPresent()) { writer.name("nullableInput"); new JavaOptionalCompositeAdapter<>(new JavaOptionalCompositeAdapter<>(new ObjectCompositeAdapter(MyInput_InputAdapter.INSTANCE, false))).toJson(writer, value.nullableInput, adapterContext); @@ -45,5 +49,9 @@ public enum MyQuery_VariablesAdapter { writer.name("nonNullableInputWithDefault"); new JavaOptionalCompositeAdapter<>(new ObjectCompositeAdapter(MyInput_InputAdapter.INSTANCE, false)).toJson(writer, value.nonNullableInputWithDefault, adapterContext); } + else if (withDefaultValues) { + writer.name("nonNullableInputWithDefault"); + Adapters.NullableAnyAdapter.toJson(writer, CustomScalarAdapters.Empty, new ImmutableMapBuilder().put("nonNullableInt", 4).build()); + } } } diff --git a/libraries/apollo-compiler/src/test/graphql/com/example/java_java_optionals/java/operationBased/java_java_optionals/selections/MyQuerySelections.java.expected b/libraries/apollo-compiler/src/test/graphql/com/example/java_java_optionals/java/operationBased/java_java_optionals/selections/MyQuerySelections.java.expected index b76d967a1ee..278d4d425ee 100644 --- a/libraries/apollo-compiler/src/test/graphql/com/example/java_java_optionals/java/operationBased/java_java_optionals/selections/MyQuerySelections.java.expected +++ b/libraries/apollo-compiler/src/test/graphql/com/example/java_java_optionals/java/operationBased/java_java_optionals/selections/MyQuerySelections.java.expected @@ -29,8 +29,8 @@ public class MyQuerySelections { ); public static List __root = Arrays.asList( - new CompiledField.Builder("nullableInt", GraphQLInt.type).arguments(Arrays.asList(new CompiledArgument.Builder("nonNullableInput", new CompiledVariable("nonNullableInput")).build(), new CompiledArgument.Builder("nonNullableInputWithDefault", new CompiledVariable("nonNullableInputWithDefault")).build(), new CompiledArgument.Builder("nonNullableInt", new CompiledVariable("nonNullableInt")).build(), new CompiledArgument.Builder("nonNullableIntWithDefault", new CompiledVariable("nonNullableIntWithDefault")).build(), new CompiledArgument.Builder("nullableInput", new CompiledVariable("nullableInput")).build(), new CompiledArgument.Builder("nullableInt", new CompiledVariable("nullableInt")).build())).build(), - new CompiledField.Builder("nonNullableInt", new CompiledNotNullType(GraphQLInt.type)).arguments(Arrays.asList(new CompiledArgument.Builder("nonNullableInput", new CompiledVariable("nonNullableInput")).build(), new CompiledArgument.Builder("nonNullableInputWithDefault", new CompiledVariable("nonNullableInputWithDefault")).build(), new CompiledArgument.Builder("nonNullableInt", new CompiledVariable("nonNullableInt")).build(), new CompiledArgument.Builder("nonNullableIntWithDefault", new CompiledVariable("nonNullableIntWithDefault")).build(), new CompiledArgument.Builder("nullableInput", new CompiledVariable("nullableInput")).build(), new CompiledArgument.Builder("nullableInt", new CompiledVariable("nullableInt")).build())).build(), + new CompiledField.Builder("nullableInt", GraphQLInt.type).arguments(Arrays.asList(new CompiledArgument.Builder("nonNullableInput").value(new CompiledVariable("nonNullableInput")).build(), new CompiledArgument.Builder("nonNullableInputWithDefault").value(new CompiledVariable("nonNullableInputWithDefault")).build(), new CompiledArgument.Builder("nonNullableInt").value(new CompiledVariable("nonNullableInt")).build(), new CompiledArgument.Builder("nonNullableIntWithDefault").value(new CompiledVariable("nonNullableIntWithDefault")).build(), new CompiledArgument.Builder("nullableInput").value(new CompiledVariable("nullableInput")).build(), new CompiledArgument.Builder("nullableInt").value(new CompiledVariable("nullableInt")).build())).build(), + new CompiledField.Builder("nonNullableInt", new CompiledNotNullType(GraphQLInt.type)).arguments(Arrays.asList(new CompiledArgument.Builder("nonNullableInput").value(new CompiledVariable("nonNullableInput")).build(), new CompiledArgument.Builder("nonNullableInputWithDefault").value(new CompiledVariable("nonNullableInputWithDefault")).build(), new CompiledArgument.Builder("nonNullableInt").value(new CompiledVariable("nonNullableInt")).build(), new CompiledArgument.Builder("nonNullableIntWithDefault").value(new CompiledVariable("nonNullableIntWithDefault")).build(), new CompiledArgument.Builder("nullableInput").value(new CompiledVariable("nullableInput")).build(), new CompiledArgument.Builder("nullableInt").value(new CompiledVariable("nullableInt")).build())).build(), new CompiledField.Builder("nullableMyType", MyType.type).selections(__nullableMyType).build(), new CompiledField.Builder("nonNullableMyType", new CompiledNotNullType(MyType.type)).selections(__nonNullableMyType).build(), new CompiledField.Builder("nullableListOfNullableString", new CompiledListType(GraphQLString.type)).build(), diff --git a/libraries/apollo-compiler/src/test/graphql/com/example/java_java_optionals/kotlin/responseBased/java_java_optionals/MyQuery.kt.expected b/libraries/apollo-compiler/src/test/graphql/com/example/java_java_optionals/kotlin/responseBased/java_java_optionals/MyQuery.kt.expected index 8454cd6ef49..b2c4a795553 100644 --- a/libraries/apollo-compiler/src/test/graphql/com/example/java_java_optionals/kotlin/responseBased/java_java_optionals/MyQuery.kt.expected +++ b/libraries/apollo-compiler/src/test/graphql/com/example/java_java_optionals/kotlin/responseBased/java_java_optionals/MyQuery.kt.expected @@ -40,10 +40,10 @@ public data class MyQuery( override fun serializeVariables( writer: JsonWriter, customScalarAdapters: CustomScalarAdapters, - withBooleanDefaultValues: Boolean, + withDefaultValues: Boolean, ) { MyQuery_VariablesAdapter.serializeVariables(writer, this, customScalarAdapters, - withBooleanDefaultValues) + withDefaultValues) } override fun adapter(): CompositeAdapter = MyQuery_ResponseAdapter.Data.obj() diff --git a/libraries/apollo-compiler/src/test/graphql/com/example/java_java_optionals/kotlin/responseBased/java_java_optionals/adapter/MyQuery_VariablesAdapter.kt.expected b/libraries/apollo-compiler/src/test/graphql/com/example/java_java_optionals/kotlin/responseBased/java_java_optionals/adapter/MyQuery_VariablesAdapter.kt.expected index 1eb1b63559e..427f0ffef62 100644 --- a/libraries/apollo-compiler/src/test/graphql/com/example/java_java_optionals/kotlin/responseBased/java_java_optionals/adapter/MyQuery_VariablesAdapter.kt.expected +++ b/libraries/apollo-compiler/src/test/graphql/com/example/java_java_optionals/kotlin/responseBased/java_java_optionals/adapter/MyQuery_VariablesAdapter.kt.expected @@ -7,6 +7,7 @@ package com.example.java_java_optionals.adapter import com.apollographql.apollo3.api.CustomScalarAdapters import com.apollographql.apollo3.api.IntAdapter +import com.apollographql.apollo3.api.NullableAnyAdapter import com.apollographql.apollo3.api.NullableIntAdapter import com.apollographql.apollo3.api.Optional import com.apollographql.apollo3.api.json.JsonWriter @@ -27,7 +28,7 @@ public object MyQuery_VariablesAdapter { writer: JsonWriter, `value`: MyQuery, customScalarAdapters: CustomScalarAdapters, - withBooleanDefaultValues: Boolean, + withDefaultValues: Boolean, ) { if (value.nullableInt is Optional.Present) { writer.name("nullableInt") @@ -39,6 +40,10 @@ public object MyQuery_VariablesAdapter { writer.name("nonNullableIntWithDefault") IntAdapter.present().toJson(writer, customScalarAdapters, value.nonNullableIntWithDefault) } + else if (withDefaultValues) { + writer.name("nonNullableIntWithDefault") + NullableAnyAdapter.toJson(writer, customScalarAdapters, 4) + } if (value.nullableInput is Optional.Present) { writer.name("nullableInput") MyInput_InputAdapter.obj().nullable().present().toJson(writer, customScalarAdapters, @@ -51,5 +56,11 @@ public object MyQuery_VariablesAdapter { MyInput_InputAdapter.obj().present().toJson(writer, customScalarAdapters, value.nonNullableInputWithDefault) } + else if (withDefaultValues) { + writer.name("nonNullableInputWithDefault") + NullableAnyAdapter.toJson(writer, customScalarAdapters, mapOf( + "nonNullableInt" to 4 + )) + } } } diff --git a/libraries/apollo-compiler/src/test/graphql/com/example/java_java_optionals/kotlin/responseBased/java_java_optionals/selections/MyQuerySelections.kt.expected b/libraries/apollo-compiler/src/test/graphql/com/example/java_java_optionals/kotlin/responseBased/java_java_optionals/selections/MyQuerySelections.kt.expected index 64431c7a22a..26e74f7655c 100644 --- a/libraries/apollo-compiler/src/test/graphql/com/example/java_java_optionals/kotlin/responseBased/java_java_optionals/selections/MyQuerySelections.kt.expected +++ b/libraries/apollo-compiler/src/test/graphql/com/example/java_java_optionals/kotlin/responseBased/java_java_optionals/selections/MyQuerySelections.kt.expected @@ -44,24 +44,24 @@ public object MyQuerySelections { name = "nullableInt", type = GraphQLInt.type ).arguments(listOf( - CompiledArgument.Builder("nonNullableInput", CompiledVariable("nonNullableInput")).build(), - CompiledArgument.Builder("nonNullableInputWithDefault", CompiledVariable("nonNullableInputWithDefault")).build(), - CompiledArgument.Builder("nonNullableInt", CompiledVariable("nonNullableInt")).build(), - CompiledArgument.Builder("nonNullableIntWithDefault", CompiledVariable("nonNullableIntWithDefault")).build(), - CompiledArgument.Builder("nullableInput", CompiledVariable("nullableInput")).build(), - CompiledArgument.Builder("nullableInt", CompiledVariable("nullableInt")).build() + CompiledArgument.Builder("nonNullableInput").value(CompiledVariable("nonNullableInput")).build(), + CompiledArgument.Builder("nonNullableInputWithDefault").value(CompiledVariable("nonNullableInputWithDefault")).build(), + CompiledArgument.Builder("nonNullableInt").value(CompiledVariable("nonNullableInt")).build(), + CompiledArgument.Builder("nonNullableIntWithDefault").value(CompiledVariable("nonNullableIntWithDefault")).build(), + CompiledArgument.Builder("nullableInput").value(CompiledVariable("nullableInput")).build(), + CompiledArgument.Builder("nullableInt").value(CompiledVariable("nullableInt")).build() )) .build(), CompiledField.Builder( name = "nonNullableInt", type = GraphQLInt.type.notNull() ).arguments(listOf( - CompiledArgument.Builder("nonNullableInput", CompiledVariable("nonNullableInput")).build(), - CompiledArgument.Builder("nonNullableInputWithDefault", CompiledVariable("nonNullableInputWithDefault")).build(), - CompiledArgument.Builder("nonNullableInt", CompiledVariable("nonNullableInt")).build(), - CompiledArgument.Builder("nonNullableIntWithDefault", CompiledVariable("nonNullableIntWithDefault")).build(), - CompiledArgument.Builder("nullableInput", CompiledVariable("nullableInput")).build(), - CompiledArgument.Builder("nullableInt", CompiledVariable("nullableInt")).build() + CompiledArgument.Builder("nonNullableInput").value(CompiledVariable("nonNullableInput")).build(), + CompiledArgument.Builder("nonNullableInputWithDefault").value(CompiledVariable("nonNullableInputWithDefault")).build(), + CompiledArgument.Builder("nonNullableInt").value(CompiledVariable("nonNullableInt")).build(), + CompiledArgument.Builder("nonNullableIntWithDefault").value(CompiledVariable("nonNullableIntWithDefault")).build(), + CompiledArgument.Builder("nullableInput").value(CompiledVariable("nullableInput")).build(), + CompiledArgument.Builder("nullableInt").value(CompiledVariable("nullableInt")).build() )) .build(), CompiledField.Builder( diff --git a/libraries/apollo-compiler/src/test/graphql/com/example/java_jetbrains_annotations/java/operationBased/java_jetbrains_annotations/MyQuery.java.expected b/libraries/apollo-compiler/src/test/graphql/com/example/java_jetbrains_annotations/java/operationBased/java_jetbrains_annotations/MyQuery.java.expected index 702a4c498ca..8f2e9860f90 100644 --- a/libraries/apollo-compiler/src/test/graphql/com/example/java_jetbrains_annotations/java/operationBased/java_jetbrains_annotations/MyQuery.java.expected +++ b/libraries/apollo-compiler/src/test/graphql/com/example/java_jetbrains_annotations/java/operationBased/java_jetbrains_annotations/MyQuery.java.expected @@ -164,8 +164,8 @@ public class MyQuery implements Query { @Override public void serializeVariables(JsonWriter writer, CustomScalarAdapters customScalarAdapters, - boolean withBooleanDefaultValues) throws IOException { - MyQuery_VariablesAdapter.INSTANCE.serializeVariables(writer, this, customScalarAdapters, withBooleanDefaultValues); + boolean withDefaultValues) throws IOException { + MyQuery_VariablesAdapter.INSTANCE.serializeVariables(writer, this, customScalarAdapters, withDefaultValues); } @Override diff --git a/libraries/apollo-compiler/src/test/graphql/com/example/java_jetbrains_annotations/java/operationBased/java_jetbrains_annotations/adapter/MyQuery_VariablesAdapter.java.expected b/libraries/apollo-compiler/src/test/graphql/com/example/java_jetbrains_annotations/java/operationBased/java_jetbrains_annotations/adapter/MyQuery_VariablesAdapter.java.expected index f332d97d26d..013428ddcdc 100644 --- a/libraries/apollo-compiler/src/test/graphql/com/example/java_jetbrains_annotations/java/operationBased/java_jetbrains_annotations/adapter/MyQuery_VariablesAdapter.java.expected +++ b/libraries/apollo-compiler/src/test/graphql/com/example/java_jetbrains_annotations/java/operationBased/java_jetbrains_annotations/adapter/MyQuery_VariablesAdapter.java.expected @@ -10,6 +10,7 @@ import com.apollographql.apollo3.api.ApolloOptionalAdapter; import com.apollographql.apollo3.api.ApolloOptionalCompositeAdapter; import com.apollographql.apollo3.api.CompositeAdapterContext; import com.apollographql.apollo3.api.CustomScalarAdapters; +import com.apollographql.apollo3.api.ImmutableMapBuilder; import com.apollographql.apollo3.api.NullableCompositeAdapter; import com.apollographql.apollo3.api.ObjectCompositeAdapter; import com.apollographql.apollo3.api.Optional; @@ -23,8 +24,7 @@ public enum MyQuery_VariablesAdapter { INSTANCE; public void serializeVariables(JsonWriter writer, MyQuery value, - CustomScalarAdapters customScalarAdapters, boolean withBooleanDefaultValues) throws - IOException { + CustomScalarAdapters customScalarAdapters, boolean withDefaultValues) throws IOException { CompositeAdapterContext adapterContext = new CompositeAdapterContext.Builder().customScalarAdapters(customScalarAdapters).build(); if (value.nullableInt instanceof Optional.Present) { writer.name("nullableInt"); @@ -36,6 +36,10 @@ public enum MyQuery_VariablesAdapter { writer.name("nonNullableIntWithDefault"); new ApolloOptionalAdapter<>(Adapters.IntAdapter).toJson(writer, CustomScalarAdapters.Empty, value.nonNullableIntWithDefault); } + else if (withDefaultValues) { + writer.name("nonNullableIntWithDefault"); + Adapters.NullableAnyAdapter.toJson(writer, CustomScalarAdapters.Empty, 4); + } if (value.nullableInput instanceof Optional.Present) { writer.name("nullableInput"); new ApolloOptionalCompositeAdapter<>(new NullableCompositeAdapter<>(new ObjectCompositeAdapter(MyInput_InputAdapter.INSTANCE, false))).toJson(writer, value.nullableInput, adapterContext); @@ -46,5 +50,9 @@ public enum MyQuery_VariablesAdapter { writer.name("nonNullableInputWithDefault"); new ApolloOptionalCompositeAdapter<>(new ObjectCompositeAdapter(MyInput_InputAdapter.INSTANCE, false)).toJson(writer, value.nonNullableInputWithDefault, adapterContext); } + else if (withDefaultValues) { + writer.name("nonNullableInputWithDefault"); + Adapters.NullableAnyAdapter.toJson(writer, CustomScalarAdapters.Empty, new ImmutableMapBuilder().put("nonNullableInt", 4).build()); + } } } diff --git a/libraries/apollo-compiler/src/test/graphql/com/example/java_jetbrains_annotations/java/operationBased/java_jetbrains_annotations/selections/MyQuerySelections.java.expected b/libraries/apollo-compiler/src/test/graphql/com/example/java_jetbrains_annotations/java/operationBased/java_jetbrains_annotations/selections/MyQuerySelections.java.expected index d0c88b34708..8dc469fa136 100644 --- a/libraries/apollo-compiler/src/test/graphql/com/example/java_jetbrains_annotations/java/operationBased/java_jetbrains_annotations/selections/MyQuerySelections.java.expected +++ b/libraries/apollo-compiler/src/test/graphql/com/example/java_jetbrains_annotations/java/operationBased/java_jetbrains_annotations/selections/MyQuerySelections.java.expected @@ -29,8 +29,8 @@ public class MyQuerySelections { ); public static List __root = Arrays.asList( - new CompiledField.Builder("nullableInt", GraphQLInt.type).arguments(Arrays.asList(new CompiledArgument.Builder("nonNullableInput", new CompiledVariable("nonNullableInput")).build(), new CompiledArgument.Builder("nonNullableInputWithDefault", new CompiledVariable("nonNullableInputWithDefault")).build(), new CompiledArgument.Builder("nonNullableInt", new CompiledVariable("nonNullableInt")).build(), new CompiledArgument.Builder("nonNullableIntWithDefault", new CompiledVariable("nonNullableIntWithDefault")).build(), new CompiledArgument.Builder("nullableInput", new CompiledVariable("nullableInput")).build(), new CompiledArgument.Builder("nullableInt", new CompiledVariable("nullableInt")).build())).build(), - new CompiledField.Builder("nonNullableInt", new CompiledNotNullType(GraphQLInt.type)).arguments(Arrays.asList(new CompiledArgument.Builder("nonNullableInput", new CompiledVariable("nonNullableInput")).build(), new CompiledArgument.Builder("nonNullableInputWithDefault", new CompiledVariable("nonNullableInputWithDefault")).build(), new CompiledArgument.Builder("nonNullableInt", new CompiledVariable("nonNullableInt")).build(), new CompiledArgument.Builder("nonNullableIntWithDefault", new CompiledVariable("nonNullableIntWithDefault")).build(), new CompiledArgument.Builder("nullableInput", new CompiledVariable("nullableInput")).build(), new CompiledArgument.Builder("nullableInt", new CompiledVariable("nullableInt")).build())).build(), + new CompiledField.Builder("nullableInt", GraphQLInt.type).arguments(Arrays.asList(new CompiledArgument.Builder("nonNullableInput").value(new CompiledVariable("nonNullableInput")).build(), new CompiledArgument.Builder("nonNullableInputWithDefault").value(new CompiledVariable("nonNullableInputWithDefault")).build(), new CompiledArgument.Builder("nonNullableInt").value(new CompiledVariable("nonNullableInt")).build(), new CompiledArgument.Builder("nonNullableIntWithDefault").value(new CompiledVariable("nonNullableIntWithDefault")).build(), new CompiledArgument.Builder("nullableInput").value(new CompiledVariable("nullableInput")).build(), new CompiledArgument.Builder("nullableInt").value(new CompiledVariable("nullableInt")).build())).build(), + new CompiledField.Builder("nonNullableInt", new CompiledNotNullType(GraphQLInt.type)).arguments(Arrays.asList(new CompiledArgument.Builder("nonNullableInput").value(new CompiledVariable("nonNullableInput")).build(), new CompiledArgument.Builder("nonNullableInputWithDefault").value(new CompiledVariable("nonNullableInputWithDefault")).build(), new CompiledArgument.Builder("nonNullableInt").value(new CompiledVariable("nonNullableInt")).build(), new CompiledArgument.Builder("nonNullableIntWithDefault").value(new CompiledVariable("nonNullableIntWithDefault")).build(), new CompiledArgument.Builder("nullableInput").value(new CompiledVariable("nullableInput")).build(), new CompiledArgument.Builder("nullableInt").value(new CompiledVariable("nullableInt")).build())).build(), new CompiledField.Builder("nullableMyType", MyType.type).selections(__nullableMyType).build(), new CompiledField.Builder("nonNullableMyType", new CompiledNotNullType(MyType.type)).selections(__nonNullableMyType).build(), new CompiledField.Builder("nullableListOfNullableString", new CompiledListType(GraphQLString.type)).build(), diff --git a/libraries/apollo-compiler/src/test/graphql/com/example/java_jetbrains_annotations/kotlin/responseBased/java_jetbrains_annotations/MyQuery.kt.expected b/libraries/apollo-compiler/src/test/graphql/com/example/java_jetbrains_annotations/kotlin/responseBased/java_jetbrains_annotations/MyQuery.kt.expected index 8a5046eb336..0804a017574 100644 --- a/libraries/apollo-compiler/src/test/graphql/com/example/java_jetbrains_annotations/kotlin/responseBased/java_jetbrains_annotations/MyQuery.kt.expected +++ b/libraries/apollo-compiler/src/test/graphql/com/example/java_jetbrains_annotations/kotlin/responseBased/java_jetbrains_annotations/MyQuery.kt.expected @@ -40,10 +40,10 @@ public data class MyQuery( override fun serializeVariables( writer: JsonWriter, customScalarAdapters: CustomScalarAdapters, - withBooleanDefaultValues: Boolean, + withDefaultValues: Boolean, ) { MyQuery_VariablesAdapter.serializeVariables(writer, this, customScalarAdapters, - withBooleanDefaultValues) + withDefaultValues) } override fun adapter(): CompositeAdapter = MyQuery_ResponseAdapter.Data.obj() diff --git a/libraries/apollo-compiler/src/test/graphql/com/example/java_jetbrains_annotations/kotlin/responseBased/java_jetbrains_annotations/adapter/MyQuery_VariablesAdapter.kt.expected b/libraries/apollo-compiler/src/test/graphql/com/example/java_jetbrains_annotations/kotlin/responseBased/java_jetbrains_annotations/adapter/MyQuery_VariablesAdapter.kt.expected index f3ab571f605..8d23bd48524 100644 --- a/libraries/apollo-compiler/src/test/graphql/com/example/java_jetbrains_annotations/kotlin/responseBased/java_jetbrains_annotations/adapter/MyQuery_VariablesAdapter.kt.expected +++ b/libraries/apollo-compiler/src/test/graphql/com/example/java_jetbrains_annotations/kotlin/responseBased/java_jetbrains_annotations/adapter/MyQuery_VariablesAdapter.kt.expected @@ -7,6 +7,7 @@ package com.example.java_jetbrains_annotations.adapter import com.apollographql.apollo3.api.CustomScalarAdapters import com.apollographql.apollo3.api.IntAdapter +import com.apollographql.apollo3.api.NullableAnyAdapter import com.apollographql.apollo3.api.NullableIntAdapter import com.apollographql.apollo3.api.Optional import com.apollographql.apollo3.api.json.JsonWriter @@ -27,7 +28,7 @@ public object MyQuery_VariablesAdapter { writer: JsonWriter, `value`: MyQuery, customScalarAdapters: CustomScalarAdapters, - withBooleanDefaultValues: Boolean, + withDefaultValues: Boolean, ) { if (value.nullableInt is Optional.Present) { writer.name("nullableInt") @@ -39,6 +40,10 @@ public object MyQuery_VariablesAdapter { writer.name("nonNullableIntWithDefault") IntAdapter.present().toJson(writer, customScalarAdapters, value.nonNullableIntWithDefault) } + else if (withDefaultValues) { + writer.name("nonNullableIntWithDefault") + NullableAnyAdapter.toJson(writer, customScalarAdapters, 4) + } if (value.nullableInput is Optional.Present) { writer.name("nullableInput") MyInput_InputAdapter.obj().nullable().present().toJson(writer, customScalarAdapters, @@ -51,5 +56,11 @@ public object MyQuery_VariablesAdapter { MyInput_InputAdapter.obj().present().toJson(writer, customScalarAdapters, value.nonNullableInputWithDefault) } + else if (withDefaultValues) { + writer.name("nonNullableInputWithDefault") + NullableAnyAdapter.toJson(writer, customScalarAdapters, mapOf( + "nonNullableInt" to 4 + )) + } } } diff --git a/libraries/apollo-compiler/src/test/graphql/com/example/java_jetbrains_annotations/kotlin/responseBased/java_jetbrains_annotations/selections/MyQuerySelections.kt.expected b/libraries/apollo-compiler/src/test/graphql/com/example/java_jetbrains_annotations/kotlin/responseBased/java_jetbrains_annotations/selections/MyQuerySelections.kt.expected index 7cb43555f46..0183ac59551 100644 --- a/libraries/apollo-compiler/src/test/graphql/com/example/java_jetbrains_annotations/kotlin/responseBased/java_jetbrains_annotations/selections/MyQuerySelections.kt.expected +++ b/libraries/apollo-compiler/src/test/graphql/com/example/java_jetbrains_annotations/kotlin/responseBased/java_jetbrains_annotations/selections/MyQuerySelections.kt.expected @@ -44,24 +44,24 @@ public object MyQuerySelections { name = "nullableInt", type = GraphQLInt.type ).arguments(listOf( - CompiledArgument.Builder("nonNullableInput", CompiledVariable("nonNullableInput")).build(), - CompiledArgument.Builder("nonNullableInputWithDefault", CompiledVariable("nonNullableInputWithDefault")).build(), - CompiledArgument.Builder("nonNullableInt", CompiledVariable("nonNullableInt")).build(), - CompiledArgument.Builder("nonNullableIntWithDefault", CompiledVariable("nonNullableIntWithDefault")).build(), - CompiledArgument.Builder("nullableInput", CompiledVariable("nullableInput")).build(), - CompiledArgument.Builder("nullableInt", CompiledVariable("nullableInt")).build() + CompiledArgument.Builder("nonNullableInput").value(CompiledVariable("nonNullableInput")).build(), + CompiledArgument.Builder("nonNullableInputWithDefault").value(CompiledVariable("nonNullableInputWithDefault")).build(), + CompiledArgument.Builder("nonNullableInt").value(CompiledVariable("nonNullableInt")).build(), + CompiledArgument.Builder("nonNullableIntWithDefault").value(CompiledVariable("nonNullableIntWithDefault")).build(), + CompiledArgument.Builder("nullableInput").value(CompiledVariable("nullableInput")).build(), + CompiledArgument.Builder("nullableInt").value(CompiledVariable("nullableInt")).build() )) .build(), CompiledField.Builder( name = "nonNullableInt", type = GraphQLInt.type.notNull() ).arguments(listOf( - CompiledArgument.Builder("nonNullableInput", CompiledVariable("nonNullableInput")).build(), - CompiledArgument.Builder("nonNullableInputWithDefault", CompiledVariable("nonNullableInputWithDefault")).build(), - CompiledArgument.Builder("nonNullableInt", CompiledVariable("nonNullableInt")).build(), - CompiledArgument.Builder("nonNullableIntWithDefault", CompiledVariable("nonNullableIntWithDefault")).build(), - CompiledArgument.Builder("nullableInput", CompiledVariable("nullableInput")).build(), - CompiledArgument.Builder("nullableInt", CompiledVariable("nullableInt")).build() + CompiledArgument.Builder("nonNullableInput").value(CompiledVariable("nonNullableInput")).build(), + CompiledArgument.Builder("nonNullableInputWithDefault").value(CompiledVariable("nonNullableInputWithDefault")).build(), + CompiledArgument.Builder("nonNullableInt").value(CompiledVariable("nonNullableInt")).build(), + CompiledArgument.Builder("nonNullableIntWithDefault").value(CompiledVariable("nonNullableIntWithDefault")).build(), + CompiledArgument.Builder("nullableInput").value(CompiledVariable("nullableInput")).build(), + CompiledArgument.Builder("nullableInt").value(CompiledVariable("nullableInt")).build() )) .build(), CompiledField.Builder( diff --git a/libraries/apollo-compiler/src/test/graphql/com/example/java_jsr305_annotations/java/operationBased/java_jsr305_annotations/MyQuery.java.expected b/libraries/apollo-compiler/src/test/graphql/com/example/java_jsr305_annotations/java/operationBased/java_jsr305_annotations/MyQuery.java.expected index a09c27facc6..687406e14f1 100644 --- a/libraries/apollo-compiler/src/test/graphql/com/example/java_jsr305_annotations/java/operationBased/java_jsr305_annotations/MyQuery.java.expected +++ b/libraries/apollo-compiler/src/test/graphql/com/example/java_jsr305_annotations/java/operationBased/java_jsr305_annotations/MyQuery.java.expected @@ -164,8 +164,8 @@ public class MyQuery implements Query { @Override public void serializeVariables(JsonWriter writer, CustomScalarAdapters customScalarAdapters, - boolean withBooleanDefaultValues) throws IOException { - MyQuery_VariablesAdapter.INSTANCE.serializeVariables(writer, this, customScalarAdapters, withBooleanDefaultValues); + boolean withDefaultValues) throws IOException { + MyQuery_VariablesAdapter.INSTANCE.serializeVariables(writer, this, customScalarAdapters, withDefaultValues); } @Override diff --git a/libraries/apollo-compiler/src/test/graphql/com/example/java_jsr305_annotations/java/operationBased/java_jsr305_annotations/adapter/MyQuery_VariablesAdapter.java.expected b/libraries/apollo-compiler/src/test/graphql/com/example/java_jsr305_annotations/java/operationBased/java_jsr305_annotations/adapter/MyQuery_VariablesAdapter.java.expected index 11af5e8612e..31ce653d908 100644 --- a/libraries/apollo-compiler/src/test/graphql/com/example/java_jsr305_annotations/java/operationBased/java_jsr305_annotations/adapter/MyQuery_VariablesAdapter.java.expected +++ b/libraries/apollo-compiler/src/test/graphql/com/example/java_jsr305_annotations/java/operationBased/java_jsr305_annotations/adapter/MyQuery_VariablesAdapter.java.expected @@ -10,6 +10,7 @@ import com.apollographql.apollo3.api.ApolloOptionalAdapter; import com.apollographql.apollo3.api.ApolloOptionalCompositeAdapter; import com.apollographql.apollo3.api.CompositeAdapterContext; import com.apollographql.apollo3.api.CustomScalarAdapters; +import com.apollographql.apollo3.api.ImmutableMapBuilder; import com.apollographql.apollo3.api.NullableCompositeAdapter; import com.apollographql.apollo3.api.ObjectCompositeAdapter; import com.apollographql.apollo3.api.Optional; @@ -23,8 +24,7 @@ public enum MyQuery_VariablesAdapter { INSTANCE; public void serializeVariables(JsonWriter writer, MyQuery value, - CustomScalarAdapters customScalarAdapters, boolean withBooleanDefaultValues) throws - IOException { + CustomScalarAdapters customScalarAdapters, boolean withDefaultValues) throws IOException { CompositeAdapterContext adapterContext = new CompositeAdapterContext.Builder().customScalarAdapters(customScalarAdapters).build(); if (value.nullableInt instanceof Optional.Present) { writer.name("nullableInt"); @@ -36,6 +36,10 @@ public enum MyQuery_VariablesAdapter { writer.name("nonNullableIntWithDefault"); new ApolloOptionalAdapter<>(Adapters.IntAdapter).toJson(writer, CustomScalarAdapters.Empty, value.nonNullableIntWithDefault); } + else if (withDefaultValues) { + writer.name("nonNullableIntWithDefault"); + Adapters.NullableAnyAdapter.toJson(writer, CustomScalarAdapters.Empty, 4); + } if (value.nullableInput instanceof Optional.Present) { writer.name("nullableInput"); new ApolloOptionalCompositeAdapter<>(new NullableCompositeAdapter<>(new ObjectCompositeAdapter(MyInput_InputAdapter.INSTANCE, false))).toJson(writer, value.nullableInput, adapterContext); @@ -46,5 +50,9 @@ public enum MyQuery_VariablesAdapter { writer.name("nonNullableInputWithDefault"); new ApolloOptionalCompositeAdapter<>(new ObjectCompositeAdapter(MyInput_InputAdapter.INSTANCE, false)).toJson(writer, value.nonNullableInputWithDefault, adapterContext); } + else if (withDefaultValues) { + writer.name("nonNullableInputWithDefault"); + Adapters.NullableAnyAdapter.toJson(writer, CustomScalarAdapters.Empty, new ImmutableMapBuilder().put("nonNullableInt", 4).build()); + } } } diff --git a/libraries/apollo-compiler/src/test/graphql/com/example/java_jsr305_annotations/java/operationBased/java_jsr305_annotations/selections/MyQuerySelections.java.expected b/libraries/apollo-compiler/src/test/graphql/com/example/java_jsr305_annotations/java/operationBased/java_jsr305_annotations/selections/MyQuerySelections.java.expected index 641f1f465bc..768d4dcc6c9 100644 --- a/libraries/apollo-compiler/src/test/graphql/com/example/java_jsr305_annotations/java/operationBased/java_jsr305_annotations/selections/MyQuerySelections.java.expected +++ b/libraries/apollo-compiler/src/test/graphql/com/example/java_jsr305_annotations/java/operationBased/java_jsr305_annotations/selections/MyQuerySelections.java.expected @@ -29,8 +29,8 @@ public class MyQuerySelections { ); public static List __root = Arrays.asList( - new CompiledField.Builder("nullableInt", GraphQLInt.type).arguments(Arrays.asList(new CompiledArgument.Builder("nonNullableInput", new CompiledVariable("nonNullableInput")).build(), new CompiledArgument.Builder("nonNullableInputWithDefault", new CompiledVariable("nonNullableInputWithDefault")).build(), new CompiledArgument.Builder("nonNullableInt", new CompiledVariable("nonNullableInt")).build(), new CompiledArgument.Builder("nonNullableIntWithDefault", new CompiledVariable("nonNullableIntWithDefault")).build(), new CompiledArgument.Builder("nullableInput", new CompiledVariable("nullableInput")).build(), new CompiledArgument.Builder("nullableInt", new CompiledVariable("nullableInt")).build())).build(), - new CompiledField.Builder("nonNullableInt", new CompiledNotNullType(GraphQLInt.type)).arguments(Arrays.asList(new CompiledArgument.Builder("nonNullableInput", new CompiledVariable("nonNullableInput")).build(), new CompiledArgument.Builder("nonNullableInputWithDefault", new CompiledVariable("nonNullableInputWithDefault")).build(), new CompiledArgument.Builder("nonNullableInt", new CompiledVariable("nonNullableInt")).build(), new CompiledArgument.Builder("nonNullableIntWithDefault", new CompiledVariable("nonNullableIntWithDefault")).build(), new CompiledArgument.Builder("nullableInput", new CompiledVariable("nullableInput")).build(), new CompiledArgument.Builder("nullableInt", new CompiledVariable("nullableInt")).build())).build(), + new CompiledField.Builder("nullableInt", GraphQLInt.type).arguments(Arrays.asList(new CompiledArgument.Builder("nonNullableInput").value(new CompiledVariable("nonNullableInput")).build(), new CompiledArgument.Builder("nonNullableInputWithDefault").value(new CompiledVariable("nonNullableInputWithDefault")).build(), new CompiledArgument.Builder("nonNullableInt").value(new CompiledVariable("nonNullableInt")).build(), new CompiledArgument.Builder("nonNullableIntWithDefault").value(new CompiledVariable("nonNullableIntWithDefault")).build(), new CompiledArgument.Builder("nullableInput").value(new CompiledVariable("nullableInput")).build(), new CompiledArgument.Builder("nullableInt").value(new CompiledVariable("nullableInt")).build())).build(), + new CompiledField.Builder("nonNullableInt", new CompiledNotNullType(GraphQLInt.type)).arguments(Arrays.asList(new CompiledArgument.Builder("nonNullableInput").value(new CompiledVariable("nonNullableInput")).build(), new CompiledArgument.Builder("nonNullableInputWithDefault").value(new CompiledVariable("nonNullableInputWithDefault")).build(), new CompiledArgument.Builder("nonNullableInt").value(new CompiledVariable("nonNullableInt")).build(), new CompiledArgument.Builder("nonNullableIntWithDefault").value(new CompiledVariable("nonNullableIntWithDefault")).build(), new CompiledArgument.Builder("nullableInput").value(new CompiledVariable("nullableInput")).build(), new CompiledArgument.Builder("nullableInt").value(new CompiledVariable("nullableInt")).build())).build(), new CompiledField.Builder("nullableMyType", MyType.type).selections(__nullableMyType).build(), new CompiledField.Builder("nonNullableMyType", new CompiledNotNullType(MyType.type)).selections(__nonNullableMyType).build(), new CompiledField.Builder("nullableListOfNullableString", new CompiledListType(GraphQLString.type)).build(), diff --git a/libraries/apollo-compiler/src/test/graphql/com/example/java_jsr305_annotations/kotlin/responseBased/java_jsr305_annotations/MyQuery.kt.expected b/libraries/apollo-compiler/src/test/graphql/com/example/java_jsr305_annotations/kotlin/responseBased/java_jsr305_annotations/MyQuery.kt.expected index 4caeb7844e0..4c3f3233d6a 100644 --- a/libraries/apollo-compiler/src/test/graphql/com/example/java_jsr305_annotations/kotlin/responseBased/java_jsr305_annotations/MyQuery.kt.expected +++ b/libraries/apollo-compiler/src/test/graphql/com/example/java_jsr305_annotations/kotlin/responseBased/java_jsr305_annotations/MyQuery.kt.expected @@ -40,10 +40,10 @@ public data class MyQuery( override fun serializeVariables( writer: JsonWriter, customScalarAdapters: CustomScalarAdapters, - withBooleanDefaultValues: Boolean, + withDefaultValues: Boolean, ) { MyQuery_VariablesAdapter.serializeVariables(writer, this, customScalarAdapters, - withBooleanDefaultValues) + withDefaultValues) } override fun adapter(): CompositeAdapter = MyQuery_ResponseAdapter.Data.obj() diff --git a/libraries/apollo-compiler/src/test/graphql/com/example/java_jsr305_annotations/kotlin/responseBased/java_jsr305_annotations/adapter/MyQuery_VariablesAdapter.kt.expected b/libraries/apollo-compiler/src/test/graphql/com/example/java_jsr305_annotations/kotlin/responseBased/java_jsr305_annotations/adapter/MyQuery_VariablesAdapter.kt.expected index e8728627f8b..37956933950 100644 --- a/libraries/apollo-compiler/src/test/graphql/com/example/java_jsr305_annotations/kotlin/responseBased/java_jsr305_annotations/adapter/MyQuery_VariablesAdapter.kt.expected +++ b/libraries/apollo-compiler/src/test/graphql/com/example/java_jsr305_annotations/kotlin/responseBased/java_jsr305_annotations/adapter/MyQuery_VariablesAdapter.kt.expected @@ -7,6 +7,7 @@ package com.example.java_jsr305_annotations.adapter import com.apollographql.apollo3.api.CustomScalarAdapters import com.apollographql.apollo3.api.IntAdapter +import com.apollographql.apollo3.api.NullableAnyAdapter import com.apollographql.apollo3.api.NullableIntAdapter import com.apollographql.apollo3.api.Optional import com.apollographql.apollo3.api.json.JsonWriter @@ -27,7 +28,7 @@ public object MyQuery_VariablesAdapter { writer: JsonWriter, `value`: MyQuery, customScalarAdapters: CustomScalarAdapters, - withBooleanDefaultValues: Boolean, + withDefaultValues: Boolean, ) { if (value.nullableInt is Optional.Present) { writer.name("nullableInt") @@ -39,6 +40,10 @@ public object MyQuery_VariablesAdapter { writer.name("nonNullableIntWithDefault") IntAdapter.present().toJson(writer, customScalarAdapters, value.nonNullableIntWithDefault) } + else if (withDefaultValues) { + writer.name("nonNullableIntWithDefault") + NullableAnyAdapter.toJson(writer, customScalarAdapters, 4) + } if (value.nullableInput is Optional.Present) { writer.name("nullableInput") MyInput_InputAdapter.obj().nullable().present().toJson(writer, customScalarAdapters, @@ -51,5 +56,11 @@ public object MyQuery_VariablesAdapter { MyInput_InputAdapter.obj().present().toJson(writer, customScalarAdapters, value.nonNullableInputWithDefault) } + else if (withDefaultValues) { + writer.name("nonNullableInputWithDefault") + NullableAnyAdapter.toJson(writer, customScalarAdapters, mapOf( + "nonNullableInt" to 4 + )) + } } } diff --git a/libraries/apollo-compiler/src/test/graphql/com/example/java_jsr305_annotations/kotlin/responseBased/java_jsr305_annotations/selections/MyQuerySelections.kt.expected b/libraries/apollo-compiler/src/test/graphql/com/example/java_jsr305_annotations/kotlin/responseBased/java_jsr305_annotations/selections/MyQuerySelections.kt.expected index 02d401fbae3..78bc9f1c14b 100644 --- a/libraries/apollo-compiler/src/test/graphql/com/example/java_jsr305_annotations/kotlin/responseBased/java_jsr305_annotations/selections/MyQuerySelections.kt.expected +++ b/libraries/apollo-compiler/src/test/graphql/com/example/java_jsr305_annotations/kotlin/responseBased/java_jsr305_annotations/selections/MyQuerySelections.kt.expected @@ -44,24 +44,24 @@ public object MyQuerySelections { name = "nullableInt", type = GraphQLInt.type ).arguments(listOf( - CompiledArgument.Builder("nonNullableInput", CompiledVariable("nonNullableInput")).build(), - CompiledArgument.Builder("nonNullableInputWithDefault", CompiledVariable("nonNullableInputWithDefault")).build(), - CompiledArgument.Builder("nonNullableInt", CompiledVariable("nonNullableInt")).build(), - CompiledArgument.Builder("nonNullableIntWithDefault", CompiledVariable("nonNullableIntWithDefault")).build(), - CompiledArgument.Builder("nullableInput", CompiledVariable("nullableInput")).build(), - CompiledArgument.Builder("nullableInt", CompiledVariable("nullableInt")).build() + CompiledArgument.Builder("nonNullableInput").value(CompiledVariable("nonNullableInput")).build(), + CompiledArgument.Builder("nonNullableInputWithDefault").value(CompiledVariable("nonNullableInputWithDefault")).build(), + CompiledArgument.Builder("nonNullableInt").value(CompiledVariable("nonNullableInt")).build(), + CompiledArgument.Builder("nonNullableIntWithDefault").value(CompiledVariable("nonNullableIntWithDefault")).build(), + CompiledArgument.Builder("nullableInput").value(CompiledVariable("nullableInput")).build(), + CompiledArgument.Builder("nullableInt").value(CompiledVariable("nullableInt")).build() )) .build(), CompiledField.Builder( name = "nonNullableInt", type = GraphQLInt.type.notNull() ).arguments(listOf( - CompiledArgument.Builder("nonNullableInput", CompiledVariable("nonNullableInput")).build(), - CompiledArgument.Builder("nonNullableInputWithDefault", CompiledVariable("nonNullableInputWithDefault")).build(), - CompiledArgument.Builder("nonNullableInt", CompiledVariable("nonNullableInt")).build(), - CompiledArgument.Builder("nonNullableIntWithDefault", CompiledVariable("nonNullableIntWithDefault")).build(), - CompiledArgument.Builder("nullableInput", CompiledVariable("nullableInput")).build(), - CompiledArgument.Builder("nullableInt", CompiledVariable("nullableInt")).build() + CompiledArgument.Builder("nonNullableInput").value(CompiledVariable("nonNullableInput")).build(), + CompiledArgument.Builder("nonNullableInputWithDefault").value(CompiledVariable("nonNullableInputWithDefault")).build(), + CompiledArgument.Builder("nonNullableInt").value(CompiledVariable("nonNullableInt")).build(), + CompiledArgument.Builder("nonNullableIntWithDefault").value(CompiledVariable("nonNullableIntWithDefault")).build(), + CompiledArgument.Builder("nullableInput").value(CompiledVariable("nullableInput")).build(), + CompiledArgument.Builder("nullableInt").value(CompiledVariable("nullableInt")).build() )) .build(), CompiledField.Builder( diff --git a/libraries/apollo-compiler/src/test/graphql/com/example/java_primitive_types/java/operationBased/java_primitive_types/JavaPrimitiveQuery.java.expected b/libraries/apollo-compiler/src/test/graphql/com/example/java_primitive_types/java/operationBased/java_primitive_types/JavaPrimitiveQuery.java.expected index bad756c80ae..ec80440a56d 100644 --- a/libraries/apollo-compiler/src/test/graphql/com/example/java_primitive_types/java/operationBased/java_primitive_types/JavaPrimitiveQuery.java.expected +++ b/libraries/apollo-compiler/src/test/graphql/com/example/java_primitive_types/java/operationBased/java_primitive_types/JavaPrimitiveQuery.java.expected @@ -153,8 +153,8 @@ public class JavaPrimitiveQuery implements Query { @Override public void serializeVariables(JsonWriter writer, CustomScalarAdapters customScalarAdapters, - boolean withBooleanDefaultValues) throws IOException { - JavaPrimitiveQuery_VariablesAdapter.INSTANCE.serializeVariables(writer, this, customScalarAdapters, withBooleanDefaultValues); + boolean withDefaultValues) throws IOException { + JavaPrimitiveQuery_VariablesAdapter.INSTANCE.serializeVariables(writer, this, customScalarAdapters, withDefaultValues); } @Override diff --git a/libraries/apollo-compiler/src/test/graphql/com/example/java_primitive_types/java/operationBased/java_primitive_types/adapter/JavaPrimitiveQuery_VariablesAdapter.java.expected b/libraries/apollo-compiler/src/test/graphql/com/example/java_primitive_types/java/operationBased/java_primitive_types/adapter/JavaPrimitiveQuery_VariablesAdapter.java.expected index 5158e01c801..73e28b8ffc9 100644 --- a/libraries/apollo-compiler/src/test/graphql/com/example/java_primitive_types/java/operationBased/java_primitive_types/adapter/JavaPrimitiveQuery_VariablesAdapter.java.expected +++ b/libraries/apollo-compiler/src/test/graphql/com/example/java_primitive_types/java/operationBased/java_primitive_types/adapter/JavaPrimitiveQuery_VariablesAdapter.java.expected @@ -10,6 +10,7 @@ import com.apollographql.apollo3.api.ApolloOptionalAdapter; import com.apollographql.apollo3.api.ApolloOptionalCompositeAdapter; import com.apollographql.apollo3.api.CompositeAdapterContext; import com.apollographql.apollo3.api.CustomScalarAdapters; +import com.apollographql.apollo3.api.ImmutableMapBuilder; import com.apollographql.apollo3.api.NullableCompositeAdapter; import com.apollographql.apollo3.api.ObjectCompositeAdapter; import com.apollographql.apollo3.api.Optional; @@ -23,8 +24,7 @@ public enum JavaPrimitiveQuery_VariablesAdapter { INSTANCE; public void serializeVariables(JsonWriter writer, JavaPrimitiveQuery value, - CustomScalarAdapters customScalarAdapters, boolean withBooleanDefaultValues) throws - IOException { + CustomScalarAdapters customScalarAdapters, boolean withDefaultValues) throws IOException { CompositeAdapterContext adapterContext = new CompositeAdapterContext.Builder().customScalarAdapters(customScalarAdapters).build(); if (value.nullableInt instanceof Optional.Present) { writer.name("nullableInt"); @@ -36,6 +36,10 @@ public enum JavaPrimitiveQuery_VariablesAdapter { writer.name("nonNullableIntWithDefault"); new ApolloOptionalAdapter<>(Adapters.IntAdapter).toJson(writer, CustomScalarAdapters.Empty, value.nonNullableIntWithDefault); } + else if (withDefaultValues) { + writer.name("nonNullableIntWithDefault"); + Adapters.NullableAnyAdapter.toJson(writer, CustomScalarAdapters.Empty, 4); + } if (value.nullableInput instanceof Optional.Present) { writer.name("nullableInput"); new ApolloOptionalCompositeAdapter<>(new NullableCompositeAdapter<>(new ObjectCompositeAdapter(MyInput_InputAdapter.INSTANCE, false))).toJson(writer, value.nullableInput, adapterContext); @@ -46,5 +50,9 @@ public enum JavaPrimitiveQuery_VariablesAdapter { writer.name("nonNullableInputWithDefault"); new ApolloOptionalCompositeAdapter<>(new ObjectCompositeAdapter(MyInput_InputAdapter.INSTANCE, false)).toJson(writer, value.nonNullableInputWithDefault, adapterContext); } + else if (withDefaultValues) { + writer.name("nonNullableInputWithDefault"); + Adapters.NullableAnyAdapter.toJson(writer, CustomScalarAdapters.Empty, new ImmutableMapBuilder().put("nonNullableInt", 4).build()); + } } } diff --git a/libraries/apollo-compiler/src/test/graphql/com/example/java_primitive_types/java/operationBased/java_primitive_types/selections/JavaPrimitiveQuerySelections.java.expected b/libraries/apollo-compiler/src/test/graphql/com/example/java_primitive_types/java/operationBased/java_primitive_types/selections/JavaPrimitiveQuerySelections.java.expected index 91cb0f9b53a..9ca6e9cc77a 100644 --- a/libraries/apollo-compiler/src/test/graphql/com/example/java_primitive_types/java/operationBased/java_primitive_types/selections/JavaPrimitiveQuerySelections.java.expected +++ b/libraries/apollo-compiler/src/test/graphql/com/example/java_primitive_types/java/operationBased/java_primitive_types/selections/JavaPrimitiveQuerySelections.java.expected @@ -27,8 +27,8 @@ public class JavaPrimitiveQuerySelections { ); public static List __root = Arrays.asList( - new CompiledField.Builder("nullableInt", GraphQLInt.type).arguments(Arrays.asList(new CompiledArgument.Builder("nonNullableInput", new CompiledVariable("nonNullableInput")).build(), new CompiledArgument.Builder("nonNullableInputWithDefault", new CompiledVariable("nonNullableInputWithDefault")).build(), new CompiledArgument.Builder("nonNullableInt", new CompiledVariable("nonNullableInt")).build(), new CompiledArgument.Builder("nonNullableIntWithDefault", new CompiledVariable("nonNullableIntWithDefault")).build(), new CompiledArgument.Builder("nullableInput", new CompiledVariable("nullableInput")).build(), new CompiledArgument.Builder("nullableInt", new CompiledVariable("nullableInt")).build())).build(), - new CompiledField.Builder("nonNullableInt", new CompiledNotNullType(GraphQLInt.type)).arguments(Arrays.asList(new CompiledArgument.Builder("nonNullableInput", new CompiledVariable("nonNullableInput")).build(), new CompiledArgument.Builder("nonNullableInputWithDefault", new CompiledVariable("nonNullableInputWithDefault")).build(), new CompiledArgument.Builder("nonNullableInt", new CompiledVariable("nonNullableInt")).build(), new CompiledArgument.Builder("nonNullableIntWithDefault", new CompiledVariable("nonNullableIntWithDefault")).build(), new CompiledArgument.Builder("nullableInput", new CompiledVariable("nullableInput")).build(), new CompiledArgument.Builder("nullableInt", new CompiledVariable("nullableInt")).build())).build(), + new CompiledField.Builder("nullableInt", GraphQLInt.type).arguments(Arrays.asList(new CompiledArgument.Builder("nonNullableInput").value(new CompiledVariable("nonNullableInput")).build(), new CompiledArgument.Builder("nonNullableInputWithDefault").value(new CompiledVariable("nonNullableInputWithDefault")).build(), new CompiledArgument.Builder("nonNullableInt").value(new CompiledVariable("nonNullableInt")).build(), new CompiledArgument.Builder("nonNullableIntWithDefault").value(new CompiledVariable("nonNullableIntWithDefault")).build(), new CompiledArgument.Builder("nullableInput").value(new CompiledVariable("nullableInput")).build(), new CompiledArgument.Builder("nullableInt").value(new CompiledVariable("nullableInt")).build())).build(), + new CompiledField.Builder("nonNullableInt", new CompiledNotNullType(GraphQLInt.type)).arguments(Arrays.asList(new CompiledArgument.Builder("nonNullableInput").value(new CompiledVariable("nonNullableInput")).build(), new CompiledArgument.Builder("nonNullableInputWithDefault").value(new CompiledVariable("nonNullableInputWithDefault")).build(), new CompiledArgument.Builder("nonNullableInt").value(new CompiledVariable("nonNullableInt")).build(), new CompiledArgument.Builder("nonNullableIntWithDefault").value(new CompiledVariable("nonNullableIntWithDefault")).build(), new CompiledArgument.Builder("nullableInput").value(new CompiledVariable("nullableInput")).build(), new CompiledArgument.Builder("nullableInt").value(new CompiledVariable("nullableInt")).build())).build(), new CompiledField.Builder("nullableMyType", MyType.type).selections(__nullableMyType).build(), new CompiledField.Builder("nonNullableMyType", new CompiledNotNullType(MyType.type)).selections(__nonNullableMyType).build() ); diff --git a/libraries/apollo-compiler/src/test/graphql/com/example/java_primitive_types/kotlin/responseBased/java_primitive_types/JavaPrimitiveQuery.kt.expected b/libraries/apollo-compiler/src/test/graphql/com/example/java_primitive_types/kotlin/responseBased/java_primitive_types/JavaPrimitiveQuery.kt.expected index a0669809b63..0e314b5e343 100644 --- a/libraries/apollo-compiler/src/test/graphql/com/example/java_primitive_types/kotlin/responseBased/java_primitive_types/JavaPrimitiveQuery.kt.expected +++ b/libraries/apollo-compiler/src/test/graphql/com/example/java_primitive_types/kotlin/responseBased/java_primitive_types/JavaPrimitiveQuery.kt.expected @@ -39,10 +39,10 @@ public data class JavaPrimitiveQuery( override fun serializeVariables( writer: JsonWriter, customScalarAdapters: CustomScalarAdapters, - withBooleanDefaultValues: Boolean, + withDefaultValues: Boolean, ) { JavaPrimitiveQuery_VariablesAdapter.serializeVariables(writer, this, customScalarAdapters, - withBooleanDefaultValues) + withDefaultValues) } override fun adapter(): CompositeAdapter = JavaPrimitiveQuery_ResponseAdapter.Data.obj() diff --git a/libraries/apollo-compiler/src/test/graphql/com/example/java_primitive_types/kotlin/responseBased/java_primitive_types/adapter/JavaPrimitiveQuery_VariablesAdapter.kt.expected b/libraries/apollo-compiler/src/test/graphql/com/example/java_primitive_types/kotlin/responseBased/java_primitive_types/adapter/JavaPrimitiveQuery_VariablesAdapter.kt.expected index 3de52ac0671..b1c22dc046f 100644 --- a/libraries/apollo-compiler/src/test/graphql/com/example/java_primitive_types/kotlin/responseBased/java_primitive_types/adapter/JavaPrimitiveQuery_VariablesAdapter.kt.expected +++ b/libraries/apollo-compiler/src/test/graphql/com/example/java_primitive_types/kotlin/responseBased/java_primitive_types/adapter/JavaPrimitiveQuery_VariablesAdapter.kt.expected @@ -7,6 +7,7 @@ package com.example.java_primitive_types.adapter import com.apollographql.apollo3.api.CustomScalarAdapters import com.apollographql.apollo3.api.IntAdapter +import com.apollographql.apollo3.api.NullableAnyAdapter import com.apollographql.apollo3.api.NullableIntAdapter import com.apollographql.apollo3.api.Optional import com.apollographql.apollo3.api.json.JsonWriter @@ -27,7 +28,7 @@ public object JavaPrimitiveQuery_VariablesAdapter { writer: JsonWriter, `value`: JavaPrimitiveQuery, customScalarAdapters: CustomScalarAdapters, - withBooleanDefaultValues: Boolean, + withDefaultValues: Boolean, ) { if (value.nullableInt is Optional.Present) { writer.name("nullableInt") @@ -39,6 +40,10 @@ public object JavaPrimitiveQuery_VariablesAdapter { writer.name("nonNullableIntWithDefault") IntAdapter.present().toJson(writer, customScalarAdapters, value.nonNullableIntWithDefault) } + else if (withDefaultValues) { + writer.name("nonNullableIntWithDefault") + NullableAnyAdapter.toJson(writer, customScalarAdapters, 4) + } if (value.nullableInput is Optional.Present) { writer.name("nullableInput") MyInput_InputAdapter.obj().nullable().present().toJson(writer, customScalarAdapters, @@ -51,5 +56,11 @@ public object JavaPrimitiveQuery_VariablesAdapter { MyInput_InputAdapter.obj().present().toJson(writer, customScalarAdapters, value.nonNullableInputWithDefault) } + else if (withDefaultValues) { + writer.name("nonNullableInputWithDefault") + NullableAnyAdapter.toJson(writer, customScalarAdapters, mapOf( + "nonNullableInt" to 4 + )) + } } } diff --git a/libraries/apollo-compiler/src/test/graphql/com/example/java_primitive_types/kotlin/responseBased/java_primitive_types/selections/JavaPrimitiveQuerySelections.kt.expected b/libraries/apollo-compiler/src/test/graphql/com/example/java_primitive_types/kotlin/responseBased/java_primitive_types/selections/JavaPrimitiveQuerySelections.kt.expected index c383d914ec6..e990969edd0 100644 --- a/libraries/apollo-compiler/src/test/graphql/com/example/java_primitive_types/kotlin/responseBased/java_primitive_types/selections/JavaPrimitiveQuerySelections.kt.expected +++ b/libraries/apollo-compiler/src/test/graphql/com/example/java_primitive_types/kotlin/responseBased/java_primitive_types/selections/JavaPrimitiveQuerySelections.kt.expected @@ -42,24 +42,24 @@ public object JavaPrimitiveQuerySelections { name = "nullableInt", type = GraphQLInt.type ).arguments(listOf( - CompiledArgument.Builder("nonNullableInput", CompiledVariable("nonNullableInput")).build(), - CompiledArgument.Builder("nonNullableInputWithDefault", CompiledVariable("nonNullableInputWithDefault")).build(), - CompiledArgument.Builder("nonNullableInt", CompiledVariable("nonNullableInt")).build(), - CompiledArgument.Builder("nonNullableIntWithDefault", CompiledVariable("nonNullableIntWithDefault")).build(), - CompiledArgument.Builder("nullableInput", CompiledVariable("nullableInput")).build(), - CompiledArgument.Builder("nullableInt", CompiledVariable("nullableInt")).build() + CompiledArgument.Builder("nonNullableInput").value(CompiledVariable("nonNullableInput")).build(), + CompiledArgument.Builder("nonNullableInputWithDefault").value(CompiledVariable("nonNullableInputWithDefault")).build(), + CompiledArgument.Builder("nonNullableInt").value(CompiledVariable("nonNullableInt")).build(), + CompiledArgument.Builder("nonNullableIntWithDefault").value(CompiledVariable("nonNullableIntWithDefault")).build(), + CompiledArgument.Builder("nullableInput").value(CompiledVariable("nullableInput")).build(), + CompiledArgument.Builder("nullableInt").value(CompiledVariable("nullableInt")).build() )) .build(), CompiledField.Builder( name = "nonNullableInt", type = GraphQLInt.type.notNull() ).arguments(listOf( - CompiledArgument.Builder("nonNullableInput", CompiledVariable("nonNullableInput")).build(), - CompiledArgument.Builder("nonNullableInputWithDefault", CompiledVariable("nonNullableInputWithDefault")).build(), - CompiledArgument.Builder("nonNullableInt", CompiledVariable("nonNullableInt")).build(), - CompiledArgument.Builder("nonNullableIntWithDefault", CompiledVariable("nonNullableIntWithDefault")).build(), - CompiledArgument.Builder("nullableInput", CompiledVariable("nullableInput")).build(), - CompiledArgument.Builder("nullableInt", CompiledVariable("nullableInt")).build() + CompiledArgument.Builder("nonNullableInput").value(CompiledVariable("nonNullableInput")).build(), + CompiledArgument.Builder("nonNullableInputWithDefault").value(CompiledVariable("nonNullableInputWithDefault")).build(), + CompiledArgument.Builder("nonNullableInt").value(CompiledVariable("nonNullableInt")).build(), + CompiledArgument.Builder("nonNullableIntWithDefault").value(CompiledVariable("nonNullableIntWithDefault")).build(), + CompiledArgument.Builder("nullableInput").value(CompiledVariable("nullableInput")).build(), + CompiledArgument.Builder("nullableInt").value(CompiledVariable("nullableInt")).build() )) .build(), CompiledField.Builder( diff --git a/libraries/apollo-compiler/src/test/graphql/com/example/list_field_clash/java/operationBased/list_field_clash/TestQuery.java.expected b/libraries/apollo-compiler/src/test/graphql/com/example/list_field_clash/java/operationBased/list_field_clash/TestQuery.java.expected index 2983940d68c..cdc9cd215ad 100644 --- a/libraries/apollo-compiler/src/test/graphql/com/example/list_field_clash/java/operationBased/list_field_clash/TestQuery.java.expected +++ b/libraries/apollo-compiler/src/test/graphql/com/example/list_field_clash/java/operationBased/list_field_clash/TestQuery.java.expected @@ -98,7 +98,7 @@ public class TestQuery implements Query { @Override public void serializeVariables(JsonWriter writer, CustomScalarAdapters customScalarAdapters, - boolean withBooleanDefaultValues) throws IOException { + boolean withDefaultValues) throws IOException { // This operation doesn't have any variable } diff --git a/libraries/apollo-compiler/src/test/graphql/com/example/list_field_clash/kotlin/responseBased/list_field_clash/TestQuery.kt.expected b/libraries/apollo-compiler/src/test/graphql/com/example/list_field_clash/kotlin/responseBased/list_field_clash/TestQuery.kt.expected index 51c304d1caa..323b2c0d0ef 100644 --- a/libraries/apollo-compiler/src/test/graphql/com/example/list_field_clash/kotlin/responseBased/list_field_clash/TestQuery.kt.expected +++ b/libraries/apollo-compiler/src/test/graphql/com/example/list_field_clash/kotlin/responseBased/list_field_clash/TestQuery.kt.expected @@ -35,7 +35,7 @@ public class TestQuery() : Query { override fun serializeVariables( writer: JsonWriter, customScalarAdapters: CustomScalarAdapters, - withBooleanDefaultValues: Boolean, + withDefaultValues: Boolean, ) { // This operation doesn't have any variable } diff --git a/libraries/apollo-compiler/src/test/graphql/com/example/measurements b/libraries/apollo-compiler/src/test/graphql/com/example/measurements index 18bbaa622a2..0887fce7cd1 100644 --- a/libraries/apollo-compiler/src/test/graphql/com/example/measurements +++ b/libraries/apollo-compiler/src/test/graphql/com/example/measurements @@ -2,242 +2,242 @@ // If you updated the codegen and test fixtures, you should commit this file too. Test: Total LOC: -aggregate-all 194857 -aggregate-kotlin-responseBased 61996 -aggregate-kotlin-operationBased 40603 +aggregate-all 195562 +aggregate-kotlin-responseBased 62397 +aggregate-kotlin-operationBased 40827 aggregate-kotlin-compat 0 -aggregate-java-operationBased 92258 +aggregate-java-operationBased 92338 -java-operationBased-fragments_with_defer_and_include_directives 5552 -kotlin-operationBased-fragments_with_defer_and_include_directives 3459 +java-operationBased-fragments_with_defer_and_include_directives 5556 +kotlin-operationBased-fragments_with_defer_and_include_directives 3499 java-operationBased-data_builders 2933 -kotlin-responseBased-fragment_with_inline_fragment 2404 -java-operationBased-mutation_create_review 2379 +kotlin-responseBased-fragment_with_inline_fragment 2414 +java-operationBased-mutation_create_review 2378 kotlin-responseBased-data_builders 2271 -java-operationBased-fragment_with_inline_fragment 2227 +java-operationBased-fragment_with_inline_fragment 2229 kotlin-operationBased-data_builders 1922 -java-operationBased-nested_named_fragments 1868 +java-operationBased-nested_named_fragments 1869 java-operationBased-union_inline_fragments 1633 -java-operationBased-fragment_spread_with_include_directive 1625 -java-operationBased-unique_type_name 1623 -kotlin-responseBased-nested_named_fragments 1601 +java-operationBased-unique_type_name 1625 +java-operationBased-fragment_spread_with_include_directive 1624 +kotlin-responseBased-nested_named_fragments 1611 java-operationBased-inline_fragment_intersection 1599 -java-operationBased-input_object_type 1596 -java-operationBased-mutation_create_review_semantic_naming 1579 +java-operationBased-input_object_type 1595 +java-operationBased-mutation_create_review_semantic_naming 1578 java-operationBased-root_query_fragment_with_nested_fragments 1565 -java-operationBased-named_fragment_delegate 1466 -java-operationBased-simple_fragment 1465 +java-operationBased-named_fragment_delegate 1468 +java-operationBased-simple_fragment 1466 kotlin-responseBased-mutation_create_review 1386 -java-operationBased-named_fragment_with_variables 1367 -kotlin-responseBased-named_fragment_delegate 1346 -kotlin-responseBased-unique_type_name 1327 -java-operationBased-nested_conditional_inline 1297 -java-operationBased-fragment_used_twice 1278 -kotlin-operationBased-fragment_with_inline_fragment 1268 +java-operationBased-named_fragment_with_variables 1364 +kotlin-responseBased-named_fragment_delegate 1356 +kotlin-responseBased-unique_type_name 1336 +java-operationBased-nested_conditional_inline 1296 +java-operationBased-fragment_used_twice 1279 +kotlin-operationBased-fragment_with_inline_fragment 1278 java-operationBased-multiple_fragments 1265 java-operationBased-nested_field_with_multiple_fieldsets 1255 -kotlin-responseBased-root_query_fragment_with_nested_fragments 1251 +kotlin-responseBased-root_query_fragment_with_nested_fragments 1255 +kotlin-operationBased-nested_named_fragments 1241 kotlin-responseBased-input_object_type 1238 -kotlin-operationBased-nested_named_fragments 1231 java-operationBased-two_heroes_with_friends 1212 -java-operationBased-inline_fragment_merge_fields 1209 +java-operationBased-inline_fragment_merge_fields 1210 kotlin-responseBased-inline_fragment_intersection 1208 -java-operationBased-named_fragment_inside_inline_fragment 1162 -kotlin-responseBased-simple_fragment 1161 -java-operationBased-fragments_with_type_condition 1157 -kotlin-responseBased-fragment_used_twice 1134 -java-operationBased-target_name 1134 +kotlin-responseBased-simple_fragment 1166 +java-operationBased-named_fragment_inside_inline_fragment 1163 +java-operationBased-fragments_with_type_condition 1159 +kotlin-responseBased-fragment_used_twice 1139 +java-operationBased-target_name 1133 kotlin-operationBased-inline_fragment_intersection 1121 kotlin-operationBased-union_inline_fragments 1118 kotlin-responseBased-union_inline_fragments 1112 +java-operationBased-java_jetbrains_annotations 1099 +java-operationBased-java_android_annotations 1096 +java-operationBased-java_jsr305_annotations 1096 java-operationBased-root_query_inline_fragment 1096 -java-operationBased-java_jetbrains_annotations 1091 -kotlin-operationBased-fragment_spread_with_include_directive 1088 -java-operationBased-java_android_annotations 1088 -java-operationBased-java_jsr305_annotations 1088 -kotlin-operationBased-unique_type_name 1087 -kotlin-responseBased-fragments_with_type_condition 1080 -java-operationBased-java_guava_optionals 1072 -java-operationBased-java_java_optionals 1072 -java-operationBased-java_apollo_optionals 1071 +kotlin-operationBased-unique_type_name 1096 +kotlin-operationBased-fragment_spread_with_include_directive 1093 +kotlin-responseBased-fragments_with_type_condition 1093 +java-operationBased-java_guava_optionals 1080 +java-operationBased-java_java_optionals 1080 +java-operationBased-java_apollo_optionals 1079 kotlin-responseBased-multiple_fragments 1054 -java-operationBased-simple_fragment_with_inline_fragments 1046 -java-operationBased-inline_fragments_with_friends 1038 -kotlin-operationBased-root_query_fragment_with_nested_fragments 1033 -java-operationBased-fragment_spread_with_nested_fields 1030 -kotlin-responseBased-simple_fragment_with_inline_fragments 1029 -kotlin-responseBased-nested_conditional_inline 1028 +java-operationBased-simple_fragment_with_inline_fragments 1048 +java-operationBased-inline_fragments_with_friends 1039 +kotlin-responseBased-simple_fragment_with_inline_fragments 1038 +kotlin-operationBased-root_query_fragment_with_nested_fragments 1037 +java-operationBased-fragment_spread_with_nested_fields 1032 +kotlin-responseBased-nested_conditional_inline 1029 java-operationBased-operationbased2_ex8 1026 +java-operationBased-java_primitive_types 1023 kotlin-responseBased-named_fragment_with_variables 1020 -java-operationBased-java_primitive_types 1015 -kotlin-operationBased-simple_fragment 1011 -kotlin-operationBased-named_fragment_delegate 991 +kotlin-operationBased-simple_fragment 1016 +kotlin-operationBased-named_fragment_delegate 1001 java-operationBased-decapitalized_fields 975 -java-operationBased-fragments_same_type_condition 951 +java-operationBased-fragments_same_type_condition 952 java-operationBased-simple_union 949 kotlin-responseBased-operationbased2_ex8 943 java-operationBased-deprecated_merged_field 929 -java-operationBased-hero_details 919 +java-operationBased-hero_details 920 java-operationBased-not_all_combinations_are_needed 919 +java-operationBased-simple_inline_fragment 902 java-operationBased-fieldset_with_multiple_super 901 -java-operationBased-simple_inline_fragment 901 java-operationBased-inline_fragment_with_include_directive 898 -kotlin-operationBased-nested_conditional_inline 896 +kotlin-operationBased-nested_conditional_inline 897 java-operationBased-introspection_query 890 kotlin-responseBased-mutation_create_review_semantic_naming 880 -kotlin-operationBased-fragment_used_twice 874 +kotlin-operationBased-fragment_used_twice 879 kotlin-operationBased-named_fragment_with_variables 872 +kotlin-responseBased-fragment_spread_with_nested_fields 867 java-operationBased-test_inline 865 java-operationBased-union_fragment 863 -kotlin-responseBased-fragment_spread_with_nested_fields 857 java-operationBased-inline_fragment_inside_inline_fragment 854 kotlin-operationBased-multiple_fragments 834 kotlin-responseBased-nested_field_with_multiple_fieldsets 830 -java-operationBased-named_fragment_without_implementation 822 -kotlin-operationBased-fragments_with_type_condition 812 +kotlin-operationBased-fragments_with_type_condition 825 +java-operationBased-named_fragment_without_implementation 824 kotlin-operationBased-nested_field_with_multiple_fieldsets 803 +kotlin-operationBased-inline_fragment_merge_fields 794 +kotlin-responseBased-two_heroes_with_friends 793 +kotlin-operationBased-named_fragment_inside_inline_fragment 792 java-operationBased-fragment_with_multiple_fieldsets 787 -kotlin-operationBased-named_fragment_inside_inline_fragment 787 -java-operationBased-hero_details_semantic_naming 783 +java-operationBased-hero_details_semantic_naming 784 java-operationBased-operationbased2_ex7 782 -kotlin-operationBased-inline_fragment_merge_fields 781 -kotlin-responseBased-two_heroes_with_friends 780 +kotlin-responseBased-inline_fragments_with_friends 778 kotlin-responseBased-target_name 776 -java-operationBased-suppressed_warnings 775 -kotlin-responseBased-inline_fragments_with_friends 770 +kotlin-operationBased-root_query_inline_fragment 774 +java-operationBased-suppressed_warnings 774 +kotlin-responseBased-named_fragment_inside_inline_fragment 772 kotlin-responseBased-deprecated_merged_field 767 -kotlin-responseBased-named_fragment_inside_inline_fragment 767 -kotlin-operationBased-root_query_inline_fragment 767 java-operationBased-path_vs_flat_accessors 762 +kotlin-responseBased-root_query_inline_fragment 750 kotlin-responseBased-simple_union 749 kotlin-operationBased-target_name 749 -kotlin-responseBased-root_query_inline_fragment 743 java-operationBased-reserved_keywords 741 -java-operationBased-typename_always_first 738 -kotlin-responseBased-fragments_same_type_condition 721 -kotlin-operationBased-inline_fragments_with_friends 719 +java-operationBased-typename_always_first 739 +kotlin-operationBased-inline_fragments_with_friends 727 +kotlin-responseBased-fragments_same_type_condition 726 java-operationBased-interface_on_interface 714 -java-operationBased-root_query_fragment 701 -kotlin-operationBased-simple_fragment_with_inline_fragments 699 -java-operationBased-input_object_variable_and_argument 698 -java-operationBased-input_object_variable_and_argument_with_generated_methods 698 -kotlin-operationBased-fragment_spread_with_nested_fields 686 +kotlin-operationBased-simple_fragment_with_inline_fragments 708 +java-operationBased-root_query_fragment 702 +java-operationBased-input_object_variable_and_argument 697 +java-operationBased-input_object_variable_and_argument_with_generated_methods 697 +kotlin-operationBased-fragment_spread_with_nested_fields 696 java-operationBased-monomorphic 671 kotlin-operationBased-operationbased2_ex8 670 java-operationBased-interface_always_nested 669 -kotlin-operationBased-fragments_same_type_condition 651 +kotlin-operationBased-fragments_same_type_condition 656 java-operationBased-capitalized_fields 650 +kotlin-responseBased-input_object_variable_and_argument_with_generated_methods 650 kotlin-operationBased-simple_union 648 java-operationBased-recursive_selection 647 kotlin-responseBased-fragment_with_multiple_fieldsets 645 kotlin-responseBased-union_fragment 645 +kotlin-responseBased-named_fragment_without_implementation 642 kotlin-responseBased-test_inline 642 java-operationBased-hero_with_review 640 -java-operationBased-deprecation 637 +kotlin-responseBased-hero_details 637 +java-operationBased-deprecation 636 kotlin-operationBased-decapitalized_fields 634 -kotlin-responseBased-named_fragment_without_implementation 633 kotlin-operationBased-deprecated_merged_field 628 -kotlin-responseBased-hero_details 628 -kotlin-responseBased-input_object_variable_and_argument_with_generated_methods 625 +kotlin-responseBased-inline_fragment_merge_fields 624 kotlin-operationBased-not_all_combinations_are_needed 623 java-operationBased-field_with_include_directive 621 -java-operationBased-hero_name_query_long_name 621 +java-operationBased-hero_name_query_long_name 620 kotlin-operationBased-union_fragment 617 +java-operationBased-variable_default_value 617 +java-operationBased-custom_scalar_type 616 kotlin-operationBased-inline_fragment_inside_inline_fragment 616 -java-operationBased-custom_scalar_type 615 -java-operationBased-variable_default_value 613 +kotlin-operationBased-inline_fragment_with_include_directive 616 +java-operationBased-hero_name 611 kotlin-responseBased-inline_fragment_inside_inline_fragment 611 -kotlin-responseBased-inline_fragment_merge_fields 611 -kotlin-operationBased-inline_fragment_with_include_directive 611 -java-operationBased-hero_name 610 +kotlin-operationBased-simple_inline_fragment 610 kotlin-operationBased-fieldset_with_multiple_super 609 -kotlin-operationBased-simple_inline_fragment 602 +kotlin-operationBased-named_fragment_without_implementation 609 +kotlin-responseBased-java_android_annotations 604 +kotlin-responseBased-java_apollo_optionals 604 +kotlin-responseBased-java_guava_optionals 604 +kotlin-responseBased-java_java_optionals 604 +kotlin-responseBased-java_jetbrains_annotations 604 +kotlin-responseBased-java_jsr305_annotations 604 +kotlin-responseBased-simple_inline_fragment 603 kotlin-responseBased-operationbased2_ex7 601 -kotlin-operationBased-named_fragment_without_implementation 600 kotlin-responseBased-not_all_combinations_are_needed 597 kotlin-responseBased-decapitalized_fields 595 kotlin-responseBased-fieldset_with_multiple_super 595 -java-operationBased-java8annotation 595 -kotlin-responseBased-simple_inline_fragment 595 -kotlin-responseBased-java_android_annotations 593 -kotlin-responseBased-java_apollo_optionals 593 -kotlin-responseBased-java_guava_optionals 593 -kotlin-responseBased-java_java_optionals 593 -kotlin-responseBased-java_jetbrains_annotations 593 -kotlin-responseBased-java_jsr305_annotations 593 -java-operationBased-optional 592 +java-operationBased-java8annotation 594 +java-operationBased-optional 593 kotlin-responseBased-introspection_query 591 java-operationBased-enum_field 581 java-operationBased-inline_fragment_for_non_optional_field 579 java-operationBased-inline_fragment_type_coercion 573 -kotlin-responseBased-reserved_keywords 569 +kotlin-responseBased-reserved_keywords 573 kotlin-operationBased-test_inline 569 +kotlin-responseBased-java_primitive_types 568 java-operationBased-two_heroes_unique 568 +kotlin-responseBased-input_object_variable_and_argument 561 java-operationBased-list_field_clash 561 -java-operationBased-inline_fragment_simple 557 -kotlin-responseBased-java_primitive_types 557 +java-operationBased-inline_fragment_simple 558 kotlin-responseBased-path_vs_flat_accessors 546 -kotlin-operationBased-reserved_keywords 542 -kotlin-responseBased-input_object_variable_and_argument 536 -kotlin-responseBased-hero_details_semantic_naming 532 +kotlin-operationBased-reserved_keywords 546 +kotlin-responseBased-hero_details_semantic_naming 541 +kotlin-responseBased-root_query_fragment 533 +kotlin-responseBased-typename_always_first 533 kotlin-operationBased-fragment_with_multiple_fieldsets 531 -kotlin-responseBased-root_query_fragment 528 -kotlin-responseBased-typename_always_first 525 +kotlin-responseBased-hero_with_review 523 kotlin-operationBased-operationbased2_ex7 522 -java-operationBased-starships 522 +kotlin-operationBased-typename_always_first 522 kotlin-responseBased-interface_on_interface 521 +java-operationBased-starships 521 kotlin-responseBased-suppressed_warnings 517 kotlin-operationBased-path_vs_flat_accessors 516 -kotlin-operationBased-typename_always_first 514 -java-operationBased-antlr_tokens 509 -java-operationBased-subscriptions 505 -kotlin-responseBased-hero_with_review 501 -kotlin-responseBased-hero_name 498 +java-operationBased-antlr_tokens 508 +java-operationBased-subscriptions 504 +kotlin-responseBased-hero_name 503 kotlin-operationBased-interface_on_interface 495 -kotlin-responseBased-hero_name_query_long_name 492 +kotlin-responseBased-hero_name_query_long_name 493 kotlin-responseBased-interface_always_nested 490 -java-operationBased-arguments_hardcoded 484 -kotlin-operationBased-root_query_fragment 479 -kotlin-responseBased-custom_scalar_type 477 +java-operationBased-arguments_hardcoded 485 +kotlin-operationBased-root_query_fragment 484 +kotlin-responseBased-custom_scalar_type 482 +kotlin-responseBased-variable_default_value 467 kotlin-operationBased-interface_always_nested 463 -java-operationBased-merged_include 462 -java-operationBased-operation_id_generator 462 -kotlin-responseBased-variable_default_value 461 +java-operationBased-merged_include 463 +java-operationBased-operation_id_generator 463 kotlin-responseBased-deprecation 459 kotlin-operationBased-monomorphic 459 kotlin-responseBased-enum_field 458 +kotlin-responseBased-inline_fragment_for_non_optional_field 458 kotlin-responseBased-monomorphic 458 -kotlin-responseBased-inline_fragment_for_non_optional_field 455 java-operationBased-enums_as_sealed 453 +kotlin-responseBased-optional 451 java-operationBased-case_sensitive_enum 450 -kotlin-responseBased-optional 446 -java-operationBased-nonnull 443 -kotlin-operationBased-hero_name 441 +kotlin-operationBased-hero_name 446 +kotlin-responseBased-field_with_include_directive 444 +java-operationBased-nonnull 444 kotlin-operationBased-capitalized_fields 440 kotlin-responseBased-inline_fragment_type_coercion 436 java-operationBased-companion 435 -kotlin-responseBased-field_with_include_directive 435 java-operationBased-object 430 +kotlin-responseBased-inline_fragment_simple 427 kotlin-responseBased-recursive_selection 427 -kotlin-responseBased-inline_fragment_simple 419 -kotlin-operationBased-inline_fragment_for_non_optional_field 412 +kotlin-operationBased-inline_fragment_for_non_optional_field 415 kotlin-responseBased-list_field_clash 405 kotlin-responseBased-capitalized_fields 402 +kotlin-responseBased-two_heroes_unique 402 +kotlin-operationBased-inline_fragment_simple 401 kotlin-operationBased-inline_fragment_type_coercion 401 -kotlin-responseBased-two_heroes_unique 397 -kotlin-operationBased-inline_fragment_simple 393 kotlin-responseBased-starships 382 kotlin-responseBased-antlr_tokens 381 kotlin-responseBased-java8annotation 381 -kotlin-responseBased-arguments_hardcoded 369 +kotlin-responseBased-arguments_hardcoded 370 kotlin-responseBased-subscriptions 369 kotlin-responseBased-enums_as_sealed 352 +kotlin-responseBased-operation_id_generator 337 +kotlin-responseBased-merged_include 335 kotlin-responseBased-case_sensitive_enum 333 -kotlin-responseBased-operation_id_generator 332 java-operationBased-java_hashcode 331 -kotlin-responseBased-merged_include 330 kotlin-responseBased-big_query 324 -kotlin-responseBased-nonnull 316 +kotlin-responseBased-nonnull 321 kotlin-operationBased-companion 309 kotlin-responseBased-object 308 kotlin-responseBased-java_hashcode 248 diff --git a/libraries/apollo-compiler/src/test/graphql/com/example/merged_include/java/operationBased/merged_include/TestQuery.java.expected b/libraries/apollo-compiler/src/test/graphql/com/example/merged_include/java/operationBased/merged_include/TestQuery.java.expected index 4f7e62a5eb7..a198e55eccc 100644 --- a/libraries/apollo-compiler/src/test/graphql/com/example/merged_include/java/operationBased/merged_include/TestQuery.java.expected +++ b/libraries/apollo-compiler/src/test/graphql/com/example/merged_include/java/operationBased/merged_include/TestQuery.java.expected @@ -99,7 +99,7 @@ public class TestQuery implements Query { @Override public void serializeVariables(JsonWriter writer, CustomScalarAdapters customScalarAdapters, - boolean withBooleanDefaultValues) throws IOException { + boolean withDefaultValues) throws IOException { // This operation doesn't have any variable } diff --git a/libraries/apollo-compiler/src/test/graphql/com/example/merged_include/java/operationBased/merged_include/selections/TestQuerySelections.java.expected b/libraries/apollo-compiler/src/test/graphql/com/example/merged_include/java/operationBased/merged_include/selections/TestQuerySelections.java.expected index c6d6fbd305a..ad63e529752 100644 --- a/libraries/apollo-compiler/src/test/graphql/com/example/merged_include/java/operationBased/merged_include/selections/TestQuerySelections.java.expected +++ b/libraries/apollo-compiler/src/test/graphql/com/example/merged_include/java/operationBased/merged_include/selections/TestQuerySelections.java.expected @@ -5,6 +5,7 @@ // package com.example.merged_include.selections; +import com.apollographql.apollo3.api.CompiledArgument; import com.apollographql.apollo3.api.CompiledField; import com.apollographql.apollo3.api.CompiledNotNullType; import com.apollographql.apollo3.api.CompiledSelection; @@ -19,6 +20,6 @@ public class TestQuerySelections { ); public static List __root = Arrays.asList( - new CompiledField.Builder("hero", Character.type).selections(__hero).build() + new CompiledField.Builder("hero", Character.type).arguments(Arrays.asList(new CompiledArgument.Builder("episode").build(), new CompiledArgument.Builder("listOfListOfStringArgs").build())).selections(__hero).build() ); } diff --git a/libraries/apollo-compiler/src/test/graphql/com/example/merged_include/kotlin/responseBased/merged_include/TestQuery.kt.expected b/libraries/apollo-compiler/src/test/graphql/com/example/merged_include/kotlin/responseBased/merged_include/TestQuery.kt.expected index 7ac94b51488..ebc23f39762 100644 --- a/libraries/apollo-compiler/src/test/graphql/com/example/merged_include/kotlin/responseBased/merged_include/TestQuery.kt.expected +++ b/libraries/apollo-compiler/src/test/graphql/com/example/merged_include/kotlin/responseBased/merged_include/TestQuery.kt.expected @@ -34,7 +34,7 @@ public class TestQuery() : Query { override fun serializeVariables( writer: JsonWriter, customScalarAdapters: CustomScalarAdapters, - withBooleanDefaultValues: Boolean, + withDefaultValues: Boolean, ) { // This operation doesn't have any variable } diff --git a/libraries/apollo-compiler/src/test/graphql/com/example/merged_include/kotlin/responseBased/merged_include/selections/TestQuerySelections.kt.expected b/libraries/apollo-compiler/src/test/graphql/com/example/merged_include/kotlin/responseBased/merged_include/selections/TestQuerySelections.kt.expected index 9ede4f645ae..1d6b886f983 100644 --- a/libraries/apollo-compiler/src/test/graphql/com/example/merged_include/kotlin/responseBased/merged_include/selections/TestQuerySelections.kt.expected +++ b/libraries/apollo-compiler/src/test/graphql/com/example/merged_include/kotlin/responseBased/merged_include/selections/TestQuerySelections.kt.expected @@ -5,6 +5,7 @@ // package com.example.merged_include.selections +import com.apollographql.apollo3.api.CompiledArgument import com.apollographql.apollo3.api.CompiledField import com.apollographql.apollo3.api.CompiledSelection import com.apollographql.apollo3.api.notNull @@ -24,7 +25,11 @@ public object TestQuerySelections { CompiledField.Builder( name = "hero", type = Character.type - ).selections(__hero) + ).arguments(listOf( + CompiledArgument.Builder("episode").build(), + CompiledArgument.Builder("listOfListOfStringArgs").build() + )) + .selections(__hero) .build() ) } diff --git a/libraries/apollo-compiler/src/test/graphql/com/example/monomorphic/java/operationBased/monomorphic/TestQuery.java.expected b/libraries/apollo-compiler/src/test/graphql/com/example/monomorphic/java/operationBased/monomorphic/TestQuery.java.expected index f6036413460..d1bcf1f2e19 100644 --- a/libraries/apollo-compiler/src/test/graphql/com/example/monomorphic/java/operationBased/monomorphic/TestQuery.java.expected +++ b/libraries/apollo-compiler/src/test/graphql/com/example/monomorphic/java/operationBased/monomorphic/TestQuery.java.expected @@ -102,7 +102,7 @@ public class TestQuery implements Query { @Override public void serializeVariables(JsonWriter writer, CustomScalarAdapters customScalarAdapters, - boolean withBooleanDefaultValues) throws IOException { + boolean withDefaultValues) throws IOException { // This operation doesn't have any variable } diff --git a/libraries/apollo-compiler/src/test/graphql/com/example/monomorphic/kotlin/operationBased/monomorphic/TestQuery.kt.expected b/libraries/apollo-compiler/src/test/graphql/com/example/monomorphic/kotlin/operationBased/monomorphic/TestQuery.kt.expected index f705eb3b92f..64ca314e616 100644 --- a/libraries/apollo-compiler/src/test/graphql/com/example/monomorphic/kotlin/operationBased/monomorphic/TestQuery.kt.expected +++ b/libraries/apollo-compiler/src/test/graphql/com/example/monomorphic/kotlin/operationBased/monomorphic/TestQuery.kt.expected @@ -34,7 +34,7 @@ public class TestQuery() : Query { override fun serializeVariables( writer: JsonWriter, customScalarAdapters: CustomScalarAdapters, - withBooleanDefaultValues: Boolean, + withDefaultValues: Boolean, ) { // This operation doesn't have any variable } diff --git a/libraries/apollo-compiler/src/test/graphql/com/example/monomorphic/kotlin/responseBased/monomorphic/TestQuery.kt.expected b/libraries/apollo-compiler/src/test/graphql/com/example/monomorphic/kotlin/responseBased/monomorphic/TestQuery.kt.expected index 46acc0721be..79bfb2df7a3 100644 --- a/libraries/apollo-compiler/src/test/graphql/com/example/monomorphic/kotlin/responseBased/monomorphic/TestQuery.kt.expected +++ b/libraries/apollo-compiler/src/test/graphql/com/example/monomorphic/kotlin/responseBased/monomorphic/TestQuery.kt.expected @@ -35,7 +35,7 @@ public class TestQuery() : Query { override fun serializeVariables( writer: JsonWriter, customScalarAdapters: CustomScalarAdapters, - withBooleanDefaultValues: Boolean, + withDefaultValues: Boolean, ) { // This operation doesn't have any variable } diff --git a/libraries/apollo-compiler/src/test/graphql/com/example/multiple_fragments/java/operationBased/multiple_fragments/TestQuery.java.expected b/libraries/apollo-compiler/src/test/graphql/com/example/multiple_fragments/java/operationBased/multiple_fragments/TestQuery.java.expected index 84b44b7a107..e6c373e9905 100644 --- a/libraries/apollo-compiler/src/test/graphql/com/example/multiple_fragments/java/operationBased/multiple_fragments/TestQuery.java.expected +++ b/libraries/apollo-compiler/src/test/graphql/com/example/multiple_fragments/java/operationBased/multiple_fragments/TestQuery.java.expected @@ -114,7 +114,7 @@ public class TestQuery implements Query { @Override public void serializeVariables(JsonWriter writer, CustomScalarAdapters customScalarAdapters, - boolean withBooleanDefaultValues) throws IOException { + boolean withDefaultValues) throws IOException { // This operation doesn't have any variable } diff --git a/libraries/apollo-compiler/src/test/graphql/com/example/multiple_fragments/java/operationBased/multiple_fragments/fragment/AFragmentImpl.java.expected b/libraries/apollo-compiler/src/test/graphql/com/example/multiple_fragments/java/operationBased/multiple_fragments/fragment/AFragmentImpl.java.expected index 8dd2e3102e0..6d07286cf75 100644 --- a/libraries/apollo-compiler/src/test/graphql/com/example/multiple_fragments/java/operationBased/multiple_fragments/fragment/AFragmentImpl.java.expected +++ b/libraries/apollo-compiler/src/test/graphql/com/example/multiple_fragments/java/operationBased/multiple_fragments/fragment/AFragmentImpl.java.expected @@ -61,7 +61,7 @@ public class AFragmentImpl implements Fragment { @Override public void serializeVariables(JsonWriter writer, CustomScalarAdapters customScalarAdapters, - boolean withBooleanDefaultValues) throws IOException { + boolean withDefaultValues) throws IOException { // This fragment doesn't have any variable } diff --git a/libraries/apollo-compiler/src/test/graphql/com/example/multiple_fragments/java/operationBased/multiple_fragments/fragment/Fragment1Impl.java.expected b/libraries/apollo-compiler/src/test/graphql/com/example/multiple_fragments/java/operationBased/multiple_fragments/fragment/Fragment1Impl.java.expected index ab575ad47b8..46ba96a8403 100644 --- a/libraries/apollo-compiler/src/test/graphql/com/example/multiple_fragments/java/operationBased/multiple_fragments/fragment/Fragment1Impl.java.expected +++ b/libraries/apollo-compiler/src/test/graphql/com/example/multiple_fragments/java/operationBased/multiple_fragments/fragment/Fragment1Impl.java.expected @@ -61,7 +61,7 @@ public class Fragment1Impl implements Fragment { @Override public void serializeVariables(JsonWriter writer, CustomScalarAdapters customScalarAdapters, - boolean withBooleanDefaultValues) throws IOException { + boolean withDefaultValues) throws IOException { // This fragment doesn't have any variable } diff --git a/libraries/apollo-compiler/src/test/graphql/com/example/multiple_fragments/java/operationBased/multiple_fragments/fragment/Fragment2Impl.java.expected b/libraries/apollo-compiler/src/test/graphql/com/example/multiple_fragments/java/operationBased/multiple_fragments/fragment/Fragment2Impl.java.expected index 6d97b0be4f2..c9e820c969d 100644 --- a/libraries/apollo-compiler/src/test/graphql/com/example/multiple_fragments/java/operationBased/multiple_fragments/fragment/Fragment2Impl.java.expected +++ b/libraries/apollo-compiler/src/test/graphql/com/example/multiple_fragments/java/operationBased/multiple_fragments/fragment/Fragment2Impl.java.expected @@ -61,7 +61,7 @@ public class Fragment2Impl implements Fragment { @Override public void serializeVariables(JsonWriter writer, CustomScalarAdapters customScalarAdapters, - boolean withBooleanDefaultValues) throws IOException { + boolean withDefaultValues) throws IOException { // This fragment doesn't have any variable } diff --git a/libraries/apollo-compiler/src/test/graphql/com/example/multiple_fragments/kotlin/operationBased/multiple_fragments/TestQuery.kt.expected b/libraries/apollo-compiler/src/test/graphql/com/example/multiple_fragments/kotlin/operationBased/multiple_fragments/TestQuery.kt.expected index ee9ec86a4d0..254cafbe30e 100644 --- a/libraries/apollo-compiler/src/test/graphql/com/example/multiple_fragments/kotlin/operationBased/multiple_fragments/TestQuery.kt.expected +++ b/libraries/apollo-compiler/src/test/graphql/com/example/multiple_fragments/kotlin/operationBased/multiple_fragments/TestQuery.kt.expected @@ -35,7 +35,7 @@ public class TestQuery() : Query { override fun serializeVariables( writer: JsonWriter, customScalarAdapters: CustomScalarAdapters, - withBooleanDefaultValues: Boolean, + withDefaultValues: Boolean, ) { // This operation doesn't have any variable } diff --git a/libraries/apollo-compiler/src/test/graphql/com/example/multiple_fragments/kotlin/operationBased/multiple_fragments/fragment/AFragmentImpl.kt.expected b/libraries/apollo-compiler/src/test/graphql/com/example/multiple_fragments/kotlin/operationBased/multiple_fragments/fragment/AFragmentImpl.kt.expected index f59c17ca4bb..484c0a92401 100644 --- a/libraries/apollo-compiler/src/test/graphql/com/example/multiple_fragments/kotlin/operationBased/multiple_fragments/fragment/AFragmentImpl.kt.expected +++ b/libraries/apollo-compiler/src/test/graphql/com/example/multiple_fragments/kotlin/operationBased/multiple_fragments/fragment/AFragmentImpl.kt.expected @@ -25,7 +25,7 @@ public class AFragmentImpl() : Fragment { override fun serializeVariables( writer: JsonWriter, customScalarAdapters: CustomScalarAdapters, - withBooleanDefaultValues: Boolean, + withDefaultValues: Boolean, ) { // This fragment doesn't have any variable } diff --git a/libraries/apollo-compiler/src/test/graphql/com/example/multiple_fragments/kotlin/operationBased/multiple_fragments/fragment/Fragment1Impl.kt.expected b/libraries/apollo-compiler/src/test/graphql/com/example/multiple_fragments/kotlin/operationBased/multiple_fragments/fragment/Fragment1Impl.kt.expected index 3338c4e349e..24f8036291f 100644 --- a/libraries/apollo-compiler/src/test/graphql/com/example/multiple_fragments/kotlin/operationBased/multiple_fragments/fragment/Fragment1Impl.kt.expected +++ b/libraries/apollo-compiler/src/test/graphql/com/example/multiple_fragments/kotlin/operationBased/multiple_fragments/fragment/Fragment1Impl.kt.expected @@ -25,7 +25,7 @@ public class Fragment1Impl() : Fragment { override fun serializeVariables( writer: JsonWriter, customScalarAdapters: CustomScalarAdapters, - withBooleanDefaultValues: Boolean, + withDefaultValues: Boolean, ) { // This fragment doesn't have any variable } diff --git a/libraries/apollo-compiler/src/test/graphql/com/example/multiple_fragments/kotlin/operationBased/multiple_fragments/fragment/Fragment2Impl.kt.expected b/libraries/apollo-compiler/src/test/graphql/com/example/multiple_fragments/kotlin/operationBased/multiple_fragments/fragment/Fragment2Impl.kt.expected index 289479c2811..e12d6f642a1 100644 --- a/libraries/apollo-compiler/src/test/graphql/com/example/multiple_fragments/kotlin/operationBased/multiple_fragments/fragment/Fragment2Impl.kt.expected +++ b/libraries/apollo-compiler/src/test/graphql/com/example/multiple_fragments/kotlin/operationBased/multiple_fragments/fragment/Fragment2Impl.kt.expected @@ -25,7 +25,7 @@ public class Fragment2Impl() : Fragment { override fun serializeVariables( writer: JsonWriter, customScalarAdapters: CustomScalarAdapters, - withBooleanDefaultValues: Boolean, + withDefaultValues: Boolean, ) { // This fragment doesn't have any variable } diff --git a/libraries/apollo-compiler/src/test/graphql/com/example/multiple_fragments/kotlin/responseBased/multiple_fragments/TestQuery.kt.expected b/libraries/apollo-compiler/src/test/graphql/com/example/multiple_fragments/kotlin/responseBased/multiple_fragments/TestQuery.kt.expected index 80bb759058f..ff8e3241b5e 100644 --- a/libraries/apollo-compiler/src/test/graphql/com/example/multiple_fragments/kotlin/responseBased/multiple_fragments/TestQuery.kt.expected +++ b/libraries/apollo-compiler/src/test/graphql/com/example/multiple_fragments/kotlin/responseBased/multiple_fragments/TestQuery.kt.expected @@ -38,7 +38,7 @@ public class TestQuery() : Query { override fun serializeVariables( writer: JsonWriter, customScalarAdapters: CustomScalarAdapters, - withBooleanDefaultValues: Boolean, + withDefaultValues: Boolean, ) { // This operation doesn't have any variable } diff --git a/libraries/apollo-compiler/src/test/graphql/com/example/multiple_fragments/kotlin/responseBased/multiple_fragments/fragment/AFragmentImpl.kt.expected b/libraries/apollo-compiler/src/test/graphql/com/example/multiple_fragments/kotlin/responseBased/multiple_fragments/fragment/AFragmentImpl.kt.expected index c530887cac1..67f14f2a06c 100644 --- a/libraries/apollo-compiler/src/test/graphql/com/example/multiple_fragments/kotlin/responseBased/multiple_fragments/fragment/AFragmentImpl.kt.expected +++ b/libraries/apollo-compiler/src/test/graphql/com/example/multiple_fragments/kotlin/responseBased/multiple_fragments/fragment/AFragmentImpl.kt.expected @@ -27,7 +27,7 @@ public class AFragmentImpl() : Fragment { override fun serializeVariables( writer: JsonWriter, customScalarAdapters: CustomScalarAdapters, - withBooleanDefaultValues: Boolean, + withDefaultValues: Boolean, ) { // This fragment doesn't have any variable } diff --git a/libraries/apollo-compiler/src/test/graphql/com/example/multiple_fragments/kotlin/responseBased/multiple_fragments/fragment/Fragment1Impl.kt.expected b/libraries/apollo-compiler/src/test/graphql/com/example/multiple_fragments/kotlin/responseBased/multiple_fragments/fragment/Fragment1Impl.kt.expected index 0541115083b..31028fc32e4 100644 --- a/libraries/apollo-compiler/src/test/graphql/com/example/multiple_fragments/kotlin/responseBased/multiple_fragments/fragment/Fragment1Impl.kt.expected +++ b/libraries/apollo-compiler/src/test/graphql/com/example/multiple_fragments/kotlin/responseBased/multiple_fragments/fragment/Fragment1Impl.kt.expected @@ -26,7 +26,7 @@ public class Fragment1Impl() : Fragment { override fun serializeVariables( writer: JsonWriter, customScalarAdapters: CustomScalarAdapters, - withBooleanDefaultValues: Boolean, + withDefaultValues: Boolean, ) { // This fragment doesn't have any variable } diff --git a/libraries/apollo-compiler/src/test/graphql/com/example/multiple_fragments/kotlin/responseBased/multiple_fragments/fragment/Fragment2Impl.kt.expected b/libraries/apollo-compiler/src/test/graphql/com/example/multiple_fragments/kotlin/responseBased/multiple_fragments/fragment/Fragment2Impl.kt.expected index 784727a7a73..cefbbd26df3 100644 --- a/libraries/apollo-compiler/src/test/graphql/com/example/multiple_fragments/kotlin/responseBased/multiple_fragments/fragment/Fragment2Impl.kt.expected +++ b/libraries/apollo-compiler/src/test/graphql/com/example/multiple_fragments/kotlin/responseBased/multiple_fragments/fragment/Fragment2Impl.kt.expected @@ -26,7 +26,7 @@ public class Fragment2Impl() : Fragment { override fun serializeVariables( writer: JsonWriter, customScalarAdapters: CustomScalarAdapters, - withBooleanDefaultValues: Boolean, + withDefaultValues: Boolean, ) { // This fragment doesn't have any variable } diff --git a/libraries/apollo-compiler/src/test/graphql/com/example/mutation_create_review/java/operationBased/mutation_create_review/CreateReviewForEpisode.java.expected b/libraries/apollo-compiler/src/test/graphql/com/example/mutation_create_review/java/operationBased/mutation_create_review/CreateReviewForEpisode.java.expected index 743059fe60a..0e10309a4e4 100644 --- a/libraries/apollo-compiler/src/test/graphql/com/example/mutation_create_review/java/operationBased/mutation_create_review/CreateReviewForEpisode.java.expected +++ b/libraries/apollo-compiler/src/test/graphql/com/example/mutation_create_review/java/operationBased/mutation_create_review/CreateReviewForEpisode.java.expected @@ -127,8 +127,8 @@ public class CreateReviewForEpisode implements Mutation __root = Arrays.asList( - new CompiledField.Builder("createReview", Review.type).arguments(Arrays.asList(new CompiledArgument.Builder("episode", new CompiledVariable("ep")).build(), new CompiledArgument.Builder("review", new CompiledVariable("review")).build())).selections(__createReview).build() + new CompiledField.Builder("createReview", Review.type).arguments(Arrays.asList(new CompiledArgument.Builder("episode").value(new CompiledVariable("ep")).build(), new CompiledArgument.Builder("review").value(new CompiledVariable("review")).build())).selections(__createReview).build() ); } diff --git a/libraries/apollo-compiler/src/test/graphql/com/example/mutation_create_review/kotlin/responseBased/mutation_create_review/CreateReviewForEpisode.kt.expected b/libraries/apollo-compiler/src/test/graphql/com/example/mutation_create_review/kotlin/responseBased/mutation_create_review/CreateReviewForEpisode.kt.expected index 03fcf216b7e..bdfa0700fb6 100644 --- a/libraries/apollo-compiler/src/test/graphql/com/example/mutation_create_review/kotlin/responseBased/mutation_create_review/CreateReviewForEpisode.kt.expected +++ b/libraries/apollo-compiler/src/test/graphql/com/example/mutation_create_review/kotlin/responseBased/mutation_create_review/CreateReviewForEpisode.kt.expected @@ -44,10 +44,10 @@ internal data class CreateReviewForEpisode( override fun serializeVariables( writer: JsonWriter, customScalarAdapters: CustomScalarAdapters, - withBooleanDefaultValues: Boolean, + withDefaultValues: Boolean, ) { CreateReviewForEpisode_VariablesAdapter.serializeVariables(writer, this, customScalarAdapters, - withBooleanDefaultValues) + withDefaultValues) } override fun adapter(): CompositeAdapter = CreateReviewForEpisode_ResponseAdapter.Data.obj() diff --git a/libraries/apollo-compiler/src/test/graphql/com/example/mutation_create_review/kotlin/responseBased/mutation_create_review/adapter/CreateReviewForEpisode_VariablesAdapter.kt.expected b/libraries/apollo-compiler/src/test/graphql/com/example/mutation_create_review/kotlin/responseBased/mutation_create_review/adapter/CreateReviewForEpisode_VariablesAdapter.kt.expected index be0171ead62..335fdd36808 100644 --- a/libraries/apollo-compiler/src/test/graphql/com/example/mutation_create_review/kotlin/responseBased/mutation_create_review/adapter/CreateReviewForEpisode_VariablesAdapter.kt.expected +++ b/libraries/apollo-compiler/src/test/graphql/com/example/mutation_create_review/kotlin/responseBased/mutation_create_review/adapter/CreateReviewForEpisode_VariablesAdapter.kt.expected @@ -23,7 +23,7 @@ internal object CreateReviewForEpisode_VariablesAdapter { writer: JsonWriter, `value`: CreateReviewForEpisode, customScalarAdapters: CustomScalarAdapters, - withBooleanDefaultValues: Boolean, + withDefaultValues: Boolean, ) { writer.name("ep") Episode_ResponseAdapter.toJson(writer, customScalarAdapters, value.ep) diff --git a/libraries/apollo-compiler/src/test/graphql/com/example/mutation_create_review/kotlin/responseBased/mutation_create_review/selections/CreateReviewForEpisodeSelections.kt.expected b/libraries/apollo-compiler/src/test/graphql/com/example/mutation_create_review/kotlin/responseBased/mutation_create_review/selections/CreateReviewForEpisodeSelections.kt.expected index fc60f94f09e..67ebc71948a 100644 --- a/libraries/apollo-compiler/src/test/graphql/com/example/mutation_create_review/kotlin/responseBased/mutation_create_review/selections/CreateReviewForEpisodeSelections.kt.expected +++ b/libraries/apollo-compiler/src/test/graphql/com/example/mutation_create_review/kotlin/responseBased/mutation_create_review/selections/CreateReviewForEpisodeSelections.kt.expected @@ -60,8 +60,8 @@ internal object CreateReviewForEpisodeSelections { name = "createReview", type = Review.type ).arguments(listOf( - CompiledArgument.Builder("episode", CompiledVariable("ep")).build(), - CompiledArgument.Builder("review", CompiledVariable("review")).build() + CompiledArgument.Builder("episode").value(CompiledVariable("ep")).build(), + CompiledArgument.Builder("review").value(CompiledVariable("review")).build() )) .selections(__createReview) .build() diff --git a/libraries/apollo-compiler/src/test/graphql/com/example/mutation_create_review_semantic_naming/java/operationBased/mutation_create_review_semantic_naming/CreateReviewForEpisodeMutation.java.expected b/libraries/apollo-compiler/src/test/graphql/com/example/mutation_create_review_semantic_naming/java/operationBased/mutation_create_review_semantic_naming/CreateReviewForEpisodeMutation.java.expected index 23073851695..d143abb859f 100644 --- a/libraries/apollo-compiler/src/test/graphql/com/example/mutation_create_review_semantic_naming/java/operationBased/mutation_create_review_semantic_naming/CreateReviewForEpisodeMutation.java.expected +++ b/libraries/apollo-compiler/src/test/graphql/com/example/mutation_create_review_semantic_naming/java/operationBased/mutation_create_review_semantic_naming/CreateReviewForEpisodeMutation.java.expected @@ -114,8 +114,8 @@ public class CreateReviewForEpisodeMutation implements Mutation __root = Arrays.asList( - new CompiledField.Builder("createReview", Review.type).arguments(Arrays.asList(new CompiledArgument.Builder("episode", new CompiledVariable("ep")).build(), new CompiledArgument.Builder("review", new CompiledVariable("review")).build())).selections(__createReview).build() + new CompiledField.Builder("createReview", Review.type).arguments(Arrays.asList(new CompiledArgument.Builder("episode").value(new CompiledVariable("ep")).build(), new CompiledArgument.Builder("review").value(new CompiledVariable("review")).build())).selections(__createReview).build() ); } diff --git a/libraries/apollo-compiler/src/test/graphql/com/example/mutation_create_review_semantic_naming/kotlin/responseBased/mutation_create_review_semantic_naming/CreateReviewForEpisodeMutation.kt.expected b/libraries/apollo-compiler/src/test/graphql/com/example/mutation_create_review_semantic_naming/kotlin/responseBased/mutation_create_review_semantic_naming/CreateReviewForEpisodeMutation.kt.expected index 34511c33ed0..244a3d61145 100644 --- a/libraries/apollo-compiler/src/test/graphql/com/example/mutation_create_review_semantic_naming/kotlin/responseBased/mutation_create_review_semantic_naming/CreateReviewForEpisodeMutation.kt.expected +++ b/libraries/apollo-compiler/src/test/graphql/com/example/mutation_create_review_semantic_naming/kotlin/responseBased/mutation_create_review_semantic_naming/CreateReviewForEpisodeMutation.kt.expected @@ -35,10 +35,10 @@ public data class CreateReviewForEpisodeMutation( override fun serializeVariables( writer: JsonWriter, customScalarAdapters: CustomScalarAdapters, - withBooleanDefaultValues: Boolean, + withDefaultValues: Boolean, ) { CreateReviewForEpisodeMutation_VariablesAdapter.serializeVariables(writer, this, - customScalarAdapters, withBooleanDefaultValues) + customScalarAdapters, withDefaultValues) } override fun adapter(): CompositeAdapter = diff --git a/libraries/apollo-compiler/src/test/graphql/com/example/mutation_create_review_semantic_naming/kotlin/responseBased/mutation_create_review_semantic_naming/adapter/CreateReviewForEpisodeMutation_VariablesAdapter.kt.expected b/libraries/apollo-compiler/src/test/graphql/com/example/mutation_create_review_semantic_naming/kotlin/responseBased/mutation_create_review_semantic_naming/adapter/CreateReviewForEpisodeMutation_VariablesAdapter.kt.expected index a593cac58e3..ab383a12267 100644 --- a/libraries/apollo-compiler/src/test/graphql/com/example/mutation_create_review_semantic_naming/kotlin/responseBased/mutation_create_review_semantic_naming/adapter/CreateReviewForEpisodeMutation_VariablesAdapter.kt.expected +++ b/libraries/apollo-compiler/src/test/graphql/com/example/mutation_create_review_semantic_naming/kotlin/responseBased/mutation_create_review_semantic_naming/adapter/CreateReviewForEpisodeMutation_VariablesAdapter.kt.expected @@ -23,7 +23,7 @@ public object CreateReviewForEpisodeMutation_VariablesAdapter { writer: JsonWriter, `value`: CreateReviewForEpisodeMutation, customScalarAdapters: CustomScalarAdapters, - withBooleanDefaultValues: Boolean, + withDefaultValues: Boolean, ) { writer.name("ep") Episode_ResponseAdapter.toJson(writer, customScalarAdapters, value.ep) diff --git a/libraries/apollo-compiler/src/test/graphql/com/example/mutation_create_review_semantic_naming/kotlin/responseBased/mutation_create_review_semantic_naming/selections/CreateReviewForEpisodeMutationSelections.kt.expected b/libraries/apollo-compiler/src/test/graphql/com/example/mutation_create_review_semantic_naming/kotlin/responseBased/mutation_create_review_semantic_naming/selections/CreateReviewForEpisodeMutationSelections.kt.expected index 34dcb65e347..8fa1fb70b05 100644 --- a/libraries/apollo-compiler/src/test/graphql/com/example/mutation_create_review_semantic_naming/kotlin/responseBased/mutation_create_review_semantic_naming/selections/CreateReviewForEpisodeMutationSelections.kt.expected +++ b/libraries/apollo-compiler/src/test/graphql/com/example/mutation_create_review_semantic_naming/kotlin/responseBased/mutation_create_review_semantic_naming/selections/CreateReviewForEpisodeMutationSelections.kt.expected @@ -32,8 +32,8 @@ public object CreateReviewForEpisodeMutationSelections { name = "createReview", type = Review.type ).arguments(listOf( - CompiledArgument.Builder("episode", CompiledVariable("ep")).build(), - CompiledArgument.Builder("review", CompiledVariable("review")).build() + CompiledArgument.Builder("episode").value(CompiledVariable("ep")).build(), + CompiledArgument.Builder("review").value(CompiledVariable("review")).build() )) .selections(__createReview) .build() diff --git a/libraries/apollo-compiler/src/test/graphql/com/example/named_fragment_delegate/java/operationBased/named_fragment_delegate/TestQuery.java.expected b/libraries/apollo-compiler/src/test/graphql/com/example/named_fragment_delegate/java/operationBased/named_fragment_delegate/TestQuery.java.expected index eae72689c44..8abea349f61 100644 --- a/libraries/apollo-compiler/src/test/graphql/com/example/named_fragment_delegate/java/operationBased/named_fragment_delegate/TestQuery.java.expected +++ b/libraries/apollo-compiler/src/test/graphql/com/example/named_fragment_delegate/java/operationBased/named_fragment_delegate/TestQuery.java.expected @@ -120,7 +120,7 @@ public class TestQuery implements Query { @Override public void serializeVariables(JsonWriter writer, CustomScalarAdapters customScalarAdapters, - boolean withBooleanDefaultValues) throws IOException { + boolean withDefaultValues) throws IOException { // This operation doesn't have any variable } diff --git a/libraries/apollo-compiler/src/test/graphql/com/example/named_fragment_delegate/java/operationBased/named_fragment_delegate/fragment/DroidDetailsImpl.java.expected b/libraries/apollo-compiler/src/test/graphql/com/example/named_fragment_delegate/java/operationBased/named_fragment_delegate/fragment/DroidDetailsImpl.java.expected index 3bbef32ff77..f56c20cc701 100644 --- a/libraries/apollo-compiler/src/test/graphql/com/example/named_fragment_delegate/java/operationBased/named_fragment_delegate/fragment/DroidDetailsImpl.java.expected +++ b/libraries/apollo-compiler/src/test/graphql/com/example/named_fragment_delegate/java/operationBased/named_fragment_delegate/fragment/DroidDetailsImpl.java.expected @@ -61,7 +61,7 @@ public class DroidDetailsImpl implements Fragment { @Override public void serializeVariables(JsonWriter writer, CustomScalarAdapters customScalarAdapters, - boolean withBooleanDefaultValues) throws IOException { + boolean withDefaultValues) throws IOException { // This fragment doesn't have any variable } diff --git a/libraries/apollo-compiler/src/test/graphql/com/example/named_fragment_delegate/java/operationBased/named_fragment_delegate/fragment/HumanDetailsImpl.java.expected b/libraries/apollo-compiler/src/test/graphql/com/example/named_fragment_delegate/java/operationBased/named_fragment_delegate/fragment/HumanDetailsImpl.java.expected index a0d00507dd2..b6f3fdb8c4a 100644 --- a/libraries/apollo-compiler/src/test/graphql/com/example/named_fragment_delegate/java/operationBased/named_fragment_delegate/fragment/HumanDetailsImpl.java.expected +++ b/libraries/apollo-compiler/src/test/graphql/com/example/named_fragment_delegate/java/operationBased/named_fragment_delegate/fragment/HumanDetailsImpl.java.expected @@ -61,7 +61,7 @@ public class HumanDetailsImpl implements Fragment { @Override public void serializeVariables(JsonWriter writer, CustomScalarAdapters customScalarAdapters, - boolean withBooleanDefaultValues) throws IOException { + boolean withDefaultValues) throws IOException { // This fragment doesn't have any variable } diff --git a/libraries/apollo-compiler/src/test/graphql/com/example/named_fragment_delegate/java/operationBased/named_fragment_delegate/fragment/selections/HumanDetailsSelections.java.expected b/libraries/apollo-compiler/src/test/graphql/com/example/named_fragment_delegate/java/operationBased/named_fragment_delegate/fragment/selections/HumanDetailsSelections.java.expected index f03a022b586..ced5189cd64 100644 --- a/libraries/apollo-compiler/src/test/graphql/com/example/named_fragment_delegate/java/operationBased/named_fragment_delegate/fragment/selections/HumanDetailsSelections.java.expected +++ b/libraries/apollo-compiler/src/test/graphql/com/example/named_fragment_delegate/java/operationBased/named_fragment_delegate/fragment/selections/HumanDetailsSelections.java.expected @@ -5,6 +5,7 @@ // package com.example.named_fragment_delegate.fragment.selections; +import com.apollographql.apollo3.api.CompiledArgument; import com.apollographql.apollo3.api.CompiledField; import com.apollographql.apollo3.api.CompiledListType; import com.apollographql.apollo3.api.CompiledNotNullType; @@ -33,6 +34,6 @@ public class HumanDetailsSelections { public static List __root = Arrays.asList( new CompiledField.Builder("name", new CompiledNotNullType(GraphQLString.type)).build(), new CompiledField.Builder("profileLink", new CompiledNotNullType(URL.type)).build(), - new CompiledField.Builder("friendsConnection", new CompiledNotNullType(FriendsConnection.type)).selections(__friendsConnection).build() + new CompiledField.Builder("friendsConnection", new CompiledNotNullType(FriendsConnection.type)).arguments(Arrays.asList(new CompiledArgument.Builder("after").build(), new CompiledArgument.Builder("first").build())).selections(__friendsConnection).build() ); } diff --git a/libraries/apollo-compiler/src/test/graphql/com/example/named_fragment_delegate/java/operationBased/named_fragment_delegate/selections/TestQuerySelections.java.expected b/libraries/apollo-compiler/src/test/graphql/com/example/named_fragment_delegate/java/operationBased/named_fragment_delegate/selections/TestQuerySelections.java.expected index 6dffa56f2c9..8a089e57770 100644 --- a/libraries/apollo-compiler/src/test/graphql/com/example/named_fragment_delegate/java/operationBased/named_fragment_delegate/selections/TestQuerySelections.java.expected +++ b/libraries/apollo-compiler/src/test/graphql/com/example/named_fragment_delegate/java/operationBased/named_fragment_delegate/selections/TestQuerySelections.java.expected @@ -5,6 +5,7 @@ // package com.example.named_fragment_delegate.selections; +import com.apollographql.apollo3.api.CompiledArgument; import com.apollographql.apollo3.api.CompiledField; import com.apollographql.apollo3.api.CompiledFragment; import com.apollographql.apollo3.api.CompiledNotNullType; @@ -24,6 +25,6 @@ public class TestQuerySelections { ); public static List __root = Arrays.asList( - new CompiledField.Builder("hero", Character.type).selections(__hero).build() + new CompiledField.Builder("hero", Character.type).arguments(Arrays.asList(new CompiledArgument.Builder("episode").build(), new CompiledArgument.Builder("listOfListOfStringArgs").build())).selections(__hero).build() ); } diff --git a/libraries/apollo-compiler/src/test/graphql/com/example/named_fragment_delegate/kotlin/operationBased/named_fragment_delegate/TestQuery.kt.expected b/libraries/apollo-compiler/src/test/graphql/com/example/named_fragment_delegate/kotlin/operationBased/named_fragment_delegate/TestQuery.kt.expected index 7df60d7f2c4..820daf83eec 100644 --- a/libraries/apollo-compiler/src/test/graphql/com/example/named_fragment_delegate/kotlin/operationBased/named_fragment_delegate/TestQuery.kt.expected +++ b/libraries/apollo-compiler/src/test/graphql/com/example/named_fragment_delegate/kotlin/operationBased/named_fragment_delegate/TestQuery.kt.expected @@ -36,7 +36,7 @@ public class TestQuery() : Query { override fun serializeVariables( writer: JsonWriter, customScalarAdapters: CustomScalarAdapters, - withBooleanDefaultValues: Boolean, + withDefaultValues: Boolean, ) { // This operation doesn't have any variable } diff --git a/libraries/apollo-compiler/src/test/graphql/com/example/named_fragment_delegate/kotlin/operationBased/named_fragment_delegate/fragment/DroidDetailsImpl.kt.expected b/libraries/apollo-compiler/src/test/graphql/com/example/named_fragment_delegate/kotlin/operationBased/named_fragment_delegate/fragment/DroidDetailsImpl.kt.expected index acaa456ce71..ee9b6cde4d8 100644 --- a/libraries/apollo-compiler/src/test/graphql/com/example/named_fragment_delegate/kotlin/operationBased/named_fragment_delegate/fragment/DroidDetailsImpl.kt.expected +++ b/libraries/apollo-compiler/src/test/graphql/com/example/named_fragment_delegate/kotlin/operationBased/named_fragment_delegate/fragment/DroidDetailsImpl.kt.expected @@ -25,7 +25,7 @@ public class DroidDetailsImpl() : Fragment { override fun serializeVariables( writer: JsonWriter, customScalarAdapters: CustomScalarAdapters, - withBooleanDefaultValues: Boolean, + withDefaultValues: Boolean, ) { // This fragment doesn't have any variable } diff --git a/libraries/apollo-compiler/src/test/graphql/com/example/named_fragment_delegate/kotlin/operationBased/named_fragment_delegate/fragment/HumanDetailsImpl.kt.expected b/libraries/apollo-compiler/src/test/graphql/com/example/named_fragment_delegate/kotlin/operationBased/named_fragment_delegate/fragment/HumanDetailsImpl.kt.expected index 48231428b3b..f5dd938bdc7 100644 --- a/libraries/apollo-compiler/src/test/graphql/com/example/named_fragment_delegate/kotlin/operationBased/named_fragment_delegate/fragment/HumanDetailsImpl.kt.expected +++ b/libraries/apollo-compiler/src/test/graphql/com/example/named_fragment_delegate/kotlin/operationBased/named_fragment_delegate/fragment/HumanDetailsImpl.kt.expected @@ -25,7 +25,7 @@ public class HumanDetailsImpl() : Fragment { override fun serializeVariables( writer: JsonWriter, customScalarAdapters: CustomScalarAdapters, - withBooleanDefaultValues: Boolean, + withDefaultValues: Boolean, ) { // This fragment doesn't have any variable } diff --git a/libraries/apollo-compiler/src/test/graphql/com/example/named_fragment_delegate/kotlin/operationBased/named_fragment_delegate/fragment/selections/HumanDetailsSelections.kt.expected b/libraries/apollo-compiler/src/test/graphql/com/example/named_fragment_delegate/kotlin/operationBased/named_fragment_delegate/fragment/selections/HumanDetailsSelections.kt.expected index a1e7c90474c..691c3d8ff6b 100644 --- a/libraries/apollo-compiler/src/test/graphql/com/example/named_fragment_delegate/kotlin/operationBased/named_fragment_delegate/fragment/selections/HumanDetailsSelections.kt.expected +++ b/libraries/apollo-compiler/src/test/graphql/com/example/named_fragment_delegate/kotlin/operationBased/named_fragment_delegate/fragment/selections/HumanDetailsSelections.kt.expected @@ -5,6 +5,7 @@ // package com.example.named_fragment_delegate.fragment.selections +import com.apollographql.apollo3.api.CompiledArgument import com.apollographql.apollo3.api.CompiledField import com.apollographql.apollo3.api.CompiledSelection import com.apollographql.apollo3.api.list @@ -52,7 +53,11 @@ public object HumanDetailsSelections { CompiledField.Builder( name = "friendsConnection", type = FriendsConnection.type.notNull() - ).selections(__friendsConnection) + ).arguments(listOf( + CompiledArgument.Builder("after").build(), + CompiledArgument.Builder("first").build() + )) + .selections(__friendsConnection) .build() ) } diff --git a/libraries/apollo-compiler/src/test/graphql/com/example/named_fragment_delegate/kotlin/operationBased/named_fragment_delegate/selections/TestQuerySelections.kt.expected b/libraries/apollo-compiler/src/test/graphql/com/example/named_fragment_delegate/kotlin/operationBased/named_fragment_delegate/selections/TestQuerySelections.kt.expected index 2092635378b..49fdf15fef5 100644 --- a/libraries/apollo-compiler/src/test/graphql/com/example/named_fragment_delegate/kotlin/operationBased/named_fragment_delegate/selections/TestQuerySelections.kt.expected +++ b/libraries/apollo-compiler/src/test/graphql/com/example/named_fragment_delegate/kotlin/operationBased/named_fragment_delegate/selections/TestQuerySelections.kt.expected @@ -5,6 +5,7 @@ // package com.example.named_fragment_delegate.selections +import com.apollographql.apollo3.api.CompiledArgument import com.apollographql.apollo3.api.CompiledField import com.apollographql.apollo3.api.CompiledFragment import com.apollographql.apollo3.api.CompiledSelection @@ -37,7 +38,11 @@ public object TestQuerySelections { CompiledField.Builder( name = "hero", type = Character.type - ).selections(__hero) + ).arguments(listOf( + CompiledArgument.Builder("episode").build(), + CompiledArgument.Builder("listOfListOfStringArgs").build() + )) + .selections(__hero) .build() ) } diff --git a/libraries/apollo-compiler/src/test/graphql/com/example/named_fragment_delegate/kotlin/responseBased/named_fragment_delegate/TestQuery.kt.expected b/libraries/apollo-compiler/src/test/graphql/com/example/named_fragment_delegate/kotlin/responseBased/named_fragment_delegate/TestQuery.kt.expected index 923c581a7e0..ebbf8122106 100644 --- a/libraries/apollo-compiler/src/test/graphql/com/example/named_fragment_delegate/kotlin/responseBased/named_fragment_delegate/TestQuery.kt.expected +++ b/libraries/apollo-compiler/src/test/graphql/com/example/named_fragment_delegate/kotlin/responseBased/named_fragment_delegate/TestQuery.kt.expected @@ -38,7 +38,7 @@ public class TestQuery() : Query { override fun serializeVariables( writer: JsonWriter, customScalarAdapters: CustomScalarAdapters, - withBooleanDefaultValues: Boolean, + withDefaultValues: Boolean, ) { // This operation doesn't have any variable } diff --git a/libraries/apollo-compiler/src/test/graphql/com/example/named_fragment_delegate/kotlin/responseBased/named_fragment_delegate/fragment/DroidDetailsImpl.kt.expected b/libraries/apollo-compiler/src/test/graphql/com/example/named_fragment_delegate/kotlin/responseBased/named_fragment_delegate/fragment/DroidDetailsImpl.kt.expected index 897b62893bd..ad55a6e01ab 100644 --- a/libraries/apollo-compiler/src/test/graphql/com/example/named_fragment_delegate/kotlin/responseBased/named_fragment_delegate/fragment/DroidDetailsImpl.kt.expected +++ b/libraries/apollo-compiler/src/test/graphql/com/example/named_fragment_delegate/kotlin/responseBased/named_fragment_delegate/fragment/DroidDetailsImpl.kt.expected @@ -27,7 +27,7 @@ public class DroidDetailsImpl() : Fragment { override fun serializeVariables( writer: JsonWriter, customScalarAdapters: CustomScalarAdapters, - withBooleanDefaultValues: Boolean, + withDefaultValues: Boolean, ) { // This fragment doesn't have any variable } diff --git a/libraries/apollo-compiler/src/test/graphql/com/example/named_fragment_delegate/kotlin/responseBased/named_fragment_delegate/fragment/HumanDetailsImpl.kt.expected b/libraries/apollo-compiler/src/test/graphql/com/example/named_fragment_delegate/kotlin/responseBased/named_fragment_delegate/fragment/HumanDetailsImpl.kt.expected index 12292da80ff..35537a0e25b 100644 --- a/libraries/apollo-compiler/src/test/graphql/com/example/named_fragment_delegate/kotlin/responseBased/named_fragment_delegate/fragment/HumanDetailsImpl.kt.expected +++ b/libraries/apollo-compiler/src/test/graphql/com/example/named_fragment_delegate/kotlin/responseBased/named_fragment_delegate/fragment/HumanDetailsImpl.kt.expected @@ -27,7 +27,7 @@ public class HumanDetailsImpl() : Fragment { override fun serializeVariables( writer: JsonWriter, customScalarAdapters: CustomScalarAdapters, - withBooleanDefaultValues: Boolean, + withDefaultValues: Boolean, ) { // This fragment doesn't have any variable } diff --git a/libraries/apollo-compiler/src/test/graphql/com/example/named_fragment_delegate/kotlin/responseBased/named_fragment_delegate/fragment/selections/HumanDetailsSelections.kt.expected b/libraries/apollo-compiler/src/test/graphql/com/example/named_fragment_delegate/kotlin/responseBased/named_fragment_delegate/fragment/selections/HumanDetailsSelections.kt.expected index a1e7c90474c..691c3d8ff6b 100644 --- a/libraries/apollo-compiler/src/test/graphql/com/example/named_fragment_delegate/kotlin/responseBased/named_fragment_delegate/fragment/selections/HumanDetailsSelections.kt.expected +++ b/libraries/apollo-compiler/src/test/graphql/com/example/named_fragment_delegate/kotlin/responseBased/named_fragment_delegate/fragment/selections/HumanDetailsSelections.kt.expected @@ -5,6 +5,7 @@ // package com.example.named_fragment_delegate.fragment.selections +import com.apollographql.apollo3.api.CompiledArgument import com.apollographql.apollo3.api.CompiledField import com.apollographql.apollo3.api.CompiledSelection import com.apollographql.apollo3.api.list @@ -52,7 +53,11 @@ public object HumanDetailsSelections { CompiledField.Builder( name = "friendsConnection", type = FriendsConnection.type.notNull() - ).selections(__friendsConnection) + ).arguments(listOf( + CompiledArgument.Builder("after").build(), + CompiledArgument.Builder("first").build() + )) + .selections(__friendsConnection) .build() ) } diff --git a/libraries/apollo-compiler/src/test/graphql/com/example/named_fragment_delegate/kotlin/responseBased/named_fragment_delegate/selections/TestQuerySelections.kt.expected b/libraries/apollo-compiler/src/test/graphql/com/example/named_fragment_delegate/kotlin/responseBased/named_fragment_delegate/selections/TestQuerySelections.kt.expected index 2092635378b..49fdf15fef5 100644 --- a/libraries/apollo-compiler/src/test/graphql/com/example/named_fragment_delegate/kotlin/responseBased/named_fragment_delegate/selections/TestQuerySelections.kt.expected +++ b/libraries/apollo-compiler/src/test/graphql/com/example/named_fragment_delegate/kotlin/responseBased/named_fragment_delegate/selections/TestQuerySelections.kt.expected @@ -5,6 +5,7 @@ // package com.example.named_fragment_delegate.selections +import com.apollographql.apollo3.api.CompiledArgument import com.apollographql.apollo3.api.CompiledField import com.apollographql.apollo3.api.CompiledFragment import com.apollographql.apollo3.api.CompiledSelection @@ -37,7 +38,11 @@ public object TestQuerySelections { CompiledField.Builder( name = "hero", type = Character.type - ).selections(__hero) + ).arguments(listOf( + CompiledArgument.Builder("episode").build(), + CompiledArgument.Builder("listOfListOfStringArgs").build() + )) + .selections(__hero) .build() ) } diff --git a/libraries/apollo-compiler/src/test/graphql/com/example/named_fragment_inside_inline_fragment/java/operationBased/named_fragment_inside_inline_fragment/GetHero.java.expected b/libraries/apollo-compiler/src/test/graphql/com/example/named_fragment_inside_inline_fragment/java/operationBased/named_fragment_inside_inline_fragment/GetHero.java.expected index d3f35e20c4b..1e0eac26927 100644 --- a/libraries/apollo-compiler/src/test/graphql/com/example/named_fragment_inside_inline_fragment/java/operationBased/named_fragment_inside_inline_fragment/GetHero.java.expected +++ b/libraries/apollo-compiler/src/test/graphql/com/example/named_fragment_inside_inline_fragment/java/operationBased/named_fragment_inside_inline_fragment/GetHero.java.expected @@ -111,7 +111,7 @@ public class GetHero implements Query { @Override public void serializeVariables(JsonWriter writer, CustomScalarAdapters customScalarAdapters, - boolean withBooleanDefaultValues) throws IOException { + boolean withDefaultValues) throws IOException { // This operation doesn't have any variable } diff --git a/libraries/apollo-compiler/src/test/graphql/com/example/named_fragment_inside_inline_fragment/java/operationBased/named_fragment_inside_inline_fragment/fragment/CharacterAppearsInImpl.java.expected b/libraries/apollo-compiler/src/test/graphql/com/example/named_fragment_inside_inline_fragment/java/operationBased/named_fragment_inside_inline_fragment/fragment/CharacterAppearsInImpl.java.expected index f7b1425b05f..e90f576c3ef 100644 --- a/libraries/apollo-compiler/src/test/graphql/com/example/named_fragment_inside_inline_fragment/java/operationBased/named_fragment_inside_inline_fragment/fragment/CharacterAppearsInImpl.java.expected +++ b/libraries/apollo-compiler/src/test/graphql/com/example/named_fragment_inside_inline_fragment/java/operationBased/named_fragment_inside_inline_fragment/fragment/CharacterAppearsInImpl.java.expected @@ -61,7 +61,7 @@ public class CharacterAppearsInImpl implements Fragment { @Override public void serializeVariables(JsonWriter writer, CustomScalarAdapters customScalarAdapters, - boolean withBooleanDefaultValues) throws IOException { + boolean withDefaultValues) throws IOException { // This fragment doesn't have any variable } diff --git a/libraries/apollo-compiler/src/test/graphql/com/example/named_fragment_inside_inline_fragment/java/operationBased/named_fragment_inside_inline_fragment/fragment/CharacterNameImpl.java.expected b/libraries/apollo-compiler/src/test/graphql/com/example/named_fragment_inside_inline_fragment/java/operationBased/named_fragment_inside_inline_fragment/fragment/CharacterNameImpl.java.expected index 75a65e5fa33..da5bfea8355 100644 --- a/libraries/apollo-compiler/src/test/graphql/com/example/named_fragment_inside_inline_fragment/java/operationBased/named_fragment_inside_inline_fragment/fragment/CharacterNameImpl.java.expected +++ b/libraries/apollo-compiler/src/test/graphql/com/example/named_fragment_inside_inline_fragment/java/operationBased/named_fragment_inside_inline_fragment/fragment/CharacterNameImpl.java.expected @@ -61,7 +61,7 @@ public class CharacterNameImpl implements Fragment { @Override public void serializeVariables(JsonWriter writer, CustomScalarAdapters customScalarAdapters, - boolean withBooleanDefaultValues) throws IOException { + boolean withDefaultValues) throws IOException { // This fragment doesn't have any variable } diff --git a/libraries/apollo-compiler/src/test/graphql/com/example/named_fragment_inside_inline_fragment/java/operationBased/named_fragment_inside_inline_fragment/selections/GetHeroSelections.java.expected b/libraries/apollo-compiler/src/test/graphql/com/example/named_fragment_inside_inline_fragment/java/operationBased/named_fragment_inside_inline_fragment/selections/GetHeroSelections.java.expected index 0c379850dca..2b646232715 100644 --- a/libraries/apollo-compiler/src/test/graphql/com/example/named_fragment_inside_inline_fragment/java/operationBased/named_fragment_inside_inline_fragment/selections/GetHeroSelections.java.expected +++ b/libraries/apollo-compiler/src/test/graphql/com/example/named_fragment_inside_inline_fragment/java/operationBased/named_fragment_inside_inline_fragment/selections/GetHeroSelections.java.expected @@ -5,6 +5,7 @@ // package com.example.named_fragment_inside_inline_fragment.selections; +import com.apollographql.apollo3.api.CompiledArgument; import com.apollographql.apollo3.api.CompiledField; import com.apollographql.apollo3.api.CompiledFragment; import com.apollographql.apollo3.api.CompiledNotNullType; @@ -29,6 +30,6 @@ public class GetHeroSelections { ); public static List __root = Arrays.asList( - new CompiledField.Builder("hero", Character.type).selections(__hero).build() + new CompiledField.Builder("hero", Character.type).arguments(Arrays.asList(new CompiledArgument.Builder("episode").build(), new CompiledArgument.Builder("listOfListOfStringArgs").build())).selections(__hero).build() ); } diff --git a/libraries/apollo-compiler/src/test/graphql/com/example/named_fragment_inside_inline_fragment/kotlin/operationBased/named_fragment_inside_inline_fragment/GetHero.kt.expected b/libraries/apollo-compiler/src/test/graphql/com/example/named_fragment_inside_inline_fragment/kotlin/operationBased/named_fragment_inside_inline_fragment/GetHero.kt.expected index 33139cbadf5..f47afc6426f 100644 --- a/libraries/apollo-compiler/src/test/graphql/com/example/named_fragment_inside_inline_fragment/kotlin/operationBased/named_fragment_inside_inline_fragment/GetHero.kt.expected +++ b/libraries/apollo-compiler/src/test/graphql/com/example/named_fragment_inside_inline_fragment/kotlin/operationBased/named_fragment_inside_inline_fragment/GetHero.kt.expected @@ -36,7 +36,7 @@ public class GetHero() : Query { override fun serializeVariables( writer: JsonWriter, customScalarAdapters: CustomScalarAdapters, - withBooleanDefaultValues: Boolean, + withDefaultValues: Boolean, ) { // This operation doesn't have any variable } diff --git a/libraries/apollo-compiler/src/test/graphql/com/example/named_fragment_inside_inline_fragment/kotlin/operationBased/named_fragment_inside_inline_fragment/fragment/CharacterAppearsInImpl.kt.expected b/libraries/apollo-compiler/src/test/graphql/com/example/named_fragment_inside_inline_fragment/kotlin/operationBased/named_fragment_inside_inline_fragment/fragment/CharacterAppearsInImpl.kt.expected index 89ea311c33f..d794419dd5a 100644 --- a/libraries/apollo-compiler/src/test/graphql/com/example/named_fragment_inside_inline_fragment/kotlin/operationBased/named_fragment_inside_inline_fragment/fragment/CharacterAppearsInImpl.kt.expected +++ b/libraries/apollo-compiler/src/test/graphql/com/example/named_fragment_inside_inline_fragment/kotlin/operationBased/named_fragment_inside_inline_fragment/fragment/CharacterAppearsInImpl.kt.expected @@ -25,7 +25,7 @@ public class CharacterAppearsInImpl() : Fragment { override fun serializeVariables( writer: JsonWriter, customScalarAdapters: CustomScalarAdapters, - withBooleanDefaultValues: Boolean, + withDefaultValues: Boolean, ) { // This fragment doesn't have any variable } diff --git a/libraries/apollo-compiler/src/test/graphql/com/example/named_fragment_inside_inline_fragment/kotlin/operationBased/named_fragment_inside_inline_fragment/fragment/CharacterNameImpl.kt.expected b/libraries/apollo-compiler/src/test/graphql/com/example/named_fragment_inside_inline_fragment/kotlin/operationBased/named_fragment_inside_inline_fragment/fragment/CharacterNameImpl.kt.expected index 470e8c729d2..c40a18f5a14 100644 --- a/libraries/apollo-compiler/src/test/graphql/com/example/named_fragment_inside_inline_fragment/kotlin/operationBased/named_fragment_inside_inline_fragment/fragment/CharacterNameImpl.kt.expected +++ b/libraries/apollo-compiler/src/test/graphql/com/example/named_fragment_inside_inline_fragment/kotlin/operationBased/named_fragment_inside_inline_fragment/fragment/CharacterNameImpl.kt.expected @@ -25,7 +25,7 @@ public class CharacterNameImpl() : Fragment { override fun serializeVariables( writer: JsonWriter, customScalarAdapters: CustomScalarAdapters, - withBooleanDefaultValues: Boolean, + withDefaultValues: Boolean, ) { // This fragment doesn't have any variable } diff --git a/libraries/apollo-compiler/src/test/graphql/com/example/named_fragment_inside_inline_fragment/kotlin/operationBased/named_fragment_inside_inline_fragment/selections/GetHeroSelections.kt.expected b/libraries/apollo-compiler/src/test/graphql/com/example/named_fragment_inside_inline_fragment/kotlin/operationBased/named_fragment_inside_inline_fragment/selections/GetHeroSelections.kt.expected index f56722e1d3b..85e961dc201 100644 --- a/libraries/apollo-compiler/src/test/graphql/com/example/named_fragment_inside_inline_fragment/kotlin/operationBased/named_fragment_inside_inline_fragment/selections/GetHeroSelections.kt.expected +++ b/libraries/apollo-compiler/src/test/graphql/com/example/named_fragment_inside_inline_fragment/kotlin/operationBased/named_fragment_inside_inline_fragment/selections/GetHeroSelections.kt.expected @@ -5,6 +5,7 @@ // package com.example.named_fragment_inside_inline_fragment.selections +import com.apollographql.apollo3.api.CompiledArgument import com.apollographql.apollo3.api.CompiledField import com.apollographql.apollo3.api.CompiledFragment import com.apollographql.apollo3.api.CompiledSelection @@ -49,7 +50,11 @@ public object GetHeroSelections { CompiledField.Builder( name = "hero", type = Character.type - ).selections(__hero) + ).arguments(listOf( + CompiledArgument.Builder("episode").build(), + CompiledArgument.Builder("listOfListOfStringArgs").build() + )) + .selections(__hero) .build() ) } diff --git a/libraries/apollo-compiler/src/test/graphql/com/example/named_fragment_inside_inline_fragment/kotlin/responseBased/named_fragment_inside_inline_fragment/GetHero.kt.expected b/libraries/apollo-compiler/src/test/graphql/com/example/named_fragment_inside_inline_fragment/kotlin/responseBased/named_fragment_inside_inline_fragment/GetHero.kt.expected index cee68d6e35e..9669cf0bdfd 100644 --- a/libraries/apollo-compiler/src/test/graphql/com/example/named_fragment_inside_inline_fragment/kotlin/responseBased/named_fragment_inside_inline_fragment/GetHero.kt.expected +++ b/libraries/apollo-compiler/src/test/graphql/com/example/named_fragment_inside_inline_fragment/kotlin/responseBased/named_fragment_inside_inline_fragment/GetHero.kt.expected @@ -39,7 +39,7 @@ public class GetHero() : Query { override fun serializeVariables( writer: JsonWriter, customScalarAdapters: CustomScalarAdapters, - withBooleanDefaultValues: Boolean, + withDefaultValues: Boolean, ) { // This operation doesn't have any variable } diff --git a/libraries/apollo-compiler/src/test/graphql/com/example/named_fragment_inside_inline_fragment/kotlin/responseBased/named_fragment_inside_inline_fragment/fragment/CharacterAppearsInImpl.kt.expected b/libraries/apollo-compiler/src/test/graphql/com/example/named_fragment_inside_inline_fragment/kotlin/responseBased/named_fragment_inside_inline_fragment/fragment/CharacterAppearsInImpl.kt.expected index b44213b1547..25904706d75 100644 --- a/libraries/apollo-compiler/src/test/graphql/com/example/named_fragment_inside_inline_fragment/kotlin/responseBased/named_fragment_inside_inline_fragment/fragment/CharacterAppearsInImpl.kt.expected +++ b/libraries/apollo-compiler/src/test/graphql/com/example/named_fragment_inside_inline_fragment/kotlin/responseBased/named_fragment_inside_inline_fragment/fragment/CharacterAppearsInImpl.kt.expected @@ -27,7 +27,7 @@ public class CharacterAppearsInImpl() : Fragment { override fun serializeVariables( writer: JsonWriter, customScalarAdapters: CustomScalarAdapters, - withBooleanDefaultValues: Boolean, + withDefaultValues: Boolean, ) { // This fragment doesn't have any variable } diff --git a/libraries/apollo-compiler/src/test/graphql/com/example/named_fragment_inside_inline_fragment/kotlin/responseBased/named_fragment_inside_inline_fragment/fragment/CharacterNameImpl.kt.expected b/libraries/apollo-compiler/src/test/graphql/com/example/named_fragment_inside_inline_fragment/kotlin/responseBased/named_fragment_inside_inline_fragment/fragment/CharacterNameImpl.kt.expected index 8dc4a793e04..cd6b63b372d 100644 --- a/libraries/apollo-compiler/src/test/graphql/com/example/named_fragment_inside_inline_fragment/kotlin/responseBased/named_fragment_inside_inline_fragment/fragment/CharacterNameImpl.kt.expected +++ b/libraries/apollo-compiler/src/test/graphql/com/example/named_fragment_inside_inline_fragment/kotlin/responseBased/named_fragment_inside_inline_fragment/fragment/CharacterNameImpl.kt.expected @@ -26,7 +26,7 @@ public class CharacterNameImpl() : Fragment { override fun serializeVariables( writer: JsonWriter, customScalarAdapters: CustomScalarAdapters, - withBooleanDefaultValues: Boolean, + withDefaultValues: Boolean, ) { // This fragment doesn't have any variable } diff --git a/libraries/apollo-compiler/src/test/graphql/com/example/named_fragment_inside_inline_fragment/kotlin/responseBased/named_fragment_inside_inline_fragment/selections/GetHeroSelections.kt.expected b/libraries/apollo-compiler/src/test/graphql/com/example/named_fragment_inside_inline_fragment/kotlin/responseBased/named_fragment_inside_inline_fragment/selections/GetHeroSelections.kt.expected index f56722e1d3b..85e961dc201 100644 --- a/libraries/apollo-compiler/src/test/graphql/com/example/named_fragment_inside_inline_fragment/kotlin/responseBased/named_fragment_inside_inline_fragment/selections/GetHeroSelections.kt.expected +++ b/libraries/apollo-compiler/src/test/graphql/com/example/named_fragment_inside_inline_fragment/kotlin/responseBased/named_fragment_inside_inline_fragment/selections/GetHeroSelections.kt.expected @@ -5,6 +5,7 @@ // package com.example.named_fragment_inside_inline_fragment.selections +import com.apollographql.apollo3.api.CompiledArgument import com.apollographql.apollo3.api.CompiledField import com.apollographql.apollo3.api.CompiledFragment import com.apollographql.apollo3.api.CompiledSelection @@ -49,7 +50,11 @@ public object GetHeroSelections { CompiledField.Builder( name = "hero", type = Character.type - ).selections(__hero) + ).arguments(listOf( + CompiledArgument.Builder("episode").build(), + CompiledArgument.Builder("listOfListOfStringArgs").build() + )) + .selections(__hero) .build() ) } diff --git a/libraries/apollo-compiler/src/test/graphql/com/example/named_fragment_with_variables/java/operationBased/named_fragment_with_variables/GetUser.java.expected b/libraries/apollo-compiler/src/test/graphql/com/example/named_fragment_with_variables/java/operationBased/named_fragment_with_variables/GetUser.java.expected index 2b3a43e05fd..95733910ef3 100644 --- a/libraries/apollo-compiler/src/test/graphql/com/example/named_fragment_with_variables/java/operationBased/named_fragment_with_variables/GetUser.java.expected +++ b/libraries/apollo-compiler/src/test/graphql/com/example/named_fragment_with_variables/java/operationBased/named_fragment_with_variables/GetUser.java.expected @@ -135,8 +135,8 @@ public class GetUser implements Query { @Override public void serializeVariables(JsonWriter writer, CustomScalarAdapters customScalarAdapters, - boolean withBooleanDefaultValues) throws IOException { - GetUser_VariablesAdapter.INSTANCE.serializeVariables(writer, this, customScalarAdapters, withBooleanDefaultValues); + boolean withDefaultValues) throws IOException { + GetUser_VariablesAdapter.INSTANCE.serializeVariables(writer, this, customScalarAdapters, withDefaultValues); } @Override diff --git a/libraries/apollo-compiler/src/test/graphql/com/example/named_fragment_with_variables/java/operationBased/named_fragment_with_variables/adapter/GetUser_VariablesAdapter.java.expected b/libraries/apollo-compiler/src/test/graphql/com/example/named_fragment_with_variables/java/operationBased/named_fragment_with_variables/adapter/GetUser_VariablesAdapter.java.expected index 213d24b8fb6..e8a28559847 100644 --- a/libraries/apollo-compiler/src/test/graphql/com/example/named_fragment_with_variables/java/operationBased/named_fragment_with_variables/adapter/GetUser_VariablesAdapter.java.expected +++ b/libraries/apollo-compiler/src/test/graphql/com/example/named_fragment_with_variables/java/operationBased/named_fragment_with_variables/adapter/GetUser_VariablesAdapter.java.expected @@ -19,8 +19,7 @@ public enum GetUser_VariablesAdapter { INSTANCE; public void serializeVariables(JsonWriter writer, GetUser value, - CustomScalarAdapters customScalarAdapters, boolean withBooleanDefaultValues) throws - IOException { + CustomScalarAdapters customScalarAdapters, boolean withDefaultValues) throws IOException { CompositeAdapterContext adapterContext = new CompositeAdapterContext.Builder().customScalarAdapters(customScalarAdapters).build(); writer.name("organizationId"); Adapters.StringAdapter.toJson(writer, CustomScalarAdapters.Empty, value.organizationId); diff --git a/libraries/apollo-compiler/src/test/graphql/com/example/named_fragment_with_variables/java/operationBased/named_fragment_with_variables/fragment/QueryFragmentImpl.java.expected b/libraries/apollo-compiler/src/test/graphql/com/example/named_fragment_with_variables/java/operationBased/named_fragment_with_variables/fragment/QueryFragmentImpl.java.expected index a33c95416fc..e56e361747e 100644 --- a/libraries/apollo-compiler/src/test/graphql/com/example/named_fragment_with_variables/java/operationBased/named_fragment_with_variables/fragment/QueryFragmentImpl.java.expected +++ b/libraries/apollo-compiler/src/test/graphql/com/example/named_fragment_with_variables/java/operationBased/named_fragment_with_variables/fragment/QueryFragmentImpl.java.expected @@ -84,8 +84,8 @@ public class QueryFragmentImpl implements Fragment { @Override public void serializeVariables(JsonWriter writer, CustomScalarAdapters customScalarAdapters, - boolean withBooleanDefaultValues) throws IOException { - QueryFragmentImpl_VariablesAdapter.INSTANCE.serializeVariables(writer, this, customScalarAdapters, withBooleanDefaultValues); + boolean withDefaultValues) throws IOException { + QueryFragmentImpl_VariablesAdapter.INSTANCE.serializeVariables(writer, this, customScalarAdapters, withDefaultValues); } @Override diff --git a/libraries/apollo-compiler/src/test/graphql/com/example/named_fragment_with_variables/java/operationBased/named_fragment_with_variables/fragment/UserFragmentImpl.java.expected b/libraries/apollo-compiler/src/test/graphql/com/example/named_fragment_with_variables/java/operationBased/named_fragment_with_variables/fragment/UserFragmentImpl.java.expected index 339b118bbcb..eb4e212b599 100644 --- a/libraries/apollo-compiler/src/test/graphql/com/example/named_fragment_with_variables/java/operationBased/named_fragment_with_variables/fragment/UserFragmentImpl.java.expected +++ b/libraries/apollo-compiler/src/test/graphql/com/example/named_fragment_with_variables/java/operationBased/named_fragment_with_variables/fragment/UserFragmentImpl.java.expected @@ -69,8 +69,8 @@ public class UserFragmentImpl implements Fragment { @Override public void serializeVariables(JsonWriter writer, CustomScalarAdapters customScalarAdapters, - boolean withBooleanDefaultValues) throws IOException { - UserFragmentImpl_VariablesAdapter.INSTANCE.serializeVariables(writer, this, customScalarAdapters, withBooleanDefaultValues); + boolean withDefaultValues) throws IOException { + UserFragmentImpl_VariablesAdapter.INSTANCE.serializeVariables(writer, this, customScalarAdapters, withDefaultValues); } @Override diff --git a/libraries/apollo-compiler/src/test/graphql/com/example/named_fragment_with_variables/java/operationBased/named_fragment_with_variables/fragment/adapter/QueryFragmentImpl_VariablesAdapter.java.expected b/libraries/apollo-compiler/src/test/graphql/com/example/named_fragment_with_variables/java/operationBased/named_fragment_with_variables/fragment/adapter/QueryFragmentImpl_VariablesAdapter.java.expected index 1e07207192b..59859daba36 100644 --- a/libraries/apollo-compiler/src/test/graphql/com/example/named_fragment_with_variables/java/operationBased/named_fragment_with_variables/fragment/adapter/QueryFragmentImpl_VariablesAdapter.java.expected +++ b/libraries/apollo-compiler/src/test/graphql/com/example/named_fragment_with_variables/java/operationBased/named_fragment_with_variables/fragment/adapter/QueryFragmentImpl_VariablesAdapter.java.expected @@ -19,8 +19,7 @@ public enum QueryFragmentImpl_VariablesAdapter { INSTANCE; public void serializeVariables(JsonWriter writer, QueryFragmentImpl value, - CustomScalarAdapters customScalarAdapters, boolean withBooleanDefaultValues) throws - IOException { + CustomScalarAdapters customScalarAdapters, boolean withDefaultValues) throws IOException { CompositeAdapterContext adapterContext = new CompositeAdapterContext.Builder().customScalarAdapters(customScalarAdapters).build(); writer.name("organizationId"); Adapters.StringAdapter.toJson(writer, CustomScalarAdapters.Empty, value.organizationId); diff --git a/libraries/apollo-compiler/src/test/graphql/com/example/named_fragment_with_variables/java/operationBased/named_fragment_with_variables/fragment/adapter/UserFragmentImpl_VariablesAdapter.java.expected b/libraries/apollo-compiler/src/test/graphql/com/example/named_fragment_with_variables/java/operationBased/named_fragment_with_variables/fragment/adapter/UserFragmentImpl_VariablesAdapter.java.expected index 0bb45c3f52d..bf218d51c74 100644 --- a/libraries/apollo-compiler/src/test/graphql/com/example/named_fragment_with_variables/java/operationBased/named_fragment_with_variables/fragment/adapter/UserFragmentImpl_VariablesAdapter.java.expected +++ b/libraries/apollo-compiler/src/test/graphql/com/example/named_fragment_with_variables/java/operationBased/named_fragment_with_variables/fragment/adapter/UserFragmentImpl_VariablesAdapter.java.expected @@ -16,8 +16,7 @@ public enum UserFragmentImpl_VariablesAdapter { INSTANCE; public void serializeVariables(JsonWriter writer, UserFragmentImpl value, - CustomScalarAdapters customScalarAdapters, boolean withBooleanDefaultValues) throws - IOException { + CustomScalarAdapters customScalarAdapters, boolean withDefaultValues) throws IOException { CompositeAdapterContext adapterContext = new CompositeAdapterContext.Builder().customScalarAdapters(customScalarAdapters).build(); writer.name("size"); Adapters.IntAdapter.toJson(writer, CustomScalarAdapters.Empty, value.size); diff --git a/libraries/apollo-compiler/src/test/graphql/com/example/named_fragment_with_variables/java/operationBased/named_fragment_with_variables/fragment/selections/QueryFragmentSelections.java.expected b/libraries/apollo-compiler/src/test/graphql/com/example/named_fragment_with_variables/java/operationBased/named_fragment_with_variables/fragment/selections/QueryFragmentSelections.java.expected index 9d68a9b04f6..3324a2c15a0 100644 --- a/libraries/apollo-compiler/src/test/graphql/com/example/named_fragment_with_variables/java/operationBased/named_fragment_with_variables/fragment/selections/QueryFragmentSelections.java.expected +++ b/libraries/apollo-compiler/src/test/graphql/com/example/named_fragment_with_variables/java/operationBased/named_fragment_with_variables/fragment/selections/QueryFragmentSelections.java.expected @@ -26,10 +26,10 @@ public class QueryFragmentSelections { private static List __organization = Arrays.asList( new CompiledField.Builder("id", new CompiledNotNullType(GraphQLString.type)).build(), - new CompiledField.Builder("user", new CompiledNotNullType(new CompiledListType(new CompiledNotNullType(User.type)))).arguments(Arrays.asList(new CompiledArgument.Builder("query", new CompiledVariable("query")).build())).selections(__user).build() + new CompiledField.Builder("user", new CompiledNotNullType(new CompiledListType(new CompiledNotNullType(User.type)))).arguments(Arrays.asList(new CompiledArgument.Builder("query").value(new CompiledVariable("query")).build())).selections(__user).build() ); public static List __root = Arrays.asList( - new CompiledField.Builder("organization", Organization.type).arguments(Arrays.asList(new CompiledArgument.Builder("id", new CompiledVariable("organizationId")).build())).selections(__organization).build() + new CompiledField.Builder("organization", Organization.type).arguments(Arrays.asList(new CompiledArgument.Builder("id").value(new CompiledVariable("organizationId")).build())).selections(__organization).build() ); } diff --git a/libraries/apollo-compiler/src/test/graphql/com/example/named_fragment_with_variables/java/operationBased/named_fragment_with_variables/fragment/selections/UserFragmentSelections.java.expected b/libraries/apollo-compiler/src/test/graphql/com/example/named_fragment_with_variables/java/operationBased/named_fragment_with_variables/fragment/selections/UserFragmentSelections.java.expected index 00b73357d1b..8fee96e2bf4 100644 --- a/libraries/apollo-compiler/src/test/graphql/com/example/named_fragment_with_variables/java/operationBased/named_fragment_with_variables/fragment/selections/UserFragmentSelections.java.expected +++ b/libraries/apollo-compiler/src/test/graphql/com/example/named_fragment_with_variables/java/operationBased/named_fragment_with_variables/fragment/selections/UserFragmentSelections.java.expected @@ -18,6 +18,6 @@ public class UserFragmentSelections { public static List __root = Arrays.asList( new CompiledField.Builder("firstName", new CompiledNotNullType(GraphQLString.type)).build(), new CompiledField.Builder("lastName", new CompiledNotNullType(GraphQLString.type)).build(), - new CompiledField.Builder("avatar", new CompiledNotNullType(GraphQLString.type)).arguments(Arrays.asList(new CompiledArgument.Builder("size", new CompiledVariable("size")).build())).build() + new CompiledField.Builder("avatar", new CompiledNotNullType(GraphQLString.type)).arguments(Arrays.asList(new CompiledArgument.Builder("size").value(new CompiledVariable("size")).build())).build() ); } diff --git a/libraries/apollo-compiler/src/test/graphql/com/example/named_fragment_with_variables/kotlin/operationBased/named_fragment_with_variables/GetUser.kt.expected b/libraries/apollo-compiler/src/test/graphql/com/example/named_fragment_with_variables/kotlin/operationBased/named_fragment_with_variables/GetUser.kt.expected index 7f0ce57761c..c4fae5d42d1 100644 --- a/libraries/apollo-compiler/src/test/graphql/com/example/named_fragment_with_variables/kotlin/operationBased/named_fragment_with_variables/GetUser.kt.expected +++ b/libraries/apollo-compiler/src/test/graphql/com/example/named_fragment_with_variables/kotlin/operationBased/named_fragment_with_variables/GetUser.kt.expected @@ -36,10 +36,10 @@ public data class GetUser( override fun serializeVariables( writer: JsonWriter, customScalarAdapters: CustomScalarAdapters, - withBooleanDefaultValues: Boolean, + withDefaultValues: Boolean, ) { GetUser_VariablesAdapter.serializeVariables(writer, this, customScalarAdapters, - withBooleanDefaultValues) + withDefaultValues) } override fun adapter(): CompositeAdapter = GetUser_ResponseAdapter.Data.obj(true) diff --git a/libraries/apollo-compiler/src/test/graphql/com/example/named_fragment_with_variables/kotlin/operationBased/named_fragment_with_variables/adapter/GetUser_VariablesAdapter.kt.expected b/libraries/apollo-compiler/src/test/graphql/com/example/named_fragment_with_variables/kotlin/operationBased/named_fragment_with_variables/adapter/GetUser_VariablesAdapter.kt.expected index 65f8af37083..b6bf7605dd6 100644 --- a/libraries/apollo-compiler/src/test/graphql/com/example/named_fragment_with_variables/kotlin/operationBased/named_fragment_with_variables/adapter/GetUser_VariablesAdapter.kt.expected +++ b/libraries/apollo-compiler/src/test/graphql/com/example/named_fragment_with_variables/kotlin/operationBased/named_fragment_with_variables/adapter/GetUser_VariablesAdapter.kt.expected @@ -24,7 +24,7 @@ public object GetUser_VariablesAdapter { writer: JsonWriter, `value`: GetUser, customScalarAdapters: CustomScalarAdapters, - withBooleanDefaultValues: Boolean, + withDefaultValues: Boolean, ) { writer.name("organizationId") StringAdapter.toJson(writer, customScalarAdapters, value.organizationId) diff --git a/libraries/apollo-compiler/src/test/graphql/com/example/named_fragment_with_variables/kotlin/operationBased/named_fragment_with_variables/fragment/QueryFragmentImpl.kt.expected b/libraries/apollo-compiler/src/test/graphql/com/example/named_fragment_with_variables/kotlin/operationBased/named_fragment_with_variables/fragment/QueryFragmentImpl.kt.expected index 581edb29692..25005443a4e 100644 --- a/libraries/apollo-compiler/src/test/graphql/com/example/named_fragment_with_variables/kotlin/operationBased/named_fragment_with_variables/fragment/QueryFragmentImpl.kt.expected +++ b/libraries/apollo-compiler/src/test/graphql/com/example/named_fragment_with_variables/kotlin/operationBased/named_fragment_with_variables/fragment/QueryFragmentImpl.kt.expected @@ -27,10 +27,10 @@ public data class QueryFragmentImpl( override fun serializeVariables( writer: JsonWriter, customScalarAdapters: CustomScalarAdapters, - withBooleanDefaultValues: Boolean, + withDefaultValues: Boolean, ) { QueryFragmentImpl_VariablesAdapter.serializeVariables(writer, this, customScalarAdapters, - withBooleanDefaultValues) + withDefaultValues) } override fun adapter(): CompositeAdapter = diff --git a/libraries/apollo-compiler/src/test/graphql/com/example/named_fragment_with_variables/kotlin/operationBased/named_fragment_with_variables/fragment/UserFragmentImpl.kt.expected b/libraries/apollo-compiler/src/test/graphql/com/example/named_fragment_with_variables/kotlin/operationBased/named_fragment_with_variables/fragment/UserFragmentImpl.kt.expected index b958085fbdd..6ab4d88d7f7 100644 --- a/libraries/apollo-compiler/src/test/graphql/com/example/named_fragment_with_variables/kotlin/operationBased/named_fragment_with_variables/fragment/UserFragmentImpl.kt.expected +++ b/libraries/apollo-compiler/src/test/graphql/com/example/named_fragment_with_variables/kotlin/operationBased/named_fragment_with_variables/fragment/UserFragmentImpl.kt.expected @@ -23,10 +23,10 @@ public data class UserFragmentImpl( override fun serializeVariables( writer: JsonWriter, customScalarAdapters: CustomScalarAdapters, - withBooleanDefaultValues: Boolean, + withDefaultValues: Boolean, ) { UserFragmentImpl_VariablesAdapter.serializeVariables(writer, this, customScalarAdapters, - withBooleanDefaultValues) + withDefaultValues) } override fun adapter(): CompositeAdapter = diff --git a/libraries/apollo-compiler/src/test/graphql/com/example/named_fragment_with_variables/kotlin/operationBased/named_fragment_with_variables/fragment/adapter/QueryFragmentImpl_VariablesAdapter.kt.expected b/libraries/apollo-compiler/src/test/graphql/com/example/named_fragment_with_variables/kotlin/operationBased/named_fragment_with_variables/fragment/adapter/QueryFragmentImpl_VariablesAdapter.kt.expected index b5b97335bd9..38e0e5b465c 100644 --- a/libraries/apollo-compiler/src/test/graphql/com/example/named_fragment_with_variables/kotlin/operationBased/named_fragment_with_variables/fragment/adapter/QueryFragmentImpl_VariablesAdapter.kt.expected +++ b/libraries/apollo-compiler/src/test/graphql/com/example/named_fragment_with_variables/kotlin/operationBased/named_fragment_with_variables/fragment/adapter/QueryFragmentImpl_VariablesAdapter.kt.expected @@ -24,7 +24,7 @@ public object QueryFragmentImpl_VariablesAdapter { writer: JsonWriter, `value`: QueryFragmentImpl, customScalarAdapters: CustomScalarAdapters, - withBooleanDefaultValues: Boolean, + withDefaultValues: Boolean, ) { writer.name("organizationId") StringAdapter.toJson(writer, customScalarAdapters, value.organizationId) diff --git a/libraries/apollo-compiler/src/test/graphql/com/example/named_fragment_with_variables/kotlin/operationBased/named_fragment_with_variables/fragment/adapter/UserFragmentImpl_VariablesAdapter.kt.expected b/libraries/apollo-compiler/src/test/graphql/com/example/named_fragment_with_variables/kotlin/operationBased/named_fragment_with_variables/fragment/adapter/UserFragmentImpl_VariablesAdapter.kt.expected index 50921cbfd95..8d113b34714 100644 --- a/libraries/apollo-compiler/src/test/graphql/com/example/named_fragment_with_variables/kotlin/operationBased/named_fragment_with_variables/fragment/adapter/UserFragmentImpl_VariablesAdapter.kt.expected +++ b/libraries/apollo-compiler/src/test/graphql/com/example/named_fragment_with_variables/kotlin/operationBased/named_fragment_with_variables/fragment/adapter/UserFragmentImpl_VariablesAdapter.kt.expected @@ -21,7 +21,7 @@ public object UserFragmentImpl_VariablesAdapter { writer: JsonWriter, `value`: UserFragmentImpl, customScalarAdapters: CustomScalarAdapters, - withBooleanDefaultValues: Boolean, + withDefaultValues: Boolean, ) { writer.name("size") IntAdapter.toJson(writer, customScalarAdapters, value.size) diff --git a/libraries/apollo-compiler/src/test/graphql/com/example/named_fragment_with_variables/kotlin/operationBased/named_fragment_with_variables/fragment/selections/QueryFragmentSelections.kt.expected b/libraries/apollo-compiler/src/test/graphql/com/example/named_fragment_with_variables/kotlin/operationBased/named_fragment_with_variables/fragment/selections/QueryFragmentSelections.kt.expected index 46c295ca559..ab64e1b50fa 100644 --- a/libraries/apollo-compiler/src/test/graphql/com/example/named_fragment_with_variables/kotlin/operationBased/named_fragment_with_variables/fragment/selections/QueryFragmentSelections.kt.expected +++ b/libraries/apollo-compiler/src/test/graphql/com/example/named_fragment_with_variables/kotlin/operationBased/named_fragment_with_variables/fragment/selections/QueryFragmentSelections.kt.expected @@ -39,7 +39,7 @@ public object QueryFragmentSelections { name = "user", type = User.type.notNull().list().notNull() ).arguments(listOf( - CompiledArgument.Builder("query", CompiledVariable("query")).build() + CompiledArgument.Builder("query").value(CompiledVariable("query")).build() )) .selections(__user) .build() @@ -50,7 +50,7 @@ public object QueryFragmentSelections { name = "organization", type = Organization.type ).arguments(listOf( - CompiledArgument.Builder("id", CompiledVariable("organizationId")).build() + CompiledArgument.Builder("id").value(CompiledVariable("organizationId")).build() )) .selections(__organization) .build() diff --git a/libraries/apollo-compiler/src/test/graphql/com/example/named_fragment_with_variables/kotlin/operationBased/named_fragment_with_variables/fragment/selections/UserFragmentSelections.kt.expected b/libraries/apollo-compiler/src/test/graphql/com/example/named_fragment_with_variables/kotlin/operationBased/named_fragment_with_variables/fragment/selections/UserFragmentSelections.kt.expected index d5e2205da63..0edd2fef473 100644 --- a/libraries/apollo-compiler/src/test/graphql/com/example/named_fragment_with_variables/kotlin/operationBased/named_fragment_with_variables/fragment/selections/UserFragmentSelections.kt.expected +++ b/libraries/apollo-compiler/src/test/graphql/com/example/named_fragment_with_variables/kotlin/operationBased/named_fragment_with_variables/fragment/selections/UserFragmentSelections.kt.expected @@ -27,7 +27,7 @@ public object UserFragmentSelections { name = "avatar", type = GraphQLString.type.notNull() ).arguments(listOf( - CompiledArgument.Builder("size", CompiledVariable("size")).build() + CompiledArgument.Builder("size").value(CompiledVariable("size")).build() )) .build() ) diff --git a/libraries/apollo-compiler/src/test/graphql/com/example/named_fragment_with_variables/kotlin/responseBased/named_fragment_with_variables/GetUser.kt.expected b/libraries/apollo-compiler/src/test/graphql/com/example/named_fragment_with_variables/kotlin/responseBased/named_fragment_with_variables/GetUser.kt.expected index 365583cbee9..57116eb7862 100644 --- a/libraries/apollo-compiler/src/test/graphql/com/example/named_fragment_with_variables/kotlin/responseBased/named_fragment_with_variables/GetUser.kt.expected +++ b/libraries/apollo-compiler/src/test/graphql/com/example/named_fragment_with_variables/kotlin/responseBased/named_fragment_with_variables/GetUser.kt.expected @@ -39,10 +39,10 @@ public data class GetUser( override fun serializeVariables( writer: JsonWriter, customScalarAdapters: CustomScalarAdapters, - withBooleanDefaultValues: Boolean, + withDefaultValues: Boolean, ) { GetUser_VariablesAdapter.serializeVariables(writer, this, customScalarAdapters, - withBooleanDefaultValues) + withDefaultValues) } override fun adapter(): CompositeAdapter = GetUser_ResponseAdapter.Data.obj() diff --git a/libraries/apollo-compiler/src/test/graphql/com/example/named_fragment_with_variables/kotlin/responseBased/named_fragment_with_variables/adapter/GetUser_VariablesAdapter.kt.expected b/libraries/apollo-compiler/src/test/graphql/com/example/named_fragment_with_variables/kotlin/responseBased/named_fragment_with_variables/adapter/GetUser_VariablesAdapter.kt.expected index 65f8af37083..b6bf7605dd6 100644 --- a/libraries/apollo-compiler/src/test/graphql/com/example/named_fragment_with_variables/kotlin/responseBased/named_fragment_with_variables/adapter/GetUser_VariablesAdapter.kt.expected +++ b/libraries/apollo-compiler/src/test/graphql/com/example/named_fragment_with_variables/kotlin/responseBased/named_fragment_with_variables/adapter/GetUser_VariablesAdapter.kt.expected @@ -24,7 +24,7 @@ public object GetUser_VariablesAdapter { writer: JsonWriter, `value`: GetUser, customScalarAdapters: CustomScalarAdapters, - withBooleanDefaultValues: Boolean, + withDefaultValues: Boolean, ) { writer.name("organizationId") StringAdapter.toJson(writer, customScalarAdapters, value.organizationId) diff --git a/libraries/apollo-compiler/src/test/graphql/com/example/named_fragment_with_variables/kotlin/responseBased/named_fragment_with_variables/fragment/QueryFragmentImpl.kt.expected b/libraries/apollo-compiler/src/test/graphql/com/example/named_fragment_with_variables/kotlin/responseBased/named_fragment_with_variables/fragment/QueryFragmentImpl.kt.expected index a6e3888681f..cdc3c61b98f 100644 --- a/libraries/apollo-compiler/src/test/graphql/com/example/named_fragment_with_variables/kotlin/responseBased/named_fragment_with_variables/fragment/QueryFragmentImpl.kt.expected +++ b/libraries/apollo-compiler/src/test/graphql/com/example/named_fragment_with_variables/kotlin/responseBased/named_fragment_with_variables/fragment/QueryFragmentImpl.kt.expected @@ -29,10 +29,10 @@ public data class QueryFragmentImpl( override fun serializeVariables( writer: JsonWriter, customScalarAdapters: CustomScalarAdapters, - withBooleanDefaultValues: Boolean, + withDefaultValues: Boolean, ) { QueryFragmentImpl_VariablesAdapter.serializeVariables(writer, this, customScalarAdapters, - withBooleanDefaultValues) + withDefaultValues) } override fun adapter(): CompositeAdapter = QueryFragmentImpl_ResponseAdapter.Data.obj() diff --git a/libraries/apollo-compiler/src/test/graphql/com/example/named_fragment_with_variables/kotlin/responseBased/named_fragment_with_variables/fragment/UserFragmentImpl.kt.expected b/libraries/apollo-compiler/src/test/graphql/com/example/named_fragment_with_variables/kotlin/responseBased/named_fragment_with_variables/fragment/UserFragmentImpl.kt.expected index 61d8c0f244b..5044367a3d2 100644 --- a/libraries/apollo-compiler/src/test/graphql/com/example/named_fragment_with_variables/kotlin/responseBased/named_fragment_with_variables/fragment/UserFragmentImpl.kt.expected +++ b/libraries/apollo-compiler/src/test/graphql/com/example/named_fragment_with_variables/kotlin/responseBased/named_fragment_with_variables/fragment/UserFragmentImpl.kt.expected @@ -24,10 +24,10 @@ public data class UserFragmentImpl( override fun serializeVariables( writer: JsonWriter, customScalarAdapters: CustomScalarAdapters, - withBooleanDefaultValues: Boolean, + withDefaultValues: Boolean, ) { UserFragmentImpl_VariablesAdapter.serializeVariables(writer, this, customScalarAdapters, - withBooleanDefaultValues) + withDefaultValues) } override fun adapter(): CompositeAdapter = UserFragmentImpl_ResponseAdapter.Data.obj() diff --git a/libraries/apollo-compiler/src/test/graphql/com/example/named_fragment_with_variables/kotlin/responseBased/named_fragment_with_variables/fragment/adapter/QueryFragmentImpl_VariablesAdapter.kt.expected b/libraries/apollo-compiler/src/test/graphql/com/example/named_fragment_with_variables/kotlin/responseBased/named_fragment_with_variables/fragment/adapter/QueryFragmentImpl_VariablesAdapter.kt.expected index b5b97335bd9..38e0e5b465c 100644 --- a/libraries/apollo-compiler/src/test/graphql/com/example/named_fragment_with_variables/kotlin/responseBased/named_fragment_with_variables/fragment/adapter/QueryFragmentImpl_VariablesAdapter.kt.expected +++ b/libraries/apollo-compiler/src/test/graphql/com/example/named_fragment_with_variables/kotlin/responseBased/named_fragment_with_variables/fragment/adapter/QueryFragmentImpl_VariablesAdapter.kt.expected @@ -24,7 +24,7 @@ public object QueryFragmentImpl_VariablesAdapter { writer: JsonWriter, `value`: QueryFragmentImpl, customScalarAdapters: CustomScalarAdapters, - withBooleanDefaultValues: Boolean, + withDefaultValues: Boolean, ) { writer.name("organizationId") StringAdapter.toJson(writer, customScalarAdapters, value.organizationId) diff --git a/libraries/apollo-compiler/src/test/graphql/com/example/named_fragment_with_variables/kotlin/responseBased/named_fragment_with_variables/fragment/adapter/UserFragmentImpl_VariablesAdapter.kt.expected b/libraries/apollo-compiler/src/test/graphql/com/example/named_fragment_with_variables/kotlin/responseBased/named_fragment_with_variables/fragment/adapter/UserFragmentImpl_VariablesAdapter.kt.expected index 50921cbfd95..8d113b34714 100644 --- a/libraries/apollo-compiler/src/test/graphql/com/example/named_fragment_with_variables/kotlin/responseBased/named_fragment_with_variables/fragment/adapter/UserFragmentImpl_VariablesAdapter.kt.expected +++ b/libraries/apollo-compiler/src/test/graphql/com/example/named_fragment_with_variables/kotlin/responseBased/named_fragment_with_variables/fragment/adapter/UserFragmentImpl_VariablesAdapter.kt.expected @@ -21,7 +21,7 @@ public object UserFragmentImpl_VariablesAdapter { writer: JsonWriter, `value`: UserFragmentImpl, customScalarAdapters: CustomScalarAdapters, - withBooleanDefaultValues: Boolean, + withDefaultValues: Boolean, ) { writer.name("size") IntAdapter.toJson(writer, customScalarAdapters, value.size) diff --git a/libraries/apollo-compiler/src/test/graphql/com/example/named_fragment_with_variables/kotlin/responseBased/named_fragment_with_variables/fragment/selections/QueryFragmentSelections.kt.expected b/libraries/apollo-compiler/src/test/graphql/com/example/named_fragment_with_variables/kotlin/responseBased/named_fragment_with_variables/fragment/selections/QueryFragmentSelections.kt.expected index 46c295ca559..ab64e1b50fa 100644 --- a/libraries/apollo-compiler/src/test/graphql/com/example/named_fragment_with_variables/kotlin/responseBased/named_fragment_with_variables/fragment/selections/QueryFragmentSelections.kt.expected +++ b/libraries/apollo-compiler/src/test/graphql/com/example/named_fragment_with_variables/kotlin/responseBased/named_fragment_with_variables/fragment/selections/QueryFragmentSelections.kt.expected @@ -39,7 +39,7 @@ public object QueryFragmentSelections { name = "user", type = User.type.notNull().list().notNull() ).arguments(listOf( - CompiledArgument.Builder("query", CompiledVariable("query")).build() + CompiledArgument.Builder("query").value(CompiledVariable("query")).build() )) .selections(__user) .build() @@ -50,7 +50,7 @@ public object QueryFragmentSelections { name = "organization", type = Organization.type ).arguments(listOf( - CompiledArgument.Builder("id", CompiledVariable("organizationId")).build() + CompiledArgument.Builder("id").value(CompiledVariable("organizationId")).build() )) .selections(__organization) .build() diff --git a/libraries/apollo-compiler/src/test/graphql/com/example/named_fragment_with_variables/kotlin/responseBased/named_fragment_with_variables/fragment/selections/UserFragmentSelections.kt.expected b/libraries/apollo-compiler/src/test/graphql/com/example/named_fragment_with_variables/kotlin/responseBased/named_fragment_with_variables/fragment/selections/UserFragmentSelections.kt.expected index d5e2205da63..0edd2fef473 100644 --- a/libraries/apollo-compiler/src/test/graphql/com/example/named_fragment_with_variables/kotlin/responseBased/named_fragment_with_variables/fragment/selections/UserFragmentSelections.kt.expected +++ b/libraries/apollo-compiler/src/test/graphql/com/example/named_fragment_with_variables/kotlin/responseBased/named_fragment_with_variables/fragment/selections/UserFragmentSelections.kt.expected @@ -27,7 +27,7 @@ public object UserFragmentSelections { name = "avatar", type = GraphQLString.type.notNull() ).arguments(listOf( - CompiledArgument.Builder("size", CompiledVariable("size")).build() + CompiledArgument.Builder("size").value(CompiledVariable("size")).build() )) .build() ) diff --git a/libraries/apollo-compiler/src/test/graphql/com/example/named_fragment_without_implementation/java/operationBased/named_fragment_without_implementation/TestQuery.java.expected b/libraries/apollo-compiler/src/test/graphql/com/example/named_fragment_without_implementation/java/operationBased/named_fragment_without_implementation/TestQuery.java.expected index 5fb2203f3c0..be9cee7e5a1 100644 --- a/libraries/apollo-compiler/src/test/graphql/com/example/named_fragment_without_implementation/java/operationBased/named_fragment_without_implementation/TestQuery.java.expected +++ b/libraries/apollo-compiler/src/test/graphql/com/example/named_fragment_without_implementation/java/operationBased/named_fragment_without_implementation/TestQuery.java.expected @@ -109,7 +109,7 @@ public class TestQuery implements Query { @Override public void serializeVariables(JsonWriter writer, CustomScalarAdapters customScalarAdapters, - boolean withBooleanDefaultValues) throws IOException { + boolean withDefaultValues) throws IOException { // This operation doesn't have any variable } diff --git a/libraries/apollo-compiler/src/test/graphql/com/example/named_fragment_without_implementation/java/operationBased/named_fragment_without_implementation/fragment/selections/HumanDetailsSelections.java.expected b/libraries/apollo-compiler/src/test/graphql/com/example/named_fragment_without_implementation/java/operationBased/named_fragment_without_implementation/fragment/selections/HumanDetailsSelections.java.expected index 9d3d3471831..7158eb75d69 100644 --- a/libraries/apollo-compiler/src/test/graphql/com/example/named_fragment_without_implementation/java/operationBased/named_fragment_without_implementation/fragment/selections/HumanDetailsSelections.java.expected +++ b/libraries/apollo-compiler/src/test/graphql/com/example/named_fragment_without_implementation/java/operationBased/named_fragment_without_implementation/fragment/selections/HumanDetailsSelections.java.expected @@ -5,6 +5,7 @@ // package com.example.named_fragment_without_implementation.fragment.selections; +import com.apollographql.apollo3.api.CompiledArgument; import com.apollographql.apollo3.api.CompiledField; import com.apollographql.apollo3.api.CompiledSelection; import com.example.named_fragment_without_implementation.type.GraphQLFloat; @@ -13,6 +14,6 @@ import java.util.List; public class HumanDetailsSelections { public static List __root = Arrays.asList( - new CompiledField.Builder("height", GraphQLFloat.type).build() + new CompiledField.Builder("height", GraphQLFloat.type).arguments(Arrays.asList(new CompiledArgument.Builder("unit").value("METER").build())).build() ); } diff --git a/libraries/apollo-compiler/src/test/graphql/com/example/named_fragment_without_implementation/java/operationBased/named_fragment_without_implementation/selections/TestQuerySelections.java.expected b/libraries/apollo-compiler/src/test/graphql/com/example/named_fragment_without_implementation/java/operationBased/named_fragment_without_implementation/selections/TestQuerySelections.java.expected index 4d537433ef9..99a295783de 100644 --- a/libraries/apollo-compiler/src/test/graphql/com/example/named_fragment_without_implementation/java/operationBased/named_fragment_without_implementation/selections/TestQuerySelections.java.expected +++ b/libraries/apollo-compiler/src/test/graphql/com/example/named_fragment_without_implementation/java/operationBased/named_fragment_without_implementation/selections/TestQuerySelections.java.expected @@ -5,6 +5,7 @@ // package com.example.named_fragment_without_implementation.selections; +import com.apollographql.apollo3.api.CompiledArgument; import com.apollographql.apollo3.api.CompiledField; import com.apollographql.apollo3.api.CompiledFragment; import com.apollographql.apollo3.api.CompiledNotNullType; @@ -25,6 +26,6 @@ public class TestQuerySelections { ); public static List __root = Arrays.asList( - new CompiledField.Builder("hero", Character.type).selections(__hero).build() + new CompiledField.Builder("hero", Character.type).arguments(Arrays.asList(new CompiledArgument.Builder("episode").build(), new CompiledArgument.Builder("listOfListOfStringArgs").build())).selections(__hero).build() ); } diff --git a/libraries/apollo-compiler/src/test/graphql/com/example/named_fragment_without_implementation/kotlin/operationBased/named_fragment_without_implementation/TestQuery.kt.expected b/libraries/apollo-compiler/src/test/graphql/com/example/named_fragment_without_implementation/kotlin/operationBased/named_fragment_without_implementation/TestQuery.kt.expected index 7b0f9f91e65..d8d0aac9dc8 100644 --- a/libraries/apollo-compiler/src/test/graphql/com/example/named_fragment_without_implementation/kotlin/operationBased/named_fragment_without_implementation/TestQuery.kt.expected +++ b/libraries/apollo-compiler/src/test/graphql/com/example/named_fragment_without_implementation/kotlin/operationBased/named_fragment_without_implementation/TestQuery.kt.expected @@ -36,7 +36,7 @@ public class TestQuery() : Query { override fun serializeVariables( writer: JsonWriter, customScalarAdapters: CustomScalarAdapters, - withBooleanDefaultValues: Boolean, + withDefaultValues: Boolean, ) { // This operation doesn't have any variable } diff --git a/libraries/apollo-compiler/src/test/graphql/com/example/named_fragment_without_implementation/kotlin/operationBased/named_fragment_without_implementation/fragment/selections/HumanDetailsSelections.kt.expected b/libraries/apollo-compiler/src/test/graphql/com/example/named_fragment_without_implementation/kotlin/operationBased/named_fragment_without_implementation/fragment/selections/HumanDetailsSelections.kt.expected index 9991865c283..83f30ef9841 100644 --- a/libraries/apollo-compiler/src/test/graphql/com/example/named_fragment_without_implementation/kotlin/operationBased/named_fragment_without_implementation/fragment/selections/HumanDetailsSelections.kt.expected +++ b/libraries/apollo-compiler/src/test/graphql/com/example/named_fragment_without_implementation/kotlin/operationBased/named_fragment_without_implementation/fragment/selections/HumanDetailsSelections.kt.expected @@ -5,6 +5,7 @@ // package com.example.named_fragment_without_implementation.fragment.selections +import com.apollographql.apollo3.api.CompiledArgument import com.apollographql.apollo3.api.CompiledField import com.apollographql.apollo3.api.CompiledSelection import com.example.named_fragment_without_implementation.type.GraphQLFloat @@ -15,6 +16,9 @@ public object HumanDetailsSelections { CompiledField.Builder( name = "height", type = GraphQLFloat.type - ).build() + ).arguments(listOf( + CompiledArgument.Builder("unit").value("METER").build() + )) + .build() ) } diff --git a/libraries/apollo-compiler/src/test/graphql/com/example/named_fragment_without_implementation/kotlin/operationBased/named_fragment_without_implementation/selections/TestQuerySelections.kt.expected b/libraries/apollo-compiler/src/test/graphql/com/example/named_fragment_without_implementation/kotlin/operationBased/named_fragment_without_implementation/selections/TestQuerySelections.kt.expected index 22c6677ed4d..5c31aa7f123 100644 --- a/libraries/apollo-compiler/src/test/graphql/com/example/named_fragment_without_implementation/kotlin/operationBased/named_fragment_without_implementation/selections/TestQuerySelections.kt.expected +++ b/libraries/apollo-compiler/src/test/graphql/com/example/named_fragment_without_implementation/kotlin/operationBased/named_fragment_without_implementation/selections/TestQuerySelections.kt.expected @@ -5,6 +5,7 @@ // package com.example.named_fragment_without_implementation.selections +import com.apollographql.apollo3.api.CompiledArgument import com.apollographql.apollo3.api.CompiledField import com.apollographql.apollo3.api.CompiledFragment import com.apollographql.apollo3.api.CompiledSelection @@ -41,7 +42,11 @@ public object TestQuerySelections { CompiledField.Builder( name = "hero", type = Character.type - ).selections(__hero) + ).arguments(listOf( + CompiledArgument.Builder("episode").build(), + CompiledArgument.Builder("listOfListOfStringArgs").build() + )) + .selections(__hero) .build() ) } diff --git a/libraries/apollo-compiler/src/test/graphql/com/example/named_fragment_without_implementation/kotlin/responseBased/named_fragment_without_implementation/TestQuery.kt.expected b/libraries/apollo-compiler/src/test/graphql/com/example/named_fragment_without_implementation/kotlin/responseBased/named_fragment_without_implementation/TestQuery.kt.expected index 3bddf7fc963..eca9bcd5c52 100644 --- a/libraries/apollo-compiler/src/test/graphql/com/example/named_fragment_without_implementation/kotlin/responseBased/named_fragment_without_implementation/TestQuery.kt.expected +++ b/libraries/apollo-compiler/src/test/graphql/com/example/named_fragment_without_implementation/kotlin/responseBased/named_fragment_without_implementation/TestQuery.kt.expected @@ -38,7 +38,7 @@ public class TestQuery() : Query { override fun serializeVariables( writer: JsonWriter, customScalarAdapters: CustomScalarAdapters, - withBooleanDefaultValues: Boolean, + withDefaultValues: Boolean, ) { // This operation doesn't have any variable } diff --git a/libraries/apollo-compiler/src/test/graphql/com/example/named_fragment_without_implementation/kotlin/responseBased/named_fragment_without_implementation/fragment/selections/HumanDetailsSelections.kt.expected b/libraries/apollo-compiler/src/test/graphql/com/example/named_fragment_without_implementation/kotlin/responseBased/named_fragment_without_implementation/fragment/selections/HumanDetailsSelections.kt.expected index 9991865c283..83f30ef9841 100644 --- a/libraries/apollo-compiler/src/test/graphql/com/example/named_fragment_without_implementation/kotlin/responseBased/named_fragment_without_implementation/fragment/selections/HumanDetailsSelections.kt.expected +++ b/libraries/apollo-compiler/src/test/graphql/com/example/named_fragment_without_implementation/kotlin/responseBased/named_fragment_without_implementation/fragment/selections/HumanDetailsSelections.kt.expected @@ -5,6 +5,7 @@ // package com.example.named_fragment_without_implementation.fragment.selections +import com.apollographql.apollo3.api.CompiledArgument import com.apollographql.apollo3.api.CompiledField import com.apollographql.apollo3.api.CompiledSelection import com.example.named_fragment_without_implementation.type.GraphQLFloat @@ -15,6 +16,9 @@ public object HumanDetailsSelections { CompiledField.Builder( name = "height", type = GraphQLFloat.type - ).build() + ).arguments(listOf( + CompiledArgument.Builder("unit").value("METER").build() + )) + .build() ) } diff --git a/libraries/apollo-compiler/src/test/graphql/com/example/named_fragment_without_implementation/kotlin/responseBased/named_fragment_without_implementation/selections/TestQuerySelections.kt.expected b/libraries/apollo-compiler/src/test/graphql/com/example/named_fragment_without_implementation/kotlin/responseBased/named_fragment_without_implementation/selections/TestQuerySelections.kt.expected index 22c6677ed4d..5c31aa7f123 100644 --- a/libraries/apollo-compiler/src/test/graphql/com/example/named_fragment_without_implementation/kotlin/responseBased/named_fragment_without_implementation/selections/TestQuerySelections.kt.expected +++ b/libraries/apollo-compiler/src/test/graphql/com/example/named_fragment_without_implementation/kotlin/responseBased/named_fragment_without_implementation/selections/TestQuerySelections.kt.expected @@ -5,6 +5,7 @@ // package com.example.named_fragment_without_implementation.selections +import com.apollographql.apollo3.api.CompiledArgument import com.apollographql.apollo3.api.CompiledField import com.apollographql.apollo3.api.CompiledFragment import com.apollographql.apollo3.api.CompiledSelection @@ -41,7 +42,11 @@ public object TestQuerySelections { CompiledField.Builder( name = "hero", type = Character.type - ).selections(__hero) + ).arguments(listOf( + CompiledArgument.Builder("episode").build(), + CompiledArgument.Builder("listOfListOfStringArgs").build() + )) + .selections(__hero) .build() ) } diff --git a/libraries/apollo-compiler/src/test/graphql/com/example/nested_conditional_inline/java/operationBased/nested_conditional_inline/TestQuery.java.expected b/libraries/apollo-compiler/src/test/graphql/com/example/nested_conditional_inline/java/operationBased/nested_conditional_inline/TestQuery.java.expected index 98cf1553b42..1437c69ddd1 100644 --- a/libraries/apollo-compiler/src/test/graphql/com/example/nested_conditional_inline/java/operationBased/nested_conditional_inline/TestQuery.java.expected +++ b/libraries/apollo-compiler/src/test/graphql/com/example/nested_conditional_inline/java/operationBased/nested_conditional_inline/TestQuery.java.expected @@ -126,8 +126,8 @@ public class TestQuery implements Query { @Override public void serializeVariables(JsonWriter writer, CustomScalarAdapters customScalarAdapters, - boolean withBooleanDefaultValues) throws IOException { - TestQuery_VariablesAdapter.INSTANCE.serializeVariables(writer, this, customScalarAdapters, withBooleanDefaultValues); + boolean withDefaultValues) throws IOException { + TestQuery_VariablesAdapter.INSTANCE.serializeVariables(writer, this, customScalarAdapters, withDefaultValues); } @Override diff --git a/libraries/apollo-compiler/src/test/graphql/com/example/nested_conditional_inline/java/operationBased/nested_conditional_inline/adapter/TestQuery_VariablesAdapter.java.expected b/libraries/apollo-compiler/src/test/graphql/com/example/nested_conditional_inline/java/operationBased/nested_conditional_inline/adapter/TestQuery_VariablesAdapter.java.expected index 751194e5a1b..c66f4aca514 100644 --- a/libraries/apollo-compiler/src/test/graphql/com/example/nested_conditional_inline/java/operationBased/nested_conditional_inline/adapter/TestQuery_VariablesAdapter.java.expected +++ b/libraries/apollo-compiler/src/test/graphql/com/example/nested_conditional_inline/java/operationBased/nested_conditional_inline/adapter/TestQuery_VariablesAdapter.java.expected @@ -19,8 +19,7 @@ public enum TestQuery_VariablesAdapter { INSTANCE; public void serializeVariables(JsonWriter writer, TestQuery value, - CustomScalarAdapters customScalarAdapters, boolean withBooleanDefaultValues) throws - IOException { + CustomScalarAdapters customScalarAdapters, boolean withDefaultValues) throws IOException { CompositeAdapterContext adapterContext = new CompositeAdapterContext.Builder().customScalarAdapters(customScalarAdapters).build(); if (value.episode instanceof Optional.Present) { writer.name("episode"); diff --git a/libraries/apollo-compiler/src/test/graphql/com/example/nested_conditional_inline/java/operationBased/nested_conditional_inline/selections/TestQuerySelections.java.expected b/libraries/apollo-compiler/src/test/graphql/com/example/nested_conditional_inline/java/operationBased/nested_conditional_inline/selections/TestQuerySelections.java.expected index 0e9562a009f..01cff0a7e8b 100644 --- a/libraries/apollo-compiler/src/test/graphql/com/example/nested_conditional_inline/java/operationBased/nested_conditional_inline/selections/TestQuerySelections.java.expected +++ b/libraries/apollo-compiler/src/test/graphql/com/example/nested_conditional_inline/java/operationBased/nested_conditional_inline/selections/TestQuerySelections.java.expected @@ -20,7 +20,7 @@ import java.util.List; public class TestQuerySelections { private static List __onHuman1 = Arrays.asList( - new CompiledField.Builder("height", GraphQLFloat.type).arguments(Arrays.asList(new CompiledArgument.Builder("unit", "FOOT").build())).build() + new CompiledField.Builder("height", GraphQLFloat.type).arguments(Arrays.asList(new CompiledArgument.Builder("unit").value("FOOT").build())).build() ); private static List __friends = Arrays.asList( @@ -34,7 +34,7 @@ public class TestQuerySelections { ); private static List __onHuman2 = Arrays.asList( - new CompiledField.Builder("height", GraphQLFloat.type).arguments(Arrays.asList(new CompiledArgument.Builder("unit", "METER").build())).build() + new CompiledField.Builder("height", GraphQLFloat.type).arguments(Arrays.asList(new CompiledArgument.Builder("unit").value("METER").build())).build() ); private static List __friends1 = Arrays.asList( @@ -55,6 +55,6 @@ public class TestQuerySelections { ); public static List __root = Arrays.asList( - new CompiledField.Builder("hero", Character.type).arguments(Arrays.asList(new CompiledArgument.Builder("episode", new CompiledVariable("episode")).build())).selections(__hero).build() + new CompiledField.Builder("hero", Character.type).arguments(Arrays.asList(new CompiledArgument.Builder("episode").value(new CompiledVariable("episode")).build(), new CompiledArgument.Builder("listOfListOfStringArgs").build())).selections(__hero).build() ); } diff --git a/libraries/apollo-compiler/src/test/graphql/com/example/nested_conditional_inline/kotlin/operationBased/nested_conditional_inline/TestQuery.kt.expected b/libraries/apollo-compiler/src/test/graphql/com/example/nested_conditional_inline/kotlin/operationBased/nested_conditional_inline/TestQuery.kt.expected index 3d668f3476f..dc2570e5470 100644 --- a/libraries/apollo-compiler/src/test/graphql/com/example/nested_conditional_inline/kotlin/operationBased/nested_conditional_inline/TestQuery.kt.expected +++ b/libraries/apollo-compiler/src/test/graphql/com/example/nested_conditional_inline/kotlin/operationBased/nested_conditional_inline/TestQuery.kt.expected @@ -35,10 +35,10 @@ public data class TestQuery( override fun serializeVariables( writer: JsonWriter, customScalarAdapters: CustomScalarAdapters, - withBooleanDefaultValues: Boolean, + withDefaultValues: Boolean, ) { TestQuery_VariablesAdapter.serializeVariables(writer, this, customScalarAdapters, - withBooleanDefaultValues) + withDefaultValues) } override fun adapter(): CompositeAdapter = TestQuery_ResponseAdapter.Data.obj() diff --git a/libraries/apollo-compiler/src/test/graphql/com/example/nested_conditional_inline/kotlin/operationBased/nested_conditional_inline/adapter/TestQuery_VariablesAdapter.kt.expected b/libraries/apollo-compiler/src/test/graphql/com/example/nested_conditional_inline/kotlin/operationBased/nested_conditional_inline/adapter/TestQuery_VariablesAdapter.kt.expected index a82d1ea3369..8ab40f4c19d 100644 --- a/libraries/apollo-compiler/src/test/graphql/com/example/nested_conditional_inline/kotlin/operationBased/nested_conditional_inline/adapter/TestQuery_VariablesAdapter.kt.expected +++ b/libraries/apollo-compiler/src/test/graphql/com/example/nested_conditional_inline/kotlin/operationBased/nested_conditional_inline/adapter/TestQuery_VariablesAdapter.kt.expected @@ -24,7 +24,7 @@ public object TestQuery_VariablesAdapter { writer: JsonWriter, `value`: TestQuery, customScalarAdapters: CustomScalarAdapters, - withBooleanDefaultValues: Boolean, + withDefaultValues: Boolean, ) { if (value.episode is Optional.Present) { writer.name("episode") diff --git a/libraries/apollo-compiler/src/test/graphql/com/example/nested_conditional_inline/kotlin/operationBased/nested_conditional_inline/selections/TestQuerySelections.kt.expected b/libraries/apollo-compiler/src/test/graphql/com/example/nested_conditional_inline/kotlin/operationBased/nested_conditional_inline/selections/TestQuerySelections.kt.expected index 7a1a39e2a29..cf604c888eb 100644 --- a/libraries/apollo-compiler/src/test/graphql/com/example/nested_conditional_inline/kotlin/operationBased/nested_conditional_inline/selections/TestQuerySelections.kt.expected +++ b/libraries/apollo-compiler/src/test/graphql/com/example/nested_conditional_inline/kotlin/operationBased/nested_conditional_inline/selections/TestQuerySelections.kt.expected @@ -23,7 +23,7 @@ public object TestQuerySelections { name = "height", type = GraphQLFloat.type ).arguments(listOf( - CompiledArgument.Builder("unit", "FOOT").build() + CompiledArgument.Builder("unit").value("FOOT").build() )) .build() ) @@ -57,7 +57,7 @@ public object TestQuerySelections { name = "height", type = GraphQLFloat.type ).arguments(listOf( - CompiledArgument.Builder("unit", "METER").build() + CompiledArgument.Builder("unit").value("METER").build() )) .build() ) @@ -112,7 +112,8 @@ public object TestQuerySelections { name = "hero", type = Character.type ).arguments(listOf( - CompiledArgument.Builder("episode", CompiledVariable("episode")).build() + CompiledArgument.Builder("episode").value(CompiledVariable("episode")).build(), + CompiledArgument.Builder("listOfListOfStringArgs").build() )) .selections(__hero) .build() diff --git a/libraries/apollo-compiler/src/test/graphql/com/example/nested_conditional_inline/kotlin/responseBased/nested_conditional_inline/TestQuery.kt.expected b/libraries/apollo-compiler/src/test/graphql/com/example/nested_conditional_inline/kotlin/responseBased/nested_conditional_inline/TestQuery.kt.expected index cd3f43c17f7..164b5eefd70 100644 --- a/libraries/apollo-compiler/src/test/graphql/com/example/nested_conditional_inline/kotlin/responseBased/nested_conditional_inline/TestQuery.kt.expected +++ b/libraries/apollo-compiler/src/test/graphql/com/example/nested_conditional_inline/kotlin/responseBased/nested_conditional_inline/TestQuery.kt.expected @@ -36,10 +36,10 @@ public data class TestQuery( override fun serializeVariables( writer: JsonWriter, customScalarAdapters: CustomScalarAdapters, - withBooleanDefaultValues: Boolean, + withDefaultValues: Boolean, ) { TestQuery_VariablesAdapter.serializeVariables(writer, this, customScalarAdapters, - withBooleanDefaultValues) + withDefaultValues) } override fun adapter(): CompositeAdapter = TestQuery_ResponseAdapter.Data.obj() diff --git a/libraries/apollo-compiler/src/test/graphql/com/example/nested_conditional_inline/kotlin/responseBased/nested_conditional_inline/adapter/TestQuery_VariablesAdapter.kt.expected b/libraries/apollo-compiler/src/test/graphql/com/example/nested_conditional_inline/kotlin/responseBased/nested_conditional_inline/adapter/TestQuery_VariablesAdapter.kt.expected index a82d1ea3369..8ab40f4c19d 100644 --- a/libraries/apollo-compiler/src/test/graphql/com/example/nested_conditional_inline/kotlin/responseBased/nested_conditional_inline/adapter/TestQuery_VariablesAdapter.kt.expected +++ b/libraries/apollo-compiler/src/test/graphql/com/example/nested_conditional_inline/kotlin/responseBased/nested_conditional_inline/adapter/TestQuery_VariablesAdapter.kt.expected @@ -24,7 +24,7 @@ public object TestQuery_VariablesAdapter { writer: JsonWriter, `value`: TestQuery, customScalarAdapters: CustomScalarAdapters, - withBooleanDefaultValues: Boolean, + withDefaultValues: Boolean, ) { if (value.episode is Optional.Present) { writer.name("episode") diff --git a/libraries/apollo-compiler/src/test/graphql/com/example/nested_conditional_inline/kotlin/responseBased/nested_conditional_inline/selections/TestQuerySelections.kt.expected b/libraries/apollo-compiler/src/test/graphql/com/example/nested_conditional_inline/kotlin/responseBased/nested_conditional_inline/selections/TestQuerySelections.kt.expected index 7a1a39e2a29..cf604c888eb 100644 --- a/libraries/apollo-compiler/src/test/graphql/com/example/nested_conditional_inline/kotlin/responseBased/nested_conditional_inline/selections/TestQuerySelections.kt.expected +++ b/libraries/apollo-compiler/src/test/graphql/com/example/nested_conditional_inline/kotlin/responseBased/nested_conditional_inline/selections/TestQuerySelections.kt.expected @@ -23,7 +23,7 @@ public object TestQuerySelections { name = "height", type = GraphQLFloat.type ).arguments(listOf( - CompiledArgument.Builder("unit", "FOOT").build() + CompiledArgument.Builder("unit").value("FOOT").build() )) .build() ) @@ -57,7 +57,7 @@ public object TestQuerySelections { name = "height", type = GraphQLFloat.type ).arguments(listOf( - CompiledArgument.Builder("unit", "METER").build() + CompiledArgument.Builder("unit").value("METER").build() )) .build() ) @@ -112,7 +112,8 @@ public object TestQuerySelections { name = "hero", type = Character.type ).arguments(listOf( - CompiledArgument.Builder("episode", CompiledVariable("episode")).build() + CompiledArgument.Builder("episode").value(CompiledVariable("episode")).build(), + CompiledArgument.Builder("listOfListOfStringArgs").build() )) .selections(__hero) .build() diff --git a/libraries/apollo-compiler/src/test/graphql/com/example/nested_field_with_multiple_fieldsets/java/operationBased/nested_field_with_multiple_fieldsets/TestQuery.java.expected b/libraries/apollo-compiler/src/test/graphql/com/example/nested_field_with_multiple_fieldsets/java/operationBased/nested_field_with_multiple_fieldsets/TestQuery.java.expected index 71fd8bbcd27..4c62b259e15 100644 --- a/libraries/apollo-compiler/src/test/graphql/com/example/nested_field_with_multiple_fieldsets/java/operationBased/nested_field_with_multiple_fieldsets/TestQuery.java.expected +++ b/libraries/apollo-compiler/src/test/graphql/com/example/nested_field_with_multiple_fieldsets/java/operationBased/nested_field_with_multiple_fieldsets/TestQuery.java.expected @@ -118,7 +118,7 @@ public class TestQuery implements Query { @Override public void serializeVariables(JsonWriter writer, CustomScalarAdapters customScalarAdapters, - boolean withBooleanDefaultValues) throws IOException { + boolean withDefaultValues) throws IOException { // This operation doesn't have any variable } diff --git a/libraries/apollo-compiler/src/test/graphql/com/example/nested_field_with_multiple_fieldsets/kotlin/operationBased/nested_field_with_multiple_fieldsets/TestQuery.kt.expected b/libraries/apollo-compiler/src/test/graphql/com/example/nested_field_with_multiple_fieldsets/kotlin/operationBased/nested_field_with_multiple_fieldsets/TestQuery.kt.expected index d141b53ea08..df8c3b12b41 100644 --- a/libraries/apollo-compiler/src/test/graphql/com/example/nested_field_with_multiple_fieldsets/kotlin/operationBased/nested_field_with_multiple_fieldsets/TestQuery.kt.expected +++ b/libraries/apollo-compiler/src/test/graphql/com/example/nested_field_with_multiple_fieldsets/kotlin/operationBased/nested_field_with_multiple_fieldsets/TestQuery.kt.expected @@ -34,7 +34,7 @@ public class TestQuery() : Query { override fun serializeVariables( writer: JsonWriter, customScalarAdapters: CustomScalarAdapters, - withBooleanDefaultValues: Boolean, + withDefaultValues: Boolean, ) { // This operation doesn't have any variable } diff --git a/libraries/apollo-compiler/src/test/graphql/com/example/nested_field_with_multiple_fieldsets/kotlin/responseBased/nested_field_with_multiple_fieldsets/TestQuery.kt.expected b/libraries/apollo-compiler/src/test/graphql/com/example/nested_field_with_multiple_fieldsets/kotlin/responseBased/nested_field_with_multiple_fieldsets/TestQuery.kt.expected index fc94124ba2a..ecda5a6657f 100644 --- a/libraries/apollo-compiler/src/test/graphql/com/example/nested_field_with_multiple_fieldsets/kotlin/responseBased/nested_field_with_multiple_fieldsets/TestQuery.kt.expected +++ b/libraries/apollo-compiler/src/test/graphql/com/example/nested_field_with_multiple_fieldsets/kotlin/responseBased/nested_field_with_multiple_fieldsets/TestQuery.kt.expected @@ -35,7 +35,7 @@ public class TestQuery() : Query { override fun serializeVariables( writer: JsonWriter, customScalarAdapters: CustomScalarAdapters, - withBooleanDefaultValues: Boolean, + withDefaultValues: Boolean, ) { // This operation doesn't have any variable } diff --git a/libraries/apollo-compiler/src/test/graphql/com/example/nested_named_fragments/java/operationBased/nested_named_fragments/AllStarships.java.expected b/libraries/apollo-compiler/src/test/graphql/com/example/nested_named_fragments/java/operationBased/nested_named_fragments/AllStarships.java.expected index bfd745ba7ae..210a85300e9 100644 --- a/libraries/apollo-compiler/src/test/graphql/com/example/nested_named_fragments/java/operationBased/nested_named_fragments/AllStarships.java.expected +++ b/libraries/apollo-compiler/src/test/graphql/com/example/nested_named_fragments/java/operationBased/nested_named_fragments/AllStarships.java.expected @@ -129,7 +129,7 @@ public class AllStarships implements Query { @Override public void serializeVariables(JsonWriter writer, CustomScalarAdapters customScalarAdapters, - boolean withBooleanDefaultValues) throws IOException { + boolean withDefaultValues) throws IOException { // This operation doesn't have any variable } diff --git a/libraries/apollo-compiler/src/test/graphql/com/example/nested_named_fragments/java/operationBased/nested_named_fragments/fragment/PilotFragmentImpl.java.expected b/libraries/apollo-compiler/src/test/graphql/com/example/nested_named_fragments/java/operationBased/nested_named_fragments/fragment/PilotFragmentImpl.java.expected index 8e6acd1f0d5..46c96ae285a 100644 --- a/libraries/apollo-compiler/src/test/graphql/com/example/nested_named_fragments/java/operationBased/nested_named_fragments/fragment/PilotFragmentImpl.java.expected +++ b/libraries/apollo-compiler/src/test/graphql/com/example/nested_named_fragments/java/operationBased/nested_named_fragments/fragment/PilotFragmentImpl.java.expected @@ -61,7 +61,7 @@ public class PilotFragmentImpl implements Fragment { @Override public void serializeVariables(JsonWriter writer, CustomScalarAdapters customScalarAdapters, - boolean withBooleanDefaultValues) throws IOException { + boolean withDefaultValues) throws IOException { // This fragment doesn't have any variable } diff --git a/libraries/apollo-compiler/src/test/graphql/com/example/nested_named_fragments/java/operationBased/nested_named_fragments/fragment/PlanetFragmentImpl.java.expected b/libraries/apollo-compiler/src/test/graphql/com/example/nested_named_fragments/java/operationBased/nested_named_fragments/fragment/PlanetFragmentImpl.java.expected index d6b2b392f60..48b1c3be03b 100644 --- a/libraries/apollo-compiler/src/test/graphql/com/example/nested_named_fragments/java/operationBased/nested_named_fragments/fragment/PlanetFragmentImpl.java.expected +++ b/libraries/apollo-compiler/src/test/graphql/com/example/nested_named_fragments/java/operationBased/nested_named_fragments/fragment/PlanetFragmentImpl.java.expected @@ -61,7 +61,7 @@ public class PlanetFragmentImpl implements Fragment { @Override public void serializeVariables(JsonWriter writer, CustomScalarAdapters customScalarAdapters, - boolean withBooleanDefaultValues) throws IOException { + boolean withDefaultValues) throws IOException { // This fragment doesn't have any variable } diff --git a/libraries/apollo-compiler/src/test/graphql/com/example/nested_named_fragments/java/operationBased/nested_named_fragments/fragment/StarshipFragmentImpl.java.expected b/libraries/apollo-compiler/src/test/graphql/com/example/nested_named_fragments/java/operationBased/nested_named_fragments/fragment/StarshipFragmentImpl.java.expected index 619adc4a1f3..02b47b28fd5 100644 --- a/libraries/apollo-compiler/src/test/graphql/com/example/nested_named_fragments/java/operationBased/nested_named_fragments/fragment/StarshipFragmentImpl.java.expected +++ b/libraries/apollo-compiler/src/test/graphql/com/example/nested_named_fragments/java/operationBased/nested_named_fragments/fragment/StarshipFragmentImpl.java.expected @@ -61,7 +61,7 @@ public class StarshipFragmentImpl implements Fragment { @Override public void serializeVariables(JsonWriter writer, CustomScalarAdapters customScalarAdapters, - boolean withBooleanDefaultValues) throws IOException { + boolean withDefaultValues) throws IOException { // This fragment doesn't have any variable } diff --git a/libraries/apollo-compiler/src/test/graphql/com/example/nested_named_fragments/java/operationBased/nested_named_fragments/fragment/selections/starshipFragmentSelections.java.expected b/libraries/apollo-compiler/src/test/graphql/com/example/nested_named_fragments/java/operationBased/nested_named_fragments/fragment/selections/starshipFragmentSelections.java.expected index 02564381bba..69b73b609e7 100644 --- a/libraries/apollo-compiler/src/test/graphql/com/example/nested_named_fragments/java/operationBased/nested_named_fragments/fragment/selections/starshipFragmentSelections.java.expected +++ b/libraries/apollo-compiler/src/test/graphql/com/example/nested_named_fragments/java/operationBased/nested_named_fragments/fragment/selections/starshipFragmentSelections.java.expected @@ -5,6 +5,7 @@ // package com.example.nested_named_fragments.fragment.selections; +import com.apollographql.apollo3.api.CompiledArgument; import com.apollographql.apollo3.api.CompiledField; import com.apollographql.apollo3.api.CompiledFragment; import com.apollographql.apollo3.api.CompiledListType; @@ -35,6 +36,6 @@ public class starshipFragmentSelections { public static List __root = Arrays.asList( new CompiledField.Builder("id", new CompiledNotNullType(GraphQLID.type)).build(), new CompiledField.Builder("name", GraphQLString.type).build(), - new CompiledField.Builder("pilotConnection", StarshipPilotsConnection.type).selections(__pilotConnection).build() + new CompiledField.Builder("pilotConnection", StarshipPilotsConnection.type).arguments(Arrays.asList(new CompiledArgument.Builder("after").build(), new CompiledArgument.Builder("before").build(), new CompiledArgument.Builder("first").build(), new CompiledArgument.Builder("last").build())).selections(__pilotConnection).build() ); } diff --git a/libraries/apollo-compiler/src/test/graphql/com/example/nested_named_fragments/java/operationBased/nested_named_fragments/selections/AllStarshipsSelections.java.expected b/libraries/apollo-compiler/src/test/graphql/com/example/nested_named_fragments/java/operationBased/nested_named_fragments/selections/AllStarshipsSelections.java.expected index 6bfbb37c2cb..98c6e71c615 100644 --- a/libraries/apollo-compiler/src/test/graphql/com/example/nested_named_fragments/java/operationBased/nested_named_fragments/selections/AllStarshipsSelections.java.expected +++ b/libraries/apollo-compiler/src/test/graphql/com/example/nested_named_fragments/java/operationBased/nested_named_fragments/selections/AllStarshipsSelections.java.expected @@ -34,6 +34,6 @@ public class AllStarshipsSelections { ); public static List __root = Arrays.asList( - new CompiledField.Builder("allStarships", StarshipsConnection.type).arguments(Arrays.asList(new CompiledArgument.Builder("first", 7).build())).selections(__allStarships).build() + new CompiledField.Builder("allStarships", StarshipsConnection.type).arguments(Arrays.asList(new CompiledArgument.Builder("after").build(), new CompiledArgument.Builder("before").build(), new CompiledArgument.Builder("first").value(7).build(), new CompiledArgument.Builder("last").build())).selections(__allStarships).build() ); } diff --git a/libraries/apollo-compiler/src/test/graphql/com/example/nested_named_fragments/kotlin/operationBased/nested_named_fragments/AllStarships.kt.expected b/libraries/apollo-compiler/src/test/graphql/com/example/nested_named_fragments/kotlin/operationBased/nested_named_fragments/AllStarships.kt.expected index 5fb34bbd4be..f89dd787d63 100644 --- a/libraries/apollo-compiler/src/test/graphql/com/example/nested_named_fragments/kotlin/operationBased/nested_named_fragments/AllStarships.kt.expected +++ b/libraries/apollo-compiler/src/test/graphql/com/example/nested_named_fragments/kotlin/operationBased/nested_named_fragments/AllStarships.kt.expected @@ -36,7 +36,7 @@ public class AllStarships() : Query { override fun serializeVariables( writer: JsonWriter, customScalarAdapters: CustomScalarAdapters, - withBooleanDefaultValues: Boolean, + withDefaultValues: Boolean, ) { // This operation doesn't have any variable } diff --git a/libraries/apollo-compiler/src/test/graphql/com/example/nested_named_fragments/kotlin/operationBased/nested_named_fragments/fragment/PilotFragmentImpl.kt.expected b/libraries/apollo-compiler/src/test/graphql/com/example/nested_named_fragments/kotlin/operationBased/nested_named_fragments/fragment/PilotFragmentImpl.kt.expected index a8ce8bdb87c..460e4ad8e89 100644 --- a/libraries/apollo-compiler/src/test/graphql/com/example/nested_named_fragments/kotlin/operationBased/nested_named_fragments/fragment/PilotFragmentImpl.kt.expected +++ b/libraries/apollo-compiler/src/test/graphql/com/example/nested_named_fragments/kotlin/operationBased/nested_named_fragments/fragment/PilotFragmentImpl.kt.expected @@ -25,7 +25,7 @@ public class PilotFragmentImpl() : Fragment { override fun serializeVariables( writer: JsonWriter, customScalarAdapters: CustomScalarAdapters, - withBooleanDefaultValues: Boolean, + withDefaultValues: Boolean, ) { // This fragment doesn't have any variable } diff --git a/libraries/apollo-compiler/src/test/graphql/com/example/nested_named_fragments/kotlin/operationBased/nested_named_fragments/fragment/PlanetFragmentImpl.kt.expected b/libraries/apollo-compiler/src/test/graphql/com/example/nested_named_fragments/kotlin/operationBased/nested_named_fragments/fragment/PlanetFragmentImpl.kt.expected index e850bbebff7..db4763cb750 100644 --- a/libraries/apollo-compiler/src/test/graphql/com/example/nested_named_fragments/kotlin/operationBased/nested_named_fragments/fragment/PlanetFragmentImpl.kt.expected +++ b/libraries/apollo-compiler/src/test/graphql/com/example/nested_named_fragments/kotlin/operationBased/nested_named_fragments/fragment/PlanetFragmentImpl.kt.expected @@ -25,7 +25,7 @@ public class PlanetFragmentImpl() : Fragment { override fun serializeVariables( writer: JsonWriter, customScalarAdapters: CustomScalarAdapters, - withBooleanDefaultValues: Boolean, + withDefaultValues: Boolean, ) { // This fragment doesn't have any variable } diff --git a/libraries/apollo-compiler/src/test/graphql/com/example/nested_named_fragments/kotlin/operationBased/nested_named_fragments/fragment/StarshipFragmentImpl.kt.expected b/libraries/apollo-compiler/src/test/graphql/com/example/nested_named_fragments/kotlin/operationBased/nested_named_fragments/fragment/StarshipFragmentImpl.kt.expected index 3a03ae0879c..4dfd6db325e 100644 --- a/libraries/apollo-compiler/src/test/graphql/com/example/nested_named_fragments/kotlin/operationBased/nested_named_fragments/fragment/StarshipFragmentImpl.kt.expected +++ b/libraries/apollo-compiler/src/test/graphql/com/example/nested_named_fragments/kotlin/operationBased/nested_named_fragments/fragment/StarshipFragmentImpl.kt.expected @@ -25,7 +25,7 @@ public class StarshipFragmentImpl() : Fragment { override fun serializeVariables( writer: JsonWriter, customScalarAdapters: CustomScalarAdapters, - withBooleanDefaultValues: Boolean, + withDefaultValues: Boolean, ) { // This fragment doesn't have any variable } diff --git a/libraries/apollo-compiler/src/test/graphql/com/example/nested_named_fragments/kotlin/operationBased/nested_named_fragments/fragment/selections/starshipFragmentSelections.kt.expected b/libraries/apollo-compiler/src/test/graphql/com/example/nested_named_fragments/kotlin/operationBased/nested_named_fragments/fragment/selections/starshipFragmentSelections.kt.expected index b66e5f10206..cb973121758 100644 --- a/libraries/apollo-compiler/src/test/graphql/com/example/nested_named_fragments/kotlin/operationBased/nested_named_fragments/fragment/selections/starshipFragmentSelections.kt.expected +++ b/libraries/apollo-compiler/src/test/graphql/com/example/nested_named_fragments/kotlin/operationBased/nested_named_fragments/fragment/selections/starshipFragmentSelections.kt.expected @@ -5,6 +5,7 @@ // package com.example.nested_named_fragments.fragment.selections +import com.apollographql.apollo3.api.CompiledArgument import com.apollographql.apollo3.api.CompiledField import com.apollographql.apollo3.api.CompiledFragment import com.apollographql.apollo3.api.CompiledSelection @@ -58,7 +59,13 @@ public object starshipFragmentSelections { CompiledField.Builder( name = "pilotConnection", type = StarshipPilotsConnection.type - ).selections(__pilotConnection) + ).arguments(listOf( + CompiledArgument.Builder("after").build(), + CompiledArgument.Builder("before").build(), + CompiledArgument.Builder("first").build(), + CompiledArgument.Builder("last").build() + )) + .selections(__pilotConnection) .build() ) } diff --git a/libraries/apollo-compiler/src/test/graphql/com/example/nested_named_fragments/kotlin/operationBased/nested_named_fragments/selections/AllStarshipsSelections.kt.expected b/libraries/apollo-compiler/src/test/graphql/com/example/nested_named_fragments/kotlin/operationBased/nested_named_fragments/selections/AllStarshipsSelections.kt.expected index 7df17cd724b..c8ca377bf6e 100644 --- a/libraries/apollo-compiler/src/test/graphql/com/example/nested_named_fragments/kotlin/operationBased/nested_named_fragments/selections/AllStarshipsSelections.kt.expected +++ b/libraries/apollo-compiler/src/test/graphql/com/example/nested_named_fragments/kotlin/operationBased/nested_named_fragments/selections/AllStarshipsSelections.kt.expected @@ -52,7 +52,10 @@ public object AllStarshipsSelections { name = "allStarships", type = StarshipsConnection.type ).arguments(listOf( - CompiledArgument.Builder("first", 7).build() + CompiledArgument.Builder("after").build(), + CompiledArgument.Builder("before").build(), + CompiledArgument.Builder("first").value(7).build(), + CompiledArgument.Builder("last").build() )) .selections(__allStarships) .build() diff --git a/libraries/apollo-compiler/src/test/graphql/com/example/nested_named_fragments/kotlin/responseBased/nested_named_fragments/AllStarships.kt.expected b/libraries/apollo-compiler/src/test/graphql/com/example/nested_named_fragments/kotlin/responseBased/nested_named_fragments/AllStarships.kt.expected index dbe9b2bf604..0e3036aaa15 100644 --- a/libraries/apollo-compiler/src/test/graphql/com/example/nested_named_fragments/kotlin/responseBased/nested_named_fragments/AllStarships.kt.expected +++ b/libraries/apollo-compiler/src/test/graphql/com/example/nested_named_fragments/kotlin/responseBased/nested_named_fragments/AllStarships.kt.expected @@ -39,7 +39,7 @@ public class AllStarships() : Query { override fun serializeVariables( writer: JsonWriter, customScalarAdapters: CustomScalarAdapters, - withBooleanDefaultValues: Boolean, + withDefaultValues: Boolean, ) { // This operation doesn't have any variable } diff --git a/libraries/apollo-compiler/src/test/graphql/com/example/nested_named_fragments/kotlin/responseBased/nested_named_fragments/fragment/PilotFragmentImpl.kt.expected b/libraries/apollo-compiler/src/test/graphql/com/example/nested_named_fragments/kotlin/responseBased/nested_named_fragments/fragment/PilotFragmentImpl.kt.expected index 8b246e5131d..34f741701d6 100644 --- a/libraries/apollo-compiler/src/test/graphql/com/example/nested_named_fragments/kotlin/responseBased/nested_named_fragments/fragment/PilotFragmentImpl.kt.expected +++ b/libraries/apollo-compiler/src/test/graphql/com/example/nested_named_fragments/kotlin/responseBased/nested_named_fragments/fragment/PilotFragmentImpl.kt.expected @@ -27,7 +27,7 @@ public class PilotFragmentImpl() : Fragment { override fun serializeVariables( writer: JsonWriter, customScalarAdapters: CustomScalarAdapters, - withBooleanDefaultValues: Boolean, + withDefaultValues: Boolean, ) { // This fragment doesn't have any variable } diff --git a/libraries/apollo-compiler/src/test/graphql/com/example/nested_named_fragments/kotlin/responseBased/nested_named_fragments/fragment/PlanetFragmentImpl.kt.expected b/libraries/apollo-compiler/src/test/graphql/com/example/nested_named_fragments/kotlin/responseBased/nested_named_fragments/fragment/PlanetFragmentImpl.kt.expected index e6b4d2b2c94..5dc3a1e07e0 100644 --- a/libraries/apollo-compiler/src/test/graphql/com/example/nested_named_fragments/kotlin/responseBased/nested_named_fragments/fragment/PlanetFragmentImpl.kt.expected +++ b/libraries/apollo-compiler/src/test/graphql/com/example/nested_named_fragments/kotlin/responseBased/nested_named_fragments/fragment/PlanetFragmentImpl.kt.expected @@ -26,7 +26,7 @@ public class PlanetFragmentImpl() : Fragment { override fun serializeVariables( writer: JsonWriter, customScalarAdapters: CustomScalarAdapters, - withBooleanDefaultValues: Boolean, + withDefaultValues: Boolean, ) { // This fragment doesn't have any variable } diff --git a/libraries/apollo-compiler/src/test/graphql/com/example/nested_named_fragments/kotlin/responseBased/nested_named_fragments/fragment/StarshipFragmentImpl.kt.expected b/libraries/apollo-compiler/src/test/graphql/com/example/nested_named_fragments/kotlin/responseBased/nested_named_fragments/fragment/StarshipFragmentImpl.kt.expected index 03456b3b169..210082c0085 100644 --- a/libraries/apollo-compiler/src/test/graphql/com/example/nested_named_fragments/kotlin/responseBased/nested_named_fragments/fragment/StarshipFragmentImpl.kt.expected +++ b/libraries/apollo-compiler/src/test/graphql/com/example/nested_named_fragments/kotlin/responseBased/nested_named_fragments/fragment/StarshipFragmentImpl.kt.expected @@ -28,7 +28,7 @@ public class StarshipFragmentImpl() : Fragment { override fun serializeVariables( writer: JsonWriter, customScalarAdapters: CustomScalarAdapters, - withBooleanDefaultValues: Boolean, + withDefaultValues: Boolean, ) { // This fragment doesn't have any variable } diff --git a/libraries/apollo-compiler/src/test/graphql/com/example/nested_named_fragments/kotlin/responseBased/nested_named_fragments/fragment/selections/starshipFragmentSelections.kt.expected b/libraries/apollo-compiler/src/test/graphql/com/example/nested_named_fragments/kotlin/responseBased/nested_named_fragments/fragment/selections/starshipFragmentSelections.kt.expected index b66e5f10206..cb973121758 100644 --- a/libraries/apollo-compiler/src/test/graphql/com/example/nested_named_fragments/kotlin/responseBased/nested_named_fragments/fragment/selections/starshipFragmentSelections.kt.expected +++ b/libraries/apollo-compiler/src/test/graphql/com/example/nested_named_fragments/kotlin/responseBased/nested_named_fragments/fragment/selections/starshipFragmentSelections.kt.expected @@ -5,6 +5,7 @@ // package com.example.nested_named_fragments.fragment.selections +import com.apollographql.apollo3.api.CompiledArgument import com.apollographql.apollo3.api.CompiledField import com.apollographql.apollo3.api.CompiledFragment import com.apollographql.apollo3.api.CompiledSelection @@ -58,7 +59,13 @@ public object starshipFragmentSelections { CompiledField.Builder( name = "pilotConnection", type = StarshipPilotsConnection.type - ).selections(__pilotConnection) + ).arguments(listOf( + CompiledArgument.Builder("after").build(), + CompiledArgument.Builder("before").build(), + CompiledArgument.Builder("first").build(), + CompiledArgument.Builder("last").build() + )) + .selections(__pilotConnection) .build() ) } diff --git a/libraries/apollo-compiler/src/test/graphql/com/example/nested_named_fragments/kotlin/responseBased/nested_named_fragments/selections/AllStarshipsSelections.kt.expected b/libraries/apollo-compiler/src/test/graphql/com/example/nested_named_fragments/kotlin/responseBased/nested_named_fragments/selections/AllStarshipsSelections.kt.expected index 7df17cd724b..c8ca377bf6e 100644 --- a/libraries/apollo-compiler/src/test/graphql/com/example/nested_named_fragments/kotlin/responseBased/nested_named_fragments/selections/AllStarshipsSelections.kt.expected +++ b/libraries/apollo-compiler/src/test/graphql/com/example/nested_named_fragments/kotlin/responseBased/nested_named_fragments/selections/AllStarshipsSelections.kt.expected @@ -52,7 +52,10 @@ public object AllStarshipsSelections { name = "allStarships", type = StarshipsConnection.type ).arguments(listOf( - CompiledArgument.Builder("first", 7).build() + CompiledArgument.Builder("after").build(), + CompiledArgument.Builder("before").build(), + CompiledArgument.Builder("first").value(7).build(), + CompiledArgument.Builder("last").build() )) .selections(__allStarships) .build() diff --git a/libraries/apollo-compiler/src/test/graphql/com/example/nonnull/java/operationBased/nonnull/TestQuery.java.expected b/libraries/apollo-compiler/src/test/graphql/com/example/nonnull/java/operationBased/nonnull/TestQuery.java.expected index de47185362c..613148dff4a 100644 --- a/libraries/apollo-compiler/src/test/graphql/com/example/nonnull/java/operationBased/nonnull/TestQuery.java.expected +++ b/libraries/apollo-compiler/src/test/graphql/com/example/nonnull/java/operationBased/nonnull/TestQuery.java.expected @@ -96,7 +96,7 @@ public class TestQuery implements Query { @Override public void serializeVariables(JsonWriter writer, CustomScalarAdapters customScalarAdapters, - boolean withBooleanDefaultValues) throws IOException { + boolean withDefaultValues) throws IOException { // This operation doesn't have any variable } diff --git a/libraries/apollo-compiler/src/test/graphql/com/example/nonnull/java/operationBased/nonnull/selections/TestQuerySelections.java.expected b/libraries/apollo-compiler/src/test/graphql/com/example/nonnull/java/operationBased/nonnull/selections/TestQuerySelections.java.expected index 2224f32fd0c..46fefc21bb0 100644 --- a/libraries/apollo-compiler/src/test/graphql/com/example/nonnull/java/operationBased/nonnull/selections/TestQuerySelections.java.expected +++ b/libraries/apollo-compiler/src/test/graphql/com/example/nonnull/java/operationBased/nonnull/selections/TestQuerySelections.java.expected @@ -5,6 +5,7 @@ // package com.example.nonnull.selections; +import com.apollographql.apollo3.api.CompiledArgument; import com.apollographql.apollo3.api.CompiledField; import com.apollographql.apollo3.api.CompiledNotNullType; import com.apollographql.apollo3.api.CompiledSelection; @@ -19,6 +20,6 @@ public class TestQuerySelections { ); public static List __root = Arrays.asList( - new CompiledField.Builder("hero", Character.type).selections(__hero).build() + new CompiledField.Builder("hero", Character.type).arguments(Arrays.asList(new CompiledArgument.Builder("episode").build(), new CompiledArgument.Builder("listOfListOfStringArgs").build())).selections(__hero).build() ); } diff --git a/libraries/apollo-compiler/src/test/graphql/com/example/nonnull/kotlin/responseBased/nonnull/TestQuery.kt.expected b/libraries/apollo-compiler/src/test/graphql/com/example/nonnull/kotlin/responseBased/nonnull/TestQuery.kt.expected index 6c5819670bd..585da72043c 100644 --- a/libraries/apollo-compiler/src/test/graphql/com/example/nonnull/kotlin/responseBased/nonnull/TestQuery.kt.expected +++ b/libraries/apollo-compiler/src/test/graphql/com/example/nonnull/kotlin/responseBased/nonnull/TestQuery.kt.expected @@ -34,7 +34,7 @@ public class TestQuery() : Query { override fun serializeVariables( writer: JsonWriter, customScalarAdapters: CustomScalarAdapters, - withBooleanDefaultValues: Boolean, + withDefaultValues: Boolean, ) { // This operation doesn't have any variable } diff --git a/libraries/apollo-compiler/src/test/graphql/com/example/nonnull/kotlin/responseBased/nonnull/selections/TestQuerySelections.kt.expected b/libraries/apollo-compiler/src/test/graphql/com/example/nonnull/kotlin/responseBased/nonnull/selections/TestQuerySelections.kt.expected index 1b60fb7dc9b..c280ee588e1 100644 --- a/libraries/apollo-compiler/src/test/graphql/com/example/nonnull/kotlin/responseBased/nonnull/selections/TestQuerySelections.kt.expected +++ b/libraries/apollo-compiler/src/test/graphql/com/example/nonnull/kotlin/responseBased/nonnull/selections/TestQuerySelections.kt.expected @@ -5,6 +5,7 @@ // package com.example.nonnull.selections +import com.apollographql.apollo3.api.CompiledArgument import com.apollographql.apollo3.api.CompiledField import com.apollographql.apollo3.api.CompiledSelection import com.apollographql.apollo3.api.notNull @@ -24,7 +25,11 @@ public object TestQuerySelections { CompiledField.Builder( name = "hero", type = Character.type - ).selections(__hero) + ).arguments(listOf( + CompiledArgument.Builder("episode").build(), + CompiledArgument.Builder("listOfListOfStringArgs").build() + )) + .selections(__hero) .build() ) } diff --git a/libraries/apollo-compiler/src/test/graphql/com/example/not_all_combinations_are_needed/java/operationBased/not_all_combinations_are_needed/TestQuery.java.expected b/libraries/apollo-compiler/src/test/graphql/com/example/not_all_combinations_are_needed/java/operationBased/not_all_combinations_are_needed/TestQuery.java.expected index fa97beff992..6434eea8828 100644 --- a/libraries/apollo-compiler/src/test/graphql/com/example/not_all_combinations_are_needed/java/operationBased/not_all_combinations_are_needed/TestQuery.java.expected +++ b/libraries/apollo-compiler/src/test/graphql/com/example/not_all_combinations_are_needed/java/operationBased/not_all_combinations_are_needed/TestQuery.java.expected @@ -109,7 +109,7 @@ public class TestQuery implements Query { @Override public void serializeVariables(JsonWriter writer, CustomScalarAdapters customScalarAdapters, - boolean withBooleanDefaultValues) throws IOException { + boolean withDefaultValues) throws IOException { // This operation doesn't have any variable } diff --git a/libraries/apollo-compiler/src/test/graphql/com/example/not_all_combinations_are_needed/java/operationBased/not_all_combinations_are_needed/fragment/BFragmentImpl.java.expected b/libraries/apollo-compiler/src/test/graphql/com/example/not_all_combinations_are_needed/java/operationBased/not_all_combinations_are_needed/fragment/BFragmentImpl.java.expected index 23c8ba4a9f9..7b23c550ba6 100644 --- a/libraries/apollo-compiler/src/test/graphql/com/example/not_all_combinations_are_needed/java/operationBased/not_all_combinations_are_needed/fragment/BFragmentImpl.java.expected +++ b/libraries/apollo-compiler/src/test/graphql/com/example/not_all_combinations_are_needed/java/operationBased/not_all_combinations_are_needed/fragment/BFragmentImpl.java.expected @@ -61,7 +61,7 @@ public class BFragmentImpl implements Fragment { @Override public void serializeVariables(JsonWriter writer, CustomScalarAdapters customScalarAdapters, - boolean withBooleanDefaultValues) throws IOException { + boolean withDefaultValues) throws IOException { // This fragment doesn't have any variable } diff --git a/libraries/apollo-compiler/src/test/graphql/com/example/not_all_combinations_are_needed/kotlin/operationBased/not_all_combinations_are_needed/TestQuery.kt.expected b/libraries/apollo-compiler/src/test/graphql/com/example/not_all_combinations_are_needed/kotlin/operationBased/not_all_combinations_are_needed/TestQuery.kt.expected index 480e221abe5..4c884cf0880 100644 --- a/libraries/apollo-compiler/src/test/graphql/com/example/not_all_combinations_are_needed/kotlin/operationBased/not_all_combinations_are_needed/TestQuery.kt.expected +++ b/libraries/apollo-compiler/src/test/graphql/com/example/not_all_combinations_are_needed/kotlin/operationBased/not_all_combinations_are_needed/TestQuery.kt.expected @@ -35,7 +35,7 @@ public class TestQuery() : Query { override fun serializeVariables( writer: JsonWriter, customScalarAdapters: CustomScalarAdapters, - withBooleanDefaultValues: Boolean, + withDefaultValues: Boolean, ) { // This operation doesn't have any variable } diff --git a/libraries/apollo-compiler/src/test/graphql/com/example/not_all_combinations_are_needed/kotlin/operationBased/not_all_combinations_are_needed/fragment/BFragmentImpl.kt.expected b/libraries/apollo-compiler/src/test/graphql/com/example/not_all_combinations_are_needed/kotlin/operationBased/not_all_combinations_are_needed/fragment/BFragmentImpl.kt.expected index c3b0de73440..f3516f6471e 100644 --- a/libraries/apollo-compiler/src/test/graphql/com/example/not_all_combinations_are_needed/kotlin/operationBased/not_all_combinations_are_needed/fragment/BFragmentImpl.kt.expected +++ b/libraries/apollo-compiler/src/test/graphql/com/example/not_all_combinations_are_needed/kotlin/operationBased/not_all_combinations_are_needed/fragment/BFragmentImpl.kt.expected @@ -25,7 +25,7 @@ public class BFragmentImpl() : Fragment { override fun serializeVariables( writer: JsonWriter, customScalarAdapters: CustomScalarAdapters, - withBooleanDefaultValues: Boolean, + withDefaultValues: Boolean, ) { // This fragment doesn't have any variable } diff --git a/libraries/apollo-compiler/src/test/graphql/com/example/not_all_combinations_are_needed/kotlin/responseBased/not_all_combinations_are_needed/TestQuery.kt.expected b/libraries/apollo-compiler/src/test/graphql/com/example/not_all_combinations_are_needed/kotlin/responseBased/not_all_combinations_are_needed/TestQuery.kt.expected index 81e95f9bec5..8d5d786747e 100644 --- a/libraries/apollo-compiler/src/test/graphql/com/example/not_all_combinations_are_needed/kotlin/responseBased/not_all_combinations_are_needed/TestQuery.kt.expected +++ b/libraries/apollo-compiler/src/test/graphql/com/example/not_all_combinations_are_needed/kotlin/responseBased/not_all_combinations_are_needed/TestQuery.kt.expected @@ -36,7 +36,7 @@ public class TestQuery() : Query { override fun serializeVariables( writer: JsonWriter, customScalarAdapters: CustomScalarAdapters, - withBooleanDefaultValues: Boolean, + withDefaultValues: Boolean, ) { // This operation doesn't have any variable } diff --git a/libraries/apollo-compiler/src/test/graphql/com/example/not_all_combinations_are_needed/kotlin/responseBased/not_all_combinations_are_needed/fragment/BFragmentImpl.kt.expected b/libraries/apollo-compiler/src/test/graphql/com/example/not_all_combinations_are_needed/kotlin/responseBased/not_all_combinations_are_needed/fragment/BFragmentImpl.kt.expected index def80a21639..c6170709fae 100644 --- a/libraries/apollo-compiler/src/test/graphql/com/example/not_all_combinations_are_needed/kotlin/responseBased/not_all_combinations_are_needed/fragment/BFragmentImpl.kt.expected +++ b/libraries/apollo-compiler/src/test/graphql/com/example/not_all_combinations_are_needed/kotlin/responseBased/not_all_combinations_are_needed/fragment/BFragmentImpl.kt.expected @@ -26,7 +26,7 @@ public class BFragmentImpl() : Fragment { override fun serializeVariables( writer: JsonWriter, customScalarAdapters: CustomScalarAdapters, - withBooleanDefaultValues: Boolean, + withDefaultValues: Boolean, ) { // This fragment doesn't have any variable } diff --git a/libraries/apollo-compiler/src/test/graphql/com/example/object/java/operationBased/object/TestQuery.java.expected b/libraries/apollo-compiler/src/test/graphql/com/example/object/java/operationBased/object/TestQuery.java.expected index 5fb74d36468..785d127dcc1 100644 --- a/libraries/apollo-compiler/src/test/graphql/com/example/object/java/operationBased/object/TestQuery.java.expected +++ b/libraries/apollo-compiler/src/test/graphql/com/example/object/java/operationBased/object/TestQuery.java.expected @@ -96,7 +96,7 @@ public class TestQuery implements Query { @Override public void serializeVariables(JsonWriter writer, CustomScalarAdapters customScalarAdapters, - boolean withBooleanDefaultValues) throws IOException { + boolean withDefaultValues) throws IOException { // This operation doesn't have any variable } diff --git a/libraries/apollo-compiler/src/test/graphql/com/example/object/kotlin/responseBased/object/TestQuery.kt.expected b/libraries/apollo-compiler/src/test/graphql/com/example/object/kotlin/responseBased/object/TestQuery.kt.expected index 58552f3f00f..e605e3ae76e 100644 --- a/libraries/apollo-compiler/src/test/graphql/com/example/object/kotlin/responseBased/object/TestQuery.kt.expected +++ b/libraries/apollo-compiler/src/test/graphql/com/example/object/kotlin/responseBased/object/TestQuery.kt.expected @@ -34,7 +34,7 @@ public class TestQuery() : Query { override fun serializeVariables( writer: JsonWriter, customScalarAdapters: CustomScalarAdapters, - withBooleanDefaultValues: Boolean, + withDefaultValues: Boolean, ) { // This operation doesn't have any variable } diff --git a/libraries/apollo-compiler/src/test/graphql/com/example/operation_id_generator/java/operationBased/operation_id_generator/TestQuery.java.expected b/libraries/apollo-compiler/src/test/graphql/com/example/operation_id_generator/java/operationBased/operation_id_generator/TestQuery.java.expected index 96ebe413f4a..1ba0c3c5fd3 100644 --- a/libraries/apollo-compiler/src/test/graphql/com/example/operation_id_generator/java/operationBased/operation_id_generator/TestQuery.java.expected +++ b/libraries/apollo-compiler/src/test/graphql/com/example/operation_id_generator/java/operationBased/operation_id_generator/TestQuery.java.expected @@ -97,7 +97,7 @@ public class TestQuery implements Query { @Override public void serializeVariables(JsonWriter writer, CustomScalarAdapters customScalarAdapters, - boolean withBooleanDefaultValues) throws IOException { + boolean withDefaultValues) throws IOException { // This operation doesn't have any variable } diff --git a/libraries/apollo-compiler/src/test/graphql/com/example/operation_id_generator/java/operationBased/operation_id_generator/selections/TestQuerySelections.java.expected b/libraries/apollo-compiler/src/test/graphql/com/example/operation_id_generator/java/operationBased/operation_id_generator/selections/TestQuerySelections.java.expected index 491c4c0c0f3..023f02ecb95 100644 --- a/libraries/apollo-compiler/src/test/graphql/com/example/operation_id_generator/java/operationBased/operation_id_generator/selections/TestQuerySelections.java.expected +++ b/libraries/apollo-compiler/src/test/graphql/com/example/operation_id_generator/java/operationBased/operation_id_generator/selections/TestQuerySelections.java.expected @@ -5,6 +5,7 @@ // package com.example.operation_id_generator.selections; +import com.apollographql.apollo3.api.CompiledArgument; import com.apollographql.apollo3.api.CompiledField; import com.apollographql.apollo3.api.CompiledNotNullType; import com.apollographql.apollo3.api.CompiledSelection; @@ -21,6 +22,6 @@ public class TestQuerySelections { ); public static List __root = Arrays.asList( - new CompiledField.Builder("hero", Character.type).selections(__hero).build() + new CompiledField.Builder("hero", Character.type).arguments(Arrays.asList(new CompiledArgument.Builder("episode").build(), new CompiledArgument.Builder("listOfListOfStringArgs").build())).selections(__hero).build() ); } diff --git a/libraries/apollo-compiler/src/test/graphql/com/example/operation_id_generator/kotlin/responseBased/operation_id_generator/TestQuery.kt.expected b/libraries/apollo-compiler/src/test/graphql/com/example/operation_id_generator/kotlin/responseBased/operation_id_generator/TestQuery.kt.expected index bd8de61b5a4..25830aee4b9 100644 --- a/libraries/apollo-compiler/src/test/graphql/com/example/operation_id_generator/kotlin/responseBased/operation_id_generator/TestQuery.kt.expected +++ b/libraries/apollo-compiler/src/test/graphql/com/example/operation_id_generator/kotlin/responseBased/operation_id_generator/TestQuery.kt.expected @@ -34,7 +34,7 @@ public class TestQuery() : Query { override fun serializeVariables( writer: JsonWriter, customScalarAdapters: CustomScalarAdapters, - withBooleanDefaultValues: Boolean, + withDefaultValues: Boolean, ) { // This operation doesn't have any variable } diff --git a/libraries/apollo-compiler/src/test/graphql/com/example/operation_id_generator/kotlin/responseBased/operation_id_generator/selections/TestQuerySelections.kt.expected b/libraries/apollo-compiler/src/test/graphql/com/example/operation_id_generator/kotlin/responseBased/operation_id_generator/selections/TestQuerySelections.kt.expected index a8c27a0c036..18fadf99b83 100644 --- a/libraries/apollo-compiler/src/test/graphql/com/example/operation_id_generator/kotlin/responseBased/operation_id_generator/selections/TestQuerySelections.kt.expected +++ b/libraries/apollo-compiler/src/test/graphql/com/example/operation_id_generator/kotlin/responseBased/operation_id_generator/selections/TestQuerySelections.kt.expected @@ -5,6 +5,7 @@ // package com.example.operation_id_generator.selections +import com.apollographql.apollo3.api.CompiledArgument import com.apollographql.apollo3.api.CompiledField import com.apollographql.apollo3.api.CompiledSelection import com.apollographql.apollo3.api.notNull @@ -29,7 +30,11 @@ public object TestQuerySelections { CompiledField.Builder( name = "hero", type = Character.type - ).selections(__hero) + ).arguments(listOf( + CompiledArgument.Builder("episode").build(), + CompiledArgument.Builder("listOfListOfStringArgs").build() + )) + .selections(__hero) .build() ) } diff --git a/libraries/apollo-compiler/src/test/graphql/com/example/operationbased2_ex7/java/operationBased/operationbased2_ex7/TestOperation.java.expected b/libraries/apollo-compiler/src/test/graphql/com/example/operationbased2_ex7/java/operationBased/operationbased2_ex7/TestOperation.java.expected index 4809f016ef1..c631edcf439 100644 --- a/libraries/apollo-compiler/src/test/graphql/com/example/operationbased2_ex7/java/operationBased/operationbased2_ex7/TestOperation.java.expected +++ b/libraries/apollo-compiler/src/test/graphql/com/example/operationbased2_ex7/java/operationBased/operationbased2_ex7/TestOperation.java.expected @@ -107,7 +107,7 @@ public class TestOperation implements Query { @Override public void serializeVariables(JsonWriter writer, CustomScalarAdapters customScalarAdapters, - boolean withBooleanDefaultValues) throws IOException { + boolean withDefaultValues) throws IOException { // This operation doesn't have any variable } diff --git a/libraries/apollo-compiler/src/test/graphql/com/example/operationbased2_ex7/kotlin/operationBased/operationbased2_ex7/TestOperation.kt.expected b/libraries/apollo-compiler/src/test/graphql/com/example/operationbased2_ex7/kotlin/operationBased/operationbased2_ex7/TestOperation.kt.expected index 889c57a9265..a7027822e43 100644 --- a/libraries/apollo-compiler/src/test/graphql/com/example/operationbased2_ex7/kotlin/operationBased/operationbased2_ex7/TestOperation.kt.expected +++ b/libraries/apollo-compiler/src/test/graphql/com/example/operationbased2_ex7/kotlin/operationBased/operationbased2_ex7/TestOperation.kt.expected @@ -34,7 +34,7 @@ public class TestOperation() : Query { override fun serializeVariables( writer: JsonWriter, customScalarAdapters: CustomScalarAdapters, - withBooleanDefaultValues: Boolean, + withDefaultValues: Boolean, ) { // This operation doesn't have any variable } diff --git a/libraries/apollo-compiler/src/test/graphql/com/example/operationbased2_ex7/kotlin/responseBased/operationbased2_ex7/TestOperation.kt.expected b/libraries/apollo-compiler/src/test/graphql/com/example/operationbased2_ex7/kotlin/responseBased/operationbased2_ex7/TestOperation.kt.expected index 7eaf71dcad2..63f55b2dd3f 100644 --- a/libraries/apollo-compiler/src/test/graphql/com/example/operationbased2_ex7/kotlin/responseBased/operationbased2_ex7/TestOperation.kt.expected +++ b/libraries/apollo-compiler/src/test/graphql/com/example/operationbased2_ex7/kotlin/responseBased/operationbased2_ex7/TestOperation.kt.expected @@ -35,7 +35,7 @@ public class TestOperation() : Query { override fun serializeVariables( writer: JsonWriter, customScalarAdapters: CustomScalarAdapters, - withBooleanDefaultValues: Boolean, + withDefaultValues: Boolean, ) { // This operation doesn't have any variable } diff --git a/libraries/apollo-compiler/src/test/graphql/com/example/operationbased2_ex8/java/operationBased/operationbased2_ex8/TestOperation.java.expected b/libraries/apollo-compiler/src/test/graphql/com/example/operationbased2_ex8/java/operationBased/operationbased2_ex8/TestOperation.java.expected index d4b297a0804..6fc4b70f4a8 100644 --- a/libraries/apollo-compiler/src/test/graphql/com/example/operationbased2_ex8/java/operationBased/operationbased2_ex8/TestOperation.java.expected +++ b/libraries/apollo-compiler/src/test/graphql/com/example/operationbased2_ex8/java/operationBased/operationbased2_ex8/TestOperation.java.expected @@ -112,7 +112,7 @@ public class TestOperation implements Query { @Override public void serializeVariables(JsonWriter writer, CustomScalarAdapters customScalarAdapters, - boolean withBooleanDefaultValues) throws IOException { + boolean withDefaultValues) throws IOException { // This operation doesn't have any variable } diff --git a/libraries/apollo-compiler/src/test/graphql/com/example/operationbased2_ex8/java/operationBased/operationbased2_ex8/fragment/AnimalFragmentImpl.java.expected b/libraries/apollo-compiler/src/test/graphql/com/example/operationbased2_ex8/java/operationBased/operationbased2_ex8/fragment/AnimalFragmentImpl.java.expected index 5460d33a462..b7f192bb4f7 100644 --- a/libraries/apollo-compiler/src/test/graphql/com/example/operationbased2_ex8/java/operationBased/operationbased2_ex8/fragment/AnimalFragmentImpl.java.expected +++ b/libraries/apollo-compiler/src/test/graphql/com/example/operationbased2_ex8/java/operationBased/operationbased2_ex8/fragment/AnimalFragmentImpl.java.expected @@ -61,7 +61,7 @@ public class AnimalFragmentImpl implements Fragment { @Override public void serializeVariables(JsonWriter writer, CustomScalarAdapters customScalarAdapters, - boolean withBooleanDefaultValues) throws IOException { + boolean withDefaultValues) throws IOException { // This fragment doesn't have any variable } diff --git a/libraries/apollo-compiler/src/test/graphql/com/example/operationbased2_ex8/kotlin/operationBased/operationbased2_ex8/TestOperation.kt.expected b/libraries/apollo-compiler/src/test/graphql/com/example/operationbased2_ex8/kotlin/operationBased/operationbased2_ex8/TestOperation.kt.expected index 3cf2f65b7fe..68dea38fc0a 100644 --- a/libraries/apollo-compiler/src/test/graphql/com/example/operationbased2_ex8/kotlin/operationBased/operationbased2_ex8/TestOperation.kt.expected +++ b/libraries/apollo-compiler/src/test/graphql/com/example/operationbased2_ex8/kotlin/operationBased/operationbased2_ex8/TestOperation.kt.expected @@ -35,7 +35,7 @@ public class TestOperation() : Query { override fun serializeVariables( writer: JsonWriter, customScalarAdapters: CustomScalarAdapters, - withBooleanDefaultValues: Boolean, + withDefaultValues: Boolean, ) { // This operation doesn't have any variable } diff --git a/libraries/apollo-compiler/src/test/graphql/com/example/operationbased2_ex8/kotlin/operationBased/operationbased2_ex8/fragment/AnimalFragmentImpl.kt.expected b/libraries/apollo-compiler/src/test/graphql/com/example/operationbased2_ex8/kotlin/operationBased/operationbased2_ex8/fragment/AnimalFragmentImpl.kt.expected index 7086fbddf02..7666b20974e 100644 --- a/libraries/apollo-compiler/src/test/graphql/com/example/operationbased2_ex8/kotlin/operationBased/operationbased2_ex8/fragment/AnimalFragmentImpl.kt.expected +++ b/libraries/apollo-compiler/src/test/graphql/com/example/operationbased2_ex8/kotlin/operationBased/operationbased2_ex8/fragment/AnimalFragmentImpl.kt.expected @@ -25,7 +25,7 @@ public class AnimalFragmentImpl() : Fragment { override fun serializeVariables( writer: JsonWriter, customScalarAdapters: CustomScalarAdapters, - withBooleanDefaultValues: Boolean, + withDefaultValues: Boolean, ) { // This fragment doesn't have any variable } diff --git a/libraries/apollo-compiler/src/test/graphql/com/example/operationbased2_ex8/kotlin/responseBased/operationbased2_ex8/TestOperation.kt.expected b/libraries/apollo-compiler/src/test/graphql/com/example/operationbased2_ex8/kotlin/responseBased/operationbased2_ex8/TestOperation.kt.expected index 2fbe70f49c3..77fcb8f4acf 100644 --- a/libraries/apollo-compiler/src/test/graphql/com/example/operationbased2_ex8/kotlin/responseBased/operationbased2_ex8/TestOperation.kt.expected +++ b/libraries/apollo-compiler/src/test/graphql/com/example/operationbased2_ex8/kotlin/responseBased/operationbased2_ex8/TestOperation.kt.expected @@ -36,7 +36,7 @@ public class TestOperation() : Query { override fun serializeVariables( writer: JsonWriter, customScalarAdapters: CustomScalarAdapters, - withBooleanDefaultValues: Boolean, + withDefaultValues: Boolean, ) { // This operation doesn't have any variable } diff --git a/libraries/apollo-compiler/src/test/graphql/com/example/operationbased2_ex8/kotlin/responseBased/operationbased2_ex8/fragment/AnimalFragmentImpl.kt.expected b/libraries/apollo-compiler/src/test/graphql/com/example/operationbased2_ex8/kotlin/responseBased/operationbased2_ex8/fragment/AnimalFragmentImpl.kt.expected index 61b6edae91c..24d8f560411 100644 --- a/libraries/apollo-compiler/src/test/graphql/com/example/operationbased2_ex8/kotlin/responseBased/operationbased2_ex8/fragment/AnimalFragmentImpl.kt.expected +++ b/libraries/apollo-compiler/src/test/graphql/com/example/operationbased2_ex8/kotlin/responseBased/operationbased2_ex8/fragment/AnimalFragmentImpl.kt.expected @@ -27,7 +27,7 @@ public class AnimalFragmentImpl() : Fragment { override fun serializeVariables( writer: JsonWriter, customScalarAdapters: CustomScalarAdapters, - withBooleanDefaultValues: Boolean, + withDefaultValues: Boolean, ) { // This fragment doesn't have any variable } diff --git a/libraries/apollo-compiler/src/test/graphql/com/example/optional/java/operationBased/optional/TestQuery.java.expected b/libraries/apollo-compiler/src/test/graphql/com/example/optional/java/operationBased/optional/TestQuery.java.expected index e6baedbc86e..07c8ba0fdc7 100644 --- a/libraries/apollo-compiler/src/test/graphql/com/example/optional/java/operationBased/optional/TestQuery.java.expected +++ b/libraries/apollo-compiler/src/test/graphql/com/example/optional/java/operationBased/optional/TestQuery.java.expected @@ -99,7 +99,7 @@ public class TestQuery implements Query { @Override public void serializeVariables(JsonWriter writer, CustomScalarAdapters customScalarAdapters, - boolean withBooleanDefaultValues) throws IOException { + boolean withDefaultValues) throws IOException { // This operation doesn't have any variable } diff --git a/libraries/apollo-compiler/src/test/graphql/com/example/optional/java/operationBased/optional/selections/TestQuerySelections.java.expected b/libraries/apollo-compiler/src/test/graphql/com/example/optional/java/operationBased/optional/selections/TestQuerySelections.java.expected index 57227bc9cfa..3ba46682e63 100644 --- a/libraries/apollo-compiler/src/test/graphql/com/example/optional/java/operationBased/optional/selections/TestQuerySelections.java.expected +++ b/libraries/apollo-compiler/src/test/graphql/com/example/optional/java/operationBased/optional/selections/TestQuerySelections.java.expected @@ -5,6 +5,7 @@ // package com.example.optional.selections; +import com.apollographql.apollo3.api.CompiledArgument; import com.apollographql.apollo3.api.CompiledField; import com.apollographql.apollo3.api.CompiledListType; import com.apollographql.apollo3.api.CompiledNotNullType; @@ -22,6 +23,6 @@ public class TestQuerySelections { ); public static List __root = Arrays.asList( - new CompiledField.Builder("hero", Character.type).selections(__hero).build() + new CompiledField.Builder("hero", Character.type).arguments(Arrays.asList(new CompiledArgument.Builder("episode").build(), new CompiledArgument.Builder("listOfListOfStringArgs").build())).selections(__hero).build() ); } diff --git a/libraries/apollo-compiler/src/test/graphql/com/example/optional/kotlin/responseBased/optional/TestQuery.kt.expected b/libraries/apollo-compiler/src/test/graphql/com/example/optional/kotlin/responseBased/optional/TestQuery.kt.expected index e2b39896ffb..4bba544038c 100644 --- a/libraries/apollo-compiler/src/test/graphql/com/example/optional/kotlin/responseBased/optional/TestQuery.kt.expected +++ b/libraries/apollo-compiler/src/test/graphql/com/example/optional/kotlin/responseBased/optional/TestQuery.kt.expected @@ -36,7 +36,7 @@ public class TestQuery() : Query { override fun serializeVariables( writer: JsonWriter, customScalarAdapters: CustomScalarAdapters, - withBooleanDefaultValues: Boolean, + withDefaultValues: Boolean, ) { // This operation doesn't have any variable } diff --git a/libraries/apollo-compiler/src/test/graphql/com/example/optional/kotlin/responseBased/optional/selections/TestQuerySelections.kt.expected b/libraries/apollo-compiler/src/test/graphql/com/example/optional/kotlin/responseBased/optional/selections/TestQuerySelections.kt.expected index 3e38ae22f0a..74015cce89d 100644 --- a/libraries/apollo-compiler/src/test/graphql/com/example/optional/kotlin/responseBased/optional/selections/TestQuerySelections.kt.expected +++ b/libraries/apollo-compiler/src/test/graphql/com/example/optional/kotlin/responseBased/optional/selections/TestQuerySelections.kt.expected @@ -5,6 +5,7 @@ // package com.example.optional.selections +import com.apollographql.apollo3.api.CompiledArgument import com.apollographql.apollo3.api.CompiledField import com.apollographql.apollo3.api.CompiledSelection import com.apollographql.apollo3.api.list @@ -30,7 +31,11 @@ public object TestQuerySelections { CompiledField.Builder( name = "hero", type = Character.type - ).selections(__hero) + ).arguments(listOf( + CompiledArgument.Builder("episode").build(), + CompiledArgument.Builder("listOfListOfStringArgs").build() + )) + .selections(__hero) .build() ) } diff --git a/libraries/apollo-compiler/src/test/graphql/com/example/path_vs_flat_accessors/java/operationBased/path_vs_flat_accessors/TestQuery.java.expected b/libraries/apollo-compiler/src/test/graphql/com/example/path_vs_flat_accessors/java/operationBased/path_vs_flat_accessors/TestQuery.java.expected index d05ec29db6e..9554c8e6a41 100644 --- a/libraries/apollo-compiler/src/test/graphql/com/example/path_vs_flat_accessors/java/operationBased/path_vs_flat_accessors/TestQuery.java.expected +++ b/libraries/apollo-compiler/src/test/graphql/com/example/path_vs_flat_accessors/java/operationBased/path_vs_flat_accessors/TestQuery.java.expected @@ -105,7 +105,7 @@ public class TestQuery implements Query { @Override public void serializeVariables(JsonWriter writer, CustomScalarAdapters customScalarAdapters, - boolean withBooleanDefaultValues) throws IOException { + boolean withDefaultValues) throws IOException { // This operation doesn't have any variable } diff --git a/libraries/apollo-compiler/src/test/graphql/com/example/path_vs_flat_accessors/kotlin/operationBased/path_vs_flat_accessors/TestQuery.kt.expected b/libraries/apollo-compiler/src/test/graphql/com/example/path_vs_flat_accessors/kotlin/operationBased/path_vs_flat_accessors/TestQuery.kt.expected index 226e7fa4b13..f580375edba 100644 --- a/libraries/apollo-compiler/src/test/graphql/com/example/path_vs_flat_accessors/kotlin/operationBased/path_vs_flat_accessors/TestQuery.kt.expected +++ b/libraries/apollo-compiler/src/test/graphql/com/example/path_vs_flat_accessors/kotlin/operationBased/path_vs_flat_accessors/TestQuery.kt.expected @@ -34,7 +34,7 @@ public class TestQuery() : Query { override fun serializeVariables( writer: JsonWriter, customScalarAdapters: CustomScalarAdapters, - withBooleanDefaultValues: Boolean, + withDefaultValues: Boolean, ) { // This operation doesn't have any variable } diff --git a/libraries/apollo-compiler/src/test/graphql/com/example/path_vs_flat_accessors/kotlin/responseBased/path_vs_flat_accessors/TestQuery.kt.expected b/libraries/apollo-compiler/src/test/graphql/com/example/path_vs_flat_accessors/kotlin/responseBased/path_vs_flat_accessors/TestQuery.kt.expected index f6950b04185..ca506e2d8f1 100644 --- a/libraries/apollo-compiler/src/test/graphql/com/example/path_vs_flat_accessors/kotlin/responseBased/path_vs_flat_accessors/TestQuery.kt.expected +++ b/libraries/apollo-compiler/src/test/graphql/com/example/path_vs_flat_accessors/kotlin/responseBased/path_vs_flat_accessors/TestQuery.kt.expected @@ -35,7 +35,7 @@ public class TestQuery() : Query { override fun serializeVariables( writer: JsonWriter, customScalarAdapters: CustomScalarAdapters, - withBooleanDefaultValues: Boolean, + withDefaultValues: Boolean, ) { // This operation doesn't have any variable } diff --git a/libraries/apollo-compiler/src/test/graphql/com/example/recursive_selection/java/operationBased/recursive_selection/TestQuery.java.expected b/libraries/apollo-compiler/src/test/graphql/com/example/recursive_selection/java/operationBased/recursive_selection/TestQuery.java.expected index c3d2e2b7dcd..87a98d0f6b3 100644 --- a/libraries/apollo-compiler/src/test/graphql/com/example/recursive_selection/java/operationBased/recursive_selection/TestQuery.java.expected +++ b/libraries/apollo-compiler/src/test/graphql/com/example/recursive_selection/java/operationBased/recursive_selection/TestQuery.java.expected @@ -103,7 +103,7 @@ public class TestQuery implements Query { @Override public void serializeVariables(JsonWriter writer, CustomScalarAdapters customScalarAdapters, - boolean withBooleanDefaultValues) throws IOException { + boolean withDefaultValues) throws IOException { // This operation doesn't have any variable } diff --git a/libraries/apollo-compiler/src/test/graphql/com/example/recursive_selection/kotlin/responseBased/recursive_selection/TestQuery.kt.expected b/libraries/apollo-compiler/src/test/graphql/com/example/recursive_selection/kotlin/responseBased/recursive_selection/TestQuery.kt.expected index 8e2c86e4d96..2b42923514b 100644 --- a/libraries/apollo-compiler/src/test/graphql/com/example/recursive_selection/kotlin/responseBased/recursive_selection/TestQuery.kt.expected +++ b/libraries/apollo-compiler/src/test/graphql/com/example/recursive_selection/kotlin/responseBased/recursive_selection/TestQuery.kt.expected @@ -35,7 +35,7 @@ public class TestQuery() : Query { override fun serializeVariables( writer: JsonWriter, customScalarAdapters: CustomScalarAdapters, - withBooleanDefaultValues: Boolean, + withDefaultValues: Boolean, ) { // This operation doesn't have any variable } diff --git a/libraries/apollo-compiler/src/test/graphql/com/example/reserved_keywords/java/operationBased/reserved_keywords/TestQuery.java.expected b/libraries/apollo-compiler/src/test/graphql/com/example/reserved_keywords/java/operationBased/reserved_keywords/TestQuery.java.expected index e2b56520a8b..29ffded5678 100644 --- a/libraries/apollo-compiler/src/test/graphql/com/example/reserved_keywords/java/operationBased/reserved_keywords/TestQuery.java.expected +++ b/libraries/apollo-compiler/src/test/graphql/com/example/reserved_keywords/java/operationBased/reserved_keywords/TestQuery.java.expected @@ -103,7 +103,7 @@ public class TestQuery implements Query { @Override public void serializeVariables(JsonWriter writer, CustomScalarAdapters customScalarAdapters, - boolean withBooleanDefaultValues) throws IOException { + boolean withDefaultValues) throws IOException { // This operation doesn't have any variable } diff --git a/libraries/apollo-compiler/src/test/graphql/com/example/reserved_keywords/java/operationBased/reserved_keywords/selections/TestQuerySelections.java.expected b/libraries/apollo-compiler/src/test/graphql/com/example/reserved_keywords/java/operationBased/reserved_keywords/selections/TestQuerySelections.java.expected index 37d68e58bd6..7548d5a35a3 100644 --- a/libraries/apollo-compiler/src/test/graphql/com/example/reserved_keywords/java/operationBased/reserved_keywords/selections/TestQuerySelections.java.expected +++ b/libraries/apollo-compiler/src/test/graphql/com/example/reserved_keywords/java/operationBased/reserved_keywords/selections/TestQuerySelections.java.expected @@ -34,7 +34,7 @@ public class TestQuerySelections { ); public static List __root = Arrays.asList( - new CompiledField.Builder("hero", Character.type).alias("yield").selections(__hero).build(), - new CompiledField.Builder("search", new CompiledListType(SearchResult.type)).alias("objects").arguments(Arrays.asList(new CompiledArgument.Builder("text", "abc").build())).selections(__search).build() + new CompiledField.Builder("hero", Character.type).alias("yield").arguments(Arrays.asList(new CompiledArgument.Builder("episode").build(), new CompiledArgument.Builder("listOfListOfStringArgs").build())).selections(__hero).build(), + new CompiledField.Builder("search", new CompiledListType(SearchResult.type)).alias("objects").arguments(Arrays.asList(new CompiledArgument.Builder("text").value("abc").build())).selections(__search).build() ); } diff --git a/libraries/apollo-compiler/src/test/graphql/com/example/reserved_keywords/kotlin/operationBased/reserved_keywords/TestQuery.kt.expected b/libraries/apollo-compiler/src/test/graphql/com/example/reserved_keywords/kotlin/operationBased/reserved_keywords/TestQuery.kt.expected index 5e962eba3dd..16b4afe619d 100644 --- a/libraries/apollo-compiler/src/test/graphql/com/example/reserved_keywords/kotlin/operationBased/reserved_keywords/TestQuery.kt.expected +++ b/libraries/apollo-compiler/src/test/graphql/com/example/reserved_keywords/kotlin/operationBased/reserved_keywords/TestQuery.kt.expected @@ -35,7 +35,7 @@ public class TestQuery() : Query { override fun serializeVariables( writer: JsonWriter, customScalarAdapters: CustomScalarAdapters, - withBooleanDefaultValues: Boolean, + withDefaultValues: Boolean, ) { // This operation doesn't have any variable } diff --git a/libraries/apollo-compiler/src/test/graphql/com/example/reserved_keywords/kotlin/operationBased/reserved_keywords/selections/TestQuerySelections.kt.expected b/libraries/apollo-compiler/src/test/graphql/com/example/reserved_keywords/kotlin/operationBased/reserved_keywords/selections/TestQuerySelections.kt.expected index 9f085fb81cf..1b2bd694ab7 100644 --- a/libraries/apollo-compiler/src/test/graphql/com/example/reserved_keywords/kotlin/operationBased/reserved_keywords/selections/TestQuerySelections.kt.expected +++ b/libraries/apollo-compiler/src/test/graphql/com/example/reserved_keywords/kotlin/operationBased/reserved_keywords/selections/TestQuerySelections.kt.expected @@ -55,6 +55,10 @@ public object TestQuerySelections { name = "hero", type = Character.type ).alias("yield") + .arguments(listOf( + CompiledArgument.Builder("episode").build(), + CompiledArgument.Builder("listOfListOfStringArgs").build() + )) .selections(__hero) .build(), CompiledField.Builder( @@ -62,7 +66,7 @@ public object TestQuerySelections { type = SearchResult.type.list() ).alias("objects") .arguments(listOf( - CompiledArgument.Builder("text", "abc").build() + CompiledArgument.Builder("text").value("abc").build() )) .selections(__search) .build() diff --git a/libraries/apollo-compiler/src/test/graphql/com/example/reserved_keywords/kotlin/responseBased/reserved_keywords/TestQuery.kt.expected b/libraries/apollo-compiler/src/test/graphql/com/example/reserved_keywords/kotlin/responseBased/reserved_keywords/TestQuery.kt.expected index cb12b21198d..a1b5399c54d 100644 --- a/libraries/apollo-compiler/src/test/graphql/com/example/reserved_keywords/kotlin/responseBased/reserved_keywords/TestQuery.kt.expected +++ b/libraries/apollo-compiler/src/test/graphql/com/example/reserved_keywords/kotlin/responseBased/reserved_keywords/TestQuery.kt.expected @@ -36,7 +36,7 @@ public class TestQuery() : Query { override fun serializeVariables( writer: JsonWriter, customScalarAdapters: CustomScalarAdapters, - withBooleanDefaultValues: Boolean, + withDefaultValues: Boolean, ) { // This operation doesn't have any variable } diff --git a/libraries/apollo-compiler/src/test/graphql/com/example/reserved_keywords/kotlin/responseBased/reserved_keywords/selections/TestQuerySelections.kt.expected b/libraries/apollo-compiler/src/test/graphql/com/example/reserved_keywords/kotlin/responseBased/reserved_keywords/selections/TestQuerySelections.kt.expected index 9f085fb81cf..1b2bd694ab7 100644 --- a/libraries/apollo-compiler/src/test/graphql/com/example/reserved_keywords/kotlin/responseBased/reserved_keywords/selections/TestQuerySelections.kt.expected +++ b/libraries/apollo-compiler/src/test/graphql/com/example/reserved_keywords/kotlin/responseBased/reserved_keywords/selections/TestQuerySelections.kt.expected @@ -55,6 +55,10 @@ public object TestQuerySelections { name = "hero", type = Character.type ).alias("yield") + .arguments(listOf( + CompiledArgument.Builder("episode").build(), + CompiledArgument.Builder("listOfListOfStringArgs").build() + )) .selections(__hero) .build(), CompiledField.Builder( @@ -62,7 +66,7 @@ public object TestQuerySelections { type = SearchResult.type.list() ).alias("objects") .arguments(listOf( - CompiledArgument.Builder("text", "abc").build() + CompiledArgument.Builder("text").value("abc").build() )) .selections(__search) .build() diff --git a/libraries/apollo-compiler/src/test/graphql/com/example/root_query_fragment/java/operationBased/root_query_fragment/TestQuery.java.expected b/libraries/apollo-compiler/src/test/graphql/com/example/root_query_fragment/java/operationBased/root_query_fragment/TestQuery.java.expected index e1b2b29b047..1fe1110c667 100644 --- a/libraries/apollo-compiler/src/test/graphql/com/example/root_query_fragment/java/operationBased/root_query_fragment/TestQuery.java.expected +++ b/libraries/apollo-compiler/src/test/graphql/com/example/root_query_fragment/java/operationBased/root_query_fragment/TestQuery.java.expected @@ -103,7 +103,7 @@ public class TestQuery implements Query { @Override public void serializeVariables(JsonWriter writer, CustomScalarAdapters customScalarAdapters, - boolean withBooleanDefaultValues) throws IOException { + boolean withDefaultValues) throws IOException { // This operation doesn't have any variable } diff --git a/libraries/apollo-compiler/src/test/graphql/com/example/root_query_fragment/java/operationBased/root_query_fragment/fragment/QueryFragmentImpl.java.expected b/libraries/apollo-compiler/src/test/graphql/com/example/root_query_fragment/java/operationBased/root_query_fragment/fragment/QueryFragmentImpl.java.expected index ab293d49191..57af85820ab 100644 --- a/libraries/apollo-compiler/src/test/graphql/com/example/root_query_fragment/java/operationBased/root_query_fragment/fragment/QueryFragmentImpl.java.expected +++ b/libraries/apollo-compiler/src/test/graphql/com/example/root_query_fragment/java/operationBased/root_query_fragment/fragment/QueryFragmentImpl.java.expected @@ -61,7 +61,7 @@ public class QueryFragmentImpl implements Fragment { @Override public void serializeVariables(JsonWriter writer, CustomScalarAdapters customScalarAdapters, - boolean withBooleanDefaultValues) throws IOException { + boolean withDefaultValues) throws IOException { // This fragment doesn't have any variable } diff --git a/libraries/apollo-compiler/src/test/graphql/com/example/root_query_fragment/java/operationBased/root_query_fragment/fragment/selections/QueryFragmentSelections.java.expected b/libraries/apollo-compiler/src/test/graphql/com/example/root_query_fragment/java/operationBased/root_query_fragment/fragment/selections/QueryFragmentSelections.java.expected index 6ee05df5b09..5585d172cec 100644 --- a/libraries/apollo-compiler/src/test/graphql/com/example/root_query_fragment/java/operationBased/root_query_fragment/fragment/selections/QueryFragmentSelections.java.expected +++ b/libraries/apollo-compiler/src/test/graphql/com/example/root_query_fragment/java/operationBased/root_query_fragment/fragment/selections/QueryFragmentSelections.java.expected @@ -5,6 +5,7 @@ // package com.example.root_query_fragment.fragment.selections; +import com.apollographql.apollo3.api.CompiledArgument; import com.apollographql.apollo3.api.CompiledField; import com.apollographql.apollo3.api.CompiledNotNullType; import com.apollographql.apollo3.api.CompiledSelection; @@ -20,6 +21,6 @@ public class QueryFragmentSelections { public static List __root = Arrays.asList( new CompiledField.Builder("__typename", new CompiledNotNullType(GraphQLString.type)).build(), - new CompiledField.Builder("hero", Character.type).selections(__hero).build() + new CompiledField.Builder("hero", Character.type).arguments(Arrays.asList(new CompiledArgument.Builder("episode").build(), new CompiledArgument.Builder("listOfListOfStringArgs").build())).selections(__hero).build() ); } diff --git a/libraries/apollo-compiler/src/test/graphql/com/example/root_query_fragment/kotlin/operationBased/root_query_fragment/TestQuery.kt.expected b/libraries/apollo-compiler/src/test/graphql/com/example/root_query_fragment/kotlin/operationBased/root_query_fragment/TestQuery.kt.expected index 1b4eb3ca7ad..594f18c7239 100644 --- a/libraries/apollo-compiler/src/test/graphql/com/example/root_query_fragment/kotlin/operationBased/root_query_fragment/TestQuery.kt.expected +++ b/libraries/apollo-compiler/src/test/graphql/com/example/root_query_fragment/kotlin/operationBased/root_query_fragment/TestQuery.kt.expected @@ -35,7 +35,7 @@ public class TestQuery() : Query { override fun serializeVariables( writer: JsonWriter, customScalarAdapters: CustomScalarAdapters, - withBooleanDefaultValues: Boolean, + withDefaultValues: Boolean, ) { // This operation doesn't have any variable } diff --git a/libraries/apollo-compiler/src/test/graphql/com/example/root_query_fragment/kotlin/operationBased/root_query_fragment/fragment/QueryFragmentImpl.kt.expected b/libraries/apollo-compiler/src/test/graphql/com/example/root_query_fragment/kotlin/operationBased/root_query_fragment/fragment/QueryFragmentImpl.kt.expected index a7f2d8aaf78..adce7013477 100644 --- a/libraries/apollo-compiler/src/test/graphql/com/example/root_query_fragment/kotlin/operationBased/root_query_fragment/fragment/QueryFragmentImpl.kt.expected +++ b/libraries/apollo-compiler/src/test/graphql/com/example/root_query_fragment/kotlin/operationBased/root_query_fragment/fragment/QueryFragmentImpl.kt.expected @@ -25,7 +25,7 @@ public class QueryFragmentImpl() : Fragment { override fun serializeVariables( writer: JsonWriter, customScalarAdapters: CustomScalarAdapters, - withBooleanDefaultValues: Boolean, + withDefaultValues: Boolean, ) { // This fragment doesn't have any variable } diff --git a/libraries/apollo-compiler/src/test/graphql/com/example/root_query_fragment/kotlin/operationBased/root_query_fragment/fragment/selections/QueryFragmentSelections.kt.expected b/libraries/apollo-compiler/src/test/graphql/com/example/root_query_fragment/kotlin/operationBased/root_query_fragment/fragment/selections/QueryFragmentSelections.kt.expected index f7b6ec5cf23..6e82bbeef8c 100644 --- a/libraries/apollo-compiler/src/test/graphql/com/example/root_query_fragment/kotlin/operationBased/root_query_fragment/fragment/selections/QueryFragmentSelections.kt.expected +++ b/libraries/apollo-compiler/src/test/graphql/com/example/root_query_fragment/kotlin/operationBased/root_query_fragment/fragment/selections/QueryFragmentSelections.kt.expected @@ -5,6 +5,7 @@ // package com.example.root_query_fragment.fragment.selections +import com.apollographql.apollo3.api.CompiledArgument import com.apollographql.apollo3.api.CompiledField import com.apollographql.apollo3.api.CompiledSelection import com.apollographql.apollo3.api.notNull @@ -28,7 +29,11 @@ public object QueryFragmentSelections { CompiledField.Builder( name = "hero", type = Character.type - ).selections(__hero) + ).arguments(listOf( + CompiledArgument.Builder("episode").build(), + CompiledArgument.Builder("listOfListOfStringArgs").build() + )) + .selections(__hero) .build() ) } diff --git a/libraries/apollo-compiler/src/test/graphql/com/example/root_query_fragment/kotlin/responseBased/root_query_fragment/TestQuery.kt.expected b/libraries/apollo-compiler/src/test/graphql/com/example/root_query_fragment/kotlin/responseBased/root_query_fragment/TestQuery.kt.expected index b528bb9c6c9..84133a6c39f 100644 --- a/libraries/apollo-compiler/src/test/graphql/com/example/root_query_fragment/kotlin/responseBased/root_query_fragment/TestQuery.kt.expected +++ b/libraries/apollo-compiler/src/test/graphql/com/example/root_query_fragment/kotlin/responseBased/root_query_fragment/TestQuery.kt.expected @@ -36,7 +36,7 @@ public class TestQuery() : Query { override fun serializeVariables( writer: JsonWriter, customScalarAdapters: CustomScalarAdapters, - withBooleanDefaultValues: Boolean, + withDefaultValues: Boolean, ) { // This operation doesn't have any variable } diff --git a/libraries/apollo-compiler/src/test/graphql/com/example/root_query_fragment/kotlin/responseBased/root_query_fragment/fragment/QueryFragmentImpl.kt.expected b/libraries/apollo-compiler/src/test/graphql/com/example/root_query_fragment/kotlin/responseBased/root_query_fragment/fragment/QueryFragmentImpl.kt.expected index a1273919bd9..4e50e751213 100644 --- a/libraries/apollo-compiler/src/test/graphql/com/example/root_query_fragment/kotlin/responseBased/root_query_fragment/fragment/QueryFragmentImpl.kt.expected +++ b/libraries/apollo-compiler/src/test/graphql/com/example/root_query_fragment/kotlin/responseBased/root_query_fragment/fragment/QueryFragmentImpl.kt.expected @@ -26,7 +26,7 @@ public class QueryFragmentImpl() : Fragment { override fun serializeVariables( writer: JsonWriter, customScalarAdapters: CustomScalarAdapters, - withBooleanDefaultValues: Boolean, + withDefaultValues: Boolean, ) { // This fragment doesn't have any variable } diff --git a/libraries/apollo-compiler/src/test/graphql/com/example/root_query_fragment/kotlin/responseBased/root_query_fragment/fragment/selections/QueryFragmentSelections.kt.expected b/libraries/apollo-compiler/src/test/graphql/com/example/root_query_fragment/kotlin/responseBased/root_query_fragment/fragment/selections/QueryFragmentSelections.kt.expected index f7b6ec5cf23..6e82bbeef8c 100644 --- a/libraries/apollo-compiler/src/test/graphql/com/example/root_query_fragment/kotlin/responseBased/root_query_fragment/fragment/selections/QueryFragmentSelections.kt.expected +++ b/libraries/apollo-compiler/src/test/graphql/com/example/root_query_fragment/kotlin/responseBased/root_query_fragment/fragment/selections/QueryFragmentSelections.kt.expected @@ -5,6 +5,7 @@ // package com.example.root_query_fragment.fragment.selections +import com.apollographql.apollo3.api.CompiledArgument import com.apollographql.apollo3.api.CompiledField import com.apollographql.apollo3.api.CompiledSelection import com.apollographql.apollo3.api.notNull @@ -28,7 +29,11 @@ public object QueryFragmentSelections { CompiledField.Builder( name = "hero", type = Character.type - ).selections(__hero) + ).arguments(listOf( + CompiledArgument.Builder("episode").build(), + CompiledArgument.Builder("listOfListOfStringArgs").build() + )) + .selections(__hero) .build() ) } diff --git a/libraries/apollo-compiler/src/test/graphql/com/example/root_query_fragment_with_nested_fragments/java/operationBased/root_query_fragment_with_nested_fragments/TestQuery.java.expected b/libraries/apollo-compiler/src/test/graphql/com/example/root_query_fragment_with_nested_fragments/java/operationBased/root_query_fragment_with_nested_fragments/TestQuery.java.expected index 368dac12ba9..e8caaf1232e 100644 --- a/libraries/apollo-compiler/src/test/graphql/com/example/root_query_fragment_with_nested_fragments/java/operationBased/root_query_fragment_with_nested_fragments/TestQuery.java.expected +++ b/libraries/apollo-compiler/src/test/graphql/com/example/root_query_fragment_with_nested_fragments/java/operationBased/root_query_fragment_with_nested_fragments/TestQuery.java.expected @@ -124,7 +124,7 @@ public class TestQuery implements Query { @Override public void serializeVariables(JsonWriter writer, CustomScalarAdapters customScalarAdapters, - boolean withBooleanDefaultValues) throws IOException { + boolean withDefaultValues) throws IOException { // This operation doesn't have any variable } diff --git a/libraries/apollo-compiler/src/test/graphql/com/example/root_query_fragment_with_nested_fragments/java/operationBased/root_query_fragment_with_nested_fragments/fragment/DroidFragmentImpl.java.expected b/libraries/apollo-compiler/src/test/graphql/com/example/root_query_fragment_with_nested_fragments/java/operationBased/root_query_fragment_with_nested_fragments/fragment/DroidFragmentImpl.java.expected index 17baeaf3d39..22b50475d78 100644 --- a/libraries/apollo-compiler/src/test/graphql/com/example/root_query_fragment_with_nested_fragments/java/operationBased/root_query_fragment_with_nested_fragments/fragment/DroidFragmentImpl.java.expected +++ b/libraries/apollo-compiler/src/test/graphql/com/example/root_query_fragment_with_nested_fragments/java/operationBased/root_query_fragment_with_nested_fragments/fragment/DroidFragmentImpl.java.expected @@ -61,7 +61,7 @@ public class DroidFragmentImpl implements Fragment { @Override public void serializeVariables(JsonWriter writer, CustomScalarAdapters customScalarAdapters, - boolean withBooleanDefaultValues) throws IOException { + boolean withDefaultValues) throws IOException { // This fragment doesn't have any variable } diff --git a/libraries/apollo-compiler/src/test/graphql/com/example/root_query_fragment_with_nested_fragments/java/operationBased/root_query_fragment_with_nested_fragments/fragment/HeroFragmentImpl.java.expected b/libraries/apollo-compiler/src/test/graphql/com/example/root_query_fragment_with_nested_fragments/java/operationBased/root_query_fragment_with_nested_fragments/fragment/HeroFragmentImpl.java.expected index 03a76c0615b..66e9fb2334c 100644 --- a/libraries/apollo-compiler/src/test/graphql/com/example/root_query_fragment_with_nested_fragments/java/operationBased/root_query_fragment_with_nested_fragments/fragment/HeroFragmentImpl.java.expected +++ b/libraries/apollo-compiler/src/test/graphql/com/example/root_query_fragment_with_nested_fragments/java/operationBased/root_query_fragment_with_nested_fragments/fragment/HeroFragmentImpl.java.expected @@ -61,7 +61,7 @@ public class HeroFragmentImpl implements Fragment { @Override public void serializeVariables(JsonWriter writer, CustomScalarAdapters customScalarAdapters, - boolean withBooleanDefaultValues) throws IOException { + boolean withDefaultValues) throws IOException { // This fragment doesn't have any variable } diff --git a/libraries/apollo-compiler/src/test/graphql/com/example/root_query_fragment_with_nested_fragments/java/operationBased/root_query_fragment_with_nested_fragments/fragment/QueryFragmentImpl.java.expected b/libraries/apollo-compiler/src/test/graphql/com/example/root_query_fragment_with_nested_fragments/java/operationBased/root_query_fragment_with_nested_fragments/fragment/QueryFragmentImpl.java.expected index 1a9a1eefc97..ab251d08fb9 100644 --- a/libraries/apollo-compiler/src/test/graphql/com/example/root_query_fragment_with_nested_fragments/java/operationBased/root_query_fragment_with_nested_fragments/fragment/QueryFragmentImpl.java.expected +++ b/libraries/apollo-compiler/src/test/graphql/com/example/root_query_fragment_with_nested_fragments/java/operationBased/root_query_fragment_with_nested_fragments/fragment/QueryFragmentImpl.java.expected @@ -61,7 +61,7 @@ public class QueryFragmentImpl implements Fragment { @Override public void serializeVariables(JsonWriter writer, CustomScalarAdapters customScalarAdapters, - boolean withBooleanDefaultValues) throws IOException { + boolean withDefaultValues) throws IOException { // This fragment doesn't have any variable } diff --git a/libraries/apollo-compiler/src/test/graphql/com/example/root_query_fragment_with_nested_fragments/java/operationBased/root_query_fragment_with_nested_fragments/fragment/selections/QueryFragmentSelections.java.expected b/libraries/apollo-compiler/src/test/graphql/com/example/root_query_fragment_with_nested_fragments/java/operationBased/root_query_fragment_with_nested_fragments/fragment/selections/QueryFragmentSelections.java.expected index fb21707fd3d..5ea5b2d59c3 100644 --- a/libraries/apollo-compiler/src/test/graphql/com/example/root_query_fragment_with_nested_fragments/java/operationBased/root_query_fragment_with_nested_fragments/fragment/selections/QueryFragmentSelections.java.expected +++ b/libraries/apollo-compiler/src/test/graphql/com/example/root_query_fragment_with_nested_fragments/java/operationBased/root_query_fragment_with_nested_fragments/fragment/selections/QueryFragmentSelections.java.expected @@ -40,8 +40,8 @@ public class QueryFragmentSelections { public static List __root = Arrays.asList( new CompiledField.Builder("__typename", new CompiledNotNullType(GraphQLString.type)).build(), - new CompiledField.Builder("hero", Character.type).selections(__hero).build(), - new CompiledField.Builder("droid", Droid.type).arguments(Arrays.asList(new CompiledArgument.Builder("id", 1).build())).selections(__droid).build(), - new CompiledField.Builder("human", Human.type).arguments(Arrays.asList(new CompiledArgument.Builder("id", 1).build())).selections(__human).build() + new CompiledField.Builder("hero", Character.type).arguments(Arrays.asList(new CompiledArgument.Builder("episode").build(), new CompiledArgument.Builder("listOfListOfStringArgs").build())).selections(__hero).build(), + new CompiledField.Builder("droid", Droid.type).arguments(Arrays.asList(new CompiledArgument.Builder("id").value(1).build())).selections(__droid).build(), + new CompiledField.Builder("human", Human.type).arguments(Arrays.asList(new CompiledArgument.Builder("id").value(1).build())).selections(__human).build() ); } diff --git a/libraries/apollo-compiler/src/test/graphql/com/example/root_query_fragment_with_nested_fragments/kotlin/operationBased/root_query_fragment_with_nested_fragments/TestQuery.kt.expected b/libraries/apollo-compiler/src/test/graphql/com/example/root_query_fragment_with_nested_fragments/kotlin/operationBased/root_query_fragment_with_nested_fragments/TestQuery.kt.expected index 556e8ca1864..66c9daebd8a 100644 --- a/libraries/apollo-compiler/src/test/graphql/com/example/root_query_fragment_with_nested_fragments/kotlin/operationBased/root_query_fragment_with_nested_fragments/TestQuery.kt.expected +++ b/libraries/apollo-compiler/src/test/graphql/com/example/root_query_fragment_with_nested_fragments/kotlin/operationBased/root_query_fragment_with_nested_fragments/TestQuery.kt.expected @@ -35,7 +35,7 @@ public class TestQuery() : Query { override fun serializeVariables( writer: JsonWriter, customScalarAdapters: CustomScalarAdapters, - withBooleanDefaultValues: Boolean, + withDefaultValues: Boolean, ) { // This operation doesn't have any variable } diff --git a/libraries/apollo-compiler/src/test/graphql/com/example/root_query_fragment_with_nested_fragments/kotlin/operationBased/root_query_fragment_with_nested_fragments/fragment/DroidFragmentImpl.kt.expected b/libraries/apollo-compiler/src/test/graphql/com/example/root_query_fragment_with_nested_fragments/kotlin/operationBased/root_query_fragment_with_nested_fragments/fragment/DroidFragmentImpl.kt.expected index fca189f55c0..3bf34d9eea3 100644 --- a/libraries/apollo-compiler/src/test/graphql/com/example/root_query_fragment_with_nested_fragments/kotlin/operationBased/root_query_fragment_with_nested_fragments/fragment/DroidFragmentImpl.kt.expected +++ b/libraries/apollo-compiler/src/test/graphql/com/example/root_query_fragment_with_nested_fragments/kotlin/operationBased/root_query_fragment_with_nested_fragments/fragment/DroidFragmentImpl.kt.expected @@ -25,7 +25,7 @@ public class DroidFragmentImpl() : Fragment { override fun serializeVariables( writer: JsonWriter, customScalarAdapters: CustomScalarAdapters, - withBooleanDefaultValues: Boolean, + withDefaultValues: Boolean, ) { // This fragment doesn't have any variable } diff --git a/libraries/apollo-compiler/src/test/graphql/com/example/root_query_fragment_with_nested_fragments/kotlin/operationBased/root_query_fragment_with_nested_fragments/fragment/HeroFragmentImpl.kt.expected b/libraries/apollo-compiler/src/test/graphql/com/example/root_query_fragment_with_nested_fragments/kotlin/operationBased/root_query_fragment_with_nested_fragments/fragment/HeroFragmentImpl.kt.expected index 3161bdcbc7d..a67097c2705 100644 --- a/libraries/apollo-compiler/src/test/graphql/com/example/root_query_fragment_with_nested_fragments/kotlin/operationBased/root_query_fragment_with_nested_fragments/fragment/HeroFragmentImpl.kt.expected +++ b/libraries/apollo-compiler/src/test/graphql/com/example/root_query_fragment_with_nested_fragments/kotlin/operationBased/root_query_fragment_with_nested_fragments/fragment/HeroFragmentImpl.kt.expected @@ -25,7 +25,7 @@ public class HeroFragmentImpl() : Fragment { override fun serializeVariables( writer: JsonWriter, customScalarAdapters: CustomScalarAdapters, - withBooleanDefaultValues: Boolean, + withDefaultValues: Boolean, ) { // This fragment doesn't have any variable } diff --git a/libraries/apollo-compiler/src/test/graphql/com/example/root_query_fragment_with_nested_fragments/kotlin/operationBased/root_query_fragment_with_nested_fragments/fragment/QueryFragmentImpl.kt.expected b/libraries/apollo-compiler/src/test/graphql/com/example/root_query_fragment_with_nested_fragments/kotlin/operationBased/root_query_fragment_with_nested_fragments/fragment/QueryFragmentImpl.kt.expected index 46f74ce4c68..18e1cd66633 100644 --- a/libraries/apollo-compiler/src/test/graphql/com/example/root_query_fragment_with_nested_fragments/kotlin/operationBased/root_query_fragment_with_nested_fragments/fragment/QueryFragmentImpl.kt.expected +++ b/libraries/apollo-compiler/src/test/graphql/com/example/root_query_fragment_with_nested_fragments/kotlin/operationBased/root_query_fragment_with_nested_fragments/fragment/QueryFragmentImpl.kt.expected @@ -25,7 +25,7 @@ public class QueryFragmentImpl() : Fragment { override fun serializeVariables( writer: JsonWriter, customScalarAdapters: CustomScalarAdapters, - withBooleanDefaultValues: Boolean, + withDefaultValues: Boolean, ) { // This fragment doesn't have any variable } diff --git a/libraries/apollo-compiler/src/test/graphql/com/example/root_query_fragment_with_nested_fragments/kotlin/operationBased/root_query_fragment_with_nested_fragments/fragment/selections/QueryFragmentSelections.kt.expected b/libraries/apollo-compiler/src/test/graphql/com/example/root_query_fragment_with_nested_fragments/kotlin/operationBased/root_query_fragment_with_nested_fragments/fragment/selections/QueryFragmentSelections.kt.expected index e251073c174..a91643f4c24 100644 --- a/libraries/apollo-compiler/src/test/graphql/com/example/root_query_fragment_with_nested_fragments/kotlin/operationBased/root_query_fragment_with_nested_fragments/fragment/selections/QueryFragmentSelections.kt.expected +++ b/libraries/apollo-compiler/src/test/graphql/com/example/root_query_fragment_with_nested_fragments/kotlin/operationBased/root_query_fragment_with_nested_fragments/fragment/selections/QueryFragmentSelections.kt.expected @@ -72,13 +72,17 @@ public object QueryFragmentSelections { CompiledField.Builder( name = "hero", type = Character.type - ).selections(__hero) + ).arguments(listOf( + CompiledArgument.Builder("episode").build(), + CompiledArgument.Builder("listOfListOfStringArgs").build() + )) + .selections(__hero) .build(), CompiledField.Builder( name = "droid", type = Droid.type ).arguments(listOf( - CompiledArgument.Builder("id", 1).build() + CompiledArgument.Builder("id").value(1).build() )) .selections(__droid) .build(), @@ -86,7 +90,7 @@ public object QueryFragmentSelections { name = "human", type = Human.type ).arguments(listOf( - CompiledArgument.Builder("id", 1).build() + CompiledArgument.Builder("id").value(1).build() )) .selections(__human) .build() diff --git a/libraries/apollo-compiler/src/test/graphql/com/example/root_query_fragment_with_nested_fragments/kotlin/responseBased/root_query_fragment_with_nested_fragments/TestQuery.kt.expected b/libraries/apollo-compiler/src/test/graphql/com/example/root_query_fragment_with_nested_fragments/kotlin/responseBased/root_query_fragment_with_nested_fragments/TestQuery.kt.expected index 2435f5f4f9a..ce1656950e3 100644 --- a/libraries/apollo-compiler/src/test/graphql/com/example/root_query_fragment_with_nested_fragments/kotlin/responseBased/root_query_fragment_with_nested_fragments/TestQuery.kt.expected +++ b/libraries/apollo-compiler/src/test/graphql/com/example/root_query_fragment_with_nested_fragments/kotlin/responseBased/root_query_fragment_with_nested_fragments/TestQuery.kt.expected @@ -38,7 +38,7 @@ public class TestQuery() : Query { override fun serializeVariables( writer: JsonWriter, customScalarAdapters: CustomScalarAdapters, - withBooleanDefaultValues: Boolean, + withDefaultValues: Boolean, ) { // This operation doesn't have any variable } diff --git a/libraries/apollo-compiler/src/test/graphql/com/example/root_query_fragment_with_nested_fragments/kotlin/responseBased/root_query_fragment_with_nested_fragments/fragment/DroidFragmentImpl.kt.expected b/libraries/apollo-compiler/src/test/graphql/com/example/root_query_fragment_with_nested_fragments/kotlin/responseBased/root_query_fragment_with_nested_fragments/fragment/DroidFragmentImpl.kt.expected index 77aa9b81cc3..a6399cecef6 100644 --- a/libraries/apollo-compiler/src/test/graphql/com/example/root_query_fragment_with_nested_fragments/kotlin/responseBased/root_query_fragment_with_nested_fragments/fragment/DroidFragmentImpl.kt.expected +++ b/libraries/apollo-compiler/src/test/graphql/com/example/root_query_fragment_with_nested_fragments/kotlin/responseBased/root_query_fragment_with_nested_fragments/fragment/DroidFragmentImpl.kt.expected @@ -26,7 +26,7 @@ public class DroidFragmentImpl() : Fragment { override fun serializeVariables( writer: JsonWriter, customScalarAdapters: CustomScalarAdapters, - withBooleanDefaultValues: Boolean, + withDefaultValues: Boolean, ) { // This fragment doesn't have any variable } diff --git a/libraries/apollo-compiler/src/test/graphql/com/example/root_query_fragment_with_nested_fragments/kotlin/responseBased/root_query_fragment_with_nested_fragments/fragment/HeroFragmentImpl.kt.expected b/libraries/apollo-compiler/src/test/graphql/com/example/root_query_fragment_with_nested_fragments/kotlin/responseBased/root_query_fragment_with_nested_fragments/fragment/HeroFragmentImpl.kt.expected index e0ea5158049..dd619af845b 100644 --- a/libraries/apollo-compiler/src/test/graphql/com/example/root_query_fragment_with_nested_fragments/kotlin/responseBased/root_query_fragment_with_nested_fragments/fragment/HeroFragmentImpl.kt.expected +++ b/libraries/apollo-compiler/src/test/graphql/com/example/root_query_fragment_with_nested_fragments/kotlin/responseBased/root_query_fragment_with_nested_fragments/fragment/HeroFragmentImpl.kt.expected @@ -26,7 +26,7 @@ public class HeroFragmentImpl() : Fragment { override fun serializeVariables( writer: JsonWriter, customScalarAdapters: CustomScalarAdapters, - withBooleanDefaultValues: Boolean, + withDefaultValues: Boolean, ) { // This fragment doesn't have any variable } diff --git a/libraries/apollo-compiler/src/test/graphql/com/example/root_query_fragment_with_nested_fragments/kotlin/responseBased/root_query_fragment_with_nested_fragments/fragment/QueryFragmentImpl.kt.expected b/libraries/apollo-compiler/src/test/graphql/com/example/root_query_fragment_with_nested_fragments/kotlin/responseBased/root_query_fragment_with_nested_fragments/fragment/QueryFragmentImpl.kt.expected index 002b22c3fa1..d89466a5f84 100644 --- a/libraries/apollo-compiler/src/test/graphql/com/example/root_query_fragment_with_nested_fragments/kotlin/responseBased/root_query_fragment_with_nested_fragments/fragment/QueryFragmentImpl.kt.expected +++ b/libraries/apollo-compiler/src/test/graphql/com/example/root_query_fragment_with_nested_fragments/kotlin/responseBased/root_query_fragment_with_nested_fragments/fragment/QueryFragmentImpl.kt.expected @@ -27,7 +27,7 @@ public class QueryFragmentImpl() : Fragment { override fun serializeVariables( writer: JsonWriter, customScalarAdapters: CustomScalarAdapters, - withBooleanDefaultValues: Boolean, + withDefaultValues: Boolean, ) { // This fragment doesn't have any variable } diff --git a/libraries/apollo-compiler/src/test/graphql/com/example/root_query_fragment_with_nested_fragments/kotlin/responseBased/root_query_fragment_with_nested_fragments/fragment/selections/QueryFragmentSelections.kt.expected b/libraries/apollo-compiler/src/test/graphql/com/example/root_query_fragment_with_nested_fragments/kotlin/responseBased/root_query_fragment_with_nested_fragments/fragment/selections/QueryFragmentSelections.kt.expected index e251073c174..a91643f4c24 100644 --- a/libraries/apollo-compiler/src/test/graphql/com/example/root_query_fragment_with_nested_fragments/kotlin/responseBased/root_query_fragment_with_nested_fragments/fragment/selections/QueryFragmentSelections.kt.expected +++ b/libraries/apollo-compiler/src/test/graphql/com/example/root_query_fragment_with_nested_fragments/kotlin/responseBased/root_query_fragment_with_nested_fragments/fragment/selections/QueryFragmentSelections.kt.expected @@ -72,13 +72,17 @@ public object QueryFragmentSelections { CompiledField.Builder( name = "hero", type = Character.type - ).selections(__hero) + ).arguments(listOf( + CompiledArgument.Builder("episode").build(), + CompiledArgument.Builder("listOfListOfStringArgs").build() + )) + .selections(__hero) .build(), CompiledField.Builder( name = "droid", type = Droid.type ).arguments(listOf( - CompiledArgument.Builder("id", 1).build() + CompiledArgument.Builder("id").value(1).build() )) .selections(__droid) .build(), @@ -86,7 +90,7 @@ public object QueryFragmentSelections { name = "human", type = Human.type ).arguments(listOf( - CompiledArgument.Builder("id", 1).build() + CompiledArgument.Builder("id").value(1).build() )) .selections(__human) .build() diff --git a/libraries/apollo-compiler/src/test/graphql/com/example/root_query_inline_fragment/java/operationBased/root_query_inline_fragment/TestQuery.java.expected b/libraries/apollo-compiler/src/test/graphql/com/example/root_query_inline_fragment/java/operationBased/root_query_inline_fragment/TestQuery.java.expected index cc486d9cb90..b5e34946064 100644 --- a/libraries/apollo-compiler/src/test/graphql/com/example/root_query_inline_fragment/java/operationBased/root_query_inline_fragment/TestQuery.java.expected +++ b/libraries/apollo-compiler/src/test/graphql/com/example/root_query_inline_fragment/java/operationBased/root_query_inline_fragment/TestQuery.java.expected @@ -115,7 +115,7 @@ public class TestQuery implements Query { @Override public void serializeVariables(JsonWriter writer, CustomScalarAdapters customScalarAdapters, - boolean withBooleanDefaultValues) throws IOException { + boolean withDefaultValues) throws IOException { // This operation doesn't have any variable } diff --git a/libraries/apollo-compiler/src/test/graphql/com/example/root_query_inline_fragment/java/operationBased/root_query_inline_fragment/selections/TestQuerySelections.java.expected b/libraries/apollo-compiler/src/test/graphql/com/example/root_query_inline_fragment/java/operationBased/root_query_inline_fragment/selections/TestQuerySelections.java.expected index 451cb2911b7..079d5740d92 100644 --- a/libraries/apollo-compiler/src/test/graphql/com/example/root_query_inline_fragment/java/operationBased/root_query_inline_fragment/selections/TestQuerySelections.java.expected +++ b/libraries/apollo-compiler/src/test/graphql/com/example/root_query_inline_fragment/java/operationBased/root_query_inline_fragment/selections/TestQuerySelections.java.expected @@ -21,7 +21,7 @@ import java.util.List; public class TestQuerySelections { private static List __onHuman = Arrays.asList( - new CompiledField.Builder("height", GraphQLFloat.type).build() + new CompiledField.Builder("height", GraphQLFloat.type).arguments(Arrays.asList(new CompiledArgument.Builder("unit").value("METER").build())).build() ); private static List __hero = Arrays.asList( @@ -43,8 +43,8 @@ public class TestQuerySelections { private static List __onQuery = Arrays.asList( new CompiledField.Builder("__typename", new CompiledNotNullType(GraphQLString.type)).build(), - new CompiledField.Builder("hero", Character.type).selections(__hero).build(), - new CompiledField.Builder("droid", Droid.type).arguments(Arrays.asList(new CompiledArgument.Builder("id", 1).build())).selections(__droid).build() + new CompiledField.Builder("hero", Character.type).arguments(Arrays.asList(new CompiledArgument.Builder("episode").build(), new CompiledArgument.Builder("listOfListOfStringArgs").build())).selections(__hero).build(), + new CompiledField.Builder("droid", Droid.type).arguments(Arrays.asList(new CompiledArgument.Builder("id").value(1).build())).selections(__droid).build() ); public static List __root = Arrays.asList( diff --git a/libraries/apollo-compiler/src/test/graphql/com/example/root_query_inline_fragment/kotlin/operationBased/root_query_inline_fragment/TestQuery.kt.expected b/libraries/apollo-compiler/src/test/graphql/com/example/root_query_inline_fragment/kotlin/operationBased/root_query_inline_fragment/TestQuery.kt.expected index 4373cd602c8..3c1aced2d5d 100644 --- a/libraries/apollo-compiler/src/test/graphql/com/example/root_query_inline_fragment/kotlin/operationBased/root_query_inline_fragment/TestQuery.kt.expected +++ b/libraries/apollo-compiler/src/test/graphql/com/example/root_query_inline_fragment/kotlin/operationBased/root_query_inline_fragment/TestQuery.kt.expected @@ -37,7 +37,7 @@ public class TestQuery() : Query { override fun serializeVariables( writer: JsonWriter, customScalarAdapters: CustomScalarAdapters, - withBooleanDefaultValues: Boolean, + withDefaultValues: Boolean, ) { // This operation doesn't have any variable } diff --git a/libraries/apollo-compiler/src/test/graphql/com/example/root_query_inline_fragment/kotlin/operationBased/root_query_inline_fragment/selections/TestQuerySelections.kt.expected b/libraries/apollo-compiler/src/test/graphql/com/example/root_query_inline_fragment/kotlin/operationBased/root_query_inline_fragment/selections/TestQuerySelections.kt.expected index 756939e9e51..1963b08c878 100644 --- a/libraries/apollo-compiler/src/test/graphql/com/example/root_query_inline_fragment/kotlin/operationBased/root_query_inline_fragment/selections/TestQuerySelections.kt.expected +++ b/libraries/apollo-compiler/src/test/graphql/com/example/root_query_inline_fragment/kotlin/operationBased/root_query_inline_fragment/selections/TestQuerySelections.kt.expected @@ -23,7 +23,10 @@ public object TestQuerySelections { CompiledField.Builder( name = "height", type = GraphQLFloat.type - ).build() + ).arguments(listOf( + CompiledArgument.Builder("unit").value("METER").build() + )) + .build() ) private val __hero: List = listOf( @@ -77,13 +80,17 @@ public object TestQuerySelections { CompiledField.Builder( name = "hero", type = Character.type - ).selections(__hero) + ).arguments(listOf( + CompiledArgument.Builder("episode").build(), + CompiledArgument.Builder("listOfListOfStringArgs").build() + )) + .selections(__hero) .build(), CompiledField.Builder( name = "droid", type = Droid.type ).arguments(listOf( - CompiledArgument.Builder("id", 1).build() + CompiledArgument.Builder("id").value(1).build() )) .selections(__droid) .build() diff --git a/libraries/apollo-compiler/src/test/graphql/com/example/root_query_inline_fragment/kotlin/responseBased/root_query_inline_fragment/TestQuery.kt.expected b/libraries/apollo-compiler/src/test/graphql/com/example/root_query_inline_fragment/kotlin/responseBased/root_query_inline_fragment/TestQuery.kt.expected index b38a650caa7..19db64154fd 100644 --- a/libraries/apollo-compiler/src/test/graphql/com/example/root_query_inline_fragment/kotlin/responseBased/root_query_inline_fragment/TestQuery.kt.expected +++ b/libraries/apollo-compiler/src/test/graphql/com/example/root_query_inline_fragment/kotlin/responseBased/root_query_inline_fragment/TestQuery.kt.expected @@ -38,7 +38,7 @@ public class TestQuery() : Query { override fun serializeVariables( writer: JsonWriter, customScalarAdapters: CustomScalarAdapters, - withBooleanDefaultValues: Boolean, + withDefaultValues: Boolean, ) { // This operation doesn't have any variable } diff --git a/libraries/apollo-compiler/src/test/graphql/com/example/root_query_inline_fragment/kotlin/responseBased/root_query_inline_fragment/selections/TestQuerySelections.kt.expected b/libraries/apollo-compiler/src/test/graphql/com/example/root_query_inline_fragment/kotlin/responseBased/root_query_inline_fragment/selections/TestQuerySelections.kt.expected index 756939e9e51..1963b08c878 100644 --- a/libraries/apollo-compiler/src/test/graphql/com/example/root_query_inline_fragment/kotlin/responseBased/root_query_inline_fragment/selections/TestQuerySelections.kt.expected +++ b/libraries/apollo-compiler/src/test/graphql/com/example/root_query_inline_fragment/kotlin/responseBased/root_query_inline_fragment/selections/TestQuerySelections.kt.expected @@ -23,7 +23,10 @@ public object TestQuerySelections { CompiledField.Builder( name = "height", type = GraphQLFloat.type - ).build() + ).arguments(listOf( + CompiledArgument.Builder("unit").value("METER").build() + )) + .build() ) private val __hero: List = listOf( @@ -77,13 +80,17 @@ public object TestQuerySelections { CompiledField.Builder( name = "hero", type = Character.type - ).selections(__hero) + ).arguments(listOf( + CompiledArgument.Builder("episode").build(), + CompiledArgument.Builder("listOfListOfStringArgs").build() + )) + .selections(__hero) .build(), CompiledField.Builder( name = "droid", type = Droid.type ).arguments(listOf( - CompiledArgument.Builder("id", 1).build() + CompiledArgument.Builder("id").value(1).build() )) .selections(__droid) .build() diff --git a/libraries/apollo-compiler/src/test/graphql/com/example/simple_fragment/java/operationBased/simple_fragment/TestQuery.java.expected b/libraries/apollo-compiler/src/test/graphql/com/example/simple_fragment/java/operationBased/simple_fragment/TestQuery.java.expected index 3c6e26a3585..e9179fecae9 100644 --- a/libraries/apollo-compiler/src/test/graphql/com/example/simple_fragment/java/operationBased/simple_fragment/TestQuery.java.expected +++ b/libraries/apollo-compiler/src/test/graphql/com/example/simple_fragment/java/operationBased/simple_fragment/TestQuery.java.expected @@ -119,7 +119,7 @@ public class TestQuery implements Query { @Override public void serializeVariables(JsonWriter writer, CustomScalarAdapters customScalarAdapters, - boolean withBooleanDefaultValues) throws IOException { + boolean withDefaultValues) throws IOException { // This operation doesn't have any variable } diff --git a/libraries/apollo-compiler/src/test/graphql/com/example/simple_fragment/java/operationBased/simple_fragment/fragment/HeroDetailsImpl.java.expected b/libraries/apollo-compiler/src/test/graphql/com/example/simple_fragment/java/operationBased/simple_fragment/fragment/HeroDetailsImpl.java.expected index 78eb0603447..25746e1006e 100644 --- a/libraries/apollo-compiler/src/test/graphql/com/example/simple_fragment/java/operationBased/simple_fragment/fragment/HeroDetailsImpl.java.expected +++ b/libraries/apollo-compiler/src/test/graphql/com/example/simple_fragment/java/operationBased/simple_fragment/fragment/HeroDetailsImpl.java.expected @@ -65,7 +65,7 @@ public class HeroDetailsImpl implements Fragment { @Override public void serializeVariables(JsonWriter writer, CustomScalarAdapters customScalarAdapters, - boolean withBooleanDefaultValues) throws IOException { + boolean withDefaultValues) throws IOException { // This fragment doesn't have any variable } diff --git a/libraries/apollo-compiler/src/test/graphql/com/example/simple_fragment/java/operationBased/simple_fragment/fragment/HumanDetailsImpl.java.expected b/libraries/apollo-compiler/src/test/graphql/com/example/simple_fragment/java/operationBased/simple_fragment/fragment/HumanDetailsImpl.java.expected index 77b0e1c19f1..e977bcf01a5 100644 --- a/libraries/apollo-compiler/src/test/graphql/com/example/simple_fragment/java/operationBased/simple_fragment/fragment/HumanDetailsImpl.java.expected +++ b/libraries/apollo-compiler/src/test/graphql/com/example/simple_fragment/java/operationBased/simple_fragment/fragment/HumanDetailsImpl.java.expected @@ -64,7 +64,7 @@ public class HumanDetailsImpl implements Fragment { @Override public void serializeVariables(JsonWriter writer, CustomScalarAdapters customScalarAdapters, - boolean withBooleanDefaultValues) throws IOException { + boolean withDefaultValues) throws IOException { // This fragment doesn't have any variable } diff --git a/libraries/apollo-compiler/src/test/graphql/com/example/simple_fragment/java/operationBased/simple_fragment/selections/TestQuerySelections.java.expected b/libraries/apollo-compiler/src/test/graphql/com/example/simple_fragment/java/operationBased/simple_fragment/selections/TestQuerySelections.java.expected index 1c034bc68e2..9da9c24e7b7 100644 --- a/libraries/apollo-compiler/src/test/graphql/com/example/simple_fragment/java/operationBased/simple_fragment/selections/TestQuerySelections.java.expected +++ b/libraries/apollo-compiler/src/test/graphql/com/example/simple_fragment/java/operationBased/simple_fragment/selections/TestQuerySelections.java.expected @@ -5,6 +5,7 @@ // package com.example.simple_fragment.selections; +import com.apollographql.apollo3.api.CompiledArgument; import com.apollographql.apollo3.api.CompiledField; import com.apollographql.apollo3.api.CompiledFragment; import com.apollographql.apollo3.api.CompiledNotNullType; @@ -24,6 +25,6 @@ public class TestQuerySelections { ); public static List __root = Arrays.asList( - new CompiledField.Builder("hero", Character.type).selections(__hero).build() + new CompiledField.Builder("hero", Character.type).arguments(Arrays.asList(new CompiledArgument.Builder("episode").build(), new CompiledArgument.Builder("listOfListOfStringArgs").build())).selections(__hero).build() ); } diff --git a/libraries/apollo-compiler/src/test/graphql/com/example/simple_fragment/kotlin/operationBased/simple_fragment/TestQuery.kt.expected b/libraries/apollo-compiler/src/test/graphql/com/example/simple_fragment/kotlin/operationBased/simple_fragment/TestQuery.kt.expected index d0c7b2c9903..48900a27679 100644 --- a/libraries/apollo-compiler/src/test/graphql/com/example/simple_fragment/kotlin/operationBased/simple_fragment/TestQuery.kt.expected +++ b/libraries/apollo-compiler/src/test/graphql/com/example/simple_fragment/kotlin/operationBased/simple_fragment/TestQuery.kt.expected @@ -47,7 +47,7 @@ internal class TestQuery() : Query { override fun serializeVariables( writer: JsonWriter, customScalarAdapters: CustomScalarAdapters, - withBooleanDefaultValues: Boolean, + withDefaultValues: Boolean, ) { // This operation doesn't have any variable } diff --git a/libraries/apollo-compiler/src/test/graphql/com/example/simple_fragment/kotlin/operationBased/simple_fragment/fragment/HeroDetailsImpl.kt.expected b/libraries/apollo-compiler/src/test/graphql/com/example/simple_fragment/kotlin/operationBased/simple_fragment/fragment/HeroDetailsImpl.kt.expected index 61ba8a23099..241c9901147 100644 --- a/libraries/apollo-compiler/src/test/graphql/com/example/simple_fragment/kotlin/operationBased/simple_fragment/fragment/HeroDetailsImpl.kt.expected +++ b/libraries/apollo-compiler/src/test/graphql/com/example/simple_fragment/kotlin/operationBased/simple_fragment/fragment/HeroDetailsImpl.kt.expected @@ -38,7 +38,7 @@ internal class HeroDetailsImpl() : Fragment { override fun serializeVariables( writer: JsonWriter, customScalarAdapters: CustomScalarAdapters, - withBooleanDefaultValues: Boolean, + withDefaultValues: Boolean, ) { // This fragment doesn't have any variable } diff --git a/libraries/apollo-compiler/src/test/graphql/com/example/simple_fragment/kotlin/operationBased/simple_fragment/fragment/HumanDetailsImpl.kt.expected b/libraries/apollo-compiler/src/test/graphql/com/example/simple_fragment/kotlin/operationBased/simple_fragment/fragment/HumanDetailsImpl.kt.expected index b2177689034..a9d67296130 100644 --- a/libraries/apollo-compiler/src/test/graphql/com/example/simple_fragment/kotlin/operationBased/simple_fragment/fragment/HumanDetailsImpl.kt.expected +++ b/libraries/apollo-compiler/src/test/graphql/com/example/simple_fragment/kotlin/operationBased/simple_fragment/fragment/HumanDetailsImpl.kt.expected @@ -35,7 +35,7 @@ internal class HumanDetailsImpl() : Fragment { override fun serializeVariables( writer: JsonWriter, customScalarAdapters: CustomScalarAdapters, - withBooleanDefaultValues: Boolean, + withDefaultValues: Boolean, ) { // This fragment doesn't have any variable } diff --git a/libraries/apollo-compiler/src/test/graphql/com/example/simple_fragment/kotlin/operationBased/simple_fragment/selections/TestQuerySelections.kt.expected b/libraries/apollo-compiler/src/test/graphql/com/example/simple_fragment/kotlin/operationBased/simple_fragment/selections/TestQuerySelections.kt.expected index 2f6bb0f8daa..7f3d44081a8 100644 --- a/libraries/apollo-compiler/src/test/graphql/com/example/simple_fragment/kotlin/operationBased/simple_fragment/selections/TestQuerySelections.kt.expected +++ b/libraries/apollo-compiler/src/test/graphql/com/example/simple_fragment/kotlin/operationBased/simple_fragment/selections/TestQuerySelections.kt.expected @@ -5,6 +5,7 @@ // package com.example.simple_fragment.selections +import com.apollographql.apollo3.api.CompiledArgument import com.apollographql.apollo3.api.CompiledField import com.apollographql.apollo3.api.CompiledFragment import com.apollographql.apollo3.api.CompiledSelection @@ -37,7 +38,11 @@ internal object TestQuerySelections { CompiledField.Builder( name = "hero", type = Character.type - ).selections(__hero) + ).arguments(listOf( + CompiledArgument.Builder("episode").build(), + CompiledArgument.Builder("listOfListOfStringArgs").build() + )) + .selections(__hero) .build() ) } diff --git a/libraries/apollo-compiler/src/test/graphql/com/example/simple_fragment/kotlin/responseBased/simple_fragment/TestQuery.kt.expected b/libraries/apollo-compiler/src/test/graphql/com/example/simple_fragment/kotlin/responseBased/simple_fragment/TestQuery.kt.expected index ff55d3fa6b0..25fd98c876b 100644 --- a/libraries/apollo-compiler/src/test/graphql/com/example/simple_fragment/kotlin/responseBased/simple_fragment/TestQuery.kt.expected +++ b/libraries/apollo-compiler/src/test/graphql/com/example/simple_fragment/kotlin/responseBased/simple_fragment/TestQuery.kt.expected @@ -49,7 +49,7 @@ internal class TestQuery() : Query { override fun serializeVariables( writer: JsonWriter, customScalarAdapters: CustomScalarAdapters, - withBooleanDefaultValues: Boolean, + withDefaultValues: Boolean, ) { // This operation doesn't have any variable } diff --git a/libraries/apollo-compiler/src/test/graphql/com/example/simple_fragment/kotlin/responseBased/simple_fragment/fragment/HeroDetailsImpl.kt.expected b/libraries/apollo-compiler/src/test/graphql/com/example/simple_fragment/kotlin/responseBased/simple_fragment/fragment/HeroDetailsImpl.kt.expected index 9110081f3d0..d3f96244036 100644 --- a/libraries/apollo-compiler/src/test/graphql/com/example/simple_fragment/kotlin/responseBased/simple_fragment/fragment/HeroDetailsImpl.kt.expected +++ b/libraries/apollo-compiler/src/test/graphql/com/example/simple_fragment/kotlin/responseBased/simple_fragment/fragment/HeroDetailsImpl.kt.expected @@ -40,7 +40,7 @@ internal class HeroDetailsImpl() : Fragment { override fun serializeVariables( writer: JsonWriter, customScalarAdapters: CustomScalarAdapters, - withBooleanDefaultValues: Boolean, + withDefaultValues: Boolean, ) { // This fragment doesn't have any variable } diff --git a/libraries/apollo-compiler/src/test/graphql/com/example/simple_fragment/kotlin/responseBased/simple_fragment/fragment/HumanDetailsImpl.kt.expected b/libraries/apollo-compiler/src/test/graphql/com/example/simple_fragment/kotlin/responseBased/simple_fragment/fragment/HumanDetailsImpl.kt.expected index 718b5115d45..aab079bdebc 100644 --- a/libraries/apollo-compiler/src/test/graphql/com/example/simple_fragment/kotlin/responseBased/simple_fragment/fragment/HumanDetailsImpl.kt.expected +++ b/libraries/apollo-compiler/src/test/graphql/com/example/simple_fragment/kotlin/responseBased/simple_fragment/fragment/HumanDetailsImpl.kt.expected @@ -36,7 +36,7 @@ internal class HumanDetailsImpl() : Fragment { override fun serializeVariables( writer: JsonWriter, customScalarAdapters: CustomScalarAdapters, - withBooleanDefaultValues: Boolean, + withDefaultValues: Boolean, ) { // This fragment doesn't have any variable } diff --git a/libraries/apollo-compiler/src/test/graphql/com/example/simple_fragment/kotlin/responseBased/simple_fragment/selections/TestQuerySelections.kt.expected b/libraries/apollo-compiler/src/test/graphql/com/example/simple_fragment/kotlin/responseBased/simple_fragment/selections/TestQuerySelections.kt.expected index 2f6bb0f8daa..7f3d44081a8 100644 --- a/libraries/apollo-compiler/src/test/graphql/com/example/simple_fragment/kotlin/responseBased/simple_fragment/selections/TestQuerySelections.kt.expected +++ b/libraries/apollo-compiler/src/test/graphql/com/example/simple_fragment/kotlin/responseBased/simple_fragment/selections/TestQuerySelections.kt.expected @@ -5,6 +5,7 @@ // package com.example.simple_fragment.selections +import com.apollographql.apollo3.api.CompiledArgument import com.apollographql.apollo3.api.CompiledField import com.apollographql.apollo3.api.CompiledFragment import com.apollographql.apollo3.api.CompiledSelection @@ -37,7 +38,11 @@ internal object TestQuerySelections { CompiledField.Builder( name = "hero", type = Character.type - ).selections(__hero) + ).arguments(listOf( + CompiledArgument.Builder("episode").build(), + CompiledArgument.Builder("listOfListOfStringArgs").build() + )) + .selections(__hero) .build() ) } diff --git a/libraries/apollo-compiler/src/test/graphql/com/example/simple_fragment_with_inline_fragments/java/operationBased/simple_fragment_with_inline_fragments/TestQuery.java.expected b/libraries/apollo-compiler/src/test/graphql/com/example/simple_fragment_with_inline_fragments/java/operationBased/simple_fragment_with_inline_fragments/TestQuery.java.expected index fe3e4025245..a2ea77fd2f8 100644 --- a/libraries/apollo-compiler/src/test/graphql/com/example/simple_fragment_with_inline_fragments/java/operationBased/simple_fragment_with_inline_fragments/TestQuery.java.expected +++ b/libraries/apollo-compiler/src/test/graphql/com/example/simple_fragment_with_inline_fragments/java/operationBased/simple_fragment_with_inline_fragments/TestQuery.java.expected @@ -112,7 +112,7 @@ public class TestQuery implements Query { @Override public void serializeVariables(JsonWriter writer, CustomScalarAdapters customScalarAdapters, - boolean withBooleanDefaultValues) throws IOException { + boolean withDefaultValues) throws IOException { // This operation doesn't have any variable } diff --git a/libraries/apollo-compiler/src/test/graphql/com/example/simple_fragment_with_inline_fragments/java/operationBased/simple_fragment_with_inline_fragments/fragment/HeroDetailsImpl.java.expected b/libraries/apollo-compiler/src/test/graphql/com/example/simple_fragment_with_inline_fragments/java/operationBased/simple_fragment_with_inline_fragments/fragment/HeroDetailsImpl.java.expected index b554239462f..4c49b023e99 100644 --- a/libraries/apollo-compiler/src/test/graphql/com/example/simple_fragment_with_inline_fragments/java/operationBased/simple_fragment_with_inline_fragments/fragment/HeroDetailsImpl.java.expected +++ b/libraries/apollo-compiler/src/test/graphql/com/example/simple_fragment_with_inline_fragments/java/operationBased/simple_fragment_with_inline_fragments/fragment/HeroDetailsImpl.java.expected @@ -61,7 +61,7 @@ public class HeroDetailsImpl implements Fragment { @Override public void serializeVariables(JsonWriter writer, CustomScalarAdapters customScalarAdapters, - boolean withBooleanDefaultValues) throws IOException { + boolean withDefaultValues) throws IOException { // This fragment doesn't have any variable } diff --git a/libraries/apollo-compiler/src/test/graphql/com/example/simple_fragment_with_inline_fragments/java/operationBased/simple_fragment_with_inline_fragments/fragment/selections/HeroDetailsSelections.java.expected b/libraries/apollo-compiler/src/test/graphql/com/example/simple_fragment_with_inline_fragments/java/operationBased/simple_fragment_with_inline_fragments/fragment/selections/HeroDetailsSelections.java.expected index eccb035ecfe..4ecd616b538 100644 --- a/libraries/apollo-compiler/src/test/graphql/com/example/simple_fragment_with_inline_fragments/java/operationBased/simple_fragment_with_inline_fragments/fragment/selections/HeroDetailsSelections.java.expected +++ b/libraries/apollo-compiler/src/test/graphql/com/example/simple_fragment_with_inline_fragments/java/operationBased/simple_fragment_with_inline_fragments/fragment/selections/HeroDetailsSelections.java.expected @@ -5,6 +5,7 @@ // package com.example.simple_fragment_with_inline_fragments.fragment.selections; +import com.apollographql.apollo3.api.CompiledArgument; import com.apollographql.apollo3.api.CompiledField; import com.apollographql.apollo3.api.CompiledFragment; import com.apollographql.apollo3.api.CompiledListType; @@ -18,7 +19,7 @@ import java.util.List; public class HeroDetailsSelections { private static List __onHuman = Arrays.asList( - new CompiledField.Builder("height", GraphQLFloat.type).build() + new CompiledField.Builder("height", GraphQLFloat.type).arguments(Arrays.asList(new CompiledArgument.Builder("unit").value("METER").build())).build() ); private static List __onDroid = Arrays.asList( diff --git a/libraries/apollo-compiler/src/test/graphql/com/example/simple_fragment_with_inline_fragments/java/operationBased/simple_fragment_with_inline_fragments/selections/TestQuerySelections.java.expected b/libraries/apollo-compiler/src/test/graphql/com/example/simple_fragment_with_inline_fragments/java/operationBased/simple_fragment_with_inline_fragments/selections/TestQuerySelections.java.expected index dd79df11d96..f671988ca82 100644 --- a/libraries/apollo-compiler/src/test/graphql/com/example/simple_fragment_with_inline_fragments/java/operationBased/simple_fragment_with_inline_fragments/selections/TestQuerySelections.java.expected +++ b/libraries/apollo-compiler/src/test/graphql/com/example/simple_fragment_with_inline_fragments/java/operationBased/simple_fragment_with_inline_fragments/selections/TestQuerySelections.java.expected @@ -5,6 +5,7 @@ // package com.example.simple_fragment_with_inline_fragments.selections; +import com.apollographql.apollo3.api.CompiledArgument; import com.apollographql.apollo3.api.CompiledField; import com.apollographql.apollo3.api.CompiledFragment; import com.apollographql.apollo3.api.CompiledNotNullType; @@ -22,6 +23,6 @@ public class TestQuerySelections { ); public static List __root = Arrays.asList( - new CompiledField.Builder("hero", Character.type).selections(__hero).build() + new CompiledField.Builder("hero", Character.type).arguments(Arrays.asList(new CompiledArgument.Builder("episode").build(), new CompiledArgument.Builder("listOfListOfStringArgs").build())).selections(__hero).build() ); } diff --git a/libraries/apollo-compiler/src/test/graphql/com/example/simple_fragment_with_inline_fragments/kotlin/operationBased/simple_fragment_with_inline_fragments/TestQuery.kt.expected b/libraries/apollo-compiler/src/test/graphql/com/example/simple_fragment_with_inline_fragments/kotlin/operationBased/simple_fragment_with_inline_fragments/TestQuery.kt.expected index 445c5c1b304..0b2359ecc46 100644 --- a/libraries/apollo-compiler/src/test/graphql/com/example/simple_fragment_with_inline_fragments/kotlin/operationBased/simple_fragment_with_inline_fragments/TestQuery.kt.expected +++ b/libraries/apollo-compiler/src/test/graphql/com/example/simple_fragment_with_inline_fragments/kotlin/operationBased/simple_fragment_with_inline_fragments/TestQuery.kt.expected @@ -35,7 +35,7 @@ public class TestQuery() : Query { override fun serializeVariables( writer: JsonWriter, customScalarAdapters: CustomScalarAdapters, - withBooleanDefaultValues: Boolean, + withDefaultValues: Boolean, ) { // This operation doesn't have any variable } diff --git a/libraries/apollo-compiler/src/test/graphql/com/example/simple_fragment_with_inline_fragments/kotlin/operationBased/simple_fragment_with_inline_fragments/fragment/HeroDetailsImpl.kt.expected b/libraries/apollo-compiler/src/test/graphql/com/example/simple_fragment_with_inline_fragments/kotlin/operationBased/simple_fragment_with_inline_fragments/fragment/HeroDetailsImpl.kt.expected index a4c8527b861..7b875527ca1 100644 --- a/libraries/apollo-compiler/src/test/graphql/com/example/simple_fragment_with_inline_fragments/kotlin/operationBased/simple_fragment_with_inline_fragments/fragment/HeroDetailsImpl.kt.expected +++ b/libraries/apollo-compiler/src/test/graphql/com/example/simple_fragment_with_inline_fragments/kotlin/operationBased/simple_fragment_with_inline_fragments/fragment/HeroDetailsImpl.kt.expected @@ -25,7 +25,7 @@ public class HeroDetailsImpl() : Fragment { override fun serializeVariables( writer: JsonWriter, customScalarAdapters: CustomScalarAdapters, - withBooleanDefaultValues: Boolean, + withDefaultValues: Boolean, ) { // This fragment doesn't have any variable } diff --git a/libraries/apollo-compiler/src/test/graphql/com/example/simple_fragment_with_inline_fragments/kotlin/operationBased/simple_fragment_with_inline_fragments/fragment/selections/HeroDetailsSelections.kt.expected b/libraries/apollo-compiler/src/test/graphql/com/example/simple_fragment_with_inline_fragments/kotlin/operationBased/simple_fragment_with_inline_fragments/fragment/selections/HeroDetailsSelections.kt.expected index 9c57f1d8246..7c4172f124d 100644 --- a/libraries/apollo-compiler/src/test/graphql/com/example/simple_fragment_with_inline_fragments/kotlin/operationBased/simple_fragment_with_inline_fragments/fragment/selections/HeroDetailsSelections.kt.expected +++ b/libraries/apollo-compiler/src/test/graphql/com/example/simple_fragment_with_inline_fragments/kotlin/operationBased/simple_fragment_with_inline_fragments/fragment/selections/HeroDetailsSelections.kt.expected @@ -5,6 +5,7 @@ // package com.example.simple_fragment_with_inline_fragments.fragment.selections +import com.apollographql.apollo3.api.CompiledArgument import com.apollographql.apollo3.api.CompiledField import com.apollographql.apollo3.api.CompiledFragment import com.apollographql.apollo3.api.CompiledSelection @@ -20,7 +21,10 @@ public object HeroDetailsSelections { CompiledField.Builder( name = "height", type = GraphQLFloat.type - ).build() + ).arguments(listOf( + CompiledArgument.Builder("unit").value("METER").build() + )) + .build() ) private val __onDroid: List = listOf( diff --git a/libraries/apollo-compiler/src/test/graphql/com/example/simple_fragment_with_inline_fragments/kotlin/operationBased/simple_fragment_with_inline_fragments/selections/TestQuerySelections.kt.expected b/libraries/apollo-compiler/src/test/graphql/com/example/simple_fragment_with_inline_fragments/kotlin/operationBased/simple_fragment_with_inline_fragments/selections/TestQuerySelections.kt.expected index 61ebfbc0fb6..31e54c8626b 100644 --- a/libraries/apollo-compiler/src/test/graphql/com/example/simple_fragment_with_inline_fragments/kotlin/operationBased/simple_fragment_with_inline_fragments/selections/TestQuerySelections.kt.expected +++ b/libraries/apollo-compiler/src/test/graphql/com/example/simple_fragment_with_inline_fragments/kotlin/operationBased/simple_fragment_with_inline_fragments/selections/TestQuerySelections.kt.expected @@ -5,6 +5,7 @@ // package com.example.simple_fragment_with_inline_fragments.selections +import com.apollographql.apollo3.api.CompiledArgument import com.apollographql.apollo3.api.CompiledField import com.apollographql.apollo3.api.CompiledFragment import com.apollographql.apollo3.api.CompiledSelection @@ -31,7 +32,11 @@ public object TestQuerySelections { CompiledField.Builder( name = "hero", type = Character.type - ).selections(__hero) + ).arguments(listOf( + CompiledArgument.Builder("episode").build(), + CompiledArgument.Builder("listOfListOfStringArgs").build() + )) + .selections(__hero) .build() ) } diff --git a/libraries/apollo-compiler/src/test/graphql/com/example/simple_fragment_with_inline_fragments/kotlin/responseBased/simple_fragment_with_inline_fragments/TestQuery.kt.expected b/libraries/apollo-compiler/src/test/graphql/com/example/simple_fragment_with_inline_fragments/kotlin/responseBased/simple_fragment_with_inline_fragments/TestQuery.kt.expected index 3b30548a7cf..221e5b99a2c 100644 --- a/libraries/apollo-compiler/src/test/graphql/com/example/simple_fragment_with_inline_fragments/kotlin/responseBased/simple_fragment_with_inline_fragments/TestQuery.kt.expected +++ b/libraries/apollo-compiler/src/test/graphql/com/example/simple_fragment_with_inline_fragments/kotlin/responseBased/simple_fragment_with_inline_fragments/TestQuery.kt.expected @@ -38,7 +38,7 @@ public class TestQuery() : Query { override fun serializeVariables( writer: JsonWriter, customScalarAdapters: CustomScalarAdapters, - withBooleanDefaultValues: Boolean, + withDefaultValues: Boolean, ) { // This operation doesn't have any variable } diff --git a/libraries/apollo-compiler/src/test/graphql/com/example/simple_fragment_with_inline_fragments/kotlin/responseBased/simple_fragment_with_inline_fragments/fragment/HeroDetailsImpl.kt.expected b/libraries/apollo-compiler/src/test/graphql/com/example/simple_fragment_with_inline_fragments/kotlin/responseBased/simple_fragment_with_inline_fragments/fragment/HeroDetailsImpl.kt.expected index 28177c11136..2b9ae57eec0 100644 --- a/libraries/apollo-compiler/src/test/graphql/com/example/simple_fragment_with_inline_fragments/kotlin/responseBased/simple_fragment_with_inline_fragments/fragment/HeroDetailsImpl.kt.expected +++ b/libraries/apollo-compiler/src/test/graphql/com/example/simple_fragment_with_inline_fragments/kotlin/responseBased/simple_fragment_with_inline_fragments/fragment/HeroDetailsImpl.kt.expected @@ -29,7 +29,7 @@ public class HeroDetailsImpl() : Fragment { override fun serializeVariables( writer: JsonWriter, customScalarAdapters: CustomScalarAdapters, - withBooleanDefaultValues: Boolean, + withDefaultValues: Boolean, ) { // This fragment doesn't have any variable } diff --git a/libraries/apollo-compiler/src/test/graphql/com/example/simple_fragment_with_inline_fragments/kotlin/responseBased/simple_fragment_with_inline_fragments/fragment/selections/HeroDetailsSelections.kt.expected b/libraries/apollo-compiler/src/test/graphql/com/example/simple_fragment_with_inline_fragments/kotlin/responseBased/simple_fragment_with_inline_fragments/fragment/selections/HeroDetailsSelections.kt.expected index 9c57f1d8246..7c4172f124d 100644 --- a/libraries/apollo-compiler/src/test/graphql/com/example/simple_fragment_with_inline_fragments/kotlin/responseBased/simple_fragment_with_inline_fragments/fragment/selections/HeroDetailsSelections.kt.expected +++ b/libraries/apollo-compiler/src/test/graphql/com/example/simple_fragment_with_inline_fragments/kotlin/responseBased/simple_fragment_with_inline_fragments/fragment/selections/HeroDetailsSelections.kt.expected @@ -5,6 +5,7 @@ // package com.example.simple_fragment_with_inline_fragments.fragment.selections +import com.apollographql.apollo3.api.CompiledArgument import com.apollographql.apollo3.api.CompiledField import com.apollographql.apollo3.api.CompiledFragment import com.apollographql.apollo3.api.CompiledSelection @@ -20,7 +21,10 @@ public object HeroDetailsSelections { CompiledField.Builder( name = "height", type = GraphQLFloat.type - ).build() + ).arguments(listOf( + CompiledArgument.Builder("unit").value("METER").build() + )) + .build() ) private val __onDroid: List = listOf( diff --git a/libraries/apollo-compiler/src/test/graphql/com/example/simple_fragment_with_inline_fragments/kotlin/responseBased/simple_fragment_with_inline_fragments/selections/TestQuerySelections.kt.expected b/libraries/apollo-compiler/src/test/graphql/com/example/simple_fragment_with_inline_fragments/kotlin/responseBased/simple_fragment_with_inline_fragments/selections/TestQuerySelections.kt.expected index 61ebfbc0fb6..31e54c8626b 100644 --- a/libraries/apollo-compiler/src/test/graphql/com/example/simple_fragment_with_inline_fragments/kotlin/responseBased/simple_fragment_with_inline_fragments/selections/TestQuerySelections.kt.expected +++ b/libraries/apollo-compiler/src/test/graphql/com/example/simple_fragment_with_inline_fragments/kotlin/responseBased/simple_fragment_with_inline_fragments/selections/TestQuerySelections.kt.expected @@ -5,6 +5,7 @@ // package com.example.simple_fragment_with_inline_fragments.selections +import com.apollographql.apollo3.api.CompiledArgument import com.apollographql.apollo3.api.CompiledField import com.apollographql.apollo3.api.CompiledFragment import com.apollographql.apollo3.api.CompiledSelection @@ -31,7 +32,11 @@ public object TestQuerySelections { CompiledField.Builder( name = "hero", type = Character.type - ).selections(__hero) + ).arguments(listOf( + CompiledArgument.Builder("episode").build(), + CompiledArgument.Builder("listOfListOfStringArgs").build() + )) + .selections(__hero) .build() ) } diff --git a/libraries/apollo-compiler/src/test/graphql/com/example/simple_inline_fragment/java/operationBased/simple_inline_fragment/TestQuery.java.expected b/libraries/apollo-compiler/src/test/graphql/com/example/simple_inline_fragment/java/operationBased/simple_inline_fragment/TestQuery.java.expected index 8fcc7dee979..3a54bb0b8ec 100644 --- a/libraries/apollo-compiler/src/test/graphql/com/example/simple_inline_fragment/java/operationBased/simple_inline_fragment/TestQuery.java.expected +++ b/libraries/apollo-compiler/src/test/graphql/com/example/simple_inline_fragment/java/operationBased/simple_inline_fragment/TestQuery.java.expected @@ -110,7 +110,7 @@ public class TestQuery implements Query { @Override public void serializeVariables(JsonWriter writer, CustomScalarAdapters customScalarAdapters, - boolean withBooleanDefaultValues) throws IOException { + boolean withDefaultValues) throws IOException { // This operation doesn't have any variable } diff --git a/libraries/apollo-compiler/src/test/graphql/com/example/simple_inline_fragment/java/operationBased/simple_inline_fragment/selections/TestQuerySelections.java.expected b/libraries/apollo-compiler/src/test/graphql/com/example/simple_inline_fragment/java/operationBased/simple_inline_fragment/selections/TestQuerySelections.java.expected index d7667c27dcc..45cef371335 100644 --- a/libraries/apollo-compiler/src/test/graphql/com/example/simple_inline_fragment/java/operationBased/simple_inline_fragment/selections/TestQuerySelections.java.expected +++ b/libraries/apollo-compiler/src/test/graphql/com/example/simple_inline_fragment/java/operationBased/simple_inline_fragment/selections/TestQuerySelections.java.expected @@ -5,6 +5,7 @@ // package com.example.simple_inline_fragment.selections; +import com.apollographql.apollo3.api.CompiledArgument; import com.apollographql.apollo3.api.CompiledField; import com.apollographql.apollo3.api.CompiledFragment; import com.apollographql.apollo3.api.CompiledNotNullType; @@ -28,7 +29,7 @@ public class TestQuerySelections { ); private static List __onHuman = Arrays.asList( - new CompiledField.Builder("height", GraphQLFloat.type).build() + new CompiledField.Builder("height", GraphQLFloat.type).arguments(Arrays.asList(new CompiledArgument.Builder("unit").value("METER").build())).build() ); private static List __onDroid = Arrays.asList( @@ -43,6 +44,6 @@ public class TestQuerySelections { ); public static List __root = Arrays.asList( - new CompiledField.Builder("hero", Character.type).selections(__hero).build() + new CompiledField.Builder("hero", Character.type).arguments(Arrays.asList(new CompiledArgument.Builder("episode").build(), new CompiledArgument.Builder("listOfListOfStringArgs").build())).selections(__hero).build() ); } diff --git a/libraries/apollo-compiler/src/test/graphql/com/example/simple_inline_fragment/kotlin/operationBased/simple_inline_fragment/TestQuery.kt.expected b/libraries/apollo-compiler/src/test/graphql/com/example/simple_inline_fragment/kotlin/operationBased/simple_inline_fragment/TestQuery.kt.expected index f6fbebcb1ca..e5d187a2e6c 100644 --- a/libraries/apollo-compiler/src/test/graphql/com/example/simple_inline_fragment/kotlin/operationBased/simple_inline_fragment/TestQuery.kt.expected +++ b/libraries/apollo-compiler/src/test/graphql/com/example/simple_inline_fragment/kotlin/operationBased/simple_inline_fragment/TestQuery.kt.expected @@ -35,7 +35,7 @@ public class TestQuery() : Query { override fun serializeVariables( writer: JsonWriter, customScalarAdapters: CustomScalarAdapters, - withBooleanDefaultValues: Boolean, + withDefaultValues: Boolean, ) { // This operation doesn't have any variable } diff --git a/libraries/apollo-compiler/src/test/graphql/com/example/simple_inline_fragment/kotlin/operationBased/simple_inline_fragment/selections/TestQuerySelections.kt.expected b/libraries/apollo-compiler/src/test/graphql/com/example/simple_inline_fragment/kotlin/operationBased/simple_inline_fragment/selections/TestQuerySelections.kt.expected index a6e23f9b9f1..8ba8668b07f 100644 --- a/libraries/apollo-compiler/src/test/graphql/com/example/simple_inline_fragment/kotlin/operationBased/simple_inline_fragment/selections/TestQuerySelections.kt.expected +++ b/libraries/apollo-compiler/src/test/graphql/com/example/simple_inline_fragment/kotlin/operationBased/simple_inline_fragment/selections/TestQuerySelections.kt.expected @@ -5,6 +5,7 @@ // package com.example.simple_inline_fragment.selections +import com.apollographql.apollo3.api.CompiledArgument import com.apollographql.apollo3.api.CompiledField import com.apollographql.apollo3.api.CompiledFragment import com.apollographql.apollo3.api.CompiledSelection @@ -43,7 +44,10 @@ public object TestQuerySelections { CompiledField.Builder( name = "height", type = GraphQLFloat.type - ).build() + ).arguments(listOf( + CompiledArgument.Builder("unit").value("METER").build() + )) + .build() ) private val __onDroid: List = listOf( @@ -79,7 +83,11 @@ public object TestQuerySelections { CompiledField.Builder( name = "hero", type = Character.type - ).selections(__hero) + ).arguments(listOf( + CompiledArgument.Builder("episode").build(), + CompiledArgument.Builder("listOfListOfStringArgs").build() + )) + .selections(__hero) .build() ) } diff --git a/libraries/apollo-compiler/src/test/graphql/com/example/simple_inline_fragment/kotlin/responseBased/simple_inline_fragment/TestQuery.kt.expected b/libraries/apollo-compiler/src/test/graphql/com/example/simple_inline_fragment/kotlin/responseBased/simple_inline_fragment/TestQuery.kt.expected index 21aa1b375f9..f6a1e65cfc5 100644 --- a/libraries/apollo-compiler/src/test/graphql/com/example/simple_inline_fragment/kotlin/responseBased/simple_inline_fragment/TestQuery.kt.expected +++ b/libraries/apollo-compiler/src/test/graphql/com/example/simple_inline_fragment/kotlin/responseBased/simple_inline_fragment/TestQuery.kt.expected @@ -36,7 +36,7 @@ public class TestQuery() : Query { override fun serializeVariables( writer: JsonWriter, customScalarAdapters: CustomScalarAdapters, - withBooleanDefaultValues: Boolean, + withDefaultValues: Boolean, ) { // This operation doesn't have any variable } diff --git a/libraries/apollo-compiler/src/test/graphql/com/example/simple_inline_fragment/kotlin/responseBased/simple_inline_fragment/selections/TestQuerySelections.kt.expected b/libraries/apollo-compiler/src/test/graphql/com/example/simple_inline_fragment/kotlin/responseBased/simple_inline_fragment/selections/TestQuerySelections.kt.expected index a6e23f9b9f1..8ba8668b07f 100644 --- a/libraries/apollo-compiler/src/test/graphql/com/example/simple_inline_fragment/kotlin/responseBased/simple_inline_fragment/selections/TestQuerySelections.kt.expected +++ b/libraries/apollo-compiler/src/test/graphql/com/example/simple_inline_fragment/kotlin/responseBased/simple_inline_fragment/selections/TestQuerySelections.kt.expected @@ -5,6 +5,7 @@ // package com.example.simple_inline_fragment.selections +import com.apollographql.apollo3.api.CompiledArgument import com.apollographql.apollo3.api.CompiledField import com.apollographql.apollo3.api.CompiledFragment import com.apollographql.apollo3.api.CompiledSelection @@ -43,7 +44,10 @@ public object TestQuerySelections { CompiledField.Builder( name = "height", type = GraphQLFloat.type - ).build() + ).arguments(listOf( + CompiledArgument.Builder("unit").value("METER").build() + )) + .build() ) private val __onDroid: List = listOf( @@ -79,7 +83,11 @@ public object TestQuerySelections { CompiledField.Builder( name = "hero", type = Character.type - ).selections(__hero) + ).arguments(listOf( + CompiledArgument.Builder("episode").build(), + CompiledArgument.Builder("listOfListOfStringArgs").build() + )) + .selections(__hero) .build() ) } diff --git a/libraries/apollo-compiler/src/test/graphql/com/example/simple_union/java/operationBased/simple_union/AnimalQuery.java.expected b/libraries/apollo-compiler/src/test/graphql/com/example/simple_union/java/operationBased/simple_union/AnimalQuery.java.expected index f61f6330f9b..a9f2afdebf2 100644 --- a/libraries/apollo-compiler/src/test/graphql/com/example/simple_union/java/operationBased/simple_union/AnimalQuery.java.expected +++ b/libraries/apollo-compiler/src/test/graphql/com/example/simple_union/java/operationBased/simple_union/AnimalQuery.java.expected @@ -108,7 +108,7 @@ public class AnimalQuery implements Query { @Override public void serializeVariables(JsonWriter writer, CustomScalarAdapters customScalarAdapters, - boolean withBooleanDefaultValues) throws IOException { + boolean withDefaultValues) throws IOException { // This operation doesn't have any variable } diff --git a/libraries/apollo-compiler/src/test/graphql/com/example/simple_union/java/operationBased/simple_union/fragment/CatFragmentImpl.java.expected b/libraries/apollo-compiler/src/test/graphql/com/example/simple_union/java/operationBased/simple_union/fragment/CatFragmentImpl.java.expected index 07592b19941..aa6a5351713 100644 --- a/libraries/apollo-compiler/src/test/graphql/com/example/simple_union/java/operationBased/simple_union/fragment/CatFragmentImpl.java.expected +++ b/libraries/apollo-compiler/src/test/graphql/com/example/simple_union/java/operationBased/simple_union/fragment/CatFragmentImpl.java.expected @@ -61,7 +61,7 @@ public class CatFragmentImpl implements Fragment { @Override public void serializeVariables(JsonWriter writer, CustomScalarAdapters customScalarAdapters, - boolean withBooleanDefaultValues) throws IOException { + boolean withDefaultValues) throws IOException { // This fragment doesn't have any variable } diff --git a/libraries/apollo-compiler/src/test/graphql/com/example/simple_union/java/operationBased/simple_union/fragment/DogFragmentImpl.java.expected b/libraries/apollo-compiler/src/test/graphql/com/example/simple_union/java/operationBased/simple_union/fragment/DogFragmentImpl.java.expected index 877acfbd2d4..e31c05cabd2 100644 --- a/libraries/apollo-compiler/src/test/graphql/com/example/simple_union/java/operationBased/simple_union/fragment/DogFragmentImpl.java.expected +++ b/libraries/apollo-compiler/src/test/graphql/com/example/simple_union/java/operationBased/simple_union/fragment/DogFragmentImpl.java.expected @@ -61,7 +61,7 @@ public class DogFragmentImpl implements Fragment { @Override public void serializeVariables(JsonWriter writer, CustomScalarAdapters customScalarAdapters, - boolean withBooleanDefaultValues) throws IOException { + boolean withDefaultValues) throws IOException { // This fragment doesn't have any variable } diff --git a/libraries/apollo-compiler/src/test/graphql/com/example/simple_union/kotlin/operationBased/simple_union/AnimalQuery.kt.expected b/libraries/apollo-compiler/src/test/graphql/com/example/simple_union/kotlin/operationBased/simple_union/AnimalQuery.kt.expected index 3e86dd5c468..5dad01a1f73 100644 --- a/libraries/apollo-compiler/src/test/graphql/com/example/simple_union/kotlin/operationBased/simple_union/AnimalQuery.kt.expected +++ b/libraries/apollo-compiler/src/test/graphql/com/example/simple_union/kotlin/operationBased/simple_union/AnimalQuery.kt.expected @@ -36,7 +36,7 @@ public class AnimalQuery() : Query { override fun serializeVariables( writer: JsonWriter, customScalarAdapters: CustomScalarAdapters, - withBooleanDefaultValues: Boolean, + withDefaultValues: Boolean, ) { // This operation doesn't have any variable } diff --git a/libraries/apollo-compiler/src/test/graphql/com/example/simple_union/kotlin/operationBased/simple_union/fragment/CatFragmentImpl.kt.expected b/libraries/apollo-compiler/src/test/graphql/com/example/simple_union/kotlin/operationBased/simple_union/fragment/CatFragmentImpl.kt.expected index 04a19185ff3..793589a3b47 100644 --- a/libraries/apollo-compiler/src/test/graphql/com/example/simple_union/kotlin/operationBased/simple_union/fragment/CatFragmentImpl.kt.expected +++ b/libraries/apollo-compiler/src/test/graphql/com/example/simple_union/kotlin/operationBased/simple_union/fragment/CatFragmentImpl.kt.expected @@ -25,7 +25,7 @@ public class CatFragmentImpl() : Fragment { override fun serializeVariables( writer: JsonWriter, customScalarAdapters: CustomScalarAdapters, - withBooleanDefaultValues: Boolean, + withDefaultValues: Boolean, ) { // This fragment doesn't have any variable } diff --git a/libraries/apollo-compiler/src/test/graphql/com/example/simple_union/kotlin/operationBased/simple_union/fragment/DogFragmentImpl.kt.expected b/libraries/apollo-compiler/src/test/graphql/com/example/simple_union/kotlin/operationBased/simple_union/fragment/DogFragmentImpl.kt.expected index e02aabda0d0..f63ae1a3d87 100644 --- a/libraries/apollo-compiler/src/test/graphql/com/example/simple_union/kotlin/operationBased/simple_union/fragment/DogFragmentImpl.kt.expected +++ b/libraries/apollo-compiler/src/test/graphql/com/example/simple_union/kotlin/operationBased/simple_union/fragment/DogFragmentImpl.kt.expected @@ -25,7 +25,7 @@ public class DogFragmentImpl() : Fragment { override fun serializeVariables( writer: JsonWriter, customScalarAdapters: CustomScalarAdapters, - withBooleanDefaultValues: Boolean, + withDefaultValues: Boolean, ) { // This fragment doesn't have any variable } diff --git a/libraries/apollo-compiler/src/test/graphql/com/example/simple_union/kotlin/responseBased/simple_union/AnimalQuery.kt.expected b/libraries/apollo-compiler/src/test/graphql/com/example/simple_union/kotlin/responseBased/simple_union/AnimalQuery.kt.expected index ff5da387dbe..906d88de1d4 100644 --- a/libraries/apollo-compiler/src/test/graphql/com/example/simple_union/kotlin/responseBased/simple_union/AnimalQuery.kt.expected +++ b/libraries/apollo-compiler/src/test/graphql/com/example/simple_union/kotlin/responseBased/simple_union/AnimalQuery.kt.expected @@ -37,7 +37,7 @@ public class AnimalQuery() : Query { override fun serializeVariables( writer: JsonWriter, customScalarAdapters: CustomScalarAdapters, - withBooleanDefaultValues: Boolean, + withDefaultValues: Boolean, ) { // This operation doesn't have any variable } diff --git a/libraries/apollo-compiler/src/test/graphql/com/example/simple_union/kotlin/responseBased/simple_union/fragment/CatFragmentImpl.kt.expected b/libraries/apollo-compiler/src/test/graphql/com/example/simple_union/kotlin/responseBased/simple_union/fragment/CatFragmentImpl.kt.expected index 5b6716a1763..335c3942065 100644 --- a/libraries/apollo-compiler/src/test/graphql/com/example/simple_union/kotlin/responseBased/simple_union/fragment/CatFragmentImpl.kt.expected +++ b/libraries/apollo-compiler/src/test/graphql/com/example/simple_union/kotlin/responseBased/simple_union/fragment/CatFragmentImpl.kt.expected @@ -26,7 +26,7 @@ public class CatFragmentImpl() : Fragment { override fun serializeVariables( writer: JsonWriter, customScalarAdapters: CustomScalarAdapters, - withBooleanDefaultValues: Boolean, + withDefaultValues: Boolean, ) { // This fragment doesn't have any variable } diff --git a/libraries/apollo-compiler/src/test/graphql/com/example/simple_union/kotlin/responseBased/simple_union/fragment/DogFragmentImpl.kt.expected b/libraries/apollo-compiler/src/test/graphql/com/example/simple_union/kotlin/responseBased/simple_union/fragment/DogFragmentImpl.kt.expected index 0cab9fc565f..7faaf1fe36d 100644 --- a/libraries/apollo-compiler/src/test/graphql/com/example/simple_union/kotlin/responseBased/simple_union/fragment/DogFragmentImpl.kt.expected +++ b/libraries/apollo-compiler/src/test/graphql/com/example/simple_union/kotlin/responseBased/simple_union/fragment/DogFragmentImpl.kt.expected @@ -26,7 +26,7 @@ public class DogFragmentImpl() : Fragment { override fun serializeVariables( writer: JsonWriter, customScalarAdapters: CustomScalarAdapters, - withBooleanDefaultValues: Boolean, + withDefaultValues: Boolean, ) { // This fragment doesn't have any variable } diff --git a/libraries/apollo-compiler/src/test/graphql/com/example/starships/java/operationBased/starships/TestQuery.java.expected b/libraries/apollo-compiler/src/test/graphql/com/example/starships/java/operationBased/starships/TestQuery.java.expected index 50d063648dc..ed32cc6a742 100644 --- a/libraries/apollo-compiler/src/test/graphql/com/example/starships/java/operationBased/starships/TestQuery.java.expected +++ b/libraries/apollo-compiler/src/test/graphql/com/example/starships/java/operationBased/starships/TestQuery.java.expected @@ -107,8 +107,8 @@ public class TestQuery implements Query { @Override public void serializeVariables(JsonWriter writer, CustomScalarAdapters customScalarAdapters, - boolean withBooleanDefaultValues) throws IOException { - TestQuery_VariablesAdapter.INSTANCE.serializeVariables(writer, this, customScalarAdapters, withBooleanDefaultValues); + boolean withDefaultValues) throws IOException { + TestQuery_VariablesAdapter.INSTANCE.serializeVariables(writer, this, customScalarAdapters, withDefaultValues); } @Override diff --git a/libraries/apollo-compiler/src/test/graphql/com/example/starships/java/operationBased/starships/adapter/TestQuery_VariablesAdapter.java.expected b/libraries/apollo-compiler/src/test/graphql/com/example/starships/java/operationBased/starships/adapter/TestQuery_VariablesAdapter.java.expected index f84fb232d4f..85e92adefd2 100644 --- a/libraries/apollo-compiler/src/test/graphql/com/example/starships/java/operationBased/starships/adapter/TestQuery_VariablesAdapter.java.expected +++ b/libraries/apollo-compiler/src/test/graphql/com/example/starships/java/operationBased/starships/adapter/TestQuery_VariablesAdapter.java.expected @@ -16,8 +16,7 @@ public enum TestQuery_VariablesAdapter { INSTANCE; public void serializeVariables(JsonWriter writer, TestQuery value, - CustomScalarAdapters customScalarAdapters, boolean withBooleanDefaultValues) throws - IOException { + CustomScalarAdapters customScalarAdapters, boolean withDefaultValues) throws IOException { CompositeAdapterContext adapterContext = new CompositeAdapterContext.Builder().customScalarAdapters(customScalarAdapters).build(); writer.name("id"); Adapters.StringAdapter.toJson(writer, CustomScalarAdapters.Empty, value.id); diff --git a/libraries/apollo-compiler/src/test/graphql/com/example/starships/java/operationBased/starships/selections/TestQuerySelections.java.expected b/libraries/apollo-compiler/src/test/graphql/com/example/starships/java/operationBased/starships/selections/TestQuerySelections.java.expected index bd4632c9eab..07e9f2604be 100644 --- a/libraries/apollo-compiler/src/test/graphql/com/example/starships/java/operationBased/starships/selections/TestQuerySelections.java.expected +++ b/libraries/apollo-compiler/src/test/graphql/com/example/starships/java/operationBased/starships/selections/TestQuerySelections.java.expected @@ -26,6 +26,6 @@ public class TestQuerySelections { ); public static List __root = Arrays.asList( - new CompiledField.Builder("starship", Starship.type).arguments(Arrays.asList(new CompiledArgument.Builder("id", new CompiledVariable("id")).build())).selections(__starship).build() + new CompiledField.Builder("starship", Starship.type).arguments(Arrays.asList(new CompiledArgument.Builder("id").value(new CompiledVariable("id")).build())).selections(__starship).build() ); } diff --git a/libraries/apollo-compiler/src/test/graphql/com/example/starships/kotlin/responseBased/starships/TestQuery.kt.expected b/libraries/apollo-compiler/src/test/graphql/com/example/starships/kotlin/responseBased/starships/TestQuery.kt.expected index 18a10e90eb0..2afe257deba 100644 --- a/libraries/apollo-compiler/src/test/graphql/com/example/starships/kotlin/responseBased/starships/TestQuery.kt.expected +++ b/libraries/apollo-compiler/src/test/graphql/com/example/starships/kotlin/responseBased/starships/TestQuery.kt.expected @@ -33,10 +33,10 @@ public data class TestQuery( override fun serializeVariables( writer: JsonWriter, customScalarAdapters: CustomScalarAdapters, - withBooleanDefaultValues: Boolean, + withDefaultValues: Boolean, ) { TestQuery_VariablesAdapter.serializeVariables(writer, this, customScalarAdapters, - withBooleanDefaultValues) + withDefaultValues) } override fun adapter(): CompositeAdapter = TestQuery_ResponseAdapter.Data.obj() diff --git a/libraries/apollo-compiler/src/test/graphql/com/example/starships/kotlin/responseBased/starships/adapter/TestQuery_VariablesAdapter.kt.expected b/libraries/apollo-compiler/src/test/graphql/com/example/starships/kotlin/responseBased/starships/adapter/TestQuery_VariablesAdapter.kt.expected index e820f44bea8..d10d03a85ea 100644 --- a/libraries/apollo-compiler/src/test/graphql/com/example/starships/kotlin/responseBased/starships/adapter/TestQuery_VariablesAdapter.kt.expected +++ b/libraries/apollo-compiler/src/test/graphql/com/example/starships/kotlin/responseBased/starships/adapter/TestQuery_VariablesAdapter.kt.expected @@ -21,7 +21,7 @@ public object TestQuery_VariablesAdapter { writer: JsonWriter, `value`: TestQuery, customScalarAdapters: CustomScalarAdapters, - withBooleanDefaultValues: Boolean, + withDefaultValues: Boolean, ) { writer.name("id") StringAdapter.toJson(writer, customScalarAdapters, value.id) diff --git a/libraries/apollo-compiler/src/test/graphql/com/example/starships/kotlin/responseBased/starships/selections/TestQuerySelections.kt.expected b/libraries/apollo-compiler/src/test/graphql/com/example/starships/kotlin/responseBased/starships/selections/TestQuerySelections.kt.expected index 04821c13f25..ad320cd45e4 100644 --- a/libraries/apollo-compiler/src/test/graphql/com/example/starships/kotlin/responseBased/starships/selections/TestQuerySelections.kt.expected +++ b/libraries/apollo-compiler/src/test/graphql/com/example/starships/kotlin/responseBased/starships/selections/TestQuerySelections.kt.expected @@ -38,7 +38,7 @@ public object TestQuerySelections { name = "starship", type = Starship.type ).arguments(listOf( - CompiledArgument.Builder("id", CompiledVariable("id")).build() + CompiledArgument.Builder("id").value(CompiledVariable("id")).build() )) .selections(__starship) .build() diff --git a/libraries/apollo-compiler/src/test/graphql/com/example/subscriptions/java/operationBased/subscriptions/TestSubscription.java.expected b/libraries/apollo-compiler/src/test/graphql/com/example/subscriptions/java/operationBased/subscriptions/TestSubscription.java.expected index 31eb5682eaa..65a558c1fe9 100644 --- a/libraries/apollo-compiler/src/test/graphql/com/example/subscriptions/java/operationBased/subscriptions/TestSubscription.java.expected +++ b/libraries/apollo-compiler/src/test/graphql/com/example/subscriptions/java/operationBased/subscriptions/TestSubscription.java.expected @@ -105,8 +105,8 @@ public class TestSubscription implements Subscription { @Override public void serializeVariables(JsonWriter writer, CustomScalarAdapters customScalarAdapters, - boolean withBooleanDefaultValues) throws IOException { - TestSubscription_VariablesAdapter.INSTANCE.serializeVariables(writer, this, customScalarAdapters, withBooleanDefaultValues); + boolean withDefaultValues) throws IOException { + TestSubscription_VariablesAdapter.INSTANCE.serializeVariables(writer, this, customScalarAdapters, withDefaultValues); } @Override diff --git a/libraries/apollo-compiler/src/test/graphql/com/example/subscriptions/java/operationBased/subscriptions/adapter/TestSubscription_VariablesAdapter.java.expected b/libraries/apollo-compiler/src/test/graphql/com/example/subscriptions/java/operationBased/subscriptions/adapter/TestSubscription_VariablesAdapter.java.expected index 3e0d4654faa..a13ff0ffd12 100644 --- a/libraries/apollo-compiler/src/test/graphql/com/example/subscriptions/java/operationBased/subscriptions/adapter/TestSubscription_VariablesAdapter.java.expected +++ b/libraries/apollo-compiler/src/test/graphql/com/example/subscriptions/java/operationBased/subscriptions/adapter/TestSubscription_VariablesAdapter.java.expected @@ -16,8 +16,7 @@ public enum TestSubscription_VariablesAdapter { INSTANCE; public void serializeVariables(JsonWriter writer, TestSubscription value, - CustomScalarAdapters customScalarAdapters, boolean withBooleanDefaultValues) throws - IOException { + CustomScalarAdapters customScalarAdapters, boolean withDefaultValues) throws IOException { CompositeAdapterContext adapterContext = new CompositeAdapterContext.Builder().customScalarAdapters(customScalarAdapters).build(); writer.name("repo"); Adapters.StringAdapter.toJson(writer, CustomScalarAdapters.Empty, value.repo); diff --git a/libraries/apollo-compiler/src/test/graphql/com/example/subscriptions/java/operationBased/subscriptions/selections/TestSubscriptionSelections.java.expected b/libraries/apollo-compiler/src/test/graphql/com/example/subscriptions/java/operationBased/subscriptions/selections/TestSubscriptionSelections.java.expected index 41056f6797c..460b437182b 100644 --- a/libraries/apollo-compiler/src/test/graphql/com/example/subscriptions/java/operationBased/subscriptions/selections/TestSubscriptionSelections.java.expected +++ b/libraries/apollo-compiler/src/test/graphql/com/example/subscriptions/java/operationBased/subscriptions/selections/TestSubscriptionSelections.java.expected @@ -23,6 +23,6 @@ public class TestSubscriptionSelections { ); public static List __root = Arrays.asList( - new CompiledField.Builder("commentAdded", Comment.type).arguments(Arrays.asList(new CompiledArgument.Builder("repoFullName", new CompiledVariable("repo")).build())).selections(__commentAdded).build() + new CompiledField.Builder("commentAdded", Comment.type).arguments(Arrays.asList(new CompiledArgument.Builder("repoFullName").value(new CompiledVariable("repo")).build())).selections(__commentAdded).build() ); } diff --git a/libraries/apollo-compiler/src/test/graphql/com/example/subscriptions/kotlin/responseBased/subscriptions/TestSubscription.kt.expected b/libraries/apollo-compiler/src/test/graphql/com/example/subscriptions/kotlin/responseBased/subscriptions/TestSubscription.kt.expected index bb34547d493..73adca43461 100644 --- a/libraries/apollo-compiler/src/test/graphql/com/example/subscriptions/kotlin/responseBased/subscriptions/TestSubscription.kt.expected +++ b/libraries/apollo-compiler/src/test/graphql/com/example/subscriptions/kotlin/responseBased/subscriptions/TestSubscription.kt.expected @@ -32,10 +32,10 @@ public data class TestSubscription( override fun serializeVariables( writer: JsonWriter, customScalarAdapters: CustomScalarAdapters, - withBooleanDefaultValues: Boolean, + withDefaultValues: Boolean, ) { TestSubscription_VariablesAdapter.serializeVariables(writer, this, customScalarAdapters, - withBooleanDefaultValues) + withDefaultValues) } override fun adapter(): CompositeAdapter = TestSubscription_ResponseAdapter.Data.obj() diff --git a/libraries/apollo-compiler/src/test/graphql/com/example/subscriptions/kotlin/responseBased/subscriptions/adapter/TestSubscription_VariablesAdapter.kt.expected b/libraries/apollo-compiler/src/test/graphql/com/example/subscriptions/kotlin/responseBased/subscriptions/adapter/TestSubscription_VariablesAdapter.kt.expected index 54c8cba3b6b..63a40dc5c9a 100644 --- a/libraries/apollo-compiler/src/test/graphql/com/example/subscriptions/kotlin/responseBased/subscriptions/adapter/TestSubscription_VariablesAdapter.kt.expected +++ b/libraries/apollo-compiler/src/test/graphql/com/example/subscriptions/kotlin/responseBased/subscriptions/adapter/TestSubscription_VariablesAdapter.kt.expected @@ -21,7 +21,7 @@ public object TestSubscription_VariablesAdapter { writer: JsonWriter, `value`: TestSubscription, customScalarAdapters: CustomScalarAdapters, - withBooleanDefaultValues: Boolean, + withDefaultValues: Boolean, ) { writer.name("repo") StringAdapter.toJson(writer, customScalarAdapters, value.repo) diff --git a/libraries/apollo-compiler/src/test/graphql/com/example/subscriptions/kotlin/responseBased/subscriptions/selections/TestSubscriptionSelections.kt.expected b/libraries/apollo-compiler/src/test/graphql/com/example/subscriptions/kotlin/responseBased/subscriptions/selections/TestSubscriptionSelections.kt.expected index 8296116cf7c..3fcafafe1e1 100644 --- a/libraries/apollo-compiler/src/test/graphql/com/example/subscriptions/kotlin/responseBased/subscriptions/selections/TestSubscriptionSelections.kt.expected +++ b/libraries/apollo-compiler/src/test/graphql/com/example/subscriptions/kotlin/responseBased/subscriptions/selections/TestSubscriptionSelections.kt.expected @@ -32,7 +32,7 @@ public object TestSubscriptionSelections { name = "commentAdded", type = Comment.type ).arguments(listOf( - CompiledArgument.Builder("repoFullName", CompiledVariable("repo")).build() + CompiledArgument.Builder("repoFullName").value(CompiledVariable("repo")).build() )) .selections(__commentAdded) .build() diff --git a/libraries/apollo-compiler/src/test/graphql/com/example/suppressed_warnings/java/operationBased/suppressed_warnings/CatQuery.java.expected b/libraries/apollo-compiler/src/test/graphql/com/example/suppressed_warnings/java/operationBased/suppressed_warnings/CatQuery.java.expected index 1afd2c6ff8c..925c1364557 100644 --- a/libraries/apollo-compiler/src/test/graphql/com/example/suppressed_warnings/java/operationBased/suppressed_warnings/CatQuery.java.expected +++ b/libraries/apollo-compiler/src/test/graphql/com/example/suppressed_warnings/java/operationBased/suppressed_warnings/CatQuery.java.expected @@ -108,8 +108,8 @@ public class CatQuery implements Query { @Override public void serializeVariables(JsonWriter writer, CustomScalarAdapters customScalarAdapters, - boolean withBooleanDefaultValues) throws IOException { - CatQuery_VariablesAdapter.INSTANCE.serializeVariables(writer, this, customScalarAdapters, withBooleanDefaultValues); + boolean withDefaultValues) throws IOException { + CatQuery_VariablesAdapter.INSTANCE.serializeVariables(writer, this, customScalarAdapters, withDefaultValues); } @Override diff --git a/libraries/apollo-compiler/src/test/graphql/com/example/suppressed_warnings/java/operationBased/suppressed_warnings/adapter/CatQuery_VariablesAdapter.java.expected b/libraries/apollo-compiler/src/test/graphql/com/example/suppressed_warnings/java/operationBased/suppressed_warnings/adapter/CatQuery_VariablesAdapter.java.expected index 724f5542ae3..4ca2ed00673 100644 --- a/libraries/apollo-compiler/src/test/graphql/com/example/suppressed_warnings/java/operationBased/suppressed_warnings/adapter/CatQuery_VariablesAdapter.java.expected +++ b/libraries/apollo-compiler/src/test/graphql/com/example/suppressed_warnings/java/operationBased/suppressed_warnings/adapter/CatQuery_VariablesAdapter.java.expected @@ -21,8 +21,7 @@ public enum CatQuery_VariablesAdapter { INSTANCE; public void serializeVariables(JsonWriter writer, CatQuery value, - CustomScalarAdapters customScalarAdapters, boolean withBooleanDefaultValues) throws - IOException { + CustomScalarAdapters customScalarAdapters, boolean withDefaultValues) throws IOException { CompositeAdapterContext adapterContext = new CompositeAdapterContext.Builder().customScalarAdapters(customScalarAdapters).build(); if (value.filter instanceof Optional.Present) { writer.name("filter"); diff --git a/libraries/apollo-compiler/src/test/graphql/com/example/suppressed_warnings/java/operationBased/suppressed_warnings/selections/CatQuerySelections.java.expected b/libraries/apollo-compiler/src/test/graphql/com/example/suppressed_warnings/java/operationBased/suppressed_warnings/selections/CatQuerySelections.java.expected index c45f37844df..f58c52cb7e4 100644 --- a/libraries/apollo-compiler/src/test/graphql/com/example/suppressed_warnings/java/operationBased/suppressed_warnings/selections/CatQuerySelections.java.expected +++ b/libraries/apollo-compiler/src/test/graphql/com/example/suppressed_warnings/java/operationBased/suppressed_warnings/selections/CatQuerySelections.java.expected @@ -22,7 +22,7 @@ public class CatQuerySelections { ); public static List __root = Arrays.asList( - new CompiledField.Builder("search", Cat.type).arguments(Arrays.asList(new CompiledArgument.Builder("filter", new CompiledVariable("filter")).build())).selections(__search).build(), + new CompiledField.Builder("search", Cat.type).arguments(Arrays.asList(new CompiledArgument.Builder("filter").value(new CompiledVariable("filter")).build())).selections(__search).build(), new CompiledField.Builder("direction", Direction.type).build() ); } diff --git a/libraries/apollo-compiler/src/test/graphql/com/example/suppressed_warnings/kotlin/responseBased/suppressed_warnings/CatQuery.kt.expected b/libraries/apollo-compiler/src/test/graphql/com/example/suppressed_warnings/kotlin/responseBased/suppressed_warnings/CatQuery.kt.expected index 3885151de83..fb95c1756c8 100644 --- a/libraries/apollo-compiler/src/test/graphql/com/example/suppressed_warnings/kotlin/responseBased/suppressed_warnings/CatQuery.kt.expected +++ b/libraries/apollo-compiler/src/test/graphql/com/example/suppressed_warnings/kotlin/responseBased/suppressed_warnings/CatQuery.kt.expected @@ -35,10 +35,10 @@ public data class CatQuery( override fun serializeVariables( writer: JsonWriter, customScalarAdapters: CustomScalarAdapters, - withBooleanDefaultValues: Boolean, + withDefaultValues: Boolean, ) { CatQuery_VariablesAdapter.serializeVariables(writer, this, customScalarAdapters, - withBooleanDefaultValues) + withDefaultValues) } override fun adapter(): CompositeAdapter = CatQuery_ResponseAdapter.Data.obj() diff --git a/libraries/apollo-compiler/src/test/graphql/com/example/suppressed_warnings/kotlin/responseBased/suppressed_warnings/adapter/CatQuery_VariablesAdapter.kt.expected b/libraries/apollo-compiler/src/test/graphql/com/example/suppressed_warnings/kotlin/responseBased/suppressed_warnings/adapter/CatQuery_VariablesAdapter.kt.expected index 9fc4756a864..2ab02e08714 100644 --- a/libraries/apollo-compiler/src/test/graphql/com/example/suppressed_warnings/kotlin/responseBased/suppressed_warnings/adapter/CatQuery_VariablesAdapter.kt.expected +++ b/libraries/apollo-compiler/src/test/graphql/com/example/suppressed_warnings/kotlin/responseBased/suppressed_warnings/adapter/CatQuery_VariablesAdapter.kt.expected @@ -25,7 +25,7 @@ public object CatQuery_VariablesAdapter { writer: JsonWriter, `value`: CatQuery, customScalarAdapters: CustomScalarAdapters, - withBooleanDefaultValues: Boolean, + withDefaultValues: Boolean, ) { if (value.filter is Optional.Present) { writer.name("filter") diff --git a/libraries/apollo-compiler/src/test/graphql/com/example/suppressed_warnings/kotlin/responseBased/suppressed_warnings/selections/CatQuerySelections.kt.expected b/libraries/apollo-compiler/src/test/graphql/com/example/suppressed_warnings/kotlin/responseBased/suppressed_warnings/selections/CatQuerySelections.kt.expected index 1a778c71235..5ef8e13155f 100644 --- a/libraries/apollo-compiler/src/test/graphql/com/example/suppressed_warnings/kotlin/responseBased/suppressed_warnings/selections/CatQuerySelections.kt.expected +++ b/libraries/apollo-compiler/src/test/graphql/com/example/suppressed_warnings/kotlin/responseBased/suppressed_warnings/selections/CatQuerySelections.kt.expected @@ -28,7 +28,7 @@ public object CatQuerySelections { name = "search", type = Cat.type ).arguments(listOf( - CompiledArgument.Builder("filter", CompiledVariable("filter")).build() + CompiledArgument.Builder("filter").value(CompiledVariable("filter")).build() )) .selections(__search) .build(), diff --git a/libraries/apollo-compiler/src/test/graphql/com/example/target_name/java/operationBased/target_name/TestQuery.java.expected b/libraries/apollo-compiler/src/test/graphql/com/example/target_name/java/operationBased/target_name/TestQuery.java.expected index 3743cce6c37..3054f37cef5 100644 --- a/libraries/apollo-compiler/src/test/graphql/com/example/target_name/java/operationBased/target_name/TestQuery.java.expected +++ b/libraries/apollo-compiler/src/test/graphql/com/example/target_name/java/operationBased/target_name/TestQuery.java.expected @@ -131,8 +131,8 @@ public class TestQuery implements Query { @Override public void serializeVariables(JsonWriter writer, CustomScalarAdapters customScalarAdapters, - boolean withBooleanDefaultValues) throws IOException { - TestQuery_VariablesAdapter.INSTANCE.serializeVariables(writer, this, customScalarAdapters, withBooleanDefaultValues); + boolean withDefaultValues) throws IOException { + TestQuery_VariablesAdapter.INSTANCE.serializeVariables(writer, this, customScalarAdapters, withDefaultValues); } @Override diff --git a/libraries/apollo-compiler/src/test/graphql/com/example/target_name/java/operationBased/target_name/adapter/TestQuery_VariablesAdapter.java.expected b/libraries/apollo-compiler/src/test/graphql/com/example/target_name/java/operationBased/target_name/adapter/TestQuery_VariablesAdapter.java.expected index bc9b47a3697..00504545d1e 100644 --- a/libraries/apollo-compiler/src/test/graphql/com/example/target_name/java/operationBased/target_name/adapter/TestQuery_VariablesAdapter.java.expected +++ b/libraries/apollo-compiler/src/test/graphql/com/example/target_name/java/operationBased/target_name/adapter/TestQuery_VariablesAdapter.java.expected @@ -25,8 +25,7 @@ public enum TestQuery_VariablesAdapter { INSTANCE; public void serializeVariables(JsonWriter writer, TestQuery value, - CustomScalarAdapters customScalarAdapters, boolean withBooleanDefaultValues) throws - IOException { + CustomScalarAdapters customScalarAdapters, boolean withDefaultValues) throws IOException { CompositeAdapterContext adapterContext = new CompositeAdapterContext.Builder().customScalarAdapters(customScalarAdapters).build(); if (value.input instanceof Optional.Present) { writer.name("input"); diff --git a/libraries/apollo-compiler/src/test/graphql/com/example/target_name/java/operationBased/target_name/selections/TestQuerySelections.java.expected b/libraries/apollo-compiler/src/test/graphql/com/example/target_name/java/operationBased/target_name/selections/TestQuerySelections.java.expected index 663cdcda131..14d113a5fd6 100644 --- a/libraries/apollo-compiler/src/test/graphql/com/example/target_name/java/operationBased/target_name/selections/TestQuerySelections.java.expected +++ b/libraries/apollo-compiler/src/test/graphql/com/example/target_name/java/operationBased/target_name/selections/TestQuerySelections.java.expected @@ -39,10 +39,10 @@ public class TestQuerySelections { ); public static List __root = Arrays.asList( - new CompiledField.Builder("object", renamedObject.type).arguments(Arrays.asList(new CompiledArgument.Builder("input", new CompiledVariable("input")).build())).selections(__object).build(), + new CompiledField.Builder("object", renamedObject.type).arguments(Arrays.asList(new CompiledArgument.Builder("input").value(new CompiledVariable("input")).build())).selections(__object).build(), new CompiledField.Builder("interface", renamedInterface.type).selections(__interface).build(), new CompiledField.Builder("union", renamedUnion.type).selections(__union).build(), - new CompiledField.Builder("scalar", renamedScalar.type).arguments(Arrays.asList(new CompiledArgument.Builder("scalar", new CompiledVariable("scalar")).build())).build(), - new CompiledField.Builder("enum", renamedEnum.type).arguments(Arrays.asList(new CompiledArgument.Builder("enum", new CompiledVariable("enum")).build())).build() + new CompiledField.Builder("scalar", renamedScalar.type).arguments(Arrays.asList(new CompiledArgument.Builder("scalar").value(new CompiledVariable("scalar")).build())).build(), + new CompiledField.Builder("enum", renamedEnum.type).arguments(Arrays.asList(new CompiledArgument.Builder("enum").value(new CompiledVariable("enum")).build())).build() ); } diff --git a/libraries/apollo-compiler/src/test/graphql/com/example/target_name/kotlin/operationBased/target_name/TestQuery.kt.expected b/libraries/apollo-compiler/src/test/graphql/com/example/target_name/kotlin/operationBased/target_name/TestQuery.kt.expected index b29a3794f32..8622c73888c 100644 --- a/libraries/apollo-compiler/src/test/graphql/com/example/target_name/kotlin/operationBased/target_name/TestQuery.kt.expected +++ b/libraries/apollo-compiler/src/test/graphql/com/example/target_name/kotlin/operationBased/target_name/TestQuery.kt.expected @@ -37,10 +37,10 @@ public data class TestQuery( override fun serializeVariables( writer: JsonWriter, customScalarAdapters: CustomScalarAdapters, - withBooleanDefaultValues: Boolean, + withDefaultValues: Boolean, ) { TestQuery_VariablesAdapter.serializeVariables(writer, this, customScalarAdapters, - withBooleanDefaultValues) + withDefaultValues) } override fun adapter(): CompositeAdapter = TestQuery_ResponseAdapter.Data.obj() diff --git a/libraries/apollo-compiler/src/test/graphql/com/example/target_name/kotlin/operationBased/target_name/adapter/TestQuery_VariablesAdapter.kt.expected b/libraries/apollo-compiler/src/test/graphql/com/example/target_name/kotlin/operationBased/target_name/adapter/TestQuery_VariablesAdapter.kt.expected index 6c6e128844d..2e5b8fa5f88 100644 --- a/libraries/apollo-compiler/src/test/graphql/com/example/target_name/kotlin/operationBased/target_name/adapter/TestQuery_VariablesAdapter.kt.expected +++ b/libraries/apollo-compiler/src/test/graphql/com/example/target_name/kotlin/operationBased/target_name/adapter/TestQuery_VariablesAdapter.kt.expected @@ -27,7 +27,7 @@ public object TestQuery_VariablesAdapter { writer: JsonWriter, `value`: TestQuery, customScalarAdapters: CustomScalarAdapters, - withBooleanDefaultValues: Boolean, + withDefaultValues: Boolean, ) { if (value.input is Optional.Present) { writer.name("input") diff --git a/libraries/apollo-compiler/src/test/graphql/com/example/target_name/kotlin/operationBased/target_name/selections/TestQuerySelections.kt.expected b/libraries/apollo-compiler/src/test/graphql/com/example/target_name/kotlin/operationBased/target_name/selections/TestQuerySelections.kt.expected index b3dcf43794f..8f684d6eb94 100644 --- a/libraries/apollo-compiler/src/test/graphql/com/example/target_name/kotlin/operationBased/target_name/selections/TestQuerySelections.kt.expected +++ b/libraries/apollo-compiler/src/test/graphql/com/example/target_name/kotlin/operationBased/target_name/selections/TestQuerySelections.kt.expected @@ -58,7 +58,7 @@ public object TestQuerySelections { name = "object", type = renamedObject.type ).arguments(listOf( - CompiledArgument.Builder("input", CompiledVariable("input")).build() + CompiledArgument.Builder("input").value(CompiledVariable("input")).build() )) .selections(__object) .build(), @@ -76,14 +76,14 @@ public object TestQuerySelections { name = "scalar", type = renamedScalar.type ).arguments(listOf( - CompiledArgument.Builder("scalar", CompiledVariable("scalar")).build() + CompiledArgument.Builder("scalar").value(CompiledVariable("scalar")).build() )) .build(), CompiledField.Builder( name = "enum", type = renamedEnum.type ).arguments(listOf( - CompiledArgument.Builder("enum", CompiledVariable("enum")).build() + CompiledArgument.Builder("enum").value(CompiledVariable("enum")).build() )) .build() ) diff --git a/libraries/apollo-compiler/src/test/graphql/com/example/target_name/kotlin/responseBased/target_name/TestQuery.kt.expected b/libraries/apollo-compiler/src/test/graphql/com/example/target_name/kotlin/responseBased/target_name/TestQuery.kt.expected index cc753f016cb..9907bd22550 100644 --- a/libraries/apollo-compiler/src/test/graphql/com/example/target_name/kotlin/responseBased/target_name/TestQuery.kt.expected +++ b/libraries/apollo-compiler/src/test/graphql/com/example/target_name/kotlin/responseBased/target_name/TestQuery.kt.expected @@ -38,10 +38,10 @@ public data class TestQuery( override fun serializeVariables( writer: JsonWriter, customScalarAdapters: CustomScalarAdapters, - withBooleanDefaultValues: Boolean, + withDefaultValues: Boolean, ) { TestQuery_VariablesAdapter.serializeVariables(writer, this, customScalarAdapters, - withBooleanDefaultValues) + withDefaultValues) } override fun adapter(): CompositeAdapter = TestQuery_ResponseAdapter.Data.obj() diff --git a/libraries/apollo-compiler/src/test/graphql/com/example/target_name/kotlin/responseBased/target_name/adapter/TestQuery_VariablesAdapter.kt.expected b/libraries/apollo-compiler/src/test/graphql/com/example/target_name/kotlin/responseBased/target_name/adapter/TestQuery_VariablesAdapter.kt.expected index 6c6e128844d..2e5b8fa5f88 100644 --- a/libraries/apollo-compiler/src/test/graphql/com/example/target_name/kotlin/responseBased/target_name/adapter/TestQuery_VariablesAdapter.kt.expected +++ b/libraries/apollo-compiler/src/test/graphql/com/example/target_name/kotlin/responseBased/target_name/adapter/TestQuery_VariablesAdapter.kt.expected @@ -27,7 +27,7 @@ public object TestQuery_VariablesAdapter { writer: JsonWriter, `value`: TestQuery, customScalarAdapters: CustomScalarAdapters, - withBooleanDefaultValues: Boolean, + withDefaultValues: Boolean, ) { if (value.input is Optional.Present) { writer.name("input") diff --git a/libraries/apollo-compiler/src/test/graphql/com/example/target_name/kotlin/responseBased/target_name/selections/TestQuerySelections.kt.expected b/libraries/apollo-compiler/src/test/graphql/com/example/target_name/kotlin/responseBased/target_name/selections/TestQuerySelections.kt.expected index b3dcf43794f..8f684d6eb94 100644 --- a/libraries/apollo-compiler/src/test/graphql/com/example/target_name/kotlin/responseBased/target_name/selections/TestQuerySelections.kt.expected +++ b/libraries/apollo-compiler/src/test/graphql/com/example/target_name/kotlin/responseBased/target_name/selections/TestQuerySelections.kt.expected @@ -58,7 +58,7 @@ public object TestQuerySelections { name = "object", type = renamedObject.type ).arguments(listOf( - CompiledArgument.Builder("input", CompiledVariable("input")).build() + CompiledArgument.Builder("input").value(CompiledVariable("input")).build() )) .selections(__object) .build(), @@ -76,14 +76,14 @@ public object TestQuerySelections { name = "scalar", type = renamedScalar.type ).arguments(listOf( - CompiledArgument.Builder("scalar", CompiledVariable("scalar")).build() + CompiledArgument.Builder("scalar").value(CompiledVariable("scalar")).build() )) .build(), CompiledField.Builder( name = "enum", type = renamedEnum.type ).arguments(listOf( - CompiledArgument.Builder("enum", CompiledVariable("enum")).build() + CompiledArgument.Builder("enum").value(CompiledVariable("enum")).build() )) .build() ) diff --git a/libraries/apollo-compiler/src/test/graphql/com/example/test_inline/java/operationBased/test_inline/GetPage.java.expected b/libraries/apollo-compiler/src/test/graphql/com/example/test_inline/java/operationBased/test_inline/GetPage.java.expected index f18597d09f4..a905e606d3c 100644 --- a/libraries/apollo-compiler/src/test/graphql/com/example/test_inline/java/operationBased/test_inline/GetPage.java.expected +++ b/libraries/apollo-compiler/src/test/graphql/com/example/test_inline/java/operationBased/test_inline/GetPage.java.expected @@ -108,7 +108,7 @@ public class GetPage implements Query { @Override public void serializeVariables(JsonWriter writer, CustomScalarAdapters customScalarAdapters, - boolean withBooleanDefaultValues) throws IOException { + boolean withDefaultValues) throws IOException { // This operation doesn't have any variable } diff --git a/libraries/apollo-compiler/src/test/graphql/com/example/test_inline/kotlin/operationBased/test_inline/GetPage.kt.expected b/libraries/apollo-compiler/src/test/graphql/com/example/test_inline/kotlin/operationBased/test_inline/GetPage.kt.expected index 1f9c88bb920..ff4946ecf58 100644 --- a/libraries/apollo-compiler/src/test/graphql/com/example/test_inline/kotlin/operationBased/test_inline/GetPage.kt.expected +++ b/libraries/apollo-compiler/src/test/graphql/com/example/test_inline/kotlin/operationBased/test_inline/GetPage.kt.expected @@ -35,7 +35,7 @@ public class GetPage() : Query { override fun serializeVariables( writer: JsonWriter, customScalarAdapters: CustomScalarAdapters, - withBooleanDefaultValues: Boolean, + withDefaultValues: Boolean, ) { // This operation doesn't have any variable } diff --git a/libraries/apollo-compiler/src/test/graphql/com/example/test_inline/kotlin/responseBased/test_inline/GetPage.kt.expected b/libraries/apollo-compiler/src/test/graphql/com/example/test_inline/kotlin/responseBased/test_inline/GetPage.kt.expected index fa80e960d26..fbb929b7917 100644 --- a/libraries/apollo-compiler/src/test/graphql/com/example/test_inline/kotlin/responseBased/test_inline/GetPage.kt.expected +++ b/libraries/apollo-compiler/src/test/graphql/com/example/test_inline/kotlin/responseBased/test_inline/GetPage.kt.expected @@ -36,7 +36,7 @@ public class GetPage() : Query { override fun serializeVariables( writer: JsonWriter, customScalarAdapters: CustomScalarAdapters, - withBooleanDefaultValues: Boolean, + withDefaultValues: Boolean, ) { // This operation doesn't have any variable } diff --git a/libraries/apollo-compiler/src/test/graphql/com/example/two_heroes_unique/java/operationBased/two_heroes_unique/TestQuery.java.expected b/libraries/apollo-compiler/src/test/graphql/com/example/two_heroes_unique/java/operationBased/two_heroes_unique/TestQuery.java.expected index bcf8d2785e3..ddce231153d 100644 --- a/libraries/apollo-compiler/src/test/graphql/com/example/two_heroes_unique/java/operationBased/two_heroes_unique/TestQuery.java.expected +++ b/libraries/apollo-compiler/src/test/graphql/com/example/two_heroes_unique/java/operationBased/two_heroes_unique/TestQuery.java.expected @@ -100,7 +100,7 @@ public class TestQuery implements Query { @Override public void serializeVariables(JsonWriter writer, CustomScalarAdapters customScalarAdapters, - boolean withBooleanDefaultValues) throws IOException { + boolean withDefaultValues) throws IOException { // This operation doesn't have any variable } diff --git a/libraries/apollo-compiler/src/test/graphql/com/example/two_heroes_unique/java/operationBased/two_heroes_unique/selections/TestQuerySelections.java.expected b/libraries/apollo-compiler/src/test/graphql/com/example/two_heroes_unique/java/operationBased/two_heroes_unique/selections/TestQuerySelections.java.expected index 4a15b935e5f..c9dd6694ac7 100644 --- a/libraries/apollo-compiler/src/test/graphql/com/example/two_heroes_unique/java/operationBased/two_heroes_unique/selections/TestQuerySelections.java.expected +++ b/libraries/apollo-compiler/src/test/graphql/com/example/two_heroes_unique/java/operationBased/two_heroes_unique/selections/TestQuerySelections.java.expected @@ -26,7 +26,7 @@ public class TestQuerySelections { ); public static List __root = Arrays.asList( - new CompiledField.Builder("hero", Character.type).alias("r2").selections(__hero).build(), - new CompiledField.Builder("hero", Character.type).alias("luke").arguments(Arrays.asList(new CompiledArgument.Builder("episode", "EMPIRE").build())).selections(__hero1).build() + new CompiledField.Builder("hero", Character.type).alias("r2").arguments(Arrays.asList(new CompiledArgument.Builder("episode").build(), new CompiledArgument.Builder("listOfListOfStringArgs").build())).selections(__hero).build(), + new CompiledField.Builder("hero", Character.type).alias("luke").arguments(Arrays.asList(new CompiledArgument.Builder("episode").value("EMPIRE").build(), new CompiledArgument.Builder("listOfListOfStringArgs").build())).selections(__hero1).build() ); } diff --git a/libraries/apollo-compiler/src/test/graphql/com/example/two_heroes_unique/kotlin/responseBased/two_heroes_unique/TestQuery.kt.expected b/libraries/apollo-compiler/src/test/graphql/com/example/two_heroes_unique/kotlin/responseBased/two_heroes_unique/TestQuery.kt.expected index fd3fa884ac1..da7f7e13e02 100644 --- a/libraries/apollo-compiler/src/test/graphql/com/example/two_heroes_unique/kotlin/responseBased/two_heroes_unique/TestQuery.kt.expected +++ b/libraries/apollo-compiler/src/test/graphql/com/example/two_heroes_unique/kotlin/responseBased/two_heroes_unique/TestQuery.kt.expected @@ -34,7 +34,7 @@ public class TestQuery() : Query { override fun serializeVariables( writer: JsonWriter, customScalarAdapters: CustomScalarAdapters, - withBooleanDefaultValues: Boolean, + withDefaultValues: Boolean, ) { // This operation doesn't have any variable } diff --git a/libraries/apollo-compiler/src/test/graphql/com/example/two_heroes_unique/kotlin/responseBased/two_heroes_unique/selections/TestQuerySelections.kt.expected b/libraries/apollo-compiler/src/test/graphql/com/example/two_heroes_unique/kotlin/responseBased/two_heroes_unique/selections/TestQuerySelections.kt.expected index 6826aeb3b84..20d585f59e1 100644 --- a/libraries/apollo-compiler/src/test/graphql/com/example/two_heroes_unique/kotlin/responseBased/two_heroes_unique/selections/TestQuerySelections.kt.expected +++ b/libraries/apollo-compiler/src/test/graphql/com/example/two_heroes_unique/kotlin/responseBased/two_heroes_unique/selections/TestQuerySelections.kt.expected @@ -38,6 +38,10 @@ public object TestQuerySelections { name = "hero", type = Character.type ).alias("r2") + .arguments(listOf( + CompiledArgument.Builder("episode").build(), + CompiledArgument.Builder("listOfListOfStringArgs").build() + )) .selections(__hero) .build(), CompiledField.Builder( @@ -45,7 +49,8 @@ public object TestQuerySelections { type = Character.type ).alias("luke") .arguments(listOf( - CompiledArgument.Builder("episode", "EMPIRE").build() + CompiledArgument.Builder("episode").value("EMPIRE").build(), + CompiledArgument.Builder("listOfListOfStringArgs").build() )) .selections(__hero1) .build() diff --git a/libraries/apollo-compiler/src/test/graphql/com/example/two_heroes_with_friends/java/operationBased/two_heroes_with_friends/TestQuery.java.expected b/libraries/apollo-compiler/src/test/graphql/com/example/two_heroes_with_friends/java/operationBased/two_heroes_with_friends/TestQuery.java.expected index c4d82e02eb3..067db546211 100644 --- a/libraries/apollo-compiler/src/test/graphql/com/example/two_heroes_with_friends/java/operationBased/two_heroes_with_friends/TestQuery.java.expected +++ b/libraries/apollo-compiler/src/test/graphql/com/example/two_heroes_with_friends/java/operationBased/two_heroes_with_friends/TestQuery.java.expected @@ -118,7 +118,7 @@ public class TestQuery implements Query { @Override public void serializeVariables(JsonWriter writer, CustomScalarAdapters customScalarAdapters, - boolean withBooleanDefaultValues) throws IOException { + boolean withDefaultValues) throws IOException { // This operation doesn't have any variable } diff --git a/libraries/apollo-compiler/src/test/graphql/com/example/two_heroes_with_friends/java/operationBased/two_heroes_with_friends/selections/TestQuerySelections.java.expected b/libraries/apollo-compiler/src/test/graphql/com/example/two_heroes_with_friends/java/operationBased/two_heroes_with_friends/selections/TestQuerySelections.java.expected index 2f8c215a1e0..34b16340dd5 100644 --- a/libraries/apollo-compiler/src/test/graphql/com/example/two_heroes_with_friends/java/operationBased/two_heroes_with_friends/selections/TestQuerySelections.java.expected +++ b/libraries/apollo-compiler/src/test/graphql/com/example/two_heroes_with_friends/java/operationBased/two_heroes_with_friends/selections/TestQuerySelections.java.expected @@ -35,7 +35,7 @@ public class TestQuerySelections { private static List __hero = Arrays.asList( new CompiledField.Builder("name", new CompiledNotNullType(GraphQLString.type)).build(), - new CompiledField.Builder("friendsConnection", new CompiledNotNullType(FriendsConnection.type)).selections(__friendsConnection).build() + new CompiledField.Builder("friendsConnection", new CompiledNotNullType(FriendsConnection.type)).arguments(Arrays.asList(new CompiledArgument.Builder("after").build(), new CompiledArgument.Builder("first").build())).selections(__friendsConnection).build() ); private static List __node1 = Arrays.asList( @@ -54,11 +54,11 @@ public class TestQuerySelections { private static List __hero1 = Arrays.asList( new CompiledField.Builder("id", new CompiledNotNullType(GraphQLID.type)).build(), new CompiledField.Builder("name", new CompiledNotNullType(GraphQLString.type)).build(), - new CompiledField.Builder("friendsConnection", new CompiledNotNullType(FriendsConnection.type)).selections(__friendsConnection1).build() + new CompiledField.Builder("friendsConnection", new CompiledNotNullType(FriendsConnection.type)).arguments(Arrays.asList(new CompiledArgument.Builder("after").build(), new CompiledArgument.Builder("first").build())).selections(__friendsConnection1).build() ); public static List __root = Arrays.asList( - new CompiledField.Builder("hero", Character.type).alias("r2").selections(__hero).build(), - new CompiledField.Builder("hero", Character.type).alias("luke").arguments(Arrays.asList(new CompiledArgument.Builder("episode", "EMPIRE").build())).selections(__hero1).build() + new CompiledField.Builder("hero", Character.type).alias("r2").arguments(Arrays.asList(new CompiledArgument.Builder("episode").build(), new CompiledArgument.Builder("listOfListOfStringArgs").build())).selections(__hero).build(), + new CompiledField.Builder("hero", Character.type).alias("luke").arguments(Arrays.asList(new CompiledArgument.Builder("episode").value("EMPIRE").build(), new CompiledArgument.Builder("listOfListOfStringArgs").build())).selections(__hero1).build() ); } diff --git a/libraries/apollo-compiler/src/test/graphql/com/example/two_heroes_with_friends/kotlin/responseBased/two_heroes_with_friends/TestQuery.kt.expected b/libraries/apollo-compiler/src/test/graphql/com/example/two_heroes_with_friends/kotlin/responseBased/two_heroes_with_friends/TestQuery.kt.expected index a0112ec025e..dc723bc86e9 100644 --- a/libraries/apollo-compiler/src/test/graphql/com/example/two_heroes_with_friends/kotlin/responseBased/two_heroes_with_friends/TestQuery.kt.expected +++ b/libraries/apollo-compiler/src/test/graphql/com/example/two_heroes_with_friends/kotlin/responseBased/two_heroes_with_friends/TestQuery.kt.expected @@ -35,7 +35,7 @@ public class TestQuery() : Query { override fun serializeVariables( writer: JsonWriter, customScalarAdapters: CustomScalarAdapters, - withBooleanDefaultValues: Boolean, + withDefaultValues: Boolean, ) { // This operation doesn't have any variable } diff --git a/libraries/apollo-compiler/src/test/graphql/com/example/two_heroes_with_friends/kotlin/responseBased/two_heroes_with_friends/selections/TestQuerySelections.kt.expected b/libraries/apollo-compiler/src/test/graphql/com/example/two_heroes_with_friends/kotlin/responseBased/two_heroes_with_friends/selections/TestQuerySelections.kt.expected index d6b8a0be15e..8c939e3df06 100644 --- a/libraries/apollo-compiler/src/test/graphql/com/example/two_heroes_with_friends/kotlin/responseBased/two_heroes_with_friends/selections/TestQuerySelections.kt.expected +++ b/libraries/apollo-compiler/src/test/graphql/com/example/two_heroes_with_friends/kotlin/responseBased/two_heroes_with_friends/selections/TestQuerySelections.kt.expected @@ -54,7 +54,11 @@ public object TestQuerySelections { CompiledField.Builder( name = "friendsConnection", type = FriendsConnection.type.notNull() - ).selections(__friendsConnection) + ).arguments(listOf( + CompiledArgument.Builder("after").build(), + CompiledArgument.Builder("first").build() + )) + .selections(__friendsConnection) .build() ) @@ -97,7 +101,11 @@ public object TestQuerySelections { CompiledField.Builder( name = "friendsConnection", type = FriendsConnection.type.notNull() - ).selections(__friendsConnection1) + ).arguments(listOf( + CompiledArgument.Builder("after").build(), + CompiledArgument.Builder("first").build() + )) + .selections(__friendsConnection1) .build() ) @@ -106,6 +114,10 @@ public object TestQuerySelections { name = "hero", type = Character.type ).alias("r2") + .arguments(listOf( + CompiledArgument.Builder("episode").build(), + CompiledArgument.Builder("listOfListOfStringArgs").build() + )) .selections(__hero) .build(), CompiledField.Builder( @@ -113,7 +125,8 @@ public object TestQuerySelections { type = Character.type ).alias("luke") .arguments(listOf( - CompiledArgument.Builder("episode", "EMPIRE").build() + CompiledArgument.Builder("episode").value("EMPIRE").build(), + CompiledArgument.Builder("listOfListOfStringArgs").build() )) .selections(__hero1) .build() diff --git a/libraries/apollo-compiler/src/test/graphql/com/example/typename_always_first/java/operationBased/typename_always_first/TestQuery.java.expected b/libraries/apollo-compiler/src/test/graphql/com/example/typename_always_first/java/operationBased/typename_always_first/TestQuery.java.expected index 9e05a545139..c0403060e3e 100644 --- a/libraries/apollo-compiler/src/test/graphql/com/example/typename_always_first/java/operationBased/typename_always_first/TestQuery.java.expected +++ b/libraries/apollo-compiler/src/test/graphql/com/example/typename_always_first/java/operationBased/typename_always_first/TestQuery.java.expected @@ -107,7 +107,7 @@ public class TestQuery implements Query { @Override public void serializeVariables(JsonWriter writer, CustomScalarAdapters customScalarAdapters, - boolean withBooleanDefaultValues) throws IOException { + boolean withDefaultValues) throws IOException { // This operation doesn't have any variable } diff --git a/libraries/apollo-compiler/src/test/graphql/com/example/typename_always_first/java/operationBased/typename_always_first/selections/TestQuerySelections.java.expected b/libraries/apollo-compiler/src/test/graphql/com/example/typename_always_first/java/operationBased/typename_always_first/selections/TestQuerySelections.java.expected index b3148b45612..5c96e664065 100644 --- a/libraries/apollo-compiler/src/test/graphql/com/example/typename_always_first/java/operationBased/typename_always_first/selections/TestQuerySelections.java.expected +++ b/libraries/apollo-compiler/src/test/graphql/com/example/typename_always_first/java/operationBased/typename_always_first/selections/TestQuerySelections.java.expected @@ -5,6 +5,7 @@ // package com.example.typename_always_first.selections; +import com.apollographql.apollo3.api.CompiledArgument; import com.apollographql.apollo3.api.CompiledField; import com.apollographql.apollo3.api.CompiledFragment; import com.apollographql.apollo3.api.CompiledNotNullType; @@ -17,7 +18,7 @@ import java.util.List; public class TestQuerySelections { private static List __onHuman = Arrays.asList( - new CompiledField.Builder("height", GraphQLFloat.type).build(), + new CompiledField.Builder("height", GraphQLFloat.type).arguments(Arrays.asList(new CompiledArgument.Builder("unit").value("METER").build())).build(), new CompiledField.Builder("__typename", new CompiledNotNullType(GraphQLString.type)).build() ); @@ -34,7 +35,7 @@ public class TestQuerySelections { ); public static List __root = Arrays.asList( - new CompiledField.Builder("hero", Character.type).selections(__hero).build(), + new CompiledField.Builder("hero", Character.type).arguments(Arrays.asList(new CompiledArgument.Builder("episode").build(), new CompiledArgument.Builder("listOfListOfStringArgs").build())).selections(__hero).build(), new CompiledField.Builder("__typename", new CompiledNotNullType(GraphQLString.type)).build() ); } diff --git a/libraries/apollo-compiler/src/test/graphql/com/example/typename_always_first/kotlin/operationBased/typename_always_first/TestQuery.kt.expected b/libraries/apollo-compiler/src/test/graphql/com/example/typename_always_first/kotlin/operationBased/typename_always_first/TestQuery.kt.expected index 323b428f9ab..24796fa7de5 100644 --- a/libraries/apollo-compiler/src/test/graphql/com/example/typename_always_first/kotlin/operationBased/typename_always_first/TestQuery.kt.expected +++ b/libraries/apollo-compiler/src/test/graphql/com/example/typename_always_first/kotlin/operationBased/typename_always_first/TestQuery.kt.expected @@ -35,7 +35,7 @@ public class TestQuery() : Query { override fun serializeVariables( writer: JsonWriter, customScalarAdapters: CustomScalarAdapters, - withBooleanDefaultValues: Boolean, + withDefaultValues: Boolean, ) { // This operation doesn't have any variable } diff --git a/libraries/apollo-compiler/src/test/graphql/com/example/typename_always_first/kotlin/operationBased/typename_always_first/selections/TestQuerySelections.kt.expected b/libraries/apollo-compiler/src/test/graphql/com/example/typename_always_first/kotlin/operationBased/typename_always_first/selections/TestQuerySelections.kt.expected index 47891d62009..05719275814 100644 --- a/libraries/apollo-compiler/src/test/graphql/com/example/typename_always_first/kotlin/operationBased/typename_always_first/selections/TestQuerySelections.kt.expected +++ b/libraries/apollo-compiler/src/test/graphql/com/example/typename_always_first/kotlin/operationBased/typename_always_first/selections/TestQuerySelections.kt.expected @@ -5,6 +5,7 @@ // package com.example.typename_always_first.selections +import com.apollographql.apollo3.api.CompiledArgument import com.apollographql.apollo3.api.CompiledField import com.apollographql.apollo3.api.CompiledFragment import com.apollographql.apollo3.api.CompiledSelection @@ -19,7 +20,10 @@ public object TestQuerySelections { CompiledField.Builder( name = "height", type = GraphQLFloat.type - ).build(), + ).arguments(listOf( + CompiledArgument.Builder("unit").value("METER").build() + )) + .build(), CompiledField.Builder( name = "__typename", type = GraphQLString.type.notNull() @@ -62,7 +66,11 @@ public object TestQuerySelections { CompiledField.Builder( name = "hero", type = Character.type - ).selections(__hero) + ).arguments(listOf( + CompiledArgument.Builder("episode").build(), + CompiledArgument.Builder("listOfListOfStringArgs").build() + )) + .selections(__hero) .build(), CompiledField.Builder( name = "__typename", diff --git a/libraries/apollo-compiler/src/test/graphql/com/example/typename_always_first/kotlin/responseBased/typename_always_first/TestQuery.kt.expected b/libraries/apollo-compiler/src/test/graphql/com/example/typename_always_first/kotlin/responseBased/typename_always_first/TestQuery.kt.expected index 30a3d1eb12a..d2b615c100f 100644 --- a/libraries/apollo-compiler/src/test/graphql/com/example/typename_always_first/kotlin/responseBased/typename_always_first/TestQuery.kt.expected +++ b/libraries/apollo-compiler/src/test/graphql/com/example/typename_always_first/kotlin/responseBased/typename_always_first/TestQuery.kt.expected @@ -36,7 +36,7 @@ public class TestQuery() : Query { override fun serializeVariables( writer: JsonWriter, customScalarAdapters: CustomScalarAdapters, - withBooleanDefaultValues: Boolean, + withDefaultValues: Boolean, ) { // This operation doesn't have any variable } diff --git a/libraries/apollo-compiler/src/test/graphql/com/example/typename_always_first/kotlin/responseBased/typename_always_first/selections/TestQuerySelections.kt.expected b/libraries/apollo-compiler/src/test/graphql/com/example/typename_always_first/kotlin/responseBased/typename_always_first/selections/TestQuerySelections.kt.expected index 47891d62009..05719275814 100644 --- a/libraries/apollo-compiler/src/test/graphql/com/example/typename_always_first/kotlin/responseBased/typename_always_first/selections/TestQuerySelections.kt.expected +++ b/libraries/apollo-compiler/src/test/graphql/com/example/typename_always_first/kotlin/responseBased/typename_always_first/selections/TestQuerySelections.kt.expected @@ -5,6 +5,7 @@ // package com.example.typename_always_first.selections +import com.apollographql.apollo3.api.CompiledArgument import com.apollographql.apollo3.api.CompiledField import com.apollographql.apollo3.api.CompiledFragment import com.apollographql.apollo3.api.CompiledSelection @@ -19,7 +20,10 @@ public object TestQuerySelections { CompiledField.Builder( name = "height", type = GraphQLFloat.type - ).build(), + ).arguments(listOf( + CompiledArgument.Builder("unit").value("METER").build() + )) + .build(), CompiledField.Builder( name = "__typename", type = GraphQLString.type.notNull() @@ -62,7 +66,11 @@ public object TestQuerySelections { CompiledField.Builder( name = "hero", type = Character.type - ).selections(__hero) + ).arguments(listOf( + CompiledArgument.Builder("episode").build(), + CompiledArgument.Builder("listOfListOfStringArgs").build() + )) + .selections(__hero) .build(), CompiledField.Builder( name = "__typename", diff --git a/libraries/apollo-compiler/src/test/graphql/com/example/union_fragment/java/operationBased/union_fragment/TestQuery.java.expected b/libraries/apollo-compiler/src/test/graphql/com/example/union_fragment/java/operationBased/union_fragment/TestQuery.java.expected index d773ffa2916..49a00180c83 100644 --- a/libraries/apollo-compiler/src/test/graphql/com/example/union_fragment/java/operationBased/union_fragment/TestQuery.java.expected +++ b/libraries/apollo-compiler/src/test/graphql/com/example/union_fragment/java/operationBased/union_fragment/TestQuery.java.expected @@ -106,7 +106,7 @@ public class TestQuery implements Query { @Override public void serializeVariables(JsonWriter writer, CustomScalarAdapters customScalarAdapters, - boolean withBooleanDefaultValues) throws IOException { + boolean withDefaultValues) throws IOException { // This operation doesn't have any variable } diff --git a/libraries/apollo-compiler/src/test/graphql/com/example/union_fragment/java/operationBased/union_fragment/fragment/StarshipImpl.java.expected b/libraries/apollo-compiler/src/test/graphql/com/example/union_fragment/java/operationBased/union_fragment/fragment/StarshipImpl.java.expected index cb892ea923e..0b8a95a413b 100644 --- a/libraries/apollo-compiler/src/test/graphql/com/example/union_fragment/java/operationBased/union_fragment/fragment/StarshipImpl.java.expected +++ b/libraries/apollo-compiler/src/test/graphql/com/example/union_fragment/java/operationBased/union_fragment/fragment/StarshipImpl.java.expected @@ -60,7 +60,7 @@ public class StarshipImpl implements Fragment { @Override public void serializeVariables(JsonWriter writer, CustomScalarAdapters customScalarAdapters, - boolean withBooleanDefaultValues) throws IOException { + boolean withDefaultValues) throws IOException { // This fragment doesn't have any variable } diff --git a/libraries/apollo-compiler/src/test/graphql/com/example/union_fragment/java/operationBased/union_fragment/selections/TestQuerySelections.java.expected b/libraries/apollo-compiler/src/test/graphql/com/example/union_fragment/java/operationBased/union_fragment/selections/TestQuerySelections.java.expected index f64b11c80b0..268fd08affe 100644 --- a/libraries/apollo-compiler/src/test/graphql/com/example/union_fragment/java/operationBased/union_fragment/selections/TestQuerySelections.java.expected +++ b/libraries/apollo-compiler/src/test/graphql/com/example/union_fragment/java/operationBased/union_fragment/selections/TestQuerySelections.java.expected @@ -30,6 +30,6 @@ public class TestQuerySelections { ); public static List __root = Arrays.asList( - new CompiledField.Builder("search", new CompiledListType(SearchResult.type)).arguments(Arrays.asList(new CompiledArgument.Builder("text", "test").build())).selections(__search).build() + new CompiledField.Builder("search", new CompiledListType(SearchResult.type)).arguments(Arrays.asList(new CompiledArgument.Builder("text").value("test").build())).selections(__search).build() ); } diff --git a/libraries/apollo-compiler/src/test/graphql/com/example/union_fragment/kotlin/operationBased/union_fragment/TestQuery.kt.expected b/libraries/apollo-compiler/src/test/graphql/com/example/union_fragment/kotlin/operationBased/union_fragment/TestQuery.kt.expected index 61aa5147d50..e9216fe0cfa 100644 --- a/libraries/apollo-compiler/src/test/graphql/com/example/union_fragment/kotlin/operationBased/union_fragment/TestQuery.kt.expected +++ b/libraries/apollo-compiler/src/test/graphql/com/example/union_fragment/kotlin/operationBased/union_fragment/TestQuery.kt.expected @@ -36,7 +36,7 @@ public class TestQuery() : Query { override fun serializeVariables( writer: JsonWriter, customScalarAdapters: CustomScalarAdapters, - withBooleanDefaultValues: Boolean, + withDefaultValues: Boolean, ) { // This operation doesn't have any variable } diff --git a/libraries/apollo-compiler/src/test/graphql/com/example/union_fragment/kotlin/operationBased/union_fragment/fragment/StarshipImpl.kt.expected b/libraries/apollo-compiler/src/test/graphql/com/example/union_fragment/kotlin/operationBased/union_fragment/fragment/StarshipImpl.kt.expected index 406cdccaffe..3db46b4c6ef 100644 --- a/libraries/apollo-compiler/src/test/graphql/com/example/union_fragment/kotlin/operationBased/union_fragment/fragment/StarshipImpl.kt.expected +++ b/libraries/apollo-compiler/src/test/graphql/com/example/union_fragment/kotlin/operationBased/union_fragment/fragment/StarshipImpl.kt.expected @@ -24,7 +24,7 @@ public class StarshipImpl() : Fragment { override fun serializeVariables( writer: JsonWriter, customScalarAdapters: CustomScalarAdapters, - withBooleanDefaultValues: Boolean, + withDefaultValues: Boolean, ) { // This fragment doesn't have any variable } diff --git a/libraries/apollo-compiler/src/test/graphql/com/example/union_fragment/kotlin/operationBased/union_fragment/selections/TestQuerySelections.kt.expected b/libraries/apollo-compiler/src/test/graphql/com/example/union_fragment/kotlin/operationBased/union_fragment/selections/TestQuerySelections.kt.expected index 23bdb7a3351..5f266f96cee 100644 --- a/libraries/apollo-compiler/src/test/graphql/com/example/union_fragment/kotlin/operationBased/union_fragment/selections/TestQuerySelections.kt.expected +++ b/libraries/apollo-compiler/src/test/graphql/com/example/union_fragment/kotlin/operationBased/union_fragment/selections/TestQuerySelections.kt.expected @@ -47,7 +47,7 @@ public object TestQuerySelections { name = "search", type = SearchResult.type.list() ).arguments(listOf( - CompiledArgument.Builder("text", "test").build() + CompiledArgument.Builder("text").value("test").build() )) .selections(__search) .build() diff --git a/libraries/apollo-compiler/src/test/graphql/com/example/union_fragment/kotlin/responseBased/union_fragment/TestQuery.kt.expected b/libraries/apollo-compiler/src/test/graphql/com/example/union_fragment/kotlin/responseBased/union_fragment/TestQuery.kt.expected index a07cdb0a129..bf642f891f6 100644 --- a/libraries/apollo-compiler/src/test/graphql/com/example/union_fragment/kotlin/responseBased/union_fragment/TestQuery.kt.expected +++ b/libraries/apollo-compiler/src/test/graphql/com/example/union_fragment/kotlin/responseBased/union_fragment/TestQuery.kt.expected @@ -37,7 +37,7 @@ public class TestQuery() : Query { override fun serializeVariables( writer: JsonWriter, customScalarAdapters: CustomScalarAdapters, - withBooleanDefaultValues: Boolean, + withDefaultValues: Boolean, ) { // This operation doesn't have any variable } diff --git a/libraries/apollo-compiler/src/test/graphql/com/example/union_fragment/kotlin/responseBased/union_fragment/fragment/StarshipImpl.kt.expected b/libraries/apollo-compiler/src/test/graphql/com/example/union_fragment/kotlin/responseBased/union_fragment/fragment/StarshipImpl.kt.expected index ae33149d884..3205d1b5c5c 100644 --- a/libraries/apollo-compiler/src/test/graphql/com/example/union_fragment/kotlin/responseBased/union_fragment/fragment/StarshipImpl.kt.expected +++ b/libraries/apollo-compiler/src/test/graphql/com/example/union_fragment/kotlin/responseBased/union_fragment/fragment/StarshipImpl.kt.expected @@ -25,7 +25,7 @@ public class StarshipImpl() : Fragment { override fun serializeVariables( writer: JsonWriter, customScalarAdapters: CustomScalarAdapters, - withBooleanDefaultValues: Boolean, + withDefaultValues: Boolean, ) { // This fragment doesn't have any variable } diff --git a/libraries/apollo-compiler/src/test/graphql/com/example/union_fragment/kotlin/responseBased/union_fragment/selections/TestQuerySelections.kt.expected b/libraries/apollo-compiler/src/test/graphql/com/example/union_fragment/kotlin/responseBased/union_fragment/selections/TestQuerySelections.kt.expected index 23bdb7a3351..5f266f96cee 100644 --- a/libraries/apollo-compiler/src/test/graphql/com/example/union_fragment/kotlin/responseBased/union_fragment/selections/TestQuerySelections.kt.expected +++ b/libraries/apollo-compiler/src/test/graphql/com/example/union_fragment/kotlin/responseBased/union_fragment/selections/TestQuerySelections.kt.expected @@ -47,7 +47,7 @@ public object TestQuerySelections { name = "search", type = SearchResult.type.list() ).arguments(listOf( - CompiledArgument.Builder("text", "test").build() + CompiledArgument.Builder("text").value("test").build() )) .selections(__search) .build() diff --git a/libraries/apollo-compiler/src/test/graphql/com/example/union_inline_fragments/java/operationBased/union_inline_fragments/TestQuery.java.expected b/libraries/apollo-compiler/src/test/graphql/com/example/union_inline_fragments/java/operationBased/union_inline_fragments/TestQuery.java.expected index 2e4e522e3f8..b6055a166d5 100644 --- a/libraries/apollo-compiler/src/test/graphql/com/example/union_inline_fragments/java/operationBased/union_inline_fragments/TestQuery.java.expected +++ b/libraries/apollo-compiler/src/test/graphql/com/example/union_inline_fragments/java/operationBased/union_inline_fragments/TestQuery.java.expected @@ -126,7 +126,7 @@ public class TestQuery implements Query { @Override public void serializeVariables(JsonWriter writer, CustomScalarAdapters customScalarAdapters, - boolean withBooleanDefaultValues) throws IOException { + boolean withDefaultValues) throws IOException { // This operation doesn't have any variable } diff --git a/libraries/apollo-compiler/src/test/graphql/com/example/union_inline_fragments/java/operationBased/union_inline_fragments/selections/TestQuerySelections.java.expected b/libraries/apollo-compiler/src/test/graphql/com/example/union_inline_fragments/java/operationBased/union_inline_fragments/selections/TestQuerySelections.java.expected index fac593e7e6f..e6f161caa26 100644 --- a/libraries/apollo-compiler/src/test/graphql/com/example/union_inline_fragments/java/operationBased/union_inline_fragments/selections/TestQuerySelections.java.expected +++ b/libraries/apollo-compiler/src/test/graphql/com/example/union_inline_fragments/java/operationBased/union_inline_fragments/selections/TestQuerySelections.java.expected @@ -71,6 +71,6 @@ public class TestQuerySelections { ); public static List __root = Arrays.asList( - new CompiledField.Builder("search", new CompiledListType(SearchResult.type)).arguments(Arrays.asList(new CompiledArgument.Builder("text", "test").build())).selections(__search).build() + new CompiledField.Builder("search", new CompiledListType(SearchResult.type)).arguments(Arrays.asList(new CompiledArgument.Builder("text").value("test").build())).selections(__search).build() ); } diff --git a/libraries/apollo-compiler/src/test/graphql/com/example/union_inline_fragments/kotlin/operationBased/union_inline_fragments/TestQuery.kt.expected b/libraries/apollo-compiler/src/test/graphql/com/example/union_inline_fragments/kotlin/operationBased/union_inline_fragments/TestQuery.kt.expected index 99246f7f7c2..ed9d94acc1f 100644 --- a/libraries/apollo-compiler/src/test/graphql/com/example/union_inline_fragments/kotlin/operationBased/union_inline_fragments/TestQuery.kt.expected +++ b/libraries/apollo-compiler/src/test/graphql/com/example/union_inline_fragments/kotlin/operationBased/union_inline_fragments/TestQuery.kt.expected @@ -36,7 +36,7 @@ public class TestQuery() : Query { override fun serializeVariables( writer: JsonWriter, customScalarAdapters: CustomScalarAdapters, - withBooleanDefaultValues: Boolean, + withDefaultValues: Boolean, ) { // This operation doesn't have any variable } diff --git a/libraries/apollo-compiler/src/test/graphql/com/example/union_inline_fragments/kotlin/operationBased/union_inline_fragments/selections/TestQuerySelections.kt.expected b/libraries/apollo-compiler/src/test/graphql/com/example/union_inline_fragments/kotlin/operationBased/union_inline_fragments/selections/TestQuerySelections.kt.expected index 3c445e16136..7fb3281c743 100644 --- a/libraries/apollo-compiler/src/test/graphql/com/example/union_inline_fragments/kotlin/operationBased/union_inline_fragments/selections/TestQuerySelections.kt.expected +++ b/libraries/apollo-compiler/src/test/graphql/com/example/union_inline_fragments/kotlin/operationBased/union_inline_fragments/selections/TestQuerySelections.kt.expected @@ -143,7 +143,7 @@ public object TestQuerySelections { name = "search", type = SearchResult.type.list() ).arguments(listOf( - CompiledArgument.Builder("text", "test").build() + CompiledArgument.Builder("text").value("test").build() )) .selections(__search) .build() diff --git a/libraries/apollo-compiler/src/test/graphql/com/example/union_inline_fragments/kotlin/responseBased/union_inline_fragments/TestQuery.kt.expected b/libraries/apollo-compiler/src/test/graphql/com/example/union_inline_fragments/kotlin/responseBased/union_inline_fragments/TestQuery.kt.expected index 1168938604b..4cc9d463d37 100644 --- a/libraries/apollo-compiler/src/test/graphql/com/example/union_inline_fragments/kotlin/responseBased/union_inline_fragments/TestQuery.kt.expected +++ b/libraries/apollo-compiler/src/test/graphql/com/example/union_inline_fragments/kotlin/responseBased/union_inline_fragments/TestQuery.kt.expected @@ -37,7 +37,7 @@ public class TestQuery() : Query { override fun serializeVariables( writer: JsonWriter, customScalarAdapters: CustomScalarAdapters, - withBooleanDefaultValues: Boolean, + withDefaultValues: Boolean, ) { // This operation doesn't have any variable } diff --git a/libraries/apollo-compiler/src/test/graphql/com/example/union_inline_fragments/kotlin/responseBased/union_inline_fragments/selections/TestQuerySelections.kt.expected b/libraries/apollo-compiler/src/test/graphql/com/example/union_inline_fragments/kotlin/responseBased/union_inline_fragments/selections/TestQuerySelections.kt.expected index 3c445e16136..7fb3281c743 100644 --- a/libraries/apollo-compiler/src/test/graphql/com/example/union_inline_fragments/kotlin/responseBased/union_inline_fragments/selections/TestQuerySelections.kt.expected +++ b/libraries/apollo-compiler/src/test/graphql/com/example/union_inline_fragments/kotlin/responseBased/union_inline_fragments/selections/TestQuerySelections.kt.expected @@ -143,7 +143,7 @@ public object TestQuerySelections { name = "search", type = SearchResult.type.list() ).arguments(listOf( - CompiledArgument.Builder("text", "test").build() + CompiledArgument.Builder("text").value("test").build() )) .selections(__search) .build() diff --git a/libraries/apollo-compiler/src/test/graphql/com/example/unique_type_name/java/operationBased/unique_type_name/HeroDetailQuery.java.expected b/libraries/apollo-compiler/src/test/graphql/com/example/unique_type_name/java/operationBased/unique_type_name/HeroDetailQuery.java.expected index 8a0a22b18df..06a1cbf44ee 100644 --- a/libraries/apollo-compiler/src/test/graphql/com/example/unique_type_name/java/operationBased/unique_type_name/HeroDetailQuery.java.expected +++ b/libraries/apollo-compiler/src/test/graphql/com/example/unique_type_name/java/operationBased/unique_type_name/HeroDetailQuery.java.expected @@ -126,7 +126,7 @@ public class HeroDetailQuery implements Query { @Override public void serializeVariables(JsonWriter writer, CustomScalarAdapters customScalarAdapters, - boolean withBooleanDefaultValues) throws IOException { + boolean withDefaultValues) throws IOException { // This operation doesn't have any variable } diff --git a/libraries/apollo-compiler/src/test/graphql/com/example/unique_type_name/java/operationBased/unique_type_name/fragment/HeroDetailsImpl.java.expected b/libraries/apollo-compiler/src/test/graphql/com/example/unique_type_name/java/operationBased/unique_type_name/fragment/HeroDetailsImpl.java.expected index d241c4d5c2c..e4d386319a6 100644 --- a/libraries/apollo-compiler/src/test/graphql/com/example/unique_type_name/java/operationBased/unique_type_name/fragment/HeroDetailsImpl.java.expected +++ b/libraries/apollo-compiler/src/test/graphql/com/example/unique_type_name/java/operationBased/unique_type_name/fragment/HeroDetailsImpl.java.expected @@ -61,7 +61,7 @@ public class HeroDetailsImpl implements Fragment { @Override public void serializeVariables(JsonWriter writer, CustomScalarAdapters customScalarAdapters, - boolean withBooleanDefaultValues) throws IOException { + boolean withDefaultValues) throws IOException { // This fragment doesn't have any variable } diff --git a/libraries/apollo-compiler/src/test/graphql/com/example/unique_type_name/java/operationBased/unique_type_name/fragment/selections/HeroDetailsSelections.java.expected b/libraries/apollo-compiler/src/test/graphql/com/example/unique_type_name/java/operationBased/unique_type_name/fragment/selections/HeroDetailsSelections.java.expected index dc0e8364291..3e8f402930c 100644 --- a/libraries/apollo-compiler/src/test/graphql/com/example/unique_type_name/java/operationBased/unique_type_name/fragment/selections/HeroDetailsSelections.java.expected +++ b/libraries/apollo-compiler/src/test/graphql/com/example/unique_type_name/java/operationBased/unique_type_name/fragment/selections/HeroDetailsSelections.java.expected @@ -5,6 +5,7 @@ // package com.example.unique_type_name.fragment.selections; +import com.apollographql.apollo3.api.CompiledArgument; import com.apollographql.apollo3.api.CompiledField; import com.apollographql.apollo3.api.CompiledListType; import com.apollographql.apollo3.api.CompiledNotNullType; @@ -33,6 +34,6 @@ public class HeroDetailsSelections { public static List __root = Arrays.asList( new CompiledField.Builder("name", new CompiledNotNullType(GraphQLString.type)).build(), - new CompiledField.Builder("friendsConnection", new CompiledNotNullType(FriendsConnection.type)).selections(__friendsConnection).build() + new CompiledField.Builder("friendsConnection", new CompiledNotNullType(FriendsConnection.type)).arguments(Arrays.asList(new CompiledArgument.Builder("after").build(), new CompiledArgument.Builder("first").build())).selections(__friendsConnection).build() ); } diff --git a/libraries/apollo-compiler/src/test/graphql/com/example/unique_type_name/java/operationBased/unique_type_name/selections/HeroDetailQuerySelections.java.expected b/libraries/apollo-compiler/src/test/graphql/com/example/unique_type_name/java/operationBased/unique_type_name/selections/HeroDetailQuerySelections.java.expected index fb8d6a35bb1..d6b78ebe195 100644 --- a/libraries/apollo-compiler/src/test/graphql/com/example/unique_type_name/java/operationBased/unique_type_name/selections/HeroDetailQuerySelections.java.expected +++ b/libraries/apollo-compiler/src/test/graphql/com/example/unique_type_name/java/operationBased/unique_type_name/selections/HeroDetailQuerySelections.java.expected @@ -5,6 +5,7 @@ // package com.example.unique_type_name.selections; +import com.apollographql.apollo3.api.CompiledArgument; import com.apollographql.apollo3.api.CompiledField; import com.apollographql.apollo3.api.CompiledFragment; import com.apollographql.apollo3.api.CompiledListType; @@ -34,7 +35,7 @@ public class HeroDetailQuerySelections { ); private static List __onHuman = Arrays.asList( - new CompiledField.Builder("height", GraphQLFloat.type).build(), + new CompiledField.Builder("height", GraphQLFloat.type).arguments(Arrays.asList(new CompiledArgument.Builder("unit").value("METER").build())).build(), new CompiledField.Builder("friends", new CompiledListType(Character.type)).selections(__friends1).build() ); diff --git a/libraries/apollo-compiler/src/test/graphql/com/example/unique_type_name/kotlin/operationBased/unique_type_name/HeroDetailQuery.kt.expected b/libraries/apollo-compiler/src/test/graphql/com/example/unique_type_name/kotlin/operationBased/unique_type_name/HeroDetailQuery.kt.expected index ca9e6df8798..7112dacf692 100644 --- a/libraries/apollo-compiler/src/test/graphql/com/example/unique_type_name/kotlin/operationBased/unique_type_name/HeroDetailQuery.kt.expected +++ b/libraries/apollo-compiler/src/test/graphql/com/example/unique_type_name/kotlin/operationBased/unique_type_name/HeroDetailQuery.kt.expected @@ -38,7 +38,7 @@ public class HeroDetailQuery() : Query { override fun serializeVariables( writer: JsonWriter, customScalarAdapters: CustomScalarAdapters, - withBooleanDefaultValues: Boolean, + withDefaultValues: Boolean, ) { // This operation doesn't have any variable } diff --git a/libraries/apollo-compiler/src/test/graphql/com/example/unique_type_name/kotlin/operationBased/unique_type_name/fragment/HeroDetailsImpl.kt.expected b/libraries/apollo-compiler/src/test/graphql/com/example/unique_type_name/kotlin/operationBased/unique_type_name/fragment/HeroDetailsImpl.kt.expected index e672c38bfc2..2307edfac3d 100644 --- a/libraries/apollo-compiler/src/test/graphql/com/example/unique_type_name/kotlin/operationBased/unique_type_name/fragment/HeroDetailsImpl.kt.expected +++ b/libraries/apollo-compiler/src/test/graphql/com/example/unique_type_name/kotlin/operationBased/unique_type_name/fragment/HeroDetailsImpl.kt.expected @@ -25,7 +25,7 @@ public class HeroDetailsImpl() : Fragment { override fun serializeVariables( writer: JsonWriter, customScalarAdapters: CustomScalarAdapters, - withBooleanDefaultValues: Boolean, + withDefaultValues: Boolean, ) { // This fragment doesn't have any variable } diff --git a/libraries/apollo-compiler/src/test/graphql/com/example/unique_type_name/kotlin/operationBased/unique_type_name/fragment/selections/HeroDetailsSelections.kt.expected b/libraries/apollo-compiler/src/test/graphql/com/example/unique_type_name/kotlin/operationBased/unique_type_name/fragment/selections/HeroDetailsSelections.kt.expected index 6969834d7b6..b5d5907442b 100644 --- a/libraries/apollo-compiler/src/test/graphql/com/example/unique_type_name/kotlin/operationBased/unique_type_name/fragment/selections/HeroDetailsSelections.kt.expected +++ b/libraries/apollo-compiler/src/test/graphql/com/example/unique_type_name/kotlin/operationBased/unique_type_name/fragment/selections/HeroDetailsSelections.kt.expected @@ -5,6 +5,7 @@ // package com.example.unique_type_name.fragment.selections +import com.apollographql.apollo3.api.CompiledArgument import com.apollographql.apollo3.api.CompiledField import com.apollographql.apollo3.api.CompiledSelection import com.apollographql.apollo3.api.list @@ -52,7 +53,11 @@ public object HeroDetailsSelections { CompiledField.Builder( name = "friendsConnection", type = FriendsConnection.type.notNull() - ).selections(__friendsConnection) + ).arguments(listOf( + CompiledArgument.Builder("after").build(), + CompiledArgument.Builder("first").build() + )) + .selections(__friendsConnection) .build() ) } diff --git a/libraries/apollo-compiler/src/test/graphql/com/example/unique_type_name/kotlin/operationBased/unique_type_name/selections/HeroDetailQuerySelections.kt.expected b/libraries/apollo-compiler/src/test/graphql/com/example/unique_type_name/kotlin/operationBased/unique_type_name/selections/HeroDetailQuerySelections.kt.expected index dbe1dc54e26..4b3c1d139f1 100644 --- a/libraries/apollo-compiler/src/test/graphql/com/example/unique_type_name/kotlin/operationBased/unique_type_name/selections/HeroDetailQuerySelections.kt.expected +++ b/libraries/apollo-compiler/src/test/graphql/com/example/unique_type_name/kotlin/operationBased/unique_type_name/selections/HeroDetailQuerySelections.kt.expected @@ -5,6 +5,7 @@ // package com.example.unique_type_name.selections +import com.apollographql.apollo3.api.CompiledArgument import com.apollographql.apollo3.api.CompiledField import com.apollographql.apollo3.api.CompiledFragment import com.apollographql.apollo3.api.CompiledSelection @@ -53,7 +54,10 @@ public object HeroDetailQuerySelections { CompiledField.Builder( name = "height", type = GraphQLFloat.type - ).build(), + ).arguments(listOf( + CompiledArgument.Builder("unit").value("METER").build() + )) + .build(), CompiledField.Builder( name = "friends", type = Character.type.list() diff --git a/libraries/apollo-compiler/src/test/graphql/com/example/unique_type_name/kotlin/responseBased/unique_type_name/HeroDetailQuery.kt.expected b/libraries/apollo-compiler/src/test/graphql/com/example/unique_type_name/kotlin/responseBased/unique_type_name/HeroDetailQuery.kt.expected index c5646c78494..783747f459d 100644 --- a/libraries/apollo-compiler/src/test/graphql/com/example/unique_type_name/kotlin/responseBased/unique_type_name/HeroDetailQuery.kt.expected +++ b/libraries/apollo-compiler/src/test/graphql/com/example/unique_type_name/kotlin/responseBased/unique_type_name/HeroDetailQuery.kt.expected @@ -39,7 +39,7 @@ public class HeroDetailQuery() : Query { override fun serializeVariables( writer: JsonWriter, customScalarAdapters: CustomScalarAdapters, - withBooleanDefaultValues: Boolean, + withDefaultValues: Boolean, ) { // This operation doesn't have any variable } diff --git a/libraries/apollo-compiler/src/test/graphql/com/example/unique_type_name/kotlin/responseBased/unique_type_name/fragment/HeroDetailsImpl.kt.expected b/libraries/apollo-compiler/src/test/graphql/com/example/unique_type_name/kotlin/responseBased/unique_type_name/fragment/HeroDetailsImpl.kt.expected index 912d97e253b..ce102809607 100644 --- a/libraries/apollo-compiler/src/test/graphql/com/example/unique_type_name/kotlin/responseBased/unique_type_name/fragment/HeroDetailsImpl.kt.expected +++ b/libraries/apollo-compiler/src/test/graphql/com/example/unique_type_name/kotlin/responseBased/unique_type_name/fragment/HeroDetailsImpl.kt.expected @@ -27,7 +27,7 @@ public class HeroDetailsImpl() : Fragment { override fun serializeVariables( writer: JsonWriter, customScalarAdapters: CustomScalarAdapters, - withBooleanDefaultValues: Boolean, + withDefaultValues: Boolean, ) { // This fragment doesn't have any variable } diff --git a/libraries/apollo-compiler/src/test/graphql/com/example/unique_type_name/kotlin/responseBased/unique_type_name/fragment/selections/HeroDetailsSelections.kt.expected b/libraries/apollo-compiler/src/test/graphql/com/example/unique_type_name/kotlin/responseBased/unique_type_name/fragment/selections/HeroDetailsSelections.kt.expected index 6969834d7b6..b5d5907442b 100644 --- a/libraries/apollo-compiler/src/test/graphql/com/example/unique_type_name/kotlin/responseBased/unique_type_name/fragment/selections/HeroDetailsSelections.kt.expected +++ b/libraries/apollo-compiler/src/test/graphql/com/example/unique_type_name/kotlin/responseBased/unique_type_name/fragment/selections/HeroDetailsSelections.kt.expected @@ -5,6 +5,7 @@ // package com.example.unique_type_name.fragment.selections +import com.apollographql.apollo3.api.CompiledArgument import com.apollographql.apollo3.api.CompiledField import com.apollographql.apollo3.api.CompiledSelection import com.apollographql.apollo3.api.list @@ -52,7 +53,11 @@ public object HeroDetailsSelections { CompiledField.Builder( name = "friendsConnection", type = FriendsConnection.type.notNull() - ).selections(__friendsConnection) + ).arguments(listOf( + CompiledArgument.Builder("after").build(), + CompiledArgument.Builder("first").build() + )) + .selections(__friendsConnection) .build() ) } diff --git a/libraries/apollo-compiler/src/test/graphql/com/example/unique_type_name/kotlin/responseBased/unique_type_name/selections/HeroDetailQuerySelections.kt.expected b/libraries/apollo-compiler/src/test/graphql/com/example/unique_type_name/kotlin/responseBased/unique_type_name/selections/HeroDetailQuerySelections.kt.expected index dbe1dc54e26..4b3c1d139f1 100644 --- a/libraries/apollo-compiler/src/test/graphql/com/example/unique_type_name/kotlin/responseBased/unique_type_name/selections/HeroDetailQuerySelections.kt.expected +++ b/libraries/apollo-compiler/src/test/graphql/com/example/unique_type_name/kotlin/responseBased/unique_type_name/selections/HeroDetailQuerySelections.kt.expected @@ -5,6 +5,7 @@ // package com.example.unique_type_name.selections +import com.apollographql.apollo3.api.CompiledArgument import com.apollographql.apollo3.api.CompiledField import com.apollographql.apollo3.api.CompiledFragment import com.apollographql.apollo3.api.CompiledSelection @@ -53,7 +54,10 @@ public object HeroDetailQuerySelections { CompiledField.Builder( name = "height", type = GraphQLFloat.type - ).build(), + ).arguments(listOf( + CompiledArgument.Builder("unit").value("METER").build() + )) + .build(), CompiledField.Builder( name = "friends", type = Character.type.list() diff --git a/libraries/apollo-compiler/src/test/graphql/com/example/variable_default_value/java/operationBased/variable_default_value/TestQuery.java.expected b/libraries/apollo-compiler/src/test/graphql/com/example/variable_default_value/java/operationBased/variable_default_value/TestQuery.java.expected index 5bc369a4cf9..563e7b6ac8c 100644 --- a/libraries/apollo-compiler/src/test/graphql/com/example/variable_default_value/java/operationBased/variable_default_value/TestQuery.java.expected +++ b/libraries/apollo-compiler/src/test/graphql/com/example/variable_default_value/java/operationBased/variable_default_value/TestQuery.java.expected @@ -105,8 +105,8 @@ public class TestQuery implements Query { @Override public void serializeVariables(JsonWriter writer, CustomScalarAdapters customScalarAdapters, - boolean withBooleanDefaultValues) throws IOException { - TestQuery_VariablesAdapter.INSTANCE.serializeVariables(writer, this, customScalarAdapters, withBooleanDefaultValues); + boolean withDefaultValues) throws IOException { + TestQuery_VariablesAdapter.INSTANCE.serializeVariables(writer, this, customScalarAdapters, withDefaultValues); } @Override diff --git a/libraries/apollo-compiler/src/test/graphql/com/example/variable_default_value/java/operationBased/variable_default_value/adapter/TestQuery_VariablesAdapter.java.expected b/libraries/apollo-compiler/src/test/graphql/com/example/variable_default_value/java/operationBased/variable_default_value/adapter/TestQuery_VariablesAdapter.java.expected index a8caf66a60b..f71a9efd220 100644 --- a/libraries/apollo-compiler/src/test/graphql/com/example/variable_default_value/java/operationBased/variable_default_value/adapter/TestQuery_VariablesAdapter.java.expected +++ b/libraries/apollo-compiler/src/test/graphql/com/example/variable_default_value/java/operationBased/variable_default_value/adapter/TestQuery_VariablesAdapter.java.expected @@ -5,6 +5,7 @@ // package com.example.variable_default_value.adapter; +import com.apollographql.apollo3.api.Adapters; import com.apollographql.apollo3.api.ApolloOptionalAdapter; import com.apollographql.apollo3.api.CompositeAdapterContext; import com.apollographql.apollo3.api.CustomScalarAdapters; @@ -18,12 +19,15 @@ public enum TestQuery_VariablesAdapter { INSTANCE; public void serializeVariables(JsonWriter writer, TestQuery value, - CustomScalarAdapters customScalarAdapters, boolean withBooleanDefaultValues) throws - IOException { + CustomScalarAdapters customScalarAdapters, boolean withDefaultValues) throws IOException { CompositeAdapterContext adapterContext = new CompositeAdapterContext.Builder().customScalarAdapters(customScalarAdapters).build(); if (value.episode instanceof Optional.Present) { writer.name("episode"); new ApolloOptionalAdapter<>(Episode_ResponseAdapter.INSTANCE).toJson(writer, CustomScalarAdapters.Empty, value.episode); } + else if (withDefaultValues) { + writer.name("episode"); + Adapters.NullableAnyAdapter.toJson(writer, CustomScalarAdapters.Empty, "JEDI"); + } } } diff --git a/libraries/apollo-compiler/src/test/graphql/com/example/variable_default_value/java/operationBased/variable_default_value/selections/TestQuerySelections.java.expected b/libraries/apollo-compiler/src/test/graphql/com/example/variable_default_value/java/operationBased/variable_default_value/selections/TestQuerySelections.java.expected index 18f27e836ed..c710b27fbdb 100644 --- a/libraries/apollo-compiler/src/test/graphql/com/example/variable_default_value/java/operationBased/variable_default_value/selections/TestQuerySelections.java.expected +++ b/libraries/apollo-compiler/src/test/graphql/com/example/variable_default_value/java/operationBased/variable_default_value/selections/TestQuerySelections.java.expected @@ -21,6 +21,6 @@ public class TestQuerySelections { ); public static List __root = Arrays.asList( - new CompiledField.Builder("hero", Character.type).arguments(Arrays.asList(new CompiledArgument.Builder("episode", new CompiledVariable("episode")).build())).selections(__hero).build() + new CompiledField.Builder("hero", Character.type).arguments(Arrays.asList(new CompiledArgument.Builder("episode").value(new CompiledVariable("episode")).build(), new CompiledArgument.Builder("listOfListOfStringArgs").build())).selections(__hero).build() ); } diff --git a/libraries/apollo-compiler/src/test/graphql/com/example/variable_default_value/kotlin/responseBased/variable_default_value/TestQuery.kt.expected b/libraries/apollo-compiler/src/test/graphql/com/example/variable_default_value/kotlin/responseBased/variable_default_value/TestQuery.kt.expected index 7cce42cd827..f6c047d4dff 100644 --- a/libraries/apollo-compiler/src/test/graphql/com/example/variable_default_value/kotlin/responseBased/variable_default_value/TestQuery.kt.expected +++ b/libraries/apollo-compiler/src/test/graphql/com/example/variable_default_value/kotlin/responseBased/variable_default_value/TestQuery.kt.expected @@ -34,10 +34,10 @@ public data class TestQuery @JvmOverloads constructor( override fun serializeVariables( writer: JsonWriter, customScalarAdapters: CustomScalarAdapters, - withBooleanDefaultValues: Boolean, + withDefaultValues: Boolean, ) { TestQuery_VariablesAdapter.serializeVariables(writer, this, customScalarAdapters, - withBooleanDefaultValues) + withDefaultValues) } override fun adapter(): CompositeAdapter = TestQuery_ResponseAdapter.Data.obj() diff --git a/libraries/apollo-compiler/src/test/graphql/com/example/variable_default_value/kotlin/responseBased/variable_default_value/adapter/TestQuery_VariablesAdapter.kt.expected b/libraries/apollo-compiler/src/test/graphql/com/example/variable_default_value/kotlin/responseBased/variable_default_value/adapter/TestQuery_VariablesAdapter.kt.expected index c505174f4f6..f7fcb9d9305 100644 --- a/libraries/apollo-compiler/src/test/graphql/com/example/variable_default_value/kotlin/responseBased/variable_default_value/adapter/TestQuery_VariablesAdapter.kt.expected +++ b/libraries/apollo-compiler/src/test/graphql/com/example/variable_default_value/kotlin/responseBased/variable_default_value/adapter/TestQuery_VariablesAdapter.kt.expected @@ -6,6 +6,7 @@ package com.example.variable_default_value.adapter import com.apollographql.apollo3.api.CustomScalarAdapters +import com.apollographql.apollo3.api.NullableAnyAdapter import com.apollographql.apollo3.api.Optional import com.apollographql.apollo3.api.json.JsonWriter import com.apollographql.apollo3.api.present @@ -23,11 +24,15 @@ public object TestQuery_VariablesAdapter { writer: JsonWriter, `value`: TestQuery, customScalarAdapters: CustomScalarAdapters, - withBooleanDefaultValues: Boolean, + withDefaultValues: Boolean, ) { if (value.episode is Optional.Present) { writer.name("episode") Episode_ResponseAdapter.present().toJson(writer, customScalarAdapters, value.episode) } + else if (withDefaultValues) { + writer.name("episode") + NullableAnyAdapter.toJson(writer, customScalarAdapters, "JEDI") + } } } diff --git a/libraries/apollo-compiler/src/test/graphql/com/example/variable_default_value/kotlin/responseBased/variable_default_value/selections/TestQuerySelections.kt.expected b/libraries/apollo-compiler/src/test/graphql/com/example/variable_default_value/kotlin/responseBased/variable_default_value/selections/TestQuerySelections.kt.expected index b41d50dc0fe..df6affccdbc 100644 --- a/libraries/apollo-compiler/src/test/graphql/com/example/variable_default_value/kotlin/responseBased/variable_default_value/selections/TestQuerySelections.kt.expected +++ b/libraries/apollo-compiler/src/test/graphql/com/example/variable_default_value/kotlin/responseBased/variable_default_value/selections/TestQuerySelections.kt.expected @@ -27,7 +27,8 @@ public object TestQuerySelections { name = "hero", type = Character.type ).arguments(listOf( - CompiledArgument.Builder("episode", CompiledVariable("episode")).build() + CompiledArgument.Builder("episode").value(CompiledVariable("episode")).build(), + CompiledArgument.Builder("listOfListOfStringArgs").build() )) .selections(__hero) .build() diff --git a/libraries/apollo-normalized-cache-api-incubating/src/commonMain/kotlin/com/apollographql/apollo3/cache/normalized/api/CacheResolver.kt b/libraries/apollo-normalized-cache-api-incubating/src/commonMain/kotlin/com/apollographql/apollo3/cache/normalized/api/CacheResolver.kt index de32e3fc500..f434e920140 100644 --- a/libraries/apollo-normalized-cache-api-incubating/src/commonMain/kotlin/com/apollographql/apollo3/cache/normalized/api/CacheResolver.kt +++ b/libraries/apollo-normalized-cache-api-incubating/src/commonMain/kotlin/com/apollographql/apollo3/cache/normalized/api/CacheResolver.kt @@ -3,7 +3,6 @@ package com.apollographql.apollo3.cache.normalized.api import com.apollographql.apollo3.annotations.ApolloExperimental import com.apollographql.apollo3.api.CompiledField import com.apollographql.apollo3.api.Executable -import com.apollographql.apollo3.api.resolveVariables import com.apollographql.apollo3.exception.CacheMissException import com.apollographql.apollo3.mpp.currentTimeMillis import kotlin.jvm.JvmSuppressWildcards @@ -198,9 +197,7 @@ object FieldPolicyCacheResolver : CacheResolver { parent: Map, parentId: String, ): Any? { - val keyArgsValues = field.arguments.filter { it.isKey }.map { - resolveVariables(it.value, variables).toString() - } + val keyArgsValues = field.resolveArguments(variables) { it.isKey }.values.map { it.toString() } if (keyArgsValues.isNotEmpty()) { return CacheKey(field.type.rawType().name, keyArgsValues) diff --git a/libraries/apollo-normalized-cache-api-incubating/src/commonMain/kotlin/com/apollographql/apollo3/cache/normalized/api/MetadataGenerator.kt b/libraries/apollo-normalized-cache-api-incubating/src/commonMain/kotlin/com/apollographql/apollo3/cache/normalized/api/MetadataGenerator.kt index d4ce1b4ef05..3b7bd2799b3 100644 --- a/libraries/apollo-normalized-cache-api-incubating/src/commonMain/kotlin/com/apollographql/apollo3/cache/normalized/api/MetadataGenerator.kt +++ b/libraries/apollo-normalized-cache-api-incubating/src/commonMain/kotlin/com/apollographql/apollo3/cache/normalized/api/MetadataGenerator.kt @@ -15,11 +15,11 @@ class MetadataGeneratorContext( val variables: Executable.Variables, ) { fun argumentValue(argumentName: String): Any? { - return field.resolveArgument(argumentName, variables) + return field.resolveArgument(argumentName, variables).getOrNull() } fun allArgumentValues(): Map { - return field.arguments.associate { it.name to argumentValue(it.name) } + return field.resolveArguments(variables) { !it.isPagination } } } diff --git a/libraries/apollo-normalized-cache-api/src/commonMain/kotlin/com/apollographql/apollo3/cache/normalized/api/CacheResolver.kt b/libraries/apollo-normalized-cache-api/src/commonMain/kotlin/com/apollographql/apollo3/cache/normalized/api/CacheResolver.kt index c02bbaa7575..d762ecff317 100644 --- a/libraries/apollo-normalized-cache-api/src/commonMain/kotlin/com/apollographql/apollo3/cache/normalized/api/CacheResolver.kt +++ b/libraries/apollo-normalized-cache-api/src/commonMain/kotlin/com/apollographql/apollo3/cache/normalized/api/CacheResolver.kt @@ -3,7 +3,6 @@ package com.apollographql.apollo3.cache.normalized.api import com.apollographql.apollo3.annotations.ApolloExperimental import com.apollographql.apollo3.api.CompiledField import com.apollographql.apollo3.api.Executable -import com.apollographql.apollo3.api.resolveVariables import com.apollographql.apollo3.exception.CacheMissException import com.apollographql.apollo3.mpp.currentTimeMillis import kotlin.jvm.JvmSuppressWildcards @@ -177,9 +176,7 @@ object FieldPolicyCacheResolver : CacheResolver { parent: Map, parentId: String, ): Any? { - val keyArgsValues = field.arguments.filter { it.isKey }.map { - resolveVariables(it.value, variables).toString() - } + val keyArgsValues = field.resolveArguments(variables) {it.isKey }.values.map { it.toString() } if (keyArgsValues.isNotEmpty()) { return CacheKey(field.type.rawType().name, keyArgsValues) diff --git a/libraries/apollo-tooling/src/main/kotlin/com/apollographql/apollo3/tooling/RegisterOperations.kt b/libraries/apollo-tooling/src/main/kotlin/com/apollographql/apollo3/tooling/RegisterOperations.kt index 8250868e576..87f39a9ef64 100644 --- a/libraries/apollo-tooling/src/main/kotlin/com/apollographql/apollo3/tooling/RegisterOperations.kt +++ b/libraries/apollo-tooling/src/main/kotlin/com/apollographql/apollo3/tooling/RegisterOperations.kt @@ -180,7 +180,7 @@ object RegisterOperations { val hiddenLiterals = gqlDocument.transform { when (it) { is GQLIntValue -> { - TransformResult.Replace(it.copy(value = 0)) + TransformResult.Replace(it.copy(value = "0")) } is GQLFloatValue -> { @@ -192,7 +192,7 @@ object RegisterOperations { TransformResult.Replace( GQLIntValue( sourceLocation = it.sourceLocation, - value = 0 + value = "0" ) ) } diff --git a/tests/browser-tests/src/commonTest/kotlin/test/HeadersTest.kt b/tests/browser-tests/src/commonTest/kotlin/test/HeadersTest.kt index bd017be6efa..c159eb46d2b 100644 --- a/tests/browser-tests/src/commonTest/kotlin/test/HeadersTest.kt +++ b/tests/browser-tests/src/commonTest/kotlin/test/HeadersTest.kt @@ -50,7 +50,7 @@ class NothingSubscription : Subscription { TODO("Not yet implemented") } - override fun serializeVariables(writer: JsonWriter, customScalarAdapters: CustomScalarAdapters, withBooleanDefaultValues: Boolean) { + override fun serializeVariables(writer: JsonWriter, customScalarAdapters: CustomScalarAdapters, withDefaultValues: Boolean) { TODO("Not yet implemented") } diff --git a/tests/cache-include-directive/README.md b/tests/cache-include-directive/README.md deleted file mode 100644 index 9c4efdde557..00000000000 --- a/tests/cache-include-directive/README.md +++ /dev/null @@ -1,2 +0,0 @@ -Test reading fragments from the cache using `@include` -See https://kotlinlang.slack.com/archives/C01A6KM1SBZ/p1696977296566129 \ No newline at end of file diff --git a/tests/cache-include-directive/src/main/graphql/operation.graphql b/tests/cache-include-directive/src/main/graphql/operation.graphql deleted file mode 100644 index 679dbe3cee2..00000000000 --- a/tests/cache-include-directive/src/main/graphql/operation.graphql +++ /dev/null @@ -1,11 +0,0 @@ -query GetUser($withDetails: Boolean!) { - user { - id - ...userDetails @include(if: $withDetails) - } -} - -fragment userDetails on User { - name - email -} diff --git a/tests/cache-include-directive/src/main/graphql/schema.graphqls b/tests/cache-include-directive/src/main/graphql/schema.graphqls deleted file mode 100644 index 53fffeb6de9..00000000000 --- a/tests/cache-include-directive/src/main/graphql/schema.graphqls +++ /dev/null @@ -1,10 +0,0 @@ -type Query { - user: User! -} - -type User { - id: ID! - name: String! - email: String! - -} diff --git a/tests/cache-variables-arguments/README.md b/tests/cache-variables-arguments/README.md new file mode 100644 index 00000000000..0c9e61b7a8a --- /dev/null +++ b/tests/cache-variables-arguments/README.md @@ -0,0 +1,3 @@ +Test using the cache with `@include` and different arguments, including variables +* See https://kotlinlang.slack.com/archives/C01A6KM1SBZ/p1696977296566129 +* See https://github.com/apollographql/apollo-kotlin/issues/5186 \ No newline at end of file diff --git a/tests/cache-include-directive/build.gradle.kts b/tests/cache-variables-arguments/build.gradle.kts similarity index 100% rename from tests/cache-include-directive/build.gradle.kts rename to tests/cache-variables-arguments/build.gradle.kts diff --git a/tests/cache-variables-arguments/src/main/graphql/operation.graphql b/tests/cache-variables-arguments/src/main/graphql/operation.graphql new file mode 100644 index 00000000000..236bf9b3226 --- /dev/null +++ b/tests/cache-variables-arguments/src/main/graphql/operation.graphql @@ -0,0 +1,35 @@ +query GetUser($withDetails: Boolean!) { + user { + id + ...userDetails @include(if: $withDetails) + } +} + +fragment userDetails on User { + name + email +} + +query VariableDefaultValueEmpty($b: B = {}) { + a0(b: $b) +} + +query VariableDefaultValueWithC($b: B = {c: 4}) { + a0(b: $b) +} + +query VariableAbsent($b: B) { + a0(b: $b) +} + +query VariableDefaultValueNull($b: B = null) { + a0(b: $b) +} + +query AbsentArgumentWithArgumentDefaultValue { + a1 +} + +query PresentArgumentEmpty { + a1(b: {}) +} \ No newline at end of file diff --git a/tests/cache-variables-arguments/src/main/graphql/schema.graphqls b/tests/cache-variables-arguments/src/main/graphql/schema.graphqls new file mode 100644 index 00000000000..ca77bbd368f --- /dev/null +++ b/tests/cache-variables-arguments/src/main/graphql/schema.graphqls @@ -0,0 +1,17 @@ +type Query { + user: User! + a0(b: B): Int + a1(b: B = {}): Int + a2(b: B = {c: 2}): Int +} + +input B { + c: Int = 3 + d: Int +} + +type User { + id: ID! + name: String! + email: String! +} diff --git a/tests/cache-variables-arguments/src/test/kotlin/test/CacheArgumentTest.kt b/tests/cache-variables-arguments/src/test/kotlin/test/CacheArgumentTest.kt new file mode 100644 index 00000000000..bdd9f185cbc --- /dev/null +++ b/tests/cache-variables-arguments/src/test/kotlin/test/CacheArgumentTest.kt @@ -0,0 +1,90 @@ +package test + +import cache.include.AbsentArgumentWithArgumentDefaultValueQuery +import cache.include.PresentArgumentEmptyQuery +import cache.include.VariableAbsentQuery +import cache.include.VariableDefaultValueEmptyQuery +import cache.include.VariableDefaultValueNullQuery +import cache.include.VariableDefaultValueWithCQuery +import com.apollographql.apollo3.api.CustomScalarAdapters +import com.apollographql.apollo3.api.Operation +import com.apollographql.apollo3.cache.normalized.api.TypePolicyCacheKeyGenerator +import com.apollographql.apollo3.cache.normalized.api.normalize +import kotlin.test.Test +import kotlin.test.assertEquals + +/** + * Test to check coercion of various variables/arguments combinations. + * + * I am not 100% certain this is all correct but hopefully this is a good base for future + * improvements + * See https://github.com/graphql/graphql-spec/pull/793 + */ +class CacheArgumentTest { + @Test + fun variableDefaultValueEmpty() { + val operation = VariableDefaultValueEmptyQuery() + + /** + * One would expect b: 3 here but the default variable is not coerced + */ + assertEquals("a0({\"b\":{}})", operation.fieldKey(VariableDefaultValueEmptyQuery.Data(a0 = 42))) + } + + @Test + fun variableDefaultValueWithC() { + val operation = VariableDefaultValueWithCQuery() + + /** + * The default value contains c + */ + assertEquals("a0({\"b\":{\"c\":4}})", operation.fieldKey(VariableDefaultValueWithCQuery.Data(a0 = 42))) + } + + @Test + fun variableDefaultValueNull() { + val operation = VariableDefaultValueNullQuery() + + /** + * The default value can be null + */ + assertEquals("a0({\"b\":null})", operation.fieldKey(VariableDefaultValueNullQuery.Data(a0 = 42))) + } + + @Test + fun variableAbsent() { + val operation = VariableAbsentQuery() + + /** + * An argument can be absent + */ + assertEquals("a0", operation.fieldKey(VariableAbsentQuery.Data(a0 = 42))) + } + + @Test + fun absentArgumentWithArgumentDefaultValue() { + val operation = AbsentArgumentWithArgumentDefaultValueQuery() + + /** + * The argument definition defaultValue is the empty object and is not coerced + */ + assertEquals("a1({\"b\":{}})", operation.fieldKey(AbsentArgumentWithArgumentDefaultValueQuery.Data(a1 = 42))) + } + + @Test + fun presentArgumentEmpty() { + val operation = PresentArgumentEmptyQuery() + + /** + * Because here we're passing an argument explicitly, this argument is coerced and the 3 default value gets pulled + * in even if it was initially not there + */ + assertEquals("a1({\"b\":{\"c\":3}})", operation.fieldKey(PresentArgumentEmptyQuery.Data(a1 = 42))) + } +} + +private fun Operation.fieldKey(data: D): String { + val record = normalize(data, CustomScalarAdapters.Empty, TypePolicyCacheKeyGenerator) + + return record.values.single().keys.single { it.startsWith("a") } +} \ No newline at end of file diff --git a/tests/cache-include-directive/src/test/kotlin/test/IncludeTest.kt b/tests/cache-variables-arguments/src/test/kotlin/test/IncludeTest.kt similarity index 100% rename from tests/cache-include-directive/src/test/kotlin/test/IncludeTest.kt rename to tests/cache-variables-arguments/src/test/kotlin/test/IncludeTest.kt diff --git a/tests/integration-tests/src/commonTest/kotlin/Utils.kt b/tests/integration-tests/src/commonTest/kotlin/Utils.kt index 327f75ce690..04a833ce22e 100644 --- a/tests/integration-tests/src/commonTest/kotlin/Utils.kt +++ b/tests/integration-tests/src/commonTest/kotlin/Utils.kt @@ -26,7 +26,7 @@ fun assertEquals2(actual: Any?, expected: Any?) = assertEquals(expected, actual) */ object IdCacheResolver: CacheResolver { override fun resolveField(field: CompiledField, variables: Executable.Variables, parent: Map, parentId: String): Any? { - val id = field.resolveArgument("id", variables)?.toString() + val id = field.resolveArgument("id", variables).getOrNull()?.toString() if (id != null) { return CacheKey(id) } diff --git a/tests/integration-tests/src/commonTest/kotlin/test/declarativecache/DeclarativeCacheTest.kt b/tests/integration-tests/src/commonTest/kotlin/test/declarativecache/DeclarativeCacheTest.kt index 2ab4cd3495a..039b4f41acd 100644 --- a/tests/integration-tests/src/commonTest/kotlin/test/declarativecache/DeclarativeCacheTest.kt +++ b/tests/integration-tests/src/commonTest/kotlin/test/declarativecache/DeclarativeCacheTest.kt @@ -99,7 +99,7 @@ class DeclarativeCacheTest { override fun resolveField(field: CompiledField, variables: Executable.Variables, parent: Map, parentId: String): Any? { if (field.name == "books") { @Suppress("UNCHECKED_CAST") - val isbns = field.resolveArgument("isbns", variables) as? List + val isbns = field.resolveArgument("isbns", variables).getOrThrow() as? List if (isbns != null) { return isbns.map { CacheKey(field.type.rawType().name, listOf(it)) } }