test(client): update jackson client generation to always annotate all fields - graphql client (part1)

SalyczeQ · SalyczeQ · commit 65003346c7f6 · 2024-06-07T02:34:20.000-06:00
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
@@ -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/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
@@ -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/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
@@ -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_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
@@ -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
@@ -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
@@ -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
@@ -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/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
@@ -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/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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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/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
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
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
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

Original file line number	Diff line number	Diff line change
`@@ -3,6 +3,7 @@ package com.expediagroup.graphql.generated`
`3`	`3`	`import com.expediagroup.graphql.client.Generated`
`4`	`4`	`import com.expediagroup.graphql.client.types.GraphQLClientRequest`
`5`	`5`	`import com.expediagroup.graphql.generated.documentationquery.DocObject`
	`6`	+import com.fasterxml.jackson.`annotation`.JsonProperty
`6`	`7`	`import kotlin.String`
`7`	`8`	`import kotlin.reflect.KClass`
`8`	`9`
`@@ -22,6 +23,7 @@ public class DocumentationQuery : GraphQLClientRequest<DocumentationQuery.Result`
`22`	`23`	`/**`
`23`	`24`	`* Query to test doc strings`
`24`	`25`	`*/`
	`26`	`+ @get:JsonProperty(value = "docQuery")`
`25`	`27`	`public val docQuery: DocObject,`
`26`	`28`	`)`
`27`	`29`	`}`
Original file line number	Diff line number	Diff line change
`@@ -32,6 +32,7 @@ public class SimpleMutation(`
`32`	`32`	`/**`
`33`	`33`	`* Example of a muation`
`34`	`34`	`*/`
	`35`	`+ @get:JsonProperty(value = "simpleMutation")`
`35`	`36`	`public val simpleMutation: BasicObject,`
`36`	`37`	`)`
`37`	`38`	`}`