From c54069b95533da7d6be9e3df55beed769106ecd3 Mon Sep 17 00:00:00 2001 From: Jiho Lee Date: Wed, 28 Jan 2026 13:22:59 -0800 Subject: [PATCH 1/4] Add Jackson 3 annotations based on compile classpath dependencies --- graphql-dgs-codegen-core/build.gradle | 1 + .../expected/types/Person.kt | 12 ++- .../expected/types/Query.kt | 12 ++- .../expected/types/Person.kt | 12 ++- .../expected/types/Query.kt | 12 ++- .../expected/types/Query.kt | 12 ++- .../expected/types/Person.kt | 12 ++- .../expected/types/Query.kt | 12 ++- .../expected/types/Person.kt | 12 ++- .../expected/types/Query.kt | 12 ++- .../dataClassDocs/expected/types/Movie.kt | 12 ++- .../dataClassDocs/expected/types/Query.kt | 12 ++- .../expected/types/Movie.kt | 12 ++- .../expected/types/Query.kt | 12 ++- .../expected/types/Person.kt | 12 ++- .../expected/types/Query.kt | 12 ++- .../expected/types/Query.kt | 12 ++- .../expected/types/RequiredTestType.kt | 12 ++- .../expected/types/Entity.kt | 12 ++- .../expected/types/EntityConnection.kt | 12 ++- .../expected/types/EntityEdge.kt | 12 ++- .../expected/types/PageInfo.kt | 12 ++- .../expected/types/Query.kt | 12 ++- .../expected/types/Car.kt | 12 ++- .../expected/types/Engine.kt | 12 ++- .../expected/types/Performance.kt | 12 ++- .../expected/types/Query.kt | 12 ++- .../expected/types/Query.kt | 12 ++- .../expected/types/Employee.kt | 12 ++- .../expected/types/Query.kt | 12 ++- .../expected/types/Employee.kt | 12 ++- .../expected/types/Query.kt | 12 ++- .../expected/types/Query.kt | 12 ++- .../expected/types/Talent.kt | 12 ++- .../expected/types/Person.kt | 12 ++- .../expected/types/Query.kt | 12 ++- .../expected/types/Product.kt | 12 ++- .../expected/types/Query.kt | 12 ++- .../expected/types/Entity.kt | 12 ++- .../expected/types/EntityEdge.kt | 12 ++- .../expected/types/Query.kt | 12 ++- .../expected/types/Employee.kt | 12 ++- .../expected/types/Query.kt | 12 ++- .../expected/types/MyType.kt | 12 ++- .../expected/types/OtherType.kt | 12 ++- .../expected/types/Person.kt | 12 ++- .../expected/types/Query.kt | 12 ++- .../expected/types/MyType.kt | 12 ++- .../expected/types/MyType.kt | 12 ++- .../expected/types/Person.kt | 12 ++- .../expected/types/Query.kt | 12 ++- .../expected/types/MyType.kt | 12 ++- .../expected/types/Person.kt | 12 ++- .../expected/types/Query.kt | 12 ++- .../expected/types/Person.kt | 12 ++- .../expected/types/Query.kt | 12 ++- .../expected/types/SampleType.kt | 12 ++- .../expected/types/Person.kt | 12 ++- .../expected/types/Query.kt | 12 ++- .../cases/enum/expected/types/Query.kt | 12 ++- .../expected/types/Query.kt | 12 ++- .../expected/types/Example.kt | 12 ++- .../cases/input/expected/types/Query.kt | 12 ++- .../expected/types/Query.kt | 12 ++- .../expected/types/Query.kt | 12 ++- .../expected/types/Query.kt | 12 ++- .../expected/types/Bird.kt | 12 ++- .../expected/types/Dog.kt | 12 ++- .../expected/types/Dog.kt | 12 ++- .../expected/types/Vegetarian.kt | 12 ++- .../expected/types/Employee.kt | 12 ++- .../expected/types/Query.kt | 12 ++- .../expected/types/Query.kt | 12 ++- .../expected/types/Seed.kt | 12 ++- .../expected/types/Query.kt | 12 ++- .../expected/types/T.kt | 12 ++- .../expected/types/Query.kt | 12 ++- .../expected/types/Query.kt | 12 ++- .../expected/types/Query.kt | 12 ++- .../expected/types/Query.kt | 12 ++- .../expected/types/Employee.kt | 12 ++- .../expected/types/Query.kt | 12 ++- .../expected/types/Employee.kt | 12 ++- .../expected/types/Query.kt | 12 ++- .../expected/types/Employee.kt | 12 ++- .../expected/types/Query.kt | 12 ++- .../expected/types/Person.kt | 12 ++- .../expected/types/Person.kt | 12 ++- .../cases/union/expected/types/Actor.kt | 12 ++- .../cases/union/expected/types/Movie.kt | 12 ++- .../cases/union/expected/types/Query.kt | 12 ++- .../expected/types/Droid.kt | 12 ++- .../expected/types/Human.kt | 12 ++- .../expected/types/Query.kt | 12 ++- .../expected/types/SearchResultPage.kt | 12 ++- .../expected/types/Actor.kt | 12 ++- .../expected/types/Movie.kt | 12 ++- .../expected/types/Query.kt | 12 ++- .../expected/types/Rating.kt | 12 ++- .../netflix/graphql/dgs/codegen/CodeGen.kt | 9 ++ .../generators/kotlin/KotlinPoetUtils.kt | 92 ++++++++++++++++--- .../kotlin2/GenerateKotlin2DataTypes.kt | 18 ++-- .../dgs/codegen/gradle/GenerateJavaTask.kt | 3 + .../codegen/gradle/JacksonVersionDetector.kt | 67 ++++++++++++++ 104 files changed, 952 insertions(+), 414 deletions(-) create mode 100644 graphql-dgs-codegen-gradle/src/main/kotlin/com/netflix/graphql/dgs/codegen/gradle/JacksonVersionDetector.kt diff --git a/graphql-dgs-codegen-core/build.gradle b/graphql-dgs-codegen-core/build.gradle index 2792da501..f9d38a5e9 100644 --- a/graphql-dgs-codegen-core/build.gradle +++ b/graphql-dgs-codegen-core/build.gradle @@ -43,6 +43,7 @@ dependencies { testImplementation 'org.jetbrains.kotlin:kotlin-compiler' integTestImplementation 'com.fasterxml.jackson.module:jackson-module-kotlin' + integTestImplementation 'tools.jackson.core:jackson-databind:latest.release' } application { diff --git a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/constantsForInputTypes/expected/types/Person.kt b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/constantsForInputTypes/expected/types/Person.kt index 5c6f4523f..205a10923 100644 --- a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/constantsForInputTypes/expected/types/Person.kt +++ b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/constantsForInputTypes/expected/types/Person.kt @@ -3,14 +3,17 @@ package com.netflix.graphql.dgs.codegen.cases.constantsForInputTypes.expected.ty import com.fasterxml.jackson.`annotation`.JsonIgnoreProperties import com.fasterxml.jackson.`annotation`.JsonProperty import com.fasterxml.jackson.`annotation`.JsonTypeInfo -import com.fasterxml.jackson.databind.`annotation`.JsonDeserialize -import com.fasterxml.jackson.databind.`annotation`.JsonPOJOBuilder import java.lang.IllegalStateException import kotlin.String import kotlin.jvm.JvmName +import com.fasterxml.jackson.databind.`annotation`.JsonDeserialize as FasterxmlJacksonDatabindAnnotationJsonDeserialize +import com.fasterxml.jackson.databind.`annotation`.JsonPOJOBuilder as FasterxmlJacksonDatabindAnnotationJsonPOJOBuilder +import tools.jackson.databind.`annotation`.JsonDeserialize as ToolsJacksonDatabindAnnotationJsonDeserialize +import tools.jackson.databind.`annotation`.JsonPOJOBuilder as ToolsJacksonDatabindAnnotationJsonPOJOBuilder @JsonTypeInfo(use = JsonTypeInfo.Id.NONE) -@JsonDeserialize(builder = Person.Builder::class) +@FasterxmlJacksonDatabindAnnotationJsonDeserialize(builder = Person.Builder::class) +@ToolsJacksonDatabindAnnotationJsonDeserialize(builder = Person.Builder::class) public class Person( firstname: () -> String? = firstnameDefault, lastname: () -> String? = lastnameDefault, @@ -35,7 +38,8 @@ public class Person( { throw IllegalStateException("Field `lastname` was not requested") } } - @JsonPOJOBuilder + @FasterxmlJacksonDatabindAnnotationJsonPOJOBuilder + @ToolsJacksonDatabindAnnotationJsonPOJOBuilder @JsonIgnoreProperties("__typename") public class Builder { private var firstname: () -> String? = firstnameDefault diff --git a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/constantsForInputTypes/expected/types/Query.kt b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/constantsForInputTypes/expected/types/Query.kt index 444457f09..9f2464db4 100644 --- a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/constantsForInputTypes/expected/types/Query.kt +++ b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/constantsForInputTypes/expected/types/Query.kt @@ -3,14 +3,17 @@ package com.netflix.graphql.dgs.codegen.cases.constantsForInputTypes.expected.ty import com.fasterxml.jackson.`annotation`.JsonIgnoreProperties import com.fasterxml.jackson.`annotation`.JsonProperty import com.fasterxml.jackson.`annotation`.JsonTypeInfo -import com.fasterxml.jackson.databind.`annotation`.JsonDeserialize -import com.fasterxml.jackson.databind.`annotation`.JsonPOJOBuilder import java.lang.IllegalStateException import kotlin.collections.List import kotlin.jvm.JvmName +import com.fasterxml.jackson.databind.`annotation`.JsonDeserialize as FasterxmlJacksonDatabindAnnotationJsonDeserialize +import com.fasterxml.jackson.databind.`annotation`.JsonPOJOBuilder as FasterxmlJacksonDatabindAnnotationJsonPOJOBuilder +import tools.jackson.databind.`annotation`.JsonDeserialize as ToolsJacksonDatabindAnnotationJsonDeserialize +import tools.jackson.databind.`annotation`.JsonPOJOBuilder as ToolsJacksonDatabindAnnotationJsonPOJOBuilder @JsonTypeInfo(use = JsonTypeInfo.Id.NONE) -@JsonDeserialize(builder = Query.Builder::class) +@FasterxmlJacksonDatabindAnnotationJsonDeserialize(builder = Query.Builder::class) +@ToolsJacksonDatabindAnnotationJsonDeserialize(builder = Query.Builder::class) public class Query( people: () -> List? = peopleDefault, ) { @@ -25,7 +28,8 @@ public class Query( { throw IllegalStateException("Field `people` was not requested") } } - @JsonPOJOBuilder + @FasterxmlJacksonDatabindAnnotationJsonPOJOBuilder + @ToolsJacksonDatabindAnnotationJsonPOJOBuilder @JsonIgnoreProperties("__typename") public class Builder { private var people: () -> List? = peopleDefault diff --git a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/constantsWithExtendedInputTypes/expected/types/Person.kt b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/constantsWithExtendedInputTypes/expected/types/Person.kt index d855e5afc..65181028c 100644 --- a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/constantsWithExtendedInputTypes/expected/types/Person.kt +++ b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/constantsWithExtendedInputTypes/expected/types/Person.kt @@ -3,14 +3,17 @@ package com.netflix.graphql.dgs.codegen.cases.constantsWithExtendedInputTypes.ex import com.fasterxml.jackson.`annotation`.JsonIgnoreProperties import com.fasterxml.jackson.`annotation`.JsonProperty import com.fasterxml.jackson.`annotation`.JsonTypeInfo -import com.fasterxml.jackson.databind.`annotation`.JsonDeserialize -import com.fasterxml.jackson.databind.`annotation`.JsonPOJOBuilder import java.lang.IllegalStateException import kotlin.String import kotlin.jvm.JvmName +import com.fasterxml.jackson.databind.`annotation`.JsonDeserialize as FasterxmlJacksonDatabindAnnotationJsonDeserialize +import com.fasterxml.jackson.databind.`annotation`.JsonPOJOBuilder as FasterxmlJacksonDatabindAnnotationJsonPOJOBuilder +import tools.jackson.databind.`annotation`.JsonDeserialize as ToolsJacksonDatabindAnnotationJsonDeserialize +import tools.jackson.databind.`annotation`.JsonPOJOBuilder as ToolsJacksonDatabindAnnotationJsonPOJOBuilder @JsonTypeInfo(use = JsonTypeInfo.Id.NONE) -@JsonDeserialize(builder = Person.Builder::class) +@FasterxmlJacksonDatabindAnnotationJsonDeserialize(builder = Person.Builder::class) +@ToolsJacksonDatabindAnnotationJsonDeserialize(builder = Person.Builder::class) public class Person( firstname: () -> String? = firstnameDefault, lastname: () -> String? = lastnameDefault, @@ -35,7 +38,8 @@ public class Person( { throw IllegalStateException("Field `lastname` was not requested") } } - @JsonPOJOBuilder + @FasterxmlJacksonDatabindAnnotationJsonPOJOBuilder + @ToolsJacksonDatabindAnnotationJsonPOJOBuilder @JsonIgnoreProperties("__typename") public class Builder { private var firstname: () -> String? = firstnameDefault diff --git a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/constantsWithExtendedInputTypes/expected/types/Query.kt b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/constantsWithExtendedInputTypes/expected/types/Query.kt index 7696e9ba4..542a68d32 100644 --- a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/constantsWithExtendedInputTypes/expected/types/Query.kt +++ b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/constantsWithExtendedInputTypes/expected/types/Query.kt @@ -3,14 +3,17 @@ package com.netflix.graphql.dgs.codegen.cases.constantsWithExtendedInputTypes.ex import com.fasterxml.jackson.`annotation`.JsonIgnoreProperties import com.fasterxml.jackson.`annotation`.JsonProperty import com.fasterxml.jackson.`annotation`.JsonTypeInfo -import com.fasterxml.jackson.databind.`annotation`.JsonDeserialize -import com.fasterxml.jackson.databind.`annotation`.JsonPOJOBuilder import java.lang.IllegalStateException import kotlin.collections.List import kotlin.jvm.JvmName +import com.fasterxml.jackson.databind.`annotation`.JsonDeserialize as FasterxmlJacksonDatabindAnnotationJsonDeserialize +import com.fasterxml.jackson.databind.`annotation`.JsonPOJOBuilder as FasterxmlJacksonDatabindAnnotationJsonPOJOBuilder +import tools.jackson.databind.`annotation`.JsonDeserialize as ToolsJacksonDatabindAnnotationJsonDeserialize +import tools.jackson.databind.`annotation`.JsonPOJOBuilder as ToolsJacksonDatabindAnnotationJsonPOJOBuilder @JsonTypeInfo(use = JsonTypeInfo.Id.NONE) -@JsonDeserialize(builder = Query.Builder::class) +@FasterxmlJacksonDatabindAnnotationJsonDeserialize(builder = Query.Builder::class) +@ToolsJacksonDatabindAnnotationJsonDeserialize(builder = Query.Builder::class) public class Query( people: () -> List? = peopleDefault, ) { @@ -25,7 +28,8 @@ public class Query( { throw IllegalStateException("Field `people` was not requested") } } - @JsonPOJOBuilder + @FasterxmlJacksonDatabindAnnotationJsonPOJOBuilder + @ToolsJacksonDatabindAnnotationJsonPOJOBuilder @JsonIgnoreProperties("__typename") public class Builder { private var people: () -> List? = peopleDefault diff --git a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/constantsWithExtendedInterface/expected/types/Query.kt b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/constantsWithExtendedInterface/expected/types/Query.kt index 2961f273a..3531a7ba0 100644 --- a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/constantsWithExtendedInterface/expected/types/Query.kt +++ b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/constantsWithExtendedInterface/expected/types/Query.kt @@ -3,14 +3,17 @@ package com.netflix.graphql.dgs.codegen.cases.constantsWithExtendedInterface.exp import com.fasterxml.jackson.`annotation`.JsonIgnoreProperties import com.fasterxml.jackson.`annotation`.JsonProperty import com.fasterxml.jackson.`annotation`.JsonTypeInfo -import com.fasterxml.jackson.databind.`annotation`.JsonDeserialize -import com.fasterxml.jackson.databind.`annotation`.JsonPOJOBuilder import java.lang.IllegalStateException import kotlin.collections.List import kotlin.jvm.JvmName +import com.fasterxml.jackson.databind.`annotation`.JsonDeserialize as FasterxmlJacksonDatabindAnnotationJsonDeserialize +import com.fasterxml.jackson.databind.`annotation`.JsonPOJOBuilder as FasterxmlJacksonDatabindAnnotationJsonPOJOBuilder +import tools.jackson.databind.`annotation`.JsonDeserialize as ToolsJacksonDatabindAnnotationJsonDeserialize +import tools.jackson.databind.`annotation`.JsonPOJOBuilder as ToolsJacksonDatabindAnnotationJsonPOJOBuilder @JsonTypeInfo(use = JsonTypeInfo.Id.NONE) -@JsonDeserialize(builder = Query.Builder::class) +@FasterxmlJacksonDatabindAnnotationJsonDeserialize(builder = Query.Builder::class) +@ToolsJacksonDatabindAnnotationJsonDeserialize(builder = Query.Builder::class) public class Query( people: () -> List? = peopleDefault, ) { @@ -25,7 +28,8 @@ public class Query( { throw IllegalStateException("Field `people` was not requested") } } - @JsonPOJOBuilder + @FasterxmlJacksonDatabindAnnotationJsonPOJOBuilder + @ToolsJacksonDatabindAnnotationJsonPOJOBuilder @JsonIgnoreProperties("__typename") public class Builder { private var people: () -> List? = peopleDefault diff --git a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/constantsWithExtendedQuery/expected/types/Person.kt b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/constantsWithExtendedQuery/expected/types/Person.kt index da3f6ef37..339598bfd 100644 --- a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/constantsWithExtendedQuery/expected/types/Person.kt +++ b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/constantsWithExtendedQuery/expected/types/Person.kt @@ -3,14 +3,17 @@ package com.netflix.graphql.dgs.codegen.cases.constantsWithExtendedQuery.expecte import com.fasterxml.jackson.`annotation`.JsonIgnoreProperties import com.fasterxml.jackson.`annotation`.JsonProperty import com.fasterxml.jackson.`annotation`.JsonTypeInfo -import com.fasterxml.jackson.databind.`annotation`.JsonDeserialize -import com.fasterxml.jackson.databind.`annotation`.JsonPOJOBuilder import java.lang.IllegalStateException import kotlin.String import kotlin.jvm.JvmName +import com.fasterxml.jackson.databind.`annotation`.JsonDeserialize as FasterxmlJacksonDatabindAnnotationJsonDeserialize +import com.fasterxml.jackson.databind.`annotation`.JsonPOJOBuilder as FasterxmlJacksonDatabindAnnotationJsonPOJOBuilder +import tools.jackson.databind.`annotation`.JsonDeserialize as ToolsJacksonDatabindAnnotationJsonDeserialize +import tools.jackson.databind.`annotation`.JsonPOJOBuilder as ToolsJacksonDatabindAnnotationJsonPOJOBuilder @JsonTypeInfo(use = JsonTypeInfo.Id.NONE) -@JsonDeserialize(builder = Person.Builder::class) +@FasterxmlJacksonDatabindAnnotationJsonDeserialize(builder = Person.Builder::class) +@ToolsJacksonDatabindAnnotationJsonDeserialize(builder = Person.Builder::class) public class Person( firstname: () -> String? = firstnameDefault, lastname: () -> String? = lastnameDefault, @@ -35,7 +38,8 @@ public class Person( { throw IllegalStateException("Field `lastname` was not requested") } } - @JsonPOJOBuilder + @FasterxmlJacksonDatabindAnnotationJsonPOJOBuilder + @ToolsJacksonDatabindAnnotationJsonPOJOBuilder @JsonIgnoreProperties("__typename") public class Builder { private var firstname: () -> String? = firstnameDefault diff --git a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/constantsWithExtendedQuery/expected/types/Query.kt b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/constantsWithExtendedQuery/expected/types/Query.kt index 8ecf2b9cb..3eef2e4c0 100644 --- a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/constantsWithExtendedQuery/expected/types/Query.kt +++ b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/constantsWithExtendedQuery/expected/types/Query.kt @@ -3,14 +3,17 @@ package com.netflix.graphql.dgs.codegen.cases.constantsWithExtendedQuery.expecte import com.fasterxml.jackson.`annotation`.JsonIgnoreProperties import com.fasterxml.jackson.`annotation`.JsonProperty import com.fasterxml.jackson.`annotation`.JsonTypeInfo -import com.fasterxml.jackson.databind.`annotation`.JsonDeserialize -import com.fasterxml.jackson.databind.`annotation`.JsonPOJOBuilder import java.lang.IllegalStateException import kotlin.collections.List import kotlin.jvm.JvmName +import com.fasterxml.jackson.databind.`annotation`.JsonDeserialize as FasterxmlJacksonDatabindAnnotationJsonDeserialize +import com.fasterxml.jackson.databind.`annotation`.JsonPOJOBuilder as FasterxmlJacksonDatabindAnnotationJsonPOJOBuilder +import tools.jackson.databind.`annotation`.JsonDeserialize as ToolsJacksonDatabindAnnotationJsonDeserialize +import tools.jackson.databind.`annotation`.JsonPOJOBuilder as ToolsJacksonDatabindAnnotationJsonPOJOBuilder @JsonTypeInfo(use = JsonTypeInfo.Id.NONE) -@JsonDeserialize(builder = Query.Builder::class) +@FasterxmlJacksonDatabindAnnotationJsonDeserialize(builder = Query.Builder::class) +@ToolsJacksonDatabindAnnotationJsonDeserialize(builder = Query.Builder::class) public class Query( people: () -> List? = peopleDefault, friends: () -> List? = friendsDefault, @@ -35,7 +38,8 @@ public class Query( { throw IllegalStateException("Field `friends` was not requested") } } - @JsonPOJOBuilder + @FasterxmlJacksonDatabindAnnotationJsonPOJOBuilder + @ToolsJacksonDatabindAnnotationJsonPOJOBuilder @JsonIgnoreProperties("__typename") public class Builder { private var people: () -> List? = peopleDefault diff --git a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/constantsWithExtendedTypes/expected/types/Person.kt b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/constantsWithExtendedTypes/expected/types/Person.kt index 82eaf19f6..105122809 100644 --- a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/constantsWithExtendedTypes/expected/types/Person.kt +++ b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/constantsWithExtendedTypes/expected/types/Person.kt @@ -3,14 +3,17 @@ package com.netflix.graphql.dgs.codegen.cases.constantsWithExtendedTypes.expecte import com.fasterxml.jackson.`annotation`.JsonIgnoreProperties import com.fasterxml.jackson.`annotation`.JsonProperty import com.fasterxml.jackson.`annotation`.JsonTypeInfo -import com.fasterxml.jackson.databind.`annotation`.JsonDeserialize -import com.fasterxml.jackson.databind.`annotation`.JsonPOJOBuilder import java.lang.IllegalStateException import kotlin.String import kotlin.jvm.JvmName +import com.fasterxml.jackson.databind.`annotation`.JsonDeserialize as FasterxmlJacksonDatabindAnnotationJsonDeserialize +import com.fasterxml.jackson.databind.`annotation`.JsonPOJOBuilder as FasterxmlJacksonDatabindAnnotationJsonPOJOBuilder +import tools.jackson.databind.`annotation`.JsonDeserialize as ToolsJacksonDatabindAnnotationJsonDeserialize +import tools.jackson.databind.`annotation`.JsonPOJOBuilder as ToolsJacksonDatabindAnnotationJsonPOJOBuilder @JsonTypeInfo(use = JsonTypeInfo.Id.NONE) -@JsonDeserialize(builder = Person.Builder::class) +@FasterxmlJacksonDatabindAnnotationJsonDeserialize(builder = Person.Builder::class) +@ToolsJacksonDatabindAnnotationJsonDeserialize(builder = Person.Builder::class) public class Person( firstname: () -> String? = firstnameDefault, lastname: () -> String? = lastnameDefault, @@ -45,7 +48,8 @@ public class Person( { throw IllegalStateException("Field `email` was not requested") } } - @JsonPOJOBuilder + @FasterxmlJacksonDatabindAnnotationJsonPOJOBuilder + @ToolsJacksonDatabindAnnotationJsonPOJOBuilder @JsonIgnoreProperties("__typename") public class Builder { private var firstname: () -> String? = firstnameDefault diff --git a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/constantsWithExtendedTypes/expected/types/Query.kt b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/constantsWithExtendedTypes/expected/types/Query.kt index 6bd54c0ef..a448c4827 100644 --- a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/constantsWithExtendedTypes/expected/types/Query.kt +++ b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/constantsWithExtendedTypes/expected/types/Query.kt @@ -3,14 +3,17 @@ package com.netflix.graphql.dgs.codegen.cases.constantsWithExtendedTypes.expecte import com.fasterxml.jackson.`annotation`.JsonIgnoreProperties import com.fasterxml.jackson.`annotation`.JsonProperty import com.fasterxml.jackson.`annotation`.JsonTypeInfo -import com.fasterxml.jackson.databind.`annotation`.JsonDeserialize -import com.fasterxml.jackson.databind.`annotation`.JsonPOJOBuilder import java.lang.IllegalStateException import kotlin.collections.List import kotlin.jvm.JvmName +import com.fasterxml.jackson.databind.`annotation`.JsonDeserialize as FasterxmlJacksonDatabindAnnotationJsonDeserialize +import com.fasterxml.jackson.databind.`annotation`.JsonPOJOBuilder as FasterxmlJacksonDatabindAnnotationJsonPOJOBuilder +import tools.jackson.databind.`annotation`.JsonDeserialize as ToolsJacksonDatabindAnnotationJsonDeserialize +import tools.jackson.databind.`annotation`.JsonPOJOBuilder as ToolsJacksonDatabindAnnotationJsonPOJOBuilder @JsonTypeInfo(use = JsonTypeInfo.Id.NONE) -@JsonDeserialize(builder = Query.Builder::class) +@FasterxmlJacksonDatabindAnnotationJsonDeserialize(builder = Query.Builder::class) +@ToolsJacksonDatabindAnnotationJsonDeserialize(builder = Query.Builder::class) public class Query( people: () -> List? = peopleDefault, ) { @@ -25,7 +28,8 @@ public class Query( { throw IllegalStateException("Field `people` was not requested") } } - @JsonPOJOBuilder + @FasterxmlJacksonDatabindAnnotationJsonPOJOBuilder + @ToolsJacksonDatabindAnnotationJsonPOJOBuilder @JsonIgnoreProperties("__typename") public class Builder { private var people: () -> List? = peopleDefault diff --git a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassDocs/expected/types/Movie.kt b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassDocs/expected/types/Movie.kt index 64f1ac388..c00b4b440 100644 --- a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassDocs/expected/types/Movie.kt +++ b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassDocs/expected/types/Movie.kt @@ -3,18 +3,21 @@ package com.netflix.graphql.dgs.codegen.cases.dataClassDocs.expected.types import com.fasterxml.jackson.`annotation`.JsonIgnoreProperties import com.fasterxml.jackson.`annotation`.JsonProperty import com.fasterxml.jackson.`annotation`.JsonTypeInfo -import com.fasterxml.jackson.databind.`annotation`.JsonDeserialize -import com.fasterxml.jackson.databind.`annotation`.JsonPOJOBuilder import java.lang.IllegalStateException import kotlin.String import kotlin.jvm.JvmName +import com.fasterxml.jackson.databind.`annotation`.JsonDeserialize as FasterxmlJacksonDatabindAnnotationJsonDeserialize +import com.fasterxml.jackson.databind.`annotation`.JsonPOJOBuilder as FasterxmlJacksonDatabindAnnotationJsonPOJOBuilder +import tools.jackson.databind.`annotation`.JsonDeserialize as ToolsJacksonDatabindAnnotationJsonDeserialize +import tools.jackson.databind.`annotation`.JsonPOJOBuilder as ToolsJacksonDatabindAnnotationJsonPOJOBuilder /** * Movies are fun to watch. * They also work well as examples in GraphQL. */ @JsonTypeInfo(use = JsonTypeInfo.Id.NONE) -@JsonDeserialize(builder = Movie.Builder::class) +@FasterxmlJacksonDatabindAnnotationJsonDeserialize(builder = Movie.Builder::class) +@ToolsJacksonDatabindAnnotationJsonDeserialize(builder = Movie.Builder::class) public class Movie( title: () -> String? = titleDefault, ) { @@ -29,7 +32,8 @@ public class Movie( { throw IllegalStateException("Field `title` was not requested") } } - @JsonPOJOBuilder + @FasterxmlJacksonDatabindAnnotationJsonPOJOBuilder + @ToolsJacksonDatabindAnnotationJsonPOJOBuilder @JsonIgnoreProperties("__typename") public class Builder { private var title: () -> String? = titleDefault diff --git a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassDocs/expected/types/Query.kt b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassDocs/expected/types/Query.kt index d6474ef21..6888753a7 100644 --- a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassDocs/expected/types/Query.kt +++ b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassDocs/expected/types/Query.kt @@ -3,13 +3,16 @@ package com.netflix.graphql.dgs.codegen.cases.dataClassDocs.expected.types import com.fasterxml.jackson.`annotation`.JsonIgnoreProperties import com.fasterxml.jackson.`annotation`.JsonProperty import com.fasterxml.jackson.`annotation`.JsonTypeInfo -import com.fasterxml.jackson.databind.`annotation`.JsonDeserialize -import com.fasterxml.jackson.databind.`annotation`.JsonPOJOBuilder import java.lang.IllegalStateException import kotlin.jvm.JvmName +import com.fasterxml.jackson.databind.`annotation`.JsonDeserialize as FasterxmlJacksonDatabindAnnotationJsonDeserialize +import com.fasterxml.jackson.databind.`annotation`.JsonPOJOBuilder as FasterxmlJacksonDatabindAnnotationJsonPOJOBuilder +import tools.jackson.databind.`annotation`.JsonDeserialize as ToolsJacksonDatabindAnnotationJsonDeserialize +import tools.jackson.databind.`annotation`.JsonPOJOBuilder as ToolsJacksonDatabindAnnotationJsonPOJOBuilder @JsonTypeInfo(use = JsonTypeInfo.Id.NONE) -@JsonDeserialize(builder = Query.Builder::class) +@FasterxmlJacksonDatabindAnnotationJsonDeserialize(builder = Query.Builder::class) +@ToolsJacksonDatabindAnnotationJsonDeserialize(builder = Query.Builder::class) public class Query( search: () -> Movie? = searchDefault, ) { @@ -24,7 +27,8 @@ public class Query( { throw IllegalStateException("Field `search` was not requested") } } - @JsonPOJOBuilder + @FasterxmlJacksonDatabindAnnotationJsonPOJOBuilder + @ToolsJacksonDatabindAnnotationJsonPOJOBuilder @JsonIgnoreProperties("__typename") public class Builder { private var search: () -> Movie? = searchDefault diff --git a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassFieldDocs/expected/types/Movie.kt b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassFieldDocs/expected/types/Movie.kt index b56b7fd0e..fd860c27b 100644 --- a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassFieldDocs/expected/types/Movie.kt +++ b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassFieldDocs/expected/types/Movie.kt @@ -3,14 +3,17 @@ package com.netflix.graphql.dgs.codegen.cases.dataClassFieldDocs.expected.types import com.fasterxml.jackson.`annotation`.JsonIgnoreProperties import com.fasterxml.jackson.`annotation`.JsonProperty import com.fasterxml.jackson.`annotation`.JsonTypeInfo -import com.fasterxml.jackson.databind.`annotation`.JsonDeserialize -import com.fasterxml.jackson.databind.`annotation`.JsonPOJOBuilder import java.lang.IllegalStateException import kotlin.String import kotlin.jvm.JvmName +import com.fasterxml.jackson.databind.`annotation`.JsonDeserialize as FasterxmlJacksonDatabindAnnotationJsonDeserialize +import com.fasterxml.jackson.databind.`annotation`.JsonPOJOBuilder as FasterxmlJacksonDatabindAnnotationJsonPOJOBuilder +import tools.jackson.databind.`annotation`.JsonDeserialize as ToolsJacksonDatabindAnnotationJsonDeserialize +import tools.jackson.databind.`annotation`.JsonPOJOBuilder as ToolsJacksonDatabindAnnotationJsonPOJOBuilder @JsonTypeInfo(use = JsonTypeInfo.Id.NONE) -@JsonDeserialize(builder = Movie.Builder::class) +@FasterxmlJacksonDatabindAnnotationJsonDeserialize(builder = Movie.Builder::class) +@ToolsJacksonDatabindAnnotationJsonDeserialize(builder = Movie.Builder::class) public class Movie( title: () -> String? = titleDefault, ) { @@ -28,7 +31,8 @@ public class Movie( { throw IllegalStateException("Field `title` was not requested") } } - @JsonPOJOBuilder + @FasterxmlJacksonDatabindAnnotationJsonPOJOBuilder + @ToolsJacksonDatabindAnnotationJsonPOJOBuilder @JsonIgnoreProperties("__typename") public class Builder { private var title: () -> String? = titleDefault diff --git a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassFieldDocs/expected/types/Query.kt b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassFieldDocs/expected/types/Query.kt index 74e1ad41b..d4762054b 100644 --- a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassFieldDocs/expected/types/Query.kt +++ b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassFieldDocs/expected/types/Query.kt @@ -3,13 +3,16 @@ package com.netflix.graphql.dgs.codegen.cases.dataClassFieldDocs.expected.types import com.fasterxml.jackson.`annotation`.JsonIgnoreProperties import com.fasterxml.jackson.`annotation`.JsonProperty import com.fasterxml.jackson.`annotation`.JsonTypeInfo -import com.fasterxml.jackson.databind.`annotation`.JsonDeserialize -import com.fasterxml.jackson.databind.`annotation`.JsonPOJOBuilder import java.lang.IllegalStateException import kotlin.jvm.JvmName +import com.fasterxml.jackson.databind.`annotation`.JsonDeserialize as FasterxmlJacksonDatabindAnnotationJsonDeserialize +import com.fasterxml.jackson.databind.`annotation`.JsonPOJOBuilder as FasterxmlJacksonDatabindAnnotationJsonPOJOBuilder +import tools.jackson.databind.`annotation`.JsonDeserialize as ToolsJacksonDatabindAnnotationJsonDeserialize +import tools.jackson.databind.`annotation`.JsonPOJOBuilder as ToolsJacksonDatabindAnnotationJsonPOJOBuilder @JsonTypeInfo(use = JsonTypeInfo.Id.NONE) -@JsonDeserialize(builder = Query.Builder::class) +@FasterxmlJacksonDatabindAnnotationJsonDeserialize(builder = Query.Builder::class) +@ToolsJacksonDatabindAnnotationJsonDeserialize(builder = Query.Builder::class) public class Query( search: () -> Movie? = searchDefault, ) { @@ -24,7 +27,8 @@ public class Query( { throw IllegalStateException("Field `search` was not requested") } } - @JsonPOJOBuilder + @FasterxmlJacksonDatabindAnnotationJsonPOJOBuilder + @ToolsJacksonDatabindAnnotationJsonPOJOBuilder @JsonIgnoreProperties("__typename") public class Builder { private var search: () -> Movie? = searchDefault diff --git a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWIthNoFields/expected/types/Person.kt b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWIthNoFields/expected/types/Person.kt index 0b969e337..caa988649 100644 --- a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWIthNoFields/expected/types/Person.kt +++ b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWIthNoFields/expected/types/Person.kt @@ -2,15 +2,19 @@ package com.netflix.graphql.dgs.codegen.cases.dataClassWIthNoFields.expected.typ import com.fasterxml.jackson.`annotation`.JsonIgnoreProperties import com.fasterxml.jackson.`annotation`.JsonTypeInfo -import com.fasterxml.jackson.databind.`annotation`.JsonDeserialize -import com.fasterxml.jackson.databind.`annotation`.JsonPOJOBuilder +import com.fasterxml.jackson.databind.`annotation`.JsonDeserialize as FasterxmlJacksonDatabindAnnotationJsonDeserialize +import com.fasterxml.jackson.databind.`annotation`.JsonPOJOBuilder as FasterxmlJacksonDatabindAnnotationJsonPOJOBuilder +import tools.jackson.databind.`annotation`.JsonDeserialize as ToolsJacksonDatabindAnnotationJsonDeserialize +import tools.jackson.databind.`annotation`.JsonPOJOBuilder as ToolsJacksonDatabindAnnotationJsonPOJOBuilder @JsonTypeInfo(use = JsonTypeInfo.Id.NONE) -@JsonDeserialize(builder = Person.Builder::class) +@FasterxmlJacksonDatabindAnnotationJsonDeserialize(builder = Person.Builder::class) +@ToolsJacksonDatabindAnnotationJsonDeserialize(builder = Person.Builder::class) public class Person() { public companion object - @JsonPOJOBuilder + @FasterxmlJacksonDatabindAnnotationJsonPOJOBuilder + @ToolsJacksonDatabindAnnotationJsonPOJOBuilder @JsonIgnoreProperties("__typename") public class Builder { public fun build(): Person = Person( diff --git a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWIthNoFields/expected/types/Query.kt b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWIthNoFields/expected/types/Query.kt index e6c0d19ce..907876835 100644 --- a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWIthNoFields/expected/types/Query.kt +++ b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWIthNoFields/expected/types/Query.kt @@ -3,13 +3,16 @@ package com.netflix.graphql.dgs.codegen.cases.dataClassWIthNoFields.expected.typ import com.fasterxml.jackson.`annotation`.JsonIgnoreProperties import com.fasterxml.jackson.`annotation`.JsonProperty import com.fasterxml.jackson.`annotation`.JsonTypeInfo -import com.fasterxml.jackson.databind.`annotation`.JsonDeserialize -import com.fasterxml.jackson.databind.`annotation`.JsonPOJOBuilder import java.lang.IllegalStateException import kotlin.jvm.JvmName +import com.fasterxml.jackson.databind.`annotation`.JsonDeserialize as FasterxmlJacksonDatabindAnnotationJsonDeserialize +import com.fasterxml.jackson.databind.`annotation`.JsonPOJOBuilder as FasterxmlJacksonDatabindAnnotationJsonPOJOBuilder +import tools.jackson.databind.`annotation`.JsonDeserialize as ToolsJacksonDatabindAnnotationJsonDeserialize +import tools.jackson.databind.`annotation`.JsonPOJOBuilder as ToolsJacksonDatabindAnnotationJsonPOJOBuilder @JsonTypeInfo(use = JsonTypeInfo.Id.NONE) -@JsonDeserialize(builder = Query.Builder::class) +@FasterxmlJacksonDatabindAnnotationJsonDeserialize(builder = Query.Builder::class) +@ToolsJacksonDatabindAnnotationJsonDeserialize(builder = Query.Builder::class) public class Query( me: () -> Person? = meDefault, ) { @@ -24,7 +27,8 @@ public class Query( { throw IllegalStateException("Field `me` was not requested") } } - @JsonPOJOBuilder + @FasterxmlJacksonDatabindAnnotationJsonPOJOBuilder + @ToolsJacksonDatabindAnnotationJsonPOJOBuilder @JsonIgnoreProperties("__typename") public class Builder { private var me: () -> Person? = meDefault diff --git a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithBooleanField/expected/types/Query.kt b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithBooleanField/expected/types/Query.kt index 0d16e85d6..95318b3dd 100644 --- a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithBooleanField/expected/types/Query.kt +++ b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithBooleanField/expected/types/Query.kt @@ -3,13 +3,16 @@ package com.netflix.graphql.dgs.codegen.cases.dataClassWithBooleanField.expected import com.fasterxml.jackson.`annotation`.JsonIgnoreProperties import com.fasterxml.jackson.`annotation`.JsonProperty import com.fasterxml.jackson.`annotation`.JsonTypeInfo -import com.fasterxml.jackson.databind.`annotation`.JsonDeserialize -import com.fasterxml.jackson.databind.`annotation`.JsonPOJOBuilder import java.lang.IllegalStateException import kotlin.jvm.JvmName +import com.fasterxml.jackson.databind.`annotation`.JsonDeserialize as FasterxmlJacksonDatabindAnnotationJsonDeserialize +import com.fasterxml.jackson.databind.`annotation`.JsonPOJOBuilder as FasterxmlJacksonDatabindAnnotationJsonPOJOBuilder +import tools.jackson.databind.`annotation`.JsonDeserialize as ToolsJacksonDatabindAnnotationJsonDeserialize +import tools.jackson.databind.`annotation`.JsonPOJOBuilder as ToolsJacksonDatabindAnnotationJsonPOJOBuilder @JsonTypeInfo(use = JsonTypeInfo.Id.NONE) -@JsonDeserialize(builder = Query.Builder::class) +@FasterxmlJacksonDatabindAnnotationJsonDeserialize(builder = Query.Builder::class) +@ToolsJacksonDatabindAnnotationJsonDeserialize(builder = Query.Builder::class) public class Query( test: () -> RequiredTestType? = testDefault, ) { @@ -24,7 +27,8 @@ public class Query( { throw IllegalStateException("Field `test` was not requested") } } - @JsonPOJOBuilder + @FasterxmlJacksonDatabindAnnotationJsonPOJOBuilder + @ToolsJacksonDatabindAnnotationJsonPOJOBuilder @JsonIgnoreProperties("__typename") public class Builder { private var test: () -> RequiredTestType? = testDefault diff --git a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithBooleanField/expected/types/RequiredTestType.kt b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithBooleanField/expected/types/RequiredTestType.kt index f5b7c7cb4..0669d53b6 100644 --- a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithBooleanField/expected/types/RequiredTestType.kt +++ b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithBooleanField/expected/types/RequiredTestType.kt @@ -3,14 +3,17 @@ package com.netflix.graphql.dgs.codegen.cases.dataClassWithBooleanField.expected import com.fasterxml.jackson.`annotation`.JsonIgnoreProperties import com.fasterxml.jackson.`annotation`.JsonProperty import com.fasterxml.jackson.`annotation`.JsonTypeInfo -import com.fasterxml.jackson.databind.`annotation`.JsonDeserialize -import com.fasterxml.jackson.databind.`annotation`.JsonPOJOBuilder import java.lang.IllegalStateException import kotlin.Boolean import kotlin.jvm.JvmName +import com.fasterxml.jackson.databind.`annotation`.JsonDeserialize as FasterxmlJacksonDatabindAnnotationJsonDeserialize +import com.fasterxml.jackson.databind.`annotation`.JsonPOJOBuilder as FasterxmlJacksonDatabindAnnotationJsonPOJOBuilder +import tools.jackson.databind.`annotation`.JsonDeserialize as ToolsJacksonDatabindAnnotationJsonDeserialize +import tools.jackson.databind.`annotation`.JsonPOJOBuilder as ToolsJacksonDatabindAnnotationJsonPOJOBuilder @JsonTypeInfo(use = JsonTypeInfo.Id.NONE) -@JsonDeserialize(builder = RequiredTestType.Builder::class) +@FasterxmlJacksonDatabindAnnotationJsonDeserialize(builder = RequiredTestType.Builder::class) +@ToolsJacksonDatabindAnnotationJsonDeserialize(builder = RequiredTestType.Builder::class) public class RequiredTestType( isRequired: () -> Boolean = isRequiredDefault, ) { @@ -25,7 +28,8 @@ public class RequiredTestType( { throw IllegalStateException("Field `isRequired` was not requested") } } - @JsonPOJOBuilder + @FasterxmlJacksonDatabindAnnotationJsonPOJOBuilder + @ToolsJacksonDatabindAnnotationJsonPOJOBuilder @JsonIgnoreProperties("__typename") public class Builder { private var isRequired: () -> Boolean = isRequiredDefault diff --git a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithDeclaredScalars/expected/types/Entity.kt b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithDeclaredScalars/expected/types/Entity.kt index 675fae78e..8d81dc2c7 100644 --- a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithDeclaredScalars/expected/types/Entity.kt +++ b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithDeclaredScalars/expected/types/Entity.kt @@ -3,15 +3,18 @@ package com.netflix.graphql.dgs.codegen.cases.dataClassWithDeclaredScalars.expec import com.fasterxml.jackson.`annotation`.JsonIgnoreProperties import com.fasterxml.jackson.`annotation`.JsonProperty import com.fasterxml.jackson.`annotation`.JsonTypeInfo -import com.fasterxml.jackson.databind.`annotation`.JsonDeserialize -import com.fasterxml.jackson.databind.`annotation`.JsonPOJOBuilder import java.lang.IllegalStateException import java.time.OffsetDateTime import kotlin.Long import kotlin.jvm.JvmName +import com.fasterxml.jackson.databind.`annotation`.JsonDeserialize as FasterxmlJacksonDatabindAnnotationJsonDeserialize +import com.fasterxml.jackson.databind.`annotation`.JsonPOJOBuilder as FasterxmlJacksonDatabindAnnotationJsonPOJOBuilder +import tools.jackson.databind.`annotation`.JsonDeserialize as ToolsJacksonDatabindAnnotationJsonDeserialize +import tools.jackson.databind.`annotation`.JsonPOJOBuilder as ToolsJacksonDatabindAnnotationJsonPOJOBuilder @JsonTypeInfo(use = JsonTypeInfo.Id.NONE) -@JsonDeserialize(builder = Entity.Builder::class) +@FasterxmlJacksonDatabindAnnotationJsonDeserialize(builder = Entity.Builder::class) +@ToolsJacksonDatabindAnnotationJsonDeserialize(builder = Entity.Builder::class) public class Entity( long: () -> Long? = longDefault, dateTime: () -> OffsetDateTime? = dateTimeDefault, @@ -36,7 +39,8 @@ public class Entity( { throw IllegalStateException("Field `dateTime` was not requested") } } - @JsonPOJOBuilder + @FasterxmlJacksonDatabindAnnotationJsonPOJOBuilder + @ToolsJacksonDatabindAnnotationJsonPOJOBuilder @JsonIgnoreProperties("__typename") public class Builder { private var long: () -> Long? = longDefault diff --git a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithDeclaredScalars/expected/types/EntityConnection.kt b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithDeclaredScalars/expected/types/EntityConnection.kt index 1ef984539..c4c0a7f47 100644 --- a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithDeclaredScalars/expected/types/EntityConnection.kt +++ b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithDeclaredScalars/expected/types/EntityConnection.kt @@ -3,14 +3,17 @@ package com.netflix.graphql.dgs.codegen.cases.dataClassWithDeclaredScalars.expec import com.fasterxml.jackson.`annotation`.JsonIgnoreProperties import com.fasterxml.jackson.`annotation`.JsonProperty import com.fasterxml.jackson.`annotation`.JsonTypeInfo -import com.fasterxml.jackson.databind.`annotation`.JsonDeserialize -import com.fasterxml.jackson.databind.`annotation`.JsonPOJOBuilder import java.lang.IllegalStateException import kotlin.collections.List import kotlin.jvm.JvmName +import com.fasterxml.jackson.databind.`annotation`.JsonDeserialize as FasterxmlJacksonDatabindAnnotationJsonDeserialize +import com.fasterxml.jackson.databind.`annotation`.JsonPOJOBuilder as FasterxmlJacksonDatabindAnnotationJsonPOJOBuilder +import tools.jackson.databind.`annotation`.JsonDeserialize as ToolsJacksonDatabindAnnotationJsonDeserialize +import tools.jackson.databind.`annotation`.JsonPOJOBuilder as ToolsJacksonDatabindAnnotationJsonPOJOBuilder @JsonTypeInfo(use = JsonTypeInfo.Id.NONE) -@JsonDeserialize(builder = EntityConnection.Builder::class) +@FasterxmlJacksonDatabindAnnotationJsonDeserialize(builder = EntityConnection.Builder::class) +@ToolsJacksonDatabindAnnotationJsonDeserialize(builder = EntityConnection.Builder::class) public class EntityConnection( pageInfo: () -> PageInfo = pageInfoDefault, edges: () -> List? = edgesDefault, @@ -35,7 +38,8 @@ public class EntityConnection( { throw IllegalStateException("Field `edges` was not requested") } } - @JsonPOJOBuilder + @FasterxmlJacksonDatabindAnnotationJsonPOJOBuilder + @ToolsJacksonDatabindAnnotationJsonPOJOBuilder @JsonIgnoreProperties("__typename") public class Builder { private var pageInfo: () -> PageInfo = pageInfoDefault diff --git a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithDeclaredScalars/expected/types/EntityEdge.kt b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithDeclaredScalars/expected/types/EntityEdge.kt index 2ff90a47d..80bff3f2a 100644 --- a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithDeclaredScalars/expected/types/EntityEdge.kt +++ b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithDeclaredScalars/expected/types/EntityEdge.kt @@ -3,14 +3,17 @@ package com.netflix.graphql.dgs.codegen.cases.dataClassWithDeclaredScalars.expec import com.fasterxml.jackson.`annotation`.JsonIgnoreProperties import com.fasterxml.jackson.`annotation`.JsonProperty import com.fasterxml.jackson.`annotation`.JsonTypeInfo -import com.fasterxml.jackson.databind.`annotation`.JsonDeserialize -import com.fasterxml.jackson.databind.`annotation`.JsonPOJOBuilder import java.lang.IllegalStateException import kotlin.String import kotlin.jvm.JvmName +import com.fasterxml.jackson.databind.`annotation`.JsonDeserialize as FasterxmlJacksonDatabindAnnotationJsonDeserialize +import com.fasterxml.jackson.databind.`annotation`.JsonPOJOBuilder as FasterxmlJacksonDatabindAnnotationJsonPOJOBuilder +import tools.jackson.databind.`annotation`.JsonDeserialize as ToolsJacksonDatabindAnnotationJsonDeserialize +import tools.jackson.databind.`annotation`.JsonPOJOBuilder as ToolsJacksonDatabindAnnotationJsonPOJOBuilder @JsonTypeInfo(use = JsonTypeInfo.Id.NONE) -@JsonDeserialize(builder = EntityEdge.Builder::class) +@FasterxmlJacksonDatabindAnnotationJsonDeserialize(builder = EntityEdge.Builder::class) +@ToolsJacksonDatabindAnnotationJsonDeserialize(builder = EntityEdge.Builder::class) public class EntityEdge( cursor: () -> String = cursorDefault, node: () -> Entity? = nodeDefault, @@ -35,7 +38,8 @@ public class EntityEdge( { throw IllegalStateException("Field `node` was not requested") } } - @JsonPOJOBuilder + @FasterxmlJacksonDatabindAnnotationJsonPOJOBuilder + @ToolsJacksonDatabindAnnotationJsonPOJOBuilder @JsonIgnoreProperties("__typename") public class Builder { private var cursor: () -> String = cursorDefault diff --git a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithDeclaredScalars/expected/types/PageInfo.kt b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithDeclaredScalars/expected/types/PageInfo.kt index 16cd49208..757a98108 100644 --- a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithDeclaredScalars/expected/types/PageInfo.kt +++ b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithDeclaredScalars/expected/types/PageInfo.kt @@ -3,15 +3,18 @@ package com.netflix.graphql.dgs.codegen.cases.dataClassWithDeclaredScalars.expec import com.fasterxml.jackson.`annotation`.JsonIgnoreProperties import com.fasterxml.jackson.`annotation`.JsonProperty import com.fasterxml.jackson.`annotation`.JsonTypeInfo -import com.fasterxml.jackson.databind.`annotation`.JsonDeserialize -import com.fasterxml.jackson.databind.`annotation`.JsonPOJOBuilder import java.lang.IllegalStateException import kotlin.Boolean import kotlin.String import kotlin.jvm.JvmName +import com.fasterxml.jackson.databind.`annotation`.JsonDeserialize as FasterxmlJacksonDatabindAnnotationJsonDeserialize +import com.fasterxml.jackson.databind.`annotation`.JsonPOJOBuilder as FasterxmlJacksonDatabindAnnotationJsonPOJOBuilder +import tools.jackson.databind.`annotation`.JsonDeserialize as ToolsJacksonDatabindAnnotationJsonDeserialize +import tools.jackson.databind.`annotation`.JsonPOJOBuilder as ToolsJacksonDatabindAnnotationJsonPOJOBuilder @JsonTypeInfo(use = JsonTypeInfo.Id.NONE) -@JsonDeserialize(builder = PageInfo.Builder::class) +@FasterxmlJacksonDatabindAnnotationJsonDeserialize(builder = PageInfo.Builder::class) +@ToolsJacksonDatabindAnnotationJsonDeserialize(builder = PageInfo.Builder::class) public class PageInfo( startCursor: () -> String? = startCursorDefault, endCursor: () -> String? = endCursorDefault, @@ -56,7 +59,8 @@ public class PageInfo( { throw IllegalStateException("Field `hasPreviousPage` was not requested") } } - @JsonPOJOBuilder + @FasterxmlJacksonDatabindAnnotationJsonPOJOBuilder + @ToolsJacksonDatabindAnnotationJsonPOJOBuilder @JsonIgnoreProperties("__typename") public class Builder { private var startCursor: () -> String? = startCursorDefault diff --git a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithDeclaredScalars/expected/types/Query.kt b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithDeclaredScalars/expected/types/Query.kt index b03b6ed47..70510eda3 100644 --- a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithDeclaredScalars/expected/types/Query.kt +++ b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithDeclaredScalars/expected/types/Query.kt @@ -3,14 +3,17 @@ package com.netflix.graphql.dgs.codegen.cases.dataClassWithDeclaredScalars.expec import com.fasterxml.jackson.`annotation`.JsonIgnoreProperties import com.fasterxml.jackson.`annotation`.JsonProperty import com.fasterxml.jackson.`annotation`.JsonTypeInfo -import com.fasterxml.jackson.databind.`annotation`.JsonDeserialize -import com.fasterxml.jackson.databind.`annotation`.JsonPOJOBuilder import java.lang.IllegalStateException import kotlin.collections.List import kotlin.jvm.JvmName +import com.fasterxml.jackson.databind.`annotation`.JsonDeserialize as FasterxmlJacksonDatabindAnnotationJsonDeserialize +import com.fasterxml.jackson.databind.`annotation`.JsonPOJOBuilder as FasterxmlJacksonDatabindAnnotationJsonPOJOBuilder +import tools.jackson.databind.`annotation`.JsonDeserialize as ToolsJacksonDatabindAnnotationJsonDeserialize +import tools.jackson.databind.`annotation`.JsonPOJOBuilder as ToolsJacksonDatabindAnnotationJsonPOJOBuilder @JsonTypeInfo(use = JsonTypeInfo.Id.NONE) -@JsonDeserialize(builder = Query.Builder::class) +@FasterxmlJacksonDatabindAnnotationJsonDeserialize(builder = Query.Builder::class) +@ToolsJacksonDatabindAnnotationJsonDeserialize(builder = Query.Builder::class) public class Query( entity: () -> List? = entityDefault, entityConnection: () -> EntityConnection? = entityConnectionDefault, @@ -35,7 +38,8 @@ public class Query( { throw IllegalStateException("Field `entityConnection` was not requested") } } - @JsonPOJOBuilder + @FasterxmlJacksonDatabindAnnotationJsonPOJOBuilder + @ToolsJacksonDatabindAnnotationJsonPOJOBuilder @JsonIgnoreProperties("__typename") public class Builder { private var entity: () -> List? = entityDefault diff --git a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithDeeplyNestedComplexField/expected/types/Car.kt b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithDeeplyNestedComplexField/expected/types/Car.kt index 4b1761276..3dd77ebf7 100644 --- a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithDeeplyNestedComplexField/expected/types/Car.kt +++ b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithDeeplyNestedComplexField/expected/types/Car.kt @@ -3,14 +3,17 @@ package com.netflix.graphql.dgs.codegen.cases.dataClassWithDeeplyNestedComplexFi import com.fasterxml.jackson.`annotation`.JsonIgnoreProperties import com.fasterxml.jackson.`annotation`.JsonProperty import com.fasterxml.jackson.`annotation`.JsonTypeInfo -import com.fasterxml.jackson.databind.`annotation`.JsonDeserialize -import com.fasterxml.jackson.databind.`annotation`.JsonPOJOBuilder import java.lang.IllegalStateException import kotlin.String import kotlin.jvm.JvmName +import com.fasterxml.jackson.databind.`annotation`.JsonDeserialize as FasterxmlJacksonDatabindAnnotationJsonDeserialize +import com.fasterxml.jackson.databind.`annotation`.JsonPOJOBuilder as FasterxmlJacksonDatabindAnnotationJsonPOJOBuilder +import tools.jackson.databind.`annotation`.JsonDeserialize as ToolsJacksonDatabindAnnotationJsonDeserialize +import tools.jackson.databind.`annotation`.JsonPOJOBuilder as ToolsJacksonDatabindAnnotationJsonPOJOBuilder @JsonTypeInfo(use = JsonTypeInfo.Id.NONE) -@JsonDeserialize(builder = Car.Builder::class) +@FasterxmlJacksonDatabindAnnotationJsonDeserialize(builder = Car.Builder::class) +@ToolsJacksonDatabindAnnotationJsonDeserialize(builder = Car.Builder::class) public class Car( make: () -> String? = makeDefault, model: () -> String? = modelDefault, @@ -45,7 +48,8 @@ public class Car( { throw IllegalStateException("Field `engine` was not requested") } } - @JsonPOJOBuilder + @FasterxmlJacksonDatabindAnnotationJsonPOJOBuilder + @ToolsJacksonDatabindAnnotationJsonPOJOBuilder @JsonIgnoreProperties("__typename") public class Builder { private var make: () -> String? = makeDefault diff --git a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithDeeplyNestedComplexField/expected/types/Engine.kt b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithDeeplyNestedComplexField/expected/types/Engine.kt index 933dd8a2c..94c5b92dc 100644 --- a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithDeeplyNestedComplexField/expected/types/Engine.kt +++ b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithDeeplyNestedComplexField/expected/types/Engine.kt @@ -3,16 +3,19 @@ package com.netflix.graphql.dgs.codegen.cases.dataClassWithDeeplyNestedComplexFi import com.fasterxml.jackson.`annotation`.JsonIgnoreProperties import com.fasterxml.jackson.`annotation`.JsonProperty import com.fasterxml.jackson.`annotation`.JsonTypeInfo -import com.fasterxml.jackson.databind.`annotation`.JsonDeserialize -import com.fasterxml.jackson.databind.`annotation`.JsonPOJOBuilder import java.lang.IllegalStateException import kotlin.Double import kotlin.Int import kotlin.String import kotlin.jvm.JvmName +import com.fasterxml.jackson.databind.`annotation`.JsonDeserialize as FasterxmlJacksonDatabindAnnotationJsonDeserialize +import com.fasterxml.jackson.databind.`annotation`.JsonPOJOBuilder as FasterxmlJacksonDatabindAnnotationJsonPOJOBuilder +import tools.jackson.databind.`annotation`.JsonDeserialize as ToolsJacksonDatabindAnnotationJsonDeserialize +import tools.jackson.databind.`annotation`.JsonPOJOBuilder as ToolsJacksonDatabindAnnotationJsonPOJOBuilder @JsonTypeInfo(use = JsonTypeInfo.Id.NONE) -@JsonDeserialize(builder = Engine.Builder::class) +@FasterxmlJacksonDatabindAnnotationJsonDeserialize(builder = Engine.Builder::class) +@ToolsJacksonDatabindAnnotationJsonDeserialize(builder = Engine.Builder::class) public class Engine( type: () -> String? = typeDefault, bhp: () -> Int? = bhpDefault, @@ -57,7 +60,8 @@ public class Engine( { throw IllegalStateException("Field `performance` was not requested") } } - @JsonPOJOBuilder + @FasterxmlJacksonDatabindAnnotationJsonPOJOBuilder + @ToolsJacksonDatabindAnnotationJsonPOJOBuilder @JsonIgnoreProperties("__typename") public class Builder { private var type: () -> String? = typeDefault diff --git a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithDeeplyNestedComplexField/expected/types/Performance.kt b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithDeeplyNestedComplexField/expected/types/Performance.kt index 45ee173af..d4fb771a1 100644 --- a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithDeeplyNestedComplexField/expected/types/Performance.kt +++ b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithDeeplyNestedComplexField/expected/types/Performance.kt @@ -3,14 +3,17 @@ package com.netflix.graphql.dgs.codegen.cases.dataClassWithDeeplyNestedComplexFi import com.fasterxml.jackson.`annotation`.JsonIgnoreProperties import com.fasterxml.jackson.`annotation`.JsonProperty import com.fasterxml.jackson.`annotation`.JsonTypeInfo -import com.fasterxml.jackson.databind.`annotation`.JsonDeserialize -import com.fasterxml.jackson.databind.`annotation`.JsonPOJOBuilder import java.lang.IllegalStateException import kotlin.Double import kotlin.jvm.JvmName +import com.fasterxml.jackson.databind.`annotation`.JsonDeserialize as FasterxmlJacksonDatabindAnnotationJsonDeserialize +import com.fasterxml.jackson.databind.`annotation`.JsonPOJOBuilder as FasterxmlJacksonDatabindAnnotationJsonPOJOBuilder +import tools.jackson.databind.`annotation`.JsonDeserialize as ToolsJacksonDatabindAnnotationJsonDeserialize +import tools.jackson.databind.`annotation`.JsonPOJOBuilder as ToolsJacksonDatabindAnnotationJsonPOJOBuilder @JsonTypeInfo(use = JsonTypeInfo.Id.NONE) -@JsonDeserialize(builder = Performance.Builder::class) +@FasterxmlJacksonDatabindAnnotationJsonDeserialize(builder = Performance.Builder::class) +@ToolsJacksonDatabindAnnotationJsonDeserialize(builder = Performance.Builder::class) public class Performance( zeroToSixty: () -> Double? = zeroToSixtyDefault, quarterMile: () -> Double? = quarterMileDefault, @@ -35,7 +38,8 @@ public class Performance( { throw IllegalStateException("Field `quarterMile` was not requested") } } - @JsonPOJOBuilder + @FasterxmlJacksonDatabindAnnotationJsonPOJOBuilder + @ToolsJacksonDatabindAnnotationJsonPOJOBuilder @JsonIgnoreProperties("__typename") public class Builder { private var zeroToSixty: () -> Double? = zeroToSixtyDefault diff --git a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithDeeplyNestedComplexField/expected/types/Query.kt b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithDeeplyNestedComplexField/expected/types/Query.kt index 4833681d2..591ee7f12 100644 --- a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithDeeplyNestedComplexField/expected/types/Query.kt +++ b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithDeeplyNestedComplexField/expected/types/Query.kt @@ -3,14 +3,17 @@ package com.netflix.graphql.dgs.codegen.cases.dataClassWithDeeplyNestedComplexFi import com.fasterxml.jackson.`annotation`.JsonIgnoreProperties import com.fasterxml.jackson.`annotation`.JsonProperty import com.fasterxml.jackson.`annotation`.JsonTypeInfo -import com.fasterxml.jackson.databind.`annotation`.JsonDeserialize -import com.fasterxml.jackson.databind.`annotation`.JsonPOJOBuilder import java.lang.IllegalStateException import kotlin.collections.List import kotlin.jvm.JvmName +import com.fasterxml.jackson.databind.`annotation`.JsonDeserialize as FasterxmlJacksonDatabindAnnotationJsonDeserialize +import com.fasterxml.jackson.databind.`annotation`.JsonPOJOBuilder as FasterxmlJacksonDatabindAnnotationJsonPOJOBuilder +import tools.jackson.databind.`annotation`.JsonDeserialize as ToolsJacksonDatabindAnnotationJsonDeserialize +import tools.jackson.databind.`annotation`.JsonPOJOBuilder as ToolsJacksonDatabindAnnotationJsonPOJOBuilder @JsonTypeInfo(use = JsonTypeInfo.Id.NONE) -@JsonDeserialize(builder = Query.Builder::class) +@FasterxmlJacksonDatabindAnnotationJsonDeserialize(builder = Query.Builder::class) +@ToolsJacksonDatabindAnnotationJsonDeserialize(builder = Query.Builder::class) public class Query( cars: () -> List? = carsDefault, ) { @@ -25,7 +28,8 @@ public class Query( { throw IllegalStateException("Field `cars` was not requested") } } - @JsonPOJOBuilder + @FasterxmlJacksonDatabindAnnotationJsonPOJOBuilder + @ToolsJacksonDatabindAnnotationJsonPOJOBuilder @JsonIgnoreProperties("__typename") public class Builder { private var cars: () -> List? = carsDefault diff --git a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithExtendedInterface/expected/types/Query.kt b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithExtendedInterface/expected/types/Query.kt index 1fe70b7b0..1b0b28904 100644 --- a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithExtendedInterface/expected/types/Query.kt +++ b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithExtendedInterface/expected/types/Query.kt @@ -3,14 +3,17 @@ package com.netflix.graphql.dgs.codegen.cases.dataClassWithExtendedInterface.exp import com.fasterxml.jackson.`annotation`.JsonIgnoreProperties import com.fasterxml.jackson.`annotation`.JsonProperty import com.fasterxml.jackson.`annotation`.JsonTypeInfo -import com.fasterxml.jackson.databind.`annotation`.JsonDeserialize -import com.fasterxml.jackson.databind.`annotation`.JsonPOJOBuilder import java.lang.IllegalStateException import kotlin.collections.List import kotlin.jvm.JvmName +import com.fasterxml.jackson.databind.`annotation`.JsonDeserialize as FasterxmlJacksonDatabindAnnotationJsonDeserialize +import com.fasterxml.jackson.databind.`annotation`.JsonPOJOBuilder as FasterxmlJacksonDatabindAnnotationJsonPOJOBuilder +import tools.jackson.databind.`annotation`.JsonDeserialize as ToolsJacksonDatabindAnnotationJsonDeserialize +import tools.jackson.databind.`annotation`.JsonPOJOBuilder as ToolsJacksonDatabindAnnotationJsonPOJOBuilder @JsonTypeInfo(use = JsonTypeInfo.Id.NONE) -@JsonDeserialize(builder = Query.Builder::class) +@FasterxmlJacksonDatabindAnnotationJsonDeserialize(builder = Query.Builder::class) +@ToolsJacksonDatabindAnnotationJsonDeserialize(builder = Query.Builder::class) public class Query( people: () -> List? = peopleDefault, ) { @@ -25,7 +28,8 @@ public class Query( { throw IllegalStateException("Field `people` was not requested") } } - @JsonPOJOBuilder + @FasterxmlJacksonDatabindAnnotationJsonPOJOBuilder + @ToolsJacksonDatabindAnnotationJsonPOJOBuilder @JsonIgnoreProperties("__typename") public class Builder { private var people: () -> List? = peopleDefault diff --git a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithExtendedInterfaceInheritance/expected/types/Employee.kt b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithExtendedInterfaceInheritance/expected/types/Employee.kt index 6696e70c8..b73e2ad8f 100644 --- a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithExtendedInterfaceInheritance/expected/types/Employee.kt +++ b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithExtendedInterfaceInheritance/expected/types/Employee.kt @@ -3,16 +3,19 @@ package com.netflix.graphql.dgs.codegen.cases.dataClassWithExtendedInterfaceInhe import com.fasterxml.jackson.`annotation`.JsonIgnoreProperties import com.fasterxml.jackson.`annotation`.JsonProperty import com.fasterxml.jackson.`annotation`.JsonTypeInfo -import com.fasterxml.jackson.databind.`annotation`.JsonDeserialize -import com.fasterxml.jackson.databind.`annotation`.JsonPOJOBuilder import java.lang.IllegalStateException import kotlin.Int import kotlin.String import kotlin.Suppress import kotlin.jvm.JvmName +import com.fasterxml.jackson.databind.`annotation`.JsonDeserialize as FasterxmlJacksonDatabindAnnotationJsonDeserialize +import com.fasterxml.jackson.databind.`annotation`.JsonPOJOBuilder as FasterxmlJacksonDatabindAnnotationJsonPOJOBuilder +import tools.jackson.databind.`annotation`.JsonDeserialize as ToolsJacksonDatabindAnnotationJsonDeserialize +import tools.jackson.databind.`annotation`.JsonPOJOBuilder as ToolsJacksonDatabindAnnotationJsonPOJOBuilder @JsonTypeInfo(use = JsonTypeInfo.Id.NONE) -@JsonDeserialize(builder = Employee.Builder::class) +@FasterxmlJacksonDatabindAnnotationJsonDeserialize(builder = Employee.Builder::class) +@ToolsJacksonDatabindAnnotationJsonDeserialize(builder = Employee.Builder::class) public class Employee( firstname: () -> String = firstnameDefault, lastname: () -> String? = lastnameDefault, @@ -60,7 +63,8 @@ public class Employee( { throw IllegalStateException("Field `age` was not requested") } } - @JsonPOJOBuilder + @FasterxmlJacksonDatabindAnnotationJsonPOJOBuilder + @ToolsJacksonDatabindAnnotationJsonPOJOBuilder @JsonIgnoreProperties("__typename") public class Builder { private var firstname: () -> String = firstnameDefault diff --git a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithExtendedInterfaceInheritance/expected/types/Query.kt b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithExtendedInterfaceInheritance/expected/types/Query.kt index 13ef33bcc..9828962e9 100644 --- a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithExtendedInterfaceInheritance/expected/types/Query.kt +++ b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithExtendedInterfaceInheritance/expected/types/Query.kt @@ -3,14 +3,17 @@ package com.netflix.graphql.dgs.codegen.cases.dataClassWithExtendedInterfaceInhe import com.fasterxml.jackson.`annotation`.JsonIgnoreProperties import com.fasterxml.jackson.`annotation`.JsonProperty import com.fasterxml.jackson.`annotation`.JsonTypeInfo -import com.fasterxml.jackson.databind.`annotation`.JsonDeserialize -import com.fasterxml.jackson.databind.`annotation`.JsonPOJOBuilder import java.lang.IllegalStateException import kotlin.collections.List import kotlin.jvm.JvmName +import com.fasterxml.jackson.databind.`annotation`.JsonDeserialize as FasterxmlJacksonDatabindAnnotationJsonDeserialize +import com.fasterxml.jackson.databind.`annotation`.JsonPOJOBuilder as FasterxmlJacksonDatabindAnnotationJsonPOJOBuilder +import tools.jackson.databind.`annotation`.JsonDeserialize as ToolsJacksonDatabindAnnotationJsonDeserialize +import tools.jackson.databind.`annotation`.JsonPOJOBuilder as ToolsJacksonDatabindAnnotationJsonPOJOBuilder @JsonTypeInfo(use = JsonTypeInfo.Id.NONE) -@JsonDeserialize(builder = Query.Builder::class) +@FasterxmlJacksonDatabindAnnotationJsonDeserialize(builder = Query.Builder::class) +@ToolsJacksonDatabindAnnotationJsonDeserialize(builder = Query.Builder::class) public class Query( people: () -> List? = peopleDefault, ) { @@ -25,7 +28,8 @@ public class Query( { throw IllegalStateException("Field `people` was not requested") } } - @JsonPOJOBuilder + @FasterxmlJacksonDatabindAnnotationJsonPOJOBuilder + @ToolsJacksonDatabindAnnotationJsonPOJOBuilder @JsonIgnoreProperties("__typename") public class Builder { private var people: () -> List? = peopleDefault diff --git a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithInterface/expected/types/Employee.kt b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithInterface/expected/types/Employee.kt index 7dbddb9b3..d73030a1f 100644 --- a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithInterface/expected/types/Employee.kt +++ b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithInterface/expected/types/Employee.kt @@ -3,15 +3,18 @@ package com.netflix.graphql.dgs.codegen.cases.dataClassWithInterface.expected.ty import com.fasterxml.jackson.`annotation`.JsonIgnoreProperties import com.fasterxml.jackson.`annotation`.JsonProperty import com.fasterxml.jackson.`annotation`.JsonTypeInfo -import com.fasterxml.jackson.databind.`annotation`.JsonDeserialize -import com.fasterxml.jackson.databind.`annotation`.JsonPOJOBuilder import java.lang.IllegalStateException import kotlin.String import kotlin.Suppress import kotlin.jvm.JvmName +import com.fasterxml.jackson.databind.`annotation`.JsonDeserialize as FasterxmlJacksonDatabindAnnotationJsonDeserialize +import com.fasterxml.jackson.databind.`annotation`.JsonPOJOBuilder as FasterxmlJacksonDatabindAnnotationJsonPOJOBuilder +import tools.jackson.databind.`annotation`.JsonDeserialize as ToolsJacksonDatabindAnnotationJsonDeserialize +import tools.jackson.databind.`annotation`.JsonPOJOBuilder as ToolsJacksonDatabindAnnotationJsonPOJOBuilder @JsonTypeInfo(use = JsonTypeInfo.Id.NONE) -@JsonDeserialize(builder = Employee.Builder::class) +@FasterxmlJacksonDatabindAnnotationJsonDeserialize(builder = Employee.Builder::class) +@ToolsJacksonDatabindAnnotationJsonDeserialize(builder = Employee.Builder::class) public class Employee( firstname: () -> String? = firstnameDefault, lastname: () -> String? = lastnameDefault, @@ -48,7 +51,8 @@ public class Employee( { throw IllegalStateException("Field `company` was not requested") } } - @JsonPOJOBuilder + @FasterxmlJacksonDatabindAnnotationJsonPOJOBuilder + @ToolsJacksonDatabindAnnotationJsonPOJOBuilder @JsonIgnoreProperties("__typename") public class Builder { private var firstname: () -> String? = firstnameDefault diff --git a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithInterface/expected/types/Query.kt b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithInterface/expected/types/Query.kt index dba982a87..3ab9ded2e 100644 --- a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithInterface/expected/types/Query.kt +++ b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithInterface/expected/types/Query.kt @@ -3,14 +3,17 @@ package com.netflix.graphql.dgs.codegen.cases.dataClassWithInterface.expected.ty import com.fasterxml.jackson.`annotation`.JsonIgnoreProperties import com.fasterxml.jackson.`annotation`.JsonProperty import com.fasterxml.jackson.`annotation`.JsonTypeInfo -import com.fasterxml.jackson.databind.`annotation`.JsonDeserialize -import com.fasterxml.jackson.databind.`annotation`.JsonPOJOBuilder import java.lang.IllegalStateException import kotlin.collections.List import kotlin.jvm.JvmName +import com.fasterxml.jackson.databind.`annotation`.JsonDeserialize as FasterxmlJacksonDatabindAnnotationJsonDeserialize +import com.fasterxml.jackson.databind.`annotation`.JsonPOJOBuilder as FasterxmlJacksonDatabindAnnotationJsonPOJOBuilder +import tools.jackson.databind.`annotation`.JsonDeserialize as ToolsJacksonDatabindAnnotationJsonDeserialize +import tools.jackson.databind.`annotation`.JsonPOJOBuilder as ToolsJacksonDatabindAnnotationJsonPOJOBuilder @JsonTypeInfo(use = JsonTypeInfo.Id.NONE) -@JsonDeserialize(builder = Query.Builder::class) +@FasterxmlJacksonDatabindAnnotationJsonDeserialize(builder = Query.Builder::class) +@ToolsJacksonDatabindAnnotationJsonDeserialize(builder = Query.Builder::class) public class Query( people: () -> List? = peopleDefault, ) { @@ -25,7 +28,8 @@ public class Query( { throw IllegalStateException("Field `people` was not requested") } } - @JsonPOJOBuilder + @FasterxmlJacksonDatabindAnnotationJsonPOJOBuilder + @ToolsJacksonDatabindAnnotationJsonPOJOBuilder @JsonIgnoreProperties("__typename") public class Builder { private var people: () -> List? = peopleDefault diff --git a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithInterfaceInheritance/expected/types/Query.kt b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithInterfaceInheritance/expected/types/Query.kt index d02923873..9ead25c70 100644 --- a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithInterfaceInheritance/expected/types/Query.kt +++ b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithInterfaceInheritance/expected/types/Query.kt @@ -3,14 +3,17 @@ package com.netflix.graphql.dgs.codegen.cases.dataClassWithInterfaceInheritance. import com.fasterxml.jackson.`annotation`.JsonIgnoreProperties import com.fasterxml.jackson.`annotation`.JsonProperty import com.fasterxml.jackson.`annotation`.JsonTypeInfo -import com.fasterxml.jackson.databind.`annotation`.JsonDeserialize -import com.fasterxml.jackson.databind.`annotation`.JsonPOJOBuilder import java.lang.IllegalStateException import kotlin.collections.List import kotlin.jvm.JvmName +import com.fasterxml.jackson.databind.`annotation`.JsonDeserialize as FasterxmlJacksonDatabindAnnotationJsonDeserialize +import com.fasterxml.jackson.databind.`annotation`.JsonPOJOBuilder as FasterxmlJacksonDatabindAnnotationJsonPOJOBuilder +import tools.jackson.databind.`annotation`.JsonDeserialize as ToolsJacksonDatabindAnnotationJsonDeserialize +import tools.jackson.databind.`annotation`.JsonPOJOBuilder as ToolsJacksonDatabindAnnotationJsonPOJOBuilder @JsonTypeInfo(use = JsonTypeInfo.Id.NONE) -@JsonDeserialize(builder = Query.Builder::class) +@FasterxmlJacksonDatabindAnnotationJsonDeserialize(builder = Query.Builder::class) +@ToolsJacksonDatabindAnnotationJsonDeserialize(builder = Query.Builder::class) public class Query( people: () -> List? = peopleDefault, ) { @@ -25,7 +28,8 @@ public class Query( { throw IllegalStateException("Field `people` was not requested") } } - @JsonPOJOBuilder + @FasterxmlJacksonDatabindAnnotationJsonPOJOBuilder + @ToolsJacksonDatabindAnnotationJsonPOJOBuilder @JsonIgnoreProperties("__typename") public class Builder { private var people: () -> List? = peopleDefault diff --git a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithInterfaceInheritance/expected/types/Talent.kt b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithInterfaceInheritance/expected/types/Talent.kt index e734d08e9..6b5be4e4a 100644 --- a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithInterfaceInheritance/expected/types/Talent.kt +++ b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithInterfaceInheritance/expected/types/Talent.kt @@ -3,15 +3,18 @@ package com.netflix.graphql.dgs.codegen.cases.dataClassWithInterfaceInheritance. import com.fasterxml.jackson.`annotation`.JsonIgnoreProperties import com.fasterxml.jackson.`annotation`.JsonProperty import com.fasterxml.jackson.`annotation`.JsonTypeInfo -import com.fasterxml.jackson.databind.`annotation`.JsonDeserialize -import com.fasterxml.jackson.databind.`annotation`.JsonPOJOBuilder import java.lang.IllegalStateException import kotlin.String import kotlin.Suppress import kotlin.jvm.JvmName +import com.fasterxml.jackson.databind.`annotation`.JsonDeserialize as FasterxmlJacksonDatabindAnnotationJsonDeserialize +import com.fasterxml.jackson.databind.`annotation`.JsonPOJOBuilder as FasterxmlJacksonDatabindAnnotationJsonPOJOBuilder +import tools.jackson.databind.`annotation`.JsonDeserialize as ToolsJacksonDatabindAnnotationJsonDeserialize +import tools.jackson.databind.`annotation`.JsonPOJOBuilder as ToolsJacksonDatabindAnnotationJsonPOJOBuilder @JsonTypeInfo(use = JsonTypeInfo.Id.NONE) -@JsonDeserialize(builder = Talent.Builder::class) +@FasterxmlJacksonDatabindAnnotationJsonDeserialize(builder = Talent.Builder::class) +@ToolsJacksonDatabindAnnotationJsonDeserialize(builder = Talent.Builder::class) public class Talent( firstname: () -> String = firstnameDefault, lastname: () -> String? = lastnameDefault, @@ -59,7 +62,8 @@ public class Talent( { throw IllegalStateException("Field `imdbProfile` was not requested") } } - @JsonPOJOBuilder + @FasterxmlJacksonDatabindAnnotationJsonPOJOBuilder + @ToolsJacksonDatabindAnnotationJsonPOJOBuilder @JsonIgnoreProperties("__typename") public class Builder { private var firstname: () -> String = firstnameDefault diff --git a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithListProperties/expected/types/Person.kt b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithListProperties/expected/types/Person.kt index 42e7e8004..501d59c83 100644 --- a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithListProperties/expected/types/Person.kt +++ b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithListProperties/expected/types/Person.kt @@ -3,15 +3,18 @@ package com.netflix.graphql.dgs.codegen.cases.dataClassWithListProperties.expect import com.fasterxml.jackson.`annotation`.JsonIgnoreProperties import com.fasterxml.jackson.`annotation`.JsonProperty import com.fasterxml.jackson.`annotation`.JsonTypeInfo -import com.fasterxml.jackson.databind.`annotation`.JsonDeserialize -import com.fasterxml.jackson.databind.`annotation`.JsonPOJOBuilder import java.lang.IllegalStateException import kotlin.String import kotlin.collections.List import kotlin.jvm.JvmName +import com.fasterxml.jackson.databind.`annotation`.JsonDeserialize as FasterxmlJacksonDatabindAnnotationJsonDeserialize +import com.fasterxml.jackson.databind.`annotation`.JsonPOJOBuilder as FasterxmlJacksonDatabindAnnotationJsonPOJOBuilder +import tools.jackson.databind.`annotation`.JsonDeserialize as ToolsJacksonDatabindAnnotationJsonDeserialize +import tools.jackson.databind.`annotation`.JsonPOJOBuilder as ToolsJacksonDatabindAnnotationJsonPOJOBuilder @JsonTypeInfo(use = JsonTypeInfo.Id.NONE) -@JsonDeserialize(builder = Person.Builder::class) +@FasterxmlJacksonDatabindAnnotationJsonDeserialize(builder = Person.Builder::class) +@ToolsJacksonDatabindAnnotationJsonDeserialize(builder = Person.Builder::class) public class Person( name: () -> String? = nameDefault, email: () -> List? = emailDefault, @@ -36,7 +39,8 @@ public class Person( { throw IllegalStateException("Field `email` was not requested") } } - @JsonPOJOBuilder + @FasterxmlJacksonDatabindAnnotationJsonPOJOBuilder + @ToolsJacksonDatabindAnnotationJsonPOJOBuilder @JsonIgnoreProperties("__typename") public class Builder { private var name: () -> String? = nameDefault diff --git a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithListProperties/expected/types/Query.kt b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithListProperties/expected/types/Query.kt index 686240a86..f08e4ab93 100644 --- a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithListProperties/expected/types/Query.kt +++ b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithListProperties/expected/types/Query.kt @@ -3,14 +3,17 @@ package com.netflix.graphql.dgs.codegen.cases.dataClassWithListProperties.expect import com.fasterxml.jackson.`annotation`.JsonIgnoreProperties import com.fasterxml.jackson.`annotation`.JsonProperty import com.fasterxml.jackson.`annotation`.JsonTypeInfo -import com.fasterxml.jackson.databind.`annotation`.JsonDeserialize -import com.fasterxml.jackson.databind.`annotation`.JsonPOJOBuilder import java.lang.IllegalStateException import kotlin.collections.List import kotlin.jvm.JvmName +import com.fasterxml.jackson.databind.`annotation`.JsonDeserialize as FasterxmlJacksonDatabindAnnotationJsonDeserialize +import com.fasterxml.jackson.databind.`annotation`.JsonPOJOBuilder as FasterxmlJacksonDatabindAnnotationJsonPOJOBuilder +import tools.jackson.databind.`annotation`.JsonDeserialize as ToolsJacksonDatabindAnnotationJsonDeserialize +import tools.jackson.databind.`annotation`.JsonPOJOBuilder as ToolsJacksonDatabindAnnotationJsonPOJOBuilder @JsonTypeInfo(use = JsonTypeInfo.Id.NONE) -@JsonDeserialize(builder = Query.Builder::class) +@FasterxmlJacksonDatabindAnnotationJsonDeserialize(builder = Query.Builder::class) +@ToolsJacksonDatabindAnnotationJsonDeserialize(builder = Query.Builder::class) public class Query( people: () -> List? = peopleDefault, ) { @@ -25,7 +28,8 @@ public class Query( { throw IllegalStateException("Field `people` was not requested") } } - @JsonPOJOBuilder + @FasterxmlJacksonDatabindAnnotationJsonPOJOBuilder + @ToolsJacksonDatabindAnnotationJsonPOJOBuilder @JsonIgnoreProperties("__typename") public class Builder { private var people: () -> List? = peopleDefault diff --git a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithMappedInterfaces/expected/types/Product.kt b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithMappedInterfaces/expected/types/Product.kt index fd0de5806..eadf37c57 100644 --- a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithMappedInterfaces/expected/types/Product.kt +++ b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithMappedInterfaces/expected/types/Product.kt @@ -3,16 +3,19 @@ package com.netflix.graphql.dgs.codegen.cases.dataClassWithMappedInterfaces.expe import com.fasterxml.jackson.`annotation`.JsonIgnoreProperties import com.fasterxml.jackson.`annotation`.JsonProperty import com.fasterxml.jackson.`annotation`.JsonTypeInfo -import com.fasterxml.jackson.databind.`annotation`.JsonDeserialize -import com.fasterxml.jackson.databind.`annotation`.JsonPOJOBuilder import com.netflix.graphql.dgs.codegen.fixtures.Node import java.lang.IllegalStateException import kotlin.String import kotlin.Suppress import kotlin.jvm.JvmName +import com.fasterxml.jackson.databind.`annotation`.JsonDeserialize as FasterxmlJacksonDatabindAnnotationJsonDeserialize +import com.fasterxml.jackson.databind.`annotation`.JsonPOJOBuilder as FasterxmlJacksonDatabindAnnotationJsonPOJOBuilder +import tools.jackson.databind.`annotation`.JsonDeserialize as ToolsJacksonDatabindAnnotationJsonDeserialize +import tools.jackson.databind.`annotation`.JsonPOJOBuilder as ToolsJacksonDatabindAnnotationJsonPOJOBuilder @JsonTypeInfo(use = JsonTypeInfo.Id.NONE) -@JsonDeserialize(builder = Product.Builder::class) +@FasterxmlJacksonDatabindAnnotationJsonDeserialize(builder = Product.Builder::class) +@ToolsJacksonDatabindAnnotationJsonDeserialize(builder = Product.Builder::class) public class Product( id: () -> String = idDefault, ) : Entity, @@ -29,7 +32,8 @@ public class Product( { throw IllegalStateException("Field `id` was not requested") } } - @JsonPOJOBuilder + @FasterxmlJacksonDatabindAnnotationJsonPOJOBuilder + @ToolsJacksonDatabindAnnotationJsonPOJOBuilder @JsonIgnoreProperties("__typename") public class Builder { private var id: () -> String = idDefault diff --git a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithMappedInterfaces/expected/types/Query.kt b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithMappedInterfaces/expected/types/Query.kt index c912a9e19..aaa4ec5f9 100644 --- a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithMappedInterfaces/expected/types/Query.kt +++ b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithMappedInterfaces/expected/types/Query.kt @@ -3,14 +3,17 @@ package com.netflix.graphql.dgs.codegen.cases.dataClassWithMappedInterfaces.expe import com.fasterxml.jackson.`annotation`.JsonIgnoreProperties import com.fasterxml.jackson.`annotation`.JsonProperty import com.fasterxml.jackson.`annotation`.JsonTypeInfo -import com.fasterxml.jackson.databind.`annotation`.JsonDeserialize -import com.fasterxml.jackson.databind.`annotation`.JsonPOJOBuilder import java.lang.IllegalStateException import kotlin.collections.List import kotlin.jvm.JvmName +import com.fasterxml.jackson.databind.`annotation`.JsonDeserialize as FasterxmlJacksonDatabindAnnotationJsonDeserialize +import com.fasterxml.jackson.databind.`annotation`.JsonPOJOBuilder as FasterxmlJacksonDatabindAnnotationJsonPOJOBuilder +import tools.jackson.databind.`annotation`.JsonDeserialize as ToolsJacksonDatabindAnnotationJsonDeserialize +import tools.jackson.databind.`annotation`.JsonPOJOBuilder as ToolsJacksonDatabindAnnotationJsonPOJOBuilder @JsonTypeInfo(use = JsonTypeInfo.Id.NONE) -@JsonDeserialize(builder = Query.Builder::class) +@FasterxmlJacksonDatabindAnnotationJsonDeserialize(builder = Query.Builder::class) +@ToolsJacksonDatabindAnnotationJsonDeserialize(builder = Query.Builder::class) public class Query( products: () -> List? = productsDefault, ) { @@ -25,7 +28,8 @@ public class Query( { throw IllegalStateException("Field `products` was not requested") } } - @JsonPOJOBuilder + @FasterxmlJacksonDatabindAnnotationJsonPOJOBuilder + @ToolsJacksonDatabindAnnotationJsonPOJOBuilder @JsonIgnoreProperties("__typename") public class Builder { private var products: () -> List? = productsDefault diff --git a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithMappedTypes/expected/types/Entity.kt b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithMappedTypes/expected/types/Entity.kt index 7a0dd05a3..159bea699 100644 --- a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithMappedTypes/expected/types/Entity.kt +++ b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithMappedTypes/expected/types/Entity.kt @@ -3,15 +3,18 @@ package com.netflix.graphql.dgs.codegen.cases.dataClassWithMappedTypes.expected. import com.fasterxml.jackson.`annotation`.JsonIgnoreProperties import com.fasterxml.jackson.`annotation`.JsonProperty import com.fasterxml.jackson.`annotation`.JsonTypeInfo -import com.fasterxml.jackson.databind.`annotation`.JsonDeserialize -import com.fasterxml.jackson.databind.`annotation`.JsonPOJOBuilder import java.lang.IllegalStateException import java.time.OffsetDateTime import kotlin.Long import kotlin.jvm.JvmName +import com.fasterxml.jackson.databind.`annotation`.JsonDeserialize as FasterxmlJacksonDatabindAnnotationJsonDeserialize +import com.fasterxml.jackson.databind.`annotation`.JsonPOJOBuilder as FasterxmlJacksonDatabindAnnotationJsonPOJOBuilder +import tools.jackson.databind.`annotation`.JsonDeserialize as ToolsJacksonDatabindAnnotationJsonDeserialize +import tools.jackson.databind.`annotation`.JsonPOJOBuilder as ToolsJacksonDatabindAnnotationJsonPOJOBuilder @JsonTypeInfo(use = JsonTypeInfo.Id.NONE) -@JsonDeserialize(builder = Entity.Builder::class) +@FasterxmlJacksonDatabindAnnotationJsonDeserialize(builder = Entity.Builder::class) +@ToolsJacksonDatabindAnnotationJsonDeserialize(builder = Entity.Builder::class) public class Entity( long: () -> Long? = longDefault, dateTime: () -> OffsetDateTime? = dateTimeDefault, @@ -36,7 +39,8 @@ public class Entity( { throw IllegalStateException("Field `dateTime` was not requested") } } - @JsonPOJOBuilder + @FasterxmlJacksonDatabindAnnotationJsonPOJOBuilder + @ToolsJacksonDatabindAnnotationJsonPOJOBuilder @JsonIgnoreProperties("__typename") public class Builder { private var long: () -> Long? = longDefault diff --git a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithMappedTypes/expected/types/EntityEdge.kt b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithMappedTypes/expected/types/EntityEdge.kt index a0e3620a6..38933cae1 100644 --- a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithMappedTypes/expected/types/EntityEdge.kt +++ b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithMappedTypes/expected/types/EntityEdge.kt @@ -3,14 +3,17 @@ package com.netflix.graphql.dgs.codegen.cases.dataClassWithMappedTypes.expected. import com.fasterxml.jackson.`annotation`.JsonIgnoreProperties import com.fasterxml.jackson.`annotation`.JsonProperty import com.fasterxml.jackson.`annotation`.JsonTypeInfo -import com.fasterxml.jackson.databind.`annotation`.JsonDeserialize -import com.fasterxml.jackson.databind.`annotation`.JsonPOJOBuilder import java.lang.IllegalStateException import kotlin.String import kotlin.jvm.JvmName +import com.fasterxml.jackson.databind.`annotation`.JsonDeserialize as FasterxmlJacksonDatabindAnnotationJsonDeserialize +import com.fasterxml.jackson.databind.`annotation`.JsonPOJOBuilder as FasterxmlJacksonDatabindAnnotationJsonPOJOBuilder +import tools.jackson.databind.`annotation`.JsonDeserialize as ToolsJacksonDatabindAnnotationJsonDeserialize +import tools.jackson.databind.`annotation`.JsonPOJOBuilder as ToolsJacksonDatabindAnnotationJsonPOJOBuilder @JsonTypeInfo(use = JsonTypeInfo.Id.NONE) -@JsonDeserialize(builder = EntityEdge.Builder::class) +@FasterxmlJacksonDatabindAnnotationJsonDeserialize(builder = EntityEdge.Builder::class) +@ToolsJacksonDatabindAnnotationJsonDeserialize(builder = EntityEdge.Builder::class) public class EntityEdge( cursor: () -> String = cursorDefault, node: () -> Entity? = nodeDefault, @@ -35,7 +38,8 @@ public class EntityEdge( { throw IllegalStateException("Field `node` was not requested") } } - @JsonPOJOBuilder + @FasterxmlJacksonDatabindAnnotationJsonPOJOBuilder + @ToolsJacksonDatabindAnnotationJsonPOJOBuilder @JsonIgnoreProperties("__typename") public class Builder { private var cursor: () -> String = cursorDefault diff --git a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithMappedTypes/expected/types/Query.kt b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithMappedTypes/expected/types/Query.kt index e7e726bda..f01714df4 100644 --- a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithMappedTypes/expected/types/Query.kt +++ b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithMappedTypes/expected/types/Query.kt @@ -3,15 +3,18 @@ package com.netflix.graphql.dgs.codegen.cases.dataClassWithMappedTypes.expected. import com.fasterxml.jackson.`annotation`.JsonIgnoreProperties import com.fasterxml.jackson.`annotation`.JsonProperty import com.fasterxml.jackson.`annotation`.JsonTypeInfo -import com.fasterxml.jackson.databind.`annotation`.JsonDeserialize -import com.fasterxml.jackson.databind.`annotation`.JsonPOJOBuilder import graphql.relay.SimpleListConnection import java.lang.IllegalStateException import kotlin.collections.List import kotlin.jvm.JvmName +import com.fasterxml.jackson.databind.`annotation`.JsonDeserialize as FasterxmlJacksonDatabindAnnotationJsonDeserialize +import com.fasterxml.jackson.databind.`annotation`.JsonPOJOBuilder as FasterxmlJacksonDatabindAnnotationJsonPOJOBuilder +import tools.jackson.databind.`annotation`.JsonDeserialize as ToolsJacksonDatabindAnnotationJsonDeserialize +import tools.jackson.databind.`annotation`.JsonPOJOBuilder as ToolsJacksonDatabindAnnotationJsonPOJOBuilder @JsonTypeInfo(use = JsonTypeInfo.Id.NONE) -@JsonDeserialize(builder = Query.Builder::class) +@FasterxmlJacksonDatabindAnnotationJsonDeserialize(builder = Query.Builder::class) +@ToolsJacksonDatabindAnnotationJsonDeserialize(builder = Query.Builder::class) public class Query( entity: () -> List? = entityDefault, entityConnection: () -> SimpleListConnection? = entityConnectionDefault, @@ -36,7 +39,8 @@ public class Query( { throw IllegalStateException("Field `entityConnection` was not requested") } } - @JsonPOJOBuilder + @FasterxmlJacksonDatabindAnnotationJsonPOJOBuilder + @ToolsJacksonDatabindAnnotationJsonPOJOBuilder @JsonIgnoreProperties("__typename") public class Builder { private var entity: () -> List? = entityDefault diff --git a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithNonNullableAndInterface/expected/types/Employee.kt b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithNonNullableAndInterface/expected/types/Employee.kt index b9f267245..b2e352cc5 100644 --- a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithNonNullableAndInterface/expected/types/Employee.kt +++ b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithNonNullableAndInterface/expected/types/Employee.kt @@ -3,15 +3,18 @@ package com.netflix.graphql.dgs.codegen.cases.dataClassWithNonNullableAndInterfa import com.fasterxml.jackson.`annotation`.JsonIgnoreProperties import com.fasterxml.jackson.`annotation`.JsonProperty import com.fasterxml.jackson.`annotation`.JsonTypeInfo -import com.fasterxml.jackson.databind.`annotation`.JsonDeserialize -import com.fasterxml.jackson.databind.`annotation`.JsonPOJOBuilder import java.lang.IllegalStateException import kotlin.String import kotlin.Suppress import kotlin.jvm.JvmName +import com.fasterxml.jackson.databind.`annotation`.JsonDeserialize as FasterxmlJacksonDatabindAnnotationJsonDeserialize +import com.fasterxml.jackson.databind.`annotation`.JsonPOJOBuilder as FasterxmlJacksonDatabindAnnotationJsonPOJOBuilder +import tools.jackson.databind.`annotation`.JsonDeserialize as ToolsJacksonDatabindAnnotationJsonDeserialize +import tools.jackson.databind.`annotation`.JsonPOJOBuilder as ToolsJacksonDatabindAnnotationJsonPOJOBuilder @JsonTypeInfo(use = JsonTypeInfo.Id.NONE) -@JsonDeserialize(builder = Employee.Builder::class) +@FasterxmlJacksonDatabindAnnotationJsonDeserialize(builder = Employee.Builder::class) +@ToolsJacksonDatabindAnnotationJsonDeserialize(builder = Employee.Builder::class) public class Employee( firstname: () -> String = firstnameDefault, lastname: () -> String = lastnameDefault, @@ -49,7 +52,8 @@ public class Employee( { throw IllegalStateException("Field `company` was not requested") } } - @JsonPOJOBuilder + @FasterxmlJacksonDatabindAnnotationJsonPOJOBuilder + @ToolsJacksonDatabindAnnotationJsonPOJOBuilder @JsonIgnoreProperties("__typename") public class Builder { private var firstname: () -> String = firstnameDefault diff --git a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithNonNullableAndInterface/expected/types/Query.kt b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithNonNullableAndInterface/expected/types/Query.kt index afaad8450..40ab65d4f 100644 --- a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithNonNullableAndInterface/expected/types/Query.kt +++ b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithNonNullableAndInterface/expected/types/Query.kt @@ -3,14 +3,17 @@ package com.netflix.graphql.dgs.codegen.cases.dataClassWithNonNullableAndInterfa import com.fasterxml.jackson.`annotation`.JsonIgnoreProperties import com.fasterxml.jackson.`annotation`.JsonProperty import com.fasterxml.jackson.`annotation`.JsonTypeInfo -import com.fasterxml.jackson.databind.`annotation`.JsonDeserialize -import com.fasterxml.jackson.databind.`annotation`.JsonPOJOBuilder import java.lang.IllegalStateException import kotlin.collections.List import kotlin.jvm.JvmName +import com.fasterxml.jackson.databind.`annotation`.JsonDeserialize as FasterxmlJacksonDatabindAnnotationJsonDeserialize +import com.fasterxml.jackson.databind.`annotation`.JsonPOJOBuilder as FasterxmlJacksonDatabindAnnotationJsonPOJOBuilder +import tools.jackson.databind.`annotation`.JsonDeserialize as ToolsJacksonDatabindAnnotationJsonDeserialize +import tools.jackson.databind.`annotation`.JsonPOJOBuilder as ToolsJacksonDatabindAnnotationJsonPOJOBuilder @JsonTypeInfo(use = JsonTypeInfo.Id.NONE) -@JsonDeserialize(builder = Query.Builder::class) +@FasterxmlJacksonDatabindAnnotationJsonDeserialize(builder = Query.Builder::class) +@ToolsJacksonDatabindAnnotationJsonDeserialize(builder = Query.Builder::class) public class Query( people: () -> List? = peopleDefault, ) { @@ -25,7 +28,8 @@ public class Query( { throw IllegalStateException("Field `people` was not requested") } } - @JsonPOJOBuilder + @FasterxmlJacksonDatabindAnnotationJsonPOJOBuilder + @ToolsJacksonDatabindAnnotationJsonPOJOBuilder @JsonIgnoreProperties("__typename") public class Builder { private var people: () -> List? = peopleDefault diff --git a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithNonNullableComplexType/expected/types/MyType.kt b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithNonNullableComplexType/expected/types/MyType.kt index 75a89bc92..853c2bffc 100644 --- a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithNonNullableComplexType/expected/types/MyType.kt +++ b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithNonNullableComplexType/expected/types/MyType.kt @@ -3,13 +3,16 @@ package com.netflix.graphql.dgs.codegen.cases.dataClassWithNonNullableComplexTyp import com.fasterxml.jackson.`annotation`.JsonIgnoreProperties import com.fasterxml.jackson.`annotation`.JsonProperty import com.fasterxml.jackson.`annotation`.JsonTypeInfo -import com.fasterxml.jackson.databind.`annotation`.JsonDeserialize -import com.fasterxml.jackson.databind.`annotation`.JsonPOJOBuilder import java.lang.IllegalStateException import kotlin.jvm.JvmName +import com.fasterxml.jackson.databind.`annotation`.JsonDeserialize as FasterxmlJacksonDatabindAnnotationJsonDeserialize +import com.fasterxml.jackson.databind.`annotation`.JsonPOJOBuilder as FasterxmlJacksonDatabindAnnotationJsonPOJOBuilder +import tools.jackson.databind.`annotation`.JsonDeserialize as ToolsJacksonDatabindAnnotationJsonDeserialize +import tools.jackson.databind.`annotation`.JsonPOJOBuilder as ToolsJacksonDatabindAnnotationJsonPOJOBuilder @JsonTypeInfo(use = JsonTypeInfo.Id.NONE) -@JsonDeserialize(builder = MyType.Builder::class) +@FasterxmlJacksonDatabindAnnotationJsonDeserialize(builder = MyType.Builder::class) +@ToolsJacksonDatabindAnnotationJsonDeserialize(builder = MyType.Builder::class) public class MyType( other: () -> OtherType = otherDefault, ) { @@ -24,7 +27,8 @@ public class MyType( { throw IllegalStateException("Field `other` was not requested") } } - @JsonPOJOBuilder + @FasterxmlJacksonDatabindAnnotationJsonPOJOBuilder + @ToolsJacksonDatabindAnnotationJsonPOJOBuilder @JsonIgnoreProperties("__typename") public class Builder { private var other: () -> OtherType = otherDefault diff --git a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithNonNullableComplexType/expected/types/OtherType.kt b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithNonNullableComplexType/expected/types/OtherType.kt index 48cd62864..c5e0faf0a 100644 --- a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithNonNullableComplexType/expected/types/OtherType.kt +++ b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithNonNullableComplexType/expected/types/OtherType.kt @@ -3,14 +3,17 @@ package com.netflix.graphql.dgs.codegen.cases.dataClassWithNonNullableComplexTyp import com.fasterxml.jackson.`annotation`.JsonIgnoreProperties import com.fasterxml.jackson.`annotation`.JsonProperty import com.fasterxml.jackson.`annotation`.JsonTypeInfo -import com.fasterxml.jackson.databind.`annotation`.JsonDeserialize -import com.fasterxml.jackson.databind.`annotation`.JsonPOJOBuilder import java.lang.IllegalStateException import kotlin.String import kotlin.jvm.JvmName +import com.fasterxml.jackson.databind.`annotation`.JsonDeserialize as FasterxmlJacksonDatabindAnnotationJsonDeserialize +import com.fasterxml.jackson.databind.`annotation`.JsonPOJOBuilder as FasterxmlJacksonDatabindAnnotationJsonPOJOBuilder +import tools.jackson.databind.`annotation`.JsonDeserialize as ToolsJacksonDatabindAnnotationJsonDeserialize +import tools.jackson.databind.`annotation`.JsonPOJOBuilder as ToolsJacksonDatabindAnnotationJsonPOJOBuilder @JsonTypeInfo(use = JsonTypeInfo.Id.NONE) -@JsonDeserialize(builder = OtherType.Builder::class) +@FasterxmlJacksonDatabindAnnotationJsonDeserialize(builder = OtherType.Builder::class) +@ToolsJacksonDatabindAnnotationJsonDeserialize(builder = OtherType.Builder::class) public class OtherType( name: () -> String = nameDefault, ) { @@ -25,7 +28,8 @@ public class OtherType( { throw IllegalStateException("Field `name` was not requested") } } - @JsonPOJOBuilder + @FasterxmlJacksonDatabindAnnotationJsonPOJOBuilder + @ToolsJacksonDatabindAnnotationJsonPOJOBuilder @JsonIgnoreProperties("__typename") public class Builder { private var name: () -> String = nameDefault diff --git a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithNonNullableListOfNullableValues/expected/types/Person.kt b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithNonNullableListOfNullableValues/expected/types/Person.kt index dd3e13995..2f2e9670c 100644 --- a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithNonNullableListOfNullableValues/expected/types/Person.kt +++ b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithNonNullableListOfNullableValues/expected/types/Person.kt @@ -3,15 +3,18 @@ package com.netflix.graphql.dgs.codegen.cases.dataClassWithNonNullableListOfNull import com.fasterxml.jackson.`annotation`.JsonIgnoreProperties import com.fasterxml.jackson.`annotation`.JsonProperty import com.fasterxml.jackson.`annotation`.JsonTypeInfo -import com.fasterxml.jackson.databind.`annotation`.JsonDeserialize -import com.fasterxml.jackson.databind.`annotation`.JsonPOJOBuilder import java.lang.IllegalStateException import kotlin.String import kotlin.collections.List import kotlin.jvm.JvmName +import com.fasterxml.jackson.databind.`annotation`.JsonDeserialize as FasterxmlJacksonDatabindAnnotationJsonDeserialize +import com.fasterxml.jackson.databind.`annotation`.JsonPOJOBuilder as FasterxmlJacksonDatabindAnnotationJsonPOJOBuilder +import tools.jackson.databind.`annotation`.JsonDeserialize as ToolsJacksonDatabindAnnotationJsonDeserialize +import tools.jackson.databind.`annotation`.JsonPOJOBuilder as ToolsJacksonDatabindAnnotationJsonPOJOBuilder @JsonTypeInfo(use = JsonTypeInfo.Id.NONE) -@JsonDeserialize(builder = Person.Builder::class) +@FasterxmlJacksonDatabindAnnotationJsonDeserialize(builder = Person.Builder::class) +@ToolsJacksonDatabindAnnotationJsonDeserialize(builder = Person.Builder::class) public class Person( name: () -> String = nameDefault, email: () -> List = emailDefault, @@ -36,7 +39,8 @@ public class Person( { throw IllegalStateException("Field `email` was not requested") } } - @JsonPOJOBuilder + @FasterxmlJacksonDatabindAnnotationJsonPOJOBuilder + @ToolsJacksonDatabindAnnotationJsonPOJOBuilder @JsonIgnoreProperties("__typename") public class Builder { private var name: () -> String = nameDefault diff --git a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithNonNullableListOfNullableValues/expected/types/Query.kt b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithNonNullableListOfNullableValues/expected/types/Query.kt index 581c0266c..6a59fd490 100644 --- a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithNonNullableListOfNullableValues/expected/types/Query.kt +++ b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithNonNullableListOfNullableValues/expected/types/Query.kt @@ -3,14 +3,17 @@ package com.netflix.graphql.dgs.codegen.cases.dataClassWithNonNullableListOfNull import com.fasterxml.jackson.`annotation`.JsonIgnoreProperties import com.fasterxml.jackson.`annotation`.JsonProperty import com.fasterxml.jackson.`annotation`.JsonTypeInfo -import com.fasterxml.jackson.databind.`annotation`.JsonDeserialize -import com.fasterxml.jackson.databind.`annotation`.JsonPOJOBuilder import java.lang.IllegalStateException import kotlin.collections.List import kotlin.jvm.JvmName +import com.fasterxml.jackson.databind.`annotation`.JsonDeserialize as FasterxmlJacksonDatabindAnnotationJsonDeserialize +import com.fasterxml.jackson.databind.`annotation`.JsonPOJOBuilder as FasterxmlJacksonDatabindAnnotationJsonPOJOBuilder +import tools.jackson.databind.`annotation`.JsonDeserialize as ToolsJacksonDatabindAnnotationJsonDeserialize +import tools.jackson.databind.`annotation`.JsonPOJOBuilder as ToolsJacksonDatabindAnnotationJsonPOJOBuilder @JsonTypeInfo(use = JsonTypeInfo.Id.NONE) -@JsonDeserialize(builder = Query.Builder::class) +@FasterxmlJacksonDatabindAnnotationJsonDeserialize(builder = Query.Builder::class) +@ToolsJacksonDatabindAnnotationJsonDeserialize(builder = Query.Builder::class) public class Query( people: () -> List? = peopleDefault, ) { @@ -25,7 +28,8 @@ public class Query( { throw IllegalStateException("Field `people` was not requested") } } - @JsonPOJOBuilder + @FasterxmlJacksonDatabindAnnotationJsonPOJOBuilder + @ToolsJacksonDatabindAnnotationJsonPOJOBuilder @JsonIgnoreProperties("__typename") public class Builder { private var people: () -> List? = peopleDefault diff --git a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithNonNullablePrimitive/expected/types/MyType.kt b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithNonNullablePrimitive/expected/types/MyType.kt index 908d637a8..18ca395bd 100644 --- a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithNonNullablePrimitive/expected/types/MyType.kt +++ b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithNonNullablePrimitive/expected/types/MyType.kt @@ -3,16 +3,19 @@ package com.netflix.graphql.dgs.codegen.cases.dataClassWithNonNullablePrimitive. import com.fasterxml.jackson.`annotation`.JsonIgnoreProperties import com.fasterxml.jackson.`annotation`.JsonProperty import com.fasterxml.jackson.`annotation`.JsonTypeInfo -import com.fasterxml.jackson.databind.`annotation`.JsonDeserialize -import com.fasterxml.jackson.databind.`annotation`.JsonPOJOBuilder import java.lang.IllegalStateException import kotlin.Boolean import kotlin.Double import kotlin.Int import kotlin.jvm.JvmName +import com.fasterxml.jackson.databind.`annotation`.JsonDeserialize as FasterxmlJacksonDatabindAnnotationJsonDeserialize +import com.fasterxml.jackson.databind.`annotation`.JsonPOJOBuilder as FasterxmlJacksonDatabindAnnotationJsonPOJOBuilder +import tools.jackson.databind.`annotation`.JsonDeserialize as ToolsJacksonDatabindAnnotationJsonDeserialize +import tools.jackson.databind.`annotation`.JsonPOJOBuilder as ToolsJacksonDatabindAnnotationJsonPOJOBuilder @JsonTypeInfo(use = JsonTypeInfo.Id.NONE) -@JsonDeserialize(builder = MyType.Builder::class) +@FasterxmlJacksonDatabindAnnotationJsonDeserialize(builder = MyType.Builder::class) +@ToolsJacksonDatabindAnnotationJsonDeserialize(builder = MyType.Builder::class) public class MyType( count: () -> Int = countDefault, truth: () -> Boolean = truthDefault, @@ -47,7 +50,8 @@ public class MyType( { throw IllegalStateException("Field `floaty` was not requested") } } - @JsonPOJOBuilder + @FasterxmlJacksonDatabindAnnotationJsonPOJOBuilder + @ToolsJacksonDatabindAnnotationJsonPOJOBuilder @JsonIgnoreProperties("__typename") public class Builder { private var count: () -> Int = countDefault diff --git a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithNonNullablePrimitiveInList/expected/types/MyType.kt b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithNonNullablePrimitiveInList/expected/types/MyType.kt index 6c71edd29..eb92b6aa9 100644 --- a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithNonNullablePrimitiveInList/expected/types/MyType.kt +++ b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithNonNullablePrimitiveInList/expected/types/MyType.kt @@ -3,17 +3,20 @@ package com.netflix.graphql.dgs.codegen.cases.dataClassWithNonNullablePrimitiveI import com.fasterxml.jackson.`annotation`.JsonIgnoreProperties import com.fasterxml.jackson.`annotation`.JsonProperty import com.fasterxml.jackson.`annotation`.JsonTypeInfo -import com.fasterxml.jackson.databind.`annotation`.JsonDeserialize -import com.fasterxml.jackson.databind.`annotation`.JsonPOJOBuilder import java.lang.IllegalStateException import kotlin.Boolean import kotlin.Double import kotlin.Int import kotlin.collections.List import kotlin.jvm.JvmName +import com.fasterxml.jackson.databind.`annotation`.JsonDeserialize as FasterxmlJacksonDatabindAnnotationJsonDeserialize +import com.fasterxml.jackson.databind.`annotation`.JsonPOJOBuilder as FasterxmlJacksonDatabindAnnotationJsonPOJOBuilder +import tools.jackson.databind.`annotation`.JsonDeserialize as ToolsJacksonDatabindAnnotationJsonDeserialize +import tools.jackson.databind.`annotation`.JsonPOJOBuilder as ToolsJacksonDatabindAnnotationJsonPOJOBuilder @JsonTypeInfo(use = JsonTypeInfo.Id.NONE) -@JsonDeserialize(builder = MyType.Builder::class) +@FasterxmlJacksonDatabindAnnotationJsonDeserialize(builder = MyType.Builder::class) +@ToolsJacksonDatabindAnnotationJsonDeserialize(builder = MyType.Builder::class) public class MyType( count: () -> List? = countDefault, truth: () -> List? = truthDefault, @@ -48,7 +51,8 @@ public class MyType( { throw IllegalStateException("Field `floaty` was not requested") } } - @JsonPOJOBuilder + @FasterxmlJacksonDatabindAnnotationJsonPOJOBuilder + @ToolsJacksonDatabindAnnotationJsonPOJOBuilder @JsonIgnoreProperties("__typename") public class Builder { private var count: () -> List? = countDefault diff --git a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithNonNullableProperties/expected/types/Person.kt b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithNonNullableProperties/expected/types/Person.kt index faa2bc98f..08d298cc5 100644 --- a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithNonNullableProperties/expected/types/Person.kt +++ b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithNonNullableProperties/expected/types/Person.kt @@ -3,15 +3,18 @@ package com.netflix.graphql.dgs.codegen.cases.dataClassWithNonNullableProperties import com.fasterxml.jackson.`annotation`.JsonIgnoreProperties import com.fasterxml.jackson.`annotation`.JsonProperty import com.fasterxml.jackson.`annotation`.JsonTypeInfo -import com.fasterxml.jackson.databind.`annotation`.JsonDeserialize -import com.fasterxml.jackson.databind.`annotation`.JsonPOJOBuilder import java.lang.IllegalStateException import kotlin.String import kotlin.collections.List import kotlin.jvm.JvmName +import com.fasterxml.jackson.databind.`annotation`.JsonDeserialize as FasterxmlJacksonDatabindAnnotationJsonDeserialize +import com.fasterxml.jackson.databind.`annotation`.JsonPOJOBuilder as FasterxmlJacksonDatabindAnnotationJsonPOJOBuilder +import tools.jackson.databind.`annotation`.JsonDeserialize as ToolsJacksonDatabindAnnotationJsonDeserialize +import tools.jackson.databind.`annotation`.JsonPOJOBuilder as ToolsJacksonDatabindAnnotationJsonPOJOBuilder @JsonTypeInfo(use = JsonTypeInfo.Id.NONE) -@JsonDeserialize(builder = Person.Builder::class) +@FasterxmlJacksonDatabindAnnotationJsonDeserialize(builder = Person.Builder::class) +@ToolsJacksonDatabindAnnotationJsonDeserialize(builder = Person.Builder::class) public class Person( name: () -> String = nameDefault, email: () -> List = emailDefault, @@ -36,7 +39,8 @@ public class Person( { throw IllegalStateException("Field `email` was not requested") } } - @JsonPOJOBuilder + @FasterxmlJacksonDatabindAnnotationJsonPOJOBuilder + @ToolsJacksonDatabindAnnotationJsonPOJOBuilder @JsonIgnoreProperties("__typename") public class Builder { private var name: () -> String = nameDefault diff --git a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithNonNullableProperties/expected/types/Query.kt b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithNonNullableProperties/expected/types/Query.kt index 2d53d046d..44d9ac1eb 100644 --- a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithNonNullableProperties/expected/types/Query.kt +++ b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithNonNullableProperties/expected/types/Query.kt @@ -3,14 +3,17 @@ package com.netflix.graphql.dgs.codegen.cases.dataClassWithNonNullableProperties import com.fasterxml.jackson.`annotation`.JsonIgnoreProperties import com.fasterxml.jackson.`annotation`.JsonProperty import com.fasterxml.jackson.`annotation`.JsonTypeInfo -import com.fasterxml.jackson.databind.`annotation`.JsonDeserialize -import com.fasterxml.jackson.databind.`annotation`.JsonPOJOBuilder import java.lang.IllegalStateException import kotlin.collections.List import kotlin.jvm.JvmName +import com.fasterxml.jackson.databind.`annotation`.JsonDeserialize as FasterxmlJacksonDatabindAnnotationJsonDeserialize +import com.fasterxml.jackson.databind.`annotation`.JsonPOJOBuilder as FasterxmlJacksonDatabindAnnotationJsonPOJOBuilder +import tools.jackson.databind.`annotation`.JsonDeserialize as ToolsJacksonDatabindAnnotationJsonDeserialize +import tools.jackson.databind.`annotation`.JsonPOJOBuilder as ToolsJacksonDatabindAnnotationJsonPOJOBuilder @JsonTypeInfo(use = JsonTypeInfo.Id.NONE) -@JsonDeserialize(builder = Query.Builder::class) +@FasterxmlJacksonDatabindAnnotationJsonDeserialize(builder = Query.Builder::class) +@ToolsJacksonDatabindAnnotationJsonDeserialize(builder = Query.Builder::class) public class Query( people: () -> List? = peopleDefault, ) { @@ -25,7 +28,8 @@ public class Query( { throw IllegalStateException("Field `people` was not requested") } } - @JsonPOJOBuilder + @FasterxmlJacksonDatabindAnnotationJsonPOJOBuilder + @ToolsJacksonDatabindAnnotationJsonPOJOBuilder @JsonIgnoreProperties("__typename") public class Builder { private var people: () -> List? = peopleDefault diff --git a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithNullablePrimitive/expected/types/MyType.kt b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithNullablePrimitive/expected/types/MyType.kt index b54bca148..4bb236131 100644 --- a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithNullablePrimitive/expected/types/MyType.kt +++ b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithNullablePrimitive/expected/types/MyType.kt @@ -3,16 +3,19 @@ package com.netflix.graphql.dgs.codegen.cases.dataClassWithNullablePrimitive.exp import com.fasterxml.jackson.`annotation`.JsonIgnoreProperties import com.fasterxml.jackson.`annotation`.JsonProperty import com.fasterxml.jackson.`annotation`.JsonTypeInfo -import com.fasterxml.jackson.databind.`annotation`.JsonDeserialize -import com.fasterxml.jackson.databind.`annotation`.JsonPOJOBuilder import java.lang.IllegalStateException import kotlin.Boolean import kotlin.Double import kotlin.Int import kotlin.jvm.JvmName +import com.fasterxml.jackson.databind.`annotation`.JsonDeserialize as FasterxmlJacksonDatabindAnnotationJsonDeserialize +import com.fasterxml.jackson.databind.`annotation`.JsonPOJOBuilder as FasterxmlJacksonDatabindAnnotationJsonPOJOBuilder +import tools.jackson.databind.`annotation`.JsonDeserialize as ToolsJacksonDatabindAnnotationJsonDeserialize +import tools.jackson.databind.`annotation`.JsonPOJOBuilder as ToolsJacksonDatabindAnnotationJsonPOJOBuilder @JsonTypeInfo(use = JsonTypeInfo.Id.NONE) -@JsonDeserialize(builder = MyType.Builder::class) +@FasterxmlJacksonDatabindAnnotationJsonDeserialize(builder = MyType.Builder::class) +@ToolsJacksonDatabindAnnotationJsonDeserialize(builder = MyType.Builder::class) public class MyType( count: () -> Int? = countDefault, truth: () -> Boolean? = truthDefault, @@ -47,7 +50,8 @@ public class MyType( { throw IllegalStateException("Field `floaty` was not requested") } } - @JsonPOJOBuilder + @FasterxmlJacksonDatabindAnnotationJsonPOJOBuilder + @ToolsJacksonDatabindAnnotationJsonPOJOBuilder @JsonIgnoreProperties("__typename") public class Builder { private var count: () -> Int? = countDefault diff --git a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithRecursiveField/expected/types/Person.kt b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithRecursiveField/expected/types/Person.kt index d82d73359..7f275aa57 100644 --- a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithRecursiveField/expected/types/Person.kt +++ b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithRecursiveField/expected/types/Person.kt @@ -3,15 +3,18 @@ package com.netflix.graphql.dgs.codegen.cases.dataClassWithRecursiveField.expect import com.fasterxml.jackson.`annotation`.JsonIgnoreProperties import com.fasterxml.jackson.`annotation`.JsonProperty import com.fasterxml.jackson.`annotation`.JsonTypeInfo -import com.fasterxml.jackson.databind.`annotation`.JsonDeserialize -import com.fasterxml.jackson.databind.`annotation`.JsonPOJOBuilder import java.lang.IllegalStateException import kotlin.String import kotlin.collections.List import kotlin.jvm.JvmName +import com.fasterxml.jackson.databind.`annotation`.JsonDeserialize as FasterxmlJacksonDatabindAnnotationJsonDeserialize +import com.fasterxml.jackson.databind.`annotation`.JsonPOJOBuilder as FasterxmlJacksonDatabindAnnotationJsonPOJOBuilder +import tools.jackson.databind.`annotation`.JsonDeserialize as ToolsJacksonDatabindAnnotationJsonDeserialize +import tools.jackson.databind.`annotation`.JsonPOJOBuilder as ToolsJacksonDatabindAnnotationJsonPOJOBuilder @JsonTypeInfo(use = JsonTypeInfo.Id.NONE) -@JsonDeserialize(builder = Person.Builder::class) +@FasterxmlJacksonDatabindAnnotationJsonDeserialize(builder = Person.Builder::class) +@ToolsJacksonDatabindAnnotationJsonDeserialize(builder = Person.Builder::class) public class Person( firstname: () -> String? = firstnameDefault, lastname: () -> String? = lastnameDefault, @@ -46,7 +49,8 @@ public class Person( { throw IllegalStateException("Field `friends` was not requested") } } - @JsonPOJOBuilder + @FasterxmlJacksonDatabindAnnotationJsonPOJOBuilder + @ToolsJacksonDatabindAnnotationJsonPOJOBuilder @JsonIgnoreProperties("__typename") public class Builder { private var firstname: () -> String? = firstnameDefault diff --git a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithRecursiveField/expected/types/Query.kt b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithRecursiveField/expected/types/Query.kt index 8e483b636..f3432a5a6 100644 --- a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithRecursiveField/expected/types/Query.kt +++ b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithRecursiveField/expected/types/Query.kt @@ -3,14 +3,17 @@ package com.netflix.graphql.dgs.codegen.cases.dataClassWithRecursiveField.expect import com.fasterxml.jackson.`annotation`.JsonIgnoreProperties import com.fasterxml.jackson.`annotation`.JsonProperty import com.fasterxml.jackson.`annotation`.JsonTypeInfo -import com.fasterxml.jackson.databind.`annotation`.JsonDeserialize -import com.fasterxml.jackson.databind.`annotation`.JsonPOJOBuilder import java.lang.IllegalStateException import kotlin.collections.List import kotlin.jvm.JvmName +import com.fasterxml.jackson.databind.`annotation`.JsonDeserialize as FasterxmlJacksonDatabindAnnotationJsonDeserialize +import com.fasterxml.jackson.databind.`annotation`.JsonPOJOBuilder as FasterxmlJacksonDatabindAnnotationJsonPOJOBuilder +import tools.jackson.databind.`annotation`.JsonDeserialize as ToolsJacksonDatabindAnnotationJsonDeserialize +import tools.jackson.databind.`annotation`.JsonPOJOBuilder as ToolsJacksonDatabindAnnotationJsonPOJOBuilder @JsonTypeInfo(use = JsonTypeInfo.Id.NONE) -@JsonDeserialize(builder = Query.Builder::class) +@FasterxmlJacksonDatabindAnnotationJsonDeserialize(builder = Query.Builder::class) +@ToolsJacksonDatabindAnnotationJsonDeserialize(builder = Query.Builder::class) public class Query( people: () -> List? = peopleDefault, ) { @@ -25,7 +28,8 @@ public class Query( { throw IllegalStateException("Field `people` was not requested") } } - @JsonPOJOBuilder + @FasterxmlJacksonDatabindAnnotationJsonPOJOBuilder + @ToolsJacksonDatabindAnnotationJsonPOJOBuilder @JsonIgnoreProperties("__typename") public class Builder { private var people: () -> List? = peopleDefault diff --git a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithReservedWord/expected/types/Person.kt b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithReservedWord/expected/types/Person.kt index 18cf8ba60..feff2888c 100644 --- a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithReservedWord/expected/types/Person.kt +++ b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithReservedWord/expected/types/Person.kt @@ -3,14 +3,17 @@ package com.netflix.graphql.dgs.codegen.cases.dataClassWithReservedWord.expected import com.fasterxml.jackson.`annotation`.JsonIgnoreProperties import com.fasterxml.jackson.`annotation`.JsonProperty import com.fasterxml.jackson.`annotation`.JsonTypeInfo -import com.fasterxml.jackson.databind.`annotation`.JsonDeserialize -import com.fasterxml.jackson.databind.`annotation`.JsonPOJOBuilder import java.lang.IllegalStateException import kotlin.String import kotlin.jvm.JvmName +import com.fasterxml.jackson.databind.`annotation`.JsonDeserialize as FasterxmlJacksonDatabindAnnotationJsonDeserialize +import com.fasterxml.jackson.databind.`annotation`.JsonPOJOBuilder as FasterxmlJacksonDatabindAnnotationJsonPOJOBuilder +import tools.jackson.databind.`annotation`.JsonDeserialize as ToolsJacksonDatabindAnnotationJsonDeserialize +import tools.jackson.databind.`annotation`.JsonPOJOBuilder as ToolsJacksonDatabindAnnotationJsonPOJOBuilder @JsonTypeInfo(use = JsonTypeInfo.Id.NONE) -@JsonDeserialize(builder = Person.Builder::class) +@FasterxmlJacksonDatabindAnnotationJsonDeserialize(builder = Person.Builder::class) +@ToolsJacksonDatabindAnnotationJsonDeserialize(builder = Person.Builder::class) public class Person( info: () -> String? = infoDefault, `interface`: () -> String? = interfaceDefault, @@ -35,7 +38,8 @@ public class Person( { throw IllegalStateException("Field `interface` was not requested") } } - @JsonPOJOBuilder + @FasterxmlJacksonDatabindAnnotationJsonPOJOBuilder + @ToolsJacksonDatabindAnnotationJsonPOJOBuilder @JsonIgnoreProperties("__typename") public class Builder { private var info: () -> String? = infoDefault diff --git a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithReservedWord/expected/types/Query.kt b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithReservedWord/expected/types/Query.kt index 8f9385423..40aac5cab 100644 --- a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithReservedWord/expected/types/Query.kt +++ b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithReservedWord/expected/types/Query.kt @@ -3,14 +3,17 @@ package com.netflix.graphql.dgs.codegen.cases.dataClassWithReservedWord.expected import com.fasterxml.jackson.`annotation`.JsonIgnoreProperties import com.fasterxml.jackson.`annotation`.JsonProperty import com.fasterxml.jackson.`annotation`.JsonTypeInfo -import com.fasterxml.jackson.databind.`annotation`.JsonDeserialize -import com.fasterxml.jackson.databind.`annotation`.JsonPOJOBuilder import java.lang.IllegalStateException import kotlin.collections.List import kotlin.jvm.JvmName +import com.fasterxml.jackson.databind.`annotation`.JsonDeserialize as FasterxmlJacksonDatabindAnnotationJsonDeserialize +import com.fasterxml.jackson.databind.`annotation`.JsonPOJOBuilder as FasterxmlJacksonDatabindAnnotationJsonPOJOBuilder +import tools.jackson.databind.`annotation`.JsonDeserialize as ToolsJacksonDatabindAnnotationJsonDeserialize +import tools.jackson.databind.`annotation`.JsonPOJOBuilder as ToolsJacksonDatabindAnnotationJsonPOJOBuilder @JsonTypeInfo(use = JsonTypeInfo.Id.NONE) -@JsonDeserialize(builder = Query.Builder::class) +@FasterxmlJacksonDatabindAnnotationJsonDeserialize(builder = Query.Builder::class) +@ToolsJacksonDatabindAnnotationJsonDeserialize(builder = Query.Builder::class) public class Query( people: () -> List? = peopleDefault, ) { @@ -25,7 +28,8 @@ public class Query( { throw IllegalStateException("Field `people` was not requested") } } - @JsonPOJOBuilder + @FasterxmlJacksonDatabindAnnotationJsonPOJOBuilder + @ToolsJacksonDatabindAnnotationJsonPOJOBuilder @JsonIgnoreProperties("__typename") public class Builder { private var people: () -> List? = peopleDefault diff --git a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithReservedWord/expected/types/SampleType.kt b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithReservedWord/expected/types/SampleType.kt index 9fd155355..4f59e4d06 100644 --- a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithReservedWord/expected/types/SampleType.kt +++ b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithReservedWord/expected/types/SampleType.kt @@ -3,14 +3,17 @@ package com.netflix.graphql.dgs.codegen.cases.dataClassWithReservedWord.expected import com.fasterxml.jackson.`annotation`.JsonIgnoreProperties import com.fasterxml.jackson.`annotation`.JsonProperty import com.fasterxml.jackson.`annotation`.JsonTypeInfo -import com.fasterxml.jackson.databind.`annotation`.JsonDeserialize -import com.fasterxml.jackson.databind.`annotation`.JsonPOJOBuilder import java.lang.IllegalStateException import kotlin.String import kotlin.jvm.JvmName +import com.fasterxml.jackson.databind.`annotation`.JsonDeserialize as FasterxmlJacksonDatabindAnnotationJsonDeserialize +import com.fasterxml.jackson.databind.`annotation`.JsonPOJOBuilder as FasterxmlJacksonDatabindAnnotationJsonPOJOBuilder +import tools.jackson.databind.`annotation`.JsonDeserialize as ToolsJacksonDatabindAnnotationJsonDeserialize +import tools.jackson.databind.`annotation`.JsonPOJOBuilder as ToolsJacksonDatabindAnnotationJsonPOJOBuilder @JsonTypeInfo(use = JsonTypeInfo.Id.NONE) -@JsonDeserialize(builder = SampleType.Builder::class) +@FasterxmlJacksonDatabindAnnotationJsonDeserialize(builder = SampleType.Builder::class) +@ToolsJacksonDatabindAnnotationJsonDeserialize(builder = SampleType.Builder::class) public class SampleType( `return`: () -> String = returnDefault, ) { @@ -25,7 +28,8 @@ public class SampleType( { throw IllegalStateException("Field `return` was not requested") } } - @JsonPOJOBuilder + @FasterxmlJacksonDatabindAnnotationJsonPOJOBuilder + @ToolsJacksonDatabindAnnotationJsonPOJOBuilder @JsonIgnoreProperties("__typename") public class Builder { private var `return`: () -> String = returnDefault diff --git a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithStringProperties/expected/types/Person.kt b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithStringProperties/expected/types/Person.kt index 9a4adc154..36dbf6805 100644 --- a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithStringProperties/expected/types/Person.kt +++ b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithStringProperties/expected/types/Person.kt @@ -3,14 +3,17 @@ package com.netflix.graphql.dgs.codegen.cases.dataClassWithStringProperties.expe import com.fasterxml.jackson.`annotation`.JsonIgnoreProperties import com.fasterxml.jackson.`annotation`.JsonProperty import com.fasterxml.jackson.`annotation`.JsonTypeInfo -import com.fasterxml.jackson.databind.`annotation`.JsonDeserialize -import com.fasterxml.jackson.databind.`annotation`.JsonPOJOBuilder import java.lang.IllegalStateException import kotlin.String import kotlin.jvm.JvmName +import com.fasterxml.jackson.databind.`annotation`.JsonDeserialize as FasterxmlJacksonDatabindAnnotationJsonDeserialize +import com.fasterxml.jackson.databind.`annotation`.JsonPOJOBuilder as FasterxmlJacksonDatabindAnnotationJsonPOJOBuilder +import tools.jackson.databind.`annotation`.JsonDeserialize as ToolsJacksonDatabindAnnotationJsonDeserialize +import tools.jackson.databind.`annotation`.JsonPOJOBuilder as ToolsJacksonDatabindAnnotationJsonPOJOBuilder @JsonTypeInfo(use = JsonTypeInfo.Id.NONE) -@JsonDeserialize(builder = Person.Builder::class) +@FasterxmlJacksonDatabindAnnotationJsonDeserialize(builder = Person.Builder::class) +@ToolsJacksonDatabindAnnotationJsonDeserialize(builder = Person.Builder::class) public class Person( firstname: () -> String? = firstnameDefault, lastname: () -> String? = lastnameDefault, @@ -35,7 +38,8 @@ public class Person( { throw IllegalStateException("Field `lastname` was not requested") } } - @JsonPOJOBuilder + @FasterxmlJacksonDatabindAnnotationJsonPOJOBuilder + @ToolsJacksonDatabindAnnotationJsonPOJOBuilder @JsonIgnoreProperties("__typename") public class Builder { private var firstname: () -> String? = firstnameDefault diff --git a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithStringProperties/expected/types/Query.kt b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithStringProperties/expected/types/Query.kt index e83a398c7..be15ff6a0 100644 --- a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithStringProperties/expected/types/Query.kt +++ b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithStringProperties/expected/types/Query.kt @@ -3,14 +3,17 @@ package com.netflix.graphql.dgs.codegen.cases.dataClassWithStringProperties.expe import com.fasterxml.jackson.`annotation`.JsonIgnoreProperties import com.fasterxml.jackson.`annotation`.JsonProperty import com.fasterxml.jackson.`annotation`.JsonTypeInfo -import com.fasterxml.jackson.databind.`annotation`.JsonDeserialize -import com.fasterxml.jackson.databind.`annotation`.JsonPOJOBuilder import java.lang.IllegalStateException import kotlin.collections.List import kotlin.jvm.JvmName +import com.fasterxml.jackson.databind.`annotation`.JsonDeserialize as FasterxmlJacksonDatabindAnnotationJsonDeserialize +import com.fasterxml.jackson.databind.`annotation`.JsonPOJOBuilder as FasterxmlJacksonDatabindAnnotationJsonPOJOBuilder +import tools.jackson.databind.`annotation`.JsonDeserialize as ToolsJacksonDatabindAnnotationJsonDeserialize +import tools.jackson.databind.`annotation`.JsonPOJOBuilder as ToolsJacksonDatabindAnnotationJsonPOJOBuilder @JsonTypeInfo(use = JsonTypeInfo.Id.NONE) -@JsonDeserialize(builder = Query.Builder::class) +@FasterxmlJacksonDatabindAnnotationJsonDeserialize(builder = Query.Builder::class) +@ToolsJacksonDatabindAnnotationJsonDeserialize(builder = Query.Builder::class) public class Query( people: () -> List? = peopleDefault, ) { @@ -25,7 +28,8 @@ public class Query( { throw IllegalStateException("Field `people` was not requested") } } - @JsonPOJOBuilder + @FasterxmlJacksonDatabindAnnotationJsonPOJOBuilder + @ToolsJacksonDatabindAnnotationJsonPOJOBuilder @JsonIgnoreProperties("__typename") public class Builder { private var people: () -> List? = peopleDefault diff --git a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/enum/expected/types/Query.kt b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/enum/expected/types/Query.kt index 52988050b..75925daeb 100644 --- a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/enum/expected/types/Query.kt +++ b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/enum/expected/types/Query.kt @@ -3,14 +3,17 @@ package com.netflix.graphql.dgs.codegen.cases.`enum`.expected.types import com.fasterxml.jackson.`annotation`.JsonIgnoreProperties import com.fasterxml.jackson.`annotation`.JsonProperty import com.fasterxml.jackson.`annotation`.JsonTypeInfo -import com.fasterxml.jackson.databind.`annotation`.JsonDeserialize -import com.fasterxml.jackson.databind.`annotation`.JsonPOJOBuilder import java.lang.IllegalStateException import kotlin.collections.List import kotlin.jvm.JvmName +import com.fasterxml.jackson.databind.`annotation`.JsonDeserialize as FasterxmlJacksonDatabindAnnotationJsonDeserialize +import com.fasterxml.jackson.databind.`annotation`.JsonPOJOBuilder as FasterxmlJacksonDatabindAnnotationJsonPOJOBuilder +import tools.jackson.databind.`annotation`.JsonDeserialize as ToolsJacksonDatabindAnnotationJsonDeserialize +import tools.jackson.databind.`annotation`.JsonPOJOBuilder as ToolsJacksonDatabindAnnotationJsonPOJOBuilder @JsonTypeInfo(use = JsonTypeInfo.Id.NONE) -@JsonDeserialize(builder = Query.Builder::class) +@FasterxmlJacksonDatabindAnnotationJsonDeserialize(builder = Query.Builder::class) +@ToolsJacksonDatabindAnnotationJsonDeserialize(builder = Query.Builder::class) public class Query( types: () -> List? = typesDefault, ) { @@ -25,7 +28,8 @@ public class Query( { throw IllegalStateException("Field `types` was not requested") } } - @JsonPOJOBuilder + @FasterxmlJacksonDatabindAnnotationJsonPOJOBuilder + @ToolsJacksonDatabindAnnotationJsonPOJOBuilder @JsonIgnoreProperties("__typename") public class Builder { private var types: () -> List? = typesDefault diff --git a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/enumWithExtendedType/expected/types/Query.kt b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/enumWithExtendedType/expected/types/Query.kt index 645cfda99..22b7bd799 100644 --- a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/enumWithExtendedType/expected/types/Query.kt +++ b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/enumWithExtendedType/expected/types/Query.kt @@ -3,14 +3,17 @@ package com.netflix.graphql.dgs.codegen.cases.enumWithExtendedType.expected.type import com.fasterxml.jackson.`annotation`.JsonIgnoreProperties import com.fasterxml.jackson.`annotation`.JsonProperty import com.fasterxml.jackson.`annotation`.JsonTypeInfo -import com.fasterxml.jackson.databind.`annotation`.JsonDeserialize -import com.fasterxml.jackson.databind.`annotation`.JsonPOJOBuilder import java.lang.IllegalStateException import kotlin.collections.List import kotlin.jvm.JvmName +import com.fasterxml.jackson.databind.`annotation`.JsonDeserialize as FasterxmlJacksonDatabindAnnotationJsonDeserialize +import com.fasterxml.jackson.databind.`annotation`.JsonPOJOBuilder as FasterxmlJacksonDatabindAnnotationJsonPOJOBuilder +import tools.jackson.databind.`annotation`.JsonDeserialize as ToolsJacksonDatabindAnnotationJsonDeserialize +import tools.jackson.databind.`annotation`.JsonPOJOBuilder as ToolsJacksonDatabindAnnotationJsonPOJOBuilder @JsonTypeInfo(use = JsonTypeInfo.Id.NONE) -@JsonDeserialize(builder = Query.Builder::class) +@FasterxmlJacksonDatabindAnnotationJsonDeserialize(builder = Query.Builder::class) +@ToolsJacksonDatabindAnnotationJsonDeserialize(builder = Query.Builder::class) public class Query( types: () -> List? = typesDefault, ) { @@ -25,7 +28,8 @@ public class Query( { throw IllegalStateException("Field `types` was not requested") } } - @JsonPOJOBuilder + @FasterxmlJacksonDatabindAnnotationJsonPOJOBuilder + @ToolsJacksonDatabindAnnotationJsonPOJOBuilder @JsonIgnoreProperties("__typename") public class Builder { private var types: () -> List? = typesDefault diff --git a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/extendedDataClassWithInterface/expected/types/Example.kt b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/extendedDataClassWithInterface/expected/types/Example.kt index 4965ca5ee..0dd6fb2dd 100644 --- a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/extendedDataClassWithInterface/expected/types/Example.kt +++ b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/extendedDataClassWithInterface/expected/types/Example.kt @@ -3,16 +3,19 @@ package com.netflix.graphql.dgs.codegen.cases.extendedDataClassWithInterface.exp import com.fasterxml.jackson.`annotation`.JsonIgnoreProperties import com.fasterxml.jackson.`annotation`.JsonProperty import com.fasterxml.jackson.`annotation`.JsonTypeInfo -import com.fasterxml.jackson.databind.`annotation`.JsonDeserialize -import com.fasterxml.jackson.databind.`annotation`.JsonPOJOBuilder import java.lang.IllegalStateException import kotlin.Int import kotlin.String import kotlin.Suppress import kotlin.jvm.JvmName +import com.fasterxml.jackson.databind.`annotation`.JsonDeserialize as FasterxmlJacksonDatabindAnnotationJsonDeserialize +import com.fasterxml.jackson.databind.`annotation`.JsonPOJOBuilder as FasterxmlJacksonDatabindAnnotationJsonPOJOBuilder +import tools.jackson.databind.`annotation`.JsonDeserialize as ToolsJacksonDatabindAnnotationJsonDeserialize +import tools.jackson.databind.`annotation`.JsonPOJOBuilder as ToolsJacksonDatabindAnnotationJsonPOJOBuilder @JsonTypeInfo(use = JsonTypeInfo.Id.NONE) -@JsonDeserialize(builder = Example.Builder::class) +@FasterxmlJacksonDatabindAnnotationJsonDeserialize(builder = Example.Builder::class) +@ToolsJacksonDatabindAnnotationJsonDeserialize(builder = Example.Builder::class) public class Example( name: () -> String? = nameDefault, age: () -> Int? = ageDefault, @@ -40,7 +43,8 @@ public class Example( { throw IllegalStateException("Field `age` was not requested") } } - @JsonPOJOBuilder + @FasterxmlJacksonDatabindAnnotationJsonPOJOBuilder + @ToolsJacksonDatabindAnnotationJsonPOJOBuilder @JsonIgnoreProperties("__typename") public class Builder { private var name: () -> String? = nameDefault diff --git a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/input/expected/types/Query.kt b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/input/expected/types/Query.kt index e3e6d75f1..4209015cc 100644 --- a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/input/expected/types/Query.kt +++ b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/input/expected/types/Query.kt @@ -3,15 +3,18 @@ package com.netflix.graphql.dgs.codegen.cases.input.expected.types import com.fasterxml.jackson.`annotation`.JsonIgnoreProperties import com.fasterxml.jackson.`annotation`.JsonProperty import com.fasterxml.jackson.`annotation`.JsonTypeInfo -import com.fasterxml.jackson.databind.`annotation`.JsonDeserialize -import com.fasterxml.jackson.databind.`annotation`.JsonPOJOBuilder import java.lang.IllegalStateException import kotlin.String import kotlin.collections.List import kotlin.jvm.JvmName +import com.fasterxml.jackson.databind.`annotation`.JsonDeserialize as FasterxmlJacksonDatabindAnnotationJsonDeserialize +import com.fasterxml.jackson.databind.`annotation`.JsonPOJOBuilder as FasterxmlJacksonDatabindAnnotationJsonPOJOBuilder +import tools.jackson.databind.`annotation`.JsonDeserialize as ToolsJacksonDatabindAnnotationJsonDeserialize +import tools.jackson.databind.`annotation`.JsonPOJOBuilder as ToolsJacksonDatabindAnnotationJsonPOJOBuilder @JsonTypeInfo(use = JsonTypeInfo.Id.NONE) -@JsonDeserialize(builder = Query.Builder::class) +@FasterxmlJacksonDatabindAnnotationJsonDeserialize(builder = Query.Builder::class) +@ToolsJacksonDatabindAnnotationJsonDeserialize(builder = Query.Builder::class) public class Query( movies: () -> List? = moviesDefault, ) { @@ -26,7 +29,8 @@ public class Query( { throw IllegalStateException("Field `movies` was not requested") } } - @JsonPOJOBuilder + @FasterxmlJacksonDatabindAnnotationJsonPOJOBuilder + @ToolsJacksonDatabindAnnotationJsonPOJOBuilder @JsonIgnoreProperties("__typename") public class Builder { private var movies: () -> List? = moviesDefault diff --git a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/inputWithDefaultBigDecimal/expected/types/Query.kt b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/inputWithDefaultBigDecimal/expected/types/Query.kt index 93c13ba14..a8b15f43a 100644 --- a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/inputWithDefaultBigDecimal/expected/types/Query.kt +++ b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/inputWithDefaultBigDecimal/expected/types/Query.kt @@ -3,14 +3,17 @@ package com.netflix.graphql.dgs.codegen.cases.inputWithDefaultBigDecimal.expecte import com.fasterxml.jackson.`annotation`.JsonIgnoreProperties import com.fasterxml.jackson.`annotation`.JsonProperty import com.fasterxml.jackson.`annotation`.JsonTypeInfo -import com.fasterxml.jackson.databind.`annotation`.JsonDeserialize -import com.fasterxml.jackson.databind.`annotation`.JsonPOJOBuilder import java.lang.IllegalStateException import kotlin.String import kotlin.jvm.JvmName +import com.fasterxml.jackson.databind.`annotation`.JsonDeserialize as FasterxmlJacksonDatabindAnnotationJsonDeserialize +import com.fasterxml.jackson.databind.`annotation`.JsonPOJOBuilder as FasterxmlJacksonDatabindAnnotationJsonPOJOBuilder +import tools.jackson.databind.`annotation`.JsonDeserialize as ToolsJacksonDatabindAnnotationJsonDeserialize +import tools.jackson.databind.`annotation`.JsonPOJOBuilder as ToolsJacksonDatabindAnnotationJsonPOJOBuilder @JsonTypeInfo(use = JsonTypeInfo.Id.NONE) -@JsonDeserialize(builder = Query.Builder::class) +@FasterxmlJacksonDatabindAnnotationJsonDeserialize(builder = Query.Builder::class) +@ToolsJacksonDatabindAnnotationJsonDeserialize(builder = Query.Builder::class) public class Query( orders: () -> String? = ordersDefault, ) { @@ -25,7 +28,8 @@ public class Query( { throw IllegalStateException("Field `orders` was not requested") } } - @JsonPOJOBuilder + @FasterxmlJacksonDatabindAnnotationJsonPOJOBuilder + @ToolsJacksonDatabindAnnotationJsonPOJOBuilder @JsonIgnoreProperties("__typename") public class Builder { private var orders: () -> String? = ordersDefault diff --git a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/inputWithDefaultCurrency/expected/types/Query.kt b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/inputWithDefaultCurrency/expected/types/Query.kt index e8d0167ff..cc35c4858 100644 --- a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/inputWithDefaultCurrency/expected/types/Query.kt +++ b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/inputWithDefaultCurrency/expected/types/Query.kt @@ -3,14 +3,17 @@ package com.netflix.graphql.dgs.codegen.cases.inputWithDefaultCurrency.expected. import com.fasterxml.jackson.`annotation`.JsonIgnoreProperties import com.fasterxml.jackson.`annotation`.JsonProperty import com.fasterxml.jackson.`annotation`.JsonTypeInfo -import com.fasterxml.jackson.databind.`annotation`.JsonDeserialize -import com.fasterxml.jackson.databind.`annotation`.JsonPOJOBuilder import java.lang.IllegalStateException import kotlin.String import kotlin.jvm.JvmName +import com.fasterxml.jackson.databind.`annotation`.JsonDeserialize as FasterxmlJacksonDatabindAnnotationJsonDeserialize +import com.fasterxml.jackson.databind.`annotation`.JsonPOJOBuilder as FasterxmlJacksonDatabindAnnotationJsonPOJOBuilder +import tools.jackson.databind.`annotation`.JsonDeserialize as ToolsJacksonDatabindAnnotationJsonDeserialize +import tools.jackson.databind.`annotation`.JsonPOJOBuilder as ToolsJacksonDatabindAnnotationJsonPOJOBuilder @JsonTypeInfo(use = JsonTypeInfo.Id.NONE) -@JsonDeserialize(builder = Query.Builder::class) +@FasterxmlJacksonDatabindAnnotationJsonDeserialize(builder = Query.Builder::class) +@ToolsJacksonDatabindAnnotationJsonDeserialize(builder = Query.Builder::class) public class Query( orders: () -> String? = ordersDefault, ) { @@ -25,7 +28,8 @@ public class Query( { throw IllegalStateException("Field `orders` was not requested") } } - @JsonPOJOBuilder + @FasterxmlJacksonDatabindAnnotationJsonPOJOBuilder + @ToolsJacksonDatabindAnnotationJsonPOJOBuilder @JsonIgnoreProperties("__typename") public class Builder { private var orders: () -> String? = ordersDefault diff --git a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/inputWithExtendedType/expected/types/Query.kt b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/inputWithExtendedType/expected/types/Query.kt index db2065e88..25f38fe17 100644 --- a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/inputWithExtendedType/expected/types/Query.kt +++ b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/inputWithExtendedType/expected/types/Query.kt @@ -3,15 +3,18 @@ package com.netflix.graphql.dgs.codegen.cases.inputWithExtendedType.expected.typ import com.fasterxml.jackson.`annotation`.JsonIgnoreProperties import com.fasterxml.jackson.`annotation`.JsonProperty import com.fasterxml.jackson.`annotation`.JsonTypeInfo -import com.fasterxml.jackson.databind.`annotation`.JsonDeserialize -import com.fasterxml.jackson.databind.`annotation`.JsonPOJOBuilder import java.lang.IllegalStateException import kotlin.String import kotlin.collections.List import kotlin.jvm.JvmName +import com.fasterxml.jackson.databind.`annotation`.JsonDeserialize as FasterxmlJacksonDatabindAnnotationJsonDeserialize +import com.fasterxml.jackson.databind.`annotation`.JsonPOJOBuilder as FasterxmlJacksonDatabindAnnotationJsonPOJOBuilder +import tools.jackson.databind.`annotation`.JsonDeserialize as ToolsJacksonDatabindAnnotationJsonDeserialize +import tools.jackson.databind.`annotation`.JsonPOJOBuilder as ToolsJacksonDatabindAnnotationJsonPOJOBuilder @JsonTypeInfo(use = JsonTypeInfo.Id.NONE) -@JsonDeserialize(builder = Query.Builder::class) +@FasterxmlJacksonDatabindAnnotationJsonDeserialize(builder = Query.Builder::class) +@ToolsJacksonDatabindAnnotationJsonDeserialize(builder = Query.Builder::class) public class Query( movies: () -> List? = moviesDefault, ) { @@ -26,7 +29,8 @@ public class Query( { throw IllegalStateException("Field `movies` was not requested") } } - @JsonPOJOBuilder + @FasterxmlJacksonDatabindAnnotationJsonPOJOBuilder + @ToolsJacksonDatabindAnnotationJsonPOJOBuilder @JsonIgnoreProperties("__typename") public class Builder { private var movies: () -> List? = moviesDefault diff --git a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/interfaceClassWithInterfaceFields/expected/types/Bird.kt b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/interfaceClassWithInterfaceFields/expected/types/Bird.kt index f81708ed3..453f6149e 100644 --- a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/interfaceClassWithInterfaceFields/expected/types/Bird.kt +++ b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/interfaceClassWithInterfaceFields/expected/types/Bird.kt @@ -3,16 +3,19 @@ package com.netflix.graphql.dgs.codegen.cases.interfaceClassWithInterfaceFields. import com.fasterxml.jackson.`annotation`.JsonIgnoreProperties import com.fasterxml.jackson.`annotation`.JsonProperty import com.fasterxml.jackson.`annotation`.JsonTypeInfo -import com.fasterxml.jackson.databind.`annotation`.JsonDeserialize -import com.fasterxml.jackson.databind.`annotation`.JsonPOJOBuilder import java.lang.IllegalStateException import kotlin.String import kotlin.Suppress import kotlin.collections.List import kotlin.jvm.JvmName +import com.fasterxml.jackson.databind.`annotation`.JsonDeserialize as FasterxmlJacksonDatabindAnnotationJsonDeserialize +import com.fasterxml.jackson.databind.`annotation`.JsonPOJOBuilder as FasterxmlJacksonDatabindAnnotationJsonPOJOBuilder +import tools.jackson.databind.`annotation`.JsonDeserialize as ToolsJacksonDatabindAnnotationJsonDeserialize +import tools.jackson.databind.`annotation`.JsonPOJOBuilder as ToolsJacksonDatabindAnnotationJsonPOJOBuilder @JsonTypeInfo(use = JsonTypeInfo.Id.NONE) -@JsonDeserialize(builder = Bird.Builder::class) +@FasterxmlJacksonDatabindAnnotationJsonDeserialize(builder = Bird.Builder::class) +@ToolsJacksonDatabindAnnotationJsonDeserialize(builder = Bird.Builder::class) public class Bird( id: () -> String = idDefault, name: () -> String? = nameDefault, @@ -83,7 +86,8 @@ public class Bird( { throw IllegalStateException("Field `parents` was not requested") } } - @JsonPOJOBuilder + @FasterxmlJacksonDatabindAnnotationJsonPOJOBuilder + @ToolsJacksonDatabindAnnotationJsonPOJOBuilder @JsonIgnoreProperties("__typename") public class Builder { private var id: () -> String = idDefault diff --git a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/interfaceClassWithInterfaceFields/expected/types/Dog.kt b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/interfaceClassWithInterfaceFields/expected/types/Dog.kt index 65a7e974e..93107ddde 100644 --- a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/interfaceClassWithInterfaceFields/expected/types/Dog.kt +++ b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/interfaceClassWithInterfaceFields/expected/types/Dog.kt @@ -3,16 +3,19 @@ package com.netflix.graphql.dgs.codegen.cases.interfaceClassWithInterfaceFields. import com.fasterxml.jackson.`annotation`.JsonIgnoreProperties import com.fasterxml.jackson.`annotation`.JsonProperty import com.fasterxml.jackson.`annotation`.JsonTypeInfo -import com.fasterxml.jackson.databind.`annotation`.JsonDeserialize -import com.fasterxml.jackson.databind.`annotation`.JsonPOJOBuilder import java.lang.IllegalStateException import kotlin.String import kotlin.Suppress import kotlin.collections.List import kotlin.jvm.JvmName +import com.fasterxml.jackson.databind.`annotation`.JsonDeserialize as FasterxmlJacksonDatabindAnnotationJsonDeserialize +import com.fasterxml.jackson.databind.`annotation`.JsonPOJOBuilder as FasterxmlJacksonDatabindAnnotationJsonPOJOBuilder +import tools.jackson.databind.`annotation`.JsonDeserialize as ToolsJacksonDatabindAnnotationJsonDeserialize +import tools.jackson.databind.`annotation`.JsonPOJOBuilder as ToolsJacksonDatabindAnnotationJsonPOJOBuilder @JsonTypeInfo(use = JsonTypeInfo.Id.NONE) -@JsonDeserialize(builder = Dog.Builder::class) +@FasterxmlJacksonDatabindAnnotationJsonDeserialize(builder = Dog.Builder::class) +@ToolsJacksonDatabindAnnotationJsonDeserialize(builder = Dog.Builder::class) public class Dog( id: () -> String = idDefault, name: () -> String? = nameDefault, @@ -83,7 +86,8 @@ public class Dog( { throw IllegalStateException("Field `parents` was not requested") } } - @JsonPOJOBuilder + @FasterxmlJacksonDatabindAnnotationJsonPOJOBuilder + @ToolsJacksonDatabindAnnotationJsonPOJOBuilder @JsonIgnoreProperties("__typename") public class Builder { private var id: () -> String = idDefault diff --git a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/interfaceClassWithInterfaceFieldsOfDifferentType/expected/types/Dog.kt b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/interfaceClassWithInterfaceFieldsOfDifferentType/expected/types/Dog.kt index 3830f43cb..66de9787f 100644 --- a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/interfaceClassWithInterfaceFieldsOfDifferentType/expected/types/Dog.kt +++ b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/interfaceClassWithInterfaceFieldsOfDifferentType/expected/types/Dog.kt @@ -3,15 +3,18 @@ package com.netflix.graphql.dgs.codegen.cases.interfaceClassWithInterfaceFieldsO import com.fasterxml.jackson.`annotation`.JsonIgnoreProperties import com.fasterxml.jackson.`annotation`.JsonProperty import com.fasterxml.jackson.`annotation`.JsonTypeInfo -import com.fasterxml.jackson.databind.`annotation`.JsonDeserialize -import com.fasterxml.jackson.databind.`annotation`.JsonPOJOBuilder import java.lang.IllegalStateException import kotlin.String import kotlin.Suppress import kotlin.jvm.JvmName +import com.fasterxml.jackson.databind.`annotation`.JsonDeserialize as FasterxmlJacksonDatabindAnnotationJsonDeserialize +import com.fasterxml.jackson.databind.`annotation`.JsonPOJOBuilder as FasterxmlJacksonDatabindAnnotationJsonPOJOBuilder +import tools.jackson.databind.`annotation`.JsonDeserialize as ToolsJacksonDatabindAnnotationJsonDeserialize +import tools.jackson.databind.`annotation`.JsonPOJOBuilder as ToolsJacksonDatabindAnnotationJsonPOJOBuilder @JsonTypeInfo(use = JsonTypeInfo.Id.NONE) -@JsonDeserialize(builder = Dog.Builder::class) +@FasterxmlJacksonDatabindAnnotationJsonDeserialize(builder = Dog.Builder::class) +@ToolsJacksonDatabindAnnotationJsonDeserialize(builder = Dog.Builder::class) public class Dog( name: () -> String? = nameDefault, diet: () -> Vegetarian? = dietDefault, @@ -38,7 +41,8 @@ public class Dog( { throw IllegalStateException("Field `diet` was not requested") } } - @JsonPOJOBuilder + @FasterxmlJacksonDatabindAnnotationJsonPOJOBuilder + @ToolsJacksonDatabindAnnotationJsonPOJOBuilder @JsonIgnoreProperties("__typename") public class Builder { private var name: () -> String? = nameDefault diff --git a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/interfaceClassWithInterfaceFieldsOfDifferentType/expected/types/Vegetarian.kt b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/interfaceClassWithInterfaceFieldsOfDifferentType/expected/types/Vegetarian.kt index 6ca7e0553..04d6dbf47 100644 --- a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/interfaceClassWithInterfaceFieldsOfDifferentType/expected/types/Vegetarian.kt +++ b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/interfaceClassWithInterfaceFieldsOfDifferentType/expected/types/Vegetarian.kt @@ -3,16 +3,19 @@ package com.netflix.graphql.dgs.codegen.cases.interfaceClassWithInterfaceFieldsO import com.fasterxml.jackson.`annotation`.JsonIgnoreProperties import com.fasterxml.jackson.`annotation`.JsonProperty import com.fasterxml.jackson.`annotation`.JsonTypeInfo -import com.fasterxml.jackson.databind.`annotation`.JsonDeserialize -import com.fasterxml.jackson.databind.`annotation`.JsonPOJOBuilder import java.lang.IllegalStateException import kotlin.String import kotlin.Suppress import kotlin.collections.List import kotlin.jvm.JvmName +import com.fasterxml.jackson.databind.`annotation`.JsonDeserialize as FasterxmlJacksonDatabindAnnotationJsonDeserialize +import com.fasterxml.jackson.databind.`annotation`.JsonPOJOBuilder as FasterxmlJacksonDatabindAnnotationJsonPOJOBuilder +import tools.jackson.databind.`annotation`.JsonDeserialize as ToolsJacksonDatabindAnnotationJsonDeserialize +import tools.jackson.databind.`annotation`.JsonPOJOBuilder as ToolsJacksonDatabindAnnotationJsonPOJOBuilder @JsonTypeInfo(use = JsonTypeInfo.Id.NONE) -@JsonDeserialize(builder = Vegetarian.Builder::class) +@FasterxmlJacksonDatabindAnnotationJsonDeserialize(builder = Vegetarian.Builder::class) +@ToolsJacksonDatabindAnnotationJsonDeserialize(builder = Vegetarian.Builder::class) public class Vegetarian( calories: () -> String? = caloriesDefault, vegetables: () -> List? = vegetablesDefault, @@ -38,7 +41,8 @@ public class Vegetarian( { throw IllegalStateException("Field `vegetables` was not requested") } } - @JsonPOJOBuilder + @FasterxmlJacksonDatabindAnnotationJsonPOJOBuilder + @ToolsJacksonDatabindAnnotationJsonPOJOBuilder @JsonIgnoreProperties("__typename") public class Builder { private var calories: () -> String? = caloriesDefault diff --git a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/interfaceClassWithNonNullableFields/expected/types/Employee.kt b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/interfaceClassWithNonNullableFields/expected/types/Employee.kt index 1c58168e3..d3796a61d 100644 --- a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/interfaceClassWithNonNullableFields/expected/types/Employee.kt +++ b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/interfaceClassWithNonNullableFields/expected/types/Employee.kt @@ -3,15 +3,18 @@ package com.netflix.graphql.dgs.codegen.cases.interfaceClassWithNonNullableField import com.fasterxml.jackson.`annotation`.JsonIgnoreProperties import com.fasterxml.jackson.`annotation`.JsonProperty import com.fasterxml.jackson.`annotation`.JsonTypeInfo -import com.fasterxml.jackson.databind.`annotation`.JsonDeserialize -import com.fasterxml.jackson.databind.`annotation`.JsonPOJOBuilder import java.lang.IllegalStateException import kotlin.String import kotlin.Suppress import kotlin.jvm.JvmName +import com.fasterxml.jackson.databind.`annotation`.JsonDeserialize as FasterxmlJacksonDatabindAnnotationJsonDeserialize +import com.fasterxml.jackson.databind.`annotation`.JsonPOJOBuilder as FasterxmlJacksonDatabindAnnotationJsonPOJOBuilder +import tools.jackson.databind.`annotation`.JsonDeserialize as ToolsJacksonDatabindAnnotationJsonDeserialize +import tools.jackson.databind.`annotation`.JsonPOJOBuilder as ToolsJacksonDatabindAnnotationJsonPOJOBuilder @JsonTypeInfo(use = JsonTypeInfo.Id.NONE) -@JsonDeserialize(builder = Employee.Builder::class) +@FasterxmlJacksonDatabindAnnotationJsonDeserialize(builder = Employee.Builder::class) +@ToolsJacksonDatabindAnnotationJsonDeserialize(builder = Employee.Builder::class) public class Employee( firstname: () -> String = firstnameDefault, lastname: () -> String? = lastnameDefault, @@ -48,7 +51,8 @@ public class Employee( { throw IllegalStateException("Field `company` was not requested") } } - @JsonPOJOBuilder + @FasterxmlJacksonDatabindAnnotationJsonPOJOBuilder + @ToolsJacksonDatabindAnnotationJsonPOJOBuilder @JsonIgnoreProperties("__typename") public class Builder { private var firstname: () -> String = firstnameDefault diff --git a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/interfaceClassWithNonNullableFields/expected/types/Query.kt b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/interfaceClassWithNonNullableFields/expected/types/Query.kt index c974265c5..9e5ee3ae3 100644 --- a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/interfaceClassWithNonNullableFields/expected/types/Query.kt +++ b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/interfaceClassWithNonNullableFields/expected/types/Query.kt @@ -3,14 +3,17 @@ package com.netflix.graphql.dgs.codegen.cases.interfaceClassWithNonNullableField import com.fasterxml.jackson.`annotation`.JsonIgnoreProperties import com.fasterxml.jackson.`annotation`.JsonProperty import com.fasterxml.jackson.`annotation`.JsonTypeInfo -import com.fasterxml.jackson.databind.`annotation`.JsonDeserialize -import com.fasterxml.jackson.databind.`annotation`.JsonPOJOBuilder import java.lang.IllegalStateException import kotlin.collections.List import kotlin.jvm.JvmName +import com.fasterxml.jackson.databind.`annotation`.JsonDeserialize as FasterxmlJacksonDatabindAnnotationJsonDeserialize +import com.fasterxml.jackson.databind.`annotation`.JsonPOJOBuilder as FasterxmlJacksonDatabindAnnotationJsonPOJOBuilder +import tools.jackson.databind.`annotation`.JsonDeserialize as ToolsJacksonDatabindAnnotationJsonDeserialize +import tools.jackson.databind.`annotation`.JsonPOJOBuilder as ToolsJacksonDatabindAnnotationJsonPOJOBuilder @JsonTypeInfo(use = JsonTypeInfo.Id.NONE) -@JsonDeserialize(builder = Query.Builder::class) +@FasterxmlJacksonDatabindAnnotationJsonDeserialize(builder = Query.Builder::class) +@ToolsJacksonDatabindAnnotationJsonDeserialize(builder = Query.Builder::class) public class Query( people: () -> List? = peopleDefault, ) { @@ -25,7 +28,8 @@ public class Query( { throw IllegalStateException("Field `people` was not requested") } } - @JsonPOJOBuilder + @FasterxmlJacksonDatabindAnnotationJsonPOJOBuilder + @ToolsJacksonDatabindAnnotationJsonPOJOBuilder @JsonIgnoreProperties("__typename") public class Builder { private var people: () -> List? = peopleDefault diff --git a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/interfaceWithInterfaceInheritance/expected/types/Query.kt b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/interfaceWithInterfaceInheritance/expected/types/Query.kt index 0ac2f70ae..4624f9f39 100644 --- a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/interfaceWithInterfaceInheritance/expected/types/Query.kt +++ b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/interfaceWithInterfaceInheritance/expected/types/Query.kt @@ -3,14 +3,17 @@ package com.netflix.graphql.dgs.codegen.cases.interfaceWithInterfaceInheritance. import com.fasterxml.jackson.`annotation`.JsonIgnoreProperties import com.fasterxml.jackson.`annotation`.JsonProperty import com.fasterxml.jackson.`annotation`.JsonTypeInfo -import com.fasterxml.jackson.databind.`annotation`.JsonDeserialize -import com.fasterxml.jackson.databind.`annotation`.JsonPOJOBuilder import java.lang.IllegalStateException import kotlin.collections.List import kotlin.jvm.JvmName +import com.fasterxml.jackson.databind.`annotation`.JsonDeserialize as FasterxmlJacksonDatabindAnnotationJsonDeserialize +import com.fasterxml.jackson.databind.`annotation`.JsonPOJOBuilder as FasterxmlJacksonDatabindAnnotationJsonPOJOBuilder +import tools.jackson.databind.`annotation`.JsonDeserialize as ToolsJacksonDatabindAnnotationJsonDeserialize +import tools.jackson.databind.`annotation`.JsonPOJOBuilder as ToolsJacksonDatabindAnnotationJsonPOJOBuilder @JsonTypeInfo(use = JsonTypeInfo.Id.NONE) -@JsonDeserialize(builder = Query.Builder::class) +@FasterxmlJacksonDatabindAnnotationJsonDeserialize(builder = Query.Builder::class) +@ToolsJacksonDatabindAnnotationJsonDeserialize(builder = Query.Builder::class) public class Query( fruits: () -> List? = fruitsDefault, ) { @@ -25,7 +28,8 @@ public class Query( { throw IllegalStateException("Field `fruits` was not requested") } } - @JsonPOJOBuilder + @FasterxmlJacksonDatabindAnnotationJsonPOJOBuilder + @ToolsJacksonDatabindAnnotationJsonPOJOBuilder @JsonIgnoreProperties("__typename") public class Builder { private var fruits: () -> List? = fruitsDefault diff --git a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/interfaceWithInterfaceInheritance/expected/types/Seed.kt b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/interfaceWithInterfaceInheritance/expected/types/Seed.kt index 59c8904a8..d803689ac 100644 --- a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/interfaceWithInterfaceInheritance/expected/types/Seed.kt +++ b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/interfaceWithInterfaceInheritance/expected/types/Seed.kt @@ -3,14 +3,17 @@ package com.netflix.graphql.dgs.codegen.cases.interfaceWithInterfaceInheritance. import com.fasterxml.jackson.`annotation`.JsonIgnoreProperties import com.fasterxml.jackson.`annotation`.JsonProperty import com.fasterxml.jackson.`annotation`.JsonTypeInfo -import com.fasterxml.jackson.databind.`annotation`.JsonDeserialize -import com.fasterxml.jackson.databind.`annotation`.JsonPOJOBuilder import java.lang.IllegalStateException import kotlin.String import kotlin.jvm.JvmName +import com.fasterxml.jackson.databind.`annotation`.JsonDeserialize as FasterxmlJacksonDatabindAnnotationJsonDeserialize +import com.fasterxml.jackson.databind.`annotation`.JsonPOJOBuilder as FasterxmlJacksonDatabindAnnotationJsonPOJOBuilder +import tools.jackson.databind.`annotation`.JsonDeserialize as ToolsJacksonDatabindAnnotationJsonDeserialize +import tools.jackson.databind.`annotation`.JsonPOJOBuilder as ToolsJacksonDatabindAnnotationJsonPOJOBuilder @JsonTypeInfo(use = JsonTypeInfo.Id.NONE) -@JsonDeserialize(builder = Seed.Builder::class) +@FasterxmlJacksonDatabindAnnotationJsonDeserialize(builder = Seed.Builder::class) +@ToolsJacksonDatabindAnnotationJsonDeserialize(builder = Seed.Builder::class) public class Seed( name: () -> String? = nameDefault, ) { @@ -25,7 +28,8 @@ public class Seed( { throw IllegalStateException("Field `name` was not requested") } } - @JsonPOJOBuilder + @FasterxmlJacksonDatabindAnnotationJsonPOJOBuilder + @ToolsJacksonDatabindAnnotationJsonPOJOBuilder @JsonIgnoreProperties("__typename") public class Builder { private var name: () -> String? = nameDefault diff --git a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/interfaceWithUnderscoreFields/expected/types/Query.kt b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/interfaceWithUnderscoreFields/expected/types/Query.kt index 1782c52d1..07bb5cb2d 100644 --- a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/interfaceWithUnderscoreFields/expected/types/Query.kt +++ b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/interfaceWithUnderscoreFields/expected/types/Query.kt @@ -3,14 +3,17 @@ package com.netflix.graphql.dgs.codegen.cases.interfaceWithUnderscoreFields.expe import com.fasterxml.jackson.`annotation`.JsonIgnoreProperties import com.fasterxml.jackson.`annotation`.JsonProperty import com.fasterxml.jackson.`annotation`.JsonTypeInfo -import com.fasterxml.jackson.databind.`annotation`.JsonDeserialize -import com.fasterxml.jackson.databind.`annotation`.JsonPOJOBuilder import java.lang.IllegalStateException import kotlin.collections.List import kotlin.jvm.JvmName +import com.fasterxml.jackson.databind.`annotation`.JsonDeserialize as FasterxmlJacksonDatabindAnnotationJsonDeserialize +import com.fasterxml.jackson.databind.`annotation`.JsonPOJOBuilder as FasterxmlJacksonDatabindAnnotationJsonPOJOBuilder +import tools.jackson.databind.`annotation`.JsonDeserialize as ToolsJacksonDatabindAnnotationJsonDeserialize +import tools.jackson.databind.`annotation`.JsonPOJOBuilder as ToolsJacksonDatabindAnnotationJsonPOJOBuilder @JsonTypeInfo(use = JsonTypeInfo.Id.NONE) -@JsonDeserialize(builder = Query.Builder::class) +@FasterxmlJacksonDatabindAnnotationJsonDeserialize(builder = Query.Builder::class) +@ToolsJacksonDatabindAnnotationJsonDeserialize(builder = Query.Builder::class) public class Query( `is`: () -> List? = isDefault, ) { @@ -25,7 +28,8 @@ public class Query( { throw IllegalStateException("Field `is` was not requested") } } - @JsonPOJOBuilder + @FasterxmlJacksonDatabindAnnotationJsonPOJOBuilder + @ToolsJacksonDatabindAnnotationJsonPOJOBuilder @JsonIgnoreProperties("__typename") public class Builder { private var `is`: () -> List? = isDefault diff --git a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/interfaceWithUnderscoreFields/expected/types/T.kt b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/interfaceWithUnderscoreFields/expected/types/T.kt index d67a28971..208eaa0a3 100644 --- a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/interfaceWithUnderscoreFields/expected/types/T.kt +++ b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/interfaceWithUnderscoreFields/expected/types/T.kt @@ -3,15 +3,18 @@ package com.netflix.graphql.dgs.codegen.cases.interfaceWithUnderscoreFields.expe import com.fasterxml.jackson.`annotation`.JsonIgnoreProperties import com.fasterxml.jackson.`annotation`.JsonProperty import com.fasterxml.jackson.`annotation`.JsonTypeInfo -import com.fasterxml.jackson.databind.`annotation`.JsonDeserialize -import com.fasterxml.jackson.databind.`annotation`.JsonPOJOBuilder import java.lang.IllegalStateException import kotlin.String import kotlin.Suppress import kotlin.jvm.JvmName +import com.fasterxml.jackson.databind.`annotation`.JsonDeserialize as FasterxmlJacksonDatabindAnnotationJsonDeserialize +import com.fasterxml.jackson.databind.`annotation`.JsonPOJOBuilder as FasterxmlJacksonDatabindAnnotationJsonPOJOBuilder +import tools.jackson.databind.`annotation`.JsonDeserialize as ToolsJacksonDatabindAnnotationJsonDeserialize +import tools.jackson.databind.`annotation`.JsonPOJOBuilder as ToolsJacksonDatabindAnnotationJsonPOJOBuilder @JsonTypeInfo(use = JsonTypeInfo.Id.NONE) -@JsonDeserialize(builder = T.Builder::class) +@FasterxmlJacksonDatabindAnnotationJsonDeserialize(builder = T.Builder::class) +@ToolsJacksonDatabindAnnotationJsonDeserialize(builder = T.Builder::class) public class T( _id: () -> String? = _idDefault, id: () -> String? = idDefault, @@ -37,7 +40,8 @@ public class T( { throw IllegalStateException("Field `id` was not requested") } } - @JsonPOJOBuilder + @FasterxmlJacksonDatabindAnnotationJsonPOJOBuilder + @ToolsJacksonDatabindAnnotationJsonPOJOBuilder @JsonIgnoreProperties("__typename") public class Builder { private var _id: () -> String? = _idDefault diff --git a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/projectionWithEnum/expected/types/Query.kt b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/projectionWithEnum/expected/types/Query.kt index 6379548ec..2ed9ac833 100644 --- a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/projectionWithEnum/expected/types/Query.kt +++ b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/projectionWithEnum/expected/types/Query.kt @@ -3,14 +3,17 @@ package com.netflix.graphql.dgs.codegen.cases.projectionWithEnum.expected.types import com.fasterxml.jackson.`annotation`.JsonIgnoreProperties import com.fasterxml.jackson.`annotation`.JsonProperty import com.fasterxml.jackson.`annotation`.JsonTypeInfo -import com.fasterxml.jackson.databind.`annotation`.JsonDeserialize -import com.fasterxml.jackson.databind.`annotation`.JsonPOJOBuilder import java.lang.IllegalStateException import kotlin.collections.List import kotlin.jvm.JvmName +import com.fasterxml.jackson.databind.`annotation`.JsonDeserialize as FasterxmlJacksonDatabindAnnotationJsonDeserialize +import com.fasterxml.jackson.databind.`annotation`.JsonPOJOBuilder as FasterxmlJacksonDatabindAnnotationJsonPOJOBuilder +import tools.jackson.databind.`annotation`.JsonDeserialize as ToolsJacksonDatabindAnnotationJsonDeserialize +import tools.jackson.databind.`annotation`.JsonPOJOBuilder as ToolsJacksonDatabindAnnotationJsonPOJOBuilder @JsonTypeInfo(use = JsonTypeInfo.Id.NONE) -@JsonDeserialize(builder = Query.Builder::class) +@FasterxmlJacksonDatabindAnnotationJsonDeserialize(builder = Query.Builder::class) +@ToolsJacksonDatabindAnnotationJsonDeserialize(builder = Query.Builder::class) public class Query( e: () -> E? = eDefault, es: () -> List? = esDefault, @@ -35,7 +38,8 @@ public class Query( { throw IllegalStateException("Field `es` was not requested") } } - @JsonPOJOBuilder + @FasterxmlJacksonDatabindAnnotationJsonPOJOBuilder + @ToolsJacksonDatabindAnnotationJsonPOJOBuilder @JsonIgnoreProperties("__typename") public class Builder { private var e: () -> E? = eDefault diff --git a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/projectionWithNestedInputs/expected/types/Query.kt b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/projectionWithNestedInputs/expected/types/Query.kt index 46a01c25b..1a1a2c3fe 100644 --- a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/projectionWithNestedInputs/expected/types/Query.kt +++ b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/projectionWithNestedInputs/expected/types/Query.kt @@ -3,14 +3,17 @@ package com.netflix.graphql.dgs.codegen.cases.projectionWithNestedInputs.expecte import com.fasterxml.jackson.`annotation`.JsonIgnoreProperties import com.fasterxml.jackson.`annotation`.JsonProperty import com.fasterxml.jackson.`annotation`.JsonTypeInfo -import com.fasterxml.jackson.databind.`annotation`.JsonDeserialize -import com.fasterxml.jackson.databind.`annotation`.JsonPOJOBuilder import java.lang.IllegalStateException import kotlin.String import kotlin.jvm.JvmName +import com.fasterxml.jackson.databind.`annotation`.JsonDeserialize as FasterxmlJacksonDatabindAnnotationJsonDeserialize +import com.fasterxml.jackson.databind.`annotation`.JsonPOJOBuilder as FasterxmlJacksonDatabindAnnotationJsonPOJOBuilder +import tools.jackson.databind.`annotation`.JsonDeserialize as ToolsJacksonDatabindAnnotationJsonDeserialize +import tools.jackson.databind.`annotation`.JsonPOJOBuilder as ToolsJacksonDatabindAnnotationJsonPOJOBuilder @JsonTypeInfo(use = JsonTypeInfo.Id.NONE) -@JsonDeserialize(builder = Query.Builder::class) +@FasterxmlJacksonDatabindAnnotationJsonDeserialize(builder = Query.Builder::class) +@ToolsJacksonDatabindAnnotationJsonDeserialize(builder = Query.Builder::class) public class Query( q1: () -> String? = q1Default, q2: () -> String? = q2Default, @@ -35,7 +38,8 @@ public class Query( { throw IllegalStateException("Field `q2` was not requested") } } - @JsonPOJOBuilder + @FasterxmlJacksonDatabindAnnotationJsonPOJOBuilder + @ToolsJacksonDatabindAnnotationJsonPOJOBuilder @JsonIgnoreProperties("__typename") public class Builder { private var q1: () -> String? = q1Default diff --git a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/projectionWithPrimitiveAndArgs/expected/types/Query.kt b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/projectionWithPrimitiveAndArgs/expected/types/Query.kt index 93c4f515c..bc012618f 100644 --- a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/projectionWithPrimitiveAndArgs/expected/types/Query.kt +++ b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/projectionWithPrimitiveAndArgs/expected/types/Query.kt @@ -3,14 +3,17 @@ package com.netflix.graphql.dgs.codegen.cases.projectionWithPrimitiveAndArgs.exp import com.fasterxml.jackson.`annotation`.JsonIgnoreProperties import com.fasterxml.jackson.`annotation`.JsonProperty import com.fasterxml.jackson.`annotation`.JsonTypeInfo -import com.fasterxml.jackson.databind.`annotation`.JsonDeserialize -import com.fasterxml.jackson.databind.`annotation`.JsonPOJOBuilder import java.lang.IllegalStateException import kotlin.String import kotlin.jvm.JvmName +import com.fasterxml.jackson.databind.`annotation`.JsonDeserialize as FasterxmlJacksonDatabindAnnotationJsonDeserialize +import com.fasterxml.jackson.databind.`annotation`.JsonPOJOBuilder as FasterxmlJacksonDatabindAnnotationJsonPOJOBuilder +import tools.jackson.databind.`annotation`.JsonDeserialize as ToolsJacksonDatabindAnnotationJsonDeserialize +import tools.jackson.databind.`annotation`.JsonPOJOBuilder as ToolsJacksonDatabindAnnotationJsonPOJOBuilder @JsonTypeInfo(use = JsonTypeInfo.Id.NONE) -@JsonDeserialize(builder = Query.Builder::class) +@FasterxmlJacksonDatabindAnnotationJsonDeserialize(builder = Query.Builder::class) +@ToolsJacksonDatabindAnnotationJsonDeserialize(builder = Query.Builder::class) public class Query( string: () -> String? = stringDefault, ) { @@ -25,7 +28,8 @@ public class Query( { throw IllegalStateException("Field `string` was not requested") } } - @JsonPOJOBuilder + @FasterxmlJacksonDatabindAnnotationJsonPOJOBuilder + @ToolsJacksonDatabindAnnotationJsonPOJOBuilder @JsonIgnoreProperties("__typename") public class Builder { private var string: () -> String? = stringDefault diff --git a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/projectionWithPrimitives/expected/types/Query.kt b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/projectionWithPrimitives/expected/types/Query.kt index e2baf0e49..5b0f567ae 100644 --- a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/projectionWithPrimitives/expected/types/Query.kt +++ b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/projectionWithPrimitives/expected/types/Query.kt @@ -3,15 +3,18 @@ package com.netflix.graphql.dgs.codegen.cases.projectionWithPrimitives.expected. import com.fasterxml.jackson.`annotation`.JsonIgnoreProperties import com.fasterxml.jackson.`annotation`.JsonProperty import com.fasterxml.jackson.`annotation`.JsonTypeInfo -import com.fasterxml.jackson.databind.`annotation`.JsonDeserialize -import com.fasterxml.jackson.databind.`annotation`.JsonPOJOBuilder import java.lang.IllegalStateException import kotlin.String import kotlin.collections.List import kotlin.jvm.JvmName +import com.fasterxml.jackson.databind.`annotation`.JsonDeserialize as FasterxmlJacksonDatabindAnnotationJsonDeserialize +import com.fasterxml.jackson.databind.`annotation`.JsonPOJOBuilder as FasterxmlJacksonDatabindAnnotationJsonPOJOBuilder +import tools.jackson.databind.`annotation`.JsonDeserialize as ToolsJacksonDatabindAnnotationJsonDeserialize +import tools.jackson.databind.`annotation`.JsonPOJOBuilder as ToolsJacksonDatabindAnnotationJsonPOJOBuilder @JsonTypeInfo(use = JsonTypeInfo.Id.NONE) -@JsonDeserialize(builder = Query.Builder::class) +@FasterxmlJacksonDatabindAnnotationJsonDeserialize(builder = Query.Builder::class) +@ToolsJacksonDatabindAnnotationJsonDeserialize(builder = Query.Builder::class) public class Query( string: () -> String? = stringDefault, strings: () -> List? = stringsDefault, @@ -36,7 +39,8 @@ public class Query( { throw IllegalStateException("Field `strings` was not requested") } } - @JsonPOJOBuilder + @FasterxmlJacksonDatabindAnnotationJsonPOJOBuilder + @ToolsJacksonDatabindAnnotationJsonPOJOBuilder @JsonIgnoreProperties("__typename") public class Builder { private var string: () -> String? = stringDefault diff --git a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/projectionWithType/expected/types/Employee.kt b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/projectionWithType/expected/types/Employee.kt index 3f9b1f0a4..a8e5ebb89 100644 --- a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/projectionWithType/expected/types/Employee.kt +++ b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/projectionWithType/expected/types/Employee.kt @@ -3,15 +3,18 @@ package com.netflix.graphql.dgs.codegen.cases.projectionWithType.expected.types import com.fasterxml.jackson.`annotation`.JsonIgnoreProperties import com.fasterxml.jackson.`annotation`.JsonProperty import com.fasterxml.jackson.`annotation`.JsonTypeInfo -import com.fasterxml.jackson.databind.`annotation`.JsonDeserialize -import com.fasterxml.jackson.databind.`annotation`.JsonPOJOBuilder import java.lang.IllegalStateException import kotlin.String import kotlin.Suppress import kotlin.jvm.JvmName +import com.fasterxml.jackson.databind.`annotation`.JsonDeserialize as FasterxmlJacksonDatabindAnnotationJsonDeserialize +import com.fasterxml.jackson.databind.`annotation`.JsonPOJOBuilder as FasterxmlJacksonDatabindAnnotationJsonPOJOBuilder +import tools.jackson.databind.`annotation`.JsonDeserialize as ToolsJacksonDatabindAnnotationJsonDeserialize +import tools.jackson.databind.`annotation`.JsonPOJOBuilder as ToolsJacksonDatabindAnnotationJsonPOJOBuilder @JsonTypeInfo(use = JsonTypeInfo.Id.NONE) -@JsonDeserialize(builder = Employee.Builder::class) +@FasterxmlJacksonDatabindAnnotationJsonDeserialize(builder = Employee.Builder::class) +@ToolsJacksonDatabindAnnotationJsonDeserialize(builder = Employee.Builder::class) public class Employee( firstname: () -> String? = firstnameDefault, company: () -> String? = companyDefault, @@ -37,7 +40,8 @@ public class Employee( { throw IllegalStateException("Field `company` was not requested") } } - @JsonPOJOBuilder + @FasterxmlJacksonDatabindAnnotationJsonPOJOBuilder + @ToolsJacksonDatabindAnnotationJsonPOJOBuilder @JsonIgnoreProperties("__typename") public class Builder { private var firstname: () -> String? = firstnameDefault diff --git a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/projectionWithType/expected/types/Query.kt b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/projectionWithType/expected/types/Query.kt index 72fd25238..373c0e4d5 100644 --- a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/projectionWithType/expected/types/Query.kt +++ b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/projectionWithType/expected/types/Query.kt @@ -3,14 +3,17 @@ package com.netflix.graphql.dgs.codegen.cases.projectionWithType.expected.types import com.fasterxml.jackson.`annotation`.JsonIgnoreProperties import com.fasterxml.jackson.`annotation`.JsonProperty import com.fasterxml.jackson.`annotation`.JsonTypeInfo -import com.fasterxml.jackson.databind.`annotation`.JsonDeserialize -import com.fasterxml.jackson.databind.`annotation`.JsonPOJOBuilder import java.lang.IllegalStateException import kotlin.collections.List import kotlin.jvm.JvmName +import com.fasterxml.jackson.databind.`annotation`.JsonDeserialize as FasterxmlJacksonDatabindAnnotationJsonDeserialize +import com.fasterxml.jackson.databind.`annotation`.JsonPOJOBuilder as FasterxmlJacksonDatabindAnnotationJsonPOJOBuilder +import tools.jackson.databind.`annotation`.JsonDeserialize as ToolsJacksonDatabindAnnotationJsonDeserialize +import tools.jackson.databind.`annotation`.JsonPOJOBuilder as ToolsJacksonDatabindAnnotationJsonPOJOBuilder @JsonTypeInfo(use = JsonTypeInfo.Id.NONE) -@JsonDeserialize(builder = Query.Builder::class) +@FasterxmlJacksonDatabindAnnotationJsonDeserialize(builder = Query.Builder::class) +@ToolsJacksonDatabindAnnotationJsonDeserialize(builder = Query.Builder::class) public class Query( person: () -> Person? = personDefault, people: () -> List? = peopleDefault, @@ -35,7 +38,8 @@ public class Query( { throw IllegalStateException("Field `people` was not requested") } } - @JsonPOJOBuilder + @FasterxmlJacksonDatabindAnnotationJsonPOJOBuilder + @ToolsJacksonDatabindAnnotationJsonPOJOBuilder @JsonIgnoreProperties("__typename") public class Builder { private var person: () -> Person? = personDefault diff --git a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/projectionWithTypeAndArgs/expected/types/Employee.kt b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/projectionWithTypeAndArgs/expected/types/Employee.kt index 38ceb1a22..3a556df14 100644 --- a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/projectionWithTypeAndArgs/expected/types/Employee.kt +++ b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/projectionWithTypeAndArgs/expected/types/Employee.kt @@ -3,15 +3,18 @@ package com.netflix.graphql.dgs.codegen.cases.projectionWithTypeAndArgs.expected import com.fasterxml.jackson.`annotation`.JsonIgnoreProperties import com.fasterxml.jackson.`annotation`.JsonProperty import com.fasterxml.jackson.`annotation`.JsonTypeInfo -import com.fasterxml.jackson.databind.`annotation`.JsonDeserialize -import com.fasterxml.jackson.databind.`annotation`.JsonPOJOBuilder import java.lang.IllegalStateException import kotlin.String import kotlin.Suppress import kotlin.jvm.JvmName +import com.fasterxml.jackson.databind.`annotation`.JsonDeserialize as FasterxmlJacksonDatabindAnnotationJsonDeserialize +import com.fasterxml.jackson.databind.`annotation`.JsonPOJOBuilder as FasterxmlJacksonDatabindAnnotationJsonPOJOBuilder +import tools.jackson.databind.`annotation`.JsonDeserialize as ToolsJacksonDatabindAnnotationJsonDeserialize +import tools.jackson.databind.`annotation`.JsonPOJOBuilder as ToolsJacksonDatabindAnnotationJsonPOJOBuilder @JsonTypeInfo(use = JsonTypeInfo.Id.NONE) -@JsonDeserialize(builder = Employee.Builder::class) +@FasterxmlJacksonDatabindAnnotationJsonDeserialize(builder = Employee.Builder::class) +@ToolsJacksonDatabindAnnotationJsonDeserialize(builder = Employee.Builder::class) public class Employee( firstname: () -> String? = firstnameDefault, company: () -> String? = companyDefault, @@ -37,7 +40,8 @@ public class Employee( { throw IllegalStateException("Field `company` was not requested") } } - @JsonPOJOBuilder + @FasterxmlJacksonDatabindAnnotationJsonPOJOBuilder + @ToolsJacksonDatabindAnnotationJsonPOJOBuilder @JsonIgnoreProperties("__typename") public class Builder { private var firstname: () -> String? = firstnameDefault diff --git a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/projectionWithTypeAndArgs/expected/types/Query.kt b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/projectionWithTypeAndArgs/expected/types/Query.kt index c9dc7e836..0e8684f81 100644 --- a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/projectionWithTypeAndArgs/expected/types/Query.kt +++ b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/projectionWithTypeAndArgs/expected/types/Query.kt @@ -3,13 +3,16 @@ package com.netflix.graphql.dgs.codegen.cases.projectionWithTypeAndArgs.expected import com.fasterxml.jackson.`annotation`.JsonIgnoreProperties import com.fasterxml.jackson.`annotation`.JsonProperty import com.fasterxml.jackson.`annotation`.JsonTypeInfo -import com.fasterxml.jackson.databind.`annotation`.JsonDeserialize -import com.fasterxml.jackson.databind.`annotation`.JsonPOJOBuilder import java.lang.IllegalStateException import kotlin.jvm.JvmName +import com.fasterxml.jackson.databind.`annotation`.JsonDeserialize as FasterxmlJacksonDatabindAnnotationJsonDeserialize +import com.fasterxml.jackson.databind.`annotation`.JsonPOJOBuilder as FasterxmlJacksonDatabindAnnotationJsonPOJOBuilder +import tools.jackson.databind.`annotation`.JsonDeserialize as ToolsJacksonDatabindAnnotationJsonDeserialize +import tools.jackson.databind.`annotation`.JsonPOJOBuilder as ToolsJacksonDatabindAnnotationJsonPOJOBuilder @JsonTypeInfo(use = JsonTypeInfo.Id.NONE) -@JsonDeserialize(builder = Query.Builder::class) +@FasterxmlJacksonDatabindAnnotationJsonDeserialize(builder = Query.Builder::class) +@ToolsJacksonDatabindAnnotationJsonDeserialize(builder = Query.Builder::class) public class Query( person: () -> Person? = personDefault, ) { @@ -24,7 +27,8 @@ public class Query( { throw IllegalStateException("Field `person` was not requested") } } - @JsonPOJOBuilder + @FasterxmlJacksonDatabindAnnotationJsonPOJOBuilder + @ToolsJacksonDatabindAnnotationJsonPOJOBuilder @JsonIgnoreProperties("__typename") public class Builder { private var person: () -> Person? = personDefault diff --git a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/projectionWithUnion/expected/types/Employee.kt b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/projectionWithUnion/expected/types/Employee.kt index b5fd669ba..6e9cbe571 100644 --- a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/projectionWithUnion/expected/types/Employee.kt +++ b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/projectionWithUnion/expected/types/Employee.kt @@ -3,15 +3,18 @@ package com.netflix.graphql.dgs.codegen.cases.projectionWithUnion.expected.types import com.fasterxml.jackson.`annotation`.JsonIgnoreProperties import com.fasterxml.jackson.`annotation`.JsonProperty import com.fasterxml.jackson.`annotation`.JsonTypeInfo -import com.fasterxml.jackson.databind.`annotation`.JsonDeserialize -import com.fasterxml.jackson.databind.`annotation`.JsonPOJOBuilder import java.lang.IllegalStateException import kotlin.String import kotlin.Suppress import kotlin.jvm.JvmName +import com.fasterxml.jackson.databind.`annotation`.JsonDeserialize as FasterxmlJacksonDatabindAnnotationJsonDeserialize +import com.fasterxml.jackson.databind.`annotation`.JsonPOJOBuilder as FasterxmlJacksonDatabindAnnotationJsonPOJOBuilder +import tools.jackson.databind.`annotation`.JsonDeserialize as ToolsJacksonDatabindAnnotationJsonDeserialize +import tools.jackson.databind.`annotation`.JsonPOJOBuilder as ToolsJacksonDatabindAnnotationJsonPOJOBuilder @JsonTypeInfo(use = JsonTypeInfo.Id.NONE) -@JsonDeserialize(builder = Employee.Builder::class) +@FasterxmlJacksonDatabindAnnotationJsonDeserialize(builder = Employee.Builder::class) +@ToolsJacksonDatabindAnnotationJsonDeserialize(builder = Employee.Builder::class) public class Employee( firstname: () -> String? = firstnameDefault, company: () -> String? = companyDefault, @@ -38,7 +41,8 @@ public class Employee( { throw IllegalStateException("Field `company` was not requested") } } - @JsonPOJOBuilder + @FasterxmlJacksonDatabindAnnotationJsonPOJOBuilder + @ToolsJacksonDatabindAnnotationJsonPOJOBuilder @JsonIgnoreProperties("__typename") public class Builder { private var firstname: () -> String? = firstnameDefault diff --git a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/projectionWithUnion/expected/types/Query.kt b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/projectionWithUnion/expected/types/Query.kt index fe07e2f18..fd9704b49 100644 --- a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/projectionWithUnion/expected/types/Query.kt +++ b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/projectionWithUnion/expected/types/Query.kt @@ -3,14 +3,17 @@ package com.netflix.graphql.dgs.codegen.cases.projectionWithUnion.expected.types import com.fasterxml.jackson.`annotation`.JsonIgnoreProperties import com.fasterxml.jackson.`annotation`.JsonProperty import com.fasterxml.jackson.`annotation`.JsonTypeInfo -import com.fasterxml.jackson.databind.`annotation`.JsonDeserialize -import com.fasterxml.jackson.databind.`annotation`.JsonPOJOBuilder import java.lang.IllegalStateException import kotlin.collections.List import kotlin.jvm.JvmName +import com.fasterxml.jackson.databind.`annotation`.JsonDeserialize as FasterxmlJacksonDatabindAnnotationJsonDeserialize +import com.fasterxml.jackson.databind.`annotation`.JsonPOJOBuilder as FasterxmlJacksonDatabindAnnotationJsonPOJOBuilder +import tools.jackson.databind.`annotation`.JsonDeserialize as ToolsJacksonDatabindAnnotationJsonDeserialize +import tools.jackson.databind.`annotation`.JsonPOJOBuilder as ToolsJacksonDatabindAnnotationJsonPOJOBuilder @JsonTypeInfo(use = JsonTypeInfo.Id.NONE) -@JsonDeserialize(builder = Query.Builder::class) +@FasterxmlJacksonDatabindAnnotationJsonDeserialize(builder = Query.Builder::class) +@ToolsJacksonDatabindAnnotationJsonDeserialize(builder = Query.Builder::class) public class Query( u: () -> U? = uDefault, us: () -> List? = usDefault, @@ -35,7 +38,8 @@ public class Query( { throw IllegalStateException("Field `us` was not requested") } } - @JsonPOJOBuilder + @FasterxmlJacksonDatabindAnnotationJsonPOJOBuilder + @ToolsJacksonDatabindAnnotationJsonPOJOBuilder @JsonIgnoreProperties("__typename") public class Builder { private var u: () -> U? = uDefault diff --git a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/skipCodegenOnFields/expected/types/Person.kt b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/skipCodegenOnFields/expected/types/Person.kt index 9a51a0907..77766f9ea 100644 --- a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/skipCodegenOnFields/expected/types/Person.kt +++ b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/skipCodegenOnFields/expected/types/Person.kt @@ -3,14 +3,17 @@ package com.netflix.graphql.dgs.codegen.cases.skipCodegenOnFields.expected.types import com.fasterxml.jackson.`annotation`.JsonIgnoreProperties import com.fasterxml.jackson.`annotation`.JsonProperty import com.fasterxml.jackson.`annotation`.JsonTypeInfo -import com.fasterxml.jackson.databind.`annotation`.JsonDeserialize -import com.fasterxml.jackson.databind.`annotation`.JsonPOJOBuilder import java.lang.IllegalStateException import kotlin.String import kotlin.jvm.JvmName +import com.fasterxml.jackson.databind.`annotation`.JsonDeserialize as FasterxmlJacksonDatabindAnnotationJsonDeserialize +import com.fasterxml.jackson.databind.`annotation`.JsonPOJOBuilder as FasterxmlJacksonDatabindAnnotationJsonPOJOBuilder +import tools.jackson.databind.`annotation`.JsonDeserialize as ToolsJacksonDatabindAnnotationJsonDeserialize +import tools.jackson.databind.`annotation`.JsonPOJOBuilder as ToolsJacksonDatabindAnnotationJsonPOJOBuilder @JsonTypeInfo(use = JsonTypeInfo.Id.NONE) -@JsonDeserialize(builder = Person.Builder::class) +@FasterxmlJacksonDatabindAnnotationJsonDeserialize(builder = Person.Builder::class) +@ToolsJacksonDatabindAnnotationJsonDeserialize(builder = Person.Builder::class) public class Person( name: () -> String? = nameDefault, ) { @@ -25,7 +28,8 @@ public class Person( { throw IllegalStateException("Field `name` was not requested") } } - @JsonPOJOBuilder + @FasterxmlJacksonDatabindAnnotationJsonPOJOBuilder + @ToolsJacksonDatabindAnnotationJsonPOJOBuilder @JsonIgnoreProperties("__typename") public class Builder { private var name: () -> String? = nameDefault diff --git a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/skipCodegenOnTypes/expected/types/Person.kt b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/skipCodegenOnTypes/expected/types/Person.kt index 554a9dfc1..16b6e3e17 100644 --- a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/skipCodegenOnTypes/expected/types/Person.kt +++ b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/skipCodegenOnTypes/expected/types/Person.kt @@ -3,14 +3,17 @@ package com.netflix.graphql.dgs.codegen.cases.skipCodegenOnTypes.expected.types import com.fasterxml.jackson.`annotation`.JsonIgnoreProperties import com.fasterxml.jackson.`annotation`.JsonProperty import com.fasterxml.jackson.`annotation`.JsonTypeInfo -import com.fasterxml.jackson.databind.`annotation`.JsonDeserialize -import com.fasterxml.jackson.databind.`annotation`.JsonPOJOBuilder import java.lang.IllegalStateException import kotlin.String import kotlin.jvm.JvmName +import com.fasterxml.jackson.databind.`annotation`.JsonDeserialize as FasterxmlJacksonDatabindAnnotationJsonDeserialize +import com.fasterxml.jackson.databind.`annotation`.JsonPOJOBuilder as FasterxmlJacksonDatabindAnnotationJsonPOJOBuilder +import tools.jackson.databind.`annotation`.JsonDeserialize as ToolsJacksonDatabindAnnotationJsonDeserialize +import tools.jackson.databind.`annotation`.JsonPOJOBuilder as ToolsJacksonDatabindAnnotationJsonPOJOBuilder @JsonTypeInfo(use = JsonTypeInfo.Id.NONE) -@JsonDeserialize(builder = Person.Builder::class) +@FasterxmlJacksonDatabindAnnotationJsonDeserialize(builder = Person.Builder::class) +@ToolsJacksonDatabindAnnotationJsonDeserialize(builder = Person.Builder::class) public class Person( name: () -> String? = nameDefault, ) { @@ -25,7 +28,8 @@ public class Person( { throw IllegalStateException("Field `name` was not requested") } } - @JsonPOJOBuilder + @FasterxmlJacksonDatabindAnnotationJsonPOJOBuilder + @ToolsJacksonDatabindAnnotationJsonPOJOBuilder @JsonIgnoreProperties("__typename") public class Builder { private var name: () -> String? = nameDefault diff --git a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/union/expected/types/Actor.kt b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/union/expected/types/Actor.kt index 1b03eea54..3e4413b40 100644 --- a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/union/expected/types/Actor.kt +++ b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/union/expected/types/Actor.kt @@ -3,14 +3,17 @@ package com.netflix.graphql.dgs.codegen.cases.union.expected.types import com.fasterxml.jackson.`annotation`.JsonIgnoreProperties import com.fasterxml.jackson.`annotation`.JsonProperty import com.fasterxml.jackson.`annotation`.JsonTypeInfo -import com.fasterxml.jackson.databind.`annotation`.JsonDeserialize -import com.fasterxml.jackson.databind.`annotation`.JsonPOJOBuilder import java.lang.IllegalStateException import kotlin.String import kotlin.jvm.JvmName +import com.fasterxml.jackson.databind.`annotation`.JsonDeserialize as FasterxmlJacksonDatabindAnnotationJsonDeserialize +import com.fasterxml.jackson.databind.`annotation`.JsonPOJOBuilder as FasterxmlJacksonDatabindAnnotationJsonPOJOBuilder +import tools.jackson.databind.`annotation`.JsonDeserialize as ToolsJacksonDatabindAnnotationJsonDeserialize +import tools.jackson.databind.`annotation`.JsonPOJOBuilder as ToolsJacksonDatabindAnnotationJsonPOJOBuilder @JsonTypeInfo(use = JsonTypeInfo.Id.NONE) -@JsonDeserialize(builder = Actor.Builder::class) +@FasterxmlJacksonDatabindAnnotationJsonDeserialize(builder = Actor.Builder::class) +@ToolsJacksonDatabindAnnotationJsonDeserialize(builder = Actor.Builder::class) public class Actor( name: () -> String? = nameDefault, ) : SearchResult { @@ -25,7 +28,8 @@ public class Actor( { throw IllegalStateException("Field `name` was not requested") } } - @JsonPOJOBuilder + @FasterxmlJacksonDatabindAnnotationJsonPOJOBuilder + @ToolsJacksonDatabindAnnotationJsonPOJOBuilder @JsonIgnoreProperties("__typename") public class Builder { private var name: () -> String? = nameDefault diff --git a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/union/expected/types/Movie.kt b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/union/expected/types/Movie.kt index 9cd78c2a0..2f4856d3e 100644 --- a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/union/expected/types/Movie.kt +++ b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/union/expected/types/Movie.kt @@ -3,14 +3,17 @@ package com.netflix.graphql.dgs.codegen.cases.union.expected.types import com.fasterxml.jackson.`annotation`.JsonIgnoreProperties import com.fasterxml.jackson.`annotation`.JsonProperty import com.fasterxml.jackson.`annotation`.JsonTypeInfo -import com.fasterxml.jackson.databind.`annotation`.JsonDeserialize -import com.fasterxml.jackson.databind.`annotation`.JsonPOJOBuilder import java.lang.IllegalStateException import kotlin.String import kotlin.jvm.JvmName +import com.fasterxml.jackson.databind.`annotation`.JsonDeserialize as FasterxmlJacksonDatabindAnnotationJsonDeserialize +import com.fasterxml.jackson.databind.`annotation`.JsonPOJOBuilder as FasterxmlJacksonDatabindAnnotationJsonPOJOBuilder +import tools.jackson.databind.`annotation`.JsonDeserialize as ToolsJacksonDatabindAnnotationJsonDeserialize +import tools.jackson.databind.`annotation`.JsonPOJOBuilder as ToolsJacksonDatabindAnnotationJsonPOJOBuilder @JsonTypeInfo(use = JsonTypeInfo.Id.NONE) -@JsonDeserialize(builder = Movie.Builder::class) +@FasterxmlJacksonDatabindAnnotationJsonDeserialize(builder = Movie.Builder::class) +@ToolsJacksonDatabindAnnotationJsonDeserialize(builder = Movie.Builder::class) public class Movie( title: () -> String? = titleDefault, ) : SearchResult { @@ -25,7 +28,8 @@ public class Movie( { throw IllegalStateException("Field `title` was not requested") } } - @JsonPOJOBuilder + @FasterxmlJacksonDatabindAnnotationJsonPOJOBuilder + @ToolsJacksonDatabindAnnotationJsonPOJOBuilder @JsonIgnoreProperties("__typename") public class Builder { private var title: () -> String? = titleDefault diff --git a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/union/expected/types/Query.kt b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/union/expected/types/Query.kt index fe72c795c..ec61f731c 100644 --- a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/union/expected/types/Query.kt +++ b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/union/expected/types/Query.kt @@ -3,14 +3,17 @@ package com.netflix.graphql.dgs.codegen.cases.union.expected.types import com.fasterxml.jackson.`annotation`.JsonIgnoreProperties import com.fasterxml.jackson.`annotation`.JsonProperty import com.fasterxml.jackson.`annotation`.JsonTypeInfo -import com.fasterxml.jackson.databind.`annotation`.JsonDeserialize -import com.fasterxml.jackson.databind.`annotation`.JsonPOJOBuilder import java.lang.IllegalStateException import kotlin.collections.List import kotlin.jvm.JvmName +import com.fasterxml.jackson.databind.`annotation`.JsonDeserialize as FasterxmlJacksonDatabindAnnotationJsonDeserialize +import com.fasterxml.jackson.databind.`annotation`.JsonPOJOBuilder as FasterxmlJacksonDatabindAnnotationJsonPOJOBuilder +import tools.jackson.databind.`annotation`.JsonDeserialize as ToolsJacksonDatabindAnnotationJsonDeserialize +import tools.jackson.databind.`annotation`.JsonPOJOBuilder as ToolsJacksonDatabindAnnotationJsonPOJOBuilder @JsonTypeInfo(use = JsonTypeInfo.Id.NONE) -@JsonDeserialize(builder = Query.Builder::class) +@FasterxmlJacksonDatabindAnnotationJsonDeserialize(builder = Query.Builder::class) +@ToolsJacksonDatabindAnnotationJsonDeserialize(builder = Query.Builder::class) public class Query( search: () -> List? = searchDefault, ) { @@ -25,7 +28,8 @@ public class Query( { throw IllegalStateException("Field `search` was not requested") } } - @JsonPOJOBuilder + @FasterxmlJacksonDatabindAnnotationJsonPOJOBuilder + @ToolsJacksonDatabindAnnotationJsonPOJOBuilder @JsonIgnoreProperties("__typename") public class Builder { private var search: () -> List? = searchDefault diff --git a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/unionTypesWithoutInterfaceCanDeserialize/expected/types/Droid.kt b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/unionTypesWithoutInterfaceCanDeserialize/expected/types/Droid.kt index 3c03561ec..35c283bb3 100644 --- a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/unionTypesWithoutInterfaceCanDeserialize/expected/types/Droid.kt +++ b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/unionTypesWithoutInterfaceCanDeserialize/expected/types/Droid.kt @@ -3,14 +3,17 @@ package com.netflix.graphql.dgs.codegen.cases.unionTypesWithoutInterfaceCanDeser import com.fasterxml.jackson.`annotation`.JsonIgnoreProperties import com.fasterxml.jackson.`annotation`.JsonProperty import com.fasterxml.jackson.`annotation`.JsonTypeInfo -import com.fasterxml.jackson.databind.`annotation`.JsonDeserialize -import com.fasterxml.jackson.databind.`annotation`.JsonPOJOBuilder import java.lang.IllegalStateException import kotlin.String import kotlin.jvm.JvmName +import com.fasterxml.jackson.databind.`annotation`.JsonDeserialize as FasterxmlJacksonDatabindAnnotationJsonDeserialize +import com.fasterxml.jackson.databind.`annotation`.JsonPOJOBuilder as FasterxmlJacksonDatabindAnnotationJsonPOJOBuilder +import tools.jackson.databind.`annotation`.JsonDeserialize as ToolsJacksonDatabindAnnotationJsonDeserialize +import tools.jackson.databind.`annotation`.JsonPOJOBuilder as ToolsJacksonDatabindAnnotationJsonPOJOBuilder @JsonTypeInfo(use = JsonTypeInfo.Id.NONE) -@JsonDeserialize(builder = Droid.Builder::class) +@FasterxmlJacksonDatabindAnnotationJsonDeserialize(builder = Droid.Builder::class) +@ToolsJacksonDatabindAnnotationJsonDeserialize(builder = Droid.Builder::class) public class Droid( id: () -> String = idDefault, name: () -> String = nameDefault, @@ -45,7 +48,8 @@ public class Droid( { throw IllegalStateException("Field `primaryFunction` was not requested") } } - @JsonPOJOBuilder + @FasterxmlJacksonDatabindAnnotationJsonPOJOBuilder + @ToolsJacksonDatabindAnnotationJsonPOJOBuilder @JsonIgnoreProperties("__typename") public class Builder { private var id: () -> String = idDefault diff --git a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/unionTypesWithoutInterfaceCanDeserialize/expected/types/Human.kt b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/unionTypesWithoutInterfaceCanDeserialize/expected/types/Human.kt index 3c0bca1a2..f869ecf48 100644 --- a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/unionTypesWithoutInterfaceCanDeserialize/expected/types/Human.kt +++ b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/unionTypesWithoutInterfaceCanDeserialize/expected/types/Human.kt @@ -3,15 +3,18 @@ package com.netflix.graphql.dgs.codegen.cases.unionTypesWithoutInterfaceCanDeser import com.fasterxml.jackson.`annotation`.JsonIgnoreProperties import com.fasterxml.jackson.`annotation`.JsonProperty import com.fasterxml.jackson.`annotation`.JsonTypeInfo -import com.fasterxml.jackson.databind.`annotation`.JsonDeserialize -import com.fasterxml.jackson.databind.`annotation`.JsonPOJOBuilder import java.lang.IllegalStateException import kotlin.Int import kotlin.String import kotlin.jvm.JvmName +import com.fasterxml.jackson.databind.`annotation`.JsonDeserialize as FasterxmlJacksonDatabindAnnotationJsonDeserialize +import com.fasterxml.jackson.databind.`annotation`.JsonPOJOBuilder as FasterxmlJacksonDatabindAnnotationJsonPOJOBuilder +import tools.jackson.databind.`annotation`.JsonDeserialize as ToolsJacksonDatabindAnnotationJsonDeserialize +import tools.jackson.databind.`annotation`.JsonPOJOBuilder as ToolsJacksonDatabindAnnotationJsonPOJOBuilder @JsonTypeInfo(use = JsonTypeInfo.Id.NONE) -@JsonDeserialize(builder = Human.Builder::class) +@FasterxmlJacksonDatabindAnnotationJsonDeserialize(builder = Human.Builder::class) +@ToolsJacksonDatabindAnnotationJsonDeserialize(builder = Human.Builder::class) public class Human( id: () -> String = idDefault, name: () -> String = nameDefault, @@ -46,7 +49,8 @@ public class Human( { throw IllegalStateException("Field `totalCredits` was not requested") } } - @JsonPOJOBuilder + @FasterxmlJacksonDatabindAnnotationJsonPOJOBuilder + @ToolsJacksonDatabindAnnotationJsonPOJOBuilder @JsonIgnoreProperties("__typename") public class Builder { private var id: () -> String = idDefault diff --git a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/unionTypesWithoutInterfaceCanDeserialize/expected/types/Query.kt b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/unionTypesWithoutInterfaceCanDeserialize/expected/types/Query.kt index 9f17a81da..5545915e6 100644 --- a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/unionTypesWithoutInterfaceCanDeserialize/expected/types/Query.kt +++ b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/unionTypesWithoutInterfaceCanDeserialize/expected/types/Query.kt @@ -3,13 +3,16 @@ package com.netflix.graphql.dgs.codegen.cases.unionTypesWithoutInterfaceCanDeser import com.fasterxml.jackson.`annotation`.JsonIgnoreProperties import com.fasterxml.jackson.`annotation`.JsonProperty import com.fasterxml.jackson.`annotation`.JsonTypeInfo -import com.fasterxml.jackson.databind.`annotation`.JsonDeserialize -import com.fasterxml.jackson.databind.`annotation`.JsonPOJOBuilder import java.lang.IllegalStateException import kotlin.jvm.JvmName +import com.fasterxml.jackson.databind.`annotation`.JsonDeserialize as FasterxmlJacksonDatabindAnnotationJsonDeserialize +import com.fasterxml.jackson.databind.`annotation`.JsonPOJOBuilder as FasterxmlJacksonDatabindAnnotationJsonPOJOBuilder +import tools.jackson.databind.`annotation`.JsonDeserialize as ToolsJacksonDatabindAnnotationJsonDeserialize +import tools.jackson.databind.`annotation`.JsonPOJOBuilder as ToolsJacksonDatabindAnnotationJsonPOJOBuilder @JsonTypeInfo(use = JsonTypeInfo.Id.NONE) -@JsonDeserialize(builder = Query.Builder::class) +@FasterxmlJacksonDatabindAnnotationJsonDeserialize(builder = Query.Builder::class) +@ToolsJacksonDatabindAnnotationJsonDeserialize(builder = Query.Builder::class) public class Query( search: () -> SearchResultPage? = searchDefault, ) { @@ -24,7 +27,8 @@ public class Query( { throw IllegalStateException("Field `search` was not requested") } } - @JsonPOJOBuilder + @FasterxmlJacksonDatabindAnnotationJsonPOJOBuilder + @ToolsJacksonDatabindAnnotationJsonPOJOBuilder @JsonIgnoreProperties("__typename") public class Builder { private var search: () -> SearchResultPage? = searchDefault diff --git a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/unionTypesWithoutInterfaceCanDeserialize/expected/types/SearchResultPage.kt b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/unionTypesWithoutInterfaceCanDeserialize/expected/types/SearchResultPage.kt index ecba1f512..48ed5a95b 100644 --- a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/unionTypesWithoutInterfaceCanDeserialize/expected/types/SearchResultPage.kt +++ b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/unionTypesWithoutInterfaceCanDeserialize/expected/types/SearchResultPage.kt @@ -3,14 +3,17 @@ package com.netflix.graphql.dgs.codegen.cases.unionTypesWithoutInterfaceCanDeser import com.fasterxml.jackson.`annotation`.JsonIgnoreProperties import com.fasterxml.jackson.`annotation`.JsonProperty import com.fasterxml.jackson.`annotation`.JsonTypeInfo -import com.fasterxml.jackson.databind.`annotation`.JsonDeserialize -import com.fasterxml.jackson.databind.`annotation`.JsonPOJOBuilder import java.lang.IllegalStateException import kotlin.collections.List import kotlin.jvm.JvmName +import com.fasterxml.jackson.databind.`annotation`.JsonDeserialize as FasterxmlJacksonDatabindAnnotationJsonDeserialize +import com.fasterxml.jackson.databind.`annotation`.JsonPOJOBuilder as FasterxmlJacksonDatabindAnnotationJsonPOJOBuilder +import tools.jackson.databind.`annotation`.JsonDeserialize as ToolsJacksonDatabindAnnotationJsonDeserialize +import tools.jackson.databind.`annotation`.JsonPOJOBuilder as ToolsJacksonDatabindAnnotationJsonPOJOBuilder @JsonTypeInfo(use = JsonTypeInfo.Id.NONE) -@JsonDeserialize(builder = SearchResultPage.Builder::class) +@FasterxmlJacksonDatabindAnnotationJsonDeserialize(builder = SearchResultPage.Builder::class) +@ToolsJacksonDatabindAnnotationJsonDeserialize(builder = SearchResultPage.Builder::class) public class SearchResultPage( items: () -> List? = itemsDefault, ) { @@ -25,7 +28,8 @@ public class SearchResultPage( { throw IllegalStateException("Field `items` was not requested") } } - @JsonPOJOBuilder + @FasterxmlJacksonDatabindAnnotationJsonPOJOBuilder + @ToolsJacksonDatabindAnnotationJsonPOJOBuilder @JsonIgnoreProperties("__typename") public class Builder { private var items: () -> List? = itemsDefault diff --git a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/unionWithExtendedType/expected/types/Actor.kt b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/unionWithExtendedType/expected/types/Actor.kt index 2451e4af4..a2890a58d 100644 --- a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/unionWithExtendedType/expected/types/Actor.kt +++ b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/unionWithExtendedType/expected/types/Actor.kt @@ -3,14 +3,17 @@ package com.netflix.graphql.dgs.codegen.cases.unionWithExtendedType.expected.typ import com.fasterxml.jackson.`annotation`.JsonIgnoreProperties import com.fasterxml.jackson.`annotation`.JsonProperty import com.fasterxml.jackson.`annotation`.JsonTypeInfo -import com.fasterxml.jackson.databind.`annotation`.JsonDeserialize -import com.fasterxml.jackson.databind.`annotation`.JsonPOJOBuilder import java.lang.IllegalStateException import kotlin.String import kotlin.jvm.JvmName +import com.fasterxml.jackson.databind.`annotation`.JsonDeserialize as FasterxmlJacksonDatabindAnnotationJsonDeserialize +import com.fasterxml.jackson.databind.`annotation`.JsonPOJOBuilder as FasterxmlJacksonDatabindAnnotationJsonPOJOBuilder +import tools.jackson.databind.`annotation`.JsonDeserialize as ToolsJacksonDatabindAnnotationJsonDeserialize +import tools.jackson.databind.`annotation`.JsonPOJOBuilder as ToolsJacksonDatabindAnnotationJsonPOJOBuilder @JsonTypeInfo(use = JsonTypeInfo.Id.NONE) -@JsonDeserialize(builder = Actor.Builder::class) +@FasterxmlJacksonDatabindAnnotationJsonDeserialize(builder = Actor.Builder::class) +@ToolsJacksonDatabindAnnotationJsonDeserialize(builder = Actor.Builder::class) public class Actor( name: () -> String? = nameDefault, ) : SearchResult { @@ -25,7 +28,8 @@ public class Actor( { throw IllegalStateException("Field `name` was not requested") } } - @JsonPOJOBuilder + @FasterxmlJacksonDatabindAnnotationJsonPOJOBuilder + @ToolsJacksonDatabindAnnotationJsonPOJOBuilder @JsonIgnoreProperties("__typename") public class Builder { private var name: () -> String? = nameDefault diff --git a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/unionWithExtendedType/expected/types/Movie.kt b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/unionWithExtendedType/expected/types/Movie.kt index 820c95667..884443078 100644 --- a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/unionWithExtendedType/expected/types/Movie.kt +++ b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/unionWithExtendedType/expected/types/Movie.kt @@ -3,14 +3,17 @@ package com.netflix.graphql.dgs.codegen.cases.unionWithExtendedType.expected.typ import com.fasterxml.jackson.`annotation`.JsonIgnoreProperties import com.fasterxml.jackson.`annotation`.JsonProperty import com.fasterxml.jackson.`annotation`.JsonTypeInfo -import com.fasterxml.jackson.databind.`annotation`.JsonDeserialize -import com.fasterxml.jackson.databind.`annotation`.JsonPOJOBuilder import java.lang.IllegalStateException import kotlin.String import kotlin.jvm.JvmName +import com.fasterxml.jackson.databind.`annotation`.JsonDeserialize as FasterxmlJacksonDatabindAnnotationJsonDeserialize +import com.fasterxml.jackson.databind.`annotation`.JsonPOJOBuilder as FasterxmlJacksonDatabindAnnotationJsonPOJOBuilder +import tools.jackson.databind.`annotation`.JsonDeserialize as ToolsJacksonDatabindAnnotationJsonDeserialize +import tools.jackson.databind.`annotation`.JsonPOJOBuilder as ToolsJacksonDatabindAnnotationJsonPOJOBuilder @JsonTypeInfo(use = JsonTypeInfo.Id.NONE) -@JsonDeserialize(builder = Movie.Builder::class) +@FasterxmlJacksonDatabindAnnotationJsonDeserialize(builder = Movie.Builder::class) +@ToolsJacksonDatabindAnnotationJsonDeserialize(builder = Movie.Builder::class) public class Movie( title: () -> String? = titleDefault, ) : SearchResult { @@ -25,7 +28,8 @@ public class Movie( { throw IllegalStateException("Field `title` was not requested") } } - @JsonPOJOBuilder + @FasterxmlJacksonDatabindAnnotationJsonPOJOBuilder + @ToolsJacksonDatabindAnnotationJsonPOJOBuilder @JsonIgnoreProperties("__typename") public class Builder { private var title: () -> String? = titleDefault diff --git a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/unionWithExtendedType/expected/types/Query.kt b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/unionWithExtendedType/expected/types/Query.kt index 1053eb5ce..33a163ffa 100644 --- a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/unionWithExtendedType/expected/types/Query.kt +++ b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/unionWithExtendedType/expected/types/Query.kt @@ -3,14 +3,17 @@ package com.netflix.graphql.dgs.codegen.cases.unionWithExtendedType.expected.typ import com.fasterxml.jackson.`annotation`.JsonIgnoreProperties import com.fasterxml.jackson.`annotation`.JsonProperty import com.fasterxml.jackson.`annotation`.JsonTypeInfo -import com.fasterxml.jackson.databind.`annotation`.JsonDeserialize -import com.fasterxml.jackson.databind.`annotation`.JsonPOJOBuilder import java.lang.IllegalStateException import kotlin.collections.List import kotlin.jvm.JvmName +import com.fasterxml.jackson.databind.`annotation`.JsonDeserialize as FasterxmlJacksonDatabindAnnotationJsonDeserialize +import com.fasterxml.jackson.databind.`annotation`.JsonPOJOBuilder as FasterxmlJacksonDatabindAnnotationJsonPOJOBuilder +import tools.jackson.databind.`annotation`.JsonDeserialize as ToolsJacksonDatabindAnnotationJsonDeserialize +import tools.jackson.databind.`annotation`.JsonPOJOBuilder as ToolsJacksonDatabindAnnotationJsonPOJOBuilder @JsonTypeInfo(use = JsonTypeInfo.Id.NONE) -@JsonDeserialize(builder = Query.Builder::class) +@FasterxmlJacksonDatabindAnnotationJsonDeserialize(builder = Query.Builder::class) +@ToolsJacksonDatabindAnnotationJsonDeserialize(builder = Query.Builder::class) public class Query( search: () -> List? = searchDefault, ) { @@ -25,7 +28,8 @@ public class Query( { throw IllegalStateException("Field `search` was not requested") } } - @JsonPOJOBuilder + @FasterxmlJacksonDatabindAnnotationJsonPOJOBuilder + @ToolsJacksonDatabindAnnotationJsonPOJOBuilder @JsonIgnoreProperties("__typename") public class Builder { private var search: () -> List? = searchDefault diff --git a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/unionWithExtendedType/expected/types/Rating.kt b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/unionWithExtendedType/expected/types/Rating.kt index 1b9f601c0..704ae630f 100644 --- a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/unionWithExtendedType/expected/types/Rating.kt +++ b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/unionWithExtendedType/expected/types/Rating.kt @@ -3,14 +3,17 @@ package com.netflix.graphql.dgs.codegen.cases.unionWithExtendedType.expected.typ import com.fasterxml.jackson.`annotation`.JsonIgnoreProperties import com.fasterxml.jackson.`annotation`.JsonProperty import com.fasterxml.jackson.`annotation`.JsonTypeInfo -import com.fasterxml.jackson.databind.`annotation`.JsonDeserialize -import com.fasterxml.jackson.databind.`annotation`.JsonPOJOBuilder import java.lang.IllegalStateException import kotlin.Int import kotlin.jvm.JvmName +import com.fasterxml.jackson.databind.`annotation`.JsonDeserialize as FasterxmlJacksonDatabindAnnotationJsonDeserialize +import com.fasterxml.jackson.databind.`annotation`.JsonPOJOBuilder as FasterxmlJacksonDatabindAnnotationJsonPOJOBuilder +import tools.jackson.databind.`annotation`.JsonDeserialize as ToolsJacksonDatabindAnnotationJsonDeserialize +import tools.jackson.databind.`annotation`.JsonPOJOBuilder as ToolsJacksonDatabindAnnotationJsonPOJOBuilder @JsonTypeInfo(use = JsonTypeInfo.Id.NONE) -@JsonDeserialize(builder = Rating.Builder::class) +@FasterxmlJacksonDatabindAnnotationJsonDeserialize(builder = Rating.Builder::class) +@ToolsJacksonDatabindAnnotationJsonDeserialize(builder = Rating.Builder::class) public class Rating( stars: () -> Int? = starsDefault, ) : SearchResult { @@ -25,7 +28,8 @@ public class Rating( { throw IllegalStateException("Field `stars` was not requested") } } - @JsonPOJOBuilder + @FasterxmlJacksonDatabindAnnotationJsonPOJOBuilder + @ToolsJacksonDatabindAnnotationJsonPOJOBuilder @JsonIgnoreProperties("__typename") public class Builder { private var stars: () -> Int? = starsDefault diff --git a/graphql-dgs-codegen-core/src/main/kotlin/com/netflix/graphql/dgs/codegen/CodeGen.kt b/graphql-dgs-codegen-core/src/main/kotlin/com/netflix/graphql/dgs/codegen/CodeGen.kt index 9a28512b4..17c73c05d 100644 --- a/graphql-dgs-codegen-core/src/main/kotlin/com/netflix/graphql/dgs/codegen/CodeGen.kt +++ b/graphql-dgs-codegen-core/src/main/kotlin/com/netflix/graphql/dgs/codegen/CodeGen.kt @@ -20,6 +20,7 @@ package com.netflix.graphql.dgs.codegen import com.netflix.graphql.dgs.codegen.generators.java.* import com.netflix.graphql.dgs.codegen.generators.kotlin.* +import com.netflix.graphql.dgs.codegen.generators.kotlin.configureJacksonVersion import com.netflix.graphql.dgs.codegen.generators.kotlin2.* import com.netflix.graphql.dgs.codegen.generators.shared.DocFileSpec import com.netflix.graphql.dgs.codegen.generators.shared.DocGenerator @@ -75,6 +76,8 @@ class CodeGen( ) fun generate(): CodeGenResult { + configureJacksonVersion(config.jacksonVersions) + loadTypeMappingsFromDependencies() val codeGenResult = @@ -582,6 +585,7 @@ class CodeGenConfig( var addDeprecatedAnnotation: Boolean = false, var trackInputFieldSet: Boolean = false, var generateJSpecifyAnnotations: Boolean = false, + var jacksonVersions: Set = emptySet(), ) { val packageNameClient: String = "$packageName.$subPackageNameClient" @@ -618,6 +622,11 @@ enum class Language { KOTLIN, } +enum class JacksonVersion { + JACKSON_2, + JACKSON_3, +} + data class CodeGenResult( val javaDataTypes: List = listOf(), val javaInterfaces: List = listOf(), diff --git a/graphql-dgs-codegen-core/src/main/kotlin/com/netflix/graphql/dgs/codegen/generators/kotlin/KotlinPoetUtils.kt b/graphql-dgs-codegen-core/src/main/kotlin/com/netflix/graphql/dgs/codegen/generators/kotlin/KotlinPoetUtils.kt index 0f285c4f3..e6dcb1bc5 100644 --- a/graphql-dgs-codegen-core/src/main/kotlin/com/netflix/graphql/dgs/codegen/generators/kotlin/KotlinPoetUtils.kt +++ b/graphql-dgs-codegen-core/src/main/kotlin/com/netflix/graphql/dgs/codegen/generators/kotlin/KotlinPoetUtils.kt @@ -22,10 +22,9 @@ import com.fasterxml.jackson.annotation.JsonIgnoreProperties import com.fasterxml.jackson.annotation.JsonProperty import com.fasterxml.jackson.annotation.JsonSubTypes import com.fasterxml.jackson.annotation.JsonTypeInfo -import com.fasterxml.jackson.databind.annotation.JsonDeserialize -import com.fasterxml.jackson.databind.annotation.JsonPOJOBuilder import com.netflix.graphql.dgs.codegen.CodeGen import com.netflix.graphql.dgs.codegen.CodeGenConfig +import com.netflix.graphql.dgs.codegen.JacksonVersion import com.netflix.graphql.dgs.codegen.generators.shared.CodeGeneratorUtils.capitalized import com.netflix.graphql.dgs.codegen.generators.shared.PackageParserUtil import com.netflix.graphql.dgs.codegen.generators.shared.ParserConstants @@ -46,6 +45,60 @@ import graphql.language.StringValue import graphql.language.Value import java.lang.IllegalArgumentException +private var configuredVersions: Set = emptySet() + +/** + * Configure the Jackson versions from project configuration. + * Called by the Gradle plugin after inspecting project dependencies. + */ +fun configureJacksonVersion(jacksonVersions: Set) { + configuredVersions = jacksonVersions +} + +/** + * Which Jackson versions to generate annotations for. + * + * 1. Use configured versions from Gradle plugin (inferred from project dependencies) if available + * 2. Default to both versions + */ +private fun getJacksonVersions(): Set = + // Use configured versions if available and non-empty + configuredVersions.takeIf { it.isNotEmpty() } ?: setOf(JacksonVersion.JACKSON_2, JacksonVersion.JACKSON_3) + +/** + * Get the ClassName(s) for JsonDeserialize annotation based on detected Jackson version(s). + * Jackson 2: com.fasterxml.jackson.databind.annotation.JsonDeserialize + * Jackson 3: tools.jackson.databind.annotation.JsonDeserialize + */ +private fun getJsonDeserializeClasses(): List { + val versions = getJacksonVersions() + return buildList { + if (JacksonVersion.JACKSON_2 in versions) { + add(ClassName("com.fasterxml.jackson.databind.annotation", "JsonDeserialize")) + } + if (JacksonVersion.JACKSON_3 in versions) { + add(ClassName("tools.jackson.databind.annotation", "JsonDeserialize")) + } + } +} + +/** + * Get the ClassName(s) for JsonPOJOBuilder annotation based on detected Jackson version(s). + * Jackson 2: com.fasterxml.jackson.databind.annotation.JsonPOJOBuilder + * Jackson 3: tools.jackson.databind.annotation.JsonPOJOBuilder + */ +private fun getJsonPOJOBuilderClasses(): List { + val versions = getJacksonVersions() + return buildList { + if (JacksonVersion.JACKSON_2 in versions) { + add(ClassName("com.fasterxml.jackson.databind.annotation", "JsonPOJOBuilder")) + } + if (JacksonVersion.JACKSON_3 in versions) { + add(ClassName("tools.jackson.databind.annotation", "JsonPOJOBuilder")) + } + } +} + fun sanitizeKotlinIdentifier(name: String): String = if (name == "_") { "underscoreField_" @@ -134,25 +187,38 @@ fun jsonSubTypesAnnotation(subTypes: Collection): AnnotationSpec { * ``` * @JsonDeserialize(builder = Movie.Builder::class) * ``` + * ``` + * @FasterxmlJacksonDatabindAnnotationJsonDeserialize(builder = Movie.Builder::class) + * @ToolsJacksonDatabindAnnotationJsonDeserialize(builder = Movie.Builder::class) + * ``` */ -fun jsonDeserializeAnnotation(builderType: ClassName): AnnotationSpec = - AnnotationSpec - .builder(JsonDeserialize::class) - .addMember("builder = %T::class", builderType) - .build() +fun jsonDeserializeAnnotations(builderType: ClassName): List = + getJsonDeserializeClasses().map { jsonDeserializeClass -> + AnnotationSpec + .builder(jsonDeserializeClass) + .addMember("builder = %T::class", builderType) + .build() + } /** - * Generate a [JsonPOJOBuilder] annotation for the builder class. + * Generate [JsonPOJOBuilder] annotations for all available Jackson versions. + * Jackson 2: com.fasterxml.jackson.databind.annotation.JsonPOJOBuilder + * Jackson 3: tools.jackson.databind.annotation.JsonPOJOBuilder + * When both versions are detected, generates annotations for both. * - * Example generated annotation: + * Example generated annotations: * ``` * @JsonPOJOBuilder * ``` + * ``` + * @FasterxmlJacksonDatabindAnnotationJsonPOJOBuilder + * @ToolsJacksonDatabindAnnotationJsonPOJOBuilder + * ``` */ -fun jsonBuilderAnnotation(): AnnotationSpec = - AnnotationSpec - .builder(JsonPOJOBuilder::class) - .build() +fun jsonBuilderAnnotations(): List = + getJsonPOJOBuilderClasses().map { jsonPOJOBuilderClass -> + AnnotationSpec.builder(jsonPOJOBuilderClass).build() + } /** * Generate a [JvmName] annotation for a kotlin property. diff --git a/graphql-dgs-codegen-core/src/main/kotlin/com/netflix/graphql/dgs/codegen/generators/kotlin2/GenerateKotlin2DataTypes.kt b/graphql-dgs-codegen-core/src/main/kotlin/com/netflix/graphql/dgs/codegen/generators/kotlin2/GenerateKotlin2DataTypes.kt index c7adcf46a..25af5c159 100644 --- a/graphql-dgs-codegen-core/src/main/kotlin/com/netflix/graphql/dgs/codegen/generators/kotlin2/GenerateKotlin2DataTypes.kt +++ b/graphql-dgs-codegen-core/src/main/kotlin/com/netflix/graphql/dgs/codegen/generators/kotlin2/GenerateKotlin2DataTypes.kt @@ -24,8 +24,8 @@ import com.netflix.graphql.dgs.codegen.generators.kotlin.ReservedKeywordFilter import com.netflix.graphql.dgs.codegen.generators.kotlin.addControlFlow import com.netflix.graphql.dgs.codegen.generators.kotlin.addOptionalGeneratedAnnotation import com.netflix.graphql.dgs.codegen.generators.kotlin.disableJsonTypeInfoAnnotation -import com.netflix.graphql.dgs.codegen.generators.kotlin.jsonBuilderAnnotation -import com.netflix.graphql.dgs.codegen.generators.kotlin.jsonDeserializeAnnotation +import com.netflix.graphql.dgs.codegen.generators.kotlin.jsonBuilderAnnotations +import com.netflix.graphql.dgs.codegen.generators.kotlin.jsonDeserializeAnnotations import com.netflix.graphql.dgs.codegen.generators.kotlin.jsonIgnorePropertiesAnnotation import com.netflix.graphql.dgs.codegen.generators.kotlin.jsonPropertyAnnotation import com.netflix.graphql.dgs.codegen.generators.kotlin.jvmNameAnnotation @@ -134,8 +134,10 @@ fun generateKotlin2DataTypes( TypeSpec .classBuilder("Builder") .addOptionalGeneratedAnnotation(config) - .addAnnotation(jsonBuilderAnnotation()) - .addAnnotation(jsonIgnorePropertiesAnnotation("__typename")) + .apply { + jsonBuilderAnnotations().forEach { addAnnotation(it) } + addAnnotation(jsonIgnorePropertiesAnnotation("__typename")) + } // add a backing property for each field .addProperties( fields.map { field -> @@ -193,11 +195,9 @@ fun generateKotlin2DataTypes( } // add jackson annotations .addAnnotation(disableJsonTypeInfoAnnotation()) - .addAnnotation( - jsonDeserializeAnnotation( - builderClassName, - ), - ) + .apply { + jsonDeserializeAnnotations(builderClassName).forEach { addAnnotation(it) } + } // add nested classes .addType(companionObject) .addType(builder) diff --git a/graphql-dgs-codegen-gradle/src/main/kotlin/com/netflix/graphql/dgs/codegen/gradle/GenerateJavaTask.kt b/graphql-dgs-codegen-gradle/src/main/kotlin/com/netflix/graphql/dgs/codegen/gradle/GenerateJavaTask.kt index 8a863814f..372afb260 100644 --- a/graphql-dgs-codegen-gradle/src/main/kotlin/com/netflix/graphql/dgs/codegen/gradle/GenerateJavaTask.kt +++ b/graphql-dgs-codegen-gradle/src/main/kotlin/com/netflix/graphql/dgs/codegen/gradle/GenerateJavaTask.kt @@ -182,6 +182,8 @@ open class GenerateJavaTask logger.info("Processing $it") } + val jacksonVersions = JacksonVersionDetector.detectVersions(project) + val config = CodeGenConfig( schemas = emptySet(), @@ -224,6 +226,7 @@ open class GenerateJavaTask javaGenerateAllConstructor = javaGenerateAllConstructor, trackInputFieldSet = trackInputFieldSet, generateJSpecifyAnnotations = generateJSpecifyAnnotations, + jacksonVersions = jacksonVersions, ) logger.info("Codegen config: {}", config) diff --git a/graphql-dgs-codegen-gradle/src/main/kotlin/com/netflix/graphql/dgs/codegen/gradle/JacksonVersionDetector.kt b/graphql-dgs-codegen-gradle/src/main/kotlin/com/netflix/graphql/dgs/codegen/gradle/JacksonVersionDetector.kt new file mode 100644 index 000000000..625084371 --- /dev/null +++ b/graphql-dgs-codegen-gradle/src/main/kotlin/com/netflix/graphql/dgs/codegen/gradle/JacksonVersionDetector.kt @@ -0,0 +1,67 @@ +/* + * + * Copyright 2020 Netflix, Inc. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * + */ + +package com.netflix.graphql.dgs.codegen.gradle + +import com.netflix.graphql.dgs.codegen.JacksonVersion +import org.gradle.api.Project +import org.gradle.api.logging.Logging + +object JacksonVersionDetector { + private val logger = Logging.getLogger(JacksonVersionDetector::class.java) + + /** + * Detects which Jackson versions are present in the project's compile classpath. + */ + fun detectVersions(project: Project): Set { + val configurationsToCheck = + listOfNotNull( + project.configurations.findByName("compileClasspath"), + ).filter { it.isCanBeResolved } + + val result = mutableSetOf() + + for (configuration in configurationsToCheck) { + try { + val dependencies = configuration.resolvedConfiguration.resolvedArtifacts + for (artifact in dependencies) { + val id = artifact.moduleVersion.id + if (id.group == "com.fasterxml.jackson.core" && id.name == "jackson-databind") { + val version = id.version + logger.info("DGS Codegen: Found Jackson 2 ($version) in ${configuration.name}") + result.add(JacksonVersion.JACKSON_2) + } + if (id.group == "tools.jackson.core" && id.name == "jackson-databind") { + logger.info("DGS Codegen: Found Jackson 3 (${id.version}) in ${configuration.name}") + result.add(JacksonVersion.JACKSON_3) + } + } + } catch (e: Exception) { + logger.debug("Could not resolve configuration ${configuration.name}: ${e.message}") + } + } + + if (result.size == 2) { + logger.info("DGS Codegen: Both Jackson 2 and 3 detected in project dependencies. Will generate annotations for both.") + } else if (result.isEmpty()) { + logger.warn("DGS Codegen: Could not detect Jackson version from project dependencies. Will generate annotations for both.") + } + + return result + } +} From 994b8c3befc30480a92199bef416961cf9daa773 Mon Sep 17 00:00:00 2001 From: Jiho Lee Date: Wed, 28 Jan 2026 13:24:16 -0800 Subject: [PATCH 2/4] Add tests for Jackson version detection --- .../codegen/JacksonVersionDetectionTest.kt | 153 ++++++++++++++++++ 1 file changed, 153 insertions(+) create mode 100644 graphql-dgs-codegen-core/src/test/kotlin/com/netflix/graphql/dgs/codegen/JacksonVersionDetectionTest.kt diff --git a/graphql-dgs-codegen-core/src/test/kotlin/com/netflix/graphql/dgs/codegen/JacksonVersionDetectionTest.kt b/graphql-dgs-codegen-core/src/test/kotlin/com/netflix/graphql/dgs/codegen/JacksonVersionDetectionTest.kt new file mode 100644 index 000000000..75868495f --- /dev/null +++ b/graphql-dgs-codegen-core/src/test/kotlin/com/netflix/graphql/dgs/codegen/JacksonVersionDetectionTest.kt @@ -0,0 +1,153 @@ +/* + * + * Copyright 2020 Netflix, Inc. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * + */ + +package com.netflix.graphql.dgs.codegen + +import org.assertj.core.api.Assertions.assertThat +import org.junit.jupiter.api.Test + +class JacksonVersionDetectionTest { + private val schema = + """ + type Query { + movies: [Movie] + } + + type Movie { + title: String + director: String + } + """.trimIndent() + + @Test + fun `generates only Jackson 2 JsonDeserialize and JsonPOJOBuilder annotations when Jackson 2 is configured`() { + val result = + CodeGen( + CodeGenConfig( + schemas = setOf(schema), + packageName = "com.test", + language = Language.KOTLIN, + generateKotlinNullableClasses = true, + jacksonVersions = setOf(JacksonVersion.JACKSON_2), + ), + ).generate() + + val movieType = result.kotlinDataTypes.first { it.name == "Movie" } + val fileContent = movieType.toString() + + assertThat(fileContent).contains("com.fasterxml.jackson.databind.`annotation`.JsonDeserialize") + assertThat(fileContent).doesNotContain("tools.jackson.databind.`annotation`.JsonDeserialize") + + assertThat(fileContent).contains("com.fasterxml.jackson.databind.`annotation`.JsonPOJOBuilder") + assertThat(fileContent).doesNotContain("tools.jackson.databind.`annotation`.JsonPOJOBuilder") + } + + @Test + fun `generates only Jackson 3 JsonDeserialize and JsonPOJOBuilder annotations when Jackson 3 is configured`() { + val result = + CodeGen( + CodeGenConfig( + schemas = setOf(schema), + packageName = "com.test", + language = Language.KOTLIN, + generateKotlinNullableClasses = true, + jacksonVersions = setOf(JacksonVersion.JACKSON_3), + ), + ).generate() + + val movieType = result.kotlinDataTypes.first { it.name == "Movie" } + val fileContent = movieType.toString() + + assertThat(fileContent).contains("tools.jackson.databind.`annotation`.JsonDeserialize") + assertThat(fileContent).doesNotContain("com.fasterxml.jackson.databind.`annotation`.JsonDeserialize") + + assertThat(fileContent).contains("tools.jackson.databind.`annotation`.JsonPOJOBuilder") + assertThat(fileContent).doesNotContain("com.fasterxml.jackson.databind.`annotation`.JsonPOJOBuilder") + } + + @Test + fun `generates both Jackson 2 and 3 JsonDeserialize and JsonPOJOBuilder annotations when both are configured`() { + val result = + CodeGen( + CodeGenConfig( + schemas = setOf(schema), + packageName = "com.test", + language = Language.KOTLIN, + generateKotlinNullableClasses = true, + jacksonVersions = setOf(JacksonVersion.JACKSON_2, JacksonVersion.JACKSON_3), + ), + ).generate() + + val movieType = result.kotlinDataTypes.first { it.name == "Movie" } + val fileContent = movieType.toString() + + assertThat(fileContent).contains("com.fasterxml.jackson.databind.`annotation`.JsonDeserialize") + assertThat(fileContent).contains("tools.jackson.databind.`annotation`.JsonDeserialize") + + assertThat(fileContent).contains("tools.jackson.databind.`annotation`.JsonPOJOBuilder") + assertThat(fileContent).contains("com.fasterxml.jackson.databind.`annotation`.JsonPOJOBuilder") + + assertThat(fileContent).contains("@ToolsJacksonDatabindAnnotationJsonPOJOBuilder") + assertThat(fileContent).contains("@FasterxmlJacksonDatabindAnnotationJsonPOJOBuilder") + + assertThat(fileContent).contains("@ToolsJacksonDatabindAnnotationJsonDeserialize") + assertThat(fileContent).contains("@FasterxmlJacksonDatabindAnnotationJsonDeserialize") + } + + @Test + fun `defaults to both versions when no configuration is provided`() { + // Don't configure anything - should default to both versions + val result = + CodeGen( + CodeGenConfig( + schemas = setOf(schema), + packageName = "com.test", + language = Language.KOTLIN, + generateKotlinNullableClasses = true, + ), + ).generate() + + val movieType = result.kotlinDataTypes.first { it.name == "Movie" } + val fileContent = movieType.toString() + + // Should have both Jackson 2 and 3 annotations by default + assertThat(fileContent).contains("com.fasterxml.jackson.databind.`annotation`.JsonDeserialize") + assertThat(fileContent).contains("tools.jackson.databind.`annotation`.JsonDeserialize") + } + + @Test + fun `empty configuration defaults to both versions`() { + val result = + CodeGen( + CodeGenConfig( + schemas = setOf(schema), + packageName = "com.test", + language = Language.KOTLIN, + generateKotlinNullableClasses = true, + jacksonVersions = emptySet(), + ), + ).generate() + + val movieType = result.kotlinDataTypes.first { it.name == "Movie" } + val fileContent = movieType.toString() + + // Should default to both versions + assertThat(fileContent).contains("com.fasterxml.jackson.databind.`annotation`.JsonDeserialize") + assertThat(fileContent).contains("tools.jackson.databind.`annotation`.JsonDeserialize") + } +} From bc500bda2da3701cbe7e1f8e768ec943bdd65df5 Mon Sep 17 00:00:00 2001 From: Jiho Lee Date: Wed, 28 Jan 2026 14:13:08 -0800 Subject: [PATCH 3/4] Default to Jackson 2 --- .../expected/types/Person.kt | 12 ++++-------- .../expected/types/Query.kt | 12 ++++-------- .../expected/types/Person.kt | 12 ++++-------- .../expected/types/Query.kt | 12 ++++-------- .../expected/types/Query.kt | 12 ++++-------- .../expected/types/Person.kt | 12 ++++-------- .../expected/types/Query.kt | 12 ++++-------- .../expected/types/Person.kt | 12 ++++-------- .../expected/types/Query.kt | 12 ++++-------- .../dataClassDocs/expected/types/Movie.kt | 12 ++++-------- .../dataClassDocs/expected/types/Query.kt | 12 ++++-------- .../dataClassFieldDocs/expected/types/Movie.kt | 12 ++++-------- .../dataClassFieldDocs/expected/types/Query.kt | 12 ++++-------- .../expected/types/Person.kt | 12 ++++-------- .../expected/types/Query.kt | 12 ++++-------- .../expected/types/Query.kt | 12 ++++-------- .../expected/types/RequiredTestType.kt | 12 ++++-------- .../expected/types/Entity.kt | 12 ++++-------- .../expected/types/EntityConnection.kt | 12 ++++-------- .../expected/types/EntityEdge.kt | 12 ++++-------- .../expected/types/PageInfo.kt | 12 ++++-------- .../expected/types/Query.kt | 12 ++++-------- .../expected/types/Car.kt | 12 ++++-------- .../expected/types/Engine.kt | 12 ++++-------- .../expected/types/Performance.kt | 12 ++++-------- .../expected/types/Query.kt | 12 ++++-------- .../expected/types/Query.kt | 12 ++++-------- .../expected/types/Employee.kt | 12 ++++-------- .../expected/types/Query.kt | 12 ++++-------- .../expected/types/Employee.kt | 12 ++++-------- .../expected/types/Query.kt | 12 ++++-------- .../expected/types/Query.kt | 12 ++++-------- .../expected/types/Talent.kt | 12 ++++-------- .../expected/types/Person.kt | 12 ++++-------- .../expected/types/Query.kt | 12 ++++-------- .../expected/types/Product.kt | 12 ++++-------- .../expected/types/Query.kt | 12 ++++-------- .../expected/types/Entity.kt | 12 ++++-------- .../expected/types/EntityEdge.kt | 12 ++++-------- .../expected/types/Query.kt | 12 ++++-------- .../expected/types/Employee.kt | 12 ++++-------- .../expected/types/Query.kt | 12 ++++-------- .../expected/types/MyType.kt | 12 ++++-------- .../expected/types/OtherType.kt | 12 ++++-------- .../expected/types/Person.kt | 12 ++++-------- .../expected/types/Query.kt | 12 ++++-------- .../expected/types/MyType.kt | 12 ++++-------- .../expected/types/MyType.kt | 12 ++++-------- .../expected/types/Person.kt | 12 ++++-------- .../expected/types/Query.kt | 12 ++++-------- .../expected/types/MyType.kt | 12 ++++-------- .../expected/types/Person.kt | 12 ++++-------- .../expected/types/Query.kt | 12 ++++-------- .../expected/types/Person.kt | 12 ++++-------- .../expected/types/Query.kt | 12 ++++-------- .../expected/types/SampleType.kt | 12 ++++-------- .../expected/types/Person.kt | 12 ++++-------- .../expected/types/Query.kt | 12 ++++-------- .../codegen/cases/enum/expected/types/Query.kt | 12 ++++-------- .../expected/types/Query.kt | 12 ++++-------- .../expected/types/Example.kt | 12 ++++-------- .../cases/input/expected/types/Query.kt | 12 ++++-------- .../expected/types/Query.kt | 12 ++++-------- .../expected/types/Query.kt | 12 ++++-------- .../expected/types/Query.kt | 12 ++++-------- .../expected/types/Bird.kt | 12 ++++-------- .../expected/types/Dog.kt | 12 ++++-------- .../expected/types/Dog.kt | 12 ++++-------- .../expected/types/Vegetarian.kt | 12 ++++-------- .../expected/types/Employee.kt | 12 ++++-------- .../expected/types/Query.kt | 12 ++++-------- .../expected/types/Query.kt | 12 ++++-------- .../expected/types/Seed.kt | 12 ++++-------- .../expected/types/Query.kt | 12 ++++-------- .../expected/types/T.kt | 12 ++++-------- .../projectionWithEnum/expected/types/Query.kt | 12 ++++-------- .../expected/types/Query.kt | 12 ++++-------- .../expected/types/Query.kt | 12 ++++-------- .../expected/types/Query.kt | 12 ++++-------- .../expected/types/Employee.kt | 12 ++++-------- .../projectionWithType/expected/types/Query.kt | 12 ++++-------- .../expected/types/Employee.kt | 12 ++++-------- .../expected/types/Query.kt | 12 ++++-------- .../expected/types/Employee.kt | 12 ++++-------- .../expected/types/Query.kt | 12 ++++-------- .../expected/types/Person.kt | 12 ++++-------- .../expected/types/Person.kt | 12 ++++-------- .../cases/union/expected/types/Actor.kt | 12 ++++-------- .../cases/union/expected/types/Movie.kt | 12 ++++-------- .../cases/union/expected/types/Query.kt | 12 ++++-------- .../expected/types/Droid.kt | 12 ++++-------- .../expected/types/Human.kt | 12 ++++-------- .../expected/types/Query.kt | 12 ++++-------- .../expected/types/SearchResultPage.kt | 12 ++++-------- .../expected/types/Actor.kt | 12 ++++-------- .../expected/types/Movie.kt | 12 ++++-------- .../expected/types/Query.kt | 12 ++++-------- .../expected/types/Rating.kt | 12 ++++-------- .../generators/kotlin/KotlinPoetUtils.kt | 4 ++-- .../dgs/codegen/JacksonVersionDetectionTest.kt | 18 +++++++++++------- 100 files changed, 405 insertions(+), 793 deletions(-) diff --git a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/constantsForInputTypes/expected/types/Person.kt b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/constantsForInputTypes/expected/types/Person.kt index 205a10923..5c6f4523f 100644 --- a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/constantsForInputTypes/expected/types/Person.kt +++ b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/constantsForInputTypes/expected/types/Person.kt @@ -3,17 +3,14 @@ package com.netflix.graphql.dgs.codegen.cases.constantsForInputTypes.expected.ty import com.fasterxml.jackson.`annotation`.JsonIgnoreProperties import com.fasterxml.jackson.`annotation`.JsonProperty import com.fasterxml.jackson.`annotation`.JsonTypeInfo +import com.fasterxml.jackson.databind.`annotation`.JsonDeserialize +import com.fasterxml.jackson.databind.`annotation`.JsonPOJOBuilder import java.lang.IllegalStateException import kotlin.String import kotlin.jvm.JvmName -import com.fasterxml.jackson.databind.`annotation`.JsonDeserialize as FasterxmlJacksonDatabindAnnotationJsonDeserialize -import com.fasterxml.jackson.databind.`annotation`.JsonPOJOBuilder as FasterxmlJacksonDatabindAnnotationJsonPOJOBuilder -import tools.jackson.databind.`annotation`.JsonDeserialize as ToolsJacksonDatabindAnnotationJsonDeserialize -import tools.jackson.databind.`annotation`.JsonPOJOBuilder as ToolsJacksonDatabindAnnotationJsonPOJOBuilder @JsonTypeInfo(use = JsonTypeInfo.Id.NONE) -@FasterxmlJacksonDatabindAnnotationJsonDeserialize(builder = Person.Builder::class) -@ToolsJacksonDatabindAnnotationJsonDeserialize(builder = Person.Builder::class) +@JsonDeserialize(builder = Person.Builder::class) public class Person( firstname: () -> String? = firstnameDefault, lastname: () -> String? = lastnameDefault, @@ -38,8 +35,7 @@ public class Person( { throw IllegalStateException("Field `lastname` was not requested") } } - @FasterxmlJacksonDatabindAnnotationJsonPOJOBuilder - @ToolsJacksonDatabindAnnotationJsonPOJOBuilder + @JsonPOJOBuilder @JsonIgnoreProperties("__typename") public class Builder { private var firstname: () -> String? = firstnameDefault diff --git a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/constantsForInputTypes/expected/types/Query.kt b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/constantsForInputTypes/expected/types/Query.kt index 9f2464db4..444457f09 100644 --- a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/constantsForInputTypes/expected/types/Query.kt +++ b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/constantsForInputTypes/expected/types/Query.kt @@ -3,17 +3,14 @@ package com.netflix.graphql.dgs.codegen.cases.constantsForInputTypes.expected.ty import com.fasterxml.jackson.`annotation`.JsonIgnoreProperties import com.fasterxml.jackson.`annotation`.JsonProperty import com.fasterxml.jackson.`annotation`.JsonTypeInfo +import com.fasterxml.jackson.databind.`annotation`.JsonDeserialize +import com.fasterxml.jackson.databind.`annotation`.JsonPOJOBuilder import java.lang.IllegalStateException import kotlin.collections.List import kotlin.jvm.JvmName -import com.fasterxml.jackson.databind.`annotation`.JsonDeserialize as FasterxmlJacksonDatabindAnnotationJsonDeserialize -import com.fasterxml.jackson.databind.`annotation`.JsonPOJOBuilder as FasterxmlJacksonDatabindAnnotationJsonPOJOBuilder -import tools.jackson.databind.`annotation`.JsonDeserialize as ToolsJacksonDatabindAnnotationJsonDeserialize -import tools.jackson.databind.`annotation`.JsonPOJOBuilder as ToolsJacksonDatabindAnnotationJsonPOJOBuilder @JsonTypeInfo(use = JsonTypeInfo.Id.NONE) -@FasterxmlJacksonDatabindAnnotationJsonDeserialize(builder = Query.Builder::class) -@ToolsJacksonDatabindAnnotationJsonDeserialize(builder = Query.Builder::class) +@JsonDeserialize(builder = Query.Builder::class) public class Query( people: () -> List? = peopleDefault, ) { @@ -28,8 +25,7 @@ public class Query( { throw IllegalStateException("Field `people` was not requested") } } - @FasterxmlJacksonDatabindAnnotationJsonPOJOBuilder - @ToolsJacksonDatabindAnnotationJsonPOJOBuilder + @JsonPOJOBuilder @JsonIgnoreProperties("__typename") public class Builder { private var people: () -> List? = peopleDefault diff --git a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/constantsWithExtendedInputTypes/expected/types/Person.kt b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/constantsWithExtendedInputTypes/expected/types/Person.kt index 65181028c..d855e5afc 100644 --- a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/constantsWithExtendedInputTypes/expected/types/Person.kt +++ b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/constantsWithExtendedInputTypes/expected/types/Person.kt @@ -3,17 +3,14 @@ package com.netflix.graphql.dgs.codegen.cases.constantsWithExtendedInputTypes.ex import com.fasterxml.jackson.`annotation`.JsonIgnoreProperties import com.fasterxml.jackson.`annotation`.JsonProperty import com.fasterxml.jackson.`annotation`.JsonTypeInfo +import com.fasterxml.jackson.databind.`annotation`.JsonDeserialize +import com.fasterxml.jackson.databind.`annotation`.JsonPOJOBuilder import java.lang.IllegalStateException import kotlin.String import kotlin.jvm.JvmName -import com.fasterxml.jackson.databind.`annotation`.JsonDeserialize as FasterxmlJacksonDatabindAnnotationJsonDeserialize -import com.fasterxml.jackson.databind.`annotation`.JsonPOJOBuilder as FasterxmlJacksonDatabindAnnotationJsonPOJOBuilder -import tools.jackson.databind.`annotation`.JsonDeserialize as ToolsJacksonDatabindAnnotationJsonDeserialize -import tools.jackson.databind.`annotation`.JsonPOJOBuilder as ToolsJacksonDatabindAnnotationJsonPOJOBuilder @JsonTypeInfo(use = JsonTypeInfo.Id.NONE) -@FasterxmlJacksonDatabindAnnotationJsonDeserialize(builder = Person.Builder::class) -@ToolsJacksonDatabindAnnotationJsonDeserialize(builder = Person.Builder::class) +@JsonDeserialize(builder = Person.Builder::class) public class Person( firstname: () -> String? = firstnameDefault, lastname: () -> String? = lastnameDefault, @@ -38,8 +35,7 @@ public class Person( { throw IllegalStateException("Field `lastname` was not requested") } } - @FasterxmlJacksonDatabindAnnotationJsonPOJOBuilder - @ToolsJacksonDatabindAnnotationJsonPOJOBuilder + @JsonPOJOBuilder @JsonIgnoreProperties("__typename") public class Builder { private var firstname: () -> String? = firstnameDefault diff --git a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/constantsWithExtendedInputTypes/expected/types/Query.kt b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/constantsWithExtendedInputTypes/expected/types/Query.kt index 542a68d32..7696e9ba4 100644 --- a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/constantsWithExtendedInputTypes/expected/types/Query.kt +++ b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/constantsWithExtendedInputTypes/expected/types/Query.kt @@ -3,17 +3,14 @@ package com.netflix.graphql.dgs.codegen.cases.constantsWithExtendedInputTypes.ex import com.fasterxml.jackson.`annotation`.JsonIgnoreProperties import com.fasterxml.jackson.`annotation`.JsonProperty import com.fasterxml.jackson.`annotation`.JsonTypeInfo +import com.fasterxml.jackson.databind.`annotation`.JsonDeserialize +import com.fasterxml.jackson.databind.`annotation`.JsonPOJOBuilder import java.lang.IllegalStateException import kotlin.collections.List import kotlin.jvm.JvmName -import com.fasterxml.jackson.databind.`annotation`.JsonDeserialize as FasterxmlJacksonDatabindAnnotationJsonDeserialize -import com.fasterxml.jackson.databind.`annotation`.JsonPOJOBuilder as FasterxmlJacksonDatabindAnnotationJsonPOJOBuilder -import tools.jackson.databind.`annotation`.JsonDeserialize as ToolsJacksonDatabindAnnotationJsonDeserialize -import tools.jackson.databind.`annotation`.JsonPOJOBuilder as ToolsJacksonDatabindAnnotationJsonPOJOBuilder @JsonTypeInfo(use = JsonTypeInfo.Id.NONE) -@FasterxmlJacksonDatabindAnnotationJsonDeserialize(builder = Query.Builder::class) -@ToolsJacksonDatabindAnnotationJsonDeserialize(builder = Query.Builder::class) +@JsonDeserialize(builder = Query.Builder::class) public class Query( people: () -> List? = peopleDefault, ) { @@ -28,8 +25,7 @@ public class Query( { throw IllegalStateException("Field `people` was not requested") } } - @FasterxmlJacksonDatabindAnnotationJsonPOJOBuilder - @ToolsJacksonDatabindAnnotationJsonPOJOBuilder + @JsonPOJOBuilder @JsonIgnoreProperties("__typename") public class Builder { private var people: () -> List? = peopleDefault diff --git a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/constantsWithExtendedInterface/expected/types/Query.kt b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/constantsWithExtendedInterface/expected/types/Query.kt index 3531a7ba0..2961f273a 100644 --- a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/constantsWithExtendedInterface/expected/types/Query.kt +++ b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/constantsWithExtendedInterface/expected/types/Query.kt @@ -3,17 +3,14 @@ package com.netflix.graphql.dgs.codegen.cases.constantsWithExtendedInterface.exp import com.fasterxml.jackson.`annotation`.JsonIgnoreProperties import com.fasterxml.jackson.`annotation`.JsonProperty import com.fasterxml.jackson.`annotation`.JsonTypeInfo +import com.fasterxml.jackson.databind.`annotation`.JsonDeserialize +import com.fasterxml.jackson.databind.`annotation`.JsonPOJOBuilder import java.lang.IllegalStateException import kotlin.collections.List import kotlin.jvm.JvmName -import com.fasterxml.jackson.databind.`annotation`.JsonDeserialize as FasterxmlJacksonDatabindAnnotationJsonDeserialize -import com.fasterxml.jackson.databind.`annotation`.JsonPOJOBuilder as FasterxmlJacksonDatabindAnnotationJsonPOJOBuilder -import tools.jackson.databind.`annotation`.JsonDeserialize as ToolsJacksonDatabindAnnotationJsonDeserialize -import tools.jackson.databind.`annotation`.JsonPOJOBuilder as ToolsJacksonDatabindAnnotationJsonPOJOBuilder @JsonTypeInfo(use = JsonTypeInfo.Id.NONE) -@FasterxmlJacksonDatabindAnnotationJsonDeserialize(builder = Query.Builder::class) -@ToolsJacksonDatabindAnnotationJsonDeserialize(builder = Query.Builder::class) +@JsonDeserialize(builder = Query.Builder::class) public class Query( people: () -> List? = peopleDefault, ) { @@ -28,8 +25,7 @@ public class Query( { throw IllegalStateException("Field `people` was not requested") } } - @FasterxmlJacksonDatabindAnnotationJsonPOJOBuilder - @ToolsJacksonDatabindAnnotationJsonPOJOBuilder + @JsonPOJOBuilder @JsonIgnoreProperties("__typename") public class Builder { private var people: () -> List? = peopleDefault diff --git a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/constantsWithExtendedQuery/expected/types/Person.kt b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/constantsWithExtendedQuery/expected/types/Person.kt index 339598bfd..da3f6ef37 100644 --- a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/constantsWithExtendedQuery/expected/types/Person.kt +++ b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/constantsWithExtendedQuery/expected/types/Person.kt @@ -3,17 +3,14 @@ package com.netflix.graphql.dgs.codegen.cases.constantsWithExtendedQuery.expecte import com.fasterxml.jackson.`annotation`.JsonIgnoreProperties import com.fasterxml.jackson.`annotation`.JsonProperty import com.fasterxml.jackson.`annotation`.JsonTypeInfo +import com.fasterxml.jackson.databind.`annotation`.JsonDeserialize +import com.fasterxml.jackson.databind.`annotation`.JsonPOJOBuilder import java.lang.IllegalStateException import kotlin.String import kotlin.jvm.JvmName -import com.fasterxml.jackson.databind.`annotation`.JsonDeserialize as FasterxmlJacksonDatabindAnnotationJsonDeserialize -import com.fasterxml.jackson.databind.`annotation`.JsonPOJOBuilder as FasterxmlJacksonDatabindAnnotationJsonPOJOBuilder -import tools.jackson.databind.`annotation`.JsonDeserialize as ToolsJacksonDatabindAnnotationJsonDeserialize -import tools.jackson.databind.`annotation`.JsonPOJOBuilder as ToolsJacksonDatabindAnnotationJsonPOJOBuilder @JsonTypeInfo(use = JsonTypeInfo.Id.NONE) -@FasterxmlJacksonDatabindAnnotationJsonDeserialize(builder = Person.Builder::class) -@ToolsJacksonDatabindAnnotationJsonDeserialize(builder = Person.Builder::class) +@JsonDeserialize(builder = Person.Builder::class) public class Person( firstname: () -> String? = firstnameDefault, lastname: () -> String? = lastnameDefault, @@ -38,8 +35,7 @@ public class Person( { throw IllegalStateException("Field `lastname` was not requested") } } - @FasterxmlJacksonDatabindAnnotationJsonPOJOBuilder - @ToolsJacksonDatabindAnnotationJsonPOJOBuilder + @JsonPOJOBuilder @JsonIgnoreProperties("__typename") public class Builder { private var firstname: () -> String? = firstnameDefault diff --git a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/constantsWithExtendedQuery/expected/types/Query.kt b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/constantsWithExtendedQuery/expected/types/Query.kt index 3eef2e4c0..8ecf2b9cb 100644 --- a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/constantsWithExtendedQuery/expected/types/Query.kt +++ b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/constantsWithExtendedQuery/expected/types/Query.kt @@ -3,17 +3,14 @@ package com.netflix.graphql.dgs.codegen.cases.constantsWithExtendedQuery.expecte import com.fasterxml.jackson.`annotation`.JsonIgnoreProperties import com.fasterxml.jackson.`annotation`.JsonProperty import com.fasterxml.jackson.`annotation`.JsonTypeInfo +import com.fasterxml.jackson.databind.`annotation`.JsonDeserialize +import com.fasterxml.jackson.databind.`annotation`.JsonPOJOBuilder import java.lang.IllegalStateException import kotlin.collections.List import kotlin.jvm.JvmName -import com.fasterxml.jackson.databind.`annotation`.JsonDeserialize as FasterxmlJacksonDatabindAnnotationJsonDeserialize -import com.fasterxml.jackson.databind.`annotation`.JsonPOJOBuilder as FasterxmlJacksonDatabindAnnotationJsonPOJOBuilder -import tools.jackson.databind.`annotation`.JsonDeserialize as ToolsJacksonDatabindAnnotationJsonDeserialize -import tools.jackson.databind.`annotation`.JsonPOJOBuilder as ToolsJacksonDatabindAnnotationJsonPOJOBuilder @JsonTypeInfo(use = JsonTypeInfo.Id.NONE) -@FasterxmlJacksonDatabindAnnotationJsonDeserialize(builder = Query.Builder::class) -@ToolsJacksonDatabindAnnotationJsonDeserialize(builder = Query.Builder::class) +@JsonDeserialize(builder = Query.Builder::class) public class Query( people: () -> List? = peopleDefault, friends: () -> List? = friendsDefault, @@ -38,8 +35,7 @@ public class Query( { throw IllegalStateException("Field `friends` was not requested") } } - @FasterxmlJacksonDatabindAnnotationJsonPOJOBuilder - @ToolsJacksonDatabindAnnotationJsonPOJOBuilder + @JsonPOJOBuilder @JsonIgnoreProperties("__typename") public class Builder { private var people: () -> List? = peopleDefault diff --git a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/constantsWithExtendedTypes/expected/types/Person.kt b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/constantsWithExtendedTypes/expected/types/Person.kt index 105122809..82eaf19f6 100644 --- a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/constantsWithExtendedTypes/expected/types/Person.kt +++ b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/constantsWithExtendedTypes/expected/types/Person.kt @@ -3,17 +3,14 @@ package com.netflix.graphql.dgs.codegen.cases.constantsWithExtendedTypes.expecte import com.fasterxml.jackson.`annotation`.JsonIgnoreProperties import com.fasterxml.jackson.`annotation`.JsonProperty import com.fasterxml.jackson.`annotation`.JsonTypeInfo +import com.fasterxml.jackson.databind.`annotation`.JsonDeserialize +import com.fasterxml.jackson.databind.`annotation`.JsonPOJOBuilder import java.lang.IllegalStateException import kotlin.String import kotlin.jvm.JvmName -import com.fasterxml.jackson.databind.`annotation`.JsonDeserialize as FasterxmlJacksonDatabindAnnotationJsonDeserialize -import com.fasterxml.jackson.databind.`annotation`.JsonPOJOBuilder as FasterxmlJacksonDatabindAnnotationJsonPOJOBuilder -import tools.jackson.databind.`annotation`.JsonDeserialize as ToolsJacksonDatabindAnnotationJsonDeserialize -import tools.jackson.databind.`annotation`.JsonPOJOBuilder as ToolsJacksonDatabindAnnotationJsonPOJOBuilder @JsonTypeInfo(use = JsonTypeInfo.Id.NONE) -@FasterxmlJacksonDatabindAnnotationJsonDeserialize(builder = Person.Builder::class) -@ToolsJacksonDatabindAnnotationJsonDeserialize(builder = Person.Builder::class) +@JsonDeserialize(builder = Person.Builder::class) public class Person( firstname: () -> String? = firstnameDefault, lastname: () -> String? = lastnameDefault, @@ -48,8 +45,7 @@ public class Person( { throw IllegalStateException("Field `email` was not requested") } } - @FasterxmlJacksonDatabindAnnotationJsonPOJOBuilder - @ToolsJacksonDatabindAnnotationJsonPOJOBuilder + @JsonPOJOBuilder @JsonIgnoreProperties("__typename") public class Builder { private var firstname: () -> String? = firstnameDefault diff --git a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/constantsWithExtendedTypes/expected/types/Query.kt b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/constantsWithExtendedTypes/expected/types/Query.kt index a448c4827..6bd54c0ef 100644 --- a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/constantsWithExtendedTypes/expected/types/Query.kt +++ b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/constantsWithExtendedTypes/expected/types/Query.kt @@ -3,17 +3,14 @@ package com.netflix.graphql.dgs.codegen.cases.constantsWithExtendedTypes.expecte import com.fasterxml.jackson.`annotation`.JsonIgnoreProperties import com.fasterxml.jackson.`annotation`.JsonProperty import com.fasterxml.jackson.`annotation`.JsonTypeInfo +import com.fasterxml.jackson.databind.`annotation`.JsonDeserialize +import com.fasterxml.jackson.databind.`annotation`.JsonPOJOBuilder import java.lang.IllegalStateException import kotlin.collections.List import kotlin.jvm.JvmName -import com.fasterxml.jackson.databind.`annotation`.JsonDeserialize as FasterxmlJacksonDatabindAnnotationJsonDeserialize -import com.fasterxml.jackson.databind.`annotation`.JsonPOJOBuilder as FasterxmlJacksonDatabindAnnotationJsonPOJOBuilder -import tools.jackson.databind.`annotation`.JsonDeserialize as ToolsJacksonDatabindAnnotationJsonDeserialize -import tools.jackson.databind.`annotation`.JsonPOJOBuilder as ToolsJacksonDatabindAnnotationJsonPOJOBuilder @JsonTypeInfo(use = JsonTypeInfo.Id.NONE) -@FasterxmlJacksonDatabindAnnotationJsonDeserialize(builder = Query.Builder::class) -@ToolsJacksonDatabindAnnotationJsonDeserialize(builder = Query.Builder::class) +@JsonDeserialize(builder = Query.Builder::class) public class Query( people: () -> List? = peopleDefault, ) { @@ -28,8 +25,7 @@ public class Query( { throw IllegalStateException("Field `people` was not requested") } } - @FasterxmlJacksonDatabindAnnotationJsonPOJOBuilder - @ToolsJacksonDatabindAnnotationJsonPOJOBuilder + @JsonPOJOBuilder @JsonIgnoreProperties("__typename") public class Builder { private var people: () -> List? = peopleDefault diff --git a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassDocs/expected/types/Movie.kt b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassDocs/expected/types/Movie.kt index c00b4b440..64f1ac388 100644 --- a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassDocs/expected/types/Movie.kt +++ b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassDocs/expected/types/Movie.kt @@ -3,21 +3,18 @@ package com.netflix.graphql.dgs.codegen.cases.dataClassDocs.expected.types import com.fasterxml.jackson.`annotation`.JsonIgnoreProperties import com.fasterxml.jackson.`annotation`.JsonProperty import com.fasterxml.jackson.`annotation`.JsonTypeInfo +import com.fasterxml.jackson.databind.`annotation`.JsonDeserialize +import com.fasterxml.jackson.databind.`annotation`.JsonPOJOBuilder import java.lang.IllegalStateException import kotlin.String import kotlin.jvm.JvmName -import com.fasterxml.jackson.databind.`annotation`.JsonDeserialize as FasterxmlJacksonDatabindAnnotationJsonDeserialize -import com.fasterxml.jackson.databind.`annotation`.JsonPOJOBuilder as FasterxmlJacksonDatabindAnnotationJsonPOJOBuilder -import tools.jackson.databind.`annotation`.JsonDeserialize as ToolsJacksonDatabindAnnotationJsonDeserialize -import tools.jackson.databind.`annotation`.JsonPOJOBuilder as ToolsJacksonDatabindAnnotationJsonPOJOBuilder /** * Movies are fun to watch. * They also work well as examples in GraphQL. */ @JsonTypeInfo(use = JsonTypeInfo.Id.NONE) -@FasterxmlJacksonDatabindAnnotationJsonDeserialize(builder = Movie.Builder::class) -@ToolsJacksonDatabindAnnotationJsonDeserialize(builder = Movie.Builder::class) +@JsonDeserialize(builder = Movie.Builder::class) public class Movie( title: () -> String? = titleDefault, ) { @@ -32,8 +29,7 @@ public class Movie( { throw IllegalStateException("Field `title` was not requested") } } - @FasterxmlJacksonDatabindAnnotationJsonPOJOBuilder - @ToolsJacksonDatabindAnnotationJsonPOJOBuilder + @JsonPOJOBuilder @JsonIgnoreProperties("__typename") public class Builder { private var title: () -> String? = titleDefault diff --git a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassDocs/expected/types/Query.kt b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassDocs/expected/types/Query.kt index 6888753a7..d6474ef21 100644 --- a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassDocs/expected/types/Query.kt +++ b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassDocs/expected/types/Query.kt @@ -3,16 +3,13 @@ package com.netflix.graphql.dgs.codegen.cases.dataClassDocs.expected.types import com.fasterxml.jackson.`annotation`.JsonIgnoreProperties import com.fasterxml.jackson.`annotation`.JsonProperty import com.fasterxml.jackson.`annotation`.JsonTypeInfo +import com.fasterxml.jackson.databind.`annotation`.JsonDeserialize +import com.fasterxml.jackson.databind.`annotation`.JsonPOJOBuilder import java.lang.IllegalStateException import kotlin.jvm.JvmName -import com.fasterxml.jackson.databind.`annotation`.JsonDeserialize as FasterxmlJacksonDatabindAnnotationJsonDeserialize -import com.fasterxml.jackson.databind.`annotation`.JsonPOJOBuilder as FasterxmlJacksonDatabindAnnotationJsonPOJOBuilder -import tools.jackson.databind.`annotation`.JsonDeserialize as ToolsJacksonDatabindAnnotationJsonDeserialize -import tools.jackson.databind.`annotation`.JsonPOJOBuilder as ToolsJacksonDatabindAnnotationJsonPOJOBuilder @JsonTypeInfo(use = JsonTypeInfo.Id.NONE) -@FasterxmlJacksonDatabindAnnotationJsonDeserialize(builder = Query.Builder::class) -@ToolsJacksonDatabindAnnotationJsonDeserialize(builder = Query.Builder::class) +@JsonDeserialize(builder = Query.Builder::class) public class Query( search: () -> Movie? = searchDefault, ) { @@ -27,8 +24,7 @@ public class Query( { throw IllegalStateException("Field `search` was not requested") } } - @FasterxmlJacksonDatabindAnnotationJsonPOJOBuilder - @ToolsJacksonDatabindAnnotationJsonPOJOBuilder + @JsonPOJOBuilder @JsonIgnoreProperties("__typename") public class Builder { private var search: () -> Movie? = searchDefault diff --git a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassFieldDocs/expected/types/Movie.kt b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassFieldDocs/expected/types/Movie.kt index fd860c27b..b56b7fd0e 100644 --- a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassFieldDocs/expected/types/Movie.kt +++ b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassFieldDocs/expected/types/Movie.kt @@ -3,17 +3,14 @@ package com.netflix.graphql.dgs.codegen.cases.dataClassFieldDocs.expected.types import com.fasterxml.jackson.`annotation`.JsonIgnoreProperties import com.fasterxml.jackson.`annotation`.JsonProperty import com.fasterxml.jackson.`annotation`.JsonTypeInfo +import com.fasterxml.jackson.databind.`annotation`.JsonDeserialize +import com.fasterxml.jackson.databind.`annotation`.JsonPOJOBuilder import java.lang.IllegalStateException import kotlin.String import kotlin.jvm.JvmName -import com.fasterxml.jackson.databind.`annotation`.JsonDeserialize as FasterxmlJacksonDatabindAnnotationJsonDeserialize -import com.fasterxml.jackson.databind.`annotation`.JsonPOJOBuilder as FasterxmlJacksonDatabindAnnotationJsonPOJOBuilder -import tools.jackson.databind.`annotation`.JsonDeserialize as ToolsJacksonDatabindAnnotationJsonDeserialize -import tools.jackson.databind.`annotation`.JsonPOJOBuilder as ToolsJacksonDatabindAnnotationJsonPOJOBuilder @JsonTypeInfo(use = JsonTypeInfo.Id.NONE) -@FasterxmlJacksonDatabindAnnotationJsonDeserialize(builder = Movie.Builder::class) -@ToolsJacksonDatabindAnnotationJsonDeserialize(builder = Movie.Builder::class) +@JsonDeserialize(builder = Movie.Builder::class) public class Movie( title: () -> String? = titleDefault, ) { @@ -31,8 +28,7 @@ public class Movie( { throw IllegalStateException("Field `title` was not requested") } } - @FasterxmlJacksonDatabindAnnotationJsonPOJOBuilder - @ToolsJacksonDatabindAnnotationJsonPOJOBuilder + @JsonPOJOBuilder @JsonIgnoreProperties("__typename") public class Builder { private var title: () -> String? = titleDefault diff --git a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassFieldDocs/expected/types/Query.kt b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassFieldDocs/expected/types/Query.kt index d4762054b..74e1ad41b 100644 --- a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassFieldDocs/expected/types/Query.kt +++ b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassFieldDocs/expected/types/Query.kt @@ -3,16 +3,13 @@ package com.netflix.graphql.dgs.codegen.cases.dataClassFieldDocs.expected.types import com.fasterxml.jackson.`annotation`.JsonIgnoreProperties import com.fasterxml.jackson.`annotation`.JsonProperty import com.fasterxml.jackson.`annotation`.JsonTypeInfo +import com.fasterxml.jackson.databind.`annotation`.JsonDeserialize +import com.fasterxml.jackson.databind.`annotation`.JsonPOJOBuilder import java.lang.IllegalStateException import kotlin.jvm.JvmName -import com.fasterxml.jackson.databind.`annotation`.JsonDeserialize as FasterxmlJacksonDatabindAnnotationJsonDeserialize -import com.fasterxml.jackson.databind.`annotation`.JsonPOJOBuilder as FasterxmlJacksonDatabindAnnotationJsonPOJOBuilder -import tools.jackson.databind.`annotation`.JsonDeserialize as ToolsJacksonDatabindAnnotationJsonDeserialize -import tools.jackson.databind.`annotation`.JsonPOJOBuilder as ToolsJacksonDatabindAnnotationJsonPOJOBuilder @JsonTypeInfo(use = JsonTypeInfo.Id.NONE) -@FasterxmlJacksonDatabindAnnotationJsonDeserialize(builder = Query.Builder::class) -@ToolsJacksonDatabindAnnotationJsonDeserialize(builder = Query.Builder::class) +@JsonDeserialize(builder = Query.Builder::class) public class Query( search: () -> Movie? = searchDefault, ) { @@ -27,8 +24,7 @@ public class Query( { throw IllegalStateException("Field `search` was not requested") } } - @FasterxmlJacksonDatabindAnnotationJsonPOJOBuilder - @ToolsJacksonDatabindAnnotationJsonPOJOBuilder + @JsonPOJOBuilder @JsonIgnoreProperties("__typename") public class Builder { private var search: () -> Movie? = searchDefault diff --git a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWIthNoFields/expected/types/Person.kt b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWIthNoFields/expected/types/Person.kt index caa988649..0b969e337 100644 --- a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWIthNoFields/expected/types/Person.kt +++ b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWIthNoFields/expected/types/Person.kt @@ -2,19 +2,15 @@ package com.netflix.graphql.dgs.codegen.cases.dataClassWIthNoFields.expected.typ import com.fasterxml.jackson.`annotation`.JsonIgnoreProperties import com.fasterxml.jackson.`annotation`.JsonTypeInfo -import com.fasterxml.jackson.databind.`annotation`.JsonDeserialize as FasterxmlJacksonDatabindAnnotationJsonDeserialize -import com.fasterxml.jackson.databind.`annotation`.JsonPOJOBuilder as FasterxmlJacksonDatabindAnnotationJsonPOJOBuilder -import tools.jackson.databind.`annotation`.JsonDeserialize as ToolsJacksonDatabindAnnotationJsonDeserialize -import tools.jackson.databind.`annotation`.JsonPOJOBuilder as ToolsJacksonDatabindAnnotationJsonPOJOBuilder +import com.fasterxml.jackson.databind.`annotation`.JsonDeserialize +import com.fasterxml.jackson.databind.`annotation`.JsonPOJOBuilder @JsonTypeInfo(use = JsonTypeInfo.Id.NONE) -@FasterxmlJacksonDatabindAnnotationJsonDeserialize(builder = Person.Builder::class) -@ToolsJacksonDatabindAnnotationJsonDeserialize(builder = Person.Builder::class) +@JsonDeserialize(builder = Person.Builder::class) public class Person() { public companion object - @FasterxmlJacksonDatabindAnnotationJsonPOJOBuilder - @ToolsJacksonDatabindAnnotationJsonPOJOBuilder + @JsonPOJOBuilder @JsonIgnoreProperties("__typename") public class Builder { public fun build(): Person = Person( diff --git a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWIthNoFields/expected/types/Query.kt b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWIthNoFields/expected/types/Query.kt index 907876835..e6c0d19ce 100644 --- a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWIthNoFields/expected/types/Query.kt +++ b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWIthNoFields/expected/types/Query.kt @@ -3,16 +3,13 @@ package com.netflix.graphql.dgs.codegen.cases.dataClassWIthNoFields.expected.typ import com.fasterxml.jackson.`annotation`.JsonIgnoreProperties import com.fasterxml.jackson.`annotation`.JsonProperty import com.fasterxml.jackson.`annotation`.JsonTypeInfo +import com.fasterxml.jackson.databind.`annotation`.JsonDeserialize +import com.fasterxml.jackson.databind.`annotation`.JsonPOJOBuilder import java.lang.IllegalStateException import kotlin.jvm.JvmName -import com.fasterxml.jackson.databind.`annotation`.JsonDeserialize as FasterxmlJacksonDatabindAnnotationJsonDeserialize -import com.fasterxml.jackson.databind.`annotation`.JsonPOJOBuilder as FasterxmlJacksonDatabindAnnotationJsonPOJOBuilder -import tools.jackson.databind.`annotation`.JsonDeserialize as ToolsJacksonDatabindAnnotationJsonDeserialize -import tools.jackson.databind.`annotation`.JsonPOJOBuilder as ToolsJacksonDatabindAnnotationJsonPOJOBuilder @JsonTypeInfo(use = JsonTypeInfo.Id.NONE) -@FasterxmlJacksonDatabindAnnotationJsonDeserialize(builder = Query.Builder::class) -@ToolsJacksonDatabindAnnotationJsonDeserialize(builder = Query.Builder::class) +@JsonDeserialize(builder = Query.Builder::class) public class Query( me: () -> Person? = meDefault, ) { @@ -27,8 +24,7 @@ public class Query( { throw IllegalStateException("Field `me` was not requested") } } - @FasterxmlJacksonDatabindAnnotationJsonPOJOBuilder - @ToolsJacksonDatabindAnnotationJsonPOJOBuilder + @JsonPOJOBuilder @JsonIgnoreProperties("__typename") public class Builder { private var me: () -> Person? = meDefault diff --git a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithBooleanField/expected/types/Query.kt b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithBooleanField/expected/types/Query.kt index 95318b3dd..0d16e85d6 100644 --- a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithBooleanField/expected/types/Query.kt +++ b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithBooleanField/expected/types/Query.kt @@ -3,16 +3,13 @@ package com.netflix.graphql.dgs.codegen.cases.dataClassWithBooleanField.expected import com.fasterxml.jackson.`annotation`.JsonIgnoreProperties import com.fasterxml.jackson.`annotation`.JsonProperty import com.fasterxml.jackson.`annotation`.JsonTypeInfo +import com.fasterxml.jackson.databind.`annotation`.JsonDeserialize +import com.fasterxml.jackson.databind.`annotation`.JsonPOJOBuilder import java.lang.IllegalStateException import kotlin.jvm.JvmName -import com.fasterxml.jackson.databind.`annotation`.JsonDeserialize as FasterxmlJacksonDatabindAnnotationJsonDeserialize -import com.fasterxml.jackson.databind.`annotation`.JsonPOJOBuilder as FasterxmlJacksonDatabindAnnotationJsonPOJOBuilder -import tools.jackson.databind.`annotation`.JsonDeserialize as ToolsJacksonDatabindAnnotationJsonDeserialize -import tools.jackson.databind.`annotation`.JsonPOJOBuilder as ToolsJacksonDatabindAnnotationJsonPOJOBuilder @JsonTypeInfo(use = JsonTypeInfo.Id.NONE) -@FasterxmlJacksonDatabindAnnotationJsonDeserialize(builder = Query.Builder::class) -@ToolsJacksonDatabindAnnotationJsonDeserialize(builder = Query.Builder::class) +@JsonDeserialize(builder = Query.Builder::class) public class Query( test: () -> RequiredTestType? = testDefault, ) { @@ -27,8 +24,7 @@ public class Query( { throw IllegalStateException("Field `test` was not requested") } } - @FasterxmlJacksonDatabindAnnotationJsonPOJOBuilder - @ToolsJacksonDatabindAnnotationJsonPOJOBuilder + @JsonPOJOBuilder @JsonIgnoreProperties("__typename") public class Builder { private var test: () -> RequiredTestType? = testDefault diff --git a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithBooleanField/expected/types/RequiredTestType.kt b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithBooleanField/expected/types/RequiredTestType.kt index 0669d53b6..f5b7c7cb4 100644 --- a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithBooleanField/expected/types/RequiredTestType.kt +++ b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithBooleanField/expected/types/RequiredTestType.kt @@ -3,17 +3,14 @@ package com.netflix.graphql.dgs.codegen.cases.dataClassWithBooleanField.expected import com.fasterxml.jackson.`annotation`.JsonIgnoreProperties import com.fasterxml.jackson.`annotation`.JsonProperty import com.fasterxml.jackson.`annotation`.JsonTypeInfo +import com.fasterxml.jackson.databind.`annotation`.JsonDeserialize +import com.fasterxml.jackson.databind.`annotation`.JsonPOJOBuilder import java.lang.IllegalStateException import kotlin.Boolean import kotlin.jvm.JvmName -import com.fasterxml.jackson.databind.`annotation`.JsonDeserialize as FasterxmlJacksonDatabindAnnotationJsonDeserialize -import com.fasterxml.jackson.databind.`annotation`.JsonPOJOBuilder as FasterxmlJacksonDatabindAnnotationJsonPOJOBuilder -import tools.jackson.databind.`annotation`.JsonDeserialize as ToolsJacksonDatabindAnnotationJsonDeserialize -import tools.jackson.databind.`annotation`.JsonPOJOBuilder as ToolsJacksonDatabindAnnotationJsonPOJOBuilder @JsonTypeInfo(use = JsonTypeInfo.Id.NONE) -@FasterxmlJacksonDatabindAnnotationJsonDeserialize(builder = RequiredTestType.Builder::class) -@ToolsJacksonDatabindAnnotationJsonDeserialize(builder = RequiredTestType.Builder::class) +@JsonDeserialize(builder = RequiredTestType.Builder::class) public class RequiredTestType( isRequired: () -> Boolean = isRequiredDefault, ) { @@ -28,8 +25,7 @@ public class RequiredTestType( { throw IllegalStateException("Field `isRequired` was not requested") } } - @FasterxmlJacksonDatabindAnnotationJsonPOJOBuilder - @ToolsJacksonDatabindAnnotationJsonPOJOBuilder + @JsonPOJOBuilder @JsonIgnoreProperties("__typename") public class Builder { private var isRequired: () -> Boolean = isRequiredDefault diff --git a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithDeclaredScalars/expected/types/Entity.kt b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithDeclaredScalars/expected/types/Entity.kt index 8d81dc2c7..675fae78e 100644 --- a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithDeclaredScalars/expected/types/Entity.kt +++ b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithDeclaredScalars/expected/types/Entity.kt @@ -3,18 +3,15 @@ package com.netflix.graphql.dgs.codegen.cases.dataClassWithDeclaredScalars.expec import com.fasterxml.jackson.`annotation`.JsonIgnoreProperties import com.fasterxml.jackson.`annotation`.JsonProperty import com.fasterxml.jackson.`annotation`.JsonTypeInfo +import com.fasterxml.jackson.databind.`annotation`.JsonDeserialize +import com.fasterxml.jackson.databind.`annotation`.JsonPOJOBuilder import java.lang.IllegalStateException import java.time.OffsetDateTime import kotlin.Long import kotlin.jvm.JvmName -import com.fasterxml.jackson.databind.`annotation`.JsonDeserialize as FasterxmlJacksonDatabindAnnotationJsonDeserialize -import com.fasterxml.jackson.databind.`annotation`.JsonPOJOBuilder as FasterxmlJacksonDatabindAnnotationJsonPOJOBuilder -import tools.jackson.databind.`annotation`.JsonDeserialize as ToolsJacksonDatabindAnnotationJsonDeserialize -import tools.jackson.databind.`annotation`.JsonPOJOBuilder as ToolsJacksonDatabindAnnotationJsonPOJOBuilder @JsonTypeInfo(use = JsonTypeInfo.Id.NONE) -@FasterxmlJacksonDatabindAnnotationJsonDeserialize(builder = Entity.Builder::class) -@ToolsJacksonDatabindAnnotationJsonDeserialize(builder = Entity.Builder::class) +@JsonDeserialize(builder = Entity.Builder::class) public class Entity( long: () -> Long? = longDefault, dateTime: () -> OffsetDateTime? = dateTimeDefault, @@ -39,8 +36,7 @@ public class Entity( { throw IllegalStateException("Field `dateTime` was not requested") } } - @FasterxmlJacksonDatabindAnnotationJsonPOJOBuilder - @ToolsJacksonDatabindAnnotationJsonPOJOBuilder + @JsonPOJOBuilder @JsonIgnoreProperties("__typename") public class Builder { private var long: () -> Long? = longDefault diff --git a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithDeclaredScalars/expected/types/EntityConnection.kt b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithDeclaredScalars/expected/types/EntityConnection.kt index c4c0a7f47..1ef984539 100644 --- a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithDeclaredScalars/expected/types/EntityConnection.kt +++ b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithDeclaredScalars/expected/types/EntityConnection.kt @@ -3,17 +3,14 @@ package com.netflix.graphql.dgs.codegen.cases.dataClassWithDeclaredScalars.expec import com.fasterxml.jackson.`annotation`.JsonIgnoreProperties import com.fasterxml.jackson.`annotation`.JsonProperty import com.fasterxml.jackson.`annotation`.JsonTypeInfo +import com.fasterxml.jackson.databind.`annotation`.JsonDeserialize +import com.fasterxml.jackson.databind.`annotation`.JsonPOJOBuilder import java.lang.IllegalStateException import kotlin.collections.List import kotlin.jvm.JvmName -import com.fasterxml.jackson.databind.`annotation`.JsonDeserialize as FasterxmlJacksonDatabindAnnotationJsonDeserialize -import com.fasterxml.jackson.databind.`annotation`.JsonPOJOBuilder as FasterxmlJacksonDatabindAnnotationJsonPOJOBuilder -import tools.jackson.databind.`annotation`.JsonDeserialize as ToolsJacksonDatabindAnnotationJsonDeserialize -import tools.jackson.databind.`annotation`.JsonPOJOBuilder as ToolsJacksonDatabindAnnotationJsonPOJOBuilder @JsonTypeInfo(use = JsonTypeInfo.Id.NONE) -@FasterxmlJacksonDatabindAnnotationJsonDeserialize(builder = EntityConnection.Builder::class) -@ToolsJacksonDatabindAnnotationJsonDeserialize(builder = EntityConnection.Builder::class) +@JsonDeserialize(builder = EntityConnection.Builder::class) public class EntityConnection( pageInfo: () -> PageInfo = pageInfoDefault, edges: () -> List? = edgesDefault, @@ -38,8 +35,7 @@ public class EntityConnection( { throw IllegalStateException("Field `edges` was not requested") } } - @FasterxmlJacksonDatabindAnnotationJsonPOJOBuilder - @ToolsJacksonDatabindAnnotationJsonPOJOBuilder + @JsonPOJOBuilder @JsonIgnoreProperties("__typename") public class Builder { private var pageInfo: () -> PageInfo = pageInfoDefault diff --git a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithDeclaredScalars/expected/types/EntityEdge.kt b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithDeclaredScalars/expected/types/EntityEdge.kt index 80bff3f2a..2ff90a47d 100644 --- a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithDeclaredScalars/expected/types/EntityEdge.kt +++ b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithDeclaredScalars/expected/types/EntityEdge.kt @@ -3,17 +3,14 @@ package com.netflix.graphql.dgs.codegen.cases.dataClassWithDeclaredScalars.expec import com.fasterxml.jackson.`annotation`.JsonIgnoreProperties import com.fasterxml.jackson.`annotation`.JsonProperty import com.fasterxml.jackson.`annotation`.JsonTypeInfo +import com.fasterxml.jackson.databind.`annotation`.JsonDeserialize +import com.fasterxml.jackson.databind.`annotation`.JsonPOJOBuilder import java.lang.IllegalStateException import kotlin.String import kotlin.jvm.JvmName -import com.fasterxml.jackson.databind.`annotation`.JsonDeserialize as FasterxmlJacksonDatabindAnnotationJsonDeserialize -import com.fasterxml.jackson.databind.`annotation`.JsonPOJOBuilder as FasterxmlJacksonDatabindAnnotationJsonPOJOBuilder -import tools.jackson.databind.`annotation`.JsonDeserialize as ToolsJacksonDatabindAnnotationJsonDeserialize -import tools.jackson.databind.`annotation`.JsonPOJOBuilder as ToolsJacksonDatabindAnnotationJsonPOJOBuilder @JsonTypeInfo(use = JsonTypeInfo.Id.NONE) -@FasterxmlJacksonDatabindAnnotationJsonDeserialize(builder = EntityEdge.Builder::class) -@ToolsJacksonDatabindAnnotationJsonDeserialize(builder = EntityEdge.Builder::class) +@JsonDeserialize(builder = EntityEdge.Builder::class) public class EntityEdge( cursor: () -> String = cursorDefault, node: () -> Entity? = nodeDefault, @@ -38,8 +35,7 @@ public class EntityEdge( { throw IllegalStateException("Field `node` was not requested") } } - @FasterxmlJacksonDatabindAnnotationJsonPOJOBuilder - @ToolsJacksonDatabindAnnotationJsonPOJOBuilder + @JsonPOJOBuilder @JsonIgnoreProperties("__typename") public class Builder { private var cursor: () -> String = cursorDefault diff --git a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithDeclaredScalars/expected/types/PageInfo.kt b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithDeclaredScalars/expected/types/PageInfo.kt index 757a98108..16cd49208 100644 --- a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithDeclaredScalars/expected/types/PageInfo.kt +++ b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithDeclaredScalars/expected/types/PageInfo.kt @@ -3,18 +3,15 @@ package com.netflix.graphql.dgs.codegen.cases.dataClassWithDeclaredScalars.expec import com.fasterxml.jackson.`annotation`.JsonIgnoreProperties import com.fasterxml.jackson.`annotation`.JsonProperty import com.fasterxml.jackson.`annotation`.JsonTypeInfo +import com.fasterxml.jackson.databind.`annotation`.JsonDeserialize +import com.fasterxml.jackson.databind.`annotation`.JsonPOJOBuilder import java.lang.IllegalStateException import kotlin.Boolean import kotlin.String import kotlin.jvm.JvmName -import com.fasterxml.jackson.databind.`annotation`.JsonDeserialize as FasterxmlJacksonDatabindAnnotationJsonDeserialize -import com.fasterxml.jackson.databind.`annotation`.JsonPOJOBuilder as FasterxmlJacksonDatabindAnnotationJsonPOJOBuilder -import tools.jackson.databind.`annotation`.JsonDeserialize as ToolsJacksonDatabindAnnotationJsonDeserialize -import tools.jackson.databind.`annotation`.JsonPOJOBuilder as ToolsJacksonDatabindAnnotationJsonPOJOBuilder @JsonTypeInfo(use = JsonTypeInfo.Id.NONE) -@FasterxmlJacksonDatabindAnnotationJsonDeserialize(builder = PageInfo.Builder::class) -@ToolsJacksonDatabindAnnotationJsonDeserialize(builder = PageInfo.Builder::class) +@JsonDeserialize(builder = PageInfo.Builder::class) public class PageInfo( startCursor: () -> String? = startCursorDefault, endCursor: () -> String? = endCursorDefault, @@ -59,8 +56,7 @@ public class PageInfo( { throw IllegalStateException("Field `hasPreviousPage` was not requested") } } - @FasterxmlJacksonDatabindAnnotationJsonPOJOBuilder - @ToolsJacksonDatabindAnnotationJsonPOJOBuilder + @JsonPOJOBuilder @JsonIgnoreProperties("__typename") public class Builder { private var startCursor: () -> String? = startCursorDefault diff --git a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithDeclaredScalars/expected/types/Query.kt b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithDeclaredScalars/expected/types/Query.kt index 70510eda3..b03b6ed47 100644 --- a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithDeclaredScalars/expected/types/Query.kt +++ b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithDeclaredScalars/expected/types/Query.kt @@ -3,17 +3,14 @@ package com.netflix.graphql.dgs.codegen.cases.dataClassWithDeclaredScalars.expec import com.fasterxml.jackson.`annotation`.JsonIgnoreProperties import com.fasterxml.jackson.`annotation`.JsonProperty import com.fasterxml.jackson.`annotation`.JsonTypeInfo +import com.fasterxml.jackson.databind.`annotation`.JsonDeserialize +import com.fasterxml.jackson.databind.`annotation`.JsonPOJOBuilder import java.lang.IllegalStateException import kotlin.collections.List import kotlin.jvm.JvmName -import com.fasterxml.jackson.databind.`annotation`.JsonDeserialize as FasterxmlJacksonDatabindAnnotationJsonDeserialize -import com.fasterxml.jackson.databind.`annotation`.JsonPOJOBuilder as FasterxmlJacksonDatabindAnnotationJsonPOJOBuilder -import tools.jackson.databind.`annotation`.JsonDeserialize as ToolsJacksonDatabindAnnotationJsonDeserialize -import tools.jackson.databind.`annotation`.JsonPOJOBuilder as ToolsJacksonDatabindAnnotationJsonPOJOBuilder @JsonTypeInfo(use = JsonTypeInfo.Id.NONE) -@FasterxmlJacksonDatabindAnnotationJsonDeserialize(builder = Query.Builder::class) -@ToolsJacksonDatabindAnnotationJsonDeserialize(builder = Query.Builder::class) +@JsonDeserialize(builder = Query.Builder::class) public class Query( entity: () -> List? = entityDefault, entityConnection: () -> EntityConnection? = entityConnectionDefault, @@ -38,8 +35,7 @@ public class Query( { throw IllegalStateException("Field `entityConnection` was not requested") } } - @FasterxmlJacksonDatabindAnnotationJsonPOJOBuilder - @ToolsJacksonDatabindAnnotationJsonPOJOBuilder + @JsonPOJOBuilder @JsonIgnoreProperties("__typename") public class Builder { private var entity: () -> List? = entityDefault diff --git a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithDeeplyNestedComplexField/expected/types/Car.kt b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithDeeplyNestedComplexField/expected/types/Car.kt index 3dd77ebf7..4b1761276 100644 --- a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithDeeplyNestedComplexField/expected/types/Car.kt +++ b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithDeeplyNestedComplexField/expected/types/Car.kt @@ -3,17 +3,14 @@ package com.netflix.graphql.dgs.codegen.cases.dataClassWithDeeplyNestedComplexFi import com.fasterxml.jackson.`annotation`.JsonIgnoreProperties import com.fasterxml.jackson.`annotation`.JsonProperty import com.fasterxml.jackson.`annotation`.JsonTypeInfo +import com.fasterxml.jackson.databind.`annotation`.JsonDeserialize +import com.fasterxml.jackson.databind.`annotation`.JsonPOJOBuilder import java.lang.IllegalStateException import kotlin.String import kotlin.jvm.JvmName -import com.fasterxml.jackson.databind.`annotation`.JsonDeserialize as FasterxmlJacksonDatabindAnnotationJsonDeserialize -import com.fasterxml.jackson.databind.`annotation`.JsonPOJOBuilder as FasterxmlJacksonDatabindAnnotationJsonPOJOBuilder -import tools.jackson.databind.`annotation`.JsonDeserialize as ToolsJacksonDatabindAnnotationJsonDeserialize -import tools.jackson.databind.`annotation`.JsonPOJOBuilder as ToolsJacksonDatabindAnnotationJsonPOJOBuilder @JsonTypeInfo(use = JsonTypeInfo.Id.NONE) -@FasterxmlJacksonDatabindAnnotationJsonDeserialize(builder = Car.Builder::class) -@ToolsJacksonDatabindAnnotationJsonDeserialize(builder = Car.Builder::class) +@JsonDeserialize(builder = Car.Builder::class) public class Car( make: () -> String? = makeDefault, model: () -> String? = modelDefault, @@ -48,8 +45,7 @@ public class Car( { throw IllegalStateException("Field `engine` was not requested") } } - @FasterxmlJacksonDatabindAnnotationJsonPOJOBuilder - @ToolsJacksonDatabindAnnotationJsonPOJOBuilder + @JsonPOJOBuilder @JsonIgnoreProperties("__typename") public class Builder { private var make: () -> String? = makeDefault diff --git a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithDeeplyNestedComplexField/expected/types/Engine.kt b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithDeeplyNestedComplexField/expected/types/Engine.kt index 94c5b92dc..933dd8a2c 100644 --- a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithDeeplyNestedComplexField/expected/types/Engine.kt +++ b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithDeeplyNestedComplexField/expected/types/Engine.kt @@ -3,19 +3,16 @@ package com.netflix.graphql.dgs.codegen.cases.dataClassWithDeeplyNestedComplexFi import com.fasterxml.jackson.`annotation`.JsonIgnoreProperties import com.fasterxml.jackson.`annotation`.JsonProperty import com.fasterxml.jackson.`annotation`.JsonTypeInfo +import com.fasterxml.jackson.databind.`annotation`.JsonDeserialize +import com.fasterxml.jackson.databind.`annotation`.JsonPOJOBuilder import java.lang.IllegalStateException import kotlin.Double import kotlin.Int import kotlin.String import kotlin.jvm.JvmName -import com.fasterxml.jackson.databind.`annotation`.JsonDeserialize as FasterxmlJacksonDatabindAnnotationJsonDeserialize -import com.fasterxml.jackson.databind.`annotation`.JsonPOJOBuilder as FasterxmlJacksonDatabindAnnotationJsonPOJOBuilder -import tools.jackson.databind.`annotation`.JsonDeserialize as ToolsJacksonDatabindAnnotationJsonDeserialize -import tools.jackson.databind.`annotation`.JsonPOJOBuilder as ToolsJacksonDatabindAnnotationJsonPOJOBuilder @JsonTypeInfo(use = JsonTypeInfo.Id.NONE) -@FasterxmlJacksonDatabindAnnotationJsonDeserialize(builder = Engine.Builder::class) -@ToolsJacksonDatabindAnnotationJsonDeserialize(builder = Engine.Builder::class) +@JsonDeserialize(builder = Engine.Builder::class) public class Engine( type: () -> String? = typeDefault, bhp: () -> Int? = bhpDefault, @@ -60,8 +57,7 @@ public class Engine( { throw IllegalStateException("Field `performance` was not requested") } } - @FasterxmlJacksonDatabindAnnotationJsonPOJOBuilder - @ToolsJacksonDatabindAnnotationJsonPOJOBuilder + @JsonPOJOBuilder @JsonIgnoreProperties("__typename") public class Builder { private var type: () -> String? = typeDefault diff --git a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithDeeplyNestedComplexField/expected/types/Performance.kt b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithDeeplyNestedComplexField/expected/types/Performance.kt index d4fb771a1..45ee173af 100644 --- a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithDeeplyNestedComplexField/expected/types/Performance.kt +++ b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithDeeplyNestedComplexField/expected/types/Performance.kt @@ -3,17 +3,14 @@ package com.netflix.graphql.dgs.codegen.cases.dataClassWithDeeplyNestedComplexFi import com.fasterxml.jackson.`annotation`.JsonIgnoreProperties import com.fasterxml.jackson.`annotation`.JsonProperty import com.fasterxml.jackson.`annotation`.JsonTypeInfo +import com.fasterxml.jackson.databind.`annotation`.JsonDeserialize +import com.fasterxml.jackson.databind.`annotation`.JsonPOJOBuilder import java.lang.IllegalStateException import kotlin.Double import kotlin.jvm.JvmName -import com.fasterxml.jackson.databind.`annotation`.JsonDeserialize as FasterxmlJacksonDatabindAnnotationJsonDeserialize -import com.fasterxml.jackson.databind.`annotation`.JsonPOJOBuilder as FasterxmlJacksonDatabindAnnotationJsonPOJOBuilder -import tools.jackson.databind.`annotation`.JsonDeserialize as ToolsJacksonDatabindAnnotationJsonDeserialize -import tools.jackson.databind.`annotation`.JsonPOJOBuilder as ToolsJacksonDatabindAnnotationJsonPOJOBuilder @JsonTypeInfo(use = JsonTypeInfo.Id.NONE) -@FasterxmlJacksonDatabindAnnotationJsonDeserialize(builder = Performance.Builder::class) -@ToolsJacksonDatabindAnnotationJsonDeserialize(builder = Performance.Builder::class) +@JsonDeserialize(builder = Performance.Builder::class) public class Performance( zeroToSixty: () -> Double? = zeroToSixtyDefault, quarterMile: () -> Double? = quarterMileDefault, @@ -38,8 +35,7 @@ public class Performance( { throw IllegalStateException("Field `quarterMile` was not requested") } } - @FasterxmlJacksonDatabindAnnotationJsonPOJOBuilder - @ToolsJacksonDatabindAnnotationJsonPOJOBuilder + @JsonPOJOBuilder @JsonIgnoreProperties("__typename") public class Builder { private var zeroToSixty: () -> Double? = zeroToSixtyDefault diff --git a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithDeeplyNestedComplexField/expected/types/Query.kt b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithDeeplyNestedComplexField/expected/types/Query.kt index 591ee7f12..4833681d2 100644 --- a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithDeeplyNestedComplexField/expected/types/Query.kt +++ b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithDeeplyNestedComplexField/expected/types/Query.kt @@ -3,17 +3,14 @@ package com.netflix.graphql.dgs.codegen.cases.dataClassWithDeeplyNestedComplexFi import com.fasterxml.jackson.`annotation`.JsonIgnoreProperties import com.fasterxml.jackson.`annotation`.JsonProperty import com.fasterxml.jackson.`annotation`.JsonTypeInfo +import com.fasterxml.jackson.databind.`annotation`.JsonDeserialize +import com.fasterxml.jackson.databind.`annotation`.JsonPOJOBuilder import java.lang.IllegalStateException import kotlin.collections.List import kotlin.jvm.JvmName -import com.fasterxml.jackson.databind.`annotation`.JsonDeserialize as FasterxmlJacksonDatabindAnnotationJsonDeserialize -import com.fasterxml.jackson.databind.`annotation`.JsonPOJOBuilder as FasterxmlJacksonDatabindAnnotationJsonPOJOBuilder -import tools.jackson.databind.`annotation`.JsonDeserialize as ToolsJacksonDatabindAnnotationJsonDeserialize -import tools.jackson.databind.`annotation`.JsonPOJOBuilder as ToolsJacksonDatabindAnnotationJsonPOJOBuilder @JsonTypeInfo(use = JsonTypeInfo.Id.NONE) -@FasterxmlJacksonDatabindAnnotationJsonDeserialize(builder = Query.Builder::class) -@ToolsJacksonDatabindAnnotationJsonDeserialize(builder = Query.Builder::class) +@JsonDeserialize(builder = Query.Builder::class) public class Query( cars: () -> List? = carsDefault, ) { @@ -28,8 +25,7 @@ public class Query( { throw IllegalStateException("Field `cars` was not requested") } } - @FasterxmlJacksonDatabindAnnotationJsonPOJOBuilder - @ToolsJacksonDatabindAnnotationJsonPOJOBuilder + @JsonPOJOBuilder @JsonIgnoreProperties("__typename") public class Builder { private var cars: () -> List? = carsDefault diff --git a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithExtendedInterface/expected/types/Query.kt b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithExtendedInterface/expected/types/Query.kt index 1b0b28904..1fe70b7b0 100644 --- a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithExtendedInterface/expected/types/Query.kt +++ b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithExtendedInterface/expected/types/Query.kt @@ -3,17 +3,14 @@ package com.netflix.graphql.dgs.codegen.cases.dataClassWithExtendedInterface.exp import com.fasterxml.jackson.`annotation`.JsonIgnoreProperties import com.fasterxml.jackson.`annotation`.JsonProperty import com.fasterxml.jackson.`annotation`.JsonTypeInfo +import com.fasterxml.jackson.databind.`annotation`.JsonDeserialize +import com.fasterxml.jackson.databind.`annotation`.JsonPOJOBuilder import java.lang.IllegalStateException import kotlin.collections.List import kotlin.jvm.JvmName -import com.fasterxml.jackson.databind.`annotation`.JsonDeserialize as FasterxmlJacksonDatabindAnnotationJsonDeserialize -import com.fasterxml.jackson.databind.`annotation`.JsonPOJOBuilder as FasterxmlJacksonDatabindAnnotationJsonPOJOBuilder -import tools.jackson.databind.`annotation`.JsonDeserialize as ToolsJacksonDatabindAnnotationJsonDeserialize -import tools.jackson.databind.`annotation`.JsonPOJOBuilder as ToolsJacksonDatabindAnnotationJsonPOJOBuilder @JsonTypeInfo(use = JsonTypeInfo.Id.NONE) -@FasterxmlJacksonDatabindAnnotationJsonDeserialize(builder = Query.Builder::class) -@ToolsJacksonDatabindAnnotationJsonDeserialize(builder = Query.Builder::class) +@JsonDeserialize(builder = Query.Builder::class) public class Query( people: () -> List? = peopleDefault, ) { @@ -28,8 +25,7 @@ public class Query( { throw IllegalStateException("Field `people` was not requested") } } - @FasterxmlJacksonDatabindAnnotationJsonPOJOBuilder - @ToolsJacksonDatabindAnnotationJsonPOJOBuilder + @JsonPOJOBuilder @JsonIgnoreProperties("__typename") public class Builder { private var people: () -> List? = peopleDefault diff --git a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithExtendedInterfaceInheritance/expected/types/Employee.kt b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithExtendedInterfaceInheritance/expected/types/Employee.kt index b73e2ad8f..6696e70c8 100644 --- a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithExtendedInterfaceInheritance/expected/types/Employee.kt +++ b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithExtendedInterfaceInheritance/expected/types/Employee.kt @@ -3,19 +3,16 @@ package com.netflix.graphql.dgs.codegen.cases.dataClassWithExtendedInterfaceInhe import com.fasterxml.jackson.`annotation`.JsonIgnoreProperties import com.fasterxml.jackson.`annotation`.JsonProperty import com.fasterxml.jackson.`annotation`.JsonTypeInfo +import com.fasterxml.jackson.databind.`annotation`.JsonDeserialize +import com.fasterxml.jackson.databind.`annotation`.JsonPOJOBuilder import java.lang.IllegalStateException import kotlin.Int import kotlin.String import kotlin.Suppress import kotlin.jvm.JvmName -import com.fasterxml.jackson.databind.`annotation`.JsonDeserialize as FasterxmlJacksonDatabindAnnotationJsonDeserialize -import com.fasterxml.jackson.databind.`annotation`.JsonPOJOBuilder as FasterxmlJacksonDatabindAnnotationJsonPOJOBuilder -import tools.jackson.databind.`annotation`.JsonDeserialize as ToolsJacksonDatabindAnnotationJsonDeserialize -import tools.jackson.databind.`annotation`.JsonPOJOBuilder as ToolsJacksonDatabindAnnotationJsonPOJOBuilder @JsonTypeInfo(use = JsonTypeInfo.Id.NONE) -@FasterxmlJacksonDatabindAnnotationJsonDeserialize(builder = Employee.Builder::class) -@ToolsJacksonDatabindAnnotationJsonDeserialize(builder = Employee.Builder::class) +@JsonDeserialize(builder = Employee.Builder::class) public class Employee( firstname: () -> String = firstnameDefault, lastname: () -> String? = lastnameDefault, @@ -63,8 +60,7 @@ public class Employee( { throw IllegalStateException("Field `age` was not requested") } } - @FasterxmlJacksonDatabindAnnotationJsonPOJOBuilder - @ToolsJacksonDatabindAnnotationJsonPOJOBuilder + @JsonPOJOBuilder @JsonIgnoreProperties("__typename") public class Builder { private var firstname: () -> String = firstnameDefault diff --git a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithExtendedInterfaceInheritance/expected/types/Query.kt b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithExtendedInterfaceInheritance/expected/types/Query.kt index 9828962e9..13ef33bcc 100644 --- a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithExtendedInterfaceInheritance/expected/types/Query.kt +++ b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithExtendedInterfaceInheritance/expected/types/Query.kt @@ -3,17 +3,14 @@ package com.netflix.graphql.dgs.codegen.cases.dataClassWithExtendedInterfaceInhe import com.fasterxml.jackson.`annotation`.JsonIgnoreProperties import com.fasterxml.jackson.`annotation`.JsonProperty import com.fasterxml.jackson.`annotation`.JsonTypeInfo +import com.fasterxml.jackson.databind.`annotation`.JsonDeserialize +import com.fasterxml.jackson.databind.`annotation`.JsonPOJOBuilder import java.lang.IllegalStateException import kotlin.collections.List import kotlin.jvm.JvmName -import com.fasterxml.jackson.databind.`annotation`.JsonDeserialize as FasterxmlJacksonDatabindAnnotationJsonDeserialize -import com.fasterxml.jackson.databind.`annotation`.JsonPOJOBuilder as FasterxmlJacksonDatabindAnnotationJsonPOJOBuilder -import tools.jackson.databind.`annotation`.JsonDeserialize as ToolsJacksonDatabindAnnotationJsonDeserialize -import tools.jackson.databind.`annotation`.JsonPOJOBuilder as ToolsJacksonDatabindAnnotationJsonPOJOBuilder @JsonTypeInfo(use = JsonTypeInfo.Id.NONE) -@FasterxmlJacksonDatabindAnnotationJsonDeserialize(builder = Query.Builder::class) -@ToolsJacksonDatabindAnnotationJsonDeserialize(builder = Query.Builder::class) +@JsonDeserialize(builder = Query.Builder::class) public class Query( people: () -> List? = peopleDefault, ) { @@ -28,8 +25,7 @@ public class Query( { throw IllegalStateException("Field `people` was not requested") } } - @FasterxmlJacksonDatabindAnnotationJsonPOJOBuilder - @ToolsJacksonDatabindAnnotationJsonPOJOBuilder + @JsonPOJOBuilder @JsonIgnoreProperties("__typename") public class Builder { private var people: () -> List? = peopleDefault diff --git a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithInterface/expected/types/Employee.kt b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithInterface/expected/types/Employee.kt index d73030a1f..7dbddb9b3 100644 --- a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithInterface/expected/types/Employee.kt +++ b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithInterface/expected/types/Employee.kt @@ -3,18 +3,15 @@ package com.netflix.graphql.dgs.codegen.cases.dataClassWithInterface.expected.ty import com.fasterxml.jackson.`annotation`.JsonIgnoreProperties import com.fasterxml.jackson.`annotation`.JsonProperty import com.fasterxml.jackson.`annotation`.JsonTypeInfo +import com.fasterxml.jackson.databind.`annotation`.JsonDeserialize +import com.fasterxml.jackson.databind.`annotation`.JsonPOJOBuilder import java.lang.IllegalStateException import kotlin.String import kotlin.Suppress import kotlin.jvm.JvmName -import com.fasterxml.jackson.databind.`annotation`.JsonDeserialize as FasterxmlJacksonDatabindAnnotationJsonDeserialize -import com.fasterxml.jackson.databind.`annotation`.JsonPOJOBuilder as FasterxmlJacksonDatabindAnnotationJsonPOJOBuilder -import tools.jackson.databind.`annotation`.JsonDeserialize as ToolsJacksonDatabindAnnotationJsonDeserialize -import tools.jackson.databind.`annotation`.JsonPOJOBuilder as ToolsJacksonDatabindAnnotationJsonPOJOBuilder @JsonTypeInfo(use = JsonTypeInfo.Id.NONE) -@FasterxmlJacksonDatabindAnnotationJsonDeserialize(builder = Employee.Builder::class) -@ToolsJacksonDatabindAnnotationJsonDeserialize(builder = Employee.Builder::class) +@JsonDeserialize(builder = Employee.Builder::class) public class Employee( firstname: () -> String? = firstnameDefault, lastname: () -> String? = lastnameDefault, @@ -51,8 +48,7 @@ public class Employee( { throw IllegalStateException("Field `company` was not requested") } } - @FasterxmlJacksonDatabindAnnotationJsonPOJOBuilder - @ToolsJacksonDatabindAnnotationJsonPOJOBuilder + @JsonPOJOBuilder @JsonIgnoreProperties("__typename") public class Builder { private var firstname: () -> String? = firstnameDefault diff --git a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithInterface/expected/types/Query.kt b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithInterface/expected/types/Query.kt index 3ab9ded2e..dba982a87 100644 --- a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithInterface/expected/types/Query.kt +++ b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithInterface/expected/types/Query.kt @@ -3,17 +3,14 @@ package com.netflix.graphql.dgs.codegen.cases.dataClassWithInterface.expected.ty import com.fasterxml.jackson.`annotation`.JsonIgnoreProperties import com.fasterxml.jackson.`annotation`.JsonProperty import com.fasterxml.jackson.`annotation`.JsonTypeInfo +import com.fasterxml.jackson.databind.`annotation`.JsonDeserialize +import com.fasterxml.jackson.databind.`annotation`.JsonPOJOBuilder import java.lang.IllegalStateException import kotlin.collections.List import kotlin.jvm.JvmName -import com.fasterxml.jackson.databind.`annotation`.JsonDeserialize as FasterxmlJacksonDatabindAnnotationJsonDeserialize -import com.fasterxml.jackson.databind.`annotation`.JsonPOJOBuilder as FasterxmlJacksonDatabindAnnotationJsonPOJOBuilder -import tools.jackson.databind.`annotation`.JsonDeserialize as ToolsJacksonDatabindAnnotationJsonDeserialize -import tools.jackson.databind.`annotation`.JsonPOJOBuilder as ToolsJacksonDatabindAnnotationJsonPOJOBuilder @JsonTypeInfo(use = JsonTypeInfo.Id.NONE) -@FasterxmlJacksonDatabindAnnotationJsonDeserialize(builder = Query.Builder::class) -@ToolsJacksonDatabindAnnotationJsonDeserialize(builder = Query.Builder::class) +@JsonDeserialize(builder = Query.Builder::class) public class Query( people: () -> List? = peopleDefault, ) { @@ -28,8 +25,7 @@ public class Query( { throw IllegalStateException("Field `people` was not requested") } } - @FasterxmlJacksonDatabindAnnotationJsonPOJOBuilder - @ToolsJacksonDatabindAnnotationJsonPOJOBuilder + @JsonPOJOBuilder @JsonIgnoreProperties("__typename") public class Builder { private var people: () -> List? = peopleDefault diff --git a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithInterfaceInheritance/expected/types/Query.kt b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithInterfaceInheritance/expected/types/Query.kt index 9ead25c70..d02923873 100644 --- a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithInterfaceInheritance/expected/types/Query.kt +++ b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithInterfaceInheritance/expected/types/Query.kt @@ -3,17 +3,14 @@ package com.netflix.graphql.dgs.codegen.cases.dataClassWithInterfaceInheritance. import com.fasterxml.jackson.`annotation`.JsonIgnoreProperties import com.fasterxml.jackson.`annotation`.JsonProperty import com.fasterxml.jackson.`annotation`.JsonTypeInfo +import com.fasterxml.jackson.databind.`annotation`.JsonDeserialize +import com.fasterxml.jackson.databind.`annotation`.JsonPOJOBuilder import java.lang.IllegalStateException import kotlin.collections.List import kotlin.jvm.JvmName -import com.fasterxml.jackson.databind.`annotation`.JsonDeserialize as FasterxmlJacksonDatabindAnnotationJsonDeserialize -import com.fasterxml.jackson.databind.`annotation`.JsonPOJOBuilder as FasterxmlJacksonDatabindAnnotationJsonPOJOBuilder -import tools.jackson.databind.`annotation`.JsonDeserialize as ToolsJacksonDatabindAnnotationJsonDeserialize -import tools.jackson.databind.`annotation`.JsonPOJOBuilder as ToolsJacksonDatabindAnnotationJsonPOJOBuilder @JsonTypeInfo(use = JsonTypeInfo.Id.NONE) -@FasterxmlJacksonDatabindAnnotationJsonDeserialize(builder = Query.Builder::class) -@ToolsJacksonDatabindAnnotationJsonDeserialize(builder = Query.Builder::class) +@JsonDeserialize(builder = Query.Builder::class) public class Query( people: () -> List? = peopleDefault, ) { @@ -28,8 +25,7 @@ public class Query( { throw IllegalStateException("Field `people` was not requested") } } - @FasterxmlJacksonDatabindAnnotationJsonPOJOBuilder - @ToolsJacksonDatabindAnnotationJsonPOJOBuilder + @JsonPOJOBuilder @JsonIgnoreProperties("__typename") public class Builder { private var people: () -> List? = peopleDefault diff --git a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithInterfaceInheritance/expected/types/Talent.kt b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithInterfaceInheritance/expected/types/Talent.kt index 6b5be4e4a..e734d08e9 100644 --- a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithInterfaceInheritance/expected/types/Talent.kt +++ b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithInterfaceInheritance/expected/types/Talent.kt @@ -3,18 +3,15 @@ package com.netflix.graphql.dgs.codegen.cases.dataClassWithInterfaceInheritance. import com.fasterxml.jackson.`annotation`.JsonIgnoreProperties import com.fasterxml.jackson.`annotation`.JsonProperty import com.fasterxml.jackson.`annotation`.JsonTypeInfo +import com.fasterxml.jackson.databind.`annotation`.JsonDeserialize +import com.fasterxml.jackson.databind.`annotation`.JsonPOJOBuilder import java.lang.IllegalStateException import kotlin.String import kotlin.Suppress import kotlin.jvm.JvmName -import com.fasterxml.jackson.databind.`annotation`.JsonDeserialize as FasterxmlJacksonDatabindAnnotationJsonDeserialize -import com.fasterxml.jackson.databind.`annotation`.JsonPOJOBuilder as FasterxmlJacksonDatabindAnnotationJsonPOJOBuilder -import tools.jackson.databind.`annotation`.JsonDeserialize as ToolsJacksonDatabindAnnotationJsonDeserialize -import tools.jackson.databind.`annotation`.JsonPOJOBuilder as ToolsJacksonDatabindAnnotationJsonPOJOBuilder @JsonTypeInfo(use = JsonTypeInfo.Id.NONE) -@FasterxmlJacksonDatabindAnnotationJsonDeserialize(builder = Talent.Builder::class) -@ToolsJacksonDatabindAnnotationJsonDeserialize(builder = Talent.Builder::class) +@JsonDeserialize(builder = Talent.Builder::class) public class Talent( firstname: () -> String = firstnameDefault, lastname: () -> String? = lastnameDefault, @@ -62,8 +59,7 @@ public class Talent( { throw IllegalStateException("Field `imdbProfile` was not requested") } } - @FasterxmlJacksonDatabindAnnotationJsonPOJOBuilder - @ToolsJacksonDatabindAnnotationJsonPOJOBuilder + @JsonPOJOBuilder @JsonIgnoreProperties("__typename") public class Builder { private var firstname: () -> String = firstnameDefault diff --git a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithListProperties/expected/types/Person.kt b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithListProperties/expected/types/Person.kt index 501d59c83..42e7e8004 100644 --- a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithListProperties/expected/types/Person.kt +++ b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithListProperties/expected/types/Person.kt @@ -3,18 +3,15 @@ package com.netflix.graphql.dgs.codegen.cases.dataClassWithListProperties.expect import com.fasterxml.jackson.`annotation`.JsonIgnoreProperties import com.fasterxml.jackson.`annotation`.JsonProperty import com.fasterxml.jackson.`annotation`.JsonTypeInfo +import com.fasterxml.jackson.databind.`annotation`.JsonDeserialize +import com.fasterxml.jackson.databind.`annotation`.JsonPOJOBuilder import java.lang.IllegalStateException import kotlin.String import kotlin.collections.List import kotlin.jvm.JvmName -import com.fasterxml.jackson.databind.`annotation`.JsonDeserialize as FasterxmlJacksonDatabindAnnotationJsonDeserialize -import com.fasterxml.jackson.databind.`annotation`.JsonPOJOBuilder as FasterxmlJacksonDatabindAnnotationJsonPOJOBuilder -import tools.jackson.databind.`annotation`.JsonDeserialize as ToolsJacksonDatabindAnnotationJsonDeserialize -import tools.jackson.databind.`annotation`.JsonPOJOBuilder as ToolsJacksonDatabindAnnotationJsonPOJOBuilder @JsonTypeInfo(use = JsonTypeInfo.Id.NONE) -@FasterxmlJacksonDatabindAnnotationJsonDeserialize(builder = Person.Builder::class) -@ToolsJacksonDatabindAnnotationJsonDeserialize(builder = Person.Builder::class) +@JsonDeserialize(builder = Person.Builder::class) public class Person( name: () -> String? = nameDefault, email: () -> List? = emailDefault, @@ -39,8 +36,7 @@ public class Person( { throw IllegalStateException("Field `email` was not requested") } } - @FasterxmlJacksonDatabindAnnotationJsonPOJOBuilder - @ToolsJacksonDatabindAnnotationJsonPOJOBuilder + @JsonPOJOBuilder @JsonIgnoreProperties("__typename") public class Builder { private var name: () -> String? = nameDefault diff --git a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithListProperties/expected/types/Query.kt b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithListProperties/expected/types/Query.kt index f08e4ab93..686240a86 100644 --- a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithListProperties/expected/types/Query.kt +++ b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithListProperties/expected/types/Query.kt @@ -3,17 +3,14 @@ package com.netflix.graphql.dgs.codegen.cases.dataClassWithListProperties.expect import com.fasterxml.jackson.`annotation`.JsonIgnoreProperties import com.fasterxml.jackson.`annotation`.JsonProperty import com.fasterxml.jackson.`annotation`.JsonTypeInfo +import com.fasterxml.jackson.databind.`annotation`.JsonDeserialize +import com.fasterxml.jackson.databind.`annotation`.JsonPOJOBuilder import java.lang.IllegalStateException import kotlin.collections.List import kotlin.jvm.JvmName -import com.fasterxml.jackson.databind.`annotation`.JsonDeserialize as FasterxmlJacksonDatabindAnnotationJsonDeserialize -import com.fasterxml.jackson.databind.`annotation`.JsonPOJOBuilder as FasterxmlJacksonDatabindAnnotationJsonPOJOBuilder -import tools.jackson.databind.`annotation`.JsonDeserialize as ToolsJacksonDatabindAnnotationJsonDeserialize -import tools.jackson.databind.`annotation`.JsonPOJOBuilder as ToolsJacksonDatabindAnnotationJsonPOJOBuilder @JsonTypeInfo(use = JsonTypeInfo.Id.NONE) -@FasterxmlJacksonDatabindAnnotationJsonDeserialize(builder = Query.Builder::class) -@ToolsJacksonDatabindAnnotationJsonDeserialize(builder = Query.Builder::class) +@JsonDeserialize(builder = Query.Builder::class) public class Query( people: () -> List? = peopleDefault, ) { @@ -28,8 +25,7 @@ public class Query( { throw IllegalStateException("Field `people` was not requested") } } - @FasterxmlJacksonDatabindAnnotationJsonPOJOBuilder - @ToolsJacksonDatabindAnnotationJsonPOJOBuilder + @JsonPOJOBuilder @JsonIgnoreProperties("__typename") public class Builder { private var people: () -> List? = peopleDefault diff --git a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithMappedInterfaces/expected/types/Product.kt b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithMappedInterfaces/expected/types/Product.kt index eadf37c57..fd0de5806 100644 --- a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithMappedInterfaces/expected/types/Product.kt +++ b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithMappedInterfaces/expected/types/Product.kt @@ -3,19 +3,16 @@ package com.netflix.graphql.dgs.codegen.cases.dataClassWithMappedInterfaces.expe import com.fasterxml.jackson.`annotation`.JsonIgnoreProperties import com.fasterxml.jackson.`annotation`.JsonProperty import com.fasterxml.jackson.`annotation`.JsonTypeInfo +import com.fasterxml.jackson.databind.`annotation`.JsonDeserialize +import com.fasterxml.jackson.databind.`annotation`.JsonPOJOBuilder import com.netflix.graphql.dgs.codegen.fixtures.Node import java.lang.IllegalStateException import kotlin.String import kotlin.Suppress import kotlin.jvm.JvmName -import com.fasterxml.jackson.databind.`annotation`.JsonDeserialize as FasterxmlJacksonDatabindAnnotationJsonDeserialize -import com.fasterxml.jackson.databind.`annotation`.JsonPOJOBuilder as FasterxmlJacksonDatabindAnnotationJsonPOJOBuilder -import tools.jackson.databind.`annotation`.JsonDeserialize as ToolsJacksonDatabindAnnotationJsonDeserialize -import tools.jackson.databind.`annotation`.JsonPOJOBuilder as ToolsJacksonDatabindAnnotationJsonPOJOBuilder @JsonTypeInfo(use = JsonTypeInfo.Id.NONE) -@FasterxmlJacksonDatabindAnnotationJsonDeserialize(builder = Product.Builder::class) -@ToolsJacksonDatabindAnnotationJsonDeserialize(builder = Product.Builder::class) +@JsonDeserialize(builder = Product.Builder::class) public class Product( id: () -> String = idDefault, ) : Entity, @@ -32,8 +29,7 @@ public class Product( { throw IllegalStateException("Field `id` was not requested") } } - @FasterxmlJacksonDatabindAnnotationJsonPOJOBuilder - @ToolsJacksonDatabindAnnotationJsonPOJOBuilder + @JsonPOJOBuilder @JsonIgnoreProperties("__typename") public class Builder { private var id: () -> String = idDefault diff --git a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithMappedInterfaces/expected/types/Query.kt b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithMappedInterfaces/expected/types/Query.kt index aaa4ec5f9..c912a9e19 100644 --- a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithMappedInterfaces/expected/types/Query.kt +++ b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithMappedInterfaces/expected/types/Query.kt @@ -3,17 +3,14 @@ package com.netflix.graphql.dgs.codegen.cases.dataClassWithMappedInterfaces.expe import com.fasterxml.jackson.`annotation`.JsonIgnoreProperties import com.fasterxml.jackson.`annotation`.JsonProperty import com.fasterxml.jackson.`annotation`.JsonTypeInfo +import com.fasterxml.jackson.databind.`annotation`.JsonDeserialize +import com.fasterxml.jackson.databind.`annotation`.JsonPOJOBuilder import java.lang.IllegalStateException import kotlin.collections.List import kotlin.jvm.JvmName -import com.fasterxml.jackson.databind.`annotation`.JsonDeserialize as FasterxmlJacksonDatabindAnnotationJsonDeserialize -import com.fasterxml.jackson.databind.`annotation`.JsonPOJOBuilder as FasterxmlJacksonDatabindAnnotationJsonPOJOBuilder -import tools.jackson.databind.`annotation`.JsonDeserialize as ToolsJacksonDatabindAnnotationJsonDeserialize -import tools.jackson.databind.`annotation`.JsonPOJOBuilder as ToolsJacksonDatabindAnnotationJsonPOJOBuilder @JsonTypeInfo(use = JsonTypeInfo.Id.NONE) -@FasterxmlJacksonDatabindAnnotationJsonDeserialize(builder = Query.Builder::class) -@ToolsJacksonDatabindAnnotationJsonDeserialize(builder = Query.Builder::class) +@JsonDeserialize(builder = Query.Builder::class) public class Query( products: () -> List? = productsDefault, ) { @@ -28,8 +25,7 @@ public class Query( { throw IllegalStateException("Field `products` was not requested") } } - @FasterxmlJacksonDatabindAnnotationJsonPOJOBuilder - @ToolsJacksonDatabindAnnotationJsonPOJOBuilder + @JsonPOJOBuilder @JsonIgnoreProperties("__typename") public class Builder { private var products: () -> List? = productsDefault diff --git a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithMappedTypes/expected/types/Entity.kt b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithMappedTypes/expected/types/Entity.kt index 159bea699..7a0dd05a3 100644 --- a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithMappedTypes/expected/types/Entity.kt +++ b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithMappedTypes/expected/types/Entity.kt @@ -3,18 +3,15 @@ package com.netflix.graphql.dgs.codegen.cases.dataClassWithMappedTypes.expected. import com.fasterxml.jackson.`annotation`.JsonIgnoreProperties import com.fasterxml.jackson.`annotation`.JsonProperty import com.fasterxml.jackson.`annotation`.JsonTypeInfo +import com.fasterxml.jackson.databind.`annotation`.JsonDeserialize +import com.fasterxml.jackson.databind.`annotation`.JsonPOJOBuilder import java.lang.IllegalStateException import java.time.OffsetDateTime import kotlin.Long import kotlin.jvm.JvmName -import com.fasterxml.jackson.databind.`annotation`.JsonDeserialize as FasterxmlJacksonDatabindAnnotationJsonDeserialize -import com.fasterxml.jackson.databind.`annotation`.JsonPOJOBuilder as FasterxmlJacksonDatabindAnnotationJsonPOJOBuilder -import tools.jackson.databind.`annotation`.JsonDeserialize as ToolsJacksonDatabindAnnotationJsonDeserialize -import tools.jackson.databind.`annotation`.JsonPOJOBuilder as ToolsJacksonDatabindAnnotationJsonPOJOBuilder @JsonTypeInfo(use = JsonTypeInfo.Id.NONE) -@FasterxmlJacksonDatabindAnnotationJsonDeserialize(builder = Entity.Builder::class) -@ToolsJacksonDatabindAnnotationJsonDeserialize(builder = Entity.Builder::class) +@JsonDeserialize(builder = Entity.Builder::class) public class Entity( long: () -> Long? = longDefault, dateTime: () -> OffsetDateTime? = dateTimeDefault, @@ -39,8 +36,7 @@ public class Entity( { throw IllegalStateException("Field `dateTime` was not requested") } } - @FasterxmlJacksonDatabindAnnotationJsonPOJOBuilder - @ToolsJacksonDatabindAnnotationJsonPOJOBuilder + @JsonPOJOBuilder @JsonIgnoreProperties("__typename") public class Builder { private var long: () -> Long? = longDefault diff --git a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithMappedTypes/expected/types/EntityEdge.kt b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithMappedTypes/expected/types/EntityEdge.kt index 38933cae1..a0e3620a6 100644 --- a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithMappedTypes/expected/types/EntityEdge.kt +++ b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithMappedTypes/expected/types/EntityEdge.kt @@ -3,17 +3,14 @@ package com.netflix.graphql.dgs.codegen.cases.dataClassWithMappedTypes.expected. import com.fasterxml.jackson.`annotation`.JsonIgnoreProperties import com.fasterxml.jackson.`annotation`.JsonProperty import com.fasterxml.jackson.`annotation`.JsonTypeInfo +import com.fasterxml.jackson.databind.`annotation`.JsonDeserialize +import com.fasterxml.jackson.databind.`annotation`.JsonPOJOBuilder import java.lang.IllegalStateException import kotlin.String import kotlin.jvm.JvmName -import com.fasterxml.jackson.databind.`annotation`.JsonDeserialize as FasterxmlJacksonDatabindAnnotationJsonDeserialize -import com.fasterxml.jackson.databind.`annotation`.JsonPOJOBuilder as FasterxmlJacksonDatabindAnnotationJsonPOJOBuilder -import tools.jackson.databind.`annotation`.JsonDeserialize as ToolsJacksonDatabindAnnotationJsonDeserialize -import tools.jackson.databind.`annotation`.JsonPOJOBuilder as ToolsJacksonDatabindAnnotationJsonPOJOBuilder @JsonTypeInfo(use = JsonTypeInfo.Id.NONE) -@FasterxmlJacksonDatabindAnnotationJsonDeserialize(builder = EntityEdge.Builder::class) -@ToolsJacksonDatabindAnnotationJsonDeserialize(builder = EntityEdge.Builder::class) +@JsonDeserialize(builder = EntityEdge.Builder::class) public class EntityEdge( cursor: () -> String = cursorDefault, node: () -> Entity? = nodeDefault, @@ -38,8 +35,7 @@ public class EntityEdge( { throw IllegalStateException("Field `node` was not requested") } } - @FasterxmlJacksonDatabindAnnotationJsonPOJOBuilder - @ToolsJacksonDatabindAnnotationJsonPOJOBuilder + @JsonPOJOBuilder @JsonIgnoreProperties("__typename") public class Builder { private var cursor: () -> String = cursorDefault diff --git a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithMappedTypes/expected/types/Query.kt b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithMappedTypes/expected/types/Query.kt index f01714df4..e7e726bda 100644 --- a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithMappedTypes/expected/types/Query.kt +++ b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithMappedTypes/expected/types/Query.kt @@ -3,18 +3,15 @@ package com.netflix.graphql.dgs.codegen.cases.dataClassWithMappedTypes.expected. import com.fasterxml.jackson.`annotation`.JsonIgnoreProperties import com.fasterxml.jackson.`annotation`.JsonProperty import com.fasterxml.jackson.`annotation`.JsonTypeInfo +import com.fasterxml.jackson.databind.`annotation`.JsonDeserialize +import com.fasterxml.jackson.databind.`annotation`.JsonPOJOBuilder import graphql.relay.SimpleListConnection import java.lang.IllegalStateException import kotlin.collections.List import kotlin.jvm.JvmName -import com.fasterxml.jackson.databind.`annotation`.JsonDeserialize as FasterxmlJacksonDatabindAnnotationJsonDeserialize -import com.fasterxml.jackson.databind.`annotation`.JsonPOJOBuilder as FasterxmlJacksonDatabindAnnotationJsonPOJOBuilder -import tools.jackson.databind.`annotation`.JsonDeserialize as ToolsJacksonDatabindAnnotationJsonDeserialize -import tools.jackson.databind.`annotation`.JsonPOJOBuilder as ToolsJacksonDatabindAnnotationJsonPOJOBuilder @JsonTypeInfo(use = JsonTypeInfo.Id.NONE) -@FasterxmlJacksonDatabindAnnotationJsonDeserialize(builder = Query.Builder::class) -@ToolsJacksonDatabindAnnotationJsonDeserialize(builder = Query.Builder::class) +@JsonDeserialize(builder = Query.Builder::class) public class Query( entity: () -> List? = entityDefault, entityConnection: () -> SimpleListConnection? = entityConnectionDefault, @@ -39,8 +36,7 @@ public class Query( { throw IllegalStateException("Field `entityConnection` was not requested") } } - @FasterxmlJacksonDatabindAnnotationJsonPOJOBuilder - @ToolsJacksonDatabindAnnotationJsonPOJOBuilder + @JsonPOJOBuilder @JsonIgnoreProperties("__typename") public class Builder { private var entity: () -> List? = entityDefault diff --git a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithNonNullableAndInterface/expected/types/Employee.kt b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithNonNullableAndInterface/expected/types/Employee.kt index b2e352cc5..b9f267245 100644 --- a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithNonNullableAndInterface/expected/types/Employee.kt +++ b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithNonNullableAndInterface/expected/types/Employee.kt @@ -3,18 +3,15 @@ package com.netflix.graphql.dgs.codegen.cases.dataClassWithNonNullableAndInterfa import com.fasterxml.jackson.`annotation`.JsonIgnoreProperties import com.fasterxml.jackson.`annotation`.JsonProperty import com.fasterxml.jackson.`annotation`.JsonTypeInfo +import com.fasterxml.jackson.databind.`annotation`.JsonDeserialize +import com.fasterxml.jackson.databind.`annotation`.JsonPOJOBuilder import java.lang.IllegalStateException import kotlin.String import kotlin.Suppress import kotlin.jvm.JvmName -import com.fasterxml.jackson.databind.`annotation`.JsonDeserialize as FasterxmlJacksonDatabindAnnotationJsonDeserialize -import com.fasterxml.jackson.databind.`annotation`.JsonPOJOBuilder as FasterxmlJacksonDatabindAnnotationJsonPOJOBuilder -import tools.jackson.databind.`annotation`.JsonDeserialize as ToolsJacksonDatabindAnnotationJsonDeserialize -import tools.jackson.databind.`annotation`.JsonPOJOBuilder as ToolsJacksonDatabindAnnotationJsonPOJOBuilder @JsonTypeInfo(use = JsonTypeInfo.Id.NONE) -@FasterxmlJacksonDatabindAnnotationJsonDeserialize(builder = Employee.Builder::class) -@ToolsJacksonDatabindAnnotationJsonDeserialize(builder = Employee.Builder::class) +@JsonDeserialize(builder = Employee.Builder::class) public class Employee( firstname: () -> String = firstnameDefault, lastname: () -> String = lastnameDefault, @@ -52,8 +49,7 @@ public class Employee( { throw IllegalStateException("Field `company` was not requested") } } - @FasterxmlJacksonDatabindAnnotationJsonPOJOBuilder - @ToolsJacksonDatabindAnnotationJsonPOJOBuilder + @JsonPOJOBuilder @JsonIgnoreProperties("__typename") public class Builder { private var firstname: () -> String = firstnameDefault diff --git a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithNonNullableAndInterface/expected/types/Query.kt b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithNonNullableAndInterface/expected/types/Query.kt index 40ab65d4f..afaad8450 100644 --- a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithNonNullableAndInterface/expected/types/Query.kt +++ b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithNonNullableAndInterface/expected/types/Query.kt @@ -3,17 +3,14 @@ package com.netflix.graphql.dgs.codegen.cases.dataClassWithNonNullableAndInterfa import com.fasterxml.jackson.`annotation`.JsonIgnoreProperties import com.fasterxml.jackson.`annotation`.JsonProperty import com.fasterxml.jackson.`annotation`.JsonTypeInfo +import com.fasterxml.jackson.databind.`annotation`.JsonDeserialize +import com.fasterxml.jackson.databind.`annotation`.JsonPOJOBuilder import java.lang.IllegalStateException import kotlin.collections.List import kotlin.jvm.JvmName -import com.fasterxml.jackson.databind.`annotation`.JsonDeserialize as FasterxmlJacksonDatabindAnnotationJsonDeserialize -import com.fasterxml.jackson.databind.`annotation`.JsonPOJOBuilder as FasterxmlJacksonDatabindAnnotationJsonPOJOBuilder -import tools.jackson.databind.`annotation`.JsonDeserialize as ToolsJacksonDatabindAnnotationJsonDeserialize -import tools.jackson.databind.`annotation`.JsonPOJOBuilder as ToolsJacksonDatabindAnnotationJsonPOJOBuilder @JsonTypeInfo(use = JsonTypeInfo.Id.NONE) -@FasterxmlJacksonDatabindAnnotationJsonDeserialize(builder = Query.Builder::class) -@ToolsJacksonDatabindAnnotationJsonDeserialize(builder = Query.Builder::class) +@JsonDeserialize(builder = Query.Builder::class) public class Query( people: () -> List? = peopleDefault, ) { @@ -28,8 +25,7 @@ public class Query( { throw IllegalStateException("Field `people` was not requested") } } - @FasterxmlJacksonDatabindAnnotationJsonPOJOBuilder - @ToolsJacksonDatabindAnnotationJsonPOJOBuilder + @JsonPOJOBuilder @JsonIgnoreProperties("__typename") public class Builder { private var people: () -> List? = peopleDefault diff --git a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithNonNullableComplexType/expected/types/MyType.kt b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithNonNullableComplexType/expected/types/MyType.kt index 853c2bffc..75a89bc92 100644 --- a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithNonNullableComplexType/expected/types/MyType.kt +++ b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithNonNullableComplexType/expected/types/MyType.kt @@ -3,16 +3,13 @@ package com.netflix.graphql.dgs.codegen.cases.dataClassWithNonNullableComplexTyp import com.fasterxml.jackson.`annotation`.JsonIgnoreProperties import com.fasterxml.jackson.`annotation`.JsonProperty import com.fasterxml.jackson.`annotation`.JsonTypeInfo +import com.fasterxml.jackson.databind.`annotation`.JsonDeserialize +import com.fasterxml.jackson.databind.`annotation`.JsonPOJOBuilder import java.lang.IllegalStateException import kotlin.jvm.JvmName -import com.fasterxml.jackson.databind.`annotation`.JsonDeserialize as FasterxmlJacksonDatabindAnnotationJsonDeserialize -import com.fasterxml.jackson.databind.`annotation`.JsonPOJOBuilder as FasterxmlJacksonDatabindAnnotationJsonPOJOBuilder -import tools.jackson.databind.`annotation`.JsonDeserialize as ToolsJacksonDatabindAnnotationJsonDeserialize -import tools.jackson.databind.`annotation`.JsonPOJOBuilder as ToolsJacksonDatabindAnnotationJsonPOJOBuilder @JsonTypeInfo(use = JsonTypeInfo.Id.NONE) -@FasterxmlJacksonDatabindAnnotationJsonDeserialize(builder = MyType.Builder::class) -@ToolsJacksonDatabindAnnotationJsonDeserialize(builder = MyType.Builder::class) +@JsonDeserialize(builder = MyType.Builder::class) public class MyType( other: () -> OtherType = otherDefault, ) { @@ -27,8 +24,7 @@ public class MyType( { throw IllegalStateException("Field `other` was not requested") } } - @FasterxmlJacksonDatabindAnnotationJsonPOJOBuilder - @ToolsJacksonDatabindAnnotationJsonPOJOBuilder + @JsonPOJOBuilder @JsonIgnoreProperties("__typename") public class Builder { private var other: () -> OtherType = otherDefault diff --git a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithNonNullableComplexType/expected/types/OtherType.kt b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithNonNullableComplexType/expected/types/OtherType.kt index c5e0faf0a..48cd62864 100644 --- a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithNonNullableComplexType/expected/types/OtherType.kt +++ b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithNonNullableComplexType/expected/types/OtherType.kt @@ -3,17 +3,14 @@ package com.netflix.graphql.dgs.codegen.cases.dataClassWithNonNullableComplexTyp import com.fasterxml.jackson.`annotation`.JsonIgnoreProperties import com.fasterxml.jackson.`annotation`.JsonProperty import com.fasterxml.jackson.`annotation`.JsonTypeInfo +import com.fasterxml.jackson.databind.`annotation`.JsonDeserialize +import com.fasterxml.jackson.databind.`annotation`.JsonPOJOBuilder import java.lang.IllegalStateException import kotlin.String import kotlin.jvm.JvmName -import com.fasterxml.jackson.databind.`annotation`.JsonDeserialize as FasterxmlJacksonDatabindAnnotationJsonDeserialize -import com.fasterxml.jackson.databind.`annotation`.JsonPOJOBuilder as FasterxmlJacksonDatabindAnnotationJsonPOJOBuilder -import tools.jackson.databind.`annotation`.JsonDeserialize as ToolsJacksonDatabindAnnotationJsonDeserialize -import tools.jackson.databind.`annotation`.JsonPOJOBuilder as ToolsJacksonDatabindAnnotationJsonPOJOBuilder @JsonTypeInfo(use = JsonTypeInfo.Id.NONE) -@FasterxmlJacksonDatabindAnnotationJsonDeserialize(builder = OtherType.Builder::class) -@ToolsJacksonDatabindAnnotationJsonDeserialize(builder = OtherType.Builder::class) +@JsonDeserialize(builder = OtherType.Builder::class) public class OtherType( name: () -> String = nameDefault, ) { @@ -28,8 +25,7 @@ public class OtherType( { throw IllegalStateException("Field `name` was not requested") } } - @FasterxmlJacksonDatabindAnnotationJsonPOJOBuilder - @ToolsJacksonDatabindAnnotationJsonPOJOBuilder + @JsonPOJOBuilder @JsonIgnoreProperties("__typename") public class Builder { private var name: () -> String = nameDefault diff --git a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithNonNullableListOfNullableValues/expected/types/Person.kt b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithNonNullableListOfNullableValues/expected/types/Person.kt index 2f2e9670c..dd3e13995 100644 --- a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithNonNullableListOfNullableValues/expected/types/Person.kt +++ b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithNonNullableListOfNullableValues/expected/types/Person.kt @@ -3,18 +3,15 @@ package com.netflix.graphql.dgs.codegen.cases.dataClassWithNonNullableListOfNull import com.fasterxml.jackson.`annotation`.JsonIgnoreProperties import com.fasterxml.jackson.`annotation`.JsonProperty import com.fasterxml.jackson.`annotation`.JsonTypeInfo +import com.fasterxml.jackson.databind.`annotation`.JsonDeserialize +import com.fasterxml.jackson.databind.`annotation`.JsonPOJOBuilder import java.lang.IllegalStateException import kotlin.String import kotlin.collections.List import kotlin.jvm.JvmName -import com.fasterxml.jackson.databind.`annotation`.JsonDeserialize as FasterxmlJacksonDatabindAnnotationJsonDeserialize -import com.fasterxml.jackson.databind.`annotation`.JsonPOJOBuilder as FasterxmlJacksonDatabindAnnotationJsonPOJOBuilder -import tools.jackson.databind.`annotation`.JsonDeserialize as ToolsJacksonDatabindAnnotationJsonDeserialize -import tools.jackson.databind.`annotation`.JsonPOJOBuilder as ToolsJacksonDatabindAnnotationJsonPOJOBuilder @JsonTypeInfo(use = JsonTypeInfo.Id.NONE) -@FasterxmlJacksonDatabindAnnotationJsonDeserialize(builder = Person.Builder::class) -@ToolsJacksonDatabindAnnotationJsonDeserialize(builder = Person.Builder::class) +@JsonDeserialize(builder = Person.Builder::class) public class Person( name: () -> String = nameDefault, email: () -> List = emailDefault, @@ -39,8 +36,7 @@ public class Person( { throw IllegalStateException("Field `email` was not requested") } } - @FasterxmlJacksonDatabindAnnotationJsonPOJOBuilder - @ToolsJacksonDatabindAnnotationJsonPOJOBuilder + @JsonPOJOBuilder @JsonIgnoreProperties("__typename") public class Builder { private var name: () -> String = nameDefault diff --git a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithNonNullableListOfNullableValues/expected/types/Query.kt b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithNonNullableListOfNullableValues/expected/types/Query.kt index 6a59fd490..581c0266c 100644 --- a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithNonNullableListOfNullableValues/expected/types/Query.kt +++ b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithNonNullableListOfNullableValues/expected/types/Query.kt @@ -3,17 +3,14 @@ package com.netflix.graphql.dgs.codegen.cases.dataClassWithNonNullableListOfNull import com.fasterxml.jackson.`annotation`.JsonIgnoreProperties import com.fasterxml.jackson.`annotation`.JsonProperty import com.fasterxml.jackson.`annotation`.JsonTypeInfo +import com.fasterxml.jackson.databind.`annotation`.JsonDeserialize +import com.fasterxml.jackson.databind.`annotation`.JsonPOJOBuilder import java.lang.IllegalStateException import kotlin.collections.List import kotlin.jvm.JvmName -import com.fasterxml.jackson.databind.`annotation`.JsonDeserialize as FasterxmlJacksonDatabindAnnotationJsonDeserialize -import com.fasterxml.jackson.databind.`annotation`.JsonPOJOBuilder as FasterxmlJacksonDatabindAnnotationJsonPOJOBuilder -import tools.jackson.databind.`annotation`.JsonDeserialize as ToolsJacksonDatabindAnnotationJsonDeserialize -import tools.jackson.databind.`annotation`.JsonPOJOBuilder as ToolsJacksonDatabindAnnotationJsonPOJOBuilder @JsonTypeInfo(use = JsonTypeInfo.Id.NONE) -@FasterxmlJacksonDatabindAnnotationJsonDeserialize(builder = Query.Builder::class) -@ToolsJacksonDatabindAnnotationJsonDeserialize(builder = Query.Builder::class) +@JsonDeserialize(builder = Query.Builder::class) public class Query( people: () -> List? = peopleDefault, ) { @@ -28,8 +25,7 @@ public class Query( { throw IllegalStateException("Field `people` was not requested") } } - @FasterxmlJacksonDatabindAnnotationJsonPOJOBuilder - @ToolsJacksonDatabindAnnotationJsonPOJOBuilder + @JsonPOJOBuilder @JsonIgnoreProperties("__typename") public class Builder { private var people: () -> List? = peopleDefault diff --git a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithNonNullablePrimitive/expected/types/MyType.kt b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithNonNullablePrimitive/expected/types/MyType.kt index 18ca395bd..908d637a8 100644 --- a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithNonNullablePrimitive/expected/types/MyType.kt +++ b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithNonNullablePrimitive/expected/types/MyType.kt @@ -3,19 +3,16 @@ package com.netflix.graphql.dgs.codegen.cases.dataClassWithNonNullablePrimitive. import com.fasterxml.jackson.`annotation`.JsonIgnoreProperties import com.fasterxml.jackson.`annotation`.JsonProperty import com.fasterxml.jackson.`annotation`.JsonTypeInfo +import com.fasterxml.jackson.databind.`annotation`.JsonDeserialize +import com.fasterxml.jackson.databind.`annotation`.JsonPOJOBuilder import java.lang.IllegalStateException import kotlin.Boolean import kotlin.Double import kotlin.Int import kotlin.jvm.JvmName -import com.fasterxml.jackson.databind.`annotation`.JsonDeserialize as FasterxmlJacksonDatabindAnnotationJsonDeserialize -import com.fasterxml.jackson.databind.`annotation`.JsonPOJOBuilder as FasterxmlJacksonDatabindAnnotationJsonPOJOBuilder -import tools.jackson.databind.`annotation`.JsonDeserialize as ToolsJacksonDatabindAnnotationJsonDeserialize -import tools.jackson.databind.`annotation`.JsonPOJOBuilder as ToolsJacksonDatabindAnnotationJsonPOJOBuilder @JsonTypeInfo(use = JsonTypeInfo.Id.NONE) -@FasterxmlJacksonDatabindAnnotationJsonDeserialize(builder = MyType.Builder::class) -@ToolsJacksonDatabindAnnotationJsonDeserialize(builder = MyType.Builder::class) +@JsonDeserialize(builder = MyType.Builder::class) public class MyType( count: () -> Int = countDefault, truth: () -> Boolean = truthDefault, @@ -50,8 +47,7 @@ public class MyType( { throw IllegalStateException("Field `floaty` was not requested") } } - @FasterxmlJacksonDatabindAnnotationJsonPOJOBuilder - @ToolsJacksonDatabindAnnotationJsonPOJOBuilder + @JsonPOJOBuilder @JsonIgnoreProperties("__typename") public class Builder { private var count: () -> Int = countDefault diff --git a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithNonNullablePrimitiveInList/expected/types/MyType.kt b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithNonNullablePrimitiveInList/expected/types/MyType.kt index eb92b6aa9..6c71edd29 100644 --- a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithNonNullablePrimitiveInList/expected/types/MyType.kt +++ b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithNonNullablePrimitiveInList/expected/types/MyType.kt @@ -3,20 +3,17 @@ package com.netflix.graphql.dgs.codegen.cases.dataClassWithNonNullablePrimitiveI import com.fasterxml.jackson.`annotation`.JsonIgnoreProperties import com.fasterxml.jackson.`annotation`.JsonProperty import com.fasterxml.jackson.`annotation`.JsonTypeInfo +import com.fasterxml.jackson.databind.`annotation`.JsonDeserialize +import com.fasterxml.jackson.databind.`annotation`.JsonPOJOBuilder import java.lang.IllegalStateException import kotlin.Boolean import kotlin.Double import kotlin.Int import kotlin.collections.List import kotlin.jvm.JvmName -import com.fasterxml.jackson.databind.`annotation`.JsonDeserialize as FasterxmlJacksonDatabindAnnotationJsonDeserialize -import com.fasterxml.jackson.databind.`annotation`.JsonPOJOBuilder as FasterxmlJacksonDatabindAnnotationJsonPOJOBuilder -import tools.jackson.databind.`annotation`.JsonDeserialize as ToolsJacksonDatabindAnnotationJsonDeserialize -import tools.jackson.databind.`annotation`.JsonPOJOBuilder as ToolsJacksonDatabindAnnotationJsonPOJOBuilder @JsonTypeInfo(use = JsonTypeInfo.Id.NONE) -@FasterxmlJacksonDatabindAnnotationJsonDeserialize(builder = MyType.Builder::class) -@ToolsJacksonDatabindAnnotationJsonDeserialize(builder = MyType.Builder::class) +@JsonDeserialize(builder = MyType.Builder::class) public class MyType( count: () -> List? = countDefault, truth: () -> List? = truthDefault, @@ -51,8 +48,7 @@ public class MyType( { throw IllegalStateException("Field `floaty` was not requested") } } - @FasterxmlJacksonDatabindAnnotationJsonPOJOBuilder - @ToolsJacksonDatabindAnnotationJsonPOJOBuilder + @JsonPOJOBuilder @JsonIgnoreProperties("__typename") public class Builder { private var count: () -> List? = countDefault diff --git a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithNonNullableProperties/expected/types/Person.kt b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithNonNullableProperties/expected/types/Person.kt index 08d298cc5..faa2bc98f 100644 --- a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithNonNullableProperties/expected/types/Person.kt +++ b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithNonNullableProperties/expected/types/Person.kt @@ -3,18 +3,15 @@ package com.netflix.graphql.dgs.codegen.cases.dataClassWithNonNullableProperties import com.fasterxml.jackson.`annotation`.JsonIgnoreProperties import com.fasterxml.jackson.`annotation`.JsonProperty import com.fasterxml.jackson.`annotation`.JsonTypeInfo +import com.fasterxml.jackson.databind.`annotation`.JsonDeserialize +import com.fasterxml.jackson.databind.`annotation`.JsonPOJOBuilder import java.lang.IllegalStateException import kotlin.String import kotlin.collections.List import kotlin.jvm.JvmName -import com.fasterxml.jackson.databind.`annotation`.JsonDeserialize as FasterxmlJacksonDatabindAnnotationJsonDeserialize -import com.fasterxml.jackson.databind.`annotation`.JsonPOJOBuilder as FasterxmlJacksonDatabindAnnotationJsonPOJOBuilder -import tools.jackson.databind.`annotation`.JsonDeserialize as ToolsJacksonDatabindAnnotationJsonDeserialize -import tools.jackson.databind.`annotation`.JsonPOJOBuilder as ToolsJacksonDatabindAnnotationJsonPOJOBuilder @JsonTypeInfo(use = JsonTypeInfo.Id.NONE) -@FasterxmlJacksonDatabindAnnotationJsonDeserialize(builder = Person.Builder::class) -@ToolsJacksonDatabindAnnotationJsonDeserialize(builder = Person.Builder::class) +@JsonDeserialize(builder = Person.Builder::class) public class Person( name: () -> String = nameDefault, email: () -> List = emailDefault, @@ -39,8 +36,7 @@ public class Person( { throw IllegalStateException("Field `email` was not requested") } } - @FasterxmlJacksonDatabindAnnotationJsonPOJOBuilder - @ToolsJacksonDatabindAnnotationJsonPOJOBuilder + @JsonPOJOBuilder @JsonIgnoreProperties("__typename") public class Builder { private var name: () -> String = nameDefault diff --git a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithNonNullableProperties/expected/types/Query.kt b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithNonNullableProperties/expected/types/Query.kt index 44d9ac1eb..2d53d046d 100644 --- a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithNonNullableProperties/expected/types/Query.kt +++ b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithNonNullableProperties/expected/types/Query.kt @@ -3,17 +3,14 @@ package com.netflix.graphql.dgs.codegen.cases.dataClassWithNonNullableProperties import com.fasterxml.jackson.`annotation`.JsonIgnoreProperties import com.fasterxml.jackson.`annotation`.JsonProperty import com.fasterxml.jackson.`annotation`.JsonTypeInfo +import com.fasterxml.jackson.databind.`annotation`.JsonDeserialize +import com.fasterxml.jackson.databind.`annotation`.JsonPOJOBuilder import java.lang.IllegalStateException import kotlin.collections.List import kotlin.jvm.JvmName -import com.fasterxml.jackson.databind.`annotation`.JsonDeserialize as FasterxmlJacksonDatabindAnnotationJsonDeserialize -import com.fasterxml.jackson.databind.`annotation`.JsonPOJOBuilder as FasterxmlJacksonDatabindAnnotationJsonPOJOBuilder -import tools.jackson.databind.`annotation`.JsonDeserialize as ToolsJacksonDatabindAnnotationJsonDeserialize -import tools.jackson.databind.`annotation`.JsonPOJOBuilder as ToolsJacksonDatabindAnnotationJsonPOJOBuilder @JsonTypeInfo(use = JsonTypeInfo.Id.NONE) -@FasterxmlJacksonDatabindAnnotationJsonDeserialize(builder = Query.Builder::class) -@ToolsJacksonDatabindAnnotationJsonDeserialize(builder = Query.Builder::class) +@JsonDeserialize(builder = Query.Builder::class) public class Query( people: () -> List? = peopleDefault, ) { @@ -28,8 +25,7 @@ public class Query( { throw IllegalStateException("Field `people` was not requested") } } - @FasterxmlJacksonDatabindAnnotationJsonPOJOBuilder - @ToolsJacksonDatabindAnnotationJsonPOJOBuilder + @JsonPOJOBuilder @JsonIgnoreProperties("__typename") public class Builder { private var people: () -> List? = peopleDefault diff --git a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithNullablePrimitive/expected/types/MyType.kt b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithNullablePrimitive/expected/types/MyType.kt index 4bb236131..b54bca148 100644 --- a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithNullablePrimitive/expected/types/MyType.kt +++ b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithNullablePrimitive/expected/types/MyType.kt @@ -3,19 +3,16 @@ package com.netflix.graphql.dgs.codegen.cases.dataClassWithNullablePrimitive.exp import com.fasterxml.jackson.`annotation`.JsonIgnoreProperties import com.fasterxml.jackson.`annotation`.JsonProperty import com.fasterxml.jackson.`annotation`.JsonTypeInfo +import com.fasterxml.jackson.databind.`annotation`.JsonDeserialize +import com.fasterxml.jackson.databind.`annotation`.JsonPOJOBuilder import java.lang.IllegalStateException import kotlin.Boolean import kotlin.Double import kotlin.Int import kotlin.jvm.JvmName -import com.fasterxml.jackson.databind.`annotation`.JsonDeserialize as FasterxmlJacksonDatabindAnnotationJsonDeserialize -import com.fasterxml.jackson.databind.`annotation`.JsonPOJOBuilder as FasterxmlJacksonDatabindAnnotationJsonPOJOBuilder -import tools.jackson.databind.`annotation`.JsonDeserialize as ToolsJacksonDatabindAnnotationJsonDeserialize -import tools.jackson.databind.`annotation`.JsonPOJOBuilder as ToolsJacksonDatabindAnnotationJsonPOJOBuilder @JsonTypeInfo(use = JsonTypeInfo.Id.NONE) -@FasterxmlJacksonDatabindAnnotationJsonDeserialize(builder = MyType.Builder::class) -@ToolsJacksonDatabindAnnotationJsonDeserialize(builder = MyType.Builder::class) +@JsonDeserialize(builder = MyType.Builder::class) public class MyType( count: () -> Int? = countDefault, truth: () -> Boolean? = truthDefault, @@ -50,8 +47,7 @@ public class MyType( { throw IllegalStateException("Field `floaty` was not requested") } } - @FasterxmlJacksonDatabindAnnotationJsonPOJOBuilder - @ToolsJacksonDatabindAnnotationJsonPOJOBuilder + @JsonPOJOBuilder @JsonIgnoreProperties("__typename") public class Builder { private var count: () -> Int? = countDefault diff --git a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithRecursiveField/expected/types/Person.kt b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithRecursiveField/expected/types/Person.kt index 7f275aa57..d82d73359 100644 --- a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithRecursiveField/expected/types/Person.kt +++ b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithRecursiveField/expected/types/Person.kt @@ -3,18 +3,15 @@ package com.netflix.graphql.dgs.codegen.cases.dataClassWithRecursiveField.expect import com.fasterxml.jackson.`annotation`.JsonIgnoreProperties import com.fasterxml.jackson.`annotation`.JsonProperty import com.fasterxml.jackson.`annotation`.JsonTypeInfo +import com.fasterxml.jackson.databind.`annotation`.JsonDeserialize +import com.fasterxml.jackson.databind.`annotation`.JsonPOJOBuilder import java.lang.IllegalStateException import kotlin.String import kotlin.collections.List import kotlin.jvm.JvmName -import com.fasterxml.jackson.databind.`annotation`.JsonDeserialize as FasterxmlJacksonDatabindAnnotationJsonDeserialize -import com.fasterxml.jackson.databind.`annotation`.JsonPOJOBuilder as FasterxmlJacksonDatabindAnnotationJsonPOJOBuilder -import tools.jackson.databind.`annotation`.JsonDeserialize as ToolsJacksonDatabindAnnotationJsonDeserialize -import tools.jackson.databind.`annotation`.JsonPOJOBuilder as ToolsJacksonDatabindAnnotationJsonPOJOBuilder @JsonTypeInfo(use = JsonTypeInfo.Id.NONE) -@FasterxmlJacksonDatabindAnnotationJsonDeserialize(builder = Person.Builder::class) -@ToolsJacksonDatabindAnnotationJsonDeserialize(builder = Person.Builder::class) +@JsonDeserialize(builder = Person.Builder::class) public class Person( firstname: () -> String? = firstnameDefault, lastname: () -> String? = lastnameDefault, @@ -49,8 +46,7 @@ public class Person( { throw IllegalStateException("Field `friends` was not requested") } } - @FasterxmlJacksonDatabindAnnotationJsonPOJOBuilder - @ToolsJacksonDatabindAnnotationJsonPOJOBuilder + @JsonPOJOBuilder @JsonIgnoreProperties("__typename") public class Builder { private var firstname: () -> String? = firstnameDefault diff --git a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithRecursiveField/expected/types/Query.kt b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithRecursiveField/expected/types/Query.kt index f3432a5a6..8e483b636 100644 --- a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithRecursiveField/expected/types/Query.kt +++ b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithRecursiveField/expected/types/Query.kt @@ -3,17 +3,14 @@ package com.netflix.graphql.dgs.codegen.cases.dataClassWithRecursiveField.expect import com.fasterxml.jackson.`annotation`.JsonIgnoreProperties import com.fasterxml.jackson.`annotation`.JsonProperty import com.fasterxml.jackson.`annotation`.JsonTypeInfo +import com.fasterxml.jackson.databind.`annotation`.JsonDeserialize +import com.fasterxml.jackson.databind.`annotation`.JsonPOJOBuilder import java.lang.IllegalStateException import kotlin.collections.List import kotlin.jvm.JvmName -import com.fasterxml.jackson.databind.`annotation`.JsonDeserialize as FasterxmlJacksonDatabindAnnotationJsonDeserialize -import com.fasterxml.jackson.databind.`annotation`.JsonPOJOBuilder as FasterxmlJacksonDatabindAnnotationJsonPOJOBuilder -import tools.jackson.databind.`annotation`.JsonDeserialize as ToolsJacksonDatabindAnnotationJsonDeserialize -import tools.jackson.databind.`annotation`.JsonPOJOBuilder as ToolsJacksonDatabindAnnotationJsonPOJOBuilder @JsonTypeInfo(use = JsonTypeInfo.Id.NONE) -@FasterxmlJacksonDatabindAnnotationJsonDeserialize(builder = Query.Builder::class) -@ToolsJacksonDatabindAnnotationJsonDeserialize(builder = Query.Builder::class) +@JsonDeserialize(builder = Query.Builder::class) public class Query( people: () -> List? = peopleDefault, ) { @@ -28,8 +25,7 @@ public class Query( { throw IllegalStateException("Field `people` was not requested") } } - @FasterxmlJacksonDatabindAnnotationJsonPOJOBuilder - @ToolsJacksonDatabindAnnotationJsonPOJOBuilder + @JsonPOJOBuilder @JsonIgnoreProperties("__typename") public class Builder { private var people: () -> List? = peopleDefault diff --git a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithReservedWord/expected/types/Person.kt b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithReservedWord/expected/types/Person.kt index feff2888c..18cf8ba60 100644 --- a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithReservedWord/expected/types/Person.kt +++ b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithReservedWord/expected/types/Person.kt @@ -3,17 +3,14 @@ package com.netflix.graphql.dgs.codegen.cases.dataClassWithReservedWord.expected import com.fasterxml.jackson.`annotation`.JsonIgnoreProperties import com.fasterxml.jackson.`annotation`.JsonProperty import com.fasterxml.jackson.`annotation`.JsonTypeInfo +import com.fasterxml.jackson.databind.`annotation`.JsonDeserialize +import com.fasterxml.jackson.databind.`annotation`.JsonPOJOBuilder import java.lang.IllegalStateException import kotlin.String import kotlin.jvm.JvmName -import com.fasterxml.jackson.databind.`annotation`.JsonDeserialize as FasterxmlJacksonDatabindAnnotationJsonDeserialize -import com.fasterxml.jackson.databind.`annotation`.JsonPOJOBuilder as FasterxmlJacksonDatabindAnnotationJsonPOJOBuilder -import tools.jackson.databind.`annotation`.JsonDeserialize as ToolsJacksonDatabindAnnotationJsonDeserialize -import tools.jackson.databind.`annotation`.JsonPOJOBuilder as ToolsJacksonDatabindAnnotationJsonPOJOBuilder @JsonTypeInfo(use = JsonTypeInfo.Id.NONE) -@FasterxmlJacksonDatabindAnnotationJsonDeserialize(builder = Person.Builder::class) -@ToolsJacksonDatabindAnnotationJsonDeserialize(builder = Person.Builder::class) +@JsonDeserialize(builder = Person.Builder::class) public class Person( info: () -> String? = infoDefault, `interface`: () -> String? = interfaceDefault, @@ -38,8 +35,7 @@ public class Person( { throw IllegalStateException("Field `interface` was not requested") } } - @FasterxmlJacksonDatabindAnnotationJsonPOJOBuilder - @ToolsJacksonDatabindAnnotationJsonPOJOBuilder + @JsonPOJOBuilder @JsonIgnoreProperties("__typename") public class Builder { private var info: () -> String? = infoDefault diff --git a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithReservedWord/expected/types/Query.kt b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithReservedWord/expected/types/Query.kt index 40aac5cab..8f9385423 100644 --- a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithReservedWord/expected/types/Query.kt +++ b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithReservedWord/expected/types/Query.kt @@ -3,17 +3,14 @@ package com.netflix.graphql.dgs.codegen.cases.dataClassWithReservedWord.expected import com.fasterxml.jackson.`annotation`.JsonIgnoreProperties import com.fasterxml.jackson.`annotation`.JsonProperty import com.fasterxml.jackson.`annotation`.JsonTypeInfo +import com.fasterxml.jackson.databind.`annotation`.JsonDeserialize +import com.fasterxml.jackson.databind.`annotation`.JsonPOJOBuilder import java.lang.IllegalStateException import kotlin.collections.List import kotlin.jvm.JvmName -import com.fasterxml.jackson.databind.`annotation`.JsonDeserialize as FasterxmlJacksonDatabindAnnotationJsonDeserialize -import com.fasterxml.jackson.databind.`annotation`.JsonPOJOBuilder as FasterxmlJacksonDatabindAnnotationJsonPOJOBuilder -import tools.jackson.databind.`annotation`.JsonDeserialize as ToolsJacksonDatabindAnnotationJsonDeserialize -import tools.jackson.databind.`annotation`.JsonPOJOBuilder as ToolsJacksonDatabindAnnotationJsonPOJOBuilder @JsonTypeInfo(use = JsonTypeInfo.Id.NONE) -@FasterxmlJacksonDatabindAnnotationJsonDeserialize(builder = Query.Builder::class) -@ToolsJacksonDatabindAnnotationJsonDeserialize(builder = Query.Builder::class) +@JsonDeserialize(builder = Query.Builder::class) public class Query( people: () -> List? = peopleDefault, ) { @@ -28,8 +25,7 @@ public class Query( { throw IllegalStateException("Field `people` was not requested") } } - @FasterxmlJacksonDatabindAnnotationJsonPOJOBuilder - @ToolsJacksonDatabindAnnotationJsonPOJOBuilder + @JsonPOJOBuilder @JsonIgnoreProperties("__typename") public class Builder { private var people: () -> List? = peopleDefault diff --git a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithReservedWord/expected/types/SampleType.kt b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithReservedWord/expected/types/SampleType.kt index 4f59e4d06..9fd155355 100644 --- a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithReservedWord/expected/types/SampleType.kt +++ b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithReservedWord/expected/types/SampleType.kt @@ -3,17 +3,14 @@ package com.netflix.graphql.dgs.codegen.cases.dataClassWithReservedWord.expected import com.fasterxml.jackson.`annotation`.JsonIgnoreProperties import com.fasterxml.jackson.`annotation`.JsonProperty import com.fasterxml.jackson.`annotation`.JsonTypeInfo +import com.fasterxml.jackson.databind.`annotation`.JsonDeserialize +import com.fasterxml.jackson.databind.`annotation`.JsonPOJOBuilder import java.lang.IllegalStateException import kotlin.String import kotlin.jvm.JvmName -import com.fasterxml.jackson.databind.`annotation`.JsonDeserialize as FasterxmlJacksonDatabindAnnotationJsonDeserialize -import com.fasterxml.jackson.databind.`annotation`.JsonPOJOBuilder as FasterxmlJacksonDatabindAnnotationJsonPOJOBuilder -import tools.jackson.databind.`annotation`.JsonDeserialize as ToolsJacksonDatabindAnnotationJsonDeserialize -import tools.jackson.databind.`annotation`.JsonPOJOBuilder as ToolsJacksonDatabindAnnotationJsonPOJOBuilder @JsonTypeInfo(use = JsonTypeInfo.Id.NONE) -@FasterxmlJacksonDatabindAnnotationJsonDeserialize(builder = SampleType.Builder::class) -@ToolsJacksonDatabindAnnotationJsonDeserialize(builder = SampleType.Builder::class) +@JsonDeserialize(builder = SampleType.Builder::class) public class SampleType( `return`: () -> String = returnDefault, ) { @@ -28,8 +25,7 @@ public class SampleType( { throw IllegalStateException("Field `return` was not requested") } } - @FasterxmlJacksonDatabindAnnotationJsonPOJOBuilder - @ToolsJacksonDatabindAnnotationJsonPOJOBuilder + @JsonPOJOBuilder @JsonIgnoreProperties("__typename") public class Builder { private var `return`: () -> String = returnDefault diff --git a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithStringProperties/expected/types/Person.kt b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithStringProperties/expected/types/Person.kt index 36dbf6805..9a4adc154 100644 --- a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithStringProperties/expected/types/Person.kt +++ b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithStringProperties/expected/types/Person.kt @@ -3,17 +3,14 @@ package com.netflix.graphql.dgs.codegen.cases.dataClassWithStringProperties.expe import com.fasterxml.jackson.`annotation`.JsonIgnoreProperties import com.fasterxml.jackson.`annotation`.JsonProperty import com.fasterxml.jackson.`annotation`.JsonTypeInfo +import com.fasterxml.jackson.databind.`annotation`.JsonDeserialize +import com.fasterxml.jackson.databind.`annotation`.JsonPOJOBuilder import java.lang.IllegalStateException import kotlin.String import kotlin.jvm.JvmName -import com.fasterxml.jackson.databind.`annotation`.JsonDeserialize as FasterxmlJacksonDatabindAnnotationJsonDeserialize -import com.fasterxml.jackson.databind.`annotation`.JsonPOJOBuilder as FasterxmlJacksonDatabindAnnotationJsonPOJOBuilder -import tools.jackson.databind.`annotation`.JsonDeserialize as ToolsJacksonDatabindAnnotationJsonDeserialize -import tools.jackson.databind.`annotation`.JsonPOJOBuilder as ToolsJacksonDatabindAnnotationJsonPOJOBuilder @JsonTypeInfo(use = JsonTypeInfo.Id.NONE) -@FasterxmlJacksonDatabindAnnotationJsonDeserialize(builder = Person.Builder::class) -@ToolsJacksonDatabindAnnotationJsonDeserialize(builder = Person.Builder::class) +@JsonDeserialize(builder = Person.Builder::class) public class Person( firstname: () -> String? = firstnameDefault, lastname: () -> String? = lastnameDefault, @@ -38,8 +35,7 @@ public class Person( { throw IllegalStateException("Field `lastname` was not requested") } } - @FasterxmlJacksonDatabindAnnotationJsonPOJOBuilder - @ToolsJacksonDatabindAnnotationJsonPOJOBuilder + @JsonPOJOBuilder @JsonIgnoreProperties("__typename") public class Builder { private var firstname: () -> String? = firstnameDefault diff --git a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithStringProperties/expected/types/Query.kt b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithStringProperties/expected/types/Query.kt index be15ff6a0..e83a398c7 100644 --- a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithStringProperties/expected/types/Query.kt +++ b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithStringProperties/expected/types/Query.kt @@ -3,17 +3,14 @@ package com.netflix.graphql.dgs.codegen.cases.dataClassWithStringProperties.expe import com.fasterxml.jackson.`annotation`.JsonIgnoreProperties import com.fasterxml.jackson.`annotation`.JsonProperty import com.fasterxml.jackson.`annotation`.JsonTypeInfo +import com.fasterxml.jackson.databind.`annotation`.JsonDeserialize +import com.fasterxml.jackson.databind.`annotation`.JsonPOJOBuilder import java.lang.IllegalStateException import kotlin.collections.List import kotlin.jvm.JvmName -import com.fasterxml.jackson.databind.`annotation`.JsonDeserialize as FasterxmlJacksonDatabindAnnotationJsonDeserialize -import com.fasterxml.jackson.databind.`annotation`.JsonPOJOBuilder as FasterxmlJacksonDatabindAnnotationJsonPOJOBuilder -import tools.jackson.databind.`annotation`.JsonDeserialize as ToolsJacksonDatabindAnnotationJsonDeserialize -import tools.jackson.databind.`annotation`.JsonPOJOBuilder as ToolsJacksonDatabindAnnotationJsonPOJOBuilder @JsonTypeInfo(use = JsonTypeInfo.Id.NONE) -@FasterxmlJacksonDatabindAnnotationJsonDeserialize(builder = Query.Builder::class) -@ToolsJacksonDatabindAnnotationJsonDeserialize(builder = Query.Builder::class) +@JsonDeserialize(builder = Query.Builder::class) public class Query( people: () -> List? = peopleDefault, ) { @@ -28,8 +25,7 @@ public class Query( { throw IllegalStateException("Field `people` was not requested") } } - @FasterxmlJacksonDatabindAnnotationJsonPOJOBuilder - @ToolsJacksonDatabindAnnotationJsonPOJOBuilder + @JsonPOJOBuilder @JsonIgnoreProperties("__typename") public class Builder { private var people: () -> List? = peopleDefault diff --git a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/enum/expected/types/Query.kt b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/enum/expected/types/Query.kt index 75925daeb..52988050b 100644 --- a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/enum/expected/types/Query.kt +++ b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/enum/expected/types/Query.kt @@ -3,17 +3,14 @@ package com.netflix.graphql.dgs.codegen.cases.`enum`.expected.types import com.fasterxml.jackson.`annotation`.JsonIgnoreProperties import com.fasterxml.jackson.`annotation`.JsonProperty import com.fasterxml.jackson.`annotation`.JsonTypeInfo +import com.fasterxml.jackson.databind.`annotation`.JsonDeserialize +import com.fasterxml.jackson.databind.`annotation`.JsonPOJOBuilder import java.lang.IllegalStateException import kotlin.collections.List import kotlin.jvm.JvmName -import com.fasterxml.jackson.databind.`annotation`.JsonDeserialize as FasterxmlJacksonDatabindAnnotationJsonDeserialize -import com.fasterxml.jackson.databind.`annotation`.JsonPOJOBuilder as FasterxmlJacksonDatabindAnnotationJsonPOJOBuilder -import tools.jackson.databind.`annotation`.JsonDeserialize as ToolsJacksonDatabindAnnotationJsonDeserialize -import tools.jackson.databind.`annotation`.JsonPOJOBuilder as ToolsJacksonDatabindAnnotationJsonPOJOBuilder @JsonTypeInfo(use = JsonTypeInfo.Id.NONE) -@FasterxmlJacksonDatabindAnnotationJsonDeserialize(builder = Query.Builder::class) -@ToolsJacksonDatabindAnnotationJsonDeserialize(builder = Query.Builder::class) +@JsonDeserialize(builder = Query.Builder::class) public class Query( types: () -> List? = typesDefault, ) { @@ -28,8 +25,7 @@ public class Query( { throw IllegalStateException("Field `types` was not requested") } } - @FasterxmlJacksonDatabindAnnotationJsonPOJOBuilder - @ToolsJacksonDatabindAnnotationJsonPOJOBuilder + @JsonPOJOBuilder @JsonIgnoreProperties("__typename") public class Builder { private var types: () -> List? = typesDefault diff --git a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/enumWithExtendedType/expected/types/Query.kt b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/enumWithExtendedType/expected/types/Query.kt index 22b7bd799..645cfda99 100644 --- a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/enumWithExtendedType/expected/types/Query.kt +++ b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/enumWithExtendedType/expected/types/Query.kt @@ -3,17 +3,14 @@ package com.netflix.graphql.dgs.codegen.cases.enumWithExtendedType.expected.type import com.fasterxml.jackson.`annotation`.JsonIgnoreProperties import com.fasterxml.jackson.`annotation`.JsonProperty import com.fasterxml.jackson.`annotation`.JsonTypeInfo +import com.fasterxml.jackson.databind.`annotation`.JsonDeserialize +import com.fasterxml.jackson.databind.`annotation`.JsonPOJOBuilder import java.lang.IllegalStateException import kotlin.collections.List import kotlin.jvm.JvmName -import com.fasterxml.jackson.databind.`annotation`.JsonDeserialize as FasterxmlJacksonDatabindAnnotationJsonDeserialize -import com.fasterxml.jackson.databind.`annotation`.JsonPOJOBuilder as FasterxmlJacksonDatabindAnnotationJsonPOJOBuilder -import tools.jackson.databind.`annotation`.JsonDeserialize as ToolsJacksonDatabindAnnotationJsonDeserialize -import tools.jackson.databind.`annotation`.JsonPOJOBuilder as ToolsJacksonDatabindAnnotationJsonPOJOBuilder @JsonTypeInfo(use = JsonTypeInfo.Id.NONE) -@FasterxmlJacksonDatabindAnnotationJsonDeserialize(builder = Query.Builder::class) -@ToolsJacksonDatabindAnnotationJsonDeserialize(builder = Query.Builder::class) +@JsonDeserialize(builder = Query.Builder::class) public class Query( types: () -> List? = typesDefault, ) { @@ -28,8 +25,7 @@ public class Query( { throw IllegalStateException("Field `types` was not requested") } } - @FasterxmlJacksonDatabindAnnotationJsonPOJOBuilder - @ToolsJacksonDatabindAnnotationJsonPOJOBuilder + @JsonPOJOBuilder @JsonIgnoreProperties("__typename") public class Builder { private var types: () -> List? = typesDefault diff --git a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/extendedDataClassWithInterface/expected/types/Example.kt b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/extendedDataClassWithInterface/expected/types/Example.kt index 0dd6fb2dd..4965ca5ee 100644 --- a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/extendedDataClassWithInterface/expected/types/Example.kt +++ b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/extendedDataClassWithInterface/expected/types/Example.kt @@ -3,19 +3,16 @@ package com.netflix.graphql.dgs.codegen.cases.extendedDataClassWithInterface.exp import com.fasterxml.jackson.`annotation`.JsonIgnoreProperties import com.fasterxml.jackson.`annotation`.JsonProperty import com.fasterxml.jackson.`annotation`.JsonTypeInfo +import com.fasterxml.jackson.databind.`annotation`.JsonDeserialize +import com.fasterxml.jackson.databind.`annotation`.JsonPOJOBuilder import java.lang.IllegalStateException import kotlin.Int import kotlin.String import kotlin.Suppress import kotlin.jvm.JvmName -import com.fasterxml.jackson.databind.`annotation`.JsonDeserialize as FasterxmlJacksonDatabindAnnotationJsonDeserialize -import com.fasterxml.jackson.databind.`annotation`.JsonPOJOBuilder as FasterxmlJacksonDatabindAnnotationJsonPOJOBuilder -import tools.jackson.databind.`annotation`.JsonDeserialize as ToolsJacksonDatabindAnnotationJsonDeserialize -import tools.jackson.databind.`annotation`.JsonPOJOBuilder as ToolsJacksonDatabindAnnotationJsonPOJOBuilder @JsonTypeInfo(use = JsonTypeInfo.Id.NONE) -@FasterxmlJacksonDatabindAnnotationJsonDeserialize(builder = Example.Builder::class) -@ToolsJacksonDatabindAnnotationJsonDeserialize(builder = Example.Builder::class) +@JsonDeserialize(builder = Example.Builder::class) public class Example( name: () -> String? = nameDefault, age: () -> Int? = ageDefault, @@ -43,8 +40,7 @@ public class Example( { throw IllegalStateException("Field `age` was not requested") } } - @FasterxmlJacksonDatabindAnnotationJsonPOJOBuilder - @ToolsJacksonDatabindAnnotationJsonPOJOBuilder + @JsonPOJOBuilder @JsonIgnoreProperties("__typename") public class Builder { private var name: () -> String? = nameDefault diff --git a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/input/expected/types/Query.kt b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/input/expected/types/Query.kt index 4209015cc..e3e6d75f1 100644 --- a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/input/expected/types/Query.kt +++ b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/input/expected/types/Query.kt @@ -3,18 +3,15 @@ package com.netflix.graphql.dgs.codegen.cases.input.expected.types import com.fasterxml.jackson.`annotation`.JsonIgnoreProperties import com.fasterxml.jackson.`annotation`.JsonProperty import com.fasterxml.jackson.`annotation`.JsonTypeInfo +import com.fasterxml.jackson.databind.`annotation`.JsonDeserialize +import com.fasterxml.jackson.databind.`annotation`.JsonPOJOBuilder import java.lang.IllegalStateException import kotlin.String import kotlin.collections.List import kotlin.jvm.JvmName -import com.fasterxml.jackson.databind.`annotation`.JsonDeserialize as FasterxmlJacksonDatabindAnnotationJsonDeserialize -import com.fasterxml.jackson.databind.`annotation`.JsonPOJOBuilder as FasterxmlJacksonDatabindAnnotationJsonPOJOBuilder -import tools.jackson.databind.`annotation`.JsonDeserialize as ToolsJacksonDatabindAnnotationJsonDeserialize -import tools.jackson.databind.`annotation`.JsonPOJOBuilder as ToolsJacksonDatabindAnnotationJsonPOJOBuilder @JsonTypeInfo(use = JsonTypeInfo.Id.NONE) -@FasterxmlJacksonDatabindAnnotationJsonDeserialize(builder = Query.Builder::class) -@ToolsJacksonDatabindAnnotationJsonDeserialize(builder = Query.Builder::class) +@JsonDeserialize(builder = Query.Builder::class) public class Query( movies: () -> List? = moviesDefault, ) { @@ -29,8 +26,7 @@ public class Query( { throw IllegalStateException("Field `movies` was not requested") } } - @FasterxmlJacksonDatabindAnnotationJsonPOJOBuilder - @ToolsJacksonDatabindAnnotationJsonPOJOBuilder + @JsonPOJOBuilder @JsonIgnoreProperties("__typename") public class Builder { private var movies: () -> List? = moviesDefault diff --git a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/inputWithDefaultBigDecimal/expected/types/Query.kt b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/inputWithDefaultBigDecimal/expected/types/Query.kt index a8b15f43a..93c13ba14 100644 --- a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/inputWithDefaultBigDecimal/expected/types/Query.kt +++ b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/inputWithDefaultBigDecimal/expected/types/Query.kt @@ -3,17 +3,14 @@ package com.netflix.graphql.dgs.codegen.cases.inputWithDefaultBigDecimal.expecte import com.fasterxml.jackson.`annotation`.JsonIgnoreProperties import com.fasterxml.jackson.`annotation`.JsonProperty import com.fasterxml.jackson.`annotation`.JsonTypeInfo +import com.fasterxml.jackson.databind.`annotation`.JsonDeserialize +import com.fasterxml.jackson.databind.`annotation`.JsonPOJOBuilder import java.lang.IllegalStateException import kotlin.String import kotlin.jvm.JvmName -import com.fasterxml.jackson.databind.`annotation`.JsonDeserialize as FasterxmlJacksonDatabindAnnotationJsonDeserialize -import com.fasterxml.jackson.databind.`annotation`.JsonPOJOBuilder as FasterxmlJacksonDatabindAnnotationJsonPOJOBuilder -import tools.jackson.databind.`annotation`.JsonDeserialize as ToolsJacksonDatabindAnnotationJsonDeserialize -import tools.jackson.databind.`annotation`.JsonPOJOBuilder as ToolsJacksonDatabindAnnotationJsonPOJOBuilder @JsonTypeInfo(use = JsonTypeInfo.Id.NONE) -@FasterxmlJacksonDatabindAnnotationJsonDeserialize(builder = Query.Builder::class) -@ToolsJacksonDatabindAnnotationJsonDeserialize(builder = Query.Builder::class) +@JsonDeserialize(builder = Query.Builder::class) public class Query( orders: () -> String? = ordersDefault, ) { @@ -28,8 +25,7 @@ public class Query( { throw IllegalStateException("Field `orders` was not requested") } } - @FasterxmlJacksonDatabindAnnotationJsonPOJOBuilder - @ToolsJacksonDatabindAnnotationJsonPOJOBuilder + @JsonPOJOBuilder @JsonIgnoreProperties("__typename") public class Builder { private var orders: () -> String? = ordersDefault diff --git a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/inputWithDefaultCurrency/expected/types/Query.kt b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/inputWithDefaultCurrency/expected/types/Query.kt index cc35c4858..e8d0167ff 100644 --- a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/inputWithDefaultCurrency/expected/types/Query.kt +++ b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/inputWithDefaultCurrency/expected/types/Query.kt @@ -3,17 +3,14 @@ package com.netflix.graphql.dgs.codegen.cases.inputWithDefaultCurrency.expected. import com.fasterxml.jackson.`annotation`.JsonIgnoreProperties import com.fasterxml.jackson.`annotation`.JsonProperty import com.fasterxml.jackson.`annotation`.JsonTypeInfo +import com.fasterxml.jackson.databind.`annotation`.JsonDeserialize +import com.fasterxml.jackson.databind.`annotation`.JsonPOJOBuilder import java.lang.IllegalStateException import kotlin.String import kotlin.jvm.JvmName -import com.fasterxml.jackson.databind.`annotation`.JsonDeserialize as FasterxmlJacksonDatabindAnnotationJsonDeserialize -import com.fasterxml.jackson.databind.`annotation`.JsonPOJOBuilder as FasterxmlJacksonDatabindAnnotationJsonPOJOBuilder -import tools.jackson.databind.`annotation`.JsonDeserialize as ToolsJacksonDatabindAnnotationJsonDeserialize -import tools.jackson.databind.`annotation`.JsonPOJOBuilder as ToolsJacksonDatabindAnnotationJsonPOJOBuilder @JsonTypeInfo(use = JsonTypeInfo.Id.NONE) -@FasterxmlJacksonDatabindAnnotationJsonDeserialize(builder = Query.Builder::class) -@ToolsJacksonDatabindAnnotationJsonDeserialize(builder = Query.Builder::class) +@JsonDeserialize(builder = Query.Builder::class) public class Query( orders: () -> String? = ordersDefault, ) { @@ -28,8 +25,7 @@ public class Query( { throw IllegalStateException("Field `orders` was not requested") } } - @FasterxmlJacksonDatabindAnnotationJsonPOJOBuilder - @ToolsJacksonDatabindAnnotationJsonPOJOBuilder + @JsonPOJOBuilder @JsonIgnoreProperties("__typename") public class Builder { private var orders: () -> String? = ordersDefault diff --git a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/inputWithExtendedType/expected/types/Query.kt b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/inputWithExtendedType/expected/types/Query.kt index 25f38fe17..db2065e88 100644 --- a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/inputWithExtendedType/expected/types/Query.kt +++ b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/inputWithExtendedType/expected/types/Query.kt @@ -3,18 +3,15 @@ package com.netflix.graphql.dgs.codegen.cases.inputWithExtendedType.expected.typ import com.fasterxml.jackson.`annotation`.JsonIgnoreProperties import com.fasterxml.jackson.`annotation`.JsonProperty import com.fasterxml.jackson.`annotation`.JsonTypeInfo +import com.fasterxml.jackson.databind.`annotation`.JsonDeserialize +import com.fasterxml.jackson.databind.`annotation`.JsonPOJOBuilder import java.lang.IllegalStateException import kotlin.String import kotlin.collections.List import kotlin.jvm.JvmName -import com.fasterxml.jackson.databind.`annotation`.JsonDeserialize as FasterxmlJacksonDatabindAnnotationJsonDeserialize -import com.fasterxml.jackson.databind.`annotation`.JsonPOJOBuilder as FasterxmlJacksonDatabindAnnotationJsonPOJOBuilder -import tools.jackson.databind.`annotation`.JsonDeserialize as ToolsJacksonDatabindAnnotationJsonDeserialize -import tools.jackson.databind.`annotation`.JsonPOJOBuilder as ToolsJacksonDatabindAnnotationJsonPOJOBuilder @JsonTypeInfo(use = JsonTypeInfo.Id.NONE) -@FasterxmlJacksonDatabindAnnotationJsonDeserialize(builder = Query.Builder::class) -@ToolsJacksonDatabindAnnotationJsonDeserialize(builder = Query.Builder::class) +@JsonDeserialize(builder = Query.Builder::class) public class Query( movies: () -> List? = moviesDefault, ) { @@ -29,8 +26,7 @@ public class Query( { throw IllegalStateException("Field `movies` was not requested") } } - @FasterxmlJacksonDatabindAnnotationJsonPOJOBuilder - @ToolsJacksonDatabindAnnotationJsonPOJOBuilder + @JsonPOJOBuilder @JsonIgnoreProperties("__typename") public class Builder { private var movies: () -> List? = moviesDefault diff --git a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/interfaceClassWithInterfaceFields/expected/types/Bird.kt b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/interfaceClassWithInterfaceFields/expected/types/Bird.kt index 453f6149e..f81708ed3 100644 --- a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/interfaceClassWithInterfaceFields/expected/types/Bird.kt +++ b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/interfaceClassWithInterfaceFields/expected/types/Bird.kt @@ -3,19 +3,16 @@ package com.netflix.graphql.dgs.codegen.cases.interfaceClassWithInterfaceFields. import com.fasterxml.jackson.`annotation`.JsonIgnoreProperties import com.fasterxml.jackson.`annotation`.JsonProperty import com.fasterxml.jackson.`annotation`.JsonTypeInfo +import com.fasterxml.jackson.databind.`annotation`.JsonDeserialize +import com.fasterxml.jackson.databind.`annotation`.JsonPOJOBuilder import java.lang.IllegalStateException import kotlin.String import kotlin.Suppress import kotlin.collections.List import kotlin.jvm.JvmName -import com.fasterxml.jackson.databind.`annotation`.JsonDeserialize as FasterxmlJacksonDatabindAnnotationJsonDeserialize -import com.fasterxml.jackson.databind.`annotation`.JsonPOJOBuilder as FasterxmlJacksonDatabindAnnotationJsonPOJOBuilder -import tools.jackson.databind.`annotation`.JsonDeserialize as ToolsJacksonDatabindAnnotationJsonDeserialize -import tools.jackson.databind.`annotation`.JsonPOJOBuilder as ToolsJacksonDatabindAnnotationJsonPOJOBuilder @JsonTypeInfo(use = JsonTypeInfo.Id.NONE) -@FasterxmlJacksonDatabindAnnotationJsonDeserialize(builder = Bird.Builder::class) -@ToolsJacksonDatabindAnnotationJsonDeserialize(builder = Bird.Builder::class) +@JsonDeserialize(builder = Bird.Builder::class) public class Bird( id: () -> String = idDefault, name: () -> String? = nameDefault, @@ -86,8 +83,7 @@ public class Bird( { throw IllegalStateException("Field `parents` was not requested") } } - @FasterxmlJacksonDatabindAnnotationJsonPOJOBuilder - @ToolsJacksonDatabindAnnotationJsonPOJOBuilder + @JsonPOJOBuilder @JsonIgnoreProperties("__typename") public class Builder { private var id: () -> String = idDefault diff --git a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/interfaceClassWithInterfaceFields/expected/types/Dog.kt b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/interfaceClassWithInterfaceFields/expected/types/Dog.kt index 93107ddde..65a7e974e 100644 --- a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/interfaceClassWithInterfaceFields/expected/types/Dog.kt +++ b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/interfaceClassWithInterfaceFields/expected/types/Dog.kt @@ -3,19 +3,16 @@ package com.netflix.graphql.dgs.codegen.cases.interfaceClassWithInterfaceFields. import com.fasterxml.jackson.`annotation`.JsonIgnoreProperties import com.fasterxml.jackson.`annotation`.JsonProperty import com.fasterxml.jackson.`annotation`.JsonTypeInfo +import com.fasterxml.jackson.databind.`annotation`.JsonDeserialize +import com.fasterxml.jackson.databind.`annotation`.JsonPOJOBuilder import java.lang.IllegalStateException import kotlin.String import kotlin.Suppress import kotlin.collections.List import kotlin.jvm.JvmName -import com.fasterxml.jackson.databind.`annotation`.JsonDeserialize as FasterxmlJacksonDatabindAnnotationJsonDeserialize -import com.fasterxml.jackson.databind.`annotation`.JsonPOJOBuilder as FasterxmlJacksonDatabindAnnotationJsonPOJOBuilder -import tools.jackson.databind.`annotation`.JsonDeserialize as ToolsJacksonDatabindAnnotationJsonDeserialize -import tools.jackson.databind.`annotation`.JsonPOJOBuilder as ToolsJacksonDatabindAnnotationJsonPOJOBuilder @JsonTypeInfo(use = JsonTypeInfo.Id.NONE) -@FasterxmlJacksonDatabindAnnotationJsonDeserialize(builder = Dog.Builder::class) -@ToolsJacksonDatabindAnnotationJsonDeserialize(builder = Dog.Builder::class) +@JsonDeserialize(builder = Dog.Builder::class) public class Dog( id: () -> String = idDefault, name: () -> String? = nameDefault, @@ -86,8 +83,7 @@ public class Dog( { throw IllegalStateException("Field `parents` was not requested") } } - @FasterxmlJacksonDatabindAnnotationJsonPOJOBuilder - @ToolsJacksonDatabindAnnotationJsonPOJOBuilder + @JsonPOJOBuilder @JsonIgnoreProperties("__typename") public class Builder { private var id: () -> String = idDefault diff --git a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/interfaceClassWithInterfaceFieldsOfDifferentType/expected/types/Dog.kt b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/interfaceClassWithInterfaceFieldsOfDifferentType/expected/types/Dog.kt index 66de9787f..3830f43cb 100644 --- a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/interfaceClassWithInterfaceFieldsOfDifferentType/expected/types/Dog.kt +++ b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/interfaceClassWithInterfaceFieldsOfDifferentType/expected/types/Dog.kt @@ -3,18 +3,15 @@ package com.netflix.graphql.dgs.codegen.cases.interfaceClassWithInterfaceFieldsO import com.fasterxml.jackson.`annotation`.JsonIgnoreProperties import com.fasterxml.jackson.`annotation`.JsonProperty import com.fasterxml.jackson.`annotation`.JsonTypeInfo +import com.fasterxml.jackson.databind.`annotation`.JsonDeserialize +import com.fasterxml.jackson.databind.`annotation`.JsonPOJOBuilder import java.lang.IllegalStateException import kotlin.String import kotlin.Suppress import kotlin.jvm.JvmName -import com.fasterxml.jackson.databind.`annotation`.JsonDeserialize as FasterxmlJacksonDatabindAnnotationJsonDeserialize -import com.fasterxml.jackson.databind.`annotation`.JsonPOJOBuilder as FasterxmlJacksonDatabindAnnotationJsonPOJOBuilder -import tools.jackson.databind.`annotation`.JsonDeserialize as ToolsJacksonDatabindAnnotationJsonDeserialize -import tools.jackson.databind.`annotation`.JsonPOJOBuilder as ToolsJacksonDatabindAnnotationJsonPOJOBuilder @JsonTypeInfo(use = JsonTypeInfo.Id.NONE) -@FasterxmlJacksonDatabindAnnotationJsonDeserialize(builder = Dog.Builder::class) -@ToolsJacksonDatabindAnnotationJsonDeserialize(builder = Dog.Builder::class) +@JsonDeserialize(builder = Dog.Builder::class) public class Dog( name: () -> String? = nameDefault, diet: () -> Vegetarian? = dietDefault, @@ -41,8 +38,7 @@ public class Dog( { throw IllegalStateException("Field `diet` was not requested") } } - @FasterxmlJacksonDatabindAnnotationJsonPOJOBuilder - @ToolsJacksonDatabindAnnotationJsonPOJOBuilder + @JsonPOJOBuilder @JsonIgnoreProperties("__typename") public class Builder { private var name: () -> String? = nameDefault diff --git a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/interfaceClassWithInterfaceFieldsOfDifferentType/expected/types/Vegetarian.kt b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/interfaceClassWithInterfaceFieldsOfDifferentType/expected/types/Vegetarian.kt index 04d6dbf47..6ca7e0553 100644 --- a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/interfaceClassWithInterfaceFieldsOfDifferentType/expected/types/Vegetarian.kt +++ b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/interfaceClassWithInterfaceFieldsOfDifferentType/expected/types/Vegetarian.kt @@ -3,19 +3,16 @@ package com.netflix.graphql.dgs.codegen.cases.interfaceClassWithInterfaceFieldsO import com.fasterxml.jackson.`annotation`.JsonIgnoreProperties import com.fasterxml.jackson.`annotation`.JsonProperty import com.fasterxml.jackson.`annotation`.JsonTypeInfo +import com.fasterxml.jackson.databind.`annotation`.JsonDeserialize +import com.fasterxml.jackson.databind.`annotation`.JsonPOJOBuilder import java.lang.IllegalStateException import kotlin.String import kotlin.Suppress import kotlin.collections.List import kotlin.jvm.JvmName -import com.fasterxml.jackson.databind.`annotation`.JsonDeserialize as FasterxmlJacksonDatabindAnnotationJsonDeserialize -import com.fasterxml.jackson.databind.`annotation`.JsonPOJOBuilder as FasterxmlJacksonDatabindAnnotationJsonPOJOBuilder -import tools.jackson.databind.`annotation`.JsonDeserialize as ToolsJacksonDatabindAnnotationJsonDeserialize -import tools.jackson.databind.`annotation`.JsonPOJOBuilder as ToolsJacksonDatabindAnnotationJsonPOJOBuilder @JsonTypeInfo(use = JsonTypeInfo.Id.NONE) -@FasterxmlJacksonDatabindAnnotationJsonDeserialize(builder = Vegetarian.Builder::class) -@ToolsJacksonDatabindAnnotationJsonDeserialize(builder = Vegetarian.Builder::class) +@JsonDeserialize(builder = Vegetarian.Builder::class) public class Vegetarian( calories: () -> String? = caloriesDefault, vegetables: () -> List? = vegetablesDefault, @@ -41,8 +38,7 @@ public class Vegetarian( { throw IllegalStateException("Field `vegetables` was not requested") } } - @FasterxmlJacksonDatabindAnnotationJsonPOJOBuilder - @ToolsJacksonDatabindAnnotationJsonPOJOBuilder + @JsonPOJOBuilder @JsonIgnoreProperties("__typename") public class Builder { private var calories: () -> String? = caloriesDefault diff --git a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/interfaceClassWithNonNullableFields/expected/types/Employee.kt b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/interfaceClassWithNonNullableFields/expected/types/Employee.kt index d3796a61d..1c58168e3 100644 --- a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/interfaceClassWithNonNullableFields/expected/types/Employee.kt +++ b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/interfaceClassWithNonNullableFields/expected/types/Employee.kt @@ -3,18 +3,15 @@ package com.netflix.graphql.dgs.codegen.cases.interfaceClassWithNonNullableField import com.fasterxml.jackson.`annotation`.JsonIgnoreProperties import com.fasterxml.jackson.`annotation`.JsonProperty import com.fasterxml.jackson.`annotation`.JsonTypeInfo +import com.fasterxml.jackson.databind.`annotation`.JsonDeserialize +import com.fasterxml.jackson.databind.`annotation`.JsonPOJOBuilder import java.lang.IllegalStateException import kotlin.String import kotlin.Suppress import kotlin.jvm.JvmName -import com.fasterxml.jackson.databind.`annotation`.JsonDeserialize as FasterxmlJacksonDatabindAnnotationJsonDeserialize -import com.fasterxml.jackson.databind.`annotation`.JsonPOJOBuilder as FasterxmlJacksonDatabindAnnotationJsonPOJOBuilder -import tools.jackson.databind.`annotation`.JsonDeserialize as ToolsJacksonDatabindAnnotationJsonDeserialize -import tools.jackson.databind.`annotation`.JsonPOJOBuilder as ToolsJacksonDatabindAnnotationJsonPOJOBuilder @JsonTypeInfo(use = JsonTypeInfo.Id.NONE) -@FasterxmlJacksonDatabindAnnotationJsonDeserialize(builder = Employee.Builder::class) -@ToolsJacksonDatabindAnnotationJsonDeserialize(builder = Employee.Builder::class) +@JsonDeserialize(builder = Employee.Builder::class) public class Employee( firstname: () -> String = firstnameDefault, lastname: () -> String? = lastnameDefault, @@ -51,8 +48,7 @@ public class Employee( { throw IllegalStateException("Field `company` was not requested") } } - @FasterxmlJacksonDatabindAnnotationJsonPOJOBuilder - @ToolsJacksonDatabindAnnotationJsonPOJOBuilder + @JsonPOJOBuilder @JsonIgnoreProperties("__typename") public class Builder { private var firstname: () -> String = firstnameDefault diff --git a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/interfaceClassWithNonNullableFields/expected/types/Query.kt b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/interfaceClassWithNonNullableFields/expected/types/Query.kt index 9e5ee3ae3..c974265c5 100644 --- a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/interfaceClassWithNonNullableFields/expected/types/Query.kt +++ b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/interfaceClassWithNonNullableFields/expected/types/Query.kt @@ -3,17 +3,14 @@ package com.netflix.graphql.dgs.codegen.cases.interfaceClassWithNonNullableField import com.fasterxml.jackson.`annotation`.JsonIgnoreProperties import com.fasterxml.jackson.`annotation`.JsonProperty import com.fasterxml.jackson.`annotation`.JsonTypeInfo +import com.fasterxml.jackson.databind.`annotation`.JsonDeserialize +import com.fasterxml.jackson.databind.`annotation`.JsonPOJOBuilder import java.lang.IllegalStateException import kotlin.collections.List import kotlin.jvm.JvmName -import com.fasterxml.jackson.databind.`annotation`.JsonDeserialize as FasterxmlJacksonDatabindAnnotationJsonDeserialize -import com.fasterxml.jackson.databind.`annotation`.JsonPOJOBuilder as FasterxmlJacksonDatabindAnnotationJsonPOJOBuilder -import tools.jackson.databind.`annotation`.JsonDeserialize as ToolsJacksonDatabindAnnotationJsonDeserialize -import tools.jackson.databind.`annotation`.JsonPOJOBuilder as ToolsJacksonDatabindAnnotationJsonPOJOBuilder @JsonTypeInfo(use = JsonTypeInfo.Id.NONE) -@FasterxmlJacksonDatabindAnnotationJsonDeserialize(builder = Query.Builder::class) -@ToolsJacksonDatabindAnnotationJsonDeserialize(builder = Query.Builder::class) +@JsonDeserialize(builder = Query.Builder::class) public class Query( people: () -> List? = peopleDefault, ) { @@ -28,8 +25,7 @@ public class Query( { throw IllegalStateException("Field `people` was not requested") } } - @FasterxmlJacksonDatabindAnnotationJsonPOJOBuilder - @ToolsJacksonDatabindAnnotationJsonPOJOBuilder + @JsonPOJOBuilder @JsonIgnoreProperties("__typename") public class Builder { private var people: () -> List? = peopleDefault diff --git a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/interfaceWithInterfaceInheritance/expected/types/Query.kt b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/interfaceWithInterfaceInheritance/expected/types/Query.kt index 4624f9f39..0ac2f70ae 100644 --- a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/interfaceWithInterfaceInheritance/expected/types/Query.kt +++ b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/interfaceWithInterfaceInheritance/expected/types/Query.kt @@ -3,17 +3,14 @@ package com.netflix.graphql.dgs.codegen.cases.interfaceWithInterfaceInheritance. import com.fasterxml.jackson.`annotation`.JsonIgnoreProperties import com.fasterxml.jackson.`annotation`.JsonProperty import com.fasterxml.jackson.`annotation`.JsonTypeInfo +import com.fasterxml.jackson.databind.`annotation`.JsonDeserialize +import com.fasterxml.jackson.databind.`annotation`.JsonPOJOBuilder import java.lang.IllegalStateException import kotlin.collections.List import kotlin.jvm.JvmName -import com.fasterxml.jackson.databind.`annotation`.JsonDeserialize as FasterxmlJacksonDatabindAnnotationJsonDeserialize -import com.fasterxml.jackson.databind.`annotation`.JsonPOJOBuilder as FasterxmlJacksonDatabindAnnotationJsonPOJOBuilder -import tools.jackson.databind.`annotation`.JsonDeserialize as ToolsJacksonDatabindAnnotationJsonDeserialize -import tools.jackson.databind.`annotation`.JsonPOJOBuilder as ToolsJacksonDatabindAnnotationJsonPOJOBuilder @JsonTypeInfo(use = JsonTypeInfo.Id.NONE) -@FasterxmlJacksonDatabindAnnotationJsonDeserialize(builder = Query.Builder::class) -@ToolsJacksonDatabindAnnotationJsonDeserialize(builder = Query.Builder::class) +@JsonDeserialize(builder = Query.Builder::class) public class Query( fruits: () -> List? = fruitsDefault, ) { @@ -28,8 +25,7 @@ public class Query( { throw IllegalStateException("Field `fruits` was not requested") } } - @FasterxmlJacksonDatabindAnnotationJsonPOJOBuilder - @ToolsJacksonDatabindAnnotationJsonPOJOBuilder + @JsonPOJOBuilder @JsonIgnoreProperties("__typename") public class Builder { private var fruits: () -> List? = fruitsDefault diff --git a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/interfaceWithInterfaceInheritance/expected/types/Seed.kt b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/interfaceWithInterfaceInheritance/expected/types/Seed.kt index d803689ac..59c8904a8 100644 --- a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/interfaceWithInterfaceInheritance/expected/types/Seed.kt +++ b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/interfaceWithInterfaceInheritance/expected/types/Seed.kt @@ -3,17 +3,14 @@ package com.netflix.graphql.dgs.codegen.cases.interfaceWithInterfaceInheritance. import com.fasterxml.jackson.`annotation`.JsonIgnoreProperties import com.fasterxml.jackson.`annotation`.JsonProperty import com.fasterxml.jackson.`annotation`.JsonTypeInfo +import com.fasterxml.jackson.databind.`annotation`.JsonDeserialize +import com.fasterxml.jackson.databind.`annotation`.JsonPOJOBuilder import java.lang.IllegalStateException import kotlin.String import kotlin.jvm.JvmName -import com.fasterxml.jackson.databind.`annotation`.JsonDeserialize as FasterxmlJacksonDatabindAnnotationJsonDeserialize -import com.fasterxml.jackson.databind.`annotation`.JsonPOJOBuilder as FasterxmlJacksonDatabindAnnotationJsonPOJOBuilder -import tools.jackson.databind.`annotation`.JsonDeserialize as ToolsJacksonDatabindAnnotationJsonDeserialize -import tools.jackson.databind.`annotation`.JsonPOJOBuilder as ToolsJacksonDatabindAnnotationJsonPOJOBuilder @JsonTypeInfo(use = JsonTypeInfo.Id.NONE) -@FasterxmlJacksonDatabindAnnotationJsonDeserialize(builder = Seed.Builder::class) -@ToolsJacksonDatabindAnnotationJsonDeserialize(builder = Seed.Builder::class) +@JsonDeserialize(builder = Seed.Builder::class) public class Seed( name: () -> String? = nameDefault, ) { @@ -28,8 +25,7 @@ public class Seed( { throw IllegalStateException("Field `name` was not requested") } } - @FasterxmlJacksonDatabindAnnotationJsonPOJOBuilder - @ToolsJacksonDatabindAnnotationJsonPOJOBuilder + @JsonPOJOBuilder @JsonIgnoreProperties("__typename") public class Builder { private var name: () -> String? = nameDefault diff --git a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/interfaceWithUnderscoreFields/expected/types/Query.kt b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/interfaceWithUnderscoreFields/expected/types/Query.kt index 07bb5cb2d..1782c52d1 100644 --- a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/interfaceWithUnderscoreFields/expected/types/Query.kt +++ b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/interfaceWithUnderscoreFields/expected/types/Query.kt @@ -3,17 +3,14 @@ package com.netflix.graphql.dgs.codegen.cases.interfaceWithUnderscoreFields.expe import com.fasterxml.jackson.`annotation`.JsonIgnoreProperties import com.fasterxml.jackson.`annotation`.JsonProperty import com.fasterxml.jackson.`annotation`.JsonTypeInfo +import com.fasterxml.jackson.databind.`annotation`.JsonDeserialize +import com.fasterxml.jackson.databind.`annotation`.JsonPOJOBuilder import java.lang.IllegalStateException import kotlin.collections.List import kotlin.jvm.JvmName -import com.fasterxml.jackson.databind.`annotation`.JsonDeserialize as FasterxmlJacksonDatabindAnnotationJsonDeserialize -import com.fasterxml.jackson.databind.`annotation`.JsonPOJOBuilder as FasterxmlJacksonDatabindAnnotationJsonPOJOBuilder -import tools.jackson.databind.`annotation`.JsonDeserialize as ToolsJacksonDatabindAnnotationJsonDeserialize -import tools.jackson.databind.`annotation`.JsonPOJOBuilder as ToolsJacksonDatabindAnnotationJsonPOJOBuilder @JsonTypeInfo(use = JsonTypeInfo.Id.NONE) -@FasterxmlJacksonDatabindAnnotationJsonDeserialize(builder = Query.Builder::class) -@ToolsJacksonDatabindAnnotationJsonDeserialize(builder = Query.Builder::class) +@JsonDeserialize(builder = Query.Builder::class) public class Query( `is`: () -> List? = isDefault, ) { @@ -28,8 +25,7 @@ public class Query( { throw IllegalStateException("Field `is` was not requested") } } - @FasterxmlJacksonDatabindAnnotationJsonPOJOBuilder - @ToolsJacksonDatabindAnnotationJsonPOJOBuilder + @JsonPOJOBuilder @JsonIgnoreProperties("__typename") public class Builder { private var `is`: () -> List? = isDefault diff --git a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/interfaceWithUnderscoreFields/expected/types/T.kt b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/interfaceWithUnderscoreFields/expected/types/T.kt index 208eaa0a3..d67a28971 100644 --- a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/interfaceWithUnderscoreFields/expected/types/T.kt +++ b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/interfaceWithUnderscoreFields/expected/types/T.kt @@ -3,18 +3,15 @@ package com.netflix.graphql.dgs.codegen.cases.interfaceWithUnderscoreFields.expe import com.fasterxml.jackson.`annotation`.JsonIgnoreProperties import com.fasterxml.jackson.`annotation`.JsonProperty import com.fasterxml.jackson.`annotation`.JsonTypeInfo +import com.fasterxml.jackson.databind.`annotation`.JsonDeserialize +import com.fasterxml.jackson.databind.`annotation`.JsonPOJOBuilder import java.lang.IllegalStateException import kotlin.String import kotlin.Suppress import kotlin.jvm.JvmName -import com.fasterxml.jackson.databind.`annotation`.JsonDeserialize as FasterxmlJacksonDatabindAnnotationJsonDeserialize -import com.fasterxml.jackson.databind.`annotation`.JsonPOJOBuilder as FasterxmlJacksonDatabindAnnotationJsonPOJOBuilder -import tools.jackson.databind.`annotation`.JsonDeserialize as ToolsJacksonDatabindAnnotationJsonDeserialize -import tools.jackson.databind.`annotation`.JsonPOJOBuilder as ToolsJacksonDatabindAnnotationJsonPOJOBuilder @JsonTypeInfo(use = JsonTypeInfo.Id.NONE) -@FasterxmlJacksonDatabindAnnotationJsonDeserialize(builder = T.Builder::class) -@ToolsJacksonDatabindAnnotationJsonDeserialize(builder = T.Builder::class) +@JsonDeserialize(builder = T.Builder::class) public class T( _id: () -> String? = _idDefault, id: () -> String? = idDefault, @@ -40,8 +37,7 @@ public class T( { throw IllegalStateException("Field `id` was not requested") } } - @FasterxmlJacksonDatabindAnnotationJsonPOJOBuilder - @ToolsJacksonDatabindAnnotationJsonPOJOBuilder + @JsonPOJOBuilder @JsonIgnoreProperties("__typename") public class Builder { private var _id: () -> String? = _idDefault diff --git a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/projectionWithEnum/expected/types/Query.kt b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/projectionWithEnum/expected/types/Query.kt index 2ed9ac833..6379548ec 100644 --- a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/projectionWithEnum/expected/types/Query.kt +++ b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/projectionWithEnum/expected/types/Query.kt @@ -3,17 +3,14 @@ package com.netflix.graphql.dgs.codegen.cases.projectionWithEnum.expected.types import com.fasterxml.jackson.`annotation`.JsonIgnoreProperties import com.fasterxml.jackson.`annotation`.JsonProperty import com.fasterxml.jackson.`annotation`.JsonTypeInfo +import com.fasterxml.jackson.databind.`annotation`.JsonDeserialize +import com.fasterxml.jackson.databind.`annotation`.JsonPOJOBuilder import java.lang.IllegalStateException import kotlin.collections.List import kotlin.jvm.JvmName -import com.fasterxml.jackson.databind.`annotation`.JsonDeserialize as FasterxmlJacksonDatabindAnnotationJsonDeserialize -import com.fasterxml.jackson.databind.`annotation`.JsonPOJOBuilder as FasterxmlJacksonDatabindAnnotationJsonPOJOBuilder -import tools.jackson.databind.`annotation`.JsonDeserialize as ToolsJacksonDatabindAnnotationJsonDeserialize -import tools.jackson.databind.`annotation`.JsonPOJOBuilder as ToolsJacksonDatabindAnnotationJsonPOJOBuilder @JsonTypeInfo(use = JsonTypeInfo.Id.NONE) -@FasterxmlJacksonDatabindAnnotationJsonDeserialize(builder = Query.Builder::class) -@ToolsJacksonDatabindAnnotationJsonDeserialize(builder = Query.Builder::class) +@JsonDeserialize(builder = Query.Builder::class) public class Query( e: () -> E? = eDefault, es: () -> List? = esDefault, @@ -38,8 +35,7 @@ public class Query( { throw IllegalStateException("Field `es` was not requested") } } - @FasterxmlJacksonDatabindAnnotationJsonPOJOBuilder - @ToolsJacksonDatabindAnnotationJsonPOJOBuilder + @JsonPOJOBuilder @JsonIgnoreProperties("__typename") public class Builder { private var e: () -> E? = eDefault diff --git a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/projectionWithNestedInputs/expected/types/Query.kt b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/projectionWithNestedInputs/expected/types/Query.kt index 1a1a2c3fe..46a01c25b 100644 --- a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/projectionWithNestedInputs/expected/types/Query.kt +++ b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/projectionWithNestedInputs/expected/types/Query.kt @@ -3,17 +3,14 @@ package com.netflix.graphql.dgs.codegen.cases.projectionWithNestedInputs.expecte import com.fasterxml.jackson.`annotation`.JsonIgnoreProperties import com.fasterxml.jackson.`annotation`.JsonProperty import com.fasterxml.jackson.`annotation`.JsonTypeInfo +import com.fasterxml.jackson.databind.`annotation`.JsonDeserialize +import com.fasterxml.jackson.databind.`annotation`.JsonPOJOBuilder import java.lang.IllegalStateException import kotlin.String import kotlin.jvm.JvmName -import com.fasterxml.jackson.databind.`annotation`.JsonDeserialize as FasterxmlJacksonDatabindAnnotationJsonDeserialize -import com.fasterxml.jackson.databind.`annotation`.JsonPOJOBuilder as FasterxmlJacksonDatabindAnnotationJsonPOJOBuilder -import tools.jackson.databind.`annotation`.JsonDeserialize as ToolsJacksonDatabindAnnotationJsonDeserialize -import tools.jackson.databind.`annotation`.JsonPOJOBuilder as ToolsJacksonDatabindAnnotationJsonPOJOBuilder @JsonTypeInfo(use = JsonTypeInfo.Id.NONE) -@FasterxmlJacksonDatabindAnnotationJsonDeserialize(builder = Query.Builder::class) -@ToolsJacksonDatabindAnnotationJsonDeserialize(builder = Query.Builder::class) +@JsonDeserialize(builder = Query.Builder::class) public class Query( q1: () -> String? = q1Default, q2: () -> String? = q2Default, @@ -38,8 +35,7 @@ public class Query( { throw IllegalStateException("Field `q2` was not requested") } } - @FasterxmlJacksonDatabindAnnotationJsonPOJOBuilder - @ToolsJacksonDatabindAnnotationJsonPOJOBuilder + @JsonPOJOBuilder @JsonIgnoreProperties("__typename") public class Builder { private var q1: () -> String? = q1Default diff --git a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/projectionWithPrimitiveAndArgs/expected/types/Query.kt b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/projectionWithPrimitiveAndArgs/expected/types/Query.kt index bc012618f..93c4f515c 100644 --- a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/projectionWithPrimitiveAndArgs/expected/types/Query.kt +++ b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/projectionWithPrimitiveAndArgs/expected/types/Query.kt @@ -3,17 +3,14 @@ package com.netflix.graphql.dgs.codegen.cases.projectionWithPrimitiveAndArgs.exp import com.fasterxml.jackson.`annotation`.JsonIgnoreProperties import com.fasterxml.jackson.`annotation`.JsonProperty import com.fasterxml.jackson.`annotation`.JsonTypeInfo +import com.fasterxml.jackson.databind.`annotation`.JsonDeserialize +import com.fasterxml.jackson.databind.`annotation`.JsonPOJOBuilder import java.lang.IllegalStateException import kotlin.String import kotlin.jvm.JvmName -import com.fasterxml.jackson.databind.`annotation`.JsonDeserialize as FasterxmlJacksonDatabindAnnotationJsonDeserialize -import com.fasterxml.jackson.databind.`annotation`.JsonPOJOBuilder as FasterxmlJacksonDatabindAnnotationJsonPOJOBuilder -import tools.jackson.databind.`annotation`.JsonDeserialize as ToolsJacksonDatabindAnnotationJsonDeserialize -import tools.jackson.databind.`annotation`.JsonPOJOBuilder as ToolsJacksonDatabindAnnotationJsonPOJOBuilder @JsonTypeInfo(use = JsonTypeInfo.Id.NONE) -@FasterxmlJacksonDatabindAnnotationJsonDeserialize(builder = Query.Builder::class) -@ToolsJacksonDatabindAnnotationJsonDeserialize(builder = Query.Builder::class) +@JsonDeserialize(builder = Query.Builder::class) public class Query( string: () -> String? = stringDefault, ) { @@ -28,8 +25,7 @@ public class Query( { throw IllegalStateException("Field `string` was not requested") } } - @FasterxmlJacksonDatabindAnnotationJsonPOJOBuilder - @ToolsJacksonDatabindAnnotationJsonPOJOBuilder + @JsonPOJOBuilder @JsonIgnoreProperties("__typename") public class Builder { private var string: () -> String? = stringDefault diff --git a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/projectionWithPrimitives/expected/types/Query.kt b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/projectionWithPrimitives/expected/types/Query.kt index 5b0f567ae..e2baf0e49 100644 --- a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/projectionWithPrimitives/expected/types/Query.kt +++ b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/projectionWithPrimitives/expected/types/Query.kt @@ -3,18 +3,15 @@ package com.netflix.graphql.dgs.codegen.cases.projectionWithPrimitives.expected. import com.fasterxml.jackson.`annotation`.JsonIgnoreProperties import com.fasterxml.jackson.`annotation`.JsonProperty import com.fasterxml.jackson.`annotation`.JsonTypeInfo +import com.fasterxml.jackson.databind.`annotation`.JsonDeserialize +import com.fasterxml.jackson.databind.`annotation`.JsonPOJOBuilder import java.lang.IllegalStateException import kotlin.String import kotlin.collections.List import kotlin.jvm.JvmName -import com.fasterxml.jackson.databind.`annotation`.JsonDeserialize as FasterxmlJacksonDatabindAnnotationJsonDeserialize -import com.fasterxml.jackson.databind.`annotation`.JsonPOJOBuilder as FasterxmlJacksonDatabindAnnotationJsonPOJOBuilder -import tools.jackson.databind.`annotation`.JsonDeserialize as ToolsJacksonDatabindAnnotationJsonDeserialize -import tools.jackson.databind.`annotation`.JsonPOJOBuilder as ToolsJacksonDatabindAnnotationJsonPOJOBuilder @JsonTypeInfo(use = JsonTypeInfo.Id.NONE) -@FasterxmlJacksonDatabindAnnotationJsonDeserialize(builder = Query.Builder::class) -@ToolsJacksonDatabindAnnotationJsonDeserialize(builder = Query.Builder::class) +@JsonDeserialize(builder = Query.Builder::class) public class Query( string: () -> String? = stringDefault, strings: () -> List? = stringsDefault, @@ -39,8 +36,7 @@ public class Query( { throw IllegalStateException("Field `strings` was not requested") } } - @FasterxmlJacksonDatabindAnnotationJsonPOJOBuilder - @ToolsJacksonDatabindAnnotationJsonPOJOBuilder + @JsonPOJOBuilder @JsonIgnoreProperties("__typename") public class Builder { private var string: () -> String? = stringDefault diff --git a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/projectionWithType/expected/types/Employee.kt b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/projectionWithType/expected/types/Employee.kt index a8e5ebb89..3f9b1f0a4 100644 --- a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/projectionWithType/expected/types/Employee.kt +++ b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/projectionWithType/expected/types/Employee.kt @@ -3,18 +3,15 @@ package com.netflix.graphql.dgs.codegen.cases.projectionWithType.expected.types import com.fasterxml.jackson.`annotation`.JsonIgnoreProperties import com.fasterxml.jackson.`annotation`.JsonProperty import com.fasterxml.jackson.`annotation`.JsonTypeInfo +import com.fasterxml.jackson.databind.`annotation`.JsonDeserialize +import com.fasterxml.jackson.databind.`annotation`.JsonPOJOBuilder import java.lang.IllegalStateException import kotlin.String import kotlin.Suppress import kotlin.jvm.JvmName -import com.fasterxml.jackson.databind.`annotation`.JsonDeserialize as FasterxmlJacksonDatabindAnnotationJsonDeserialize -import com.fasterxml.jackson.databind.`annotation`.JsonPOJOBuilder as FasterxmlJacksonDatabindAnnotationJsonPOJOBuilder -import tools.jackson.databind.`annotation`.JsonDeserialize as ToolsJacksonDatabindAnnotationJsonDeserialize -import tools.jackson.databind.`annotation`.JsonPOJOBuilder as ToolsJacksonDatabindAnnotationJsonPOJOBuilder @JsonTypeInfo(use = JsonTypeInfo.Id.NONE) -@FasterxmlJacksonDatabindAnnotationJsonDeserialize(builder = Employee.Builder::class) -@ToolsJacksonDatabindAnnotationJsonDeserialize(builder = Employee.Builder::class) +@JsonDeserialize(builder = Employee.Builder::class) public class Employee( firstname: () -> String? = firstnameDefault, company: () -> String? = companyDefault, @@ -40,8 +37,7 @@ public class Employee( { throw IllegalStateException("Field `company` was not requested") } } - @FasterxmlJacksonDatabindAnnotationJsonPOJOBuilder - @ToolsJacksonDatabindAnnotationJsonPOJOBuilder + @JsonPOJOBuilder @JsonIgnoreProperties("__typename") public class Builder { private var firstname: () -> String? = firstnameDefault diff --git a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/projectionWithType/expected/types/Query.kt b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/projectionWithType/expected/types/Query.kt index 373c0e4d5..72fd25238 100644 --- a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/projectionWithType/expected/types/Query.kt +++ b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/projectionWithType/expected/types/Query.kt @@ -3,17 +3,14 @@ package com.netflix.graphql.dgs.codegen.cases.projectionWithType.expected.types import com.fasterxml.jackson.`annotation`.JsonIgnoreProperties import com.fasterxml.jackson.`annotation`.JsonProperty import com.fasterxml.jackson.`annotation`.JsonTypeInfo +import com.fasterxml.jackson.databind.`annotation`.JsonDeserialize +import com.fasterxml.jackson.databind.`annotation`.JsonPOJOBuilder import java.lang.IllegalStateException import kotlin.collections.List import kotlin.jvm.JvmName -import com.fasterxml.jackson.databind.`annotation`.JsonDeserialize as FasterxmlJacksonDatabindAnnotationJsonDeserialize -import com.fasterxml.jackson.databind.`annotation`.JsonPOJOBuilder as FasterxmlJacksonDatabindAnnotationJsonPOJOBuilder -import tools.jackson.databind.`annotation`.JsonDeserialize as ToolsJacksonDatabindAnnotationJsonDeserialize -import tools.jackson.databind.`annotation`.JsonPOJOBuilder as ToolsJacksonDatabindAnnotationJsonPOJOBuilder @JsonTypeInfo(use = JsonTypeInfo.Id.NONE) -@FasterxmlJacksonDatabindAnnotationJsonDeserialize(builder = Query.Builder::class) -@ToolsJacksonDatabindAnnotationJsonDeserialize(builder = Query.Builder::class) +@JsonDeserialize(builder = Query.Builder::class) public class Query( person: () -> Person? = personDefault, people: () -> List? = peopleDefault, @@ -38,8 +35,7 @@ public class Query( { throw IllegalStateException("Field `people` was not requested") } } - @FasterxmlJacksonDatabindAnnotationJsonPOJOBuilder - @ToolsJacksonDatabindAnnotationJsonPOJOBuilder + @JsonPOJOBuilder @JsonIgnoreProperties("__typename") public class Builder { private var person: () -> Person? = personDefault diff --git a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/projectionWithTypeAndArgs/expected/types/Employee.kt b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/projectionWithTypeAndArgs/expected/types/Employee.kt index 3a556df14..38ceb1a22 100644 --- a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/projectionWithTypeAndArgs/expected/types/Employee.kt +++ b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/projectionWithTypeAndArgs/expected/types/Employee.kt @@ -3,18 +3,15 @@ package com.netflix.graphql.dgs.codegen.cases.projectionWithTypeAndArgs.expected import com.fasterxml.jackson.`annotation`.JsonIgnoreProperties import com.fasterxml.jackson.`annotation`.JsonProperty import com.fasterxml.jackson.`annotation`.JsonTypeInfo +import com.fasterxml.jackson.databind.`annotation`.JsonDeserialize +import com.fasterxml.jackson.databind.`annotation`.JsonPOJOBuilder import java.lang.IllegalStateException import kotlin.String import kotlin.Suppress import kotlin.jvm.JvmName -import com.fasterxml.jackson.databind.`annotation`.JsonDeserialize as FasterxmlJacksonDatabindAnnotationJsonDeserialize -import com.fasterxml.jackson.databind.`annotation`.JsonPOJOBuilder as FasterxmlJacksonDatabindAnnotationJsonPOJOBuilder -import tools.jackson.databind.`annotation`.JsonDeserialize as ToolsJacksonDatabindAnnotationJsonDeserialize -import tools.jackson.databind.`annotation`.JsonPOJOBuilder as ToolsJacksonDatabindAnnotationJsonPOJOBuilder @JsonTypeInfo(use = JsonTypeInfo.Id.NONE) -@FasterxmlJacksonDatabindAnnotationJsonDeserialize(builder = Employee.Builder::class) -@ToolsJacksonDatabindAnnotationJsonDeserialize(builder = Employee.Builder::class) +@JsonDeserialize(builder = Employee.Builder::class) public class Employee( firstname: () -> String? = firstnameDefault, company: () -> String? = companyDefault, @@ -40,8 +37,7 @@ public class Employee( { throw IllegalStateException("Field `company` was not requested") } } - @FasterxmlJacksonDatabindAnnotationJsonPOJOBuilder - @ToolsJacksonDatabindAnnotationJsonPOJOBuilder + @JsonPOJOBuilder @JsonIgnoreProperties("__typename") public class Builder { private var firstname: () -> String? = firstnameDefault diff --git a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/projectionWithTypeAndArgs/expected/types/Query.kt b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/projectionWithTypeAndArgs/expected/types/Query.kt index 0e8684f81..c9dc7e836 100644 --- a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/projectionWithTypeAndArgs/expected/types/Query.kt +++ b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/projectionWithTypeAndArgs/expected/types/Query.kt @@ -3,16 +3,13 @@ package com.netflix.graphql.dgs.codegen.cases.projectionWithTypeAndArgs.expected import com.fasterxml.jackson.`annotation`.JsonIgnoreProperties import com.fasterxml.jackson.`annotation`.JsonProperty import com.fasterxml.jackson.`annotation`.JsonTypeInfo +import com.fasterxml.jackson.databind.`annotation`.JsonDeserialize +import com.fasterxml.jackson.databind.`annotation`.JsonPOJOBuilder import java.lang.IllegalStateException import kotlin.jvm.JvmName -import com.fasterxml.jackson.databind.`annotation`.JsonDeserialize as FasterxmlJacksonDatabindAnnotationJsonDeserialize -import com.fasterxml.jackson.databind.`annotation`.JsonPOJOBuilder as FasterxmlJacksonDatabindAnnotationJsonPOJOBuilder -import tools.jackson.databind.`annotation`.JsonDeserialize as ToolsJacksonDatabindAnnotationJsonDeserialize -import tools.jackson.databind.`annotation`.JsonPOJOBuilder as ToolsJacksonDatabindAnnotationJsonPOJOBuilder @JsonTypeInfo(use = JsonTypeInfo.Id.NONE) -@FasterxmlJacksonDatabindAnnotationJsonDeserialize(builder = Query.Builder::class) -@ToolsJacksonDatabindAnnotationJsonDeserialize(builder = Query.Builder::class) +@JsonDeserialize(builder = Query.Builder::class) public class Query( person: () -> Person? = personDefault, ) { @@ -27,8 +24,7 @@ public class Query( { throw IllegalStateException("Field `person` was not requested") } } - @FasterxmlJacksonDatabindAnnotationJsonPOJOBuilder - @ToolsJacksonDatabindAnnotationJsonPOJOBuilder + @JsonPOJOBuilder @JsonIgnoreProperties("__typename") public class Builder { private var person: () -> Person? = personDefault diff --git a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/projectionWithUnion/expected/types/Employee.kt b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/projectionWithUnion/expected/types/Employee.kt index 6e9cbe571..b5fd669ba 100644 --- a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/projectionWithUnion/expected/types/Employee.kt +++ b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/projectionWithUnion/expected/types/Employee.kt @@ -3,18 +3,15 @@ package com.netflix.graphql.dgs.codegen.cases.projectionWithUnion.expected.types import com.fasterxml.jackson.`annotation`.JsonIgnoreProperties import com.fasterxml.jackson.`annotation`.JsonProperty import com.fasterxml.jackson.`annotation`.JsonTypeInfo +import com.fasterxml.jackson.databind.`annotation`.JsonDeserialize +import com.fasterxml.jackson.databind.`annotation`.JsonPOJOBuilder import java.lang.IllegalStateException import kotlin.String import kotlin.Suppress import kotlin.jvm.JvmName -import com.fasterxml.jackson.databind.`annotation`.JsonDeserialize as FasterxmlJacksonDatabindAnnotationJsonDeserialize -import com.fasterxml.jackson.databind.`annotation`.JsonPOJOBuilder as FasterxmlJacksonDatabindAnnotationJsonPOJOBuilder -import tools.jackson.databind.`annotation`.JsonDeserialize as ToolsJacksonDatabindAnnotationJsonDeserialize -import tools.jackson.databind.`annotation`.JsonPOJOBuilder as ToolsJacksonDatabindAnnotationJsonPOJOBuilder @JsonTypeInfo(use = JsonTypeInfo.Id.NONE) -@FasterxmlJacksonDatabindAnnotationJsonDeserialize(builder = Employee.Builder::class) -@ToolsJacksonDatabindAnnotationJsonDeserialize(builder = Employee.Builder::class) +@JsonDeserialize(builder = Employee.Builder::class) public class Employee( firstname: () -> String? = firstnameDefault, company: () -> String? = companyDefault, @@ -41,8 +38,7 @@ public class Employee( { throw IllegalStateException("Field `company` was not requested") } } - @FasterxmlJacksonDatabindAnnotationJsonPOJOBuilder - @ToolsJacksonDatabindAnnotationJsonPOJOBuilder + @JsonPOJOBuilder @JsonIgnoreProperties("__typename") public class Builder { private var firstname: () -> String? = firstnameDefault diff --git a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/projectionWithUnion/expected/types/Query.kt b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/projectionWithUnion/expected/types/Query.kt index fd9704b49..fe07e2f18 100644 --- a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/projectionWithUnion/expected/types/Query.kt +++ b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/projectionWithUnion/expected/types/Query.kt @@ -3,17 +3,14 @@ package com.netflix.graphql.dgs.codegen.cases.projectionWithUnion.expected.types import com.fasterxml.jackson.`annotation`.JsonIgnoreProperties import com.fasterxml.jackson.`annotation`.JsonProperty import com.fasterxml.jackson.`annotation`.JsonTypeInfo +import com.fasterxml.jackson.databind.`annotation`.JsonDeserialize +import com.fasterxml.jackson.databind.`annotation`.JsonPOJOBuilder import java.lang.IllegalStateException import kotlin.collections.List import kotlin.jvm.JvmName -import com.fasterxml.jackson.databind.`annotation`.JsonDeserialize as FasterxmlJacksonDatabindAnnotationJsonDeserialize -import com.fasterxml.jackson.databind.`annotation`.JsonPOJOBuilder as FasterxmlJacksonDatabindAnnotationJsonPOJOBuilder -import tools.jackson.databind.`annotation`.JsonDeserialize as ToolsJacksonDatabindAnnotationJsonDeserialize -import tools.jackson.databind.`annotation`.JsonPOJOBuilder as ToolsJacksonDatabindAnnotationJsonPOJOBuilder @JsonTypeInfo(use = JsonTypeInfo.Id.NONE) -@FasterxmlJacksonDatabindAnnotationJsonDeserialize(builder = Query.Builder::class) -@ToolsJacksonDatabindAnnotationJsonDeserialize(builder = Query.Builder::class) +@JsonDeserialize(builder = Query.Builder::class) public class Query( u: () -> U? = uDefault, us: () -> List? = usDefault, @@ -38,8 +35,7 @@ public class Query( { throw IllegalStateException("Field `us` was not requested") } } - @FasterxmlJacksonDatabindAnnotationJsonPOJOBuilder - @ToolsJacksonDatabindAnnotationJsonPOJOBuilder + @JsonPOJOBuilder @JsonIgnoreProperties("__typename") public class Builder { private var u: () -> U? = uDefault diff --git a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/skipCodegenOnFields/expected/types/Person.kt b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/skipCodegenOnFields/expected/types/Person.kt index 77766f9ea..9a51a0907 100644 --- a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/skipCodegenOnFields/expected/types/Person.kt +++ b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/skipCodegenOnFields/expected/types/Person.kt @@ -3,17 +3,14 @@ package com.netflix.graphql.dgs.codegen.cases.skipCodegenOnFields.expected.types import com.fasterxml.jackson.`annotation`.JsonIgnoreProperties import com.fasterxml.jackson.`annotation`.JsonProperty import com.fasterxml.jackson.`annotation`.JsonTypeInfo +import com.fasterxml.jackson.databind.`annotation`.JsonDeserialize +import com.fasterxml.jackson.databind.`annotation`.JsonPOJOBuilder import java.lang.IllegalStateException import kotlin.String import kotlin.jvm.JvmName -import com.fasterxml.jackson.databind.`annotation`.JsonDeserialize as FasterxmlJacksonDatabindAnnotationJsonDeserialize -import com.fasterxml.jackson.databind.`annotation`.JsonPOJOBuilder as FasterxmlJacksonDatabindAnnotationJsonPOJOBuilder -import tools.jackson.databind.`annotation`.JsonDeserialize as ToolsJacksonDatabindAnnotationJsonDeserialize -import tools.jackson.databind.`annotation`.JsonPOJOBuilder as ToolsJacksonDatabindAnnotationJsonPOJOBuilder @JsonTypeInfo(use = JsonTypeInfo.Id.NONE) -@FasterxmlJacksonDatabindAnnotationJsonDeserialize(builder = Person.Builder::class) -@ToolsJacksonDatabindAnnotationJsonDeserialize(builder = Person.Builder::class) +@JsonDeserialize(builder = Person.Builder::class) public class Person( name: () -> String? = nameDefault, ) { @@ -28,8 +25,7 @@ public class Person( { throw IllegalStateException("Field `name` was not requested") } } - @FasterxmlJacksonDatabindAnnotationJsonPOJOBuilder - @ToolsJacksonDatabindAnnotationJsonPOJOBuilder + @JsonPOJOBuilder @JsonIgnoreProperties("__typename") public class Builder { private var name: () -> String? = nameDefault diff --git a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/skipCodegenOnTypes/expected/types/Person.kt b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/skipCodegenOnTypes/expected/types/Person.kt index 16b6e3e17..554a9dfc1 100644 --- a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/skipCodegenOnTypes/expected/types/Person.kt +++ b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/skipCodegenOnTypes/expected/types/Person.kt @@ -3,17 +3,14 @@ package com.netflix.graphql.dgs.codegen.cases.skipCodegenOnTypes.expected.types import com.fasterxml.jackson.`annotation`.JsonIgnoreProperties import com.fasterxml.jackson.`annotation`.JsonProperty import com.fasterxml.jackson.`annotation`.JsonTypeInfo +import com.fasterxml.jackson.databind.`annotation`.JsonDeserialize +import com.fasterxml.jackson.databind.`annotation`.JsonPOJOBuilder import java.lang.IllegalStateException import kotlin.String import kotlin.jvm.JvmName -import com.fasterxml.jackson.databind.`annotation`.JsonDeserialize as FasterxmlJacksonDatabindAnnotationJsonDeserialize -import com.fasterxml.jackson.databind.`annotation`.JsonPOJOBuilder as FasterxmlJacksonDatabindAnnotationJsonPOJOBuilder -import tools.jackson.databind.`annotation`.JsonDeserialize as ToolsJacksonDatabindAnnotationJsonDeserialize -import tools.jackson.databind.`annotation`.JsonPOJOBuilder as ToolsJacksonDatabindAnnotationJsonPOJOBuilder @JsonTypeInfo(use = JsonTypeInfo.Id.NONE) -@FasterxmlJacksonDatabindAnnotationJsonDeserialize(builder = Person.Builder::class) -@ToolsJacksonDatabindAnnotationJsonDeserialize(builder = Person.Builder::class) +@JsonDeserialize(builder = Person.Builder::class) public class Person( name: () -> String? = nameDefault, ) { @@ -28,8 +25,7 @@ public class Person( { throw IllegalStateException("Field `name` was not requested") } } - @FasterxmlJacksonDatabindAnnotationJsonPOJOBuilder - @ToolsJacksonDatabindAnnotationJsonPOJOBuilder + @JsonPOJOBuilder @JsonIgnoreProperties("__typename") public class Builder { private var name: () -> String? = nameDefault diff --git a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/union/expected/types/Actor.kt b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/union/expected/types/Actor.kt index 3e4413b40..1b03eea54 100644 --- a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/union/expected/types/Actor.kt +++ b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/union/expected/types/Actor.kt @@ -3,17 +3,14 @@ package com.netflix.graphql.dgs.codegen.cases.union.expected.types import com.fasterxml.jackson.`annotation`.JsonIgnoreProperties import com.fasterxml.jackson.`annotation`.JsonProperty import com.fasterxml.jackson.`annotation`.JsonTypeInfo +import com.fasterxml.jackson.databind.`annotation`.JsonDeserialize +import com.fasterxml.jackson.databind.`annotation`.JsonPOJOBuilder import java.lang.IllegalStateException import kotlin.String import kotlin.jvm.JvmName -import com.fasterxml.jackson.databind.`annotation`.JsonDeserialize as FasterxmlJacksonDatabindAnnotationJsonDeserialize -import com.fasterxml.jackson.databind.`annotation`.JsonPOJOBuilder as FasterxmlJacksonDatabindAnnotationJsonPOJOBuilder -import tools.jackson.databind.`annotation`.JsonDeserialize as ToolsJacksonDatabindAnnotationJsonDeserialize -import tools.jackson.databind.`annotation`.JsonPOJOBuilder as ToolsJacksonDatabindAnnotationJsonPOJOBuilder @JsonTypeInfo(use = JsonTypeInfo.Id.NONE) -@FasterxmlJacksonDatabindAnnotationJsonDeserialize(builder = Actor.Builder::class) -@ToolsJacksonDatabindAnnotationJsonDeserialize(builder = Actor.Builder::class) +@JsonDeserialize(builder = Actor.Builder::class) public class Actor( name: () -> String? = nameDefault, ) : SearchResult { @@ -28,8 +25,7 @@ public class Actor( { throw IllegalStateException("Field `name` was not requested") } } - @FasterxmlJacksonDatabindAnnotationJsonPOJOBuilder - @ToolsJacksonDatabindAnnotationJsonPOJOBuilder + @JsonPOJOBuilder @JsonIgnoreProperties("__typename") public class Builder { private var name: () -> String? = nameDefault diff --git a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/union/expected/types/Movie.kt b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/union/expected/types/Movie.kt index 2f4856d3e..9cd78c2a0 100644 --- a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/union/expected/types/Movie.kt +++ b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/union/expected/types/Movie.kt @@ -3,17 +3,14 @@ package com.netflix.graphql.dgs.codegen.cases.union.expected.types import com.fasterxml.jackson.`annotation`.JsonIgnoreProperties import com.fasterxml.jackson.`annotation`.JsonProperty import com.fasterxml.jackson.`annotation`.JsonTypeInfo +import com.fasterxml.jackson.databind.`annotation`.JsonDeserialize +import com.fasterxml.jackson.databind.`annotation`.JsonPOJOBuilder import java.lang.IllegalStateException import kotlin.String import kotlin.jvm.JvmName -import com.fasterxml.jackson.databind.`annotation`.JsonDeserialize as FasterxmlJacksonDatabindAnnotationJsonDeserialize -import com.fasterxml.jackson.databind.`annotation`.JsonPOJOBuilder as FasterxmlJacksonDatabindAnnotationJsonPOJOBuilder -import tools.jackson.databind.`annotation`.JsonDeserialize as ToolsJacksonDatabindAnnotationJsonDeserialize -import tools.jackson.databind.`annotation`.JsonPOJOBuilder as ToolsJacksonDatabindAnnotationJsonPOJOBuilder @JsonTypeInfo(use = JsonTypeInfo.Id.NONE) -@FasterxmlJacksonDatabindAnnotationJsonDeserialize(builder = Movie.Builder::class) -@ToolsJacksonDatabindAnnotationJsonDeserialize(builder = Movie.Builder::class) +@JsonDeserialize(builder = Movie.Builder::class) public class Movie( title: () -> String? = titleDefault, ) : SearchResult { @@ -28,8 +25,7 @@ public class Movie( { throw IllegalStateException("Field `title` was not requested") } } - @FasterxmlJacksonDatabindAnnotationJsonPOJOBuilder - @ToolsJacksonDatabindAnnotationJsonPOJOBuilder + @JsonPOJOBuilder @JsonIgnoreProperties("__typename") public class Builder { private var title: () -> String? = titleDefault diff --git a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/union/expected/types/Query.kt b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/union/expected/types/Query.kt index ec61f731c..fe72c795c 100644 --- a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/union/expected/types/Query.kt +++ b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/union/expected/types/Query.kt @@ -3,17 +3,14 @@ package com.netflix.graphql.dgs.codegen.cases.union.expected.types import com.fasterxml.jackson.`annotation`.JsonIgnoreProperties import com.fasterxml.jackson.`annotation`.JsonProperty import com.fasterxml.jackson.`annotation`.JsonTypeInfo +import com.fasterxml.jackson.databind.`annotation`.JsonDeserialize +import com.fasterxml.jackson.databind.`annotation`.JsonPOJOBuilder import java.lang.IllegalStateException import kotlin.collections.List import kotlin.jvm.JvmName -import com.fasterxml.jackson.databind.`annotation`.JsonDeserialize as FasterxmlJacksonDatabindAnnotationJsonDeserialize -import com.fasterxml.jackson.databind.`annotation`.JsonPOJOBuilder as FasterxmlJacksonDatabindAnnotationJsonPOJOBuilder -import tools.jackson.databind.`annotation`.JsonDeserialize as ToolsJacksonDatabindAnnotationJsonDeserialize -import tools.jackson.databind.`annotation`.JsonPOJOBuilder as ToolsJacksonDatabindAnnotationJsonPOJOBuilder @JsonTypeInfo(use = JsonTypeInfo.Id.NONE) -@FasterxmlJacksonDatabindAnnotationJsonDeserialize(builder = Query.Builder::class) -@ToolsJacksonDatabindAnnotationJsonDeserialize(builder = Query.Builder::class) +@JsonDeserialize(builder = Query.Builder::class) public class Query( search: () -> List? = searchDefault, ) { @@ -28,8 +25,7 @@ public class Query( { throw IllegalStateException("Field `search` was not requested") } } - @FasterxmlJacksonDatabindAnnotationJsonPOJOBuilder - @ToolsJacksonDatabindAnnotationJsonPOJOBuilder + @JsonPOJOBuilder @JsonIgnoreProperties("__typename") public class Builder { private var search: () -> List? = searchDefault diff --git a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/unionTypesWithoutInterfaceCanDeserialize/expected/types/Droid.kt b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/unionTypesWithoutInterfaceCanDeserialize/expected/types/Droid.kt index 35c283bb3..3c03561ec 100644 --- a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/unionTypesWithoutInterfaceCanDeserialize/expected/types/Droid.kt +++ b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/unionTypesWithoutInterfaceCanDeserialize/expected/types/Droid.kt @@ -3,17 +3,14 @@ package com.netflix.graphql.dgs.codegen.cases.unionTypesWithoutInterfaceCanDeser import com.fasterxml.jackson.`annotation`.JsonIgnoreProperties import com.fasterxml.jackson.`annotation`.JsonProperty import com.fasterxml.jackson.`annotation`.JsonTypeInfo +import com.fasterxml.jackson.databind.`annotation`.JsonDeserialize +import com.fasterxml.jackson.databind.`annotation`.JsonPOJOBuilder import java.lang.IllegalStateException import kotlin.String import kotlin.jvm.JvmName -import com.fasterxml.jackson.databind.`annotation`.JsonDeserialize as FasterxmlJacksonDatabindAnnotationJsonDeserialize -import com.fasterxml.jackson.databind.`annotation`.JsonPOJOBuilder as FasterxmlJacksonDatabindAnnotationJsonPOJOBuilder -import tools.jackson.databind.`annotation`.JsonDeserialize as ToolsJacksonDatabindAnnotationJsonDeserialize -import tools.jackson.databind.`annotation`.JsonPOJOBuilder as ToolsJacksonDatabindAnnotationJsonPOJOBuilder @JsonTypeInfo(use = JsonTypeInfo.Id.NONE) -@FasterxmlJacksonDatabindAnnotationJsonDeserialize(builder = Droid.Builder::class) -@ToolsJacksonDatabindAnnotationJsonDeserialize(builder = Droid.Builder::class) +@JsonDeserialize(builder = Droid.Builder::class) public class Droid( id: () -> String = idDefault, name: () -> String = nameDefault, @@ -48,8 +45,7 @@ public class Droid( { throw IllegalStateException("Field `primaryFunction` was not requested") } } - @FasterxmlJacksonDatabindAnnotationJsonPOJOBuilder - @ToolsJacksonDatabindAnnotationJsonPOJOBuilder + @JsonPOJOBuilder @JsonIgnoreProperties("__typename") public class Builder { private var id: () -> String = idDefault diff --git a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/unionTypesWithoutInterfaceCanDeserialize/expected/types/Human.kt b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/unionTypesWithoutInterfaceCanDeserialize/expected/types/Human.kt index f869ecf48..3c0bca1a2 100644 --- a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/unionTypesWithoutInterfaceCanDeserialize/expected/types/Human.kt +++ b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/unionTypesWithoutInterfaceCanDeserialize/expected/types/Human.kt @@ -3,18 +3,15 @@ package com.netflix.graphql.dgs.codegen.cases.unionTypesWithoutInterfaceCanDeser import com.fasterxml.jackson.`annotation`.JsonIgnoreProperties import com.fasterxml.jackson.`annotation`.JsonProperty import com.fasterxml.jackson.`annotation`.JsonTypeInfo +import com.fasterxml.jackson.databind.`annotation`.JsonDeserialize +import com.fasterxml.jackson.databind.`annotation`.JsonPOJOBuilder import java.lang.IllegalStateException import kotlin.Int import kotlin.String import kotlin.jvm.JvmName -import com.fasterxml.jackson.databind.`annotation`.JsonDeserialize as FasterxmlJacksonDatabindAnnotationJsonDeserialize -import com.fasterxml.jackson.databind.`annotation`.JsonPOJOBuilder as FasterxmlJacksonDatabindAnnotationJsonPOJOBuilder -import tools.jackson.databind.`annotation`.JsonDeserialize as ToolsJacksonDatabindAnnotationJsonDeserialize -import tools.jackson.databind.`annotation`.JsonPOJOBuilder as ToolsJacksonDatabindAnnotationJsonPOJOBuilder @JsonTypeInfo(use = JsonTypeInfo.Id.NONE) -@FasterxmlJacksonDatabindAnnotationJsonDeserialize(builder = Human.Builder::class) -@ToolsJacksonDatabindAnnotationJsonDeserialize(builder = Human.Builder::class) +@JsonDeserialize(builder = Human.Builder::class) public class Human( id: () -> String = idDefault, name: () -> String = nameDefault, @@ -49,8 +46,7 @@ public class Human( { throw IllegalStateException("Field `totalCredits` was not requested") } } - @FasterxmlJacksonDatabindAnnotationJsonPOJOBuilder - @ToolsJacksonDatabindAnnotationJsonPOJOBuilder + @JsonPOJOBuilder @JsonIgnoreProperties("__typename") public class Builder { private var id: () -> String = idDefault diff --git a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/unionTypesWithoutInterfaceCanDeserialize/expected/types/Query.kt b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/unionTypesWithoutInterfaceCanDeserialize/expected/types/Query.kt index 5545915e6..9f17a81da 100644 --- a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/unionTypesWithoutInterfaceCanDeserialize/expected/types/Query.kt +++ b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/unionTypesWithoutInterfaceCanDeserialize/expected/types/Query.kt @@ -3,16 +3,13 @@ package com.netflix.graphql.dgs.codegen.cases.unionTypesWithoutInterfaceCanDeser import com.fasterxml.jackson.`annotation`.JsonIgnoreProperties import com.fasterxml.jackson.`annotation`.JsonProperty import com.fasterxml.jackson.`annotation`.JsonTypeInfo +import com.fasterxml.jackson.databind.`annotation`.JsonDeserialize +import com.fasterxml.jackson.databind.`annotation`.JsonPOJOBuilder import java.lang.IllegalStateException import kotlin.jvm.JvmName -import com.fasterxml.jackson.databind.`annotation`.JsonDeserialize as FasterxmlJacksonDatabindAnnotationJsonDeserialize -import com.fasterxml.jackson.databind.`annotation`.JsonPOJOBuilder as FasterxmlJacksonDatabindAnnotationJsonPOJOBuilder -import tools.jackson.databind.`annotation`.JsonDeserialize as ToolsJacksonDatabindAnnotationJsonDeserialize -import tools.jackson.databind.`annotation`.JsonPOJOBuilder as ToolsJacksonDatabindAnnotationJsonPOJOBuilder @JsonTypeInfo(use = JsonTypeInfo.Id.NONE) -@FasterxmlJacksonDatabindAnnotationJsonDeserialize(builder = Query.Builder::class) -@ToolsJacksonDatabindAnnotationJsonDeserialize(builder = Query.Builder::class) +@JsonDeserialize(builder = Query.Builder::class) public class Query( search: () -> SearchResultPage? = searchDefault, ) { @@ -27,8 +24,7 @@ public class Query( { throw IllegalStateException("Field `search` was not requested") } } - @FasterxmlJacksonDatabindAnnotationJsonPOJOBuilder - @ToolsJacksonDatabindAnnotationJsonPOJOBuilder + @JsonPOJOBuilder @JsonIgnoreProperties("__typename") public class Builder { private var search: () -> SearchResultPage? = searchDefault diff --git a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/unionTypesWithoutInterfaceCanDeserialize/expected/types/SearchResultPage.kt b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/unionTypesWithoutInterfaceCanDeserialize/expected/types/SearchResultPage.kt index 48ed5a95b..ecba1f512 100644 --- a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/unionTypesWithoutInterfaceCanDeserialize/expected/types/SearchResultPage.kt +++ b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/unionTypesWithoutInterfaceCanDeserialize/expected/types/SearchResultPage.kt @@ -3,17 +3,14 @@ package com.netflix.graphql.dgs.codegen.cases.unionTypesWithoutInterfaceCanDeser import com.fasterxml.jackson.`annotation`.JsonIgnoreProperties import com.fasterxml.jackson.`annotation`.JsonProperty import com.fasterxml.jackson.`annotation`.JsonTypeInfo +import com.fasterxml.jackson.databind.`annotation`.JsonDeserialize +import com.fasterxml.jackson.databind.`annotation`.JsonPOJOBuilder import java.lang.IllegalStateException import kotlin.collections.List import kotlin.jvm.JvmName -import com.fasterxml.jackson.databind.`annotation`.JsonDeserialize as FasterxmlJacksonDatabindAnnotationJsonDeserialize -import com.fasterxml.jackson.databind.`annotation`.JsonPOJOBuilder as FasterxmlJacksonDatabindAnnotationJsonPOJOBuilder -import tools.jackson.databind.`annotation`.JsonDeserialize as ToolsJacksonDatabindAnnotationJsonDeserialize -import tools.jackson.databind.`annotation`.JsonPOJOBuilder as ToolsJacksonDatabindAnnotationJsonPOJOBuilder @JsonTypeInfo(use = JsonTypeInfo.Id.NONE) -@FasterxmlJacksonDatabindAnnotationJsonDeserialize(builder = SearchResultPage.Builder::class) -@ToolsJacksonDatabindAnnotationJsonDeserialize(builder = SearchResultPage.Builder::class) +@JsonDeserialize(builder = SearchResultPage.Builder::class) public class SearchResultPage( items: () -> List? = itemsDefault, ) { @@ -28,8 +25,7 @@ public class SearchResultPage( { throw IllegalStateException("Field `items` was not requested") } } - @FasterxmlJacksonDatabindAnnotationJsonPOJOBuilder - @ToolsJacksonDatabindAnnotationJsonPOJOBuilder + @JsonPOJOBuilder @JsonIgnoreProperties("__typename") public class Builder { private var items: () -> List? = itemsDefault diff --git a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/unionWithExtendedType/expected/types/Actor.kt b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/unionWithExtendedType/expected/types/Actor.kt index a2890a58d..2451e4af4 100644 --- a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/unionWithExtendedType/expected/types/Actor.kt +++ b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/unionWithExtendedType/expected/types/Actor.kt @@ -3,17 +3,14 @@ package com.netflix.graphql.dgs.codegen.cases.unionWithExtendedType.expected.typ import com.fasterxml.jackson.`annotation`.JsonIgnoreProperties import com.fasterxml.jackson.`annotation`.JsonProperty import com.fasterxml.jackson.`annotation`.JsonTypeInfo +import com.fasterxml.jackson.databind.`annotation`.JsonDeserialize +import com.fasterxml.jackson.databind.`annotation`.JsonPOJOBuilder import java.lang.IllegalStateException import kotlin.String import kotlin.jvm.JvmName -import com.fasterxml.jackson.databind.`annotation`.JsonDeserialize as FasterxmlJacksonDatabindAnnotationJsonDeserialize -import com.fasterxml.jackson.databind.`annotation`.JsonPOJOBuilder as FasterxmlJacksonDatabindAnnotationJsonPOJOBuilder -import tools.jackson.databind.`annotation`.JsonDeserialize as ToolsJacksonDatabindAnnotationJsonDeserialize -import tools.jackson.databind.`annotation`.JsonPOJOBuilder as ToolsJacksonDatabindAnnotationJsonPOJOBuilder @JsonTypeInfo(use = JsonTypeInfo.Id.NONE) -@FasterxmlJacksonDatabindAnnotationJsonDeserialize(builder = Actor.Builder::class) -@ToolsJacksonDatabindAnnotationJsonDeserialize(builder = Actor.Builder::class) +@JsonDeserialize(builder = Actor.Builder::class) public class Actor( name: () -> String? = nameDefault, ) : SearchResult { @@ -28,8 +25,7 @@ public class Actor( { throw IllegalStateException("Field `name` was not requested") } } - @FasterxmlJacksonDatabindAnnotationJsonPOJOBuilder - @ToolsJacksonDatabindAnnotationJsonPOJOBuilder + @JsonPOJOBuilder @JsonIgnoreProperties("__typename") public class Builder { private var name: () -> String? = nameDefault diff --git a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/unionWithExtendedType/expected/types/Movie.kt b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/unionWithExtendedType/expected/types/Movie.kt index 884443078..820c95667 100644 --- a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/unionWithExtendedType/expected/types/Movie.kt +++ b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/unionWithExtendedType/expected/types/Movie.kt @@ -3,17 +3,14 @@ package com.netflix.graphql.dgs.codegen.cases.unionWithExtendedType.expected.typ import com.fasterxml.jackson.`annotation`.JsonIgnoreProperties import com.fasterxml.jackson.`annotation`.JsonProperty import com.fasterxml.jackson.`annotation`.JsonTypeInfo +import com.fasterxml.jackson.databind.`annotation`.JsonDeserialize +import com.fasterxml.jackson.databind.`annotation`.JsonPOJOBuilder import java.lang.IllegalStateException import kotlin.String import kotlin.jvm.JvmName -import com.fasterxml.jackson.databind.`annotation`.JsonDeserialize as FasterxmlJacksonDatabindAnnotationJsonDeserialize -import com.fasterxml.jackson.databind.`annotation`.JsonPOJOBuilder as FasterxmlJacksonDatabindAnnotationJsonPOJOBuilder -import tools.jackson.databind.`annotation`.JsonDeserialize as ToolsJacksonDatabindAnnotationJsonDeserialize -import tools.jackson.databind.`annotation`.JsonPOJOBuilder as ToolsJacksonDatabindAnnotationJsonPOJOBuilder @JsonTypeInfo(use = JsonTypeInfo.Id.NONE) -@FasterxmlJacksonDatabindAnnotationJsonDeserialize(builder = Movie.Builder::class) -@ToolsJacksonDatabindAnnotationJsonDeserialize(builder = Movie.Builder::class) +@JsonDeserialize(builder = Movie.Builder::class) public class Movie( title: () -> String? = titleDefault, ) : SearchResult { @@ -28,8 +25,7 @@ public class Movie( { throw IllegalStateException("Field `title` was not requested") } } - @FasterxmlJacksonDatabindAnnotationJsonPOJOBuilder - @ToolsJacksonDatabindAnnotationJsonPOJOBuilder + @JsonPOJOBuilder @JsonIgnoreProperties("__typename") public class Builder { private var title: () -> String? = titleDefault diff --git a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/unionWithExtendedType/expected/types/Query.kt b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/unionWithExtendedType/expected/types/Query.kt index 33a163ffa..1053eb5ce 100644 --- a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/unionWithExtendedType/expected/types/Query.kt +++ b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/unionWithExtendedType/expected/types/Query.kt @@ -3,17 +3,14 @@ package com.netflix.graphql.dgs.codegen.cases.unionWithExtendedType.expected.typ import com.fasterxml.jackson.`annotation`.JsonIgnoreProperties import com.fasterxml.jackson.`annotation`.JsonProperty import com.fasterxml.jackson.`annotation`.JsonTypeInfo +import com.fasterxml.jackson.databind.`annotation`.JsonDeserialize +import com.fasterxml.jackson.databind.`annotation`.JsonPOJOBuilder import java.lang.IllegalStateException import kotlin.collections.List import kotlin.jvm.JvmName -import com.fasterxml.jackson.databind.`annotation`.JsonDeserialize as FasterxmlJacksonDatabindAnnotationJsonDeserialize -import com.fasterxml.jackson.databind.`annotation`.JsonPOJOBuilder as FasterxmlJacksonDatabindAnnotationJsonPOJOBuilder -import tools.jackson.databind.`annotation`.JsonDeserialize as ToolsJacksonDatabindAnnotationJsonDeserialize -import tools.jackson.databind.`annotation`.JsonPOJOBuilder as ToolsJacksonDatabindAnnotationJsonPOJOBuilder @JsonTypeInfo(use = JsonTypeInfo.Id.NONE) -@FasterxmlJacksonDatabindAnnotationJsonDeserialize(builder = Query.Builder::class) -@ToolsJacksonDatabindAnnotationJsonDeserialize(builder = Query.Builder::class) +@JsonDeserialize(builder = Query.Builder::class) public class Query( search: () -> List? = searchDefault, ) { @@ -28,8 +25,7 @@ public class Query( { throw IllegalStateException("Field `search` was not requested") } } - @FasterxmlJacksonDatabindAnnotationJsonPOJOBuilder - @ToolsJacksonDatabindAnnotationJsonPOJOBuilder + @JsonPOJOBuilder @JsonIgnoreProperties("__typename") public class Builder { private var search: () -> List? = searchDefault diff --git a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/unionWithExtendedType/expected/types/Rating.kt b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/unionWithExtendedType/expected/types/Rating.kt index 704ae630f..1b9f601c0 100644 --- a/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/unionWithExtendedType/expected/types/Rating.kt +++ b/graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/unionWithExtendedType/expected/types/Rating.kt @@ -3,17 +3,14 @@ package com.netflix.graphql.dgs.codegen.cases.unionWithExtendedType.expected.typ import com.fasterxml.jackson.`annotation`.JsonIgnoreProperties import com.fasterxml.jackson.`annotation`.JsonProperty import com.fasterxml.jackson.`annotation`.JsonTypeInfo +import com.fasterxml.jackson.databind.`annotation`.JsonDeserialize +import com.fasterxml.jackson.databind.`annotation`.JsonPOJOBuilder import java.lang.IllegalStateException import kotlin.Int import kotlin.jvm.JvmName -import com.fasterxml.jackson.databind.`annotation`.JsonDeserialize as FasterxmlJacksonDatabindAnnotationJsonDeserialize -import com.fasterxml.jackson.databind.`annotation`.JsonPOJOBuilder as FasterxmlJacksonDatabindAnnotationJsonPOJOBuilder -import tools.jackson.databind.`annotation`.JsonDeserialize as ToolsJacksonDatabindAnnotationJsonDeserialize -import tools.jackson.databind.`annotation`.JsonPOJOBuilder as ToolsJacksonDatabindAnnotationJsonPOJOBuilder @JsonTypeInfo(use = JsonTypeInfo.Id.NONE) -@FasterxmlJacksonDatabindAnnotationJsonDeserialize(builder = Rating.Builder::class) -@ToolsJacksonDatabindAnnotationJsonDeserialize(builder = Rating.Builder::class) +@JsonDeserialize(builder = Rating.Builder::class) public class Rating( stars: () -> Int? = starsDefault, ) : SearchResult { @@ -28,8 +25,7 @@ public class Rating( { throw IllegalStateException("Field `stars` was not requested") } } - @FasterxmlJacksonDatabindAnnotationJsonPOJOBuilder - @ToolsJacksonDatabindAnnotationJsonPOJOBuilder + @JsonPOJOBuilder @JsonIgnoreProperties("__typename") public class Builder { private var stars: () -> Int? = starsDefault diff --git a/graphql-dgs-codegen-core/src/main/kotlin/com/netflix/graphql/dgs/codegen/generators/kotlin/KotlinPoetUtils.kt b/graphql-dgs-codegen-core/src/main/kotlin/com/netflix/graphql/dgs/codegen/generators/kotlin/KotlinPoetUtils.kt index e6dcb1bc5..181e4fda9 100644 --- a/graphql-dgs-codegen-core/src/main/kotlin/com/netflix/graphql/dgs/codegen/generators/kotlin/KotlinPoetUtils.kt +++ b/graphql-dgs-codegen-core/src/main/kotlin/com/netflix/graphql/dgs/codegen/generators/kotlin/KotlinPoetUtils.kt @@ -59,11 +59,11 @@ fun configureJacksonVersion(jacksonVersions: Set) { * Which Jackson versions to generate annotations for. * * 1. Use configured versions from Gradle plugin (inferred from project dependencies) if available - * 2. Default to both versions + * 2. Default to Jackson 2 for backwards compatibility */ private fun getJacksonVersions(): Set = // Use configured versions if available and non-empty - configuredVersions.takeIf { it.isNotEmpty() } ?: setOf(JacksonVersion.JACKSON_2, JacksonVersion.JACKSON_3) + configuredVersions.takeIf { it.isNotEmpty() } ?: setOf(JacksonVersion.JACKSON_2) /** * Get the ClassName(s) for JsonDeserialize annotation based on detected Jackson version(s). diff --git a/graphql-dgs-codegen-core/src/test/kotlin/com/netflix/graphql/dgs/codegen/JacksonVersionDetectionTest.kt b/graphql-dgs-codegen-core/src/test/kotlin/com/netflix/graphql/dgs/codegen/JacksonVersionDetectionTest.kt index 75868495f..6727584f2 100644 --- a/graphql-dgs-codegen-core/src/test/kotlin/com/netflix/graphql/dgs/codegen/JacksonVersionDetectionTest.kt +++ b/graphql-dgs-codegen-core/src/test/kotlin/com/netflix/graphql/dgs/codegen/JacksonVersionDetectionTest.kt @@ -110,8 +110,7 @@ class JacksonVersionDetectionTest { } @Test - fun `defaults to both versions when no configuration is provided`() { - // Don't configure anything - should default to both versions + fun `defaults to Jackson 2 when no configuration is provided`() { val result = CodeGen( CodeGenConfig( @@ -125,13 +124,15 @@ class JacksonVersionDetectionTest { val movieType = result.kotlinDataTypes.first { it.name == "Movie" } val fileContent = movieType.toString() - // Should have both Jackson 2 and 3 annotations by default assertThat(fileContent).contains("com.fasterxml.jackson.databind.`annotation`.JsonDeserialize") - assertThat(fileContent).contains("tools.jackson.databind.`annotation`.JsonDeserialize") + assertThat(fileContent).doesNotContain("tools.jackson.databind.`annotation`.JsonDeserialize") + + assertThat(fileContent).contains("com.fasterxml.jackson.databind.`annotation`.JsonPOJOBuilder") + assertThat(fileContent).doesNotContain("tools.jackson.databind.`annotation`.JsonPOJOBuilder") } @Test - fun `empty configuration defaults to both versions`() { + fun `empty configuration defaults to Jackson 2`() { val result = CodeGen( CodeGenConfig( @@ -146,8 +147,11 @@ class JacksonVersionDetectionTest { val movieType = result.kotlinDataTypes.first { it.name == "Movie" } val fileContent = movieType.toString() - // Should default to both versions + // Should default to Jackson 2 (backwards compatibility) assertThat(fileContent).contains("com.fasterxml.jackson.databind.`annotation`.JsonDeserialize") - assertThat(fileContent).contains("tools.jackson.databind.`annotation`.JsonDeserialize") + assertThat(fileContent).doesNotContain("tools.jackson.databind.`annotation`.JsonDeserialize") + + assertThat(fileContent).contains("com.fasterxml.jackson.databind.`annotation`.JsonPOJOBuilder") + assertThat(fileContent).doesNotContain("tools.jackson.databind.`annotation`.JsonPOJOBuilder") } } From ef989c19a42ce3a82692d57bdf764615da7b7f5a Mon Sep 17 00:00:00 2001 From: Jiho Lee Date: Wed, 28 Jan 2026 16:41:29 -0800 Subject: [PATCH 4/4] Update log message --- .../graphql/dgs/codegen/gradle/JacksonVersionDetector.kt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/graphql-dgs-codegen-gradle/src/main/kotlin/com/netflix/graphql/dgs/codegen/gradle/JacksonVersionDetector.kt b/graphql-dgs-codegen-gradle/src/main/kotlin/com/netflix/graphql/dgs/codegen/gradle/JacksonVersionDetector.kt index 625084371..cc1e5e953 100644 --- a/graphql-dgs-codegen-gradle/src/main/kotlin/com/netflix/graphql/dgs/codegen/gradle/JacksonVersionDetector.kt +++ b/graphql-dgs-codegen-gradle/src/main/kotlin/com/netflix/graphql/dgs/codegen/gradle/JacksonVersionDetector.kt @@ -59,7 +59,7 @@ object JacksonVersionDetector { if (result.size == 2) { logger.info("DGS Codegen: Both Jackson 2 and 3 detected in project dependencies. Will generate annotations for both.") } else if (result.isEmpty()) { - logger.warn("DGS Codegen: Could not detect Jackson version from project dependencies. Will generate annotations for both.") + logger.warn("DGS Codegen: Could not detect Jackson version from project dependencies. Defaulting to Jackson 2 annotations.") } return result