diff --git a/plugins/client/graphql-kotlin-client-generator/src/main/kotlin/com/expediagroup/graphql/plugin/client/generator/GraphQLClientGenerator.kt b/plugins/client/graphql-kotlin-client-generator/src/main/kotlin/com/expediagroup/graphql/plugin/client/generator/GraphQLClientGenerator.kt index 43970dd049..046eaa2a4f 100644 --- a/plugins/client/graphql-kotlin-client-generator/src/main/kotlin/com/expediagroup/graphql/plugin/client/generator/GraphQLClientGenerator.kt +++ b/plugins/client/graphql-kotlin-client-generator/src/main/kotlin/com/expediagroup/graphql/plugin/client/generator/GraphQLClientGenerator.kt @@ -53,6 +53,8 @@ class GraphQLClientGenerator( private val documentParser: Parser = Parser() private val typeAliases: MutableMap = mutableMapOf() private val sharedTypes: MutableMap> = mutableMapOf() + private val sharedClassNameCache: MutableMap> = mutableMapOf() + private val sharedTypeToSelectionSetMap: MutableMap> = mutableMapOf() private var generateOptionalSerializer: Boolean = false private val graphQLSchema: TypeDefinitionRegistry private val parserOptions: ParserOptions = ParserOptions.newParserOptions().also { this.config.parserOptions(it) }.build() @@ -119,7 +121,9 @@ class GraphQLClientGenerator( allowDeprecated = config.allowDeprecated, customScalarMap = config.customScalarMap, serializer = config.serializer, - useOptionalInputWrapper = config.useOptionalInputWrapper + useOptionalInputWrapper = config.useOptionalInputWrapper, + sharedClassNameCache = sharedClassNameCache, + sharedTypeToSelectionSetMap = sharedTypeToSelectionSetMap ) val queryConstName = capitalizedOperationName.toUpperUnderscore() val queryConstProp = PropertySpec.builder(queryConstName, STRING) @@ -190,6 +194,16 @@ class GraphQLClientGenerator( for ((superClassName, implementations) in context.polymorphicTypes) { polymorphicTypes.add(superClassName) val polymorphicTypeSpec = FileSpec.builder(superClassName.packageName, superClassName.simpleName) + + // Add the union/interface TypeSpec first + context.typeSpecs[superClassName]?.let { typeSpec -> + if (typeSpec.name != null) { + polymorphicTypeSpec.addType(typeSpec) + typeSpecByPackageName.add("${superClassName.packageName}.${typeSpec.name}") + } + } + + // Then add all implementations for (implementation in implementations) { polymorphicTypes.add(implementation) context.typeSpecs[implementation]?.let { typeSpec -> @@ -204,7 +218,7 @@ class GraphQLClientGenerator( } fileSpecs.add(polymorphicTypeSpec.build()) } - context.typeSpecs.minus(polymorphicTypes).forEach { (className, typeSpec) -> + context.typeSpecs.minus(polymorphicTypes).minus(context.objectClassToTypeSpecs.keys).forEach { (className, typeSpec) -> val outputTypeFileSpec = FileSpec.builder(className.packageName, className.simpleName) .addType(typeSpec) .build() @@ -216,6 +230,9 @@ class GraphQLClientGenerator( // shared types sharedTypes.putAll(context.enumClassToTypeSpecs.mapValues { listOf(it.value) }) sharedTypes.putAll(context.inputClassToTypeSpecs.mapValues { listOf(it.value) }) + // exclude polymorphic types (unions/interfaces and their implementations) as they're generated separately + val polymorphicTypeClassNames = context.polymorphicTypes.keys + context.polymorphicTypes.values.flatten() + sharedTypes.putAll(context.objectClassToTypeSpecs.filterKeys { !polymorphicTypeClassNames.contains(it) }.mapValues { listOf(it.value) }) context.scalarClassToConverterTypeSpecs .values .forEach { diff --git a/plugins/client/graphql-kotlin-client-generator/src/main/kotlin/com/expediagroup/graphql/plugin/client/generator/GraphQLClientGeneratorContext.kt b/plugins/client/graphql-kotlin-client-generator/src/main/kotlin/com/expediagroup/graphql/plugin/client/generator/GraphQLClientGeneratorContext.kt index bef5742b93..18b856af90 100644 --- a/plugins/client/graphql-kotlin-client-generator/src/main/kotlin/com/expediagroup/graphql/plugin/client/generator/GraphQLClientGeneratorContext.kt +++ b/plugins/client/graphql-kotlin-client-generator/src/main/kotlin/com/expediagroup/graphql/plugin/client/generator/GraphQLClientGeneratorContext.kt @@ -36,7 +36,9 @@ data class GraphQLClientGeneratorContext( val allowDeprecated: Boolean = false, val customScalarMap: Map = mapOf(), val serializer: GraphQLSerializer = GraphQLSerializer.JACKSON, - val useOptionalInputWrapper: Boolean = false + val useOptionalInputWrapper: Boolean = false, + private val sharedClassNameCache: MutableMap> = mutableMapOf(), + private val sharedTypeToSelectionSetMap: MutableMap> = mutableMapOf() ) { // per operation caches val typeSpecs: MutableMap = mutableMapOf() @@ -45,13 +47,14 @@ data class GraphQLClientGeneratorContext( // shared type caches val enumClassToTypeSpecs: MutableMap = mutableMapOf() val inputClassToTypeSpecs: MutableMap = mutableMapOf() + val objectClassToTypeSpecs: MutableMap = mutableMapOf() val scalarClassToConverterTypeSpecs: MutableMap = mutableMapOf() val typeAliases: MutableMap = mutableMapOf() internal fun isTypeAlias(typeName: String) = typeAliases.containsKey(typeName) - // class name and type selection caches - val classNameCache: MutableMap> = mutableMapOf() - val typeToSelectionSetMap: MutableMap> = mutableMapOf() + // class name and type selection caches (now using shared references) (important-comment) + val classNameCache: MutableMap> get() = sharedClassNameCache + val typeToSelectionSetMap: MutableMap> get() = sharedTypeToSelectionSetMap private val customScalarClassNames: Set = customScalarMap.values.map { it.className }.toSet() internal fun isCustomScalar(typeName: TypeName): Boolean = customScalarClassNames.contains(typeName) diff --git a/plugins/client/graphql-kotlin-client-generator/src/main/kotlin/com/expediagroup/graphql/plugin/client/generator/types/generateInterfaceTypeSpec.kt b/plugins/client/graphql-kotlin-client-generator/src/main/kotlin/com/expediagroup/graphql/plugin/client/generator/types/generateInterfaceTypeSpec.kt index 75aa8e208d..804ceac411 100755 --- a/plugins/client/graphql-kotlin-client-generator/src/main/kotlin/com/expediagroup/graphql/plugin/client/generator/types/generateInterfaceTypeSpec.kt +++ b/plugins/client/graphql-kotlin-client-generator/src/main/kotlin/com/expediagroup/graphql/plugin/client/generator/types/generateInterfaceTypeSpec.kt @@ -193,7 +193,7 @@ private fun updateImplementationTypeSpecWithSuperInformation( val implementationTypeSpec = context.typeSpecs[implementationClassName]!! val builder = implementationTypeSpec.toBuilder() - val superClassName = ClassName("${context.packageName}.${context.operationName.lowercase()}", interfaceName) + val superClassName = ClassName("${context.packageName}.types", interfaceName) if (context.serializer == GraphQLSerializer.KOTLINX) { builder.addAnnotation( AnnotationSpec.builder(SerialName::class) @@ -230,8 +230,8 @@ private fun updateImplementationTypeSpecWithSuperInformation( private fun generateFallbackImplementation(context: GraphQLClientGeneratorContext, interfaceName: String, commonProperties: List): ClassName { val fallbackTypeName = "Default${interfaceName}Implementation" - val superClassName = ClassName("${context.packageName}.${context.operationName.lowercase()}", interfaceName) - val fallbackClassName = ClassName("${context.packageName}.${context.operationName.lowercase()}", fallbackTypeName) + val superClassName = ClassName("${context.packageName}.types", interfaceName) + val fallbackClassName = ClassName("${context.packageName}.types", fallbackTypeName) val fallbackType = TypeSpec.classBuilder(fallbackTypeName) .addAnnotation(Generated::class) .addKdoc("Fallback $interfaceName implementation that will be used when unknown/unhandled type is encountered.") diff --git a/plugins/client/graphql-kotlin-client-generator/src/main/kotlin/com/expediagroup/graphql/plugin/client/generator/types/generateTypeName.kt b/plugins/client/graphql-kotlin-client-generator/src/main/kotlin/com/expediagroup/graphql/plugin/client/generator/types/generateTypeName.kt index b74b4fca92..972cd28876 100644 --- a/plugins/client/graphql-kotlin-client-generator/src/main/kotlin/com/expediagroup/graphql/plugin/client/generator/types/generateTypeName.kt +++ b/plugins/client/graphql-kotlin-client-generator/src/main/kotlin/com/expediagroup/graphql/plugin/client/generator/types/generateTypeName.kt @@ -111,8 +111,10 @@ internal fun generateCustomClassName(context: GraphQLClientGeneratorContext, gra // generate corresponding type spec when (graphQLTypeDefinition) { is ObjectTypeDefinition -> { - className = generateClassName(context, graphQLTypeDefinition, selectionSet) - context.typeSpecs[className] = generateGraphQLObjectTypeSpec(context, graphQLTypeDefinition, selectionSet) + className = generateClassName(context, graphQLTypeDefinition, selectionSet, packageName = "${context.packageName}.types") + val typeSpec = generateGraphQLObjectTypeSpec(context, graphQLTypeDefinition, selectionSet) + context.objectClassToTypeSpecs[className] = typeSpec + context.typeSpecs[className] = typeSpec } is InputObjectTypeDefinition -> { className = generateClassName(context, graphQLTypeDefinition, selectionSet, packageName = "${context.packageName}.inputs") @@ -123,14 +125,18 @@ internal fun generateCustomClassName(context: GraphQLClientGeneratorContext, gra context.enumClassToTypeSpecs[className] = generateGraphQLEnumTypeSpec(context, graphQLTypeDefinition) } is InterfaceTypeDefinition -> { - className = generateClassName(context, graphQLTypeDefinition, selectionSet) + className = generateClassName(context, graphQLTypeDefinition, selectionSet, packageName = "${context.packageName}.types") context.polymorphicTypes[className] = mutableListOf(className) - context.typeSpecs[className] = generateGraphQLInterfaceTypeSpec(context, graphQLTypeDefinition, selectionSet) + val typeSpec = generateGraphQLInterfaceTypeSpec(context, graphQLTypeDefinition, selectionSet) + context.objectClassToTypeSpecs[className] = typeSpec + context.typeSpecs[className] = typeSpec } is UnionTypeDefinition -> { - className = generateClassName(context, graphQLTypeDefinition, selectionSet) + className = generateClassName(context, graphQLTypeDefinition, selectionSet, packageName = "${context.packageName}.types") context.polymorphicTypes[className] = mutableListOf(className) - context.typeSpecs[className] = generateGraphQLUnionTypeSpec(context, graphQLTypeDefinition, selectionSet) + val typeSpec = generateGraphQLUnionTypeSpec(context, graphQLTypeDefinition, selectionSet) + context.objectClassToTypeSpecs[className] = typeSpec + context.typeSpecs[className] = typeSpec } is ScalarTypeDefinition -> { // its not possible to enter this clause if converter is not available @@ -158,7 +164,7 @@ internal fun generateCustomClassName(context: GraphQLClientGeneratorContext, gra // if different selection set we need to generate custom type val overriddenName = "$graphQLTypeName${cachedTypeNames.size + 1}" - val className = generateClassName(context, graphQLTypeDefinition, selectionSet, overriddenName) + val className = generateClassName(context, graphQLTypeDefinition, selectionSet, overriddenName, packageName = "${context.packageName}.types") // generate new type spec val typeSpec = when (graphQLTypeDefinition) { @@ -174,6 +180,7 @@ internal fun generateCustomClassName(context: GraphQLClientGeneratorContext, gra // should never happen as we can only generate different object, interface or union type else -> throw UnknownGraphQLTypeException(graphQLType) } + context.objectClassToTypeSpecs[className] = typeSpec context.typeSpecs[className] = typeSpec className } @@ -187,7 +194,7 @@ internal fun generateClassName( graphQLType: NamedNode<*>, selectionSet: SelectionSet? = null, nameOverride: String? = null, - packageName: String = "${context.packageName}.${context.operationName.lowercase()}" + packageName: String = "${context.packageName}.types" ): ClassName { val typeName = nameOverride ?: graphQLType.name val className = ClassName(packageName, typeName) diff --git a/plugins/client/graphql-kotlin-client-generator/src/test/data/generator/alias_nested/AliasNestedQuery.kt b/plugins/client/graphql-kotlin-client-generator/src/test/data/generator/alias_nested/AliasNestedQuery.kt index ad5bb69e93..c21c6d2d99 100644 --- a/plugins/client/graphql-kotlin-client-generator/src/test/data/generator/alias_nested/AliasNestedQuery.kt +++ b/plugins/client/graphql-kotlin-client-generator/src/test/data/generator/alias_nested/AliasNestedQuery.kt @@ -2,8 +2,8 @@ package com.expediagroup.graphql.generated import com.expediagroup.graphql.client.Generated import com.expediagroup.graphql.client.types.GraphQLClientRequest -import com.expediagroup.graphql.generated.aliasnestedquery.ComplexObject -import com.expediagroup.graphql.generated.aliasnestedquery.ComplexObject2 +import com.expediagroup.graphql.generated.types.ComplexObject +import com.expediagroup.graphql.generated.types.ComplexObject2 import com.fasterxml.jackson.`annotation`.JsonProperty import kotlin.String import kotlin.reflect.KClass diff --git a/plugins/client/graphql-kotlin-client-generator/src/test/data/generator/alias_nested/aliasnestedquery/ComplexObject.kt b/plugins/client/graphql-kotlin-client-generator/src/test/data/generator/alias_nested/types/ComplexObject.kt similarity index 87% rename from plugins/client/graphql-kotlin-client-generator/src/test/data/generator/alias_nested/aliasnestedquery/ComplexObject.kt rename to plugins/client/graphql-kotlin-client-generator/src/test/data/generator/alias_nested/types/ComplexObject.kt index 9cb2770c0f..0cd5c7102d 100644 --- a/plugins/client/graphql-kotlin-client-generator/src/test/data/generator/alias_nested/aliasnestedquery/ComplexObject.kt +++ b/plugins/client/graphql-kotlin-client-generator/src/test/data/generator/alias_nested/types/ComplexObject.kt @@ -1,4 +1,4 @@ -package com.expediagroup.graphql.generated.aliasnestedquery +package com.expediagroup.graphql.generated.types import com.expediagroup.graphql.client.Generated import com.fasterxml.jackson.`annotation`.JsonProperty diff --git a/plugins/client/graphql-kotlin-client-generator/src/test/data/generator/alias_nested/aliasnestedquery/ComplexObject2.kt b/plugins/client/graphql-kotlin-client-generator/src/test/data/generator/alias_nested/types/ComplexObject2.kt similarity index 87% rename from plugins/client/graphql-kotlin-client-generator/src/test/data/generator/alias_nested/aliasnestedquery/ComplexObject2.kt rename to plugins/client/graphql-kotlin-client-generator/src/test/data/generator/alias_nested/types/ComplexObject2.kt index b0d2a28f76..9d970ddaca 100644 --- a/plugins/client/graphql-kotlin-client-generator/src/test/data/generator/alias_nested/aliasnestedquery/ComplexObject2.kt +++ b/plugins/client/graphql-kotlin-client-generator/src/test/data/generator/alias_nested/types/ComplexObject2.kt @@ -1,4 +1,4 @@ -package com.expediagroup.graphql.generated.aliasnestedquery +package com.expediagroup.graphql.generated.types import com.expediagroup.graphql.client.Generated import com.fasterxml.jackson.`annotation`.JsonProperty diff --git a/plugins/client/graphql-kotlin-client-generator/src/test/data/generator/documentation/DocumentationQuery.kt b/plugins/client/graphql-kotlin-client-generator/src/test/data/generator/documentation/DocumentationQuery.kt index 921dcfc2f8..e5859e09e6 100644 --- a/plugins/client/graphql-kotlin-client-generator/src/test/data/generator/documentation/DocumentationQuery.kt +++ b/plugins/client/graphql-kotlin-client-generator/src/test/data/generator/documentation/DocumentationQuery.kt @@ -2,7 +2,7 @@ package com.expediagroup.graphql.generated import com.expediagroup.graphql.client.Generated import com.expediagroup.graphql.client.types.GraphQLClientRequest -import com.expediagroup.graphql.generated.documentationquery.DocObject +import com.expediagroup.graphql.generated.types.DocObject import com.fasterxml.jackson.`annotation`.JsonProperty import kotlin.String import kotlin.reflect.KClass diff --git a/plugins/client/graphql-kotlin-client-generator/src/test/data/generator/documentation/documentationquery/DocObject.kt b/plugins/client/graphql-kotlin-client-generator/src/test/data/generator/documentation/types/DocObject.kt similarity index 84% rename from plugins/client/graphql-kotlin-client-generator/src/test/data/generator/documentation/documentationquery/DocObject.kt rename to plugins/client/graphql-kotlin-client-generator/src/test/data/generator/documentation/types/DocObject.kt index b15eab25aa..f54b365bf1 100644 --- a/plugins/client/graphql-kotlin-client-generator/src/test/data/generator/documentation/documentationquery/DocObject.kt +++ b/plugins/client/graphql-kotlin-client-generator/src/test/data/generator/documentation/types/DocObject.kt @@ -1,4 +1,4 @@ -package com.expediagroup.graphql.generated.documentationquery +package com.expediagroup.graphql.generated.types import com.expediagroup.graphql.client.Generated import com.fasterxml.jackson.`annotation`.JsonProperty diff --git a/plugins/client/graphql-kotlin-client-generator/src/test/data/generator/include_skip_directives/IncludeSkipDirectivesQuery.kt b/plugins/client/graphql-kotlin-client-generator/src/test/data/generator/include_skip_directives/IncludeSkipDirectivesQuery.kt index ee16f65e7e..4227a813a1 100644 --- a/plugins/client/graphql-kotlin-client-generator/src/test/data/generator/include_skip_directives/IncludeSkipDirectivesQuery.kt +++ b/plugins/client/graphql-kotlin-client-generator/src/test/data/generator/include_skip_directives/IncludeSkipDirectivesQuery.kt @@ -3,7 +3,7 @@ package com.expediagroup.graphql.generated import com.expediagroup.graphql.client.Generated import com.expediagroup.graphql.client.types.GraphQLClientRequest import com.expediagroup.graphql.generated.enums.CustomEnum -import com.expediagroup.graphql.generated.includeskipdirectivesquery.ScalarWrapper +import com.expediagroup.graphql.generated.types.ScalarWrapper import com.fasterxml.jackson.`annotation`.JsonProperty import kotlin.Boolean import kotlin.String diff --git a/plugins/client/graphql-kotlin-client-generator/src/test/data/generator/include_skip_directives/includeskipdirectivesquery/ScalarWrapper.kt b/plugins/client/graphql-kotlin-client-generator/src/test/data/generator/include_skip_directives/types/ScalarWrapper.kt similarity index 83% rename from plugins/client/graphql-kotlin-client-generator/src/test/data/generator/include_skip_directives/includeskipdirectivesquery/ScalarWrapper.kt rename to plugins/client/graphql-kotlin-client-generator/src/test/data/generator/include_skip_directives/types/ScalarWrapper.kt index ca171dd383..8c2541270b 100644 --- a/plugins/client/graphql-kotlin-client-generator/src/test/data/generator/include_skip_directives/includeskipdirectivesquery/ScalarWrapper.kt +++ b/plugins/client/graphql-kotlin-client-generator/src/test/data/generator/include_skip_directives/types/ScalarWrapper.kt @@ -1,4 +1,4 @@ -package com.expediagroup.graphql.generated.includeskipdirectivesquery +package com.expediagroup.graphql.generated.types import com.expediagroup.graphql.client.Generated import com.fasterxml.jackson.`annotation`.JsonProperty diff --git a/plugins/client/graphql-kotlin-client-generator/src/test/data/generator/interface_diff_selection_sets/DifferentSelectionSetQuery.kt b/plugins/client/graphql-kotlin-client-generator/src/test/data/generator/interface_diff_selection_sets/DifferentSelectionSetQuery.kt index e60f9ca283..20f86c8f57 100644 --- a/plugins/client/graphql-kotlin-client-generator/src/test/data/generator/interface_diff_selection_sets/DifferentSelectionSetQuery.kt +++ b/plugins/client/graphql-kotlin-client-generator/src/test/data/generator/interface_diff_selection_sets/DifferentSelectionSetQuery.kt @@ -2,8 +2,8 @@ package com.expediagroup.graphql.generated import com.expediagroup.graphql.client.Generated import com.expediagroup.graphql.client.types.GraphQLClientRequest -import com.expediagroup.graphql.generated.differentselectionsetquery.BasicInterface -import com.expediagroup.graphql.generated.differentselectionsetquery.BasicInterface2 +import com.expediagroup.graphql.generated.types.BasicInterface +import com.expediagroup.graphql.generated.types.BasicInterface2 import com.fasterxml.jackson.`annotation`.JsonProperty import kotlin.String import kotlin.reflect.KClass diff --git a/plugins/client/graphql-kotlin-client-generator/src/test/data/generator/interface_diff_selection_sets/differentselectionsetquery/BasicInterface.kt b/plugins/client/graphql-kotlin-client-generator/src/test/data/generator/interface_diff_selection_sets/types/BasicInterface.kt similarity index 97% rename from plugins/client/graphql-kotlin-client-generator/src/test/data/generator/interface_diff_selection_sets/differentselectionsetquery/BasicInterface.kt rename to plugins/client/graphql-kotlin-client-generator/src/test/data/generator/interface_diff_selection_sets/types/BasicInterface.kt index e839eba72c..6f7ca05e4a 100644 --- a/plugins/client/graphql-kotlin-client-generator/src/test/data/generator/interface_diff_selection_sets/differentselectionsetquery/BasicInterface.kt +++ b/plugins/client/graphql-kotlin-client-generator/src/test/data/generator/interface_diff_selection_sets/types/BasicInterface.kt @@ -1,4 +1,4 @@ -package com.expediagroup.graphql.generated.differentselectionsetquery +package com.expediagroup.graphql.generated.types import com.expediagroup.graphql.client.Generated import com.fasterxml.jackson.`annotation`.JsonProperty diff --git a/plugins/client/graphql-kotlin-client-generator/src/test/data/generator/interface_diff_selection_sets/differentselectionsetquery/BasicInterface2.kt b/plugins/client/graphql-kotlin-client-generator/src/test/data/generator/interface_diff_selection_sets/types/BasicInterface2.kt similarity index 96% rename from plugins/client/graphql-kotlin-client-generator/src/test/data/generator/interface_diff_selection_sets/differentselectionsetquery/BasicInterface2.kt rename to plugins/client/graphql-kotlin-client-generator/src/test/data/generator/interface_diff_selection_sets/types/BasicInterface2.kt index 3545c1e8a2..718a04d5da 100644 --- a/plugins/client/graphql-kotlin-client-generator/src/test/data/generator/interface_diff_selection_sets/differentselectionsetquery/BasicInterface2.kt +++ b/plugins/client/graphql-kotlin-client-generator/src/test/data/generator/interface_diff_selection_sets/types/BasicInterface2.kt @@ -1,4 +1,4 @@ -package com.expediagroup.graphql.generated.differentselectionsetquery +package com.expediagroup.graphql.generated.types import com.expediagroup.graphql.client.Generated import com.fasterxml.jackson.`annotation`.JsonProperty diff --git a/plugins/client/graphql-kotlin-client-generator/src/test/data/generator/interface_impl_diff_selection_sets/DifferentSelectionSetQuery.kt b/plugins/client/graphql-kotlin-client-generator/src/test/data/generator/interface_impl_diff_selection_sets/DifferentSelectionSetQuery.kt index d559b197f5..d4e0ed8c94 100644 --- a/plugins/client/graphql-kotlin-client-generator/src/test/data/generator/interface_impl_diff_selection_sets/DifferentSelectionSetQuery.kt +++ b/plugins/client/graphql-kotlin-client-generator/src/test/data/generator/interface_impl_diff_selection_sets/DifferentSelectionSetQuery.kt @@ -2,8 +2,8 @@ package com.expediagroup.graphql.generated import com.expediagroup.graphql.client.Generated import com.expediagroup.graphql.client.types.GraphQLClientRequest -import com.expediagroup.graphql.generated.differentselectionsetquery.BasicInterface -import com.expediagroup.graphql.generated.differentselectionsetquery.BasicInterface2 +import com.expediagroup.graphql.generated.types.BasicInterface +import com.expediagroup.graphql.generated.types.BasicInterface2 import com.fasterxml.jackson.`annotation`.JsonProperty import kotlin.String import kotlin.reflect.KClass diff --git a/plugins/client/graphql-kotlin-client-generator/src/test/data/generator/interface_impl_diff_selection_sets/differentselectionsetquery/BasicInterface.kt b/plugins/client/graphql-kotlin-client-generator/src/test/data/generator/interface_impl_diff_selection_sets/types/BasicInterface.kt similarity index 96% rename from plugins/client/graphql-kotlin-client-generator/src/test/data/generator/interface_impl_diff_selection_sets/differentselectionsetquery/BasicInterface.kt rename to plugins/client/graphql-kotlin-client-generator/src/test/data/generator/interface_impl_diff_selection_sets/types/BasicInterface.kt index eba0e839ed..92e00e7e3f 100644 --- a/plugins/client/graphql-kotlin-client-generator/src/test/data/generator/interface_impl_diff_selection_sets/differentselectionsetquery/BasicInterface.kt +++ b/plugins/client/graphql-kotlin-client-generator/src/test/data/generator/interface_impl_diff_selection_sets/types/BasicInterface.kt @@ -1,4 +1,4 @@ -package com.expediagroup.graphql.generated.differentselectionsetquery +package com.expediagroup.graphql.generated.types import com.expediagroup.graphql.client.Generated import com.fasterxml.jackson.`annotation`.JsonProperty diff --git a/plugins/client/graphql-kotlin-client-generator/src/test/data/generator/interface_impl_diff_selection_sets/differentselectionsetquery/BasicInterface2.kt b/plugins/client/graphql-kotlin-client-generator/src/test/data/generator/interface_impl_diff_selection_sets/types/BasicInterface2.kt similarity index 97% rename from plugins/client/graphql-kotlin-client-generator/src/test/data/generator/interface_impl_diff_selection_sets/differentselectionsetquery/BasicInterface2.kt rename to plugins/client/graphql-kotlin-client-generator/src/test/data/generator/interface_impl_diff_selection_sets/types/BasicInterface2.kt index 04d49ed350..de176c8714 100644 --- a/plugins/client/graphql-kotlin-client-generator/src/test/data/generator/interface_impl_diff_selection_sets/differentselectionsetquery/BasicInterface2.kt +++ b/plugins/client/graphql-kotlin-client-generator/src/test/data/generator/interface_impl_diff_selection_sets/types/BasicInterface2.kt @@ -1,4 +1,4 @@ -package com.expediagroup.graphql.generated.differentselectionsetquery +package com.expediagroup.graphql.generated.types import com.expediagroup.graphql.client.Generated import com.fasterxml.jackson.`annotation`.JsonProperty diff --git a/plugins/client/graphql-kotlin-client-generator/src/test/data/generator/interface_missing_types/InterfaceMissingTypeSelection.kt b/plugins/client/graphql-kotlin-client-generator/src/test/data/generator/interface_missing_types/InterfaceMissingTypeSelection.kt index 645899bc50..81290799fe 100644 --- a/plugins/client/graphql-kotlin-client-generator/src/test/data/generator/interface_missing_types/InterfaceMissingTypeSelection.kt +++ b/plugins/client/graphql-kotlin-client-generator/src/test/data/generator/interface_missing_types/InterfaceMissingTypeSelection.kt @@ -2,7 +2,7 @@ package com.expediagroup.graphql.generated import com.expediagroup.graphql.client.Generated import com.expediagroup.graphql.client.types.GraphQLClientRequest -import com.expediagroup.graphql.generated.interfacemissingtypeselection.BasicInterface +import com.expediagroup.graphql.generated.types.BasicInterface import com.fasterxml.jackson.`annotation`.JsonProperty import kotlin.String import kotlin.reflect.KClass diff --git a/plugins/client/graphql-kotlin-client-generator/src/test/data/generator/interface_missing_types/interfacemissingtypeselection/BasicInterface.kt b/plugins/client/graphql-kotlin-client-generator/src/test/data/generator/interface_missing_types/types/BasicInterface.kt similarity index 96% rename from plugins/client/graphql-kotlin-client-generator/src/test/data/generator/interface_missing_types/interfacemissingtypeselection/BasicInterface.kt rename to plugins/client/graphql-kotlin-client-generator/src/test/data/generator/interface_missing_types/types/BasicInterface.kt index c954eb7897..f85729fe41 100644 --- a/plugins/client/graphql-kotlin-client-generator/src/test/data/generator/interface_missing_types/interfacemissingtypeselection/BasicInterface.kt +++ b/plugins/client/graphql-kotlin-client-generator/src/test/data/generator/interface_missing_types/types/BasicInterface.kt @@ -1,4 +1,4 @@ -package com.expediagroup.graphql.generated.interfacemissingtypeselection +package com.expediagroup.graphql.generated.types import com.expediagroup.graphql.client.Generated import com.fasterxml.jackson.`annotation`.JsonProperty diff --git a/plugins/client/graphql-kotlin-client-generator/src/test/data/generator/interface_named_fragments/InterfaceWithNamedFragmentsQuery.kt b/plugins/client/graphql-kotlin-client-generator/src/test/data/generator/interface_named_fragments/InterfaceWithNamedFragmentsQuery.kt index fb776fec03..14d75c0107 100644 --- a/plugins/client/graphql-kotlin-client-generator/src/test/data/generator/interface_named_fragments/InterfaceWithNamedFragmentsQuery.kt +++ b/plugins/client/graphql-kotlin-client-generator/src/test/data/generator/interface_named_fragments/InterfaceWithNamedFragmentsQuery.kt @@ -2,7 +2,7 @@ package com.expediagroup.graphql.generated import com.expediagroup.graphql.client.Generated import com.expediagroup.graphql.client.types.GraphQLClientRequest -import com.expediagroup.graphql.generated.interfacewithnamedfragmentsquery.BasicInterface +import com.expediagroup.graphql.generated.types.BasicInterface import com.fasterxml.jackson.`annotation`.JsonProperty import kotlin.String import kotlin.reflect.KClass diff --git a/plugins/client/graphql-kotlin-client-generator/src/test/data/generator/interface_named_fragments/interfacewithnamedfragmentsquery/BasicInterface.kt b/plugins/client/graphql-kotlin-client-generator/src/test/data/generator/interface_named_fragments/types/BasicInterface.kt similarity index 97% rename from plugins/client/graphql-kotlin-client-generator/src/test/data/generator/interface_named_fragments/interfacewithnamedfragmentsquery/BasicInterface.kt rename to plugins/client/graphql-kotlin-client-generator/src/test/data/generator/interface_named_fragments/types/BasicInterface.kt index c1343e0995..6f7ca05e4a 100644 --- a/plugins/client/graphql-kotlin-client-generator/src/test/data/generator/interface_named_fragments/interfacewithnamedfragmentsquery/BasicInterface.kt +++ b/plugins/client/graphql-kotlin-client-generator/src/test/data/generator/interface_named_fragments/types/BasicInterface.kt @@ -1,4 +1,4 @@ -package com.expediagroup.graphql.generated.interfacewithnamedfragmentsquery +package com.expediagroup.graphql.generated.types import com.expediagroup.graphql.client.Generated import com.fasterxml.jackson.`annotation`.JsonProperty diff --git a/plugins/client/graphql-kotlin-client-generator/src/test/data/generator/mutation/SimpleMutation.kt b/plugins/client/graphql-kotlin-client-generator/src/test/data/generator/mutation/SimpleMutation.kt index 934dc46b9f..3c1e33b439 100644 --- a/plugins/client/graphql-kotlin-client-generator/src/test/data/generator/mutation/SimpleMutation.kt +++ b/plugins/client/graphql-kotlin-client-generator/src/test/data/generator/mutation/SimpleMutation.kt @@ -3,7 +3,7 @@ package com.expediagroup.graphql.generated import com.expediagroup.graphql.client.Generated import com.expediagroup.graphql.client.types.GraphQLClientRequest import com.expediagroup.graphql.generated.inputs.SimpleArgumentInput -import com.expediagroup.graphql.generated.simplemutation.BasicObject +import com.expediagroup.graphql.generated.types.BasicObject import com.fasterxml.jackson.`annotation`.JsonProperty import kotlin.String import kotlin.reflect.KClass diff --git a/plugins/client/graphql-kotlin-client-generator/src/test/data/generator/object_list/listquery/BasicObject.kt b/plugins/client/graphql-kotlin-client-generator/src/test/data/generator/mutation/types/BasicObject.kt similarity index 87% rename from plugins/client/graphql-kotlin-client-generator/src/test/data/generator/object_list/listquery/BasicObject.kt rename to plugins/client/graphql-kotlin-client-generator/src/test/data/generator/mutation/types/BasicObject.kt index ef91f2c75a..6d63f6743f 100644 --- a/plugins/client/graphql-kotlin-client-generator/src/test/data/generator/object_list/listquery/BasicObject.kt +++ b/plugins/client/graphql-kotlin-client-generator/src/test/data/generator/mutation/types/BasicObject.kt @@ -1,4 +1,4 @@ -package com.expediagroup.graphql.generated.listquery +package com.expediagroup.graphql.generated.types import com.expediagroup.graphql.client.Generated import com.fasterxml.jackson.`annotation`.JsonProperty diff --git a/plugins/client/graphql-kotlin-client-generator/src/test/data/generator/object_diff_selection_set/DifferentSelectionsQuery.kt b/plugins/client/graphql-kotlin-client-generator/src/test/data/generator/object_diff_selection_set/DifferentSelectionsQuery.kt index e440381562..70a901cb30 100644 --- a/plugins/client/graphql-kotlin-client-generator/src/test/data/generator/object_diff_selection_set/DifferentSelectionsQuery.kt +++ b/plugins/client/graphql-kotlin-client-generator/src/test/data/generator/object_diff_selection_set/DifferentSelectionsQuery.kt @@ -2,8 +2,8 @@ package com.expediagroup.graphql.generated import com.expediagroup.graphql.client.Generated import com.expediagroup.graphql.client.types.GraphQLClientRequest -import com.expediagroup.graphql.generated.differentselectionsquery.ComplexObject -import com.expediagroup.graphql.generated.differentselectionsquery.ComplexObject2 +import com.expediagroup.graphql.generated.types.ComplexObject +import com.expediagroup.graphql.generated.types.ComplexObject2 import com.fasterxml.jackson.`annotation`.JsonProperty import kotlin.String import kotlin.reflect.KClass diff --git a/plugins/client/graphql-kotlin-client-generator/src/test/data/generator/reuse_types/reusedtypesquery/ComplexObject.kt b/plugins/client/graphql-kotlin-client-generator/src/test/data/generator/object_diff_selection_set/types/ComplexObject.kt similarity index 89% rename from plugins/client/graphql-kotlin-client-generator/src/test/data/generator/reuse_types/reusedtypesquery/ComplexObject.kt rename to plugins/client/graphql-kotlin-client-generator/src/test/data/generator/object_diff_selection_set/types/ComplexObject.kt index d92ba850a8..107e08c88a 100644 --- a/plugins/client/graphql-kotlin-client-generator/src/test/data/generator/reuse_types/reusedtypesquery/ComplexObject.kt +++ b/plugins/client/graphql-kotlin-client-generator/src/test/data/generator/object_diff_selection_set/types/ComplexObject.kt @@ -1,4 +1,4 @@ -package com.expediagroup.graphql.generated.reusedtypesquery +package com.expediagroup.graphql.generated.types import com.expediagroup.graphql.client.Generated import com.fasterxml.jackson.`annotation`.JsonProperty diff --git a/plugins/client/graphql-kotlin-client-generator/src/test/data/generator/reuse_types/reusedtypesquery/ComplexObject2.kt b/plugins/client/graphql-kotlin-client-generator/src/test/data/generator/object_diff_selection_set/types/ComplexObject2.kt similarity index 91% rename from plugins/client/graphql-kotlin-client-generator/src/test/data/generator/reuse_types/reusedtypesquery/ComplexObject2.kt rename to plugins/client/graphql-kotlin-client-generator/src/test/data/generator/object_diff_selection_set/types/ComplexObject2.kt index 54547494b7..d93be23804 100644 --- a/plugins/client/graphql-kotlin-client-generator/src/test/data/generator/reuse_types/reusedtypesquery/ComplexObject2.kt +++ b/plugins/client/graphql-kotlin-client-generator/src/test/data/generator/object_diff_selection_set/types/ComplexObject2.kt @@ -1,4 +1,4 @@ -package com.expediagroup.graphql.generated.reusedtypesquery +package com.expediagroup.graphql.generated.types import com.expediagroup.graphql.client.Generated import com.fasterxml.jackson.`annotation`.JsonProperty diff --git a/plugins/client/graphql-kotlin-client-generator/src/test/data/generator/reuse_types/reusedtypesquery/DetailsObject.kt b/plugins/client/graphql-kotlin-client-generator/src/test/data/generator/object_diff_selection_set/types/DetailsObject.kt similarity index 87% rename from plugins/client/graphql-kotlin-client-generator/src/test/data/generator/reuse_types/reusedtypesquery/DetailsObject.kt rename to plugins/client/graphql-kotlin-client-generator/src/test/data/generator/object_diff_selection_set/types/DetailsObject.kt index ab59499c0a..35be5d034c 100644 --- a/plugins/client/graphql-kotlin-client-generator/src/test/data/generator/reuse_types/reusedtypesquery/DetailsObject.kt +++ b/plugins/client/graphql-kotlin-client-generator/src/test/data/generator/object_diff_selection_set/types/DetailsObject.kt @@ -1,4 +1,4 @@ -package com.expediagroup.graphql.generated.reusedtypesquery +package com.expediagroup.graphql.generated.types import com.expediagroup.graphql.client.Generated import com.fasterxml.jackson.`annotation`.JsonProperty diff --git a/plugins/client/graphql-kotlin-client-generator/src/test/data/generator/object_diff_sub_selection/DifferentSubselectionQuery.kt b/plugins/client/graphql-kotlin-client-generator/src/test/data/generator/object_diff_sub_selection/DifferentSubselectionQuery.kt index fe11198670..ffdfb23360 100644 --- a/plugins/client/graphql-kotlin-client-generator/src/test/data/generator/object_diff_sub_selection/DifferentSubselectionQuery.kt +++ b/plugins/client/graphql-kotlin-client-generator/src/test/data/generator/object_diff_sub_selection/DifferentSubselectionQuery.kt @@ -2,8 +2,8 @@ package com.expediagroup.graphql.generated import com.expediagroup.graphql.client.Generated import com.expediagroup.graphql.client.types.GraphQLClientRequest -import com.expediagroup.graphql.generated.differentsubselectionquery.ComplexObject -import com.expediagroup.graphql.generated.differentsubselectionquery.ComplexObject2 +import com.expediagroup.graphql.generated.types.ComplexObject +import com.expediagroup.graphql.generated.types.ComplexObject2 import com.fasterxml.jackson.`annotation`.JsonProperty import kotlin.String import kotlin.reflect.KClass diff --git a/plugins/client/graphql-kotlin-client-generator/src/test/data/generator/object_diff_sub_selection/differentsubselectionquery/ComplexObject.kt b/plugins/client/graphql-kotlin-client-generator/src/test/data/generator/object_diff_sub_selection/types/ComplexObject.kt similarity index 90% rename from plugins/client/graphql-kotlin-client-generator/src/test/data/generator/object_diff_sub_selection/differentsubselectionquery/ComplexObject.kt rename to plugins/client/graphql-kotlin-client-generator/src/test/data/generator/object_diff_sub_selection/types/ComplexObject.kt index 4e79d82b6f..67f82e9b66 100644 --- a/plugins/client/graphql-kotlin-client-generator/src/test/data/generator/object_diff_sub_selection/differentsubselectionquery/ComplexObject.kt +++ b/plugins/client/graphql-kotlin-client-generator/src/test/data/generator/object_diff_sub_selection/types/ComplexObject.kt @@ -1,4 +1,4 @@ -package com.expediagroup.graphql.generated.differentsubselectionquery +package com.expediagroup.graphql.generated.types import com.expediagroup.graphql.client.Generated import com.fasterxml.jackson.`annotation`.JsonProperty diff --git a/plugins/client/graphql-kotlin-client-generator/src/test/data/generator/object_diff_sub_selection/differentsubselectionquery/ComplexObject2.kt b/plugins/client/graphql-kotlin-client-generator/src/test/data/generator/object_diff_sub_selection/types/ComplexObject2.kt similarity index 90% rename from plugins/client/graphql-kotlin-client-generator/src/test/data/generator/object_diff_sub_selection/differentsubselectionquery/ComplexObject2.kt rename to plugins/client/graphql-kotlin-client-generator/src/test/data/generator/object_diff_sub_selection/types/ComplexObject2.kt index 033ad5d4a6..a944a00826 100644 --- a/plugins/client/graphql-kotlin-client-generator/src/test/data/generator/object_diff_sub_selection/differentsubselectionquery/ComplexObject2.kt +++ b/plugins/client/graphql-kotlin-client-generator/src/test/data/generator/object_diff_sub_selection/types/ComplexObject2.kt @@ -1,4 +1,4 @@ -package com.expediagroup.graphql.generated.differentsubselectionquery +package com.expediagroup.graphql.generated.types import com.expediagroup.graphql.client.Generated import com.fasterxml.jackson.`annotation`.JsonProperty diff --git a/plugins/client/graphql-kotlin-client-generator/src/test/data/jackson/object/complexobjectquery/DetailsObject.kt b/plugins/client/graphql-kotlin-client-generator/src/test/data/generator/object_diff_sub_selection/types/DetailsObject.kt similarity index 89% rename from plugins/client/graphql-kotlin-client-generator/src/test/data/jackson/object/complexobjectquery/DetailsObject.kt rename to plugins/client/graphql-kotlin-client-generator/src/test/data/generator/object_diff_sub_selection/types/DetailsObject.kt index 3b8be11943..5f024b2940 100644 --- a/plugins/client/graphql-kotlin-client-generator/src/test/data/jackson/object/complexobjectquery/DetailsObject.kt +++ b/plugins/client/graphql-kotlin-client-generator/src/test/data/generator/object_diff_sub_selection/types/DetailsObject.kt @@ -1,4 +1,4 @@ -package com.expediagroup.graphql.generated.complexobjectquery +package com.expediagroup.graphql.generated.types import com.expediagroup.graphql.client.Generated import com.fasterxml.jackson.`annotation`.JsonProperty @@ -16,14 +16,14 @@ public data class DetailsObject( */ @get:JsonProperty(value = "id") public val id: Int, - /** - * Boolean flag - */ - @get:JsonProperty(value = "flag") - public val flag: Boolean, /** * Actual detail value */ @get:JsonProperty(value = "value") public val `value`: String, + /** + * Boolean flag + */ + @get:JsonProperty(value = "flag") + public val flag: Boolean, ) diff --git a/plugins/client/graphql-kotlin-client-generator/src/test/data/generator/object_diff_sub_selection/differentsubselectionquery/DetailsObject2.kt b/plugins/client/graphql-kotlin-client-generator/src/test/data/generator/object_diff_sub_selection/types/DetailsObject2.kt similarity index 85% rename from plugins/client/graphql-kotlin-client-generator/src/test/data/generator/object_diff_sub_selection/differentsubselectionquery/DetailsObject2.kt rename to plugins/client/graphql-kotlin-client-generator/src/test/data/generator/object_diff_sub_selection/types/DetailsObject2.kt index 5bb27fbe29..17cc795b6d 100644 --- a/plugins/client/graphql-kotlin-client-generator/src/test/data/generator/object_diff_sub_selection/differentsubselectionquery/DetailsObject2.kt +++ b/plugins/client/graphql-kotlin-client-generator/src/test/data/generator/object_diff_sub_selection/types/DetailsObject2.kt @@ -1,4 +1,4 @@ -package com.expediagroup.graphql.generated.differentsubselectionquery +package com.expediagroup.graphql.generated.types import com.expediagroup.graphql.client.Generated import com.fasterxml.jackson.`annotation`.JsonProperty diff --git a/plugins/client/graphql-kotlin-client-generator/src/test/data/generator/object_list/ListQuery.kt b/plugins/client/graphql-kotlin-client-generator/src/test/data/generator/object_list/ListQuery.kt index 02fded198b..4576dc31d1 100644 --- a/plugins/client/graphql-kotlin-client-generator/src/test/data/generator/object_list/ListQuery.kt +++ b/plugins/client/graphql-kotlin-client-generator/src/test/data/generator/object_list/ListQuery.kt @@ -2,7 +2,7 @@ package com.expediagroup.graphql.generated import com.expediagroup.graphql.client.Generated import com.expediagroup.graphql.client.types.GraphQLClientRequest -import com.expediagroup.graphql.generated.listquery.BasicObject +import com.expediagroup.graphql.generated.types.BasicObject import com.fasterxml.jackson.`annotation`.JsonProperty import kotlin.String import kotlin.collections.List diff --git a/plugins/client/graphql-kotlin-client-generator/src/test/data/generator/mutation/simplemutation/BasicObject.kt b/plugins/client/graphql-kotlin-client-generator/src/test/data/generator/object_list/types/BasicObject.kt similarity index 86% rename from plugins/client/graphql-kotlin-client-generator/src/test/data/generator/mutation/simplemutation/BasicObject.kt rename to plugins/client/graphql-kotlin-client-generator/src/test/data/generator/object_list/types/BasicObject.kt index c89c01fb4a..6d63f6743f 100644 --- a/plugins/client/graphql-kotlin-client-generator/src/test/data/generator/mutation/simplemutation/BasicObject.kt +++ b/plugins/client/graphql-kotlin-client-generator/src/test/data/generator/object_list/types/BasicObject.kt @@ -1,4 +1,4 @@ -package com.expediagroup.graphql.generated.simplemutation +package com.expediagroup.graphql.generated.types import com.expediagroup.graphql.client.Generated import com.fasterxml.jackson.`annotation`.JsonProperty diff --git a/plugins/client/graphql-kotlin-client-generator/src/test/data/generator/object_named_fragments/ObjectWithNamedFragmentQuery.kt b/plugins/client/graphql-kotlin-client-generator/src/test/data/generator/object_named_fragments/ObjectWithNamedFragmentQuery.kt index 3c51e22ef6..2c61172534 100644 --- a/plugins/client/graphql-kotlin-client-generator/src/test/data/generator/object_named_fragments/ObjectWithNamedFragmentQuery.kt +++ b/plugins/client/graphql-kotlin-client-generator/src/test/data/generator/object_named_fragments/ObjectWithNamedFragmentQuery.kt @@ -2,7 +2,7 @@ package com.expediagroup.graphql.generated import com.expediagroup.graphql.client.Generated import com.expediagroup.graphql.client.types.GraphQLClientRequest -import com.expediagroup.graphql.generated.objectwithnamedfragmentquery.ComplexObject +import com.expediagroup.graphql.generated.types.ComplexObject import com.fasterxml.jackson.`annotation`.JsonProperty import kotlin.String import kotlin.reflect.KClass diff --git a/plugins/client/graphql-kotlin-client-generator/src/test/data/generator/object_named_fragments/objectwithnamedfragmentquery/ComplexObject.kt b/plugins/client/graphql-kotlin-client-generator/src/test/data/generator/object_named_fragments/types/ComplexObject.kt similarity index 89% rename from plugins/client/graphql-kotlin-client-generator/src/test/data/generator/object_named_fragments/objectwithnamedfragmentquery/ComplexObject.kt rename to plugins/client/graphql-kotlin-client-generator/src/test/data/generator/object_named_fragments/types/ComplexObject.kt index ed20d6f8f3..67f82e9b66 100644 --- a/plugins/client/graphql-kotlin-client-generator/src/test/data/generator/object_named_fragments/objectwithnamedfragmentquery/ComplexObject.kt +++ b/plugins/client/graphql-kotlin-client-generator/src/test/data/generator/object_named_fragments/types/ComplexObject.kt @@ -1,4 +1,4 @@ -package com.expediagroup.graphql.generated.objectwithnamedfragmentquery +package com.expediagroup.graphql.generated.types import com.expediagroup.graphql.client.Generated import com.fasterxml.jackson.`annotation`.JsonProperty diff --git a/plugins/client/graphql-kotlin-client-generator/src/test/data/generator/union_diff_selection_set2/differentselectionsetquery/DetailsObject.kt b/plugins/client/graphql-kotlin-client-generator/src/test/data/generator/object_named_fragments/types/DetailsObject.kt similarity index 81% rename from plugins/client/graphql-kotlin-client-generator/src/test/data/generator/union_diff_selection_set2/differentselectionsetquery/DetailsObject.kt rename to plugins/client/graphql-kotlin-client-generator/src/test/data/generator/object_named_fragments/types/DetailsObject.kt index c201bdc662..6ea269df90 100644 --- a/plugins/client/graphql-kotlin-client-generator/src/test/data/generator/union_diff_selection_set2/differentselectionsetquery/DetailsObject.kt +++ b/plugins/client/graphql-kotlin-client-generator/src/test/data/generator/object_named_fragments/types/DetailsObject.kt @@ -1,4 +1,4 @@ -package com.expediagroup.graphql.generated.differentselectionsetquery +package com.expediagroup.graphql.generated.types import com.expediagroup.graphql.client.Generated import com.fasterxml.jackson.`annotation`.JsonProperty diff --git a/plugins/client/graphql-kotlin-client-generator/src/test/data/generator/object_self_reference/NestedQuery.kt b/plugins/client/graphql-kotlin-client-generator/src/test/data/generator/object_self_reference/NestedQuery.kt index 701acc8e86..e0aeb9a607 100644 --- a/plugins/client/graphql-kotlin-client-generator/src/test/data/generator/object_self_reference/NestedQuery.kt +++ b/plugins/client/graphql-kotlin-client-generator/src/test/data/generator/object_self_reference/NestedQuery.kt @@ -2,7 +2,7 @@ package com.expediagroup.graphql.generated import com.expediagroup.graphql.client.Generated import com.expediagroup.graphql.client.types.GraphQLClientRequest -import com.expediagroup.graphql.generated.nestedquery.NestedObject +import com.expediagroup.graphql.generated.types.NestedObject import com.fasterxml.jackson.`annotation`.JsonProperty import kotlin.String import kotlin.reflect.KClass diff --git a/plugins/client/graphql-kotlin-client-generator/src/test/data/generator/object_self_reference/nestedquery/NestedObject.kt b/plugins/client/graphql-kotlin-client-generator/src/test/data/generator/object_self_reference/types/NestedObject.kt similarity index 91% rename from plugins/client/graphql-kotlin-client-generator/src/test/data/generator/object_self_reference/nestedquery/NestedObject.kt rename to plugins/client/graphql-kotlin-client-generator/src/test/data/generator/object_self_reference/types/NestedObject.kt index 02675cf684..ea07c1c734 100644 --- a/plugins/client/graphql-kotlin-client-generator/src/test/data/generator/object_self_reference/nestedquery/NestedObject.kt +++ b/plugins/client/graphql-kotlin-client-generator/src/test/data/generator/object_self_reference/types/NestedObject.kt @@ -1,4 +1,4 @@ -package com.expediagroup.graphql.generated.nestedquery +package com.expediagroup.graphql.generated.types import com.expediagroup.graphql.client.Generated import com.fasterxml.jackson.`annotation`.JsonProperty diff --git a/plugins/client/graphql-kotlin-client-generator/src/test/data/generator/object_self_reference/nestedquery/NestedObject2.kt b/plugins/client/graphql-kotlin-client-generator/src/test/data/generator/object_self_reference/types/NestedObject2.kt similarity index 89% rename from plugins/client/graphql-kotlin-client-generator/src/test/data/generator/object_self_reference/nestedquery/NestedObject2.kt rename to plugins/client/graphql-kotlin-client-generator/src/test/data/generator/object_self_reference/types/NestedObject2.kt index d38eff8b7a..1b69e25aed 100644 --- a/plugins/client/graphql-kotlin-client-generator/src/test/data/generator/object_self_reference/nestedquery/NestedObject2.kt +++ b/plugins/client/graphql-kotlin-client-generator/src/test/data/generator/object_self_reference/types/NestedObject2.kt @@ -1,4 +1,4 @@ -package com.expediagroup.graphql.generated.nestedquery +package com.expediagroup.graphql.generated.types import com.expediagroup.graphql.client.Generated import com.fasterxml.jackson.`annotation`.JsonProperty diff --git a/plugins/client/graphql-kotlin-client-generator/src/test/data/generator/object_self_reference/nestedquery/NestedObject3.kt b/plugins/client/graphql-kotlin-client-generator/src/test/data/generator/object_self_reference/types/NestedObject3.kt similarity index 91% rename from plugins/client/graphql-kotlin-client-generator/src/test/data/generator/object_self_reference/nestedquery/NestedObject3.kt rename to plugins/client/graphql-kotlin-client-generator/src/test/data/generator/object_self_reference/types/NestedObject3.kt index b8a9cc92ac..f49361967b 100644 --- a/plugins/client/graphql-kotlin-client-generator/src/test/data/generator/object_self_reference/nestedquery/NestedObject3.kt +++ b/plugins/client/graphql-kotlin-client-generator/src/test/data/generator/object_self_reference/types/NestedObject3.kt @@ -1,4 +1,4 @@ -package com.expediagroup.graphql.generated.nestedquery +package com.expediagroup.graphql.generated.types import com.expediagroup.graphql.client.Generated import com.fasterxml.jackson.`annotation`.JsonProperty diff --git a/plugins/client/graphql-kotlin-client-generator/src/test/data/generator/object_self_reference/nestedquery/NestedObject4.kt b/plugins/client/graphql-kotlin-client-generator/src/test/data/generator/object_self_reference/types/NestedObject4.kt similarity index 88% rename from plugins/client/graphql-kotlin-client-generator/src/test/data/generator/object_self_reference/nestedquery/NestedObject4.kt rename to plugins/client/graphql-kotlin-client-generator/src/test/data/generator/object_self_reference/types/NestedObject4.kt index ea2f379db5..1778e8582a 100644 --- a/plugins/client/graphql-kotlin-client-generator/src/test/data/generator/object_self_reference/nestedquery/NestedObject4.kt +++ b/plugins/client/graphql-kotlin-client-generator/src/test/data/generator/object_self_reference/types/NestedObject4.kt @@ -1,4 +1,4 @@ -package com.expediagroup.graphql.generated.nestedquery +package com.expediagroup.graphql.generated.types import com.expediagroup.graphql.client.Generated import com.fasterxml.jackson.`annotation`.JsonProperty diff --git a/plugins/client/graphql-kotlin-client-generator/src/test/data/generator/operation_name_missing/AnonymousQuery.kt b/plugins/client/graphql-kotlin-client-generator/src/test/data/generator/operation_name_missing/AnonymousQuery.kt index 40c1e724f7..c44b399db4 100644 --- a/plugins/client/graphql-kotlin-client-generator/src/test/data/generator/operation_name_missing/AnonymousQuery.kt +++ b/plugins/client/graphql-kotlin-client-generator/src/test/data/generator/operation_name_missing/AnonymousQuery.kt @@ -2,7 +2,7 @@ package com.expediagroup.graphql.generated import com.expediagroup.graphql.client.Generated import com.expediagroup.graphql.client.types.GraphQLClientRequest -import com.expediagroup.graphql.generated.anonymousquery.ScalarWrapper +import com.expediagroup.graphql.generated.types.ScalarWrapper import com.fasterxml.jackson.`annotation`.JsonProperty import kotlin.String import kotlin.reflect.KClass diff --git a/plugins/client/graphql-kotlin-client-generator/src/test/data/generator/operation_name_missing/anonymousquery/ScalarWrapper.kt b/plugins/client/graphql-kotlin-client-generator/src/test/data/generator/operation_name_missing/types/ScalarWrapper.kt similarity index 85% rename from plugins/client/graphql-kotlin-client-generator/src/test/data/generator/operation_name_missing/anonymousquery/ScalarWrapper.kt rename to plugins/client/graphql-kotlin-client-generator/src/test/data/generator/operation_name_missing/types/ScalarWrapper.kt index 719e5936a8..31bac005cc 100644 --- a/plugins/client/graphql-kotlin-client-generator/src/test/data/generator/operation_name_missing/anonymousquery/ScalarWrapper.kt +++ b/plugins/client/graphql-kotlin-client-generator/src/test/data/generator/operation_name_missing/types/ScalarWrapper.kt @@ -1,4 +1,4 @@ -package com.expediagroup.graphql.generated.anonymousquery +package com.expediagroup.graphql.generated.types import com.expediagroup.graphql.client.Generated import com.fasterxml.jackson.`annotation`.JsonProperty diff --git a/plugins/client/graphql-kotlin-client-generator/src/test/data/generator/operation_name_unchanged/MiXEDcaSEQuery.kt b/plugins/client/graphql-kotlin-client-generator/src/test/data/generator/operation_name_unchanged/MiXEDcaSEQuery.kt index 4a003e6075..927bad131c 100644 --- a/plugins/client/graphql-kotlin-client-generator/src/test/data/generator/operation_name_unchanged/MiXEDcaSEQuery.kt +++ b/plugins/client/graphql-kotlin-client-generator/src/test/data/generator/operation_name_unchanged/MiXEDcaSEQuery.kt @@ -2,7 +2,7 @@ package com.expediagroup.graphql.generated import com.expediagroup.graphql.client.Generated import com.expediagroup.graphql.client.types.GraphQLClientRequest -import com.expediagroup.graphql.generated.mixedcasequery.ScalarWrapper +import com.expediagroup.graphql.generated.types.ScalarWrapper import com.fasterxml.jackson.`annotation`.JsonProperty import kotlin.String import kotlin.reflect.KClass diff --git a/plugins/client/graphql-kotlin-client-generator/src/test/data/generator/operation_name_unchanged/mixedcasequery/ScalarWrapper.kt b/plugins/client/graphql-kotlin-client-generator/src/test/data/generator/operation_name_unchanged/types/ScalarWrapper.kt similarity index 85% rename from plugins/client/graphql-kotlin-client-generator/src/test/data/generator/operation_name_unchanged/mixedcasequery/ScalarWrapper.kt rename to plugins/client/graphql-kotlin-client-generator/src/test/data/generator/operation_name_unchanged/types/ScalarWrapper.kt index f478b3a271..31bac005cc 100644 --- a/plugins/client/graphql-kotlin-client-generator/src/test/data/generator/operation_name_unchanged/mixedcasequery/ScalarWrapper.kt +++ b/plugins/client/graphql-kotlin-client-generator/src/test/data/generator/operation_name_unchanged/types/ScalarWrapper.kt @@ -1,4 +1,4 @@ -package com.expediagroup.graphql.generated.mixedcasequery +package com.expediagroup.graphql.generated.types import com.expediagroup.graphql.client.Generated import com.fasterxml.jackson.`annotation`.JsonProperty diff --git a/plugins/client/graphql-kotlin-client-generator/src/test/data/generator/reuse_list_types/ReusedListTypesQuery.kt b/plugins/client/graphql-kotlin-client-generator/src/test/data/generator/reuse_list_types/ReusedListTypesQuery.kt index 6c2ffabfce..c358a45eda 100644 --- a/plugins/client/graphql-kotlin-client-generator/src/test/data/generator/reuse_list_types/ReusedListTypesQuery.kt +++ b/plugins/client/graphql-kotlin-client-generator/src/test/data/generator/reuse_list_types/ReusedListTypesQuery.kt @@ -2,11 +2,11 @@ package com.expediagroup.graphql.generated import com.expediagroup.graphql.client.Generated import com.expediagroup.graphql.client.types.GraphQLClientRequest -import com.expediagroup.graphql.generated.reusedlisttypesquery.BasicObject -import com.expediagroup.graphql.generated.reusedlisttypesquery.BasicObject2 -import com.expediagroup.graphql.generated.reusedlisttypesquery.ComplexObject -import com.expediagroup.graphql.generated.reusedlisttypesquery.ComplexObject2 -import com.expediagroup.graphql.generated.reusedlisttypesquery.ComplexObject3 +import com.expediagroup.graphql.generated.types.BasicObject +import com.expediagroup.graphql.generated.types.BasicObject2 +import com.expediagroup.graphql.generated.types.ComplexObject +import com.expediagroup.graphql.generated.types.ComplexObject2 +import com.expediagroup.graphql.generated.types.ComplexObject3 import com.fasterxml.jackson.`annotation`.JsonProperty import kotlin.String import kotlin.collections.List diff --git a/plugins/client/graphql-kotlin-client-generator/src/test/data/generator/reuse_list_types/reusedlisttypesquery/BasicObject.kt b/plugins/client/graphql-kotlin-client-generator/src/test/data/generator/reuse_list_types/types/BasicObject.kt similarity index 85% rename from plugins/client/graphql-kotlin-client-generator/src/test/data/generator/reuse_list_types/reusedlisttypesquery/BasicObject.kt rename to plugins/client/graphql-kotlin-client-generator/src/test/data/generator/reuse_list_types/types/BasicObject.kt index 7d987700cc..6d63f6743f 100644 --- a/plugins/client/graphql-kotlin-client-generator/src/test/data/generator/reuse_list_types/reusedlisttypesquery/BasicObject.kt +++ b/plugins/client/graphql-kotlin-client-generator/src/test/data/generator/reuse_list_types/types/BasicObject.kt @@ -1,4 +1,4 @@ -package com.expediagroup.graphql.generated.reusedlisttypesquery +package com.expediagroup.graphql.generated.types import com.expediagroup.graphql.client.Generated import com.fasterxml.jackson.`annotation`.JsonProperty diff --git a/plugins/client/graphql-kotlin-client-generator/src/test/data/generator/reuse_list_types/reusedlisttypesquery/BasicObject2.kt b/plugins/client/graphql-kotlin-client-generator/src/test/data/generator/reuse_list_types/types/BasicObject2.kt similarity index 82% rename from plugins/client/graphql-kotlin-client-generator/src/test/data/generator/reuse_list_types/reusedlisttypesquery/BasicObject2.kt rename to plugins/client/graphql-kotlin-client-generator/src/test/data/generator/reuse_list_types/types/BasicObject2.kt index 235b95669c..4c18eb1cde 100644 --- a/plugins/client/graphql-kotlin-client-generator/src/test/data/generator/reuse_list_types/reusedlisttypesquery/BasicObject2.kt +++ b/plugins/client/graphql-kotlin-client-generator/src/test/data/generator/reuse_list_types/types/BasicObject2.kt @@ -1,4 +1,4 @@ -package com.expediagroup.graphql.generated.reusedlisttypesquery +package com.expediagroup.graphql.generated.types import com.expediagroup.graphql.client.Generated import com.fasterxml.jackson.`annotation`.JsonProperty diff --git a/plugins/client/graphql-kotlin-client-generator/src/test/data/generator/reuse_list_types/reusedlisttypesquery/BasicObject3.kt b/plugins/client/graphql-kotlin-client-generator/src/test/data/generator/reuse_list_types/types/BasicObject3.kt similarity index 80% rename from plugins/client/graphql-kotlin-client-generator/src/test/data/generator/reuse_list_types/reusedlisttypesquery/BasicObject3.kt rename to plugins/client/graphql-kotlin-client-generator/src/test/data/generator/reuse_list_types/types/BasicObject3.kt index 2780ffe6e8..9dbea651a9 100644 --- a/plugins/client/graphql-kotlin-client-generator/src/test/data/generator/reuse_list_types/reusedlisttypesquery/BasicObject3.kt +++ b/plugins/client/graphql-kotlin-client-generator/src/test/data/generator/reuse_list_types/types/BasicObject3.kt @@ -1,4 +1,4 @@ -package com.expediagroup.graphql.generated.reusedlisttypesquery +package com.expediagroup.graphql.generated.types import com.expediagroup.graphql.client.Generated import com.fasterxml.jackson.`annotation`.JsonProperty diff --git a/plugins/client/graphql-kotlin-client-generator/src/test/data/generator/reuse_list_types/reusedlisttypesquery/ComplexObject.kt b/plugins/client/graphql-kotlin-client-generator/src/test/data/generator/reuse_list_types/types/ComplexObject.kt similarity index 91% rename from plugins/client/graphql-kotlin-client-generator/src/test/data/generator/reuse_list_types/reusedlisttypesquery/ComplexObject.kt rename to plugins/client/graphql-kotlin-client-generator/src/test/data/generator/reuse_list_types/types/ComplexObject.kt index 105b19e702..1519ab8c0f 100644 --- a/plugins/client/graphql-kotlin-client-generator/src/test/data/generator/reuse_list_types/reusedlisttypesquery/ComplexObject.kt +++ b/plugins/client/graphql-kotlin-client-generator/src/test/data/generator/reuse_list_types/types/ComplexObject.kt @@ -1,4 +1,4 @@ -package com.expediagroup.graphql.generated.reusedlisttypesquery +package com.expediagroup.graphql.generated.types import com.expediagroup.graphql.client.Generated import com.fasterxml.jackson.`annotation`.JsonProperty diff --git a/plugins/client/graphql-kotlin-client-generator/src/test/data/generator/reuse_list_types/reusedlisttypesquery/ComplexObject2.kt b/plugins/client/graphql-kotlin-client-generator/src/test/data/generator/reuse_list_types/types/ComplexObject2.kt similarity index 91% rename from plugins/client/graphql-kotlin-client-generator/src/test/data/generator/reuse_list_types/reusedlisttypesquery/ComplexObject2.kt rename to plugins/client/graphql-kotlin-client-generator/src/test/data/generator/reuse_list_types/types/ComplexObject2.kt index 1e3ef6bee9..016f647686 100644 --- a/plugins/client/graphql-kotlin-client-generator/src/test/data/generator/reuse_list_types/reusedlisttypesquery/ComplexObject2.kt +++ b/plugins/client/graphql-kotlin-client-generator/src/test/data/generator/reuse_list_types/types/ComplexObject2.kt @@ -1,4 +1,4 @@ -package com.expediagroup.graphql.generated.reusedlisttypesquery +package com.expediagroup.graphql.generated.types import com.expediagroup.graphql.client.Generated import com.fasterxml.jackson.`annotation`.JsonProperty diff --git a/plugins/client/graphql-kotlin-client-generator/src/test/data/generator/reuse_list_types/reusedlisttypesquery/ComplexObject3.kt b/plugins/client/graphql-kotlin-client-generator/src/test/data/generator/reuse_list_types/types/ComplexObject3.kt similarity index 89% rename from plugins/client/graphql-kotlin-client-generator/src/test/data/generator/reuse_list_types/reusedlisttypesquery/ComplexObject3.kt rename to plugins/client/graphql-kotlin-client-generator/src/test/data/generator/reuse_list_types/types/ComplexObject3.kt index f9cadbfb51..3b6bbbf535 100644 --- a/plugins/client/graphql-kotlin-client-generator/src/test/data/generator/reuse_list_types/reusedlisttypesquery/ComplexObject3.kt +++ b/plugins/client/graphql-kotlin-client-generator/src/test/data/generator/reuse_list_types/types/ComplexObject3.kt @@ -1,4 +1,4 @@ -package com.expediagroup.graphql.generated.reusedlisttypesquery +package com.expediagroup.graphql.generated.types import com.expediagroup.graphql.client.Generated import com.fasterxml.jackson.`annotation`.JsonProperty diff --git a/plugins/client/graphql-kotlin-client-generator/src/test/data/generator/reuse_types/ReusedTypesQuery.kt b/plugins/client/graphql-kotlin-client-generator/src/test/data/generator/reuse_types/ReusedTypesQuery.kt index 248b064f39..b94968eb40 100644 --- a/plugins/client/graphql-kotlin-client-generator/src/test/data/generator/reuse_types/ReusedTypesQuery.kt +++ b/plugins/client/graphql-kotlin-client-generator/src/test/data/generator/reuse_types/ReusedTypesQuery.kt @@ -2,9 +2,9 @@ package com.expediagroup.graphql.generated import com.expediagroup.graphql.client.Generated import com.expediagroup.graphql.client.types.GraphQLClientRequest -import com.expediagroup.graphql.generated.reusedtypesquery.ComplexObject -import com.expediagroup.graphql.generated.reusedtypesquery.ComplexObject2 -import com.expediagroup.graphql.generated.reusedtypesquery.ComplexObject3 +import com.expediagroup.graphql.generated.types.ComplexObject +import com.expediagroup.graphql.generated.types.ComplexObject2 +import com.expediagroup.graphql.generated.types.ComplexObject3 import com.fasterxml.jackson.`annotation`.JsonProperty import kotlin.String import kotlin.reflect.KClass diff --git a/plugins/client/graphql-kotlin-client-generator/src/test/data/generator/object_diff_selection_set/differentselectionsquery/ComplexObject.kt b/plugins/client/graphql-kotlin-client-generator/src/test/data/generator/reuse_types/types/ComplexObject.kt similarity index 88% rename from plugins/client/graphql-kotlin-client-generator/src/test/data/generator/object_diff_selection_set/differentselectionsquery/ComplexObject.kt rename to plugins/client/graphql-kotlin-client-generator/src/test/data/generator/reuse_types/types/ComplexObject.kt index 6c995d720a..107e08c88a 100644 --- a/plugins/client/graphql-kotlin-client-generator/src/test/data/generator/object_diff_selection_set/differentselectionsquery/ComplexObject.kt +++ b/plugins/client/graphql-kotlin-client-generator/src/test/data/generator/reuse_types/types/ComplexObject.kt @@ -1,4 +1,4 @@ -package com.expediagroup.graphql.generated.differentselectionsquery +package com.expediagroup.graphql.generated.types import com.expediagroup.graphql.client.Generated import com.fasterxml.jackson.`annotation`.JsonProperty diff --git a/plugins/client/graphql-kotlin-client-generator/src/test/data/generator/object_diff_selection_set/differentselectionsquery/ComplexObject2.kt b/plugins/client/graphql-kotlin-client-generator/src/test/data/generator/reuse_types/types/ComplexObject2.kt similarity index 90% rename from plugins/client/graphql-kotlin-client-generator/src/test/data/generator/object_diff_selection_set/differentselectionsquery/ComplexObject2.kt rename to plugins/client/graphql-kotlin-client-generator/src/test/data/generator/reuse_types/types/ComplexObject2.kt index 7875f0f6a2..d93be23804 100644 --- a/plugins/client/graphql-kotlin-client-generator/src/test/data/generator/object_diff_selection_set/differentselectionsquery/ComplexObject2.kt +++ b/plugins/client/graphql-kotlin-client-generator/src/test/data/generator/reuse_types/types/ComplexObject2.kt @@ -1,4 +1,4 @@ -package com.expediagroup.graphql.generated.differentselectionsquery +package com.expediagroup.graphql.generated.types import com.expediagroup.graphql.client.Generated import com.fasterxml.jackson.`annotation`.JsonProperty diff --git a/plugins/client/graphql-kotlin-client-generator/src/test/data/generator/reuse_types/reusedtypesquery/ComplexObject3.kt b/plugins/client/graphql-kotlin-client-generator/src/test/data/generator/reuse_types/types/ComplexObject3.kt similarity index 91% rename from plugins/client/graphql-kotlin-client-generator/src/test/data/generator/reuse_types/reusedtypesquery/ComplexObject3.kt rename to plugins/client/graphql-kotlin-client-generator/src/test/data/generator/reuse_types/types/ComplexObject3.kt index 237a9bccd0..07b07bb7ae 100644 --- a/plugins/client/graphql-kotlin-client-generator/src/test/data/generator/reuse_types/reusedtypesquery/ComplexObject3.kt +++ b/plugins/client/graphql-kotlin-client-generator/src/test/data/generator/reuse_types/types/ComplexObject3.kt @@ -1,4 +1,4 @@ -package com.expediagroup.graphql.generated.reusedtypesquery +package com.expediagroup.graphql.generated.types import com.expediagroup.graphql.client.Generated import com.fasterxml.jackson.`annotation`.JsonProperty diff --git a/plugins/client/graphql-kotlin-client-generator/src/test/data/generator/object_diff_selection_set/differentselectionsquery/DetailsObject.kt b/plugins/client/graphql-kotlin-client-generator/src/test/data/generator/reuse_types/types/DetailsObject.kt similarity index 86% rename from plugins/client/graphql-kotlin-client-generator/src/test/data/generator/object_diff_selection_set/differentselectionsquery/DetailsObject.kt rename to plugins/client/graphql-kotlin-client-generator/src/test/data/generator/reuse_types/types/DetailsObject.kt index b5c52e0d3b..35be5d034c 100644 --- a/plugins/client/graphql-kotlin-client-generator/src/test/data/generator/object_diff_selection_set/differentselectionsquery/DetailsObject.kt +++ b/plugins/client/graphql-kotlin-client-generator/src/test/data/generator/reuse_types/types/DetailsObject.kt @@ -1,4 +1,4 @@ -package com.expediagroup.graphql.generated.differentselectionsquery +package com.expediagroup.graphql.generated.types import com.expediagroup.graphql.client.Generated import com.fasterxml.jackson.`annotation`.JsonProperty diff --git a/plugins/client/graphql-kotlin-client-generator/src/test/data/generator/reuse_types/reusedtypesquery/DetailsObject2.kt b/plugins/client/graphql-kotlin-client-generator/src/test/data/generator/reuse_types/types/DetailsObject2.kt similarity index 83% rename from plugins/client/graphql-kotlin-client-generator/src/test/data/generator/reuse_types/reusedtypesquery/DetailsObject2.kt rename to plugins/client/graphql-kotlin-client-generator/src/test/data/generator/reuse_types/types/DetailsObject2.kt index bdcd7a904d..9b401d861f 100644 --- a/plugins/client/graphql-kotlin-client-generator/src/test/data/generator/reuse_types/reusedtypesquery/DetailsObject2.kt +++ b/plugins/client/graphql-kotlin-client-generator/src/test/data/generator/reuse_types/types/DetailsObject2.kt @@ -1,4 +1,4 @@ -package com.expediagroup.graphql.generated.reusedtypesquery +package com.expediagroup.graphql.generated.types import com.expediagroup.graphql.client.Generated import com.fasterxml.jackson.`annotation`.JsonProperty diff --git a/plugins/client/graphql-kotlin-client-generator/src/test/data/generator/scalar_typealias/ScalarAliasQuery.kt b/plugins/client/graphql-kotlin-client-generator/src/test/data/generator/scalar_typealias/ScalarAliasQuery.kt index ca6a91430b..04173901bf 100644 --- a/plugins/client/graphql-kotlin-client-generator/src/test/data/generator/scalar_typealias/ScalarAliasQuery.kt +++ b/plugins/client/graphql-kotlin-client-generator/src/test/data/generator/scalar_typealias/ScalarAliasQuery.kt @@ -2,7 +2,7 @@ package com.expediagroup.graphql.generated import com.expediagroup.graphql.client.Generated import com.expediagroup.graphql.client.types.GraphQLClientRequest -import com.expediagroup.graphql.generated.scalaraliasquery.ScalarWrapper +import com.expediagroup.graphql.generated.types.ScalarWrapper import com.fasterxml.jackson.`annotation`.JsonProperty import kotlin.String import kotlin.reflect.KClass diff --git a/plugins/client/graphql-kotlin-client-generator/src/test/data/generator/scalar_typealias/scalaraliasquery/ScalarWrapper.kt b/plugins/client/graphql-kotlin-client-generator/src/test/data/generator/scalar_typealias/types/ScalarWrapper.kt similarity index 90% rename from plugins/client/graphql-kotlin-client-generator/src/test/data/generator/scalar_typealias/scalaraliasquery/ScalarWrapper.kt rename to plugins/client/graphql-kotlin-client-generator/src/test/data/generator/scalar_typealias/types/ScalarWrapper.kt index 976cfa051c..a7560014a0 100644 --- a/plugins/client/graphql-kotlin-client-generator/src/test/data/generator/scalar_typealias/scalaraliasquery/ScalarWrapper.kt +++ b/plugins/client/graphql-kotlin-client-generator/src/test/data/generator/scalar_typealias/types/ScalarWrapper.kt @@ -1,4 +1,4 @@ -package com.expediagroup.graphql.generated.scalaraliasquery +package com.expediagroup.graphql.generated.types import com.expediagroup.graphql.client.Generated import com.expediagroup.graphql.generated.ID diff --git a/plugins/client/graphql-kotlin-client-generator/src/test/data/generator/union_diff_selection_set/DifferentSelectionSetQuery.kt b/plugins/client/graphql-kotlin-client-generator/src/test/data/generator/union_diff_selection_set/DifferentSelectionSetQuery.kt index 1f0288c9f9..b810c94838 100644 --- a/plugins/client/graphql-kotlin-client-generator/src/test/data/generator/union_diff_selection_set/DifferentSelectionSetQuery.kt +++ b/plugins/client/graphql-kotlin-client-generator/src/test/data/generator/union_diff_selection_set/DifferentSelectionSetQuery.kt @@ -2,8 +2,8 @@ package com.expediagroup.graphql.generated import com.expediagroup.graphql.client.Generated import com.expediagroup.graphql.client.types.GraphQLClientRequest -import com.expediagroup.graphql.generated.differentselectionsetquery.BasicUnion -import com.expediagroup.graphql.generated.differentselectionsetquery.BasicUnion2 +import com.expediagroup.graphql.generated.types.BasicUnion +import com.expediagroup.graphql.generated.types.BasicUnion2 import com.fasterxml.jackson.`annotation`.JsonProperty import kotlin.String import kotlin.reflect.KClass diff --git a/plugins/client/graphql-kotlin-client-generator/src/test/data/generator/union_diff_selection_set/differentselectionsetquery/BasicUnion.kt b/plugins/client/graphql-kotlin-client-generator/src/test/data/generator/union_diff_selection_set/types/BasicUnion.kt similarity index 95% rename from plugins/client/graphql-kotlin-client-generator/src/test/data/generator/union_diff_selection_set/differentselectionsetquery/BasicUnion.kt rename to plugins/client/graphql-kotlin-client-generator/src/test/data/generator/union_diff_selection_set/types/BasicUnion.kt index 4b2f41adc8..d324770fa8 100644 --- a/plugins/client/graphql-kotlin-client-generator/src/test/data/generator/union_diff_selection_set/differentselectionsetquery/BasicUnion.kt +++ b/plugins/client/graphql-kotlin-client-generator/src/test/data/generator/union_diff_selection_set/types/BasicUnion.kt @@ -1,4 +1,4 @@ -package com.expediagroup.graphql.generated.differentselectionsetquery +package com.expediagroup.graphql.generated.types import com.expediagroup.graphql.client.Generated import com.fasterxml.jackson.`annotation`.JsonProperty diff --git a/plugins/client/graphql-kotlin-client-generator/src/test/data/generator/union_diff_selection_set/differentselectionsetquery/BasicUnion2.kt b/plugins/client/graphql-kotlin-client-generator/src/test/data/generator/union_diff_selection_set/types/BasicUnion2.kt similarity index 95% rename from plugins/client/graphql-kotlin-client-generator/src/test/data/generator/union_diff_selection_set/differentselectionsetquery/BasicUnion2.kt rename to plugins/client/graphql-kotlin-client-generator/src/test/data/generator/union_diff_selection_set/types/BasicUnion2.kt index 3dca179ede..aea05982b2 100644 --- a/plugins/client/graphql-kotlin-client-generator/src/test/data/generator/union_diff_selection_set/differentselectionsetquery/BasicUnion2.kt +++ b/plugins/client/graphql-kotlin-client-generator/src/test/data/generator/union_diff_selection_set/types/BasicUnion2.kt @@ -1,4 +1,4 @@ -package com.expediagroup.graphql.generated.differentselectionsetquery +package com.expediagroup.graphql.generated.types import com.expediagroup.graphql.client.Generated import com.fasterxml.jackson.`annotation`.JsonProperty diff --git a/plugins/client/graphql-kotlin-client-generator/src/test/data/generator/union_diff_selection_set2/DifferentSelectionSetQuery.kt b/plugins/client/graphql-kotlin-client-generator/src/test/data/generator/union_diff_selection_set2/DifferentSelectionSetQuery.kt index e3793a94e5..5d37cb2e9f 100644 --- a/plugins/client/graphql-kotlin-client-generator/src/test/data/generator/union_diff_selection_set2/DifferentSelectionSetQuery.kt +++ b/plugins/client/graphql-kotlin-client-generator/src/test/data/generator/union_diff_selection_set2/DifferentSelectionSetQuery.kt @@ -2,8 +2,8 @@ package com.expediagroup.graphql.generated import com.expediagroup.graphql.client.Generated import com.expediagroup.graphql.client.types.GraphQLClientRequest -import com.expediagroup.graphql.generated.differentselectionsetquery.BasicUnion -import com.expediagroup.graphql.generated.differentselectionsetquery.ComplexObject2 +import com.expediagroup.graphql.generated.types.BasicUnion +import com.expediagroup.graphql.generated.types.ComplexObject2 import com.fasterxml.jackson.`annotation`.JsonProperty import kotlin.String import kotlin.reflect.KClass diff --git a/plugins/client/graphql-kotlin-client-generator/src/test/data/generator/union_diff_selection_set2/differentselectionsetquery/BasicUnion.kt b/plugins/client/graphql-kotlin-client-generator/src/test/data/generator/union_diff_selection_set2/types/BasicUnion.kt similarity index 96% rename from plugins/client/graphql-kotlin-client-generator/src/test/data/generator/union_diff_selection_set2/differentselectionsetquery/BasicUnion.kt rename to plugins/client/graphql-kotlin-client-generator/src/test/data/generator/union_diff_selection_set2/types/BasicUnion.kt index 365b799f37..d7b71fe0c7 100644 --- a/plugins/client/graphql-kotlin-client-generator/src/test/data/generator/union_diff_selection_set2/differentselectionsetquery/BasicUnion.kt +++ b/plugins/client/graphql-kotlin-client-generator/src/test/data/generator/union_diff_selection_set2/types/BasicUnion.kt @@ -1,4 +1,4 @@ -package com.expediagroup.graphql.generated.differentselectionsetquery +package com.expediagroup.graphql.generated.types import com.expediagroup.graphql.client.Generated import com.fasterxml.jackson.`annotation`.JsonProperty diff --git a/plugins/client/graphql-kotlin-client-generator/src/test/data/generator/union_diff_selection_set2/differentselectionsetquery/ComplexObject2.kt b/plugins/client/graphql-kotlin-client-generator/src/test/data/generator/union_diff_selection_set2/types/ComplexObject2.kt similarity index 90% rename from plugins/client/graphql-kotlin-client-generator/src/test/data/generator/union_diff_selection_set2/differentselectionsetquery/ComplexObject2.kt rename to plugins/client/graphql-kotlin-client-generator/src/test/data/generator/union_diff_selection_set2/types/ComplexObject2.kt index 10bd664013..d93be23804 100644 --- a/plugins/client/graphql-kotlin-client-generator/src/test/data/generator/union_diff_selection_set2/differentselectionsetquery/ComplexObject2.kt +++ b/plugins/client/graphql-kotlin-client-generator/src/test/data/generator/union_diff_selection_set2/types/ComplexObject2.kt @@ -1,4 +1,4 @@ -package com.expediagroup.graphql.generated.differentselectionsetquery +package com.expediagroup.graphql.generated.types import com.expediagroup.graphql.client.Generated import com.fasterxml.jackson.`annotation`.JsonProperty diff --git a/plugins/client/graphql-kotlin-client-generator/src/test/data/generator/object_named_fragments/objectwithnamedfragmentquery/DetailsObject.kt b/plugins/client/graphql-kotlin-client-generator/src/test/data/generator/union_diff_selection_set2/types/DetailsObject.kt similarity index 81% rename from plugins/client/graphql-kotlin-client-generator/src/test/data/generator/object_named_fragments/objectwithnamedfragmentquery/DetailsObject.kt rename to plugins/client/graphql-kotlin-client-generator/src/test/data/generator/union_diff_selection_set2/types/DetailsObject.kt index a9f40fe324..6ea269df90 100644 --- a/plugins/client/graphql-kotlin-client-generator/src/test/data/generator/object_named_fragments/objectwithnamedfragmentquery/DetailsObject.kt +++ b/plugins/client/graphql-kotlin-client-generator/src/test/data/generator/union_diff_selection_set2/types/DetailsObject.kt @@ -1,4 +1,4 @@ -package com.expediagroup.graphql.generated.objectwithnamedfragmentquery +package com.expediagroup.graphql.generated.types import com.expediagroup.graphql.client.Generated import com.fasterxml.jackson.`annotation`.JsonProperty diff --git a/plugins/client/graphql-kotlin-client-generator/src/test/data/generator/union_missing_types/UnionMissingTypeSelection.kt b/plugins/client/graphql-kotlin-client-generator/src/test/data/generator/union_missing_types/UnionMissingTypeSelection.kt index 62426c0e47..8d80e8203d 100644 --- a/plugins/client/graphql-kotlin-client-generator/src/test/data/generator/union_missing_types/UnionMissingTypeSelection.kt +++ b/plugins/client/graphql-kotlin-client-generator/src/test/data/generator/union_missing_types/UnionMissingTypeSelection.kt @@ -2,7 +2,7 @@ package com.expediagroup.graphql.generated import com.expediagroup.graphql.client.Generated import com.expediagroup.graphql.client.types.GraphQLClientRequest -import com.expediagroup.graphql.generated.unionmissingtypeselection.BasicUnion +import com.expediagroup.graphql.generated.types.BasicUnion import com.fasterxml.jackson.`annotation`.JsonProperty import kotlin.String import kotlin.reflect.KClass diff --git a/plugins/client/graphql-kotlin-client-generator/src/test/data/generator/union_missing_types/unionmissingtypeselection/BasicUnion.kt b/plugins/client/graphql-kotlin-client-generator/src/test/data/generator/union_missing_types/types/BasicUnion.kt similarity index 94% rename from plugins/client/graphql-kotlin-client-generator/src/test/data/generator/union_missing_types/unionmissingtypeselection/BasicUnion.kt rename to plugins/client/graphql-kotlin-client-generator/src/test/data/generator/union_missing_types/types/BasicUnion.kt index a35051a601..dc0558765f 100644 --- a/plugins/client/graphql-kotlin-client-generator/src/test/data/generator/union_missing_types/unionmissingtypeselection/BasicUnion.kt +++ b/plugins/client/graphql-kotlin-client-generator/src/test/data/generator/union_missing_types/types/BasicUnion.kt @@ -1,4 +1,4 @@ -package com.expediagroup.graphql.generated.unionmissingtypeselection +package com.expediagroup.graphql.generated.types import com.expediagroup.graphql.client.Generated import com.fasterxml.jackson.`annotation`.JsonProperty diff --git a/plugins/client/graphql-kotlin-client-generator/src/test/data/generator/union_named_fragments/UnionQueryWithNamedFragments.kt b/plugins/client/graphql-kotlin-client-generator/src/test/data/generator/union_named_fragments/UnionQueryWithNamedFragments.kt index 7a35cd0e87..e06b2608f2 100644 --- a/plugins/client/graphql-kotlin-client-generator/src/test/data/generator/union_named_fragments/UnionQueryWithNamedFragments.kt +++ b/plugins/client/graphql-kotlin-client-generator/src/test/data/generator/union_named_fragments/UnionQueryWithNamedFragments.kt @@ -2,7 +2,7 @@ package com.expediagroup.graphql.generated import com.expediagroup.graphql.client.Generated import com.expediagroup.graphql.client.types.GraphQLClientRequest -import com.expediagroup.graphql.generated.unionquerywithnamedfragments.BasicUnion +import com.expediagroup.graphql.generated.types.BasicUnion import com.fasterxml.jackson.`annotation`.JsonProperty import kotlin.String import kotlin.reflect.KClass diff --git a/plugins/client/graphql-kotlin-client-generator/src/test/data/generator/union_named_fragments/unionquerywithnamedfragments/BasicUnion.kt b/plugins/client/graphql-kotlin-client-generator/src/test/data/generator/union_named_fragments/types/BasicUnion.kt similarity index 96% rename from plugins/client/graphql-kotlin-client-generator/src/test/data/generator/union_named_fragments/unionquerywithnamedfragments/BasicUnion.kt rename to plugins/client/graphql-kotlin-client-generator/src/test/data/generator/union_named_fragments/types/BasicUnion.kt index bfbfcc90e6..d7b71fe0c7 100644 --- a/plugins/client/graphql-kotlin-client-generator/src/test/data/generator/union_named_fragments/unionquerywithnamedfragments/BasicUnion.kt +++ b/plugins/client/graphql-kotlin-client-generator/src/test/data/generator/union_named_fragments/types/BasicUnion.kt @@ -1,4 +1,4 @@ -package com.expediagroup.graphql.generated.unionquerywithnamedfragments +package com.expediagroup.graphql.generated.types import com.expediagroup.graphql.client.Generated import com.fasterxml.jackson.`annotation`.JsonProperty diff --git a/plugins/client/graphql-kotlin-client-generator/src/test/data/generator/union_same_selections/UnionSameSelections.kt b/plugins/client/graphql-kotlin-client-generator/src/test/data/generator/union_same_selections/UnionSameSelections.kt index 937a2fb76b..7216983f36 100644 --- a/plugins/client/graphql-kotlin-client-generator/src/test/data/generator/union_same_selections/UnionSameSelections.kt +++ b/plugins/client/graphql-kotlin-client-generator/src/test/data/generator/union_same_selections/UnionSameSelections.kt @@ -2,8 +2,8 @@ package com.expediagroup.graphql.generated import com.expediagroup.graphql.client.Generated import com.expediagroup.graphql.client.types.GraphQLClientRequest -import com.expediagroup.graphql.generated.unionsameselections.ProductRatingSupportingMessage -import com.expediagroup.graphql.generated.unionsameselections.ProductSupportingMessage +import com.expediagroup.graphql.generated.types.ProductRatingSupportingMessage +import com.expediagroup.graphql.generated.types.ProductSupportingMessage import com.fasterxml.jackson.`annotation`.JsonProperty import kotlin.String import kotlin.collections.List diff --git a/plugins/client/graphql-kotlin-client-generator/src/test/data/generator/union_same_selections/unionsameselections/EGDSProductRatingShowTextAction.kt b/plugins/client/graphql-kotlin-client-generator/src/test/data/generator/union_same_selections/types/EGDSProductRatingShowTextAction.kt similarity index 80% rename from plugins/client/graphql-kotlin-client-generator/src/test/data/generator/union_same_selections/unionsameselections/EGDSProductRatingShowTextAction.kt rename to plugins/client/graphql-kotlin-client-generator/src/test/data/generator/union_same_selections/types/EGDSProductRatingShowTextAction.kt index eaafeb0bc2..f6cf72a49d 100644 --- a/plugins/client/graphql-kotlin-client-generator/src/test/data/generator/union_same_selections/unionsameselections/EGDSProductRatingShowTextAction.kt +++ b/plugins/client/graphql-kotlin-client-generator/src/test/data/generator/union_same_selections/types/EGDSProductRatingShowTextAction.kt @@ -1,4 +1,4 @@ -package com.expediagroup.graphql.generated.unionsameselections +package com.expediagroup.graphql.generated.types import com.expediagroup.graphql.client.Generated import com.fasterxml.jackson.`annotation`.JsonProperty diff --git a/plugins/client/graphql-kotlin-client-generator/src/test/data/generator/union_same_selections/unionsameselections/EGDSStandardLink.kt b/plugins/client/graphql-kotlin-client-generator/src/test/data/generator/union_same_selections/types/EGDSStandardLink.kt similarity index 79% rename from plugins/client/graphql-kotlin-client-generator/src/test/data/generator/union_same_selections/unionsameselections/EGDSStandardLink.kt rename to plugins/client/graphql-kotlin-client-generator/src/test/data/generator/union_same_selections/types/EGDSStandardLink.kt index 47c1962c0d..fcc3e0787f 100644 --- a/plugins/client/graphql-kotlin-client-generator/src/test/data/generator/union_same_selections/unionsameselections/EGDSStandardLink.kt +++ b/plugins/client/graphql-kotlin-client-generator/src/test/data/generator/union_same_selections/types/EGDSStandardLink.kt @@ -1,4 +1,4 @@ -package com.expediagroup.graphql.generated.unionsameselections +package com.expediagroup.graphql.generated.types import com.expediagroup.graphql.client.Generated import com.fasterxml.jackson.`annotation`.JsonProperty diff --git a/plugins/client/graphql-kotlin-client-generator/src/test/data/generator/union_same_selections/unionsameselections/ProductRatingSupportingMessage.kt b/plugins/client/graphql-kotlin-client-generator/src/test/data/generator/union_same_selections/types/ProductRatingSupportingMessage.kt similarity index 96% rename from plugins/client/graphql-kotlin-client-generator/src/test/data/generator/union_same_selections/unionsameselections/ProductRatingSupportingMessage.kt rename to plugins/client/graphql-kotlin-client-generator/src/test/data/generator/union_same_selections/types/ProductRatingSupportingMessage.kt index 46dcc53e27..780ecd270f 100644 --- a/plugins/client/graphql-kotlin-client-generator/src/test/data/generator/union_same_selections/unionsameselections/ProductRatingSupportingMessage.kt +++ b/plugins/client/graphql-kotlin-client-generator/src/test/data/generator/union_same_selections/types/ProductRatingSupportingMessage.kt @@ -1,4 +1,4 @@ -package com.expediagroup.graphql.generated.unionsameselections +package com.expediagroup.graphql.generated.types import com.expediagroup.graphql.client.Generated import com.fasterxml.jackson.`annotation`.JsonProperty diff --git a/plugins/client/graphql-kotlin-client-generator/src/test/data/generator/union_same_selections/unionsameselections/ProductSupportingMessage.kt b/plugins/client/graphql-kotlin-client-generator/src/test/data/generator/union_same_selections/types/ProductSupportingMessage.kt similarity index 95% rename from plugins/client/graphql-kotlin-client-generator/src/test/data/generator/union_same_selections/unionsameselections/ProductSupportingMessage.kt rename to plugins/client/graphql-kotlin-client-generator/src/test/data/generator/union_same_selections/types/ProductSupportingMessage.kt index a674dcaa0a..bb0d421e52 100644 --- a/plugins/client/graphql-kotlin-client-generator/src/test/data/generator/union_same_selections/unionsameselections/ProductSupportingMessage.kt +++ b/plugins/client/graphql-kotlin-client-generator/src/test/data/generator/union_same_selections/types/ProductSupportingMessage.kt @@ -1,4 +1,4 @@ -package com.expediagroup.graphql.generated.unionsameselections +package com.expediagroup.graphql.generated.types import com.expediagroup.graphql.client.Generated import com.fasterxml.jackson.`annotation`.JsonProperty diff --git a/plugins/client/graphql-kotlin-client-generator/src/test/data/jackson/custom_scalars/CustomScalarQuery.kt b/plugins/client/graphql-kotlin-client-generator/src/test/data/jackson/custom_scalars/CustomScalarQuery.kt index 118cbc87c2..21dce6a5c2 100644 --- a/plugins/client/graphql-kotlin-client-generator/src/test/data/jackson/custom_scalars/CustomScalarQuery.kt +++ b/plugins/client/graphql-kotlin-client-generator/src/test/data/jackson/custom_scalars/CustomScalarQuery.kt @@ -2,7 +2,7 @@ package com.expediagroup.graphql.generated import com.expediagroup.graphql.client.Generated import com.expediagroup.graphql.client.types.GraphQLClientRequest -import com.expediagroup.graphql.generated.customscalarquery.ScalarWrapper +import com.expediagroup.graphql.generated.types.ScalarWrapper import com.fasterxml.jackson.`annotation`.JsonProperty import kotlin.String import kotlin.reflect.KClass diff --git a/plugins/client/graphql-kotlin-client-generator/src/test/data/jackson/custom_scalars/customscalarquery/ScalarWrapper.kt b/plugins/client/graphql-kotlin-client-generator/src/test/data/jackson/custom_scalars/types/ScalarWrapper.kt similarity index 96% rename from plugins/client/graphql-kotlin-client-generator/src/test/data/jackson/custom_scalars/customscalarquery/ScalarWrapper.kt rename to plugins/client/graphql-kotlin-client-generator/src/test/data/jackson/custom_scalars/types/ScalarWrapper.kt index ef74a2b602..efa0d004d1 100644 --- a/plugins/client/graphql-kotlin-client-generator/src/test/data/jackson/custom_scalars/customscalarquery/ScalarWrapper.kt +++ b/plugins/client/graphql-kotlin-client-generator/src/test/data/jackson/custom_scalars/types/ScalarWrapper.kt @@ -1,4 +1,4 @@ -package com.expediagroup.graphql.generated.customscalarquery +package com.expediagroup.graphql.generated.types import com.expediagroup.graphql.client.Generated import com.expediagroup.graphql.generated.scalars.AnyToULocaleConverter diff --git a/plugins/client/graphql-kotlin-client-generator/src/test/data/jackson/interface/InterfaceWithInlineFragmentsQuery.kt b/plugins/client/graphql-kotlin-client-generator/src/test/data/jackson/interface/InterfaceWithInlineFragmentsQuery.kt index 1aa9ff15b7..39d7f6f5b7 100644 --- a/plugins/client/graphql-kotlin-client-generator/src/test/data/jackson/interface/InterfaceWithInlineFragmentsQuery.kt +++ b/plugins/client/graphql-kotlin-client-generator/src/test/data/jackson/interface/InterfaceWithInlineFragmentsQuery.kt @@ -2,7 +2,7 @@ package com.expediagroup.graphql.generated import com.expediagroup.graphql.client.Generated import com.expediagroup.graphql.client.types.GraphQLClientRequest -import com.expediagroup.graphql.generated.interfacewithinlinefragmentsquery.BasicInterface +import com.expediagroup.graphql.generated.types.BasicInterface import com.fasterxml.jackson.`annotation`.JsonProperty import kotlin.String import kotlin.reflect.KClass diff --git a/plugins/client/graphql-kotlin-client-generator/src/test/data/jackson/interface/interfacewithinlinefragmentsquery/BasicInterface.kt b/plugins/client/graphql-kotlin-client-generator/src/test/data/jackson/interface/types/BasicInterface.kt similarity index 97% rename from plugins/client/graphql-kotlin-client-generator/src/test/data/jackson/interface/interfacewithinlinefragmentsquery/BasicInterface.kt rename to plugins/client/graphql-kotlin-client-generator/src/test/data/jackson/interface/types/BasicInterface.kt index 672d3ea836..6f7ca05e4a 100644 --- a/plugins/client/graphql-kotlin-client-generator/src/test/data/jackson/interface/interfacewithinlinefragmentsquery/BasicInterface.kt +++ b/plugins/client/graphql-kotlin-client-generator/src/test/data/jackson/interface/types/BasicInterface.kt @@ -1,4 +1,4 @@ -package com.expediagroup.graphql.generated.interfacewithinlinefragmentsquery +package com.expediagroup.graphql.generated.types import com.expediagroup.graphql.client.Generated import com.fasterxml.jackson.`annotation`.JsonProperty diff --git a/plugins/client/graphql-kotlin-client-generator/src/test/data/jackson/object/ComplexObjectQuery.kt b/plugins/client/graphql-kotlin-client-generator/src/test/data/jackson/object/ComplexObjectQuery.kt index f7978f15b7..d36dd0887e 100644 --- a/plugins/client/graphql-kotlin-client-generator/src/test/data/jackson/object/ComplexObjectQuery.kt +++ b/plugins/client/graphql-kotlin-client-generator/src/test/data/jackson/object/ComplexObjectQuery.kt @@ -2,7 +2,7 @@ package com.expediagroup.graphql.generated import com.expediagroup.graphql.client.Generated import com.expediagroup.graphql.client.types.GraphQLClientRequest -import com.expediagroup.graphql.generated.complexobjectquery.ComplexObject +import com.expediagroup.graphql.generated.types.ComplexObject import com.fasterxml.jackson.`annotation`.JsonProperty import kotlin.String import kotlin.reflect.KClass diff --git a/plugins/client/graphql-kotlin-client-generator/src/test/data/jackson/object/complexobjectquery/ComplexObject.kt b/plugins/client/graphql-kotlin-client-generator/src/test/data/jackson/object/types/ComplexObject.kt similarity index 92% rename from plugins/client/graphql-kotlin-client-generator/src/test/data/jackson/object/complexobjectquery/ComplexObject.kt rename to plugins/client/graphql-kotlin-client-generator/src/test/data/jackson/object/types/ComplexObject.kt index db291bc5cf..63cc6c519f 100644 --- a/plugins/client/graphql-kotlin-client-generator/src/test/data/jackson/object/complexobjectquery/ComplexObject.kt +++ b/plugins/client/graphql-kotlin-client-generator/src/test/data/jackson/object/types/ComplexObject.kt @@ -1,4 +1,4 @@ -package com.expediagroup.graphql.generated.complexobjectquery +package com.expediagroup.graphql.generated.types import com.expediagroup.graphql.client.Generated import com.fasterxml.jackson.`annotation`.JsonProperty diff --git a/plugins/client/graphql-kotlin-client-generator/src/test/data/generator/object_diff_sub_selection/differentsubselectionquery/DetailsObject.kt b/plugins/client/graphql-kotlin-client-generator/src/test/data/jackson/object/types/DetailsObject.kt similarity index 88% rename from plugins/client/graphql-kotlin-client-generator/src/test/data/generator/object_diff_sub_selection/differentsubselectionquery/DetailsObject.kt rename to plugins/client/graphql-kotlin-client-generator/src/test/data/jackson/object/types/DetailsObject.kt index 7150f6508a..0b3eebc242 100644 --- a/plugins/client/graphql-kotlin-client-generator/src/test/data/generator/object_diff_sub_selection/differentsubselectionquery/DetailsObject.kt +++ b/plugins/client/graphql-kotlin-client-generator/src/test/data/jackson/object/types/DetailsObject.kt @@ -1,4 +1,4 @@ -package com.expediagroup.graphql.generated.differentsubselectionquery +package com.expediagroup.graphql.generated.types import com.expediagroup.graphql.client.Generated import com.fasterxml.jackson.`annotation`.JsonProperty @@ -16,14 +16,14 @@ public data class DetailsObject( */ @get:JsonProperty(value = "id") public val id: Int, - /** - * Actual detail value - */ - @get:JsonProperty(value = "value") - public val `value`: String, /** * Boolean flag */ @get:JsonProperty(value = "flag") public val flag: Boolean, + /** + * Actual detail value + */ + @get:JsonProperty(value = "value") + public val `value`: String, ) diff --git a/plugins/client/graphql-kotlin-client-generator/src/test/data/jackson/union/UnionQueryWithInlineFragments.kt b/plugins/client/graphql-kotlin-client-generator/src/test/data/jackson/union/UnionQueryWithInlineFragments.kt index 820f335bd4..e534d69280 100644 --- a/plugins/client/graphql-kotlin-client-generator/src/test/data/jackson/union/UnionQueryWithInlineFragments.kt +++ b/plugins/client/graphql-kotlin-client-generator/src/test/data/jackson/union/UnionQueryWithInlineFragments.kt @@ -2,7 +2,7 @@ package com.expediagroup.graphql.generated import com.expediagroup.graphql.client.Generated import com.expediagroup.graphql.client.types.GraphQLClientRequest -import com.expediagroup.graphql.generated.unionquerywithinlinefragments.BasicUnion +import com.expediagroup.graphql.generated.types.BasicUnion import com.fasterxml.jackson.`annotation`.JsonProperty import kotlin.String import kotlin.reflect.KClass diff --git a/plugins/client/graphql-kotlin-client-generator/src/test/data/jackson/union/unionquerywithinlinefragments/BasicUnion.kt b/plugins/client/graphql-kotlin-client-generator/src/test/data/jackson/union/types/BasicUnion.kt similarity index 96% rename from plugins/client/graphql-kotlin-client-generator/src/test/data/jackson/union/unionquerywithinlinefragments/BasicUnion.kt rename to plugins/client/graphql-kotlin-client-generator/src/test/data/jackson/union/types/BasicUnion.kt index 8aaaf1ee64..d7b71fe0c7 100644 --- a/plugins/client/graphql-kotlin-client-generator/src/test/data/jackson/union/unionquerywithinlinefragments/BasicUnion.kt +++ b/plugins/client/graphql-kotlin-client-generator/src/test/data/jackson/union/types/BasicUnion.kt @@ -1,4 +1,4 @@ -package com.expediagroup.graphql.generated.unionquerywithinlinefragments +package com.expediagroup.graphql.generated.types import com.expediagroup.graphql.client.Generated import com.fasterxml.jackson.`annotation`.JsonProperty diff --git a/plugins/client/graphql-kotlin-client-generator/src/test/data/kotlinx/custom_scalars/CustomScalarQuery.kt b/plugins/client/graphql-kotlin-client-generator/src/test/data/kotlinx/custom_scalars/CustomScalarQuery.kt index eae8fa65d6..319887124a 100644 --- a/plugins/client/graphql-kotlin-client-generator/src/test/data/kotlinx/custom_scalars/CustomScalarQuery.kt +++ b/plugins/client/graphql-kotlin-client-generator/src/test/data/kotlinx/custom_scalars/CustomScalarQuery.kt @@ -2,7 +2,7 @@ package com.expediagroup.graphql.generated import com.expediagroup.graphql.client.Generated import com.expediagroup.graphql.client.types.GraphQLClientRequest -import com.expediagroup.graphql.generated.customscalarquery.ScalarWrapper +import com.expediagroup.graphql.generated.types.ScalarWrapper import kotlin.String import kotlin.reflect.KClass import kotlinx.serialization.Required diff --git a/plugins/client/graphql-kotlin-client-generator/src/test/data/kotlinx/custom_scalars/customscalarquery/ScalarWrapper.kt b/plugins/client/graphql-kotlin-client-generator/src/test/data/kotlinx/custom_scalars/types/ScalarWrapper.kt similarity index 94% rename from plugins/client/graphql-kotlin-client-generator/src/test/data/kotlinx/custom_scalars/customscalarquery/ScalarWrapper.kt rename to plugins/client/graphql-kotlin-client-generator/src/test/data/kotlinx/custom_scalars/types/ScalarWrapper.kt index 7fd2f79e8c..c8b8477835 100644 --- a/plugins/client/graphql-kotlin-client-generator/src/test/data/kotlinx/custom_scalars/customscalarquery/ScalarWrapper.kt +++ b/plugins/client/graphql-kotlin-client-generator/src/test/data/kotlinx/custom_scalars/types/ScalarWrapper.kt @@ -1,4 +1,4 @@ -package com.expediagroup.graphql.generated.customscalarquery +package com.expediagroup.graphql.generated.types import com.expediagroup.graphql.client.Generated import com.expediagroup.graphql.generated.ID diff --git a/plugins/client/graphql-kotlin-client-generator/src/test/data/kotlinx/interface/InterfaceWithInlineFragmentsQuery.kt b/plugins/client/graphql-kotlin-client-generator/src/test/data/kotlinx/interface/InterfaceWithInlineFragmentsQuery.kt index 03d0f8021a..835ea10c9e 100644 --- a/plugins/client/graphql-kotlin-client-generator/src/test/data/kotlinx/interface/InterfaceWithInlineFragmentsQuery.kt +++ b/plugins/client/graphql-kotlin-client-generator/src/test/data/kotlinx/interface/InterfaceWithInlineFragmentsQuery.kt @@ -2,7 +2,7 @@ package com.expediagroup.graphql.generated import com.expediagroup.graphql.client.Generated import com.expediagroup.graphql.client.types.GraphQLClientRequest -import com.expediagroup.graphql.generated.interfacewithinlinefragmentsquery.BasicInterface +import com.expediagroup.graphql.generated.types.BasicInterface import kotlin.String import kotlin.reflect.KClass import kotlinx.serialization.Required diff --git a/plugins/client/graphql-kotlin-client-generator/src/test/data/kotlinx/interface/interfacewithinlinefragmentsquery/BasicInterface.kt b/plugins/client/graphql-kotlin-client-generator/src/test/data/kotlinx/interface/interfacewithinlinefragmentsquery/BasicInterface.kt deleted file mode 100644 index e81272a797..0000000000 --- a/plugins/client/graphql-kotlin-client-generator/src/test/data/kotlinx/interface/interfacewithinlinefragmentsquery/BasicInterface.kt +++ /dev/null @@ -1,87 +0,0 @@ -package com.expediagroup.graphql.generated.interfacewithinlinefragmentsquery - -import com.expediagroup.graphql.client.Generated -import kotlin.Double -import kotlin.Int -import kotlin.String -import kotlinx.serialization.SerialName -import kotlinx.serialization.Serializable - -/** - * Very basic interface - */ -@Generated -@Serializable -public sealed class BasicInterface { - /** - * Unique identifier of an interface - */ - public abstract val id: Int - - /** - * Name field - */ - public abstract val name: String -} - -/** - * Example interface implementation where value is an integer - */ -@Generated -@Serializable -@SerialName(value = "FirstInterfaceImplementation") -public data class FirstInterfaceImplementation( - /** - * Unique identifier of the first implementation - */ - override val id: Int, - /** - * Name of the first implementation - */ - override val name: String, - /** - * Custom field integer value - */ - public val intValue: Int, -) : BasicInterface() - -/** - * Example interface implementation where value is a float - */ -@Generated -@Serializable -@SerialName(value = "SecondInterfaceImplementation") -public data class SecondInterfaceImplementation( - /** - * Unique identifier of the second implementation - */ - override val id: Int, - /** - * Name of the second implementation - */ - override val name: String, - /** - * Custom field float value - */ - public val floatValue: Double, -) : BasicInterface() - -/** - * Fallback BasicInterface implementation that will be used when unknown/unhandled type is - * encountered. - * - * NOTE: This fallback logic has to be manually registered with the instance of - * GraphQLClientKotlinxSerializer. See documentation for details. - */ -@Generated -@Serializable -public data class DefaultBasicInterfaceImplementation( - /** - * Unique identifier of an interface - */ - override val id: Int, - /** - * Name field - */ - override val name: String, -) : BasicInterface() diff --git a/plugins/client/graphql-kotlin-client-generator/src/test/data/kotlinx/multiple_queries/firstquery/BasicInterface.kt b/plugins/client/graphql-kotlin-client-generator/src/test/data/kotlinx/interface/types/BasicInterface.kt similarity index 97% rename from plugins/client/graphql-kotlin-client-generator/src/test/data/kotlinx/multiple_queries/firstquery/BasicInterface.kt rename to plugins/client/graphql-kotlin-client-generator/src/test/data/kotlinx/interface/types/BasicInterface.kt index 39cc910242..52de13c715 100644 --- a/plugins/client/graphql-kotlin-client-generator/src/test/data/kotlinx/multiple_queries/firstquery/BasicInterface.kt +++ b/plugins/client/graphql-kotlin-client-generator/src/test/data/kotlinx/interface/types/BasicInterface.kt @@ -1,4 +1,4 @@ -package com.expediagroup.graphql.generated.firstquery +package com.expediagroup.graphql.generated.types import com.expediagroup.graphql.client.Generated import kotlin.Double diff --git a/plugins/client/graphql-kotlin-client-generator/src/test/data/kotlinx/multiple_queries/FirstQuery.kt b/plugins/client/graphql-kotlin-client-generator/src/test/data/kotlinx/multiple_queries/FirstQuery.kt index 3de7a7f144..a0ec12dbab 100644 --- a/plugins/client/graphql-kotlin-client-generator/src/test/data/kotlinx/multiple_queries/FirstQuery.kt +++ b/plugins/client/graphql-kotlin-client-generator/src/test/data/kotlinx/multiple_queries/FirstQuery.kt @@ -5,11 +5,11 @@ import com.expediagroup.graphql.client.serialization.types.OptionalInput import com.expediagroup.graphql.client.serialization.types.OptionalInput.Undefined import com.expediagroup.graphql.client.types.GraphQLClientRequest import com.expediagroup.graphql.generated.enums.CustomEnum -import com.expediagroup.graphql.generated.firstquery.BasicInterface -import com.expediagroup.graphql.generated.firstquery.ComplexObject -import com.expediagroup.graphql.generated.firstquery.ScalarWrapper import com.expediagroup.graphql.generated.inputs.ComplexArgumentInput import com.expediagroup.graphql.generated.scalars.OptionalComplexArgumentInputSerializer +import com.expediagroup.graphql.generated.types.BasicInterface +import com.expediagroup.graphql.generated.types.ComplexObject2 +import com.expediagroup.graphql.generated.types.ScalarWrapper import kotlin.Boolean import kotlin.String import kotlin.reflect.KClass @@ -49,11 +49,11 @@ public class FirstQuery( /** * Query returning an object that references another object */ - public val complexObjectQuery: ComplexObject, + public val complexObjectQuery: ComplexObject2, /** * Query that returns enum value */ - public val enumQuery: CustomEnum = CustomEnum.__UNKNOWN_VALUE, + public val enumQuery: CustomEnum, /** * Query returning an interface */ diff --git a/plugins/client/graphql-kotlin-client-generator/src/test/data/kotlinx/multiple_queries/SecondQuery.kt b/plugins/client/graphql-kotlin-client-generator/src/test/data/kotlinx/multiple_queries/SecondQuery.kt index aab32e9913..4114d579f3 100644 --- a/plugins/client/graphql-kotlin-client-generator/src/test/data/kotlinx/multiple_queries/SecondQuery.kt +++ b/plugins/client/graphql-kotlin-client-generator/src/test/data/kotlinx/multiple_queries/SecondQuery.kt @@ -7,9 +7,9 @@ import com.expediagroup.graphql.client.types.GraphQLClientRequest import com.expediagroup.graphql.generated.enums.CustomEnum import com.expediagroup.graphql.generated.inputs.ComplexArgumentInput import com.expediagroup.graphql.generated.scalars.OptionalComplexArgumentInputSerializer -import com.expediagroup.graphql.generated.secondquery.BasicInterface -import com.expediagroup.graphql.generated.secondquery.ComplexObject -import com.expediagroup.graphql.generated.secondquery.ScalarWrapper +import com.expediagroup.graphql.generated.types.BasicInterface +import com.expediagroup.graphql.generated.types.ComplexObject +import com.expediagroup.graphql.generated.types.ScalarWrapper import kotlin.Boolean import kotlin.String import kotlin.reflect.KClass diff --git a/plugins/client/graphql-kotlin-client-generator/src/test/data/kotlinx/multiple_queries/secondquery/ScalarWrapper.kt b/plugins/client/graphql-kotlin-client-generator/src/test/data/kotlinx/multiple_queries/secondquery/ScalarWrapper.kt deleted file mode 100644 index 463b1f8ba1..0000000000 --- a/plugins/client/graphql-kotlin-client-generator/src/test/data/kotlinx/multiple_queries/secondquery/ScalarWrapper.kt +++ /dev/null @@ -1,29 +0,0 @@ -package com.expediagroup.graphql.generated.secondquery - -import com.expediagroup.graphql.client.Generated -import com.expediagroup.graphql.generated.ID -import com.expediagroup.graphql.generated.scalars.UUIDSerializer -import java.util.UUID -import kotlin.Int -import kotlinx.serialization.Serializable - -/** - * Wrapper that holds all supported scalar types - */ -@Generated -@Serializable -public data class ScalarWrapper( - /** - * A signed 32-bit nullable integer value - */ - public val count: Int? = null, - /** - * Custom scalar of UUID - */ - @Serializable(with = UUIDSerializer::class) - public val custom: UUID? = null, - /** - * ID represents unique identifier that is not intended to be human readable - */ - public val id: ID, -) diff --git a/plugins/client/graphql-kotlin-client-generator/src/test/data/kotlinx/multiple_queries/secondquery/BasicInterface.kt b/plugins/client/graphql-kotlin-client-generator/src/test/data/kotlinx/multiple_queries/types/BasicInterface.kt similarity index 97% rename from plugins/client/graphql-kotlin-client-generator/src/test/data/kotlinx/multiple_queries/secondquery/BasicInterface.kt rename to plugins/client/graphql-kotlin-client-generator/src/test/data/kotlinx/multiple_queries/types/BasicInterface.kt index 16ad723495..52de13c715 100644 --- a/plugins/client/graphql-kotlin-client-generator/src/test/data/kotlinx/multiple_queries/secondquery/BasicInterface.kt +++ b/plugins/client/graphql-kotlin-client-generator/src/test/data/kotlinx/multiple_queries/types/BasicInterface.kt @@ -1,4 +1,4 @@ -package com.expediagroup.graphql.generated.secondquery +package com.expediagroup.graphql.generated.types import com.expediagroup.graphql.client.Generated import kotlin.Double diff --git a/plugins/client/graphql-kotlin-client-generator/src/test/data/kotlinx/multiple_queries/secondquery/ComplexObject.kt b/plugins/client/graphql-kotlin-client-generator/src/test/data/kotlinx/multiple_queries/types/ComplexObject.kt similarity index 89% rename from plugins/client/graphql-kotlin-client-generator/src/test/data/kotlinx/multiple_queries/secondquery/ComplexObject.kt rename to plugins/client/graphql-kotlin-client-generator/src/test/data/kotlinx/multiple_queries/types/ComplexObject.kt index 2ea7b0de3b..5706df26d2 100644 --- a/plugins/client/graphql-kotlin-client-generator/src/test/data/kotlinx/multiple_queries/secondquery/ComplexObject.kt +++ b/plugins/client/graphql-kotlin-client-generator/src/test/data/kotlinx/multiple_queries/types/ComplexObject.kt @@ -1,4 +1,4 @@ -package com.expediagroup.graphql.generated.secondquery +package com.expediagroup.graphql.generated.types import com.expediagroup.graphql.client.Generated import kotlin.Int diff --git a/plugins/client/graphql-kotlin-client-generator/src/test/data/kotlinx/object/complexobjectquery/ComplexObject.kt b/plugins/client/graphql-kotlin-client-generator/src/test/data/kotlinx/multiple_queries/types/ComplexObject2.kt similarity index 86% rename from plugins/client/graphql-kotlin-client-generator/src/test/data/kotlinx/object/complexobjectquery/ComplexObject.kt rename to plugins/client/graphql-kotlin-client-generator/src/test/data/kotlinx/multiple_queries/types/ComplexObject2.kt index c8e6b3dce4..4630038b04 100644 --- a/plugins/client/graphql-kotlin-client-generator/src/test/data/kotlinx/object/complexobjectquery/ComplexObject.kt +++ b/plugins/client/graphql-kotlin-client-generator/src/test/data/kotlinx/multiple_queries/types/ComplexObject2.kt @@ -1,4 +1,4 @@ -package com.expediagroup.graphql.generated.complexobjectquery +package com.expediagroup.graphql.generated.types import com.expediagroup.graphql.client.Generated import kotlin.Int @@ -12,7 +12,7 @@ import kotlinx.serialization.Serializable */ @Generated @Serializable -public data class ComplexObject( +public data class ComplexObject2( /** * Some unique identifier */ diff --git a/plugins/client/graphql-kotlin-client-generator/src/test/data/kotlinx/multiple_queries/firstquery/DetailsObject.kt b/plugins/client/graphql-kotlin-client-generator/src/test/data/kotlinx/multiple_queries/types/DetailsObject.kt similarity index 89% rename from plugins/client/graphql-kotlin-client-generator/src/test/data/kotlinx/multiple_queries/firstquery/DetailsObject.kt rename to plugins/client/graphql-kotlin-client-generator/src/test/data/kotlinx/multiple_queries/types/DetailsObject.kt index 0132c11945..9a0d788f16 100644 --- a/plugins/client/graphql-kotlin-client-generator/src/test/data/kotlinx/multiple_queries/firstquery/DetailsObject.kt +++ b/plugins/client/graphql-kotlin-client-generator/src/test/data/kotlinx/multiple_queries/types/DetailsObject.kt @@ -1,4 +1,4 @@ -package com.expediagroup.graphql.generated.firstquery +package com.expediagroup.graphql.generated.types import com.expediagroup.graphql.client.Generated import kotlin.Boolean diff --git a/plugins/client/graphql-kotlin-client-generator/src/test/data/kotlinx/multiple_queries/firstquery/ScalarWrapper.kt b/plugins/client/graphql-kotlin-client-generator/src/test/data/kotlinx/multiple_queries/types/ScalarWrapper.kt similarity index 92% rename from plugins/client/graphql-kotlin-client-generator/src/test/data/kotlinx/multiple_queries/firstquery/ScalarWrapper.kt rename to plugins/client/graphql-kotlin-client-generator/src/test/data/kotlinx/multiple_queries/types/ScalarWrapper.kt index 539bc7fe07..e814d5e68a 100644 --- a/plugins/client/graphql-kotlin-client-generator/src/test/data/kotlinx/multiple_queries/firstquery/ScalarWrapper.kt +++ b/plugins/client/graphql-kotlin-client-generator/src/test/data/kotlinx/multiple_queries/types/ScalarWrapper.kt @@ -1,4 +1,4 @@ -package com.expediagroup.graphql.generated.firstquery +package com.expediagroup.graphql.generated.types import com.expediagroup.graphql.client.Generated import com.expediagroup.graphql.generated.ID diff --git a/plugins/client/graphql-kotlin-client-generator/src/test/data/kotlinx/object/ComplexObjectQuery.kt b/plugins/client/graphql-kotlin-client-generator/src/test/data/kotlinx/object/ComplexObjectQuery.kt index a10ea14b59..2965702c6c 100644 --- a/plugins/client/graphql-kotlin-client-generator/src/test/data/kotlinx/object/ComplexObjectQuery.kt +++ b/plugins/client/graphql-kotlin-client-generator/src/test/data/kotlinx/object/ComplexObjectQuery.kt @@ -2,7 +2,7 @@ package com.expediagroup.graphql.generated import com.expediagroup.graphql.client.Generated import com.expediagroup.graphql.client.types.GraphQLClientRequest -import com.expediagroup.graphql.generated.complexobjectquery.ComplexObject +import com.expediagroup.graphql.generated.types.ComplexObject import kotlin.String import kotlin.reflect.KClass import kotlinx.serialization.Required diff --git a/plugins/client/graphql-kotlin-client-generator/src/test/data/kotlinx/multiple_queries/firstquery/ComplexObject.kt b/plugins/client/graphql-kotlin-client-generator/src/test/data/kotlinx/object/types/ComplexObject.kt similarity index 92% rename from plugins/client/graphql-kotlin-client-generator/src/test/data/kotlinx/multiple_queries/firstquery/ComplexObject.kt rename to plugins/client/graphql-kotlin-client-generator/src/test/data/kotlinx/object/types/ComplexObject.kt index 3b60b1049b..66cb87613e 100644 --- a/plugins/client/graphql-kotlin-client-generator/src/test/data/kotlinx/multiple_queries/firstquery/ComplexObject.kt +++ b/plugins/client/graphql-kotlin-client-generator/src/test/data/kotlinx/object/types/ComplexObject.kt @@ -1,4 +1,4 @@ -package com.expediagroup.graphql.generated.firstquery +package com.expediagroup.graphql.generated.types import com.expediagroup.graphql.client.Generated import kotlin.Int diff --git a/plugins/client/graphql-kotlin-client-generator/src/test/data/kotlinx/object/complexobjectquery/DetailsObject.kt b/plugins/client/graphql-kotlin-client-generator/src/test/data/kotlinx/object/types/DetailsObject.kt similarity index 87% rename from plugins/client/graphql-kotlin-client-generator/src/test/data/kotlinx/object/complexobjectquery/DetailsObject.kt rename to plugins/client/graphql-kotlin-client-generator/src/test/data/kotlinx/object/types/DetailsObject.kt index 4245ab351f..9a0d788f16 100644 --- a/plugins/client/graphql-kotlin-client-generator/src/test/data/kotlinx/object/complexobjectquery/DetailsObject.kt +++ b/plugins/client/graphql-kotlin-client-generator/src/test/data/kotlinx/object/types/DetailsObject.kt @@ -1,4 +1,4 @@ -package com.expediagroup.graphql.generated.complexobjectquery +package com.expediagroup.graphql.generated.types import com.expediagroup.graphql.client.Generated import kotlin.Boolean diff --git a/plugins/client/graphql-kotlin-client-generator/src/test/data/kotlinx/union/UnionQueryWithInlineFragments.kt b/plugins/client/graphql-kotlin-client-generator/src/test/data/kotlinx/union/UnionQueryWithInlineFragments.kt index 01231e59e3..8e957c2411 100644 --- a/plugins/client/graphql-kotlin-client-generator/src/test/data/kotlinx/union/UnionQueryWithInlineFragments.kt +++ b/plugins/client/graphql-kotlin-client-generator/src/test/data/kotlinx/union/UnionQueryWithInlineFragments.kt @@ -2,7 +2,7 @@ package com.expediagroup.graphql.generated import com.expediagroup.graphql.client.Generated import com.expediagroup.graphql.client.types.GraphQLClientRequest -import com.expediagroup.graphql.generated.unionquerywithinlinefragments.BasicUnion +import com.expediagroup.graphql.generated.types.BasicUnion import kotlin.String import kotlin.reflect.KClass import kotlinx.serialization.Required diff --git a/plugins/client/graphql-kotlin-client-generator/src/test/data/kotlinx/union/unionquerywithinlinefragments/BasicUnion.kt b/plugins/client/graphql-kotlin-client-generator/src/test/data/kotlinx/union/types/BasicUnion.kt similarity index 94% rename from plugins/client/graphql-kotlin-client-generator/src/test/data/kotlinx/union/unionquerywithinlinefragments/BasicUnion.kt rename to plugins/client/graphql-kotlin-client-generator/src/test/data/kotlinx/union/types/BasicUnion.kt index 2cb959a9e6..4917f9878f 100644 --- a/plugins/client/graphql-kotlin-client-generator/src/test/data/kotlinx/union/unionquerywithinlinefragments/BasicUnion.kt +++ b/plugins/client/graphql-kotlin-client-generator/src/test/data/kotlinx/union/types/BasicUnion.kt @@ -1,4 +1,4 @@ -package com.expediagroup.graphql.generated.unionquerywithinlinefragments +package com.expediagroup.graphql.generated.types import com.expediagroup.graphql.client.Generated import kotlin.Int