Merge pull request #443 from Netflix/feature/jvm-name

Use an explicit JVM generated name for all kotlin2 data classes
Netflix · Aug 15, 2022 · b0e81ff · b0e81ff
2 parents 278b1da + e01afce
commit b0e81ff
Show file tree

Hide file tree

Showing 112 changed files with 566 additions and 0 deletions.
diff --git a/...lin/com/netflix/graphql/dgs/codegen/cases/constantsForInputTypes/expected/types/Person.kt b/...lin/com/netflix/graphql/dgs/codegen/cases/constantsForInputTypes/expected/types/Person.kt
@@ -7,6 +7,7 @@ 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
 
 @JsonTypeInfo(use = JsonTypeInfo.Id.NONE)
 @JsonDeserialize(builder = Person.Builder::class)
@@ -18,9 +19,11 @@ public class Person(
 
   private val _lastname: () -> String? = lastname
 
+  @get:JvmName("getFirstname")
   public val firstname: String?
     get() = _firstname.invoke()
 
+  @get:JvmName("getLastname")
   public val lastname: String?
     get() = _lastname.invoke()
 

diff --git a/...tlin/com/netflix/graphql/dgs/codegen/cases/constantsForInputTypes/expected/types/Query.kt b/...tlin/com/netflix/graphql/dgs/codegen/cases/constantsForInputTypes/expected/types/Query.kt
@@ -7,6 +7,7 @@ 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
 
 @JsonTypeInfo(use = JsonTypeInfo.Id.NONE)
 @JsonDeserialize(builder = Query.Builder::class)
@@ -15,6 +16,7 @@ public class Query(
 ) {
   private val _people: () -> List<Person?>? = people
 
+  @get:JvmName("getPeople")
   public val people: List<Person?>?
     get() = _people.invoke()
 

diff --git a/...etflix/graphql/dgs/codegen/cases/constantsWithExtendedInputTypes/expected/types/Person.kt b/...etflix/graphql/dgs/codegen/cases/constantsWithExtendedInputTypes/expected/types/Person.kt
@@ -7,6 +7,7 @@ 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
 
 @JsonTypeInfo(use = JsonTypeInfo.Id.NONE)
 @JsonDeserialize(builder = Person.Builder::class)
@@ -18,9 +19,11 @@ public class Person(
 
   private val _lastname: () -> String? = lastname
 
+  @get:JvmName("getFirstname")
   public val firstname: String?
     get() = _firstname.invoke()
 
+  @get:JvmName("getLastname")
   public val lastname: String?
     get() = _lastname.invoke()
 

diff --git a/...netflix/graphql/dgs/codegen/cases/constantsWithExtendedInputTypes/expected/types/Query.kt b/...netflix/graphql/dgs/codegen/cases/constantsWithExtendedInputTypes/expected/types/Query.kt
@@ -7,6 +7,7 @@ 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
 
 @JsonTypeInfo(use = JsonTypeInfo.Id.NONE)
 @JsonDeserialize(builder = Query.Builder::class)
@@ -15,6 +16,7 @@ public class Query(
 ) {
   private val _people: () -> List<Person?>? = people
 
+  @get:JvmName("getPeople")
   public val people: List<Person?>?
     get() = _people.invoke()
 

diff --git a/...netflix/graphql/dgs/codegen/cases/constantsWithExtendedInterface/expected/types/Person.kt b/...netflix/graphql/dgs/codegen/cases/constantsWithExtendedInterface/expected/types/Person.kt
@@ -3,16 +3,24 @@ package com.netflix.graphql.dgs.codegen.cases.constantsWithExtendedInterface.exp
 import com.fasterxml.jackson.`annotation`.JsonTypeInfo
 import kotlin.Int
 import kotlin.String
+import kotlin.Suppress
+import kotlin.jvm.JvmName
 
 @JsonTypeInfo(
   use = JsonTypeInfo.Id.NAME,
   include = JsonTypeInfo.As.PROPERTY,
   property = "__typename",
 )
 public sealed interface Person {
+  @Suppress("INAPPLICABLE_JVM_NAME")
+  @get:JvmName("getFirstname")
   public val firstname: String
 
+  @Suppress("INAPPLICABLE_JVM_NAME")
+  @get:JvmName("getLastname")
   public val lastname: String?
 
+  @Suppress("INAPPLICABLE_JVM_NAME")
+  @get:JvmName("getAge")
   public val age: Int?
 }
diff --git a/.../netflix/graphql/dgs/codegen/cases/constantsWithExtendedInterface/expected/types/Query.kt b/.../netflix/graphql/dgs/codegen/cases/constantsWithExtendedInterface/expected/types/Query.kt
@@ -7,6 +7,7 @@ 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
 
 @JsonTypeInfo(use = JsonTypeInfo.Id.NONE)
 @JsonDeserialize(builder = Query.Builder::class)
@@ -15,6 +16,7 @@ public class Query(
 ) {
   private val _people: () -> List<Person?>? = people
 
+  @get:JvmName("getPeople")
   public val people: List<Person?>?
     get() = _people.invoke()
 

diff --git a/...com/netflix/graphql/dgs/codegen/cases/constantsWithExtendedQuery/expected/types/Person.kt b/...com/netflix/graphql/dgs/codegen/cases/constantsWithExtendedQuery/expected/types/Person.kt
@@ -7,6 +7,7 @@ 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
 
 @JsonTypeInfo(use = JsonTypeInfo.Id.NONE)
 @JsonDeserialize(builder = Person.Builder::class)
@@ -18,9 +19,11 @@ public class Person(
 
   private val _lastname: () -> String? = lastname
 
+  @get:JvmName("getFirstname")
   public val firstname: String?
     get() = _firstname.invoke()
 
+  @get:JvmName("getLastname")
   public val lastname: String?
     get() = _lastname.invoke()
 

diff --git a/.../com/netflix/graphql/dgs/codegen/cases/constantsWithExtendedQuery/expected/types/Query.kt b/.../com/netflix/graphql/dgs/codegen/cases/constantsWithExtendedQuery/expected/types/Query.kt
@@ -7,6 +7,7 @@ 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
 
 @JsonTypeInfo(use = JsonTypeInfo.Id.NONE)
 @JsonDeserialize(builder = Query.Builder::class)
@@ -18,9 +19,11 @@ public class Query(
 
   private val _friends: () -> List<Person?>? = friends
 
+  @get:JvmName("getPeople")
   public val people: List<Person?>?
     get() = _people.invoke()
 
+  @get:JvmName("getFriends")
   public val friends: List<Person?>?
     get() = _friends.invoke()
 

diff --git a/...com/netflix/graphql/dgs/codegen/cases/constantsWithExtendedTypes/expected/types/Person.kt b/...com/netflix/graphql/dgs/codegen/cases/constantsWithExtendedTypes/expected/types/Person.kt
@@ -7,6 +7,7 @@ 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
 
 @JsonTypeInfo(use = JsonTypeInfo.Id.NONE)
 @JsonDeserialize(builder = Person.Builder::class)
@@ -21,12 +22,15 @@ public class Person(
 
   private val _email: () -> String? = email
 
+  @get:JvmName("getFirstname")
   public val firstname: String?
     get() = _firstname.invoke()
 
+  @get:JvmName("getLastname")
   public val lastname: String?
     get() = _lastname.invoke()
 
+  @get:JvmName("getEmail")
   public val email: String?
     get() = _email.invoke()
 

diff --git a/.../com/netflix/graphql/dgs/codegen/cases/constantsWithExtendedTypes/expected/types/Query.kt b/.../com/netflix/graphql/dgs/codegen/cases/constantsWithExtendedTypes/expected/types/Query.kt
@@ -7,6 +7,7 @@ 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
 
 @JsonTypeInfo(use = JsonTypeInfo.Id.NONE)
 @JsonDeserialize(builder = Query.Builder::class)
@@ -15,6 +16,7 @@ public class Query(
 ) {
   private val _people: () -> List<Person?>? = people
 
+  @get:JvmName("getPeople")
   public val people: List<Person?>?
     get() = _people.invoke()
 

diff --git a/...egTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassDocs/expected/types/Movie.kt b/...egTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassDocs/expected/types/Movie.kt
@@ -7,6 +7,7 @@ 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
 
 /**
  * Movies are fun to watch.
@@ -19,6 +20,7 @@ public class Movie(
 ) {
   private val _title: () -> String? = title
 
+  @get:JvmName("getTitle")
   public val title: String?
     get() = _title.invoke()
 

diff --git a/...egTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassDocs/expected/types/Query.kt b/...egTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassDocs/expected/types/Query.kt
@@ -6,6 +6,7 @@ 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
 
 @JsonTypeInfo(use = JsonTypeInfo.Id.NONE)
 @JsonDeserialize(builder = Query.Builder::class)
@@ -14,6 +15,7 @@ public class Query(
 ) {
   private val _search: () -> Movie? = search
 
+  @get:JvmName("getSearch")
   public val search: Movie?
     get() = _search.invoke()
 

diff --git a/...t/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassFieldDocs/expected/types/Movie.kt b/...t/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassFieldDocs/expected/types/Movie.kt
@@ -7,6 +7,7 @@ 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
 
 @JsonTypeInfo(use = JsonTypeInfo.Id.NONE)
 @JsonDeserialize(builder = Movie.Builder::class)
@@ -18,6 +19,7 @@ public class Movie(
   /**
    * The original, non localized title with some specials characters : %!({[*$,.:;.
    */
+  @get:JvmName("getTitle")
   public val title: String?
     get() = _title.invoke()
 

diff --git a/...t/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassFieldDocs/expected/types/Query.kt b/...t/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassFieldDocs/expected/types/Query.kt
@@ -6,6 +6,7 @@ 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
 
 @JsonTypeInfo(use = JsonTypeInfo.Id.NONE)
 @JsonDeserialize(builder = Query.Builder::class)
@@ -14,6 +15,7 @@ public class Query(
 ) {
   private val _search: () -> Movie? = search
 
+  @get:JvmName("getSearch")
   public val search: Movie?
     get() = _search.invoke()
 

diff --git a/...otlin/com/netflix/graphql/dgs/codegen/cases/dataClassWIthNoFields/expected/types/Query.kt b/...otlin/com/netflix/graphql/dgs/codegen/cases/dataClassWIthNoFields/expected/types/Query.kt
@@ -6,6 +6,7 @@ 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
 
 @JsonTypeInfo(use = JsonTypeInfo.Id.NONE)
 @JsonDeserialize(builder = Query.Builder::class)
@@ -14,6 +15,7 @@ public class Query(
 ) {
   private val _me: () -> Person? = me
 
+  @get:JvmName("getMe")
   public val me: Person?
     get() = _me.invoke()
 

diff --git a/...lin/com/netflix/graphql/dgs/codegen/cases/dataClassWithBooleanField/expected/DgsClient.kt b/...lin/com/netflix/graphql/dgs/codegen/cases/dataClassWithBooleanField/expected/DgsClient.kt
@@ -0,0 +1,11 @@
+package com.netflix.graphql.dgs.codegen.cases.dataClassWithBooleanField.expected
+
+import com.netflix.graphql.dgs.codegen.GraphQLProjection
+import com.netflix.graphql.dgs.codegen.cases.dataClassWithBooleanField.expected.client.QueryProjection
+import graphql.language.OperationDefinition
+import kotlin.String
+
+public object DgsClient {
+  public fun buildQuery(_projection: QueryProjection.() -> QueryProjection): String =
+      GraphQLProjection.asQuery(OperationDefinition.Operation.QUERY, QueryProjection(), _projection)
+}
diff --git a/.../com/netflix/graphql/dgs/codegen/cases/dataClassWithBooleanField/expected/DgsConstants.kt b/.../com/netflix/graphql/dgs/codegen/cases/dataClassWithBooleanField/expected/DgsConstants.kt
@@ -0,0 +1,19 @@
+package com.netflix.graphql.dgs.codegen.cases.dataClassWithBooleanField.expected
+
+import kotlin.String
+
+public object DgsConstants {
+  public const val QUERY_TYPE: String = "Query"
+
+  public object QUERY {
+    public const val TYPE_NAME: String = "Query"
+
+    public const val Test: String = "test"
+  }
+
+  public object REQUIREDTESTTYPE {
+    public const val TYPE_NAME: String = "RequiredTestType"
+
+    public const val IsRequired: String = "isRequired"
+  }
+}
diff --git a/...ix/graphql/dgs/codegen/cases/dataClassWithBooleanField/expected/client/QueryProjection.kt b/...ix/graphql/dgs/codegen/cases/dataClassWithBooleanField/expected/client/QueryProjection.kt
@@ -0,0 +1,11 @@
+package com.netflix.graphql.dgs.codegen.cases.dataClassWithBooleanField.expected.client
+
+import com.netflix.graphql.dgs.codegen.GraphQLProjection
+
+public class QueryProjection : GraphQLProjection() {
+  public fun test(_projection: RequiredTestTypeProjection.() -> RequiredTestTypeProjection):
+      QueryProjection {
+    field("test", RequiredTestTypeProjection(), _projection)
+    return this
+  }
+}
diff --git a/...dgs/codegen/cases/dataClassWithBooleanField/expected/client/RequiredTestTypeProjection.kt b/...dgs/codegen/cases/dataClassWithBooleanField/expected/client/RequiredTestTypeProjection.kt
@@ -0,0 +1,11 @@
+package com.netflix.graphql.dgs.codegen.cases.dataClassWithBooleanField.expected.client
+
+import com.netflix.graphql.dgs.codegen.GraphQLProjection
+
+public class RequiredTestTypeProjection : GraphQLProjection() {
+  public val isRequired: RequiredTestTypeProjection
+    get() {
+      field("isRequired")
+      return this
+    }
+}
diff --git a/...n/com/netflix/graphql/dgs/codegen/cases/dataClassWithBooleanField/expected/types/Query.kt b/...n/com/netflix/graphql/dgs/codegen/cases/dataClassWithBooleanField/expected/types/Query.kt
@@ -0,0 +1,42 @@
+package com.netflix.graphql.dgs.codegen.cases.dataClassWithBooleanField.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
+
+@JsonTypeInfo(use = JsonTypeInfo.Id.NONE)
+@JsonDeserialize(builder = Query.Builder::class)
+public class Query(
+  test: () -> RequiredTestType? = testDefault,
+) {
+  private val _test: () -> RequiredTestType? = test
+
+  @get:JvmName("getTest")
+  public val test: RequiredTestType?
+    get() = _test.invoke()
+
+  public companion object {
+    private val testDefault: () -> RequiredTestType? = 
+        { throw IllegalStateException("Field `test` was not requested") }
+
+  }
+
+  @JsonPOJOBuilder
+  @JsonIgnoreProperties("__typename")
+  public class Builder {
+    private var test: () -> RequiredTestType? = testDefault
+
+    @JsonProperty("test")
+    public fun withTest(test: RequiredTestType?): Builder = this.apply {
+      this.test = { test }
+    }
+
+    public fun build() = Query(
+      test = test,
+    )
+  }
+}