From 60879c5a6888693698ff33c326fcd5cc9aa9ac5e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Du=C5=A1an=20Salay?=
 <11751660+SalyczeQ@users.noreply.github.com>
Date: Wed, 12 Jun 2024 22:55:22 -0600
Subject: [PATCH] feat(client): update jackson client generation to always
 annotate all fields (#1976)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

### :pencil: Description
Update Jackson client generation logic to always annotate all fields
with @get:JsonProperty.
This is a workaround to Jackson limitations due to its reliance on
reflections to find getters/setters following JavaBean naming
conventions.

Simple mutation:
``` graphql
mutation CreateIssuedInvoice($input: IssuedInvoiceInput!) {
    CreateIssuedInvoice(IssuedInvoice: $input) {
        ID
        Stav
        CisloDokladu
    }
}
```

Genarated before change:
```kotlin
public const val CREATE_ISSUED_INVOICE: String =
    "mutation CreateIssuedInvoice(${'$'}input: IssuedInvoiceInput!) {\n    CreateIssuedInvoice(IssuedInvoice: ${'$'}input) {\n        ID\n        Stav\n        CisloDokladu\n    }\n}"

@Generated
public class CreateIssuedInvoice(
  override val variables: CreateIssuedInvoice.Variables,
) : GraphQLClientRequest<CreateIssuedInvoice.Result> {
  override val query: String = CREATE_ISSUED_INVOICE

  override val operationName: String = "CreateIssuedInvoice"

  override fun responseType(): KClass<CreateIssuedInvoice.Result> =
      CreateIssuedInvoice.Result::class

  @Generated
  public data class Variables(
    @get:JsonProperty(value = "input")
    public val input: IssuedInvoiceInput,
  )

  /**
   * Dotazy pro zápis, editaci a mazání S5 objektů
   */
  @Generated
  public data class Result(
    /**
     * Faktura vydaná (zápis)
     */
    public val CreateIssuedInvoice: IssuedInvoice? = null,
  )
}
```
Genareted after change:
```kotlin
public const val CREATE_ISSUED_INVOICE: String =
    "mutation CreateIssuedInvoice(${'$'}input: IssuedInvoiceInput!) {\n    CreateIssuedInvoice(IssuedInvoice: ${'$'}input) {\n        ID\n        Stav\n        CisloDokladu\n    }\n}"

@Generated
public class CreateIssuedInvoice(
  override val variables: CreateIssuedInvoice.Variables,
) : GraphQLClientRequest<CreateIssuedInvoice.Result> {
  override val query: String = CREATE_ISSUED_INVOICE

  override val operationName: String = "CreateIssuedInvoice"

  override fun responseType(): KClass<CreateIssuedInvoice.Result> =
      CreateIssuedInvoice.Result::class

  @Generated
  public data class Variables(
    @get:JsonProperty(value = "input")
    public val input: IssuedInvoiceInput,
  )

  /**
   * Dotazy pro zápis, editaci a mazání S5 objektů
   */
  @Generated
  public data class Result(
    /**
     * Faktura vydaná (zápis)
     */
    @get:JsonProperty("CreateIssuedInvoice")
    public val CreateIssuedInvoice: IssuedInvoice? = null,
  )
}
```

data class IssuedInvoice **before** change:
```kotlin
@Generated
public data class IssuedInvoice(
  /**
   * ID
   */
  @JsonSerialize(converter = UUIDToAnyConverter::class)
  @JsonDeserialize(converter = AnyToUUIDConverter::class)
  public val ID: UUID? = null,
  /**
   * Stav
   */
  public val Stav: Int? = null,
  /**
   * Číslo dokladu
   */
  public val CisloDokladu: String? = null,
)
```

data class IssuedInvoice **after** change:
```kotlin
@Generated
public data class IssuedInvoice(
  /**
   * ID
   */
  @JsonSerialize(converter = UUIDToAnyConverter::class)
  @JsonDeserialize(converter = AnyToUUIDConverter::class)
  @get:JsonProperty("ID")
  public val ID: UUID? = null,
  /**
   * Stav
   */
  @get:JsonProperty("Stav")
  public val Stav: Int? = null,
  /**
   * Číslo dokladu
   */
  @get:JsonProperty("CisloDokladu")
  public val CisloDokladu: String? = null,
)
```

### :link: Related Issues
https://kotlinlang.slack.com/archives/CQLNT7B29/p1717655752084109
---
 .../client/generator/types/generatePropertySpecs.kt  | 12 ++++++++++++
 .../src/test/data/generator/alias/AliasQuery.kt      |  3 +++
 .../data/generator/alias_nested/AliasNestedQuery.kt  |  3 +++
 .../alias_nested/aliasnestedquery/ComplexObject.kt   |  2 ++
 .../alias_nested/aliasnestedquery/ComplexObject2.kt  |  2 ++
 .../generator/documentation/DocumentationQuery.kt    |  2 ++
 .../documentation/documentationquery/DocObject.kt    |  2 ++
 .../IncludeSkipDirectivesQuery.kt                    |  2 ++
 .../includeskipdirectivesquery/ScalarWrapper.kt      |  2 ++
 .../input_hard_coded/HardCodedInputQuery.kt          |  2 ++
 .../data/generator/input_lists/InputListQuery.kt     |  1 +
 .../SelfReferencingInputQuery.kt                     |  1 +
 .../DifferentSelectionSetQuery.kt                    |  3 +++
 .../differentselectionsetquery/BasicInterface.kt     | 11 +++++++++++
 .../differentselectionsetquery/BasicInterface2.kt    |  7 +++++++
 .../DifferentSelectionSetQuery.kt                    |  3 +++
 .../differentselectionsetquery/BasicInterface.kt     |  7 +++++++
 .../differentselectionsetquery/BasicInterface2.kt    |  9 +++++++++
 .../InterfaceMissingTypeSelection.kt                 |  2 ++
 .../interfacemissingtypeselection/BasicInterface.kt  |  8 ++++++++
 .../InterfaceWithNamedFragmentsQuery.kt              |  2 ++
 .../BasicInterface.kt                                | 11 +++++++++++
 .../test/data/generator/mutation/SimpleMutation.kt   |  1 +
 .../generator/mutation/simplemutation/BasicObject.kt |  3 +++
 .../DifferentSelectionsQuery.kt                      |  3 +++
 .../differentselectionsquery/ComplexObject.kt        |  3 +++
 .../differentselectionsquery/ComplexObject2.kt       |  4 ++++
 .../differentselectionsquery/DetailsObject.kt        |  3 +++
 .../DifferentSubselectionQuery.kt                    |  3 +++
 .../differentsubselectionquery/ComplexObject.kt      |  4 ++++
 .../differentsubselectionquery/ComplexObject2.kt     |  4 ++++
 .../differentsubselectionquery/DetailsObject.kt      |  4 ++++
 .../differentsubselectionquery/DetailsObject2.kt     |  3 +++
 .../src/test/data/generator/object_list/ListQuery.kt |  2 ++
 .../generator/object_list/listquery/BasicObject.kt   |  3 +++
 .../ObjectWithNamedFragmentQuery.kt                  |  2 ++
 .../objectwithnamedfragmentquery/ComplexObject.kt    |  4 ++++
 .../objectwithnamedfragmentquery/DetailsObject.kt    |  2 ++
 .../generator/object_self_reference/NestedQuery.kt   |  2 ++
 .../nestedquery/NestedObject.kt                      |  4 ++++
 .../nestedquery/NestedObject2.kt                     |  3 +++
 .../nestedquery/NestedObject3.kt                     |  4 ++++
 .../nestedquery/NestedObject4.kt                     |  3 +++
 .../operation_name_missing/AnonymousQuery.kt         |  2 ++
 .../anonymousquery/ScalarWrapper.kt                  |  2 ++
 .../operation_name_unchanged/MiXEDcaSEQuery.kt       |  2 ++
 .../mixedcasequery/ScalarWrapper.kt                  |  2 ++
 .../reuse_list_types/ReusedListTypesQuery.kt         |  8 ++++++++
 .../reusedlisttypesquery/BasicObject.kt              |  3 +++
 .../reusedlisttypesquery/BasicObject2.kt             |  2 ++
 .../reusedlisttypesquery/BasicObject3.kt             |  2 ++
 .../reusedlisttypesquery/ComplexObject.kt            |  4 ++++
 .../reusedlisttypesquery/ComplexObject2.kt           |  4 ++++
 .../reusedlisttypesquery/ComplexObject3.kt           |  3 +++
 .../data/generator/reuse_types/ReusedTypesQuery.kt   |  6 ++++++
 .../reuse_types/reusedtypesquery/ComplexObject.kt    |  3 +++
 .../reuse_types/reusedtypesquery/ComplexObject2.kt   |  4 ++++
 .../reuse_types/reusedtypesquery/ComplexObject3.kt   |  4 ++++
 .../reuse_types/reusedtypesquery/DetailsObject.kt    |  3 +++
 .../reuse_types/reusedtypesquery/DetailsObject2.kt   |  2 ++
 .../generator/scalar_typealias/ScalarAliasQuery.kt   |  2 ++
 .../scalaraliasquery/ScalarWrapper.kt                |  3 +++
 .../DifferentSelectionSetQuery.kt                    |  3 +++
 .../differentselectionsetquery/BasicUnion.kt         |  3 +++
 .../differentselectionsetquery/BasicUnion2.kt        |  3 +++
 .../DifferentSelectionSetQuery.kt                    |  3 +++
 .../differentselectionsetquery/BasicUnion.kt         |  6 ++++++
 .../differentselectionsetquery/ComplexObject2.kt     |  4 ++++
 .../differentselectionsetquery/DetailsObject.kt      |  2 ++
 .../union_missing_types/UnionMissingTypeSelection.kt |  2 ++
 .../unionmissingtypeselection/BasicUnion.kt          |  3 +++
 .../UnionQueryWithNamedFragments.kt                  |  2 ++
 .../unionquerywithnamedfragments/BasicUnion.kt       |  6 ++++++
 .../custom_scalar_input/CustomScalarInputQuery.kt    |  1 +
 .../data/jackson/custom_scalars/CustomScalarQuery.kt |  2 ++
 .../customscalarquery/ScalarWrapper.kt               |  5 +++++
 .../src/test/data/jackson/enums/EnumQuery.kt         |  3 +++
 .../interface/InterfaceWithInlineFragmentsQuery.kt   |  2 ++
 .../BasicInterface.kt                                | 11 +++++++++++
 .../test/data/jackson/object/ComplexObjectQuery.kt   |  2 ++
 .../object/complexobjectquery/ComplexObject.kt       |  5 +++++
 .../object/complexobjectquery/DetailsObject.kt       |  4 ++++
 .../jackson/union/UnionQueryWithInlineFragments.kt   |  2 ++
 .../unionquerywithinlinefragments/BasicUnion.kt      |  6 ++++++
 .../test/data/jackson/variables/JacksonInputQuery.kt |  1 +
 85 files changed, 303 insertions(+)

diff --git a/plugins/client/graphql-kotlin-client-generator/src/main/kotlin/com/expediagroup/graphql/plugin/client/generator/types/generatePropertySpecs.kt b/plugins/client/graphql-kotlin-client-generator/src/main/kotlin/com/expediagroup/graphql/plugin/client/generator/types/generatePropertySpecs.kt
index 4d9c14251c..c3436e6fd3 100755
--- a/plugins/client/graphql-kotlin-client-generator/src/main/kotlin/com/expediagroup/graphql/plugin/client/generator/types/generatePropertySpecs.kt
+++ b/plugins/client/graphql-kotlin-client-generator/src/main/kotlin/com/expediagroup/graphql/plugin/client/generator/types/generatePropertySpecs.kt
@@ -17,10 +17,12 @@
 package com.expediagroup.graphql.plugin.client.generator.types
 
 import com.expediagroup.graphql.plugin.client.generator.GraphQLClientGeneratorContext
+import com.expediagroup.graphql.plugin.client.generator.GraphQLSerializer
 import com.expediagroup.graphql.plugin.client.generator.ScalarConverterInfo
 import com.expediagroup.graphql.plugin.client.generator.exceptions.DeprecatedFieldsSelectedException
 import com.expediagroup.graphql.plugin.client.generator.exceptions.InvalidSelectionSetException
 import com.expediagroup.graphql.plugin.client.generator.exceptions.MissingArgumentException
+import com.fasterxml.jackson.annotation.JsonProperty
 import com.fasterxml.jackson.databind.annotation.JsonDeserialize
 import com.fasterxml.jackson.databind.annotation.JsonSerialize
 import com.squareup.kotlinpoet.AnnotationSpec
@@ -96,6 +98,16 @@ internal fun generatePropertySpecs(
         fieldDefinition.description?.content?.let { kdoc ->
             propertySpecBuilder.addKdoc("%L", kdoc)
         }
+        if (context.serializer == GraphQLSerializer.JACKSON) {
+            // always add @get:JsonProperty annotation as a workaround to Jackson limitations
+            // related to JavaBean naming conventions
+            propertySpecBuilder.addAnnotation(
+                AnnotationSpec.builder(JsonProperty::class)
+                    .useSiteTarget(AnnotationSpec.UseSiteTarget.GET)
+                    .addMember("value = \"$fieldName\"")
+                    .build()
+            )
+        }
         propertySpecBuilder.build()
     }
 
diff --git a/plugins/client/graphql-kotlin-client-generator/src/test/data/generator/alias/AliasQuery.kt b/plugins/client/graphql-kotlin-client-generator/src/test/data/generator/alias/AliasQuery.kt
index f0e43a2a03..42a41042fa 100644
--- a/plugins/client/graphql-kotlin-client-generator/src/test/data/generator/alias/AliasQuery.kt
+++ b/plugins/client/graphql-kotlin-client-generator/src/test/data/generator/alias/AliasQuery.kt
@@ -2,6 +2,7 @@ package com.expediagroup.graphql.generated
 
 import com.expediagroup.graphql.client.Generated
 import com.expediagroup.graphql.client.types.GraphQLClientRequest
+import com.fasterxml.jackson.`annotation`.JsonProperty
 import kotlin.Boolean
 import kotlin.String
 import kotlin.reflect.KClass
@@ -22,10 +23,12 @@ public class AliasQuery : GraphQLClientRequest<AliasQuery.Result> {
     /**
      * Query that accepts some input arguments
      */
+    @get:JsonProperty(value = "first")
     public val first: Boolean,
     /**
      * Query that accepts some input arguments
      */
+    @get:JsonProperty(value = "second")
     public val second: Boolean,
   )
 }
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 d9e996b495..ad5bb69e93 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
@@ -4,6 +4,7 @@ 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.fasterxml.jackson.`annotation`.JsonProperty
 import kotlin.String
 import kotlin.reflect.KClass
 
@@ -23,10 +24,12 @@ public class AliasNestedQuery : GraphQLClientRequest<AliasNestedQuery.Result> {
     /**
      * Query returning an object that references another object
      */
+    @get:JsonProperty(value = "first")
     public val first: ComplexObject,
     /**
      * Query returning an object that references another object
      */
+    @get:JsonProperty(value = "second")
     public val second: ComplexObject2,
   )
 }
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/aliasnestedquery/ComplexObject.kt
index 67384da863..9cb2770c0f 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/aliasnestedquery/ComplexObject.kt
@@ -1,6 +1,7 @@
 package com.expediagroup.graphql.generated.aliasnestedquery
 
 import com.expediagroup.graphql.client.Generated
+import com.fasterxml.jackson.`annotation`.JsonProperty
 import kotlin.String
 
 /**
@@ -13,5 +14,6 @@ public data class ComplexObject(
   /**
    * Some object name
    */
+  @get:JsonProperty(value = "nameA")
   public val nameA: String,
 )
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/aliasnestedquery/ComplexObject2.kt
index 3dac9e25b2..b0d2a28f76 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/aliasnestedquery/ComplexObject2.kt
@@ -1,6 +1,7 @@
 package com.expediagroup.graphql.generated.aliasnestedquery
 
 import com.expediagroup.graphql.client.Generated
+import com.fasterxml.jackson.`annotation`.JsonProperty
 import kotlin.String
 
 /**
@@ -13,5 +14,6 @@ public data class ComplexObject2(
   /**
    * Some object name
    */
+  @get:JsonProperty(value = "nameB")
   public val nameB: String,
 )
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 65614f59be..921dcfc2f8 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
@@ -3,6 +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.documentationquery.DocObject
+import com.fasterxml.jackson.`annotation`.JsonProperty
 import kotlin.String
 import kotlin.reflect.KClass
 
@@ -22,6 +23,7 @@ public class DocumentationQuery : GraphQLClientRequest<DocumentationQuery.Result
     /**
      * Query to test doc strings
      */
+    @get:JsonProperty(value = "docQuery")
     public val docQuery: DocObject,
   )
 }
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/documentationquery/DocObject.kt
index e7dd5c4cd1..b15eab25aa 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/documentationquery/DocObject.kt
@@ -1,6 +1,7 @@
 package com.expediagroup.graphql.generated.documentationquery
 
 import com.expediagroup.graphql.client.Generated
+import com.fasterxml.jackson.`annotation`.JsonProperty
 import kotlin.Int
 
 /**
@@ -11,5 +12,6 @@ public data class DocObject(
   /**
    * An id with a comment containing % and $ as well
    */
+  @get:JsonProperty(value = "id")
   public val id: Int,
 )
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 ccb7bbc674..ee16f65e7e 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
@@ -36,10 +36,12 @@ public class IncludeSkipDirectivesQuery(
     /**
      * Query that returns enum value
      */
+    @get:JsonProperty(value = "enumQuery")
     public val enumQuery: CustomEnum? = null,
     /**
      * Query that returns wrapper object with all supported scalar types
      */
+    @get:JsonProperty(value = "scalarQuery")
     public val scalarQuery: ScalarWrapper? = null,
   )
 }
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/includeskipdirectivesquery/ScalarWrapper.kt
index 20d16158a7..ca171dd383 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/includeskipdirectivesquery/ScalarWrapper.kt
@@ -1,6 +1,7 @@
 package com.expediagroup.graphql.generated.includeskipdirectivesquery
 
 import com.expediagroup.graphql.client.Generated
+import com.fasterxml.jackson.`annotation`.JsonProperty
 import kotlin.Int
 
 /**
@@ -11,5 +12,6 @@ public data class ScalarWrapper(
   /**
    * A signed 32-bit nullable integer value
    */
+  @get:JsonProperty(value = "count")
   public val count: Int? = null,
 )
diff --git a/plugins/client/graphql-kotlin-client-generator/src/test/data/generator/input_hard_coded/HardCodedInputQuery.kt b/plugins/client/graphql-kotlin-client-generator/src/test/data/generator/input_hard_coded/HardCodedInputQuery.kt
index 0e834fe3fc..b448b2232a 100644
--- a/plugins/client/graphql-kotlin-client-generator/src/test/data/generator/input_hard_coded/HardCodedInputQuery.kt
+++ b/plugins/client/graphql-kotlin-client-generator/src/test/data/generator/input_hard_coded/HardCodedInputQuery.kt
@@ -2,6 +2,7 @@ package com.expediagroup.graphql.generated
 
 import com.expediagroup.graphql.client.Generated
 import com.expediagroup.graphql.client.types.GraphQLClientRequest
+import com.fasterxml.jackson.`annotation`.JsonProperty
 import kotlin.Boolean
 import kotlin.String
 import kotlin.reflect.KClass
@@ -23,6 +24,7 @@ public class HardCodedInputQuery : GraphQLClientRequest<HardCodedInputQuery.Resu
     /**
      * Query that accepts some input arguments
      */
+    @get:JsonProperty(value = "inputObjectQuery")
     public val inputObjectQuery: Boolean,
   )
 }
diff --git a/plugins/client/graphql-kotlin-client-generator/src/test/data/generator/input_lists/InputListQuery.kt b/plugins/client/graphql-kotlin-client-generator/src/test/data/generator/input_lists/InputListQuery.kt
index 1b92422953..56af7afff9 100644
--- a/plugins/client/graphql-kotlin-client-generator/src/test/data/generator/input_lists/InputListQuery.kt
+++ b/plugins/client/graphql-kotlin-client-generator/src/test/data/generator/input_lists/InputListQuery.kt
@@ -35,6 +35,7 @@ public class InputListQuery(
     /**
      * Query accepting list input
      */
+    @get:JsonProperty(value = "listInputQuery")
     public val listInputQuery: String? = null,
   )
 }
diff --git a/plugins/client/graphql-kotlin-client-generator/src/test/data/generator/input_self_reference/SelfReferencingInputQuery.kt b/plugins/client/graphql-kotlin-client-generator/src/test/data/generator/input_self_reference/SelfReferencingInputQuery.kt
index 581c0385ad..fad8ceee67 100644
--- a/plugins/client/graphql-kotlin-client-generator/src/test/data/generator/input_self_reference/SelfReferencingInputQuery.kt
+++ b/plugins/client/graphql-kotlin-client-generator/src/test/data/generator/input_self_reference/SelfReferencingInputQuery.kt
@@ -33,6 +33,7 @@ public class SelfReferencingInputQuery(
     /**
      * Query that accepts self referencing input object
      */
+    @get:JsonProperty(value = "complexInputObjectQuery")
     public val complexInputObjectQuery: Boolean,
   )
 }
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 b8bb28cfe9..e60f9ca283 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
@@ -4,6 +4,7 @@ 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.fasterxml.jackson.`annotation`.JsonProperty
 import kotlin.String
 import kotlin.reflect.KClass
 
@@ -24,10 +25,12 @@ public class DifferentSelectionSetQuery : GraphQLClientRequest<DifferentSelectio
     /**
      * Query returning an interface
      */
+    @get:JsonProperty(value = "first")
     public val first: BasicInterface,
     /**
      * Query returning an interface
      */
+    @get:JsonProperty(value = "second")
     public val second: BasicInterface2,
   )
 }
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/differentselectionsetquery/BasicInterface.kt
index 58ee374b32..e839eba72c 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/differentselectionsetquery/BasicInterface.kt
@@ -1,6 +1,7 @@
 package com.expediagroup.graphql.generated.differentselectionsetquery
 
 import com.expediagroup.graphql.client.Generated
+import com.fasterxml.jackson.`annotation`.JsonProperty
 import com.fasterxml.jackson.`annotation`.JsonSubTypes
 import com.fasterxml.jackson.`annotation`.JsonTypeInfo
 import com.fasterxml.jackson.`annotation`.JsonTypeInfo.As.PROPERTY
@@ -27,11 +28,13 @@ public interface BasicInterface {
   /**
    * Unique identifier of an interface
    */
+  @get:JsonProperty(value = "id")
   public val id: Int
 
   /**
    * Name field
    */
+  @get:JsonProperty(value = "name")
   public val name: String
 }
 
@@ -43,14 +46,17 @@ public data class FirstInterfaceImplementation(
   /**
    * Unique identifier of the first implementation
    */
+  @get:JsonProperty(value = "id")
   override val id: Int,
   /**
    * Name of the first implementation
    */
+  @get:JsonProperty(value = "name")
   override val name: String,
   /**
    * Custom field integer value
    */
+  @get:JsonProperty(value = "intValue")
   public val intValue: Int,
 ) : BasicInterface
 
@@ -62,14 +68,17 @@ public data class SecondInterfaceImplementation(
   /**
    * Unique identifier of the second implementation
    */
+  @get:JsonProperty(value = "id")
   override val id: Int,
   /**
    * Name of the second implementation
    */
+  @get:JsonProperty(value = "name")
   override val name: String,
   /**
    * Custom field float value
    */
+  @get:JsonProperty(value = "floatValue")
   public val floatValue: Double,
 ) : BasicInterface
 
@@ -82,9 +91,11 @@ public data class DefaultBasicInterfaceImplementation(
   /**
    * Unique identifier of an interface
    */
+  @get:JsonProperty(value = "id")
   override val id: Int,
   /**
    * Name field
    */
+  @get:JsonProperty(value = "name")
   override val name: String,
 ) : BasicInterface
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/differentselectionsetquery/BasicInterface2.kt
index 0f23b40118..3545c1e8a2 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/differentselectionsetquery/BasicInterface2.kt
@@ -1,6 +1,7 @@
 package com.expediagroup.graphql.generated.differentselectionsetquery
 
 import com.expediagroup.graphql.client.Generated
+import com.fasterxml.jackson.`annotation`.JsonProperty
 import com.fasterxml.jackson.`annotation`.JsonSubTypes
 import com.fasterxml.jackson.`annotation`.JsonTypeInfo
 import com.fasterxml.jackson.`annotation`.JsonTypeInfo.As.PROPERTY
@@ -27,6 +28,7 @@ public interface BasicInterface2 {
   /**
    * Name field
    */
+  @get:JsonProperty(value = "name")
   public val name: String
 }
 
@@ -38,10 +40,12 @@ public data class FirstInterfaceImplementation2(
   /**
    * Name of the first implementation
    */
+  @get:JsonProperty(value = "name")
   override val name: String,
   /**
    * Custom field integer value
    */
+  @get:JsonProperty(value = "intValue")
   public val intValue: Int,
 ) : BasicInterface2
 
@@ -53,10 +57,12 @@ public data class SecondInterfaceImplementation2(
   /**
    * Name of the second implementation
    */
+  @get:JsonProperty(value = "name")
   override val name: String,
   /**
    * Custom field float value
    */
+  @get:JsonProperty(value = "floatValue")
   public val floatValue: Double,
 ) : BasicInterface2
 
@@ -69,5 +75,6 @@ public data class DefaultBasicInterface2Implementation(
   /**
    * Name field
    */
+  @get:JsonProperty(value = "name")
   override val name: String,
 ) : BasicInterface2
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 2b7881c162..d559b197f5 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
@@ -4,6 +4,7 @@ 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.fasterxml.jackson.`annotation`.JsonProperty
 import kotlin.String
 import kotlin.reflect.KClass
 
@@ -24,10 +25,12 @@ public class DifferentSelectionSetQuery : GraphQLClientRequest<DifferentSelectio
     /**
      * Query returning an interface
      */
+    @get:JsonProperty(value = "first")
     public val first: BasicInterface,
     /**
      * Query returning an interface
      */
+    @get:JsonProperty(value = "second")
     public val second: BasicInterface2,
   )
 }
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/differentselectionsetquery/BasicInterface.kt
index 4d80af0ab6..eba0e839ed 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/differentselectionsetquery/BasicInterface.kt
@@ -1,6 +1,7 @@
 package com.expediagroup.graphql.generated.differentselectionsetquery
 
 import com.expediagroup.graphql.client.Generated
+import com.fasterxml.jackson.`annotation`.JsonProperty
 import com.fasterxml.jackson.`annotation`.JsonSubTypes
 import com.fasterxml.jackson.`annotation`.JsonTypeInfo
 import com.fasterxml.jackson.`annotation`.JsonTypeInfo.As.PROPERTY
@@ -26,6 +27,7 @@ public interface BasicInterface {
   /**
    * Unique identifier of an interface
    */
+  @get:JsonProperty(value = "id")
   public val id: Int
 }
 
@@ -37,10 +39,12 @@ public data class FirstInterfaceImplementation(
   /**
    * Unique identifier of the first implementation
    */
+  @get:JsonProperty(value = "id")
   override val id: Int,
   /**
    * Custom field integer value
    */
+  @get:JsonProperty(value = "intValue")
   public val intValue: Int,
 ) : BasicInterface
 
@@ -52,10 +56,12 @@ public data class SecondInterfaceImplementation(
   /**
    * Unique identifier of the second implementation
    */
+  @get:JsonProperty(value = "id")
   override val id: Int,
   /**
    * Custom field float value
    */
+  @get:JsonProperty(value = "floatValue")
   public val floatValue: Double,
 ) : BasicInterface
 
@@ -68,5 +74,6 @@ public data class DefaultBasicInterfaceImplementation(
   /**
    * Unique identifier of an interface
    */
+  @get:JsonProperty(value = "id")
   override val id: Int,
 ) : BasicInterface
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/differentselectionsetquery/BasicInterface2.kt
index 9006fad53b..04d49ed350 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/differentselectionsetquery/BasicInterface2.kt
@@ -1,6 +1,7 @@
 package com.expediagroup.graphql.generated.differentselectionsetquery
 
 import com.expediagroup.graphql.client.Generated
+import com.fasterxml.jackson.`annotation`.JsonProperty
 import com.fasterxml.jackson.`annotation`.JsonSubTypes
 import com.fasterxml.jackson.`annotation`.JsonTypeInfo
 import com.fasterxml.jackson.`annotation`.JsonTypeInfo.As.PROPERTY
@@ -27,6 +28,7 @@ public interface BasicInterface2 {
   /**
    * Unique identifier of an interface
    */
+  @get:JsonProperty(value = "id")
   public val id: Int
 }
 
@@ -38,14 +40,17 @@ public data class FirstInterfaceImplementation2(
   /**
    * Unique identifier of the first implementation
    */
+  @get:JsonProperty(value = "id")
   override val id: Int,
   /**
    * Name of the first implementation
    */
+  @get:JsonProperty(value = "name")
   public val name: String,
   /**
    * Custom field integer value
    */
+  @get:JsonProperty(value = "intValue")
   public val intValue: Int,
 ) : BasicInterface2
 
@@ -57,14 +62,17 @@ public data class SecondInterfaceImplementation2(
   /**
    * Unique identifier of the second implementation
    */
+  @get:JsonProperty(value = "id")
   override val id: Int,
   /**
    * Name of the second implementation
    */
+  @get:JsonProperty(value = "name")
   public val name: String,
   /**
    * Custom field float value
    */
+  @get:JsonProperty(value = "floatValue")
   public val floatValue: Double,
 ) : BasicInterface2
 
@@ -77,5 +85,6 @@ public data class DefaultBasicInterface2Implementation(
   /**
    * Unique identifier of an interface
    */
+  @get:JsonProperty(value = "id")
   override val id: Int,
 ) : BasicInterface2
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 72b012ee9a..645899bc50 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
@@ -3,6 +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.interfacemissingtypeselection.BasicInterface
+import com.fasterxml.jackson.`annotation`.JsonProperty
 import kotlin.String
 import kotlin.reflect.KClass
 
@@ -24,6 +25,7 @@ public class InterfaceMissingTypeSelection :
     /**
      * Query returning an interface
      */
+    @get:JsonProperty(value = "interfaceQuery")
     public val interfaceQuery: BasicInterface,
   )
 }
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/interfacemissingtypeselection/BasicInterface.kt
index 1b1c555ab2..c954eb7897 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/interfacemissingtypeselection/BasicInterface.kt
@@ -1,6 +1,7 @@
 package com.expediagroup.graphql.generated.interfacemissingtypeselection
 
 import com.expediagroup.graphql.client.Generated
+import com.fasterxml.jackson.`annotation`.JsonProperty
 import com.fasterxml.jackson.`annotation`.JsonSubTypes
 import com.fasterxml.jackson.`annotation`.JsonTypeInfo
 import com.fasterxml.jackson.`annotation`.JsonTypeInfo.As.PROPERTY
@@ -24,11 +25,13 @@ public interface BasicInterface {
   /**
    * Unique identifier of an interface
    */
+  @get:JsonProperty(value = "id")
   public val id: Int
 
   /**
    * Name field
    */
+  @get:JsonProperty(value = "name")
   public val name: String
 }
 
@@ -40,14 +43,17 @@ public data class FirstInterfaceImplementation(
   /**
    * Unique identifier of the first implementation
    */
+  @get:JsonProperty(value = "id")
   override val id: Int,
   /**
    * Name of the first implementation
    */
+  @get:JsonProperty(value = "name")
   override val name: String,
   /**
    * Custom field integer value
    */
+  @get:JsonProperty(value = "intValue")
   public val intValue: Int,
 ) : BasicInterface
 
@@ -60,9 +66,11 @@ public data class DefaultBasicInterfaceImplementation(
   /**
    * Unique identifier of an interface
    */
+  @get:JsonProperty(value = "id")
   override val id: Int,
   /**
    * Name field
    */
+  @get:JsonProperty(value = "name")
   override val name: String,
 ) : BasicInterface
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 10d37af2e4..fb776fec03 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
@@ -3,6 +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.interfacewithnamedfragmentsquery.BasicInterface
+import com.fasterxml.jackson.`annotation`.JsonProperty
 import kotlin.String
 import kotlin.reflect.KClass
 
@@ -24,6 +25,7 @@ public class InterfaceWithNamedFragmentsQuery :
     /**
      * Query returning an interface
      */
+    @get:JsonProperty(value = "interfaceQuery")
     public val interfaceQuery: BasicInterface,
   )
 }
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/interfacewithnamedfragmentsquery/BasicInterface.kt
index 9eb2e001dd..c1343e0995 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/interfacewithnamedfragmentsquery/BasicInterface.kt
@@ -1,6 +1,7 @@
 package com.expediagroup.graphql.generated.interfacewithnamedfragmentsquery
 
 import com.expediagroup.graphql.client.Generated
+import com.fasterxml.jackson.`annotation`.JsonProperty
 import com.fasterxml.jackson.`annotation`.JsonSubTypes
 import com.fasterxml.jackson.`annotation`.JsonTypeInfo
 import com.fasterxml.jackson.`annotation`.JsonTypeInfo.As.PROPERTY
@@ -27,11 +28,13 @@ public interface BasicInterface {
   /**
    * Unique identifier of an interface
    */
+  @get:JsonProperty(value = "id")
   public val id: Int
 
   /**
    * Name field
    */
+  @get:JsonProperty(value = "name")
   public val name: String
 }
 
@@ -43,14 +46,17 @@ public data class FirstInterfaceImplementation(
   /**
    * Unique identifier of the first implementation
    */
+  @get:JsonProperty(value = "id")
   override val id: Int,
   /**
    * Name of the first implementation
    */
+  @get:JsonProperty(value = "name")
   override val name: String,
   /**
    * Custom field integer value
    */
+  @get:JsonProperty(value = "intValue")
   public val intValue: Int,
 ) : BasicInterface
 
@@ -62,14 +68,17 @@ public data class SecondInterfaceImplementation(
   /**
    * Unique identifier of the second implementation
    */
+  @get:JsonProperty(value = "id")
   override val id: Int,
   /**
    * Name of the second implementation
    */
+  @get:JsonProperty(value = "name")
   override val name: String,
   /**
    * Custom field float value
    */
+  @get:JsonProperty(value = "floatValue")
   public val floatValue: Double,
 ) : BasicInterface
 
@@ -82,9 +91,11 @@ public data class DefaultBasicInterfaceImplementation(
   /**
    * Unique identifier of an interface
    */
+  @get:JsonProperty(value = "id")
   override val id: Int,
   /**
    * Name field
    */
+  @get:JsonProperty(value = "name")
   override val name: String,
 ) : BasicInterface
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 1d6d5b9fa8..934dc46b9f 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
@@ -32,6 +32,7 @@ public class SimpleMutation(
     /**
      * Example of a muation
      */
+    @get:JsonProperty(value = "simpleMutation")
     public val simpleMutation: BasicObject,
   )
 }
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/mutation/simplemutation/BasicObject.kt
index 99101f3ba5..c89c01fb4a 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/mutation/simplemutation/BasicObject.kt
@@ -1,6 +1,7 @@
 package com.expediagroup.graphql.generated.simplemutation
 
 import com.expediagroup.graphql.client.Generated
+import com.fasterxml.jackson.`annotation`.JsonProperty
 import kotlin.Int
 import kotlin.String
 
@@ -9,9 +10,11 @@ import kotlin.String
  */
 @Generated
 public data class BasicObject(
+  @get:JsonProperty(value = "id")
   public val id: Int,
   /**
    * Object name
    */
+  @get:JsonProperty(value = "name")
   public val name: String,
 )
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 f75a613db9..e440381562 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
@@ -4,6 +4,7 @@ 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.fasterxml.jackson.`annotation`.JsonProperty
 import kotlin.String
 import kotlin.reflect.KClass
 
@@ -24,10 +25,12 @@ public class DifferentSelectionsQuery : GraphQLClientRequest<DifferentSelections
     /**
      * Query returning an object that references another object
      */
+    @get:JsonProperty(value = "first")
     public val first: ComplexObject,
     /**
      * Query returning an object that references another object
      */
+    @get:JsonProperty(value = "second")
     public val second: ComplexObject2,
   )
 }
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/object_diff_selection_set/differentselectionsquery/ComplexObject.kt
index 2e496d17b1..6c995d720a 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/object_diff_selection_set/differentselectionsquery/ComplexObject.kt
@@ -1,6 +1,7 @@
 package com.expediagroup.graphql.generated.differentselectionsquery
 
 import com.expediagroup.graphql.client.Generated
+import com.fasterxml.jackson.`annotation`.JsonProperty
 import kotlin.Int
 import kotlin.String
 
@@ -14,9 +15,11 @@ public data class ComplexObject(
   /**
    * Some unique identifier
    */
+  @get:JsonProperty(value = "id")
   public val id: Int,
   /**
    * Some object name
    */
+  @get:JsonProperty(value = "name")
   public val name: String,
 )
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/object_diff_selection_set/differentselectionsquery/ComplexObject2.kt
index 4489dc7c10..7875f0f6a2 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/object_diff_selection_set/differentselectionsquery/ComplexObject2.kt
@@ -1,6 +1,7 @@
 package com.expediagroup.graphql.generated.differentselectionsquery
 
 import com.expediagroup.graphql.client.Generated
+import com.fasterxml.jackson.`annotation`.JsonProperty
 import kotlin.Int
 import kotlin.String
 
@@ -14,13 +15,16 @@ public data class ComplexObject2(
   /**
    * Some unique identifier
    */
+  @get:JsonProperty(value = "id")
   public val id: Int,
   /**
    * Some object name
    */
+  @get:JsonProperty(value = "name")
   public val name: String,
   /**
    * Some additional details
    */
+  @get:JsonProperty(value = "details")
   public val details: DetailsObject,
 )
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/object_diff_selection_set/differentselectionsquery/DetailsObject.kt
index 1940ca4ef6..b5c52e0d3b 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/object_diff_selection_set/differentselectionsquery/DetailsObject.kt
@@ -1,6 +1,7 @@
 package com.expediagroup.graphql.generated.differentselectionsquery
 
 import com.expediagroup.graphql.client.Generated
+import com.fasterxml.jackson.`annotation`.JsonProperty
 import kotlin.Int
 import kotlin.String
 
@@ -12,9 +13,11 @@ public data class DetailsObject(
   /**
    * Unique identifier
    */
+  @get:JsonProperty(value = "id")
   public val id: Int,
   /**
    * Actual detail value
    */
+  @get:JsonProperty(value = "value")
   public val `value`: String,
 )
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 6c92c9554a..fe11198670 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
@@ -4,6 +4,7 @@ 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.fasterxml.jackson.`annotation`.JsonProperty
 import kotlin.String
 import kotlin.reflect.KClass
 
@@ -24,10 +25,12 @@ public class DifferentSubselectionQuery : GraphQLClientRequest<DifferentSubselec
     /**
      * Query returning an object that references another object
      */
+    @get:JsonProperty(value = "first")
     public val first: ComplexObject,
     /**
      * Query returning an object that references another object
      */
+    @get:JsonProperty(value = "second")
     public val second: ComplexObject2,
   )
 }
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/differentsubselectionquery/ComplexObject.kt
index 09a95834fc..4e79d82b6f 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/differentsubselectionquery/ComplexObject.kt
@@ -1,6 +1,7 @@
 package com.expediagroup.graphql.generated.differentsubselectionquery
 
 import com.expediagroup.graphql.client.Generated
+import com.fasterxml.jackson.`annotation`.JsonProperty
 import kotlin.Int
 import kotlin.String
 
@@ -14,13 +15,16 @@ public data class ComplexObject(
   /**
    * Some unique identifier
    */
+  @get:JsonProperty(value = "id")
   public val id: Int,
   /**
    * Some object name
    */
+  @get:JsonProperty(value = "name")
   public val name: String,
   /**
    * Some additional details
    */
+  @get:JsonProperty(value = "details")
   public val details: DetailsObject,
 )
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/differentsubselectionquery/ComplexObject2.kt
index f4b2df9e83..033ad5d4a6 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/differentsubselectionquery/ComplexObject2.kt
@@ -1,6 +1,7 @@
 package com.expediagroup.graphql.generated.differentsubselectionquery
 
 import com.expediagroup.graphql.client.Generated
+import com.fasterxml.jackson.`annotation`.JsonProperty
 import kotlin.Int
 import kotlin.String
 
@@ -14,13 +15,16 @@ public data class ComplexObject2(
   /**
    * Some unique identifier
    */
+  @get:JsonProperty(value = "id")
   public val id: Int,
   /**
    * Some object name
    */
+  @get:JsonProperty(value = "name")
   public val name: String,
   /**
    * Some additional details
    */
+  @get:JsonProperty(value = "details")
   public val details: DetailsObject2,
 )
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/generator/object_diff_sub_selection/differentsubselectionquery/DetailsObject.kt
index 8db671fd32..7150f6508a 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/generator/object_diff_sub_selection/differentsubselectionquery/DetailsObject.kt
@@ -1,6 +1,7 @@
 package com.expediagroup.graphql.generated.differentsubselectionquery
 
 import com.expediagroup.graphql.client.Generated
+import com.fasterxml.jackson.`annotation`.JsonProperty
 import kotlin.Boolean
 import kotlin.Int
 import kotlin.String
@@ -13,13 +14,16 @@ public data class DetailsObject(
   /**
    * Unique identifier
    */
+  @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,
 )
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/differentsubselectionquery/DetailsObject2.kt
index 58243afb8f..5bb27fbe29 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/differentsubselectionquery/DetailsObject2.kt
@@ -1,6 +1,7 @@
 package com.expediagroup.graphql.generated.differentsubselectionquery
 
 import com.expediagroup.graphql.client.Generated
+import com.fasterxml.jackson.`annotation`.JsonProperty
 import kotlin.Int
 import kotlin.String
 
@@ -12,9 +13,11 @@ public data class DetailsObject2(
   /**
    * Unique identifier
    */
+  @get:JsonProperty(value = "id")
   public val id: Int,
   /**
    * Actual detail value
    */
+  @get:JsonProperty(value = "value")
   public val `value`: String,
 )
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 7a517cee9c..02fded198b 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
@@ -3,6 +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.listquery.BasicObject
+import com.fasterxml.jackson.`annotation`.JsonProperty
 import kotlin.String
 import kotlin.collections.List
 import kotlin.reflect.KClass
@@ -22,6 +23,7 @@ public class ListQuery : GraphQLClientRequest<ListQuery.Result> {
     /**
      * Query returning list of simple objects
      */
+    @get:JsonProperty(value = "listQuery")
     public val listQuery: List<BasicObject>,
   )
 }
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/object_list/listquery/BasicObject.kt
index 6df0a9fbed..ef91f2c75a 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/object_list/listquery/BasicObject.kt
@@ -1,6 +1,7 @@
 package com.expediagroup.graphql.generated.listquery
 
 import com.expediagroup.graphql.client.Generated
+import com.fasterxml.jackson.`annotation`.JsonProperty
 import kotlin.Int
 import kotlin.String
 
@@ -9,9 +10,11 @@ import kotlin.String
  */
 @Generated
 public data class BasicObject(
+  @get:JsonProperty(value = "id")
   public val id: Int,
   /**
    * Object name
    */
+  @get:JsonProperty(value = "name")
   public val name: String,
 )
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 db57859b2b..3c51e22ef6 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
@@ -3,6 +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.objectwithnamedfragmentquery.ComplexObject
+import com.fasterxml.jackson.`annotation`.JsonProperty
 import kotlin.String
 import kotlin.reflect.KClass
 
@@ -24,6 +25,7 @@ public class ObjectWithNamedFragmentQuery :
     /**
      * Query returning an object that references another object
      */
+    @get:JsonProperty(value = "complexObjectQuery")
     public val complexObjectQuery: ComplexObject,
   )
 }
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/objectwithnamedfragmentquery/ComplexObject.kt
index 273c559dc9..ed20d6f8f3 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/objectwithnamedfragmentquery/ComplexObject.kt
@@ -1,6 +1,7 @@
 package com.expediagroup.graphql.generated.objectwithnamedfragmentquery
 
 import com.expediagroup.graphql.client.Generated
+import com.fasterxml.jackson.`annotation`.JsonProperty
 import kotlin.Int
 import kotlin.String
 
@@ -14,13 +15,16 @@ public data class ComplexObject(
   /**
    * Some unique identifier
    */
+  @get:JsonProperty(value = "id")
   public val id: Int,
   /**
    * Some object name
    */
+  @get:JsonProperty(value = "name")
   public val name: String,
   /**
    * Some additional details
    */
+  @get:JsonProperty(value = "details")
   public val details: DetailsObject,
 )
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/object_named_fragments/objectwithnamedfragmentquery/DetailsObject.kt
index 566f257681..a9f40fe324 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/object_named_fragments/objectwithnamedfragmentquery/DetailsObject.kt
@@ -1,6 +1,7 @@
 package com.expediagroup.graphql.generated.objectwithnamedfragmentquery
 
 import com.expediagroup.graphql.client.Generated
+import com.fasterxml.jackson.`annotation`.JsonProperty
 import kotlin.String
 
 /**
@@ -11,5 +12,6 @@ public data class DetailsObject(
   /**
    * Actual detail value
    */
+  @get:JsonProperty(value = "value")
   public val `value`: String,
 )
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 43e7888fca..701acc8e86 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
@@ -3,6 +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.nestedquery.NestedObject
+import com.fasterxml.jackson.`annotation`.JsonProperty
 import kotlin.String
 import kotlin.reflect.KClass
 
@@ -22,6 +23,7 @@ public class NestedQuery : GraphQLClientRequest<NestedQuery.Result> {
     /**
      * Query returning object referencing itself
      */
+    @get:JsonProperty(value = "nestedObjectQuery")
     public val nestedObjectQuery: NestedObject,
   )
 }
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/nestedquery/NestedObject.kt
index af566c4215..02675cf684 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/nestedquery/NestedObject.kt
@@ -1,6 +1,7 @@
 package com.expediagroup.graphql.generated.nestedquery
 
 import com.expediagroup.graphql.client.Generated
+import com.fasterxml.jackson.`annotation`.JsonProperty
 import kotlin.Int
 import kotlin.String
 import kotlin.collections.List
@@ -13,13 +14,16 @@ public data class NestedObject(
   /**
    * Unique identifier
    */
+  @get:JsonProperty(value = "id")
   public val id: Int,
   /**
    * Name of the object
    */
+  @get:JsonProperty(value = "name")
   public val name: String,
   /**
    * Children elements
    */
+  @get:JsonProperty(value = "children")
   public val children: List<NestedObject2>,
 )
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/nestedquery/NestedObject2.kt
index afef1b3389..d38eff8b7a 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/nestedquery/NestedObject2.kt
@@ -1,6 +1,7 @@
 package com.expediagroup.graphql.generated.nestedquery
 
 import com.expediagroup.graphql.client.Generated
+import com.fasterxml.jackson.`annotation`.JsonProperty
 import kotlin.String
 import kotlin.collections.List
 
@@ -12,9 +13,11 @@ public data class NestedObject2(
   /**
    * Name of the object
    */
+  @get:JsonProperty(value = "name")
   public val name: String,
   /**
    * Children elements
    */
+  @get:JsonProperty(value = "children")
   public val children: List<NestedObject3>,
 )
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/nestedquery/NestedObject3.kt
index dd87c34255..b8a9cc92ac 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/nestedquery/NestedObject3.kt
@@ -1,6 +1,7 @@
 package com.expediagroup.graphql.generated.nestedquery
 
 import com.expediagroup.graphql.client.Generated
+import com.fasterxml.jackson.`annotation`.JsonProperty
 import kotlin.Int
 import kotlin.String
 import kotlin.collections.List
@@ -13,13 +14,16 @@ public data class NestedObject3(
   /**
    * Unique identifier
    */
+  @get:JsonProperty(value = "id")
   public val id: Int,
   /**
    * Name of the object
    */
+  @get:JsonProperty(value = "name")
   public val name: String,
   /**
    * Children elements
    */
+  @get:JsonProperty(value = "children")
   public val children: List<NestedObject4>,
 )
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/nestedquery/NestedObject4.kt
index 6c91dd103b..ea2f379db5 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/nestedquery/NestedObject4.kt
@@ -1,6 +1,7 @@
 package com.expediagroup.graphql.generated.nestedquery
 
 import com.expediagroup.graphql.client.Generated
+import com.fasterxml.jackson.`annotation`.JsonProperty
 import kotlin.Int
 import kotlin.String
 
@@ -12,9 +13,11 @@ public data class NestedObject4(
   /**
    * Unique identifier
    */
+  @get:JsonProperty(value = "id")
   public val id: Int,
   /**
    * Name of the object
    */
+  @get:JsonProperty(value = "name")
   public val name: String,
 )
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 5d4c479c22..40c1e724f7 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
@@ -3,6 +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.anonymousquery.ScalarWrapper
+import com.fasterxml.jackson.`annotation`.JsonProperty
 import kotlin.String
 import kotlin.reflect.KClass
 
@@ -19,6 +20,7 @@ public class AnonymousQuery : GraphQLClientRequest<AnonymousQuery.Result> {
     /**
      * Query that returns wrapper object with all supported scalar types
      */
+    @get:JsonProperty(value = "scalarQuery")
     public val scalarQuery: ScalarWrapper,
   )
 }
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/anonymousquery/ScalarWrapper.kt
index 2cea6fac4b..719e5936a8 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/anonymousquery/ScalarWrapper.kt
@@ -1,6 +1,7 @@
 package com.expediagroup.graphql.generated.anonymousquery
 
 import com.expediagroup.graphql.client.Generated
+import com.fasterxml.jackson.`annotation`.JsonProperty
 import kotlin.String
 
 /**
@@ -11,5 +12,6 @@ public data class ScalarWrapper(
   /**
    * UTF-8 character sequence
    */
+  @get:JsonProperty(value = "name")
   public val name: String,
 )
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 c984ddb904..4a003e6075 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
@@ -3,6 +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.mixedcasequery.ScalarWrapper
+import com.fasterxml.jackson.`annotation`.JsonProperty
 import kotlin.String
 import kotlin.reflect.KClass
 
@@ -22,6 +23,7 @@ public class MiXEDcaSEQuery : GraphQLClientRequest<MiXEDcaSEQuery.Result> {
     /**
      * Query that returns wrapper object with all supported scalar types
      */
+    @get:JsonProperty(value = "scalarQuery")
     public val scalarQuery: ScalarWrapper,
   )
 }
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/mixedcasequery/ScalarWrapper.kt
index 522113980e..f478b3a271 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/mixedcasequery/ScalarWrapper.kt
@@ -1,6 +1,7 @@
 package com.expediagroup.graphql.generated.mixedcasequery
 
 import com.expediagroup.graphql.client.Generated
+import com.fasterxml.jackson.`annotation`.JsonProperty
 import kotlin.String
 
 /**
@@ -11,5 +12,6 @@ public data class ScalarWrapper(
   /**
    * UTF-8 character sequence
    */
+  @get:JsonProperty(value = "name")
   public val name: String,
 )
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 67372c0cf6..6c2ffabfce 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
@@ -7,6 +7,7 @@ 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.fasterxml.jackson.`annotation`.JsonProperty
 import kotlin.String
 import kotlin.collections.List
 import kotlin.reflect.KClass
@@ -28,30 +29,37 @@ public class ReusedListTypesQuery : GraphQLClientRequest<ReusedListTypesQuery.Re
     /**
      * Query returning list of simple objects
      */
+    @get:JsonProperty(value = "first")
     public val first: List<BasicObject>,
     /**
      * Query returning list of simple objects
      */
+    @get:JsonProperty(value = "second")
     public val second: List<BasicObject2>,
     /**
      * Query returning list of simple objects
      */
+    @get:JsonProperty(value = "third")
     public val third: List<BasicObject>,
     /**
      * Query returning an object that references another object
      */
+    @get:JsonProperty(value = "firstComplex")
     public val firstComplex: ComplexObject,
     /**
      * Query returning an object that references another object
      */
+    @get:JsonProperty(value = "secondComplex")
     public val secondComplex: ComplexObject,
     /**
      * Query returning an object that references another object
      */
+    @get:JsonProperty(value = "thirdComplex")
     public val thirdComplex: ComplexObject2,
     /**
      * Query returning an object that references another object
      */
+    @get:JsonProperty(value = "fourthComplex")
     public val fourthComplex: ComplexObject3,
   )
 }
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/reusedlisttypesquery/BasicObject.kt
index bf0da701f3..7d987700cc 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/reusedlisttypesquery/BasicObject.kt
@@ -1,6 +1,7 @@
 package com.expediagroup.graphql.generated.reusedlisttypesquery
 
 import com.expediagroup.graphql.client.Generated
+import com.fasterxml.jackson.`annotation`.JsonProperty
 import kotlin.Int
 import kotlin.String
 
@@ -9,9 +10,11 @@ import kotlin.String
  */
 @Generated
 public data class BasicObject(
+  @get:JsonProperty(value = "id")
   public val id: Int,
   /**
    * Object name
    */
+  @get:JsonProperty(value = "name")
   public val name: String,
 )
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/reusedlisttypesquery/BasicObject2.kt
index 0b69f401cb..235b95669c 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/reusedlisttypesquery/BasicObject2.kt
@@ -1,6 +1,7 @@
 package com.expediagroup.graphql.generated.reusedlisttypesquery
 
 import com.expediagroup.graphql.client.Generated
+import com.fasterxml.jackson.`annotation`.JsonProperty
 import kotlin.String
 
 /**
@@ -11,5 +12,6 @@ public data class BasicObject2(
   /**
    * Object name
    */
+  @get:JsonProperty(value = "name")
   public val name: String,
 )
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/reusedlisttypesquery/BasicObject3.kt
index 23ba0109af..2780ffe6e8 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/reusedlisttypesquery/BasicObject3.kt
@@ -1,6 +1,7 @@
 package com.expediagroup.graphql.generated.reusedlisttypesquery
 
 import com.expediagroup.graphql.client.Generated
+import com.fasterxml.jackson.`annotation`.JsonProperty
 import kotlin.Int
 
 /**
@@ -8,5 +9,6 @@ import kotlin.Int
  */
 @Generated
 public data class BasicObject3(
+  @get:JsonProperty(value = "id")
   public val id: Int,
 )
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/reusedlisttypesquery/ComplexObject.kt
index 3784aba835..105b19e702 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/reusedlisttypesquery/ComplexObject.kt
@@ -1,6 +1,7 @@
 package com.expediagroup.graphql.generated.reusedlisttypesquery
 
 import com.expediagroup.graphql.client.Generated
+import com.fasterxml.jackson.`annotation`.JsonProperty
 import kotlin.Int
 import kotlin.String
 import kotlin.collections.List
@@ -15,13 +16,16 @@ public data class ComplexObject(
   /**
    * Some unique identifier
    */
+  @get:JsonProperty(value = "id")
   public val id: Int,
   /**
    * Some object name
    */
+  @get:JsonProperty(value = "name")
   public val name: String,
   /**
    * List of objects
    */
+  @get:JsonProperty(value = "basicList")
   public val basicList: List<BasicObject>,
 )
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/reusedlisttypesquery/ComplexObject2.kt
index b345f8e72b..1e3ef6bee9 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/reusedlisttypesquery/ComplexObject2.kt
@@ -1,6 +1,7 @@
 package com.expediagroup.graphql.generated.reusedlisttypesquery
 
 import com.expediagroup.graphql.client.Generated
+import com.fasterxml.jackson.`annotation`.JsonProperty
 import kotlin.Int
 import kotlin.String
 import kotlin.collections.List
@@ -15,13 +16,16 @@ public data class ComplexObject2(
   /**
    * Some unique identifier
    */
+  @get:JsonProperty(value = "id")
   public val id: Int,
   /**
    * Some object name
    */
+  @get:JsonProperty(value = "name")
   public val name: String,
   /**
    * List of objects
    */
+  @get:JsonProperty(value = "basicList")
   public val basicList: List<BasicObject2>,
 )
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/reusedlisttypesquery/ComplexObject3.kt
index b30e439772..f9cadbfb51 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/reusedlisttypesquery/ComplexObject3.kt
@@ -1,6 +1,7 @@
 package com.expediagroup.graphql.generated.reusedlisttypesquery
 
 import com.expediagroup.graphql.client.Generated
+import com.fasterxml.jackson.`annotation`.JsonProperty
 import kotlin.Int
 import kotlin.collections.List
 
@@ -14,9 +15,11 @@ public data class ComplexObject3(
   /**
    * Some unique identifier
    */
+  @get:JsonProperty(value = "id")
   public val id: Int,
   /**
    * List of objects
    */
+  @get:JsonProperty(value = "basicList")
   public val basicList: List<BasicObject3>,
 )
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 4afd457d91..248b064f39 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
@@ -5,6 +5,7 @@ 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.fasterxml.jackson.`annotation`.JsonProperty
 import kotlin.String
 import kotlin.reflect.KClass
 
@@ -24,22 +25,27 @@ public class ReusedTypesQuery : GraphQLClientRequest<ReusedTypesQuery.Result> {
     /**
      * Query returning an object that references another object
      */
+    @get:JsonProperty(value = "first")
     public val first: ComplexObject,
     /**
      * Query returning an object that references another object
      */
+    @get:JsonProperty(value = "second")
     public val second: ComplexObject2,
     /**
      * Query returning an object that references another object
      */
+    @get:JsonProperty(value = "third")
     public val third: ComplexObject3,
     /**
      * Query returning an object that references another object
      */
+    @get:JsonProperty(value = "fourth")
     public val fourth: ComplexObject,
     /**
      * Query returning an object that references another object
      */
+    @get:JsonProperty(value = "fifth")
     public val fifth: ComplexObject2,
   )
 }
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/reuse_types/reusedtypesquery/ComplexObject.kt
index 193aad8b3f..d92ba850a8 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/reuse_types/reusedtypesquery/ComplexObject.kt
@@ -1,6 +1,7 @@
 package com.expediagroup.graphql.generated.reusedtypesquery
 
 import com.expediagroup.graphql.client.Generated
+import com.fasterxml.jackson.`annotation`.JsonProperty
 import kotlin.Int
 import kotlin.String
 
@@ -14,9 +15,11 @@ public data class ComplexObject(
   /**
    * Some unique identifier
    */
+  @get:JsonProperty(value = "id")
   public val id: Int,
   /**
    * Some object name
    */
+  @get:JsonProperty(value = "name")
   public val name: String,
 )
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/reuse_types/reusedtypesquery/ComplexObject2.kt
index 7e85a94e6c..54547494b7 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/reuse_types/reusedtypesquery/ComplexObject2.kt
@@ -1,6 +1,7 @@
 package com.expediagroup.graphql.generated.reusedtypesquery
 
 import com.expediagroup.graphql.client.Generated
+import com.fasterxml.jackson.`annotation`.JsonProperty
 import kotlin.Int
 import kotlin.String
 
@@ -14,13 +15,16 @@ public data class ComplexObject2(
   /**
    * Some unique identifier
    */
+  @get:JsonProperty(value = "id")
   public val id: Int,
   /**
    * Some object name
    */
+  @get:JsonProperty(value = "name")
   public val name: String,
   /**
    * Some additional details
    */
+  @get:JsonProperty(value = "details")
   public val details: DetailsObject,
 )
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/reusedtypesquery/ComplexObject3.kt
index 8108e48abf..237a9bccd0 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/reusedtypesquery/ComplexObject3.kt
@@ -1,6 +1,7 @@
 package com.expediagroup.graphql.generated.reusedtypesquery
 
 import com.expediagroup.graphql.client.Generated
+import com.fasterxml.jackson.`annotation`.JsonProperty
 import kotlin.Int
 import kotlin.String
 
@@ -14,13 +15,16 @@ public data class ComplexObject3(
   /**
    * Some unique identifier
    */
+  @get:JsonProperty(value = "id")
   public val id: Int,
   /**
    * Some object name
    */
+  @get:JsonProperty(value = "name")
   public val name: String,
   /**
    * Some additional details
    */
+  @get:JsonProperty(value = "details")
   public val details: DetailsObject2,
 )
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/reuse_types/reusedtypesquery/DetailsObject.kt
index cf8aec0896..ab59499c0a 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/reuse_types/reusedtypesquery/DetailsObject.kt
@@ -1,6 +1,7 @@
 package com.expediagroup.graphql.generated.reusedtypesquery
 
 import com.expediagroup.graphql.client.Generated
+import com.fasterxml.jackson.`annotation`.JsonProperty
 import kotlin.Int
 import kotlin.String
 
@@ -12,9 +13,11 @@ public data class DetailsObject(
   /**
    * Unique identifier
    */
+  @get:JsonProperty(value = "id")
   public val id: Int,
   /**
    * Actual detail value
    */
+  @get:JsonProperty(value = "value")
   public val `value`: String,
 )
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/reusedtypesquery/DetailsObject2.kt
index f128ddd27c..bdcd7a904d 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/reusedtypesquery/DetailsObject2.kt
@@ -1,6 +1,7 @@
 package com.expediagroup.graphql.generated.reusedtypesquery
 
 import com.expediagroup.graphql.client.Generated
+import com.fasterxml.jackson.`annotation`.JsonProperty
 import kotlin.Int
 
 /**
@@ -11,5 +12,6 @@ public data class DetailsObject2(
   /**
    * Unique identifier
    */
+  @get:JsonProperty(value = "id")
   public val id: Int,
 )
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 ab729f30a0..ca6a91430b 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
@@ -3,6 +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.scalaraliasquery.ScalarWrapper
+import com.fasterxml.jackson.`annotation`.JsonProperty
 import kotlin.String
 import kotlin.reflect.KClass
 
@@ -22,6 +23,7 @@ public class ScalarAliasQuery : GraphQLClientRequest<ScalarAliasQuery.Result> {
     /**
      * Query that returns wrapper object with all supported scalar types
      */
+    @get:JsonProperty(value = "scalarQuery")
     public val scalarQuery: ScalarWrapper,
   )
 }
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/scalaraliasquery/ScalarWrapper.kt
index a4f60b7da8..976cfa051c 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/scalaraliasquery/ScalarWrapper.kt
@@ -3,6 +3,7 @@ package com.expediagroup.graphql.generated.scalaraliasquery
 import com.expediagroup.graphql.client.Generated
 import com.expediagroup.graphql.generated.ID
 import com.expediagroup.graphql.generated.UUID
+import com.fasterxml.jackson.`annotation`.JsonProperty
 
 /**
  * Wrapper that holds all supported scalar types
@@ -12,9 +13,11 @@ public data class ScalarWrapper(
   /**
    * ID represents unique identifier that is not intended to be human readable
    */
+  @get:JsonProperty(value = "id")
   public val id: ID,
   /**
    * Custom scalar of UUID
    */
+  @get:JsonProperty(value = "custom")
   public val custom: UUID? = null,
 )
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 9deedd1b20..1f0288c9f9 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
@@ -4,6 +4,7 @@ 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.fasterxml.jackson.`annotation`.JsonProperty
 import kotlin.String
 import kotlin.reflect.KClass
 
@@ -24,10 +25,12 @@ public class DifferentSelectionSetQuery : GraphQLClientRequest<DifferentSelectio
     /**
      * Query returning union
      */
+    @get:JsonProperty(value = "first")
     public val first: BasicUnion,
     /**
      * Query returning union
      */
+    @get:JsonProperty(value = "second")
     public val second: BasicUnion2,
   )
 }
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/differentselectionsetquery/BasicUnion.kt
index f591387b95..4b2f41adc8 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/differentselectionsetquery/BasicUnion.kt
@@ -1,6 +1,7 @@
 package com.expediagroup.graphql.generated.differentselectionsetquery
 
 import com.expediagroup.graphql.client.Generated
+import com.fasterxml.jackson.`annotation`.JsonProperty
 import com.fasterxml.jackson.`annotation`.JsonSubTypes
 import com.fasterxml.jackson.`annotation`.JsonTypeInfo
 import com.fasterxml.jackson.`annotation`.JsonTypeInfo.As.PROPERTY
@@ -27,6 +28,7 @@ public interface BasicUnion
  */
 @Generated
 public data class BasicObject(
+  @get:JsonProperty(value = "id")
   public val id: Int,
 ) : BasicUnion
 
@@ -40,6 +42,7 @@ public data class ComplexObject(
   /**
    * Some unique identifier
    */
+  @get:JsonProperty(value = "id")
   public val id: Int,
 ) : BasicUnion
 
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/differentselectionsetquery/BasicUnion2.kt
index 9507fbc515..3dca179ede 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/differentselectionsetquery/BasicUnion2.kt
@@ -1,6 +1,7 @@
 package com.expediagroup.graphql.generated.differentselectionsetquery
 
 import com.expediagroup.graphql.client.Generated
+import com.fasterxml.jackson.`annotation`.JsonProperty
 import com.fasterxml.jackson.`annotation`.JsonSubTypes
 import com.fasterxml.jackson.`annotation`.JsonTypeInfo
 import com.fasterxml.jackson.`annotation`.JsonTypeInfo.As.PROPERTY
@@ -31,6 +32,7 @@ public data class BasicObject2(
   /**
    * Object name
    */
+  @get:JsonProperty(value = "name")
   public val name: String,
 ) : BasicUnion2
 
@@ -44,6 +46,7 @@ public data class ComplexObject2(
   /**
    * Some object name
    */
+  @get:JsonProperty(value = "name")
   public val name: String,
 ) : BasicUnion2
 
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 c848aad689..e3793a94e5 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
@@ -4,6 +4,7 @@ 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.fasterxml.jackson.`annotation`.JsonProperty
 import kotlin.String
 import kotlin.reflect.KClass
 
@@ -24,10 +25,12 @@ public class DifferentSelectionSetQuery : GraphQLClientRequest<DifferentSelectio
     /**
      * Query returning union
      */
+    @get:JsonProperty(value = "unionQuery")
     public val unionQuery: BasicUnion,
     /**
      * Query returning an object that references another object
      */
+    @get:JsonProperty(value = "complexObjectQuery")
     public val complexObjectQuery: ComplexObject2,
   )
 }
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/differentselectionsetquery/BasicUnion.kt
index c86071166b..365b799f37 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/differentselectionsetquery/BasicUnion.kt
@@ -1,6 +1,7 @@
 package com.expediagroup.graphql.generated.differentselectionsetquery
 
 import com.expediagroup.graphql.client.Generated
+import com.fasterxml.jackson.`annotation`.JsonProperty
 import com.fasterxml.jackson.`annotation`.JsonSubTypes
 import com.fasterxml.jackson.`annotation`.JsonTypeInfo
 import com.fasterxml.jackson.`annotation`.JsonTypeInfo.As.PROPERTY
@@ -28,10 +29,12 @@ public interface BasicUnion
  */
 @Generated
 public data class BasicObject(
+  @get:JsonProperty(value = "id")
   public val id: Int,
   /**
    * Object name
    */
+  @get:JsonProperty(value = "name")
   public val name: String,
 ) : BasicUnion
 
@@ -45,15 +48,18 @@ public data class ComplexObject(
   /**
    * Some unique identifier
    */
+  @get:JsonProperty(value = "id")
   public val id: Int,
   /**
    * Some object name
    */
+  @get:JsonProperty(value = "name")
   public val name: String,
   /**
    * Optional value
    * Second line of the description
    */
+  @get:JsonProperty(value = "optional")
   public val optional: String?,
 ) : BasicUnion
 
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/differentselectionsetquery/ComplexObject2.kt
index 3135309d9c..10bd664013 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/differentselectionsetquery/ComplexObject2.kt
@@ -1,6 +1,7 @@
 package com.expediagroup.graphql.generated.differentselectionsetquery
 
 import com.expediagroup.graphql.client.Generated
+import com.fasterxml.jackson.`annotation`.JsonProperty
 import kotlin.Int
 import kotlin.String
 
@@ -14,13 +15,16 @@ public data class ComplexObject2(
   /**
    * Some unique identifier
    */
+  @get:JsonProperty(value = "id")
   public val id: Int,
   /**
    * Some object name
    */
+  @get:JsonProperty(value = "name")
   public val name: String,
   /**
    * Some additional details
    */
+  @get:JsonProperty(value = "details")
   public val details: DetailsObject,
 )
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/union_diff_selection_set2/differentselectionsetquery/DetailsObject.kt
index e76f947182..c201bdc662 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/union_diff_selection_set2/differentselectionsetquery/DetailsObject.kt
@@ -1,6 +1,7 @@
 package com.expediagroup.graphql.generated.differentselectionsetquery
 
 import com.expediagroup.graphql.client.Generated
+import com.fasterxml.jackson.`annotation`.JsonProperty
 import kotlin.String
 
 /**
@@ -11,5 +12,6 @@ public data class DetailsObject(
   /**
    * Actual detail value
    */
+  @get:JsonProperty(value = "value")
   public val `value`: String,
 )
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 9ae36435ef..62426c0e47 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
@@ -3,6 +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.unionmissingtypeselection.BasicUnion
+import com.fasterxml.jackson.`annotation`.JsonProperty
 import kotlin.String
 import kotlin.reflect.KClass
 
@@ -23,6 +24,7 @@ public class UnionMissingTypeSelection : GraphQLClientRequest<UnionMissingTypeSe
     /**
      * Query returning union
      */
+    @get:JsonProperty(value = "unionQuery")
     public val unionQuery: BasicUnion,
   )
 }
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/unionmissingtypeselection/BasicUnion.kt
index 3894e0686c..a35051a601 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/unionmissingtypeselection/BasicUnion.kt
@@ -1,6 +1,7 @@
 package com.expediagroup.graphql.generated.unionmissingtypeselection
 
 import com.expediagroup.graphql.client.Generated
+import com.fasterxml.jackson.`annotation`.JsonProperty
 import com.fasterxml.jackson.`annotation`.JsonSubTypes
 import com.fasterxml.jackson.`annotation`.JsonTypeInfo
 import com.fasterxml.jackson.`annotation`.JsonTypeInfo.As.PROPERTY
@@ -27,10 +28,12 @@ public interface BasicUnion
  */
 @Generated
 public data class BasicObject(
+  @get:JsonProperty(value = "id")
   public val id: Int,
   /**
    * Object name
    */
+  @get:JsonProperty(value = "name")
   public val name: String,
 ) : BasicUnion
 
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 94b73656f6..7a35cd0e87 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
@@ -3,6 +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.unionquerywithnamedfragments.BasicUnion
+import com.fasterxml.jackson.`annotation`.JsonProperty
 import kotlin.String
 import kotlin.reflect.KClass
 
@@ -24,6 +25,7 @@ public class UnionQueryWithNamedFragments :
     /**
      * Query returning union
      */
+    @get:JsonProperty(value = "unionQuery")
     public val unionQuery: BasicUnion,
   )
 }
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/unionquerywithnamedfragments/BasicUnion.kt
index 4b49b094f1..bfbfcc90e6 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/unionquerywithnamedfragments/BasicUnion.kt
@@ -1,6 +1,7 @@
 package com.expediagroup.graphql.generated.unionquerywithnamedfragments
 
 import com.expediagroup.graphql.client.Generated
+import com.fasterxml.jackson.`annotation`.JsonProperty
 import com.fasterxml.jackson.`annotation`.JsonSubTypes
 import com.fasterxml.jackson.`annotation`.JsonTypeInfo
 import com.fasterxml.jackson.`annotation`.JsonTypeInfo.As.PROPERTY
@@ -28,10 +29,12 @@ public interface BasicUnion
  */
 @Generated
 public data class BasicObject(
+  @get:JsonProperty(value = "id")
   public val id: Int,
   /**
    * Object name
    */
+  @get:JsonProperty(value = "name")
   public val name: String,
 ) : BasicUnion
 
@@ -45,15 +48,18 @@ public data class ComplexObject(
   /**
    * Some unique identifier
    */
+  @get:JsonProperty(value = "id")
   public val id: Int,
   /**
    * Some object name
    */
+  @get:JsonProperty(value = "name")
   public val name: String,
   /**
    * Optional value
    * Second line of the description
    */
+  @get:JsonProperty(value = "optional")
   public val optional: String?,
 ) : BasicUnion
 
diff --git a/plugins/client/graphql-kotlin-client-generator/src/test/data/jackson/custom_scalar_input/CustomScalarInputQuery.kt b/plugins/client/graphql-kotlin-client-generator/src/test/data/jackson/custom_scalar_input/CustomScalarInputQuery.kt
index 2d309be6fd..a54cef58a4 100644
--- a/plugins/client/graphql-kotlin-client-generator/src/test/data/jackson/custom_scalar_input/CustomScalarInputQuery.kt
+++ b/plugins/client/graphql-kotlin-client-generator/src/test/data/jackson/custom_scalar_input/CustomScalarInputQuery.kt
@@ -48,6 +48,7 @@ public class CustomScalarInputQuery(
     /**
      * Query that accepts a custom scalar input
      */
+    @get:JsonProperty(value = "inputCustomScalarQuery")
     public val inputCustomScalarQuery: Boolean,
   )
 }
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 9f4e8b17ca..118cbc87c2 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
@@ -3,6 +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.customscalarquery.ScalarWrapper
+import com.fasterxml.jackson.`annotation`.JsonProperty
 import kotlin.String
 import kotlin.reflect.KClass
 
@@ -22,6 +23,7 @@ public class CustomScalarQuery : GraphQLClientRequest<CustomScalarQuery.Result>
     /**
      * Query that returns wrapper object with all supported scalar types
      */
+    @get:JsonProperty(value = "scalarQuery")
     public val scalarQuery: ScalarWrapper,
   )
 }
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/customscalarquery/ScalarWrapper.kt
index 914d4bacab..ef74a2b602 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/customscalarquery/ScalarWrapper.kt
@@ -5,6 +5,7 @@ import com.expediagroup.graphql.generated.scalars.AnyToULocaleConverter
 import com.expediagroup.graphql.generated.scalars.AnyToUUIDConverter
 import com.expediagroup.graphql.generated.scalars.ULocaleToAnyConverter
 import com.expediagroup.graphql.generated.scalars.UUIDToAnyConverter
+import com.fasterxml.jackson.`annotation`.JsonProperty
 import com.fasterxml.jackson.databind.`annotation`.JsonDeserialize
 import com.fasterxml.jackson.databind.`annotation`.JsonSerialize
 import com.ibm.icu.util.ULocale
@@ -21,23 +22,27 @@ public data class ScalarWrapper(
    */
   @JsonSerialize(converter = UUIDToAnyConverter::class)
   @JsonDeserialize(converter = AnyToUUIDConverter::class)
+  @get:JsonProperty(value = "custom")
   public val custom: UUID? = null,
   /**
    * List of custom scalar UUIDs
    */
   @JsonSerialize(contentConverter = UUIDToAnyConverter::class)
   @JsonDeserialize(contentConverter = AnyToUUIDConverter::class)
+  @get:JsonProperty(value = "customList")
   public val customList: List<UUID>? = null,
   /**
    * Custom scalar of Locale
    */
   @JsonSerialize(converter = ULocaleToAnyConverter::class)
   @JsonDeserialize(converter = AnyToULocaleConverter::class)
+  @get:JsonProperty(value = "locale")
   public val locale: ULocale,
   /**
    * List of custom scalar Locales
    */
   @JsonSerialize(contentConverter = ULocaleToAnyConverter::class)
   @JsonDeserialize(contentConverter = AnyToULocaleConverter::class)
+  @get:JsonProperty(value = "listLocale")
   public val listLocale: List<ULocale>,
 )
diff --git a/plugins/client/graphql-kotlin-client-generator/src/test/data/jackson/enums/EnumQuery.kt b/plugins/client/graphql-kotlin-client-generator/src/test/data/jackson/enums/EnumQuery.kt
index bbccd9a952..89e3bdfdbe 100644
--- a/plugins/client/graphql-kotlin-client-generator/src/test/data/jackson/enums/EnumQuery.kt
+++ b/plugins/client/graphql-kotlin-client-generator/src/test/data/jackson/enums/EnumQuery.kt
@@ -4,6 +4,7 @@ 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.enums.OtherEnum
+import com.fasterxml.jackson.`annotation`.JsonProperty
 import kotlin.String
 import kotlin.reflect.KClass
 
@@ -22,10 +23,12 @@ public class EnumQuery : GraphQLClientRequest<EnumQuery.Result> {
     /**
      * Query that returns enum value
      */
+    @get:JsonProperty(value = "enumQuery")
     public val enumQuery: CustomEnum = CustomEnum.__UNKNOWN_VALUE,
     /**
      * Query that returns other enum value
      */
+    @get:JsonProperty(value = "otherEnumQuery")
     public val otherEnumQuery: OtherEnum = OtherEnum.__UNKNOWN_VALUE,
   )
 }
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 2edd92213b..1aa9ff15b7 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
@@ -3,6 +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.interfacewithinlinefragmentsquery.BasicInterface
+import com.fasterxml.jackson.`annotation`.JsonProperty
 import kotlin.String
 import kotlin.reflect.KClass
 
@@ -24,6 +25,7 @@ public class InterfaceWithInlineFragmentsQuery :
     /**
      * Query returning an interface
      */
+    @get:JsonProperty(value = "interfaceQuery")
     public val interfaceQuery: BasicInterface,
   )
 }
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/interfacewithinlinefragmentsquery/BasicInterface.kt
index 1ef2044fd4..672d3ea836 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/interfacewithinlinefragmentsquery/BasicInterface.kt
@@ -1,6 +1,7 @@
 package com.expediagroup.graphql.generated.interfacewithinlinefragmentsquery
 
 import com.expediagroup.graphql.client.Generated
+import com.fasterxml.jackson.`annotation`.JsonProperty
 import com.fasterxml.jackson.`annotation`.JsonSubTypes
 import com.fasterxml.jackson.`annotation`.JsonTypeInfo
 import com.fasterxml.jackson.`annotation`.JsonTypeInfo.As.PROPERTY
@@ -27,11 +28,13 @@ public interface BasicInterface {
   /**
    * Unique identifier of an interface
    */
+  @get:JsonProperty(value = "id")
   public val id: Int
 
   /**
    * Name field
    */
+  @get:JsonProperty(value = "name")
   public val name: String
 }
 
@@ -43,14 +46,17 @@ public data class FirstInterfaceImplementation(
   /**
    * Unique identifier of the first implementation
    */
+  @get:JsonProperty(value = "id")
   override val id: Int,
   /**
    * Name of the first implementation
    */
+  @get:JsonProperty(value = "name")
   override val name: String,
   /**
    * Custom field integer value
    */
+  @get:JsonProperty(value = "intValue")
   public val intValue: Int,
 ) : BasicInterface
 
@@ -62,14 +68,17 @@ public data class SecondInterfaceImplementation(
   /**
    * Unique identifier of the second implementation
    */
+  @get:JsonProperty(value = "id")
   override val id: Int,
   /**
    * Name of the second implementation
    */
+  @get:JsonProperty(value = "name")
   override val name: String,
   /**
    * Custom field float value
    */
+  @get:JsonProperty(value = "floatValue")
   public val floatValue: Double,
 ) : BasicInterface
 
@@ -82,9 +91,11 @@ public data class DefaultBasicInterfaceImplementation(
   /**
    * Unique identifier of an interface
    */
+  @get:JsonProperty(value = "id")
   override val id: Int,
   /**
    * Name field
    */
+  @get:JsonProperty(value = "name")
   override val name: String,
 ) : BasicInterface
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 40cc814893..f7978f15b7 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
@@ -3,6 +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.complexobjectquery.ComplexObject
+import com.fasterxml.jackson.`annotation`.JsonProperty
 import kotlin.String
 import kotlin.reflect.KClass
 
@@ -22,6 +23,7 @@ public class ComplexObjectQuery : GraphQLClientRequest<ComplexObjectQuery.Result
     /**
      * Query returning an object that references another object
      */
+    @get:JsonProperty(value = "complexObjectQuery")
     public val complexObjectQuery: ComplexObject,
   )
 }
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/complexobjectquery/ComplexObject.kt
index 512e15b601..db291bc5cf 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/complexobjectquery/ComplexObject.kt
@@ -1,6 +1,7 @@
 package com.expediagroup.graphql.generated.complexobjectquery
 
 import com.expediagroup.graphql.client.Generated
+import com.fasterxml.jackson.`annotation`.JsonProperty
 import kotlin.Int
 import kotlin.String
 
@@ -14,18 +15,22 @@ public data class ComplexObject(
   /**
    * Some unique identifier
    */
+  @get:JsonProperty(value = "id")
   public val id: Int,
   /**
    * Some object name
    */
+  @get:JsonProperty(value = "name")
   public val name: String,
   /**
    * Optional value
    * Second line of the description
    */
+  @get:JsonProperty(value = "optional")
   public val optional: String? = null,
   /**
    * Some additional details
    */
+  @get:JsonProperty(value = "details")
   public val details: DetailsObject,
 )
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/jackson/object/complexobjectquery/DetailsObject.kt
index 0aa6d169b2..3b8be11943 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/jackson/object/complexobjectquery/DetailsObject.kt
@@ -1,6 +1,7 @@
 package com.expediagroup.graphql.generated.complexobjectquery
 
 import com.expediagroup.graphql.client.Generated
+import com.fasterxml.jackson.`annotation`.JsonProperty
 import kotlin.Boolean
 import kotlin.Int
 import kotlin.String
@@ -13,13 +14,16 @@ public data class DetailsObject(
   /**
    * Unique identifier
    */
+  @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,
 )
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 7256c1f66f..820f335bd4 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
@@ -3,6 +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.unionquerywithinlinefragments.BasicUnion
+import com.fasterxml.jackson.`annotation`.JsonProperty
 import kotlin.String
 import kotlin.reflect.KClass
 
@@ -24,6 +25,7 @@ public class UnionQueryWithInlineFragments :
     /**
      * Query returning union
      */
+    @get:JsonProperty(value = "unionQuery")
     public val unionQuery: BasicUnion,
   )
 }
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/unionquerywithinlinefragments/BasicUnion.kt
index 2a8c29367e..8aaaf1ee64 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/unionquerywithinlinefragments/BasicUnion.kt
@@ -1,6 +1,7 @@
 package com.expediagroup.graphql.generated.unionquerywithinlinefragments
 
 import com.expediagroup.graphql.client.Generated
+import com.fasterxml.jackson.`annotation`.JsonProperty
 import com.fasterxml.jackson.`annotation`.JsonSubTypes
 import com.fasterxml.jackson.`annotation`.JsonTypeInfo
 import com.fasterxml.jackson.`annotation`.JsonTypeInfo.As.PROPERTY
@@ -28,10 +29,12 @@ public interface BasicUnion
  */
 @Generated
 public data class BasicObject(
+  @get:JsonProperty(value = "id")
   public val id: Int,
   /**
    * Object name
    */
+  @get:JsonProperty(value = "name")
   public val name: String,
 ) : BasicUnion
 
@@ -45,15 +48,18 @@ public data class ComplexObject(
   /**
    * Some unique identifier
    */
+  @get:JsonProperty(value = "id")
   public val id: Int,
   /**
    * Some object name
    */
+  @get:JsonProperty(value = "name")
   public val name: String,
   /**
    * Optional value
    * Second line of the description
    */
+  @get:JsonProperty(value = "optional")
   public val optional: String?,
 ) : BasicUnion
 
diff --git a/plugins/client/graphql-kotlin-client-generator/src/test/data/jackson/variables/JacksonInputQuery.kt b/plugins/client/graphql-kotlin-client-generator/src/test/data/jackson/variables/JacksonInputQuery.kt
index 96f2cb441c..e796a64fa3 100644
--- a/plugins/client/graphql-kotlin-client-generator/src/test/data/jackson/variables/JacksonInputQuery.kt
+++ b/plugins/client/graphql-kotlin-client-generator/src/test/data/jackson/variables/JacksonInputQuery.kt
@@ -34,6 +34,7 @@ public class JacksonInputQuery(
     /**
      * Query that accepts some input arguments
      */
+    @get:JsonProperty(value = "inputObjectQuery")
     public val inputObjectQuery: Boolean,
   )
 }