update to latest version of kotlinpoet (#1092)

Starting with version `1.7.0` kotlinpoet now generates code in explicit API mode

Author: dariuszkuc

gradle.properties

@@ -23,7 +23,7 @@ classGraphVersion = 4.8.103
 federationGraphQLVersion = 0.6.3
 graphQLJavaVersion = 16.2
 jacksonVersion = 2.11.4
-kotlinPoetVersion = 1.6.0
+kotlinPoetVersion = 1.7.2
 ktorVersion = 1.5.2
 reactorVersion = 3.4.4
 reactorExtensionsVersion = 1.1.3

plugins/client/graphql-kotlin-client-generator/src/test/data/generator/alias/AliasQuery.kt

@@ -5,24 +5,24 @@ import kotlin.Boolean
 import kotlin.String
 import kotlin.reflect.KClass
 
-const val ALIAS_QUERY: String =
+public const val ALIAS_QUERY: String =
     "query AliasQuery {\n  first: inputObjectQuery(criteria: { min: 1.0, max: 5.0 } )\n  second: inputObjectQuery(criteria: { min: 5.0, max: 10.0 } )\n}"
 
-class AliasQuery : GraphQLClientRequest<AliasQuery.Result> {
-  override val query: String = ALIAS_QUERY
+public class AliasQuery : GraphQLClientRequest<AliasQuery.Result> {
+  public override val query: String = ALIAS_QUERY
 
-  override val operationName: String = "AliasQuery"
+  public override val operationName: String = "AliasQuery"
 
-  override fun responseType(): KClass<AliasQuery.Result> = AliasQuery.Result::class
+  public override fun responseType(): KClass<AliasQuery.Result> = AliasQuery.Result::class
 
-  data class Result(
+  public data class Result(
     /**
      * Query that accepts some input arguments
      */
-    val first: Boolean,
+    public val first: Boolean,
     /**
      * Query that accepts some input arguments
      */
-    val second: Boolean
+    public val second: Boolean
   )
 }

plugins/client/graphql-kotlin-client-generator/src/test/data/generator/documentation/DocumentationQuery.kt

@@ -5,19 +5,21 @@ import com.expediagroup.graphql.generated.documentationquery.DocObject
 import kotlin.String
 import kotlin.reflect.KClass
 
-const val DOCUMENTATION_QUERY: String = "query DocumentationQuery {\n  docQuery {\n    id\n  }\n}"
+public const val DOCUMENTATION_QUERY: String =
+    "query DocumentationQuery {\n  docQuery {\n    id\n  }\n}"
 
-class DocumentationQuery : GraphQLClientRequest<DocumentationQuery.Result> {
-  override val query: String = DOCUMENTATION_QUERY
+public class DocumentationQuery : GraphQLClientRequest<DocumentationQuery.Result> {
+  public override val query: String = DOCUMENTATION_QUERY
 
-  override val operationName: String = "DocumentationQuery"
+  public override val operationName: String = "DocumentationQuery"
 
-  override fun responseType(): KClass<DocumentationQuery.Result> = DocumentationQuery.Result::class
+  public override fun responseType(): KClass<DocumentationQuery.Result> =
+      DocumentationQuery.Result::class
 
-  data class Result(
+  public data class Result(
     /**
      * Query to test doc strings
      */
-    val docQuery: DocObject
+    public val docQuery: DocObject
   )
 }

plugins/client/graphql-kotlin-client-generator/src/test/data/generator/documentation/documentationquery/DocObject.kt

@@ -5,9 +5,9 @@ import kotlin.Int
 /**
  * Doc object with % and $ floating around
  */
-data class DocObject(
+public data class DocObject(
   /**
    * An id with a comment containing % and $ as well
    */
-  val id: Int
+  public val id: Int
 )

plugins/client/graphql-kotlin-client-generator/src/test/data/generator/input_hard_coded/HardCodedInputQuery.kt

@@ -5,21 +5,21 @@ import kotlin.Boolean
 import kotlin.String
 import kotlin.reflect.KClass
 
-const val HARD_CODED_INPUT_QUERY: String =
+public const val HARD_CODED_INPUT_QUERY: String =
     "query HardCodedInputQuery {\n  inputObjectQuery(criteria: { min: 1.0, max: 5.0 } )\n}"
 
-class HardCodedInputQuery : GraphQLClientRequest<HardCodedInputQuery.Result> {
-  override val query: String = HARD_CODED_INPUT_QUERY
+public class HardCodedInputQuery : GraphQLClientRequest<HardCodedInputQuery.Result> {
+  public override val query: String = HARD_CODED_INPUT_QUERY
 
-  override val operationName: String = "HardCodedInputQuery"
+  public override val operationName: String = "HardCodedInputQuery"
 
-  override fun responseType(): KClass<HardCodedInputQuery.Result> =
+  public override fun responseType(): KClass<HardCodedInputQuery.Result> =
       HardCodedInputQuery.Result::class
 
-  data class Result(
+  public data class Result(
     /**
      * Query that accepts some input arguments
      */
-    val inputObjectQuery: Boolean
+    public val inputObjectQuery: Boolean
   )
 }

plugins/client/graphql-kotlin-client-generator/src/test/data/generator/input_self_reference/SelfReferencingInputQuery.kt

@@ -6,27 +6,27 @@ import kotlin.Boolean
 import kotlin.String
 import kotlin.reflect.KClass
 
-const val SELF_REFERENCING_INPUT_QUERY: String =
+public const val SELF_REFERENCING_INPUT_QUERY: String =
     "query SelfReferencingInputQuery(${'$'}input: ComplexArgumentInput) {\n  complexInputObjectQuery(criteria: ${'$'}input)\n}"
 
-class SelfReferencingInputQuery(
-  override val variables: SelfReferencingInputQuery.Variables
+public class SelfReferencingInputQuery(
+  public override val variables: SelfReferencingInputQuery.Variables
 ) : GraphQLClientRequest<SelfReferencingInputQuery.Result> {
-  override val query: String = SELF_REFERENCING_INPUT_QUERY
+  public override val query: String = SELF_REFERENCING_INPUT_QUERY
 
-  override val operationName: String = "SelfReferencingInputQuery"
+  public override val operationName: String = "SelfReferencingInputQuery"
 
-  override fun responseType(): KClass<SelfReferencingInputQuery.Result> =
+  public override fun responseType(): KClass<SelfReferencingInputQuery.Result> =
       SelfReferencingInputQuery.Result::class
 
-  data class Variables(
-    val input: ComplexArgumentInput? = null
+  public data class Variables(
+    public val input: ComplexArgumentInput? = null
   )
 
-  data class Result(
+  public data class Result(
     /**
      * Query that accepts self referencing input object
      */
-    val complexInputObjectQuery: Boolean
+    public val complexInputObjectQuery: Boolean
   )
 }

plugins/client/graphql-kotlin-client-generator/src/test/data/generator/input_self_reference/inputs/ComplexArgumentInput.kt

@@ -5,17 +5,17 @@ import kotlin.Float
 /**
  * Self referencing input object
  */
-data class ComplexArgumentInput(
+public data class ComplexArgumentInput(
   /**
    * Maximum value for test criteria
    */
-  val max: Float? = null,
+  public val max: Float? = null,
   /**
    * Minimum value for test criteria
    */
-  val min: Float? = null,
+  public val min: Float? = null,
   /**
    * Next criteria
    */
-  val next: ComplexArgumentInput? = null
+  public val next: ComplexArgumentInput? = null
 )

plugins/client/graphql-kotlin-client-generator/src/test/data/generator/interface_diff_selection_sets/DifferentSelectionSetQuery.kt

@@ -6,25 +6,25 @@ import com.expediagroup.graphql.generated.differentselectionsetquery.BasicInterf
 import kotlin.String
 import kotlin.reflect.KClass
 
-const val DIFFERENT_SELECTION_SET_QUERY: String =
+public const val DIFFERENT_SELECTION_SET_QUERY: String =
     "query DifferentSelectionSetQuery {\n  first: interfaceQuery {\n    __typename\n    id\n    name\n    ... on FirstInterfaceImplementation {\n      intValue\n    }\n    ... on SecondInterfaceImplementation {\n      floatValue\n    }\n  }\n  second: interfaceQuery {\n    __typename\n    name\n    ... on FirstInterfaceImplementation {\n      intValue\n    }\n    ... on SecondInterfaceImplementation {\n      floatValue\n    }\n  }\n}"
 
-class DifferentSelectionSetQuery : GraphQLClientRequest<DifferentSelectionSetQuery.Result> {
-  override val query: String = DIFFERENT_SELECTION_SET_QUERY
+public class DifferentSelectionSetQuery : GraphQLClientRequest<DifferentSelectionSetQuery.Result> {
+  public override val query: String = DIFFERENT_SELECTION_SET_QUERY
 
-  override val operationName: String = "DifferentSelectionSetQuery"
+  public override val operationName: String = "DifferentSelectionSetQuery"
 
-  override fun responseType(): KClass<DifferentSelectionSetQuery.Result> =
+  public override fun responseType(): KClass<DifferentSelectionSetQuery.Result> =
       DifferentSelectionSetQuery.Result::class
 
-  data class Result(
+  public data class Result(
     /**
      * Query returning an interface
      */
-    val first: BasicInterface,
+    public val first: BasicInterface,
     /**
      * Query returning an interface
      */
-    val second: BasicInterface2
+    public val second: BasicInterface2
   )
 }

plugins/client/graphql-kotlin-client-generator/src/test/data/generator/interface_diff_selection_sets/differentselectionsetquery/BasicInterface.kt

@@ -1,9 +1,9 @@
 package com.expediagroup.graphql.generated.differentselectionsetquery
 
-import com.fasterxml.jackson.annotation.JsonSubTypes
-import com.fasterxml.jackson.annotation.JsonTypeInfo
-import com.fasterxml.jackson.annotation.JsonTypeInfo.As.PROPERTY
-import com.fasterxml.jackson.annotation.JsonTypeInfo.Id.NAME
+import com.fasterxml.jackson.`annotation`.JsonSubTypes
+import com.fasterxml.jackson.`annotation`.JsonTypeInfo
+import com.fasterxml.jackson.`annotation`.JsonTypeInfo.As.PROPERTY
+import com.fasterxml.jackson.`annotation`.JsonTypeInfo.Id.NAME
 import kotlin.Float
 import kotlin.Int
 import kotlin.String
@@ -20,50 +20,50 @@ import kotlin.String
     FirstInterfaceImplementation::class,
     name="FirstInterfaceImplementation"),com.fasterxml.jackson.annotation.JsonSubTypes.Type(value =
     SecondInterfaceImplementation::class, name="SecondInterfaceImplementation")])
-interface BasicInterface {
+public interface BasicInterface {
   /**
    * Unique identifier of an interface
    */
-  abstract val id: Int
+  public abstract val id: Int
 
   /**
    * Name field
    */
-  abstract val name: String
+  public abstract val name: String
 }
 
 /**
  * Example interface implementation where value is an integer
  */
-data class FirstInterfaceImplementation(
+public data class FirstInterfaceImplementation(
   /**
    * Unique identifier of the first implementation
    */
-  override val id: Int,
+  public override val id: Int,
   /**
    * Name of the first implementation
    */
-  override val name: String,
+  public override val name: String,
   /**
    * Custom field integer value
    */
-  val intValue: Int
+  public val intValue: Int
 ) : BasicInterface
 
 /**
  * Example interface implementation where value is a float
  */
-data class SecondInterfaceImplementation(
+public data class SecondInterfaceImplementation(
   /**
    * Unique identifier of the second implementation
    */
-  override val id: Int,
+  public override val id: Int,
   /**
    * Name of the second implementation
    */
-  override val name: String,
+  public override val name: String,
   /**
    * Custom field float value
    */
-  val floatValue: Float
+  public val floatValue: Float
 ) : BasicInterface

plugins/client/graphql-kotlin-client-generator/src/test/data/generator/interface_diff_selection_sets/differentselectionsetquery/BasicInterface2.kt

@@ -1,9 +1,9 @@
 package com.expediagroup.graphql.generated.differentselectionsetquery
 
-import com.fasterxml.jackson.annotation.JsonSubTypes
-import com.fasterxml.jackson.annotation.JsonTypeInfo
-import com.fasterxml.jackson.annotation.JsonTypeInfo.As.PROPERTY
-import com.fasterxml.jackson.annotation.JsonTypeInfo.Id.NAME
+import com.fasterxml.jackson.`annotation`.JsonSubTypes
+import com.fasterxml.jackson.`annotation`.JsonTypeInfo
+import com.fasterxml.jackson.`annotation`.JsonTypeInfo.As.PROPERTY
+import com.fasterxml.jackson.`annotation`.JsonTypeInfo.Id.NAME
 import kotlin.Float
 import kotlin.Int
 import kotlin.String
@@ -20,37 +20,37 @@ import kotlin.String
     FirstInterfaceImplementation2::class,
     name="FirstInterfaceImplementation"),com.fasterxml.jackson.annotation.JsonSubTypes.Type(value =
     SecondInterfaceImplementation2::class, name="SecondInterfaceImplementation")])
-interface BasicInterface2 {
+public interface BasicInterface2 {
   /**
    * Name field
    */
-  abstract val name: String
+  public abstract val name: String
 }
 
 /**
  * Example interface implementation where value is an integer
  */
-data class FirstInterfaceImplementation2(
+public data class FirstInterfaceImplementation2(
   /**
    * Name of the first implementation
    */
-  override val name: String,
+  public override val name: String,
   /**
    * Custom field integer value
    */
-  val intValue: Int
+  public val intValue: Int
 ) : BasicInterface2
 
 /**
  * Example interface implementation where value is a float
  */
-data class SecondInterfaceImplementation2(
+public data class SecondInterfaceImplementation2(
   /**
    * Name of the second implementation
    */
-  override val name: String,
+  public override val name: String,
   /**
    * Custom field float value
    */
-  val floatValue: Float
+  public val floatValue: Float
 ) : BasicInterface2