Skip to content

Commit 962b89b

Browse files
committed
test(client): update jackson client generation to always annotate all fields - jackson client
1 parent 3fe1bb5 commit 962b89b

File tree

12 files changed

+44
-0
lines changed

12 files changed

+44
-0
lines changed

plugins/client/graphql-kotlin-client-generator/src/test/data/jackson/custom_scalar_input/CustomScalarInputQuery.kt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -48,6 +48,7 @@ public class CustomScalarInputQuery(
4848
/**
4949
* Query that accepts a custom scalar input
5050
*/
51+
@get:JsonProperty(value = "inputCustomScalarQuery")
5152
public val inputCustomScalarQuery: Boolean,
5253
)
5354
}

plugins/client/graphql-kotlin-client-generator/src/test/data/jackson/custom_scalars/CustomScalarQuery.kt

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@ package com.expediagroup.graphql.generated
33
import com.expediagroup.graphql.client.Generated
44
import com.expediagroup.graphql.client.types.GraphQLClientRequest
55
import com.expediagroup.graphql.generated.customscalarquery.ScalarWrapper
6+
import com.fasterxml.jackson.`annotation`.JsonProperty
67
import kotlin.String
78
import kotlin.reflect.KClass
89

@@ -22,6 +23,7 @@ public class CustomScalarQuery : GraphQLClientRequest<CustomScalarQuery.Result>
2223
/**
2324
* Query that returns wrapper object with all supported scalar types
2425
*/
26+
@get:JsonProperty(value = "scalarQuery")
2527
public val scalarQuery: ScalarWrapper,
2628
)
2729
}

plugins/client/graphql-kotlin-client-generator/src/test/data/jackson/custom_scalars/customscalarquery/ScalarWrapper.kt

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@ import com.expediagroup.graphql.generated.scalars.AnyToULocaleConverter
55
import com.expediagroup.graphql.generated.scalars.AnyToUUIDConverter
66
import com.expediagroup.graphql.generated.scalars.ULocaleToAnyConverter
77
import com.expediagroup.graphql.generated.scalars.UUIDToAnyConverter
8+
import com.fasterxml.jackson.`annotation`.JsonProperty
89
import com.fasterxml.jackson.databind.`annotation`.JsonDeserialize
910
import com.fasterxml.jackson.databind.`annotation`.JsonSerialize
1011
import com.ibm.icu.util.ULocale
@@ -21,23 +22,27 @@ public data class ScalarWrapper(
2122
*/
2223
@JsonSerialize(converter = UUIDToAnyConverter::class)
2324
@JsonDeserialize(converter = AnyToUUIDConverter::class)
25+
@get:JsonProperty(value = "custom")
2426
public val custom: UUID? = null,
2527
/**
2628
* List of custom scalar UUIDs
2729
*/
2830
@JsonSerialize(contentConverter = UUIDToAnyConverter::class)
2931
@JsonDeserialize(contentConverter = AnyToUUIDConverter::class)
32+
@get:JsonProperty(value = "customList")
3033
public val customList: List<UUID>? = null,
3134
/**
3235
* Custom scalar of Locale
3336
*/
3437
@JsonSerialize(converter = ULocaleToAnyConverter::class)
3538
@JsonDeserialize(converter = AnyToULocaleConverter::class)
39+
@get:JsonProperty(value = "locale")
3640
public val locale: ULocale,
3741
/**
3842
* List of custom scalar Locales
3943
*/
4044
@JsonSerialize(contentConverter = ULocaleToAnyConverter::class)
4145
@JsonDeserialize(contentConverter = AnyToULocaleConverter::class)
46+
@get:JsonProperty(value = "listLocale")
4247
public val listLocale: List<ULocale>,
4348
)

plugins/client/graphql-kotlin-client-generator/src/test/data/jackson/enums/EnumQuery.kt

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@ import com.expediagroup.graphql.client.Generated
44
import com.expediagroup.graphql.client.types.GraphQLClientRequest
55
import com.expediagroup.graphql.generated.enums.CustomEnum
66
import com.expediagroup.graphql.generated.enums.OtherEnum
7+
import com.fasterxml.jackson.`annotation`.JsonProperty
78
import kotlin.String
89
import kotlin.reflect.KClass
910

@@ -22,10 +23,12 @@ public class EnumQuery : GraphQLClientRequest<EnumQuery.Result> {
2223
/**
2324
* Query that returns enum value
2425
*/
26+
@get:JsonProperty(value = "enumQuery")
2527
public val enumQuery: CustomEnum = CustomEnum.__UNKNOWN_VALUE,
2628
/**
2729
* Query that returns other enum value
2830
*/
31+
@get:JsonProperty(value = "otherEnumQuery")
2932
public val otherEnumQuery: OtherEnum = OtherEnum.__UNKNOWN_VALUE,
3033
)
3134
}

plugins/client/graphql-kotlin-client-generator/src/test/data/jackson/interface/InterfaceWithInlineFragmentsQuery.kt

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@ package com.expediagroup.graphql.generated
33
import com.expediagroup.graphql.client.Generated
44
import com.expediagroup.graphql.client.types.GraphQLClientRequest
55
import com.expediagroup.graphql.generated.interfacewithinlinefragmentsquery.BasicInterface
6+
import com.fasterxml.jackson.`annotation`.JsonProperty
67
import kotlin.String
78
import kotlin.reflect.KClass
89

@@ -24,6 +25,7 @@ public class InterfaceWithInlineFragmentsQuery :
2425
/**
2526
* Query returning an interface
2627
*/
28+
@get:JsonProperty(value = "interfaceQuery")
2729
public val interfaceQuery: BasicInterface,
2830
)
2931
}

plugins/client/graphql-kotlin-client-generator/src/test/data/jackson/interface/interfacewithinlinefragmentsquery/BasicInterface.kt

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
package com.expediagroup.graphql.generated.interfacewithinlinefragmentsquery
22

33
import com.expediagroup.graphql.client.Generated
4+
import com.fasterxml.jackson.`annotation`.JsonProperty
45
import com.fasterxml.jackson.`annotation`.JsonSubTypes
56
import com.fasterxml.jackson.`annotation`.JsonTypeInfo
67
import com.fasterxml.jackson.`annotation`.JsonTypeInfo.As.PROPERTY
@@ -27,11 +28,13 @@ public interface BasicInterface {
2728
/**
2829
* Unique identifier of an interface
2930
*/
31+
@get:JsonProperty(value = "id")
3032
public val id: Int
3133

3234
/**
3335
* Name field
3436
*/
37+
@get:JsonProperty(value = "name")
3538
public val name: String
3639
}
3740

@@ -43,14 +46,17 @@ public data class FirstInterfaceImplementation(
4346
/**
4447
* Unique identifier of the first implementation
4548
*/
49+
@get:JsonProperty(value = "id")
4650
override val id: Int,
4751
/**
4852
* Name of the first implementation
4953
*/
54+
@get:JsonProperty(value = "name")
5055
override val name: String,
5156
/**
5257
* Custom field integer value
5358
*/
59+
@get:JsonProperty(value = "intValue")
5460
public val intValue: Int,
5561
) : BasicInterface
5662

@@ -62,14 +68,17 @@ public data class SecondInterfaceImplementation(
6268
/**
6369
* Unique identifier of the second implementation
6470
*/
71+
@get:JsonProperty(value = "id")
6572
override val id: Int,
6673
/**
6774
* Name of the second implementation
6875
*/
76+
@get:JsonProperty(value = "name")
6977
override val name: String,
7078
/**
7179
* Custom field float value
7280
*/
81+
@get:JsonProperty(value = "floatValue")
7382
public val floatValue: Double,
7483
) : BasicInterface
7584

@@ -82,9 +91,11 @@ public data class DefaultBasicInterfaceImplementation(
8291
/**
8392
* Unique identifier of an interface
8493
*/
94+
@get:JsonProperty(value = "id")
8595
override val id: Int,
8696
/**
8797
* Name field
8898
*/
99+
@get:JsonProperty(value = "name")
89100
override val name: String,
90101
) : BasicInterface

plugins/client/graphql-kotlin-client-generator/src/test/data/jackson/object/ComplexObjectQuery.kt

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@ package com.expediagroup.graphql.generated
33
import com.expediagroup.graphql.client.Generated
44
import com.expediagroup.graphql.client.types.GraphQLClientRequest
55
import com.expediagroup.graphql.generated.complexobjectquery.ComplexObject
6+
import com.fasterxml.jackson.`annotation`.JsonProperty
67
import kotlin.String
78
import kotlin.reflect.KClass
89

@@ -22,6 +23,7 @@ public class ComplexObjectQuery : GraphQLClientRequest<ComplexObjectQuery.Result
2223
/**
2324
* Query returning an object that references another object
2425
*/
26+
@get:JsonProperty(value = "complexObjectQuery")
2527
public val complexObjectQuery: ComplexObject,
2628
)
2729
}

plugins/client/graphql-kotlin-client-generator/src/test/data/jackson/object/complexobjectquery/ComplexObject.kt

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
package com.expediagroup.graphql.generated.complexobjectquery
22

33
import com.expediagroup.graphql.client.Generated
4+
import com.fasterxml.jackson.`annotation`.JsonProperty
45
import kotlin.Int
56
import kotlin.String
67

@@ -14,18 +15,22 @@ public data class ComplexObject(
1415
/**
1516
* Some unique identifier
1617
*/
18+
@get:JsonProperty(value = "id")
1719
public val id: Int,
1820
/**
1921
* Some object name
2022
*/
23+
@get:JsonProperty(value = "name")
2124
public val name: String,
2225
/**
2326
* Optional value
2427
* Second line of the description
2528
*/
29+
@get:JsonProperty(value = "optional")
2630
public val optional: String? = null,
2731
/**
2832
* Some additional details
2933
*/
34+
@get:JsonProperty(value = "details")
3035
public val details: DetailsObject,
3136
)

plugins/client/graphql-kotlin-client-generator/src/test/data/jackson/object/complexobjectquery/DetailsObject.kt

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
package com.expediagroup.graphql.generated.complexobjectquery
22

33
import com.expediagroup.graphql.client.Generated
4+
import com.fasterxml.jackson.`annotation`.JsonProperty
45
import kotlin.Boolean
56
import kotlin.Int
67
import kotlin.String
@@ -13,13 +14,16 @@ public data class DetailsObject(
1314
/**
1415
* Unique identifier
1516
*/
17+
@get:JsonProperty(value = "id")
1618
public val id: Int,
1719
/**
1820
* Boolean flag
1921
*/
22+
@get:JsonProperty(value = "flag")
2023
public val flag: Boolean,
2124
/**
2225
* Actual detail value
2326
*/
27+
@get:JsonProperty(value = "value")
2428
public val `value`: String,
2529
)

plugins/client/graphql-kotlin-client-generator/src/test/data/jackson/union/UnionQueryWithInlineFragments.kt

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@ package com.expediagroup.graphql.generated
33
import com.expediagroup.graphql.client.Generated
44
import com.expediagroup.graphql.client.types.GraphQLClientRequest
55
import com.expediagroup.graphql.generated.unionquerywithinlinefragments.BasicUnion
6+
import com.fasterxml.jackson.`annotation`.JsonProperty
67
import kotlin.String
78
import kotlin.reflect.KClass
89

@@ -24,6 +25,7 @@ public class UnionQueryWithInlineFragments :
2425
/**
2526
* Query returning union
2627
*/
28+
@get:JsonProperty(value = "unionQuery")
2729
public val unionQuery: BasicUnion,
2830
)
2931
}

plugins/client/graphql-kotlin-client-generator/src/test/data/jackson/union/unionquerywithinlinefragments/BasicUnion.kt

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
package com.expediagroup.graphql.generated.unionquerywithinlinefragments
22

33
import com.expediagroup.graphql.client.Generated
4+
import com.fasterxml.jackson.`annotation`.JsonProperty
45
import com.fasterxml.jackson.`annotation`.JsonSubTypes
56
import com.fasterxml.jackson.`annotation`.JsonTypeInfo
67
import com.fasterxml.jackson.`annotation`.JsonTypeInfo.As.PROPERTY
@@ -28,10 +29,12 @@ public interface BasicUnion
2829
*/
2930
@Generated
3031
public data class BasicObject(
32+
@get:JsonProperty(value = "id")
3133
public val id: Int,
3234
/**
3335
* Object name
3436
*/
37+
@get:JsonProperty(value = "name")
3538
public val name: String,
3639
) : BasicUnion
3740

@@ -45,15 +48,18 @@ public data class ComplexObject(
4548
/**
4649
* Some unique identifier
4750
*/
51+
@get:JsonProperty(value = "id")
4852
public val id: Int,
4953
/**
5054
* Some object name
5155
*/
56+
@get:JsonProperty(value = "name")
5257
public val name: String,
5358
/**
5459
* Optional value
5560
* Second line of the description
5661
*/
62+
@get:JsonProperty(value = "optional")
5763
public val optional: String?,
5864
) : BasicUnion
5965

plugins/client/graphql-kotlin-client-generator/src/test/data/jackson/variables/JacksonInputQuery.kt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,7 @@ public class JacksonInputQuery(
3434
/**
3535
* Query that accepts some input arguments
3636
*/
37+
@get:JsonProperty(value = "inputObjectQuery")
3738
public val inputObjectQuery: Boolean,
3839
)
3940
}

0 commit comments

Comments
 (0)