diff --git a/clients/graphql-kotlin-client-jackson/build.gradle.kts b/clients/graphql-kotlin-client-jackson/build.gradle.kts
index f4e190d89f..6445ea628b 100644
--- a/clients/graphql-kotlin-client-jackson/build.gradle.kts
+++ b/clients/graphql-kotlin-client-jackson/build.gradle.kts
@@ -16,7 +16,7 @@ tasks {
                 limit {
                     counter = "INSTRUCTION"
                     value = "COVEREDRATIO"
-                    minimum = "0.89".toBigDecimal()
+                    minimum = "0.85".toBigDecimal()
                 }
             }
         }
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index 5dcf0fa2f7..b3824e8a59 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -6,20 +6,18 @@ federation = "3.0.1"
 graphql-java = "20.2"
 graalvm = "0.9.21"
 jackson = "2.15.0"
-kotlin = "1.7.21"
-# TODO kotlin 1.8 upgrade -> kotlinx-benchmark 0.4.7+ uses kotlin 1.8
-kotlinx-benchmark = "0.4.6"
-# TODO kotlin 1.8 upgrade -> kotlinx-coroutines 1.7.0+ uses kotlin 1.8
-kotlinx-coroutines = "1.6.4"
-# TODO kotlin 1.8 upgrade -> kotlinx-serialization 1.5.0+ uses kotlin 1.8
-kotlinx-serialization = "1.4.1"
-# TODO kotlin 1.8 upgrade -> ktor 2.3.0+ uses kotlin 1.8
-ktor = "2.2.4"
+# kotlin version has to match the compile-testing compiler version
+kotlin = "1.8.22"
+# TODO kotlin 1.9 upgrade -> kotlinx-benchaamrk 0.4.9+ uses kotlin 1.9
+kotlinx-benchmark = "0.4.8"
+kotlinx-coroutines = "1.7.3"
+# TODO kotlin 1.9 upgrade -> kotlinx-serialization 1.6.0+ uses kotlin 1.9
+kotlinx-serialization = "1.5.1"
+ktor = "2.3.3"
 maven-plugin-annotation = "3.9.0"
 maven-plugin-api = "3.9.2"
 maven-project = "2.2.1"
-# TODO kotlin 1.8 upgrade -> kotlinpoet 1.13.0+ uses kotlin 1.8
-poet = "1.12.0"
+poet = "1.14.2"
 ## reactor and spring versions should be the same as defined in spring-boot-dependencies
 reactor-core = "3.5.6"
 reactor-extensions = "1.2.2"
@@ -28,22 +26,18 @@ spring = "6.0.9"
 spring-boot = "3.1.0"
 
 # test dependencies
-# kotlin-compile-testing has to be using the same kotlin version as the kotlinx-serialization compiler
-# https://github.com/tschuchortdev/kotlin-compile-testing the latest version targets kotlin 1.7.10 which blocks updates to newer
-# versions of kotlin, switching to a fork https://github.com/ZacSweers/kotlin-compile-testing
-compile-testing = "0.1.0"
+compile-testing = "0.3.2"
 icu = "73.1"
 junit = "5.9.3"
 logback = "1.4.7"
-# TODO kotlin 1.8 upgrade -> mock 1.13.4+ uses kotlin 1.8
-mockk = "1.13.3"
+mockk = "1.13.7"
 rxjava = "3.1.6"
 wiremock = "2.35.0"
 
 # plugins
-# TODO kotlin 1.8 upgrade -> detekt 1.22.0+ uses kotlin 1.8
-detekt = "1.21.0"
-dokka = "1.7.20"
+# TODO kotlin 1.9 upgrade -> detekt 1.23.1+ uses kotlin 1.9
+detekt = "1.23.0"
+dokka = "1.8.20"
 jacoco = "0.8.10"
 # klint gradle plugin breaks with 0.46.x+
 ktlint-core = "0.45.2"
@@ -99,6 +93,8 @@ junit-api = { group = "org.junit.jupiter", name = "junit-jupiter-api", version.r
 junit-engine = { group = "org.junit.jupiter", name = "junit-jupiter-engine", version.ref = "junit" }
 junit-params = { group = "org.junit.jupiter", name = "junit-jupiter-params", version.ref = "junit" }
 kotlin-junit-test = { group = "org.jetbrains.kotlin", name = "kotlin-test-junit5", version.ref = "kotlin" }
+kotlin-annotation-processing = { group = "org.jetbrains.kotlin", name = "kotlin-annotation-processing-embeddable", version.ref = "kotlin" }
+kotlin-compiler = { group = "org.jetbrains.kotlin", name = "kotlin-compiler-embeddable", version.ref = "kotlin" }
 kotlin-test = { group = "org.jetbrains.kotlin", name = "kotlin-test", version.ref = "kotlin" }
 kotlinx-benchmark = { group = "org.jetbrains.kotlinx", name = "kotlinx-benchmark-runtime", version.ref = "kotlinx-benchmark" }
 kotlinx-coroutines-test = { group = "org.jetbrains.kotlinx", name = "kotlinx-coroutines-test", version.ref = "kotlinx-coroutines" }
diff --git a/plugins/client/graphql-kotlin-client-generator/build.gradle.kts b/plugins/client/graphql-kotlin-client-generator/build.gradle.kts
index 9f4421ce9a..16fa49f018 100644
--- a/plugins/client/graphql-kotlin-client-generator/build.gradle.kts
+++ b/plugins/client/graphql-kotlin-client-generator/build.gradle.kts
@@ -14,17 +14,25 @@ dependencies {
     implementation(libs.jackson)
     implementation(libs.ktor.client.apache)
     implementation(libs.ktor.serialization.jackson) {
-        exclude("com.fasterxml.jackson.core", "jackson-databind")
-        exclude("com.fasterxml.jackson.module", "jackson-module-kotlin")
+        exclude(group = "com.fasterxml.jackson.core", module = "jackson-databind")
+        exclude(group = "com.fasterxml.jackson.module", module = "jackson-module-kotlin")
     }
     implementation(libs.ktor.client.content)
     implementation(libs.slf4j)
     testImplementation(projects.graphqlKotlinClientJackson)
     testImplementation(projects.graphqlKotlinClientSerialization)
     testImplementation(libs.wiremock.jre8)
-    testImplementation(libs.compile.testing)
+    testImplementation(libs.compile.testing) {
+        // there is no kotlin compile testing release supporting kotlin 1.8.22
+        // explicitly downgrading kotlin version to match project version
+        exclude(group = "org.jetbrains.kotlin", module = "kotlin-annotation-processing-embeddable")
+        exclude(group = "org.jetbrains.kotlin", module = "kotlin-compiler-embeddable")
+    }
     testImplementation(libs.icu)
     testImplementation(libs.junit.params)
+    // compile testing workaround -> explicit dependencies for compiler/annotation-processing
+    testImplementation(libs.kotlin.annotation.processing)
+    testImplementation(libs.kotlin.compiler)
     testImplementation(libs.kotlin.serialization)
 }
 
diff --git a/plugins/client/graphql-kotlin-client-generator/src/test/data/generator/alias/AliasQuery.kt b/plugins/client/graphql-kotlin-client-generator/src/test/data/generator/alias/AliasQuery.kt
index eb56d638e5..f0e43a2a03 100644
--- a/plugins/client/graphql-kotlin-client-generator/src/test/data/generator/alias/AliasQuery.kt
+++ b/plugins/client/graphql-kotlin-client-generator/src/test/data/generator/alias/AliasQuery.kt
@@ -11,11 +11,11 @@ public const val ALIAS_QUERY: String =
 
 @Generated
 public class AliasQuery : GraphQLClientRequest<AliasQuery.Result> {
-  public override val query: String = ALIAS_QUERY
+  override val query: String = ALIAS_QUERY
 
-  public override val operationName: String = "AliasQuery"
+  override val operationName: String = "AliasQuery"
 
-  public override fun responseType(): KClass<AliasQuery.Result> = AliasQuery.Result::class
+  override fun responseType(): KClass<AliasQuery.Result> = AliasQuery.Result::class
 
   @Generated
   public data class Result(
diff --git a/plugins/client/graphql-kotlin-client-generator/src/test/data/generator/alias_nested/AliasNestedQuery.kt b/plugins/client/graphql-kotlin-client-generator/src/test/data/generator/alias_nested/AliasNestedQuery.kt
index 6b8b1325e5..d9e996b495 100644
--- a/plugins/client/graphql-kotlin-client-generator/src/test/data/generator/alias_nested/AliasNestedQuery.kt
+++ b/plugins/client/graphql-kotlin-client-generator/src/test/data/generator/alias_nested/AliasNestedQuery.kt
@@ -12,12 +12,11 @@ public const val ALIAS_NESTED_QUERY: String =
 
 @Generated
 public class AliasNestedQuery : GraphQLClientRequest<AliasNestedQuery.Result> {
-  public override val query: String = ALIAS_NESTED_QUERY
+  override val query: String = ALIAS_NESTED_QUERY
 
-  public override val operationName: String = "AliasNestedQuery"
+  override val operationName: String = "AliasNestedQuery"
 
-  public override fun responseType(): KClass<AliasNestedQuery.Result> =
-      AliasNestedQuery.Result::class
+  override fun responseType(): KClass<AliasNestedQuery.Result> = AliasNestedQuery.Result::class
 
   @Generated
   public data class Result(
diff --git a/plugins/client/graphql-kotlin-client-generator/src/test/data/generator/documentation/DocumentationQuery.kt b/plugins/client/graphql-kotlin-client-generator/src/test/data/generator/documentation/DocumentationQuery.kt
index 59d644fde4..65614f59be 100644
--- a/plugins/client/graphql-kotlin-client-generator/src/test/data/generator/documentation/DocumentationQuery.kt
+++ b/plugins/client/graphql-kotlin-client-generator/src/test/data/generator/documentation/DocumentationQuery.kt
@@ -11,12 +11,11 @@ public const val DOCUMENTATION_QUERY: String =
 
 @Generated
 public class DocumentationQuery : GraphQLClientRequest<DocumentationQuery.Result> {
-  public override val query: String = DOCUMENTATION_QUERY
+  override val query: String = DOCUMENTATION_QUERY
 
-  public override val operationName: String = "DocumentationQuery"
+  override val operationName: String = "DocumentationQuery"
 
-  public override fun responseType(): KClass<DocumentationQuery.Result> =
-      DocumentationQuery.Result::class
+  override fun responseType(): KClass<DocumentationQuery.Result> = DocumentationQuery.Result::class
 
   @Generated
   public data class Result(
diff --git a/plugins/client/graphql-kotlin-client-generator/src/test/data/generator/include_skip_directives/IncludeSkipDirectivesQuery.kt b/plugins/client/graphql-kotlin-client-generator/src/test/data/generator/include_skip_directives/IncludeSkipDirectivesQuery.kt
index 724152c544..ccb7bbc674 100644
--- a/plugins/client/graphql-kotlin-client-generator/src/test/data/generator/include_skip_directives/IncludeSkipDirectivesQuery.kt
+++ b/plugins/client/graphql-kotlin-client-generator/src/test/data/generator/include_skip_directives/IncludeSkipDirectivesQuery.kt
@@ -14,13 +14,13 @@ public const val INCLUDE_SKIP_DIRECTIVES_QUERY: String =
 
 @Generated
 public class IncludeSkipDirectivesQuery(
-  public override val variables: IncludeSkipDirectivesQuery.Variables,
+  override val variables: IncludeSkipDirectivesQuery.Variables,
 ) : GraphQLClientRequest<IncludeSkipDirectivesQuery.Result> {
-  public override val query: String = INCLUDE_SKIP_DIRECTIVES_QUERY
+  override val query: String = INCLUDE_SKIP_DIRECTIVES_QUERY
 
-  public override val operationName: String = "IncludeSkipDirectivesQuery"
+  override val operationName: String = "IncludeSkipDirectivesQuery"
 
-  public override fun responseType(): KClass<IncludeSkipDirectivesQuery.Result> =
+  override fun responseType(): KClass<IncludeSkipDirectivesQuery.Result> =
       IncludeSkipDirectivesQuery.Result::class
 
   @Generated
diff --git a/plugins/client/graphql-kotlin-client-generator/src/test/data/generator/input_hard_coded/HardCodedInputQuery.kt b/plugins/client/graphql-kotlin-client-generator/src/test/data/generator/input_hard_coded/HardCodedInputQuery.kt
index 2b044ee9e9..0e834fe3fc 100644
--- a/plugins/client/graphql-kotlin-client-generator/src/test/data/generator/input_hard_coded/HardCodedInputQuery.kt
+++ b/plugins/client/graphql-kotlin-client-generator/src/test/data/generator/input_hard_coded/HardCodedInputQuery.kt
@@ -11,11 +11,11 @@ public const val HARD_CODED_INPUT_QUERY: String =
 
 @Generated
 public class HardCodedInputQuery : GraphQLClientRequest<HardCodedInputQuery.Result> {
-  public override val query: String = HARD_CODED_INPUT_QUERY
+  override val query: String = HARD_CODED_INPUT_QUERY
 
-  public override val operationName: String = "HardCodedInputQuery"
+  override val operationName: String = "HardCodedInputQuery"
 
-  public override fun responseType(): KClass<HardCodedInputQuery.Result> =
+  override fun responseType(): KClass<HardCodedInputQuery.Result> =
       HardCodedInputQuery.Result::class
 
   @Generated
diff --git a/plugins/client/graphql-kotlin-client-generator/src/test/data/generator/input_lists/InputListQuery.kt b/plugins/client/graphql-kotlin-client-generator/src/test/data/generator/input_lists/InputListQuery.kt
index c853dad7ad..1b92422953 100644
--- a/plugins/client/graphql-kotlin-client-generator/src/test/data/generator/input_lists/InputListQuery.kt
+++ b/plugins/client/graphql-kotlin-client-generator/src/test/data/generator/input_lists/InputListQuery.kt
@@ -12,13 +12,13 @@ public const val INPUT_LIST_QUERY: String =
 
 @Generated
 public class InputListQuery(
-  public override val variables: InputListQuery.Variables,
+  override val variables: InputListQuery.Variables,
 ) : GraphQLClientRequest<InputListQuery.Result> {
-  public override val query: String = INPUT_LIST_QUERY
+  override val query: String = INPUT_LIST_QUERY
 
-  public override val operationName: String = "InputListQuery"
+  override val operationName: String = "InputListQuery"
 
-  public override fun responseType(): KClass<InputListQuery.Result> = InputListQuery.Result::class
+  override fun responseType(): KClass<InputListQuery.Result> = InputListQuery.Result::class
 
   @Generated
   public data class Variables(
diff --git a/plugins/client/graphql-kotlin-client-generator/src/test/data/generator/input_self_reference/SelfReferencingInputQuery.kt b/plugins/client/graphql-kotlin-client-generator/src/test/data/generator/input_self_reference/SelfReferencingInputQuery.kt
index 71f5e6d1df..581c0385ad 100644
--- a/plugins/client/graphql-kotlin-client-generator/src/test/data/generator/input_self_reference/SelfReferencingInputQuery.kt
+++ b/plugins/client/graphql-kotlin-client-generator/src/test/data/generator/input_self_reference/SelfReferencingInputQuery.kt
@@ -13,13 +13,13 @@ public const val SELF_REFERENCING_INPUT_QUERY: String =
 
 @Generated
 public class SelfReferencingInputQuery(
-  public override val variables: SelfReferencingInputQuery.Variables,
+  override val variables: SelfReferencingInputQuery.Variables,
 ) : GraphQLClientRequest<SelfReferencingInputQuery.Result> {
-  public override val query: String = SELF_REFERENCING_INPUT_QUERY
+  override val query: String = SELF_REFERENCING_INPUT_QUERY
 
-  public override val operationName: String = "SelfReferencingInputQuery"
+  override val operationName: String = "SelfReferencingInputQuery"
 
-  public override fun responseType(): KClass<SelfReferencingInputQuery.Result> =
+  override fun responseType(): KClass<SelfReferencingInputQuery.Result> =
       SelfReferencingInputQuery.Result::class
 
   @Generated
diff --git a/plugins/client/graphql-kotlin-client-generator/src/test/data/generator/interface_diff_selection_sets/DifferentSelectionSetQuery.kt b/plugins/client/graphql-kotlin-client-generator/src/test/data/generator/interface_diff_selection_sets/DifferentSelectionSetQuery.kt
index 189a2d65ff..b8bb28cfe9 100644
--- a/plugins/client/graphql-kotlin-client-generator/src/test/data/generator/interface_diff_selection_sets/DifferentSelectionSetQuery.kt
+++ b/plugins/client/graphql-kotlin-client-generator/src/test/data/generator/interface_diff_selection_sets/DifferentSelectionSetQuery.kt
@@ -12,11 +12,11 @@ public const val DIFFERENT_SELECTION_SET_QUERY: String =
 
 @Generated
 public class DifferentSelectionSetQuery : GraphQLClientRequest<DifferentSelectionSetQuery.Result> {
-  public override val query: String = DIFFERENT_SELECTION_SET_QUERY
+  override val query: String = DIFFERENT_SELECTION_SET_QUERY
 
-  public override val operationName: String = "DifferentSelectionSetQuery"
+  override val operationName: String = "DifferentSelectionSetQuery"
 
-  public override fun responseType(): KClass<DifferentSelectionSetQuery.Result> =
+  override fun responseType(): KClass<DifferentSelectionSetQuery.Result> =
       DifferentSelectionSetQuery.Result::class
 
   @Generated
diff --git a/plugins/client/graphql-kotlin-client-generator/src/test/data/generator/interface_diff_selection_sets/differentselectionsetquery/BasicInterface.kt b/plugins/client/graphql-kotlin-client-generator/src/test/data/generator/interface_diff_selection_sets/differentselectionsetquery/BasicInterface.kt
index df0289b55f..58ee374b32 100644
--- a/plugins/client/graphql-kotlin-client-generator/src/test/data/generator/interface_diff_selection_sets/differentselectionsetquery/BasicInterface.kt
+++ b/plugins/client/graphql-kotlin-client-generator/src/test/data/generator/interface_diff_selection_sets/differentselectionsetquery/BasicInterface.kt
@@ -43,11 +43,11 @@ public data class FirstInterfaceImplementation(
   /**
    * Unique identifier of the first implementation
    */
-  public override val id: Int,
+  override val id: Int,
   /**
    * Name of the first implementation
    */
-  public override val name: String,
+  override val name: String,
   /**
    * Custom field integer value
    */
@@ -62,11 +62,11 @@ public data class SecondInterfaceImplementation(
   /**
    * Unique identifier of the second implementation
    */
-  public override val id: Int,
+  override val id: Int,
   /**
    * Name of the second implementation
    */
-  public override val name: String,
+  override val name: String,
   /**
    * Custom field float value
    */
@@ -82,9 +82,9 @@ public data class DefaultBasicInterfaceImplementation(
   /**
    * Unique identifier of an interface
    */
-  public override val id: Int,
+  override val id: Int,
   /**
    * Name field
    */
-  public override val name: String,
+  override val name: String,
 ) : BasicInterface
diff --git a/plugins/client/graphql-kotlin-client-generator/src/test/data/generator/interface_diff_selection_sets/differentselectionsetquery/BasicInterface2.kt b/plugins/client/graphql-kotlin-client-generator/src/test/data/generator/interface_diff_selection_sets/differentselectionsetquery/BasicInterface2.kt
index 9753dc3595..0f23b40118 100644
--- a/plugins/client/graphql-kotlin-client-generator/src/test/data/generator/interface_diff_selection_sets/differentselectionsetquery/BasicInterface2.kt
+++ b/plugins/client/graphql-kotlin-client-generator/src/test/data/generator/interface_diff_selection_sets/differentselectionsetquery/BasicInterface2.kt
@@ -38,7 +38,7 @@ public data class FirstInterfaceImplementation2(
   /**
    * Name of the first implementation
    */
-  public override val name: String,
+  override val name: String,
   /**
    * Custom field integer value
    */
@@ -53,7 +53,7 @@ public data class SecondInterfaceImplementation2(
   /**
    * Name of the second implementation
    */
-  public override val name: String,
+  override val name: String,
   /**
    * Custom field float value
    */
@@ -69,5 +69,5 @@ public data class DefaultBasicInterface2Implementation(
   /**
    * Name field
    */
-  public override val name: String,
+  override val name: String,
 ) : BasicInterface2
diff --git a/plugins/client/graphql-kotlin-client-generator/src/test/data/generator/interface_impl_diff_selection_sets/DifferentSelectionSetQuery.kt b/plugins/client/graphql-kotlin-client-generator/src/test/data/generator/interface_impl_diff_selection_sets/DifferentSelectionSetQuery.kt
index 41764a14b7..2b7881c162 100644
--- a/plugins/client/graphql-kotlin-client-generator/src/test/data/generator/interface_impl_diff_selection_sets/DifferentSelectionSetQuery.kt
+++ b/plugins/client/graphql-kotlin-client-generator/src/test/data/generator/interface_impl_diff_selection_sets/DifferentSelectionSetQuery.kt
@@ -12,11 +12,11 @@ public const val DIFFERENT_SELECTION_SET_QUERY: String =
 
 @Generated
 public class DifferentSelectionSetQuery : GraphQLClientRequest<DifferentSelectionSetQuery.Result> {
-  public override val query: String = DIFFERENT_SELECTION_SET_QUERY
+  override val query: String = DIFFERENT_SELECTION_SET_QUERY
 
-  public override val operationName: String = "DifferentSelectionSetQuery"
+  override val operationName: String = "DifferentSelectionSetQuery"
 
-  public override fun responseType(): KClass<DifferentSelectionSetQuery.Result> =
+  override fun responseType(): KClass<DifferentSelectionSetQuery.Result> =
       DifferentSelectionSetQuery.Result::class
 
   @Generated
diff --git a/plugins/client/graphql-kotlin-client-generator/src/test/data/generator/interface_impl_diff_selection_sets/differentselectionsetquery/BasicInterface.kt b/plugins/client/graphql-kotlin-client-generator/src/test/data/generator/interface_impl_diff_selection_sets/differentselectionsetquery/BasicInterface.kt
index 84246c37cc..4d80af0ab6 100644
--- a/plugins/client/graphql-kotlin-client-generator/src/test/data/generator/interface_impl_diff_selection_sets/differentselectionsetquery/BasicInterface.kt
+++ b/plugins/client/graphql-kotlin-client-generator/src/test/data/generator/interface_impl_diff_selection_sets/differentselectionsetquery/BasicInterface.kt
@@ -37,7 +37,7 @@ public data class FirstInterfaceImplementation(
   /**
    * Unique identifier of the first implementation
    */
-  public override val id: Int,
+  override val id: Int,
   /**
    * Custom field integer value
    */
@@ -52,7 +52,7 @@ public data class SecondInterfaceImplementation(
   /**
    * Unique identifier of the second implementation
    */
-  public override val id: Int,
+  override val id: Int,
   /**
    * Custom field float value
    */
@@ -68,5 +68,5 @@ public data class DefaultBasicInterfaceImplementation(
   /**
    * Unique identifier of an interface
    */
-  public override val id: Int,
+  override val id: Int,
 ) : BasicInterface
diff --git a/plugins/client/graphql-kotlin-client-generator/src/test/data/generator/interface_impl_diff_selection_sets/differentselectionsetquery/BasicInterface2.kt b/plugins/client/graphql-kotlin-client-generator/src/test/data/generator/interface_impl_diff_selection_sets/differentselectionsetquery/BasicInterface2.kt
index af7f566b7c..9006fad53b 100644
--- a/plugins/client/graphql-kotlin-client-generator/src/test/data/generator/interface_impl_diff_selection_sets/differentselectionsetquery/BasicInterface2.kt
+++ b/plugins/client/graphql-kotlin-client-generator/src/test/data/generator/interface_impl_diff_selection_sets/differentselectionsetquery/BasicInterface2.kt
@@ -38,7 +38,7 @@ public data class FirstInterfaceImplementation2(
   /**
    * Unique identifier of the first implementation
    */
-  public override val id: Int,
+  override val id: Int,
   /**
    * Name of the first implementation
    */
@@ -57,7 +57,7 @@ public data class SecondInterfaceImplementation2(
   /**
    * Unique identifier of the second implementation
    */
-  public override val id: Int,
+  override val id: Int,
   /**
    * Name of the second implementation
    */
@@ -77,5 +77,5 @@ public data class DefaultBasicInterface2Implementation(
   /**
    * Unique identifier of an interface
    */
-  public override val id: Int,
+  override val id: Int,
 ) : BasicInterface2
diff --git a/plugins/client/graphql-kotlin-client-generator/src/test/data/generator/interface_missing_types/InterfaceMissingTypeSelection.kt b/plugins/client/graphql-kotlin-client-generator/src/test/data/generator/interface_missing_types/InterfaceMissingTypeSelection.kt
index 08b134aff3..72b012ee9a 100644
--- a/plugins/client/graphql-kotlin-client-generator/src/test/data/generator/interface_missing_types/InterfaceMissingTypeSelection.kt
+++ b/plugins/client/graphql-kotlin-client-generator/src/test/data/generator/interface_missing_types/InterfaceMissingTypeSelection.kt
@@ -12,11 +12,11 @@ public const val INTERFACE_MISSING_TYPE_SELECTION: String =
 @Generated
 public class InterfaceMissingTypeSelection :
     GraphQLClientRequest<InterfaceMissingTypeSelection.Result> {
-  public override val query: String = INTERFACE_MISSING_TYPE_SELECTION
+  override val query: String = INTERFACE_MISSING_TYPE_SELECTION
 
-  public override val operationName: String = "InterfaceMissingTypeSelection"
+  override val operationName: String = "InterfaceMissingTypeSelection"
 
-  public override fun responseType(): KClass<InterfaceMissingTypeSelection.Result> =
+  override fun responseType(): KClass<InterfaceMissingTypeSelection.Result> =
       InterfaceMissingTypeSelection.Result::class
 
   @Generated
diff --git a/plugins/client/graphql-kotlin-client-generator/src/test/data/generator/interface_missing_types/interfacemissingtypeselection/BasicInterface.kt b/plugins/client/graphql-kotlin-client-generator/src/test/data/generator/interface_missing_types/interfacemissingtypeselection/BasicInterface.kt
index 912af74bd7..1b1c555ab2 100644
--- a/plugins/client/graphql-kotlin-client-generator/src/test/data/generator/interface_missing_types/interfacemissingtypeselection/BasicInterface.kt
+++ b/plugins/client/graphql-kotlin-client-generator/src/test/data/generator/interface_missing_types/interfacemissingtypeselection/BasicInterface.kt
@@ -40,11 +40,11 @@ public data class FirstInterfaceImplementation(
   /**
    * Unique identifier of the first implementation
    */
-  public override val id: Int,
+  override val id: Int,
   /**
    * Name of the first implementation
    */
-  public override val name: String,
+  override val name: String,
   /**
    * Custom field integer value
    */
@@ -60,9 +60,9 @@ public data class DefaultBasicInterfaceImplementation(
   /**
    * Unique identifier of an interface
    */
-  public override val id: Int,
+  override val id: Int,
   /**
    * Name field
    */
-  public override val name: String,
+  override val name: String,
 ) : BasicInterface
diff --git a/plugins/client/graphql-kotlin-client-generator/src/test/data/generator/interface_named_fragments/InterfaceWithNamedFragmentsQuery.kt b/plugins/client/graphql-kotlin-client-generator/src/test/data/generator/interface_named_fragments/InterfaceWithNamedFragmentsQuery.kt
index 2adcb45508..10d37af2e4 100644
--- a/plugins/client/graphql-kotlin-client-generator/src/test/data/generator/interface_named_fragments/InterfaceWithNamedFragmentsQuery.kt
+++ b/plugins/client/graphql-kotlin-client-generator/src/test/data/generator/interface_named_fragments/InterfaceWithNamedFragmentsQuery.kt
@@ -12,11 +12,11 @@ public const val INTERFACE_WITH_NAMED_FRAGMENTS_QUERY: String =
 @Generated
 public class InterfaceWithNamedFragmentsQuery :
     GraphQLClientRequest<InterfaceWithNamedFragmentsQuery.Result> {
-  public override val query: String = INTERFACE_WITH_NAMED_FRAGMENTS_QUERY
+  override val query: String = INTERFACE_WITH_NAMED_FRAGMENTS_QUERY
 
-  public override val operationName: String = "InterfaceWithNamedFragmentsQuery"
+  override val operationName: String = "InterfaceWithNamedFragmentsQuery"
 
-  public override fun responseType(): KClass<InterfaceWithNamedFragmentsQuery.Result> =
+  override fun responseType(): KClass<InterfaceWithNamedFragmentsQuery.Result> =
       InterfaceWithNamedFragmentsQuery.Result::class
 
   @Generated
diff --git a/plugins/client/graphql-kotlin-client-generator/src/test/data/generator/interface_named_fragments/interfacewithnamedfragmentsquery/BasicInterface.kt b/plugins/client/graphql-kotlin-client-generator/src/test/data/generator/interface_named_fragments/interfacewithnamedfragmentsquery/BasicInterface.kt
index bbf4e5a79d..9eb2e001dd 100644
--- a/plugins/client/graphql-kotlin-client-generator/src/test/data/generator/interface_named_fragments/interfacewithnamedfragmentsquery/BasicInterface.kt
+++ b/plugins/client/graphql-kotlin-client-generator/src/test/data/generator/interface_named_fragments/interfacewithnamedfragmentsquery/BasicInterface.kt
@@ -43,11 +43,11 @@ public data class FirstInterfaceImplementation(
   /**
    * Unique identifier of the first implementation
    */
-  public override val id: Int,
+  override val id: Int,
   /**
    * Name of the first implementation
    */
-  public override val name: String,
+  override val name: String,
   /**
    * Custom field integer value
    */
@@ -62,11 +62,11 @@ public data class SecondInterfaceImplementation(
   /**
    * Unique identifier of the second implementation
    */
-  public override val id: Int,
+  override val id: Int,
   /**
    * Name of the second implementation
    */
-  public override val name: String,
+  override val name: String,
   /**
    * Custom field float value
    */
@@ -82,9 +82,9 @@ public data class DefaultBasicInterfaceImplementation(
   /**
    * Unique identifier of an interface
    */
-  public override val id: Int,
+  override val id: Int,
   /**
    * Name field
    */
-  public override val name: String,
+  override val name: String,
 ) : BasicInterface
diff --git a/plugins/client/graphql-kotlin-client-generator/src/test/data/generator/mutation/SimpleMutation.kt b/plugins/client/graphql-kotlin-client-generator/src/test/data/generator/mutation/SimpleMutation.kt
index ad1346431a..1d6d5b9fa8 100644
--- a/plugins/client/graphql-kotlin-client-generator/src/test/data/generator/mutation/SimpleMutation.kt
+++ b/plugins/client/graphql-kotlin-client-generator/src/test/data/generator/mutation/SimpleMutation.kt
@@ -13,13 +13,13 @@ public const val SIMPLE_MUTATION: String =
 
 @Generated
 public class SimpleMutation(
-  public override val variables: SimpleMutation.Variables,
+  override val variables: SimpleMutation.Variables,
 ) : GraphQLClientRequest<SimpleMutation.Result> {
-  public override val query: String = SIMPLE_MUTATION
+  override val query: String = SIMPLE_MUTATION
 
-  public override val operationName: String = "SimpleMutation"
+  override val operationName: String = "SimpleMutation"
 
-  public override fun responseType(): KClass<SimpleMutation.Result> = SimpleMutation.Result::class
+  override fun responseType(): KClass<SimpleMutation.Result> = SimpleMutation.Result::class
 
   @Generated
   public data class Variables(
diff --git a/plugins/client/graphql-kotlin-client-generator/src/test/data/generator/object_diff_selection_set/DifferentSelectionsQuery.kt b/plugins/client/graphql-kotlin-client-generator/src/test/data/generator/object_diff_selection_set/DifferentSelectionsQuery.kt
index fb87fd4b87..f75a613db9 100644
--- a/plugins/client/graphql-kotlin-client-generator/src/test/data/generator/object_diff_selection_set/DifferentSelectionsQuery.kt
+++ b/plugins/client/graphql-kotlin-client-generator/src/test/data/generator/object_diff_selection_set/DifferentSelectionsQuery.kt
@@ -12,11 +12,11 @@ public const val DIFFERENT_SELECTIONS_QUERY: String =
 
 @Generated
 public class DifferentSelectionsQuery : GraphQLClientRequest<DifferentSelectionsQuery.Result> {
-  public override val query: String = DIFFERENT_SELECTIONS_QUERY
+  override val query: String = DIFFERENT_SELECTIONS_QUERY
 
-  public override val operationName: String = "DifferentSelectionsQuery"
+  override val operationName: String = "DifferentSelectionsQuery"
 
-  public override fun responseType(): KClass<DifferentSelectionsQuery.Result> =
+  override fun responseType(): KClass<DifferentSelectionsQuery.Result> =
       DifferentSelectionsQuery.Result::class
 
   @Generated
diff --git a/plugins/client/graphql-kotlin-client-generator/src/test/data/generator/object_diff_sub_selection/DifferentSubselectionQuery.kt b/plugins/client/graphql-kotlin-client-generator/src/test/data/generator/object_diff_sub_selection/DifferentSubselectionQuery.kt
index 159017e738..6c92c9554a 100644
--- a/plugins/client/graphql-kotlin-client-generator/src/test/data/generator/object_diff_sub_selection/DifferentSubselectionQuery.kt
+++ b/plugins/client/graphql-kotlin-client-generator/src/test/data/generator/object_diff_sub_selection/DifferentSubselectionQuery.kt
@@ -12,11 +12,11 @@ public const val DIFFERENT_SUBSELECTION_QUERY: String =
 
 @Generated
 public class DifferentSubselectionQuery : GraphQLClientRequest<DifferentSubselectionQuery.Result> {
-  public override val query: String = DIFFERENT_SUBSELECTION_QUERY
+  override val query: String = DIFFERENT_SUBSELECTION_QUERY
 
-  public override val operationName: String = "DifferentSubselectionQuery"
+  override val operationName: String = "DifferentSubselectionQuery"
 
-  public override fun responseType(): KClass<DifferentSubselectionQuery.Result> =
+  override fun responseType(): KClass<DifferentSubselectionQuery.Result> =
       DifferentSubselectionQuery.Result::class
 
   @Generated
diff --git a/plugins/client/graphql-kotlin-client-generator/src/test/data/generator/object_list/ListQuery.kt b/plugins/client/graphql-kotlin-client-generator/src/test/data/generator/object_list/ListQuery.kt
index 2716332fdb..7a517cee9c 100644
--- a/plugins/client/graphql-kotlin-client-generator/src/test/data/generator/object_list/ListQuery.kt
+++ b/plugins/client/graphql-kotlin-client-generator/src/test/data/generator/object_list/ListQuery.kt
@@ -11,11 +11,11 @@ public const val LIST_QUERY: String = "query ListQuery {\n  listQuery {\n    id\
 
 @Generated
 public class ListQuery : GraphQLClientRequest<ListQuery.Result> {
-  public override val query: String = LIST_QUERY
+  override val query: String = LIST_QUERY
 
-  public override val operationName: String = "ListQuery"
+  override val operationName: String = "ListQuery"
 
-  public override fun responseType(): KClass<ListQuery.Result> = ListQuery.Result::class
+  override fun responseType(): KClass<ListQuery.Result> = ListQuery.Result::class
 
   @Generated
   public data class Result(
diff --git a/plugins/client/graphql-kotlin-client-generator/src/test/data/generator/object_named_fragments/ObjectWithNamedFragmentQuery.kt b/plugins/client/graphql-kotlin-client-generator/src/test/data/generator/object_named_fragments/ObjectWithNamedFragmentQuery.kt
index fcb024ec0f..db57859b2b 100644
--- a/plugins/client/graphql-kotlin-client-generator/src/test/data/generator/object_named_fragments/ObjectWithNamedFragmentQuery.kt
+++ b/plugins/client/graphql-kotlin-client-generator/src/test/data/generator/object_named_fragments/ObjectWithNamedFragmentQuery.kt
@@ -12,11 +12,11 @@ public const val OBJECT_WITH_NAMED_FRAGMENT_QUERY: String =
 @Generated
 public class ObjectWithNamedFragmentQuery :
     GraphQLClientRequest<ObjectWithNamedFragmentQuery.Result> {
-  public override val query: String = OBJECT_WITH_NAMED_FRAGMENT_QUERY
+  override val query: String = OBJECT_WITH_NAMED_FRAGMENT_QUERY
 
-  public override val operationName: String = "ObjectWithNamedFragmentQuery"
+  override val operationName: String = "ObjectWithNamedFragmentQuery"
 
-  public override fun responseType(): KClass<ObjectWithNamedFragmentQuery.Result> =
+  override fun responseType(): KClass<ObjectWithNamedFragmentQuery.Result> =
       ObjectWithNamedFragmentQuery.Result::class
 
   @Generated
diff --git a/plugins/client/graphql-kotlin-client-generator/src/test/data/generator/object_self_reference/NestedQuery.kt b/plugins/client/graphql-kotlin-client-generator/src/test/data/generator/object_self_reference/NestedQuery.kt
index 9d3dbd8d63..43e7888fca 100644
--- a/plugins/client/graphql-kotlin-client-generator/src/test/data/generator/object_self_reference/NestedQuery.kt
+++ b/plugins/client/graphql-kotlin-client-generator/src/test/data/generator/object_self_reference/NestedQuery.kt
@@ -11,11 +11,11 @@ public const val NESTED_QUERY: String =
 
 @Generated
 public class NestedQuery : GraphQLClientRequest<NestedQuery.Result> {
-  public override val query: String = NESTED_QUERY
+  override val query: String = NESTED_QUERY
 
-  public override val operationName: String = "NestedQuery"
+  override val operationName: String = "NestedQuery"
 
-  public override fun responseType(): KClass<NestedQuery.Result> = NestedQuery.Result::class
+  override fun responseType(): KClass<NestedQuery.Result> = NestedQuery.Result::class
 
   @Generated
   public data class Result(
diff --git a/plugins/client/graphql-kotlin-client-generator/src/test/data/generator/operation_name_missing/AnonymousQuery.kt b/plugins/client/graphql-kotlin-client-generator/src/test/data/generator/operation_name_missing/AnonymousQuery.kt
index f5e9244e9e..5d4c479c22 100644
--- a/plugins/client/graphql-kotlin-client-generator/src/test/data/generator/operation_name_missing/AnonymousQuery.kt
+++ b/plugins/client/graphql-kotlin-client-generator/src/test/data/generator/operation_name_missing/AnonymousQuery.kt
@@ -10,9 +10,9 @@ public const val ANONYMOUS_QUERY: String = "query {\n  scalarQuery {\n    name\n
 
 @Generated
 public class AnonymousQuery : GraphQLClientRequest<AnonymousQuery.Result> {
-  public override val query: String = ANONYMOUS_QUERY
+  override val query: String = ANONYMOUS_QUERY
 
-  public override fun responseType(): KClass<AnonymousQuery.Result> = AnonymousQuery.Result::class
+  override fun responseType(): KClass<AnonymousQuery.Result> = AnonymousQuery.Result::class
 
   @Generated
   public data class Result(
diff --git a/plugins/client/graphql-kotlin-client-generator/src/test/data/generator/operation_name_unchanged/MiXEDcaSEQuery.kt b/plugins/client/graphql-kotlin-client-generator/src/test/data/generator/operation_name_unchanged/MiXEDcaSEQuery.kt
index 7ab99b0f74..c984ddb904 100644
--- a/plugins/client/graphql-kotlin-client-generator/src/test/data/generator/operation_name_unchanged/MiXEDcaSEQuery.kt
+++ b/plugins/client/graphql-kotlin-client-generator/src/test/data/generator/operation_name_unchanged/MiXEDcaSEQuery.kt
@@ -11,11 +11,11 @@ public const val MI_XE_DCA_SE_QUERY: String =
 
 @Generated
 public class MiXEDcaSEQuery : GraphQLClientRequest<MiXEDcaSEQuery.Result> {
-  public override val query: String = MI_XE_DCA_SE_QUERY
+  override val query: String = MI_XE_DCA_SE_QUERY
 
-  public override val operationName: String = "miXEDcaSEQuery"
+  override val operationName: String = "miXEDcaSEQuery"
 
-  public override fun responseType(): KClass<MiXEDcaSEQuery.Result> = MiXEDcaSEQuery.Result::class
+  override fun responseType(): KClass<MiXEDcaSEQuery.Result> = MiXEDcaSEQuery.Result::class
 
   @Generated
   public data class Result(
diff --git a/plugins/client/graphql-kotlin-client-generator/src/test/data/generator/reuse_list_types/ReusedListTypesQuery.kt b/plugins/client/graphql-kotlin-client-generator/src/test/data/generator/reuse_list_types/ReusedListTypesQuery.kt
index 9c4b0981cd..67372c0cf6 100644
--- a/plugins/client/graphql-kotlin-client-generator/src/test/data/generator/reuse_list_types/ReusedListTypesQuery.kt
+++ b/plugins/client/graphql-kotlin-client-generator/src/test/data/generator/reuse_list_types/ReusedListTypesQuery.kt
@@ -16,11 +16,11 @@ public const val REUSED_LIST_TYPES_QUERY: String =
 
 @Generated
 public class ReusedListTypesQuery : GraphQLClientRequest<ReusedListTypesQuery.Result> {
-  public override val query: String = REUSED_LIST_TYPES_QUERY
+  override val query: String = REUSED_LIST_TYPES_QUERY
 
-  public override val operationName: String = "ReusedListTypesQuery"
+  override val operationName: String = "ReusedListTypesQuery"
 
-  public override fun responseType(): KClass<ReusedListTypesQuery.Result> =
+  override fun responseType(): KClass<ReusedListTypesQuery.Result> =
       ReusedListTypesQuery.Result::class
 
   @Generated
diff --git a/plugins/client/graphql-kotlin-client-generator/src/test/data/generator/reuse_types/ReusedTypesQuery.kt b/plugins/client/graphql-kotlin-client-generator/src/test/data/generator/reuse_types/ReusedTypesQuery.kt
index 4ce4f9ab43..4afd457d91 100644
--- a/plugins/client/graphql-kotlin-client-generator/src/test/data/generator/reuse_types/ReusedTypesQuery.kt
+++ b/plugins/client/graphql-kotlin-client-generator/src/test/data/generator/reuse_types/ReusedTypesQuery.kt
@@ -13,12 +13,11 @@ public const val REUSED_TYPES_QUERY: String =
 
 @Generated
 public class ReusedTypesQuery : GraphQLClientRequest<ReusedTypesQuery.Result> {
-  public override val query: String = REUSED_TYPES_QUERY
+  override val query: String = REUSED_TYPES_QUERY
 
-  public override val operationName: String = "ReusedTypesQuery"
+  override val operationName: String = "ReusedTypesQuery"
 
-  public override fun responseType(): KClass<ReusedTypesQuery.Result> =
-      ReusedTypesQuery.Result::class
+  override fun responseType(): KClass<ReusedTypesQuery.Result> = ReusedTypesQuery.Result::class
 
   @Generated
   public data class Result(
diff --git a/plugins/client/graphql-kotlin-client-generator/src/test/data/generator/scalar_typealias/ScalarAliasQuery.kt b/plugins/client/graphql-kotlin-client-generator/src/test/data/generator/scalar_typealias/ScalarAliasQuery.kt
index 52649c71b4..ab729f30a0 100644
--- a/plugins/client/graphql-kotlin-client-generator/src/test/data/generator/scalar_typealias/ScalarAliasQuery.kt
+++ b/plugins/client/graphql-kotlin-client-generator/src/test/data/generator/scalar_typealias/ScalarAliasQuery.kt
@@ -11,12 +11,11 @@ public const val SCALAR_ALIAS_QUERY: String =
 
 @Generated
 public class ScalarAliasQuery : GraphQLClientRequest<ScalarAliasQuery.Result> {
-  public override val query: String = SCALAR_ALIAS_QUERY
+  override val query: String = SCALAR_ALIAS_QUERY
 
-  public override val operationName: String = "ScalarAliasQuery"
+  override val operationName: String = "ScalarAliasQuery"
 
-  public override fun responseType(): KClass<ScalarAliasQuery.Result> =
-      ScalarAliasQuery.Result::class
+  override fun responseType(): KClass<ScalarAliasQuery.Result> = ScalarAliasQuery.Result::class
 
   @Generated
   public data class Result(
diff --git a/plugins/client/graphql-kotlin-client-generator/src/test/data/generator/union_diff_selection_set/DifferentSelectionSetQuery.kt b/plugins/client/graphql-kotlin-client-generator/src/test/data/generator/union_diff_selection_set/DifferentSelectionSetQuery.kt
index 59d8faa4a5..9deedd1b20 100644
--- a/plugins/client/graphql-kotlin-client-generator/src/test/data/generator/union_diff_selection_set/DifferentSelectionSetQuery.kt
+++ b/plugins/client/graphql-kotlin-client-generator/src/test/data/generator/union_diff_selection_set/DifferentSelectionSetQuery.kt
@@ -12,11 +12,11 @@ public const val DIFFERENT_SELECTION_SET_QUERY: String =
 
 @Generated
 public class DifferentSelectionSetQuery : GraphQLClientRequest<DifferentSelectionSetQuery.Result> {
-  public override val query: String = DIFFERENT_SELECTION_SET_QUERY
+  override val query: String = DIFFERENT_SELECTION_SET_QUERY
 
-  public override val operationName: String = "DifferentSelectionSetQuery"
+  override val operationName: String = "DifferentSelectionSetQuery"
 
-  public override fun responseType(): KClass<DifferentSelectionSetQuery.Result> =
+  override fun responseType(): KClass<DifferentSelectionSetQuery.Result> =
       DifferentSelectionSetQuery.Result::class
 
   @Generated
diff --git a/plugins/client/graphql-kotlin-client-generator/src/test/data/generator/union_diff_selection_set2/DifferentSelectionSetQuery.kt b/plugins/client/graphql-kotlin-client-generator/src/test/data/generator/union_diff_selection_set2/DifferentSelectionSetQuery.kt
index aadf7d3d02..c848aad689 100644
--- a/plugins/client/graphql-kotlin-client-generator/src/test/data/generator/union_diff_selection_set2/DifferentSelectionSetQuery.kt
+++ b/plugins/client/graphql-kotlin-client-generator/src/test/data/generator/union_diff_selection_set2/DifferentSelectionSetQuery.kt
@@ -12,11 +12,11 @@ public const val DIFFERENT_SELECTION_SET_QUERY: String =
 
 @Generated
 public class DifferentSelectionSetQuery : GraphQLClientRequest<DifferentSelectionSetQuery.Result> {
-  public override val query: String = DIFFERENT_SELECTION_SET_QUERY
+  override val query: String = DIFFERENT_SELECTION_SET_QUERY
 
-  public override val operationName: String = "DifferentSelectionSetQuery"
+  override val operationName: String = "DifferentSelectionSetQuery"
 
-  public override fun responseType(): KClass<DifferentSelectionSetQuery.Result> =
+  override fun responseType(): KClass<DifferentSelectionSetQuery.Result> =
       DifferentSelectionSetQuery.Result::class
 
   @Generated
diff --git a/plugins/client/graphql-kotlin-client-generator/src/test/data/generator/union_missing_types/UnionMissingTypeSelection.kt b/plugins/client/graphql-kotlin-client-generator/src/test/data/generator/union_missing_types/UnionMissingTypeSelection.kt
index 9a959cb18c..9ae36435ef 100644
--- a/plugins/client/graphql-kotlin-client-generator/src/test/data/generator/union_missing_types/UnionMissingTypeSelection.kt
+++ b/plugins/client/graphql-kotlin-client-generator/src/test/data/generator/union_missing_types/UnionMissingTypeSelection.kt
@@ -11,11 +11,11 @@ public const val UNION_MISSING_TYPE_SELECTION: String =
 
 @Generated
 public class UnionMissingTypeSelection : GraphQLClientRequest<UnionMissingTypeSelection.Result> {
-  public override val query: String = UNION_MISSING_TYPE_SELECTION
+  override val query: String = UNION_MISSING_TYPE_SELECTION
 
-  public override val operationName: String = "UnionMissingTypeSelection"
+  override val operationName: String = "UnionMissingTypeSelection"
 
-  public override fun responseType(): KClass<UnionMissingTypeSelection.Result> =
+  override fun responseType(): KClass<UnionMissingTypeSelection.Result> =
       UnionMissingTypeSelection.Result::class
 
   @Generated
diff --git a/plugins/client/graphql-kotlin-client-generator/src/test/data/generator/union_named_fragments/UnionQueryWithNamedFragments.kt b/plugins/client/graphql-kotlin-client-generator/src/test/data/generator/union_named_fragments/UnionQueryWithNamedFragments.kt
index 895c69b766..94b73656f6 100644
--- a/plugins/client/graphql-kotlin-client-generator/src/test/data/generator/union_named_fragments/UnionQueryWithNamedFragments.kt
+++ b/plugins/client/graphql-kotlin-client-generator/src/test/data/generator/union_named_fragments/UnionQueryWithNamedFragments.kt
@@ -12,11 +12,11 @@ public const val UNION_QUERY_WITH_NAMED_FRAGMENTS: String =
 @Generated
 public class UnionQueryWithNamedFragments :
     GraphQLClientRequest<UnionQueryWithNamedFragments.Result> {
-  public override val query: String = UNION_QUERY_WITH_NAMED_FRAGMENTS
+  override val query: String = UNION_QUERY_WITH_NAMED_FRAGMENTS
 
-  public override val operationName: String = "UnionQueryWithNamedFragments"
+  override val operationName: String = "UnionQueryWithNamedFragments"
 
-  public override fun responseType(): KClass<UnionQueryWithNamedFragments.Result> =
+  override fun responseType(): KClass<UnionQueryWithNamedFragments.Result> =
       UnionQueryWithNamedFragments.Result::class
 
   @Generated
diff --git a/plugins/client/graphql-kotlin-client-generator/src/test/data/jackson/custom_scalar_input/CustomScalarInputQuery.kt b/plugins/client/graphql-kotlin-client-generator/src/test/data/jackson/custom_scalar_input/CustomScalarInputQuery.kt
index 74a7725a36..2d309be6fd 100644
--- a/plugins/client/graphql-kotlin-client-generator/src/test/data/jackson/custom_scalar_input/CustomScalarInputQuery.kt
+++ b/plugins/client/graphql-kotlin-client-generator/src/test/data/jackson/custom_scalar_input/CustomScalarInputQuery.kt
@@ -21,13 +21,13 @@ public const val CUSTOM_SCALAR_INPUT_QUERY: String =
 
 @Generated
 public class CustomScalarInputQuery(
-  public override val variables: CustomScalarInputQuery.Variables,
+  override val variables: CustomScalarInputQuery.Variables,
 ) : GraphQLClientRequest<CustomScalarInputQuery.Result> {
-  public override val query: String = CUSTOM_SCALAR_INPUT_QUERY
+  override val query: String = CUSTOM_SCALAR_INPUT_QUERY
 
-  public override val operationName: String = "CustomScalarInputQuery"
+  override val operationName: String = "CustomScalarInputQuery"
 
-  public override fun responseType(): KClass<CustomScalarInputQuery.Result> =
+  override fun responseType(): KClass<CustomScalarInputQuery.Result> =
       CustomScalarInputQuery.Result::class
 
   @Generated
diff --git a/plugins/client/graphql-kotlin-client-generator/src/test/data/jackson/custom_scalar_input/scalars/AnyToULocaleConverter.kt b/plugins/client/graphql-kotlin-client-generator/src/test/data/jackson/custom_scalar_input/scalars/AnyToULocaleConverter.kt
index 05f424daec..562dbe7f4e 100644
--- a/plugins/client/graphql-kotlin-client-generator/src/test/data/jackson/custom_scalar_input/scalars/AnyToULocaleConverter.kt
+++ b/plugins/client/graphql-kotlin-client-generator/src/test/data/jackson/custom_scalar_input/scalars/AnyToULocaleConverter.kt
@@ -10,5 +10,5 @@ import kotlin.Any
 public class AnyToULocaleConverter : StdConverter<Any, ULocale>() {
   private val converter: ULocaleScalarConverter = ULocaleScalarConverter()
 
-  public override fun convert(`value`: Any): ULocale = converter.toScalar(value)
+  override fun convert(`value`: Any): ULocale = converter.toScalar(value)
 }
diff --git a/plugins/client/graphql-kotlin-client-generator/src/test/data/jackson/custom_scalar_input/scalars/AnyToUUIDConverter.kt b/plugins/client/graphql-kotlin-client-generator/src/test/data/jackson/custom_scalar_input/scalars/AnyToUUIDConverter.kt
index 7ef205ad78..7e36e0b97f 100644
--- a/plugins/client/graphql-kotlin-client-generator/src/test/data/jackson/custom_scalar_input/scalars/AnyToUUIDConverter.kt
+++ b/plugins/client/graphql-kotlin-client-generator/src/test/data/jackson/custom_scalar_input/scalars/AnyToUUIDConverter.kt
@@ -10,5 +10,5 @@ import kotlin.Any
 public class AnyToUUIDConverter : StdConverter<Any, UUID>() {
   private val converter: UUIDScalarConverter = UUIDScalarConverter()
 
-  public override fun convert(`value`: Any): UUID = converter.toScalar(value)
+  override fun convert(`value`: Any): UUID = converter.toScalar(value)
 }
diff --git a/plugins/client/graphql-kotlin-client-generator/src/test/data/jackson/custom_scalar_input/scalars/OptionalScalarInputSerializer.kt b/plugins/client/graphql-kotlin-client-generator/src/test/data/jackson/custom_scalar_input/scalars/OptionalScalarInputSerializer.kt
index c62cb35f9e..86346134ce 100644
--- a/plugins/client/graphql-kotlin-client-generator/src/test/data/jackson/custom_scalar_input/scalars/OptionalScalarInputSerializer.kt
+++ b/plugins/client/graphql-kotlin-client-generator/src/test/data/jackson/custom_scalar_input/scalars/OptionalScalarInputSerializer.kt
@@ -15,7 +15,6 @@ import java.lang.Class
 import java.util.UUID
 import kotlin.Any
 import kotlin.Boolean
-import kotlin.Unit
 import kotlin.collections.Map
 import kotlin.collections.mapOf
 
@@ -24,14 +23,14 @@ public class OptionalScalarInputSerializer : JsonSerializer<OptionalInput<*>>()
   private val converters: Map<Class<*>, ScalarConverter<*>> = mapOf(UUID::class.java to
       UUIDScalarConverter(), ULocale::class.java to ULocaleScalarConverter())
 
-  public override fun isEmpty(provider: SerializerProvider, `value`: OptionalInput<*>): Boolean =
-      value == OptionalInput.Undefined
+  override fun isEmpty(provider: SerializerProvider, `value`: OptionalInput<*>): Boolean = value ==
+      OptionalInput.Undefined
 
-  public override fun serialize(
+  override fun serialize(
     `value`: OptionalInput<*>,
     gen: JsonGenerator,
     serializers: SerializerProvider,
-  ): Unit {
+  ) {
     when (value) {
       is OptionalInput.Undefined -> return
       is OptionalInput.Defined -> {
@@ -55,7 +54,7 @@ public class OptionalScalarInputSerializer : JsonSerializer<OptionalInput<*>>()
     `value`: Any,
     gen: JsonGenerator,
     serializers: SerializerProvider,
-  ): Unit {
+  ) {
     val clazz = value::class.java
     val converter = converters[clazz] as? ScalarConverter<Any>
     if (converter != null) {
diff --git a/plugins/client/graphql-kotlin-client-generator/src/test/data/jackson/custom_scalar_input/scalars/ULocaleToAnyConverter.kt b/plugins/client/graphql-kotlin-client-generator/src/test/data/jackson/custom_scalar_input/scalars/ULocaleToAnyConverter.kt
index c849955da2..147744336b 100644
--- a/plugins/client/graphql-kotlin-client-generator/src/test/data/jackson/custom_scalar_input/scalars/ULocaleToAnyConverter.kt
+++ b/plugins/client/graphql-kotlin-client-generator/src/test/data/jackson/custom_scalar_input/scalars/ULocaleToAnyConverter.kt
@@ -10,5 +10,5 @@ import kotlin.Any
 public class ULocaleToAnyConverter : StdConverter<ULocale, Any>() {
   private val converter: ULocaleScalarConverter = ULocaleScalarConverter()
 
-  public override fun convert(`value`: ULocale): Any = converter.toJson(value)
+  override fun convert(`value`: ULocale): Any = converter.toJson(value)
 }
diff --git a/plugins/client/graphql-kotlin-client-generator/src/test/data/jackson/custom_scalar_input/scalars/UUIDToAnyConverter.kt b/plugins/client/graphql-kotlin-client-generator/src/test/data/jackson/custom_scalar_input/scalars/UUIDToAnyConverter.kt
index 8bacc7571d..4b907e6e4d 100644
--- a/plugins/client/graphql-kotlin-client-generator/src/test/data/jackson/custom_scalar_input/scalars/UUIDToAnyConverter.kt
+++ b/plugins/client/graphql-kotlin-client-generator/src/test/data/jackson/custom_scalar_input/scalars/UUIDToAnyConverter.kt
@@ -10,5 +10,5 @@ import kotlin.Any
 public class UUIDToAnyConverter : StdConverter<UUID, Any>() {
   private val converter: UUIDScalarConverter = UUIDScalarConverter()
 
-  public override fun convert(`value`: UUID): Any = converter.toJson(value)
+  override fun convert(`value`: UUID): Any = converter.toJson(value)
 }
diff --git a/plugins/client/graphql-kotlin-client-generator/src/test/data/jackson/custom_scalars/CustomScalarQuery.kt b/plugins/client/graphql-kotlin-client-generator/src/test/data/jackson/custom_scalars/CustomScalarQuery.kt
index cc8f0eb6de..9f4e8b17ca 100644
--- a/plugins/client/graphql-kotlin-client-generator/src/test/data/jackson/custom_scalars/CustomScalarQuery.kt
+++ b/plugins/client/graphql-kotlin-client-generator/src/test/data/jackson/custom_scalars/CustomScalarQuery.kt
@@ -11,12 +11,11 @@ public const val CUSTOM_SCALAR_QUERY: String =
 
 @Generated
 public class CustomScalarQuery : GraphQLClientRequest<CustomScalarQuery.Result> {
-  public override val query: String = CUSTOM_SCALAR_QUERY
+  override val query: String = CUSTOM_SCALAR_QUERY
 
-  public override val operationName: String = "CustomScalarQuery"
+  override val operationName: String = "CustomScalarQuery"
 
-  public override fun responseType(): KClass<CustomScalarQuery.Result> =
-      CustomScalarQuery.Result::class
+  override fun responseType(): KClass<CustomScalarQuery.Result> = CustomScalarQuery.Result::class
 
   @Generated
   public data class Result(
diff --git a/plugins/client/graphql-kotlin-client-generator/src/test/data/jackson/custom_scalars/scalars/AnyToULocaleConverter.kt b/plugins/client/graphql-kotlin-client-generator/src/test/data/jackson/custom_scalars/scalars/AnyToULocaleConverter.kt
index 05f424daec..562dbe7f4e 100644
--- a/plugins/client/graphql-kotlin-client-generator/src/test/data/jackson/custom_scalars/scalars/AnyToULocaleConverter.kt
+++ b/plugins/client/graphql-kotlin-client-generator/src/test/data/jackson/custom_scalars/scalars/AnyToULocaleConverter.kt
@@ -10,5 +10,5 @@ import kotlin.Any
 public class AnyToULocaleConverter : StdConverter<Any, ULocale>() {
   private val converter: ULocaleScalarConverter = ULocaleScalarConverter()
 
-  public override fun convert(`value`: Any): ULocale = converter.toScalar(value)
+  override fun convert(`value`: Any): ULocale = converter.toScalar(value)
 }
diff --git a/plugins/client/graphql-kotlin-client-generator/src/test/data/jackson/custom_scalars/scalars/AnyToUUIDConverter.kt b/plugins/client/graphql-kotlin-client-generator/src/test/data/jackson/custom_scalars/scalars/AnyToUUIDConverter.kt
index 7ef205ad78..7e36e0b97f 100644
--- a/plugins/client/graphql-kotlin-client-generator/src/test/data/jackson/custom_scalars/scalars/AnyToUUIDConverter.kt
+++ b/plugins/client/graphql-kotlin-client-generator/src/test/data/jackson/custom_scalars/scalars/AnyToUUIDConverter.kt
@@ -10,5 +10,5 @@ import kotlin.Any
 public class AnyToUUIDConverter : StdConverter<Any, UUID>() {
   private val converter: UUIDScalarConverter = UUIDScalarConverter()
 
-  public override fun convert(`value`: Any): UUID = converter.toScalar(value)
+  override fun convert(`value`: Any): UUID = converter.toScalar(value)
 }
diff --git a/plugins/client/graphql-kotlin-client-generator/src/test/data/jackson/custom_scalars/scalars/ULocaleToAnyConverter.kt b/plugins/client/graphql-kotlin-client-generator/src/test/data/jackson/custom_scalars/scalars/ULocaleToAnyConverter.kt
index c849955da2..147744336b 100644
--- a/plugins/client/graphql-kotlin-client-generator/src/test/data/jackson/custom_scalars/scalars/ULocaleToAnyConverter.kt
+++ b/plugins/client/graphql-kotlin-client-generator/src/test/data/jackson/custom_scalars/scalars/ULocaleToAnyConverter.kt
@@ -10,5 +10,5 @@ import kotlin.Any
 public class ULocaleToAnyConverter : StdConverter<ULocale, Any>() {
   private val converter: ULocaleScalarConverter = ULocaleScalarConverter()
 
-  public override fun convert(`value`: ULocale): Any = converter.toJson(value)
+  override fun convert(`value`: ULocale): Any = converter.toJson(value)
 }
diff --git a/plugins/client/graphql-kotlin-client-generator/src/test/data/jackson/custom_scalars/scalars/UUIDToAnyConverter.kt b/plugins/client/graphql-kotlin-client-generator/src/test/data/jackson/custom_scalars/scalars/UUIDToAnyConverter.kt
index 8bacc7571d..4b907e6e4d 100644
--- a/plugins/client/graphql-kotlin-client-generator/src/test/data/jackson/custom_scalars/scalars/UUIDToAnyConverter.kt
+++ b/plugins/client/graphql-kotlin-client-generator/src/test/data/jackson/custom_scalars/scalars/UUIDToAnyConverter.kt
@@ -10,5 +10,5 @@ import kotlin.Any
 public class UUIDToAnyConverter : StdConverter<UUID, Any>() {
   private val converter: UUIDScalarConverter = UUIDScalarConverter()
 
-  public override fun convert(`value`: UUID): Any = converter.toJson(value)
+  override fun convert(`value`: UUID): Any = converter.toJson(value)
 }
diff --git a/plugins/client/graphql-kotlin-client-generator/src/test/data/jackson/enums/EnumQuery.kt b/plugins/client/graphql-kotlin-client-generator/src/test/data/jackson/enums/EnumQuery.kt
index 9bce5058e6..bbccd9a952 100644
--- a/plugins/client/graphql-kotlin-client-generator/src/test/data/jackson/enums/EnumQuery.kt
+++ b/plugins/client/graphql-kotlin-client-generator/src/test/data/jackson/enums/EnumQuery.kt
@@ -11,11 +11,11 @@ public const val ENUM_QUERY: String = "query EnumQuery {\n  enumQuery\n  otherEn
 
 @Generated
 public class EnumQuery : GraphQLClientRequest<EnumQuery.Result> {
-  public override val query: String = ENUM_QUERY
+  override val query: String = ENUM_QUERY
 
-  public override val operationName: String = "EnumQuery"
+  override val operationName: String = "EnumQuery"
 
-  public override fun responseType(): KClass<EnumQuery.Result> = EnumQuery.Result::class
+  override fun responseType(): KClass<EnumQuery.Result> = EnumQuery.Result::class
 
   @Generated
   public data class Result(
diff --git a/plugins/client/graphql-kotlin-client-generator/src/test/data/jackson/interface/InterfaceWithInlineFragmentsQuery.kt b/plugins/client/graphql-kotlin-client-generator/src/test/data/jackson/interface/InterfaceWithInlineFragmentsQuery.kt
index 3f9643f57d..2edd92213b 100644
--- a/plugins/client/graphql-kotlin-client-generator/src/test/data/jackson/interface/InterfaceWithInlineFragmentsQuery.kt
+++ b/plugins/client/graphql-kotlin-client-generator/src/test/data/jackson/interface/InterfaceWithInlineFragmentsQuery.kt
@@ -12,11 +12,11 @@ public const val INTERFACE_WITH_INLINE_FRAGMENTS_QUERY: String =
 @Generated
 public class InterfaceWithInlineFragmentsQuery :
     GraphQLClientRequest<InterfaceWithInlineFragmentsQuery.Result> {
-  public override val query: String = INTERFACE_WITH_INLINE_FRAGMENTS_QUERY
+  override val query: String = INTERFACE_WITH_INLINE_FRAGMENTS_QUERY
 
-  public override val operationName: String = "InterfaceWithInlineFragmentsQuery"
+  override val operationName: String = "InterfaceWithInlineFragmentsQuery"
 
-  public override fun responseType(): KClass<InterfaceWithInlineFragmentsQuery.Result> =
+  override fun responseType(): KClass<InterfaceWithInlineFragmentsQuery.Result> =
       InterfaceWithInlineFragmentsQuery.Result::class
 
   @Generated
diff --git a/plugins/client/graphql-kotlin-client-generator/src/test/data/jackson/interface/interfacewithinlinefragmentsquery/BasicInterface.kt b/plugins/client/graphql-kotlin-client-generator/src/test/data/jackson/interface/interfacewithinlinefragmentsquery/BasicInterface.kt
index c9ed54cc8c..1ef2044fd4 100644
--- a/plugins/client/graphql-kotlin-client-generator/src/test/data/jackson/interface/interfacewithinlinefragmentsquery/BasicInterface.kt
+++ b/plugins/client/graphql-kotlin-client-generator/src/test/data/jackson/interface/interfacewithinlinefragmentsquery/BasicInterface.kt
@@ -43,11 +43,11 @@ public data class FirstInterfaceImplementation(
   /**
    * Unique identifier of the first implementation
    */
-  public override val id: Int,
+  override val id: Int,
   /**
    * Name of the first implementation
    */
-  public override val name: String,
+  override val name: String,
   /**
    * Custom field integer value
    */
@@ -62,11 +62,11 @@ public data class SecondInterfaceImplementation(
   /**
    * Unique identifier of the second implementation
    */
-  public override val id: Int,
+  override val id: Int,
   /**
    * Name of the second implementation
    */
-  public override val name: String,
+  override val name: String,
   /**
    * Custom field float value
    */
@@ -82,9 +82,9 @@ public data class DefaultBasicInterfaceImplementation(
   /**
    * Unique identifier of an interface
    */
-  public override val id: Int,
+  override val id: Int,
   /**
    * Name field
    */
-  public override val name: String,
+  override val name: String,
 ) : BasicInterface
diff --git a/plugins/client/graphql-kotlin-client-generator/src/test/data/jackson/object/ComplexObjectQuery.kt b/plugins/client/graphql-kotlin-client-generator/src/test/data/jackson/object/ComplexObjectQuery.kt
index b9ec0c456a..40cc814893 100644
--- a/plugins/client/graphql-kotlin-client-generator/src/test/data/jackson/object/ComplexObjectQuery.kt
+++ b/plugins/client/graphql-kotlin-client-generator/src/test/data/jackson/object/ComplexObjectQuery.kt
@@ -11,12 +11,11 @@ public const val COMPLEX_OBJECT_QUERY: String =
 
 @Generated
 public class ComplexObjectQuery : GraphQLClientRequest<ComplexObjectQuery.Result> {
-  public override val query: String = COMPLEX_OBJECT_QUERY
+  override val query: String = COMPLEX_OBJECT_QUERY
 
-  public override val operationName: String = "ComplexObjectQuery"
+  override val operationName: String = "ComplexObjectQuery"
 
-  public override fun responseType(): KClass<ComplexObjectQuery.Result> =
-      ComplexObjectQuery.Result::class
+  override fun responseType(): KClass<ComplexObjectQuery.Result> = ComplexObjectQuery.Result::class
 
   @Generated
   public data class Result(
diff --git a/plugins/client/graphql-kotlin-client-generator/src/test/data/jackson/union/UnionQueryWithInlineFragments.kt b/plugins/client/graphql-kotlin-client-generator/src/test/data/jackson/union/UnionQueryWithInlineFragments.kt
index fd25fc8cee..7256c1f66f 100644
--- a/plugins/client/graphql-kotlin-client-generator/src/test/data/jackson/union/UnionQueryWithInlineFragments.kt
+++ b/plugins/client/graphql-kotlin-client-generator/src/test/data/jackson/union/UnionQueryWithInlineFragments.kt
@@ -12,11 +12,11 @@ public const val UNION_QUERY_WITH_INLINE_FRAGMENTS: String =
 @Generated
 public class UnionQueryWithInlineFragments :
     GraphQLClientRequest<UnionQueryWithInlineFragments.Result> {
-  public override val query: String = UNION_QUERY_WITH_INLINE_FRAGMENTS
+  override val query: String = UNION_QUERY_WITH_INLINE_FRAGMENTS
 
-  public override val operationName: String = "UnionQueryWithInlineFragments"
+  override val operationName: String = "UnionQueryWithInlineFragments"
 
-  public override fun responseType(): KClass<UnionQueryWithInlineFragments.Result> =
+  override fun responseType(): KClass<UnionQueryWithInlineFragments.Result> =
       UnionQueryWithInlineFragments.Result::class
 
   @Generated
diff --git a/plugins/client/graphql-kotlin-client-generator/src/test/data/jackson/variables/JacksonInputQuery.kt b/plugins/client/graphql-kotlin-client-generator/src/test/data/jackson/variables/JacksonInputQuery.kt
index b117f83320..96f2cb441c 100644
--- a/plugins/client/graphql-kotlin-client-generator/src/test/data/jackson/variables/JacksonInputQuery.kt
+++ b/plugins/client/graphql-kotlin-client-generator/src/test/data/jackson/variables/JacksonInputQuery.kt
@@ -15,14 +15,13 @@ public const val JACKSON_INPUT_QUERY: String =
 
 @Generated
 public class JacksonInputQuery(
-  public override val variables: JacksonInputQuery.Variables,
+  override val variables: JacksonInputQuery.Variables,
 ) : GraphQLClientRequest<JacksonInputQuery.Result> {
-  public override val query: String = JACKSON_INPUT_QUERY
+  override val query: String = JACKSON_INPUT_QUERY
 
-  public override val operationName: String = "JacksonInputQuery"
+  override val operationName: String = "JacksonInputQuery"
 
-  public override fun responseType(): KClass<JacksonInputQuery.Result> =
-      JacksonInputQuery.Result::class
+  override fun responseType(): KClass<JacksonInputQuery.Result> = JacksonInputQuery.Result::class
 
   @Generated
   public data class Variables(
diff --git a/plugins/client/graphql-kotlin-client-generator/src/test/data/kotlinx/custom_scalar_input/CustomScalarInputQuery.kt b/plugins/client/graphql-kotlin-client-generator/src/test/data/kotlinx/custom_scalar_input/CustomScalarInputQuery.kt
index 546775eb23..5d9b87a299 100644
--- a/plugins/client/graphql-kotlin-client-generator/src/test/data/kotlinx/custom_scalar_input/CustomScalarInputQuery.kt
+++ b/plugins/client/graphql-kotlin-client-generator/src/test/data/kotlinx/custom_scalar_input/CustomScalarInputQuery.kt
@@ -21,15 +21,15 @@ public const val CUSTOM_SCALAR_INPUT_QUERY: String =
 @Generated
 @Serializable
 public class CustomScalarInputQuery(
-  public override val variables: CustomScalarInputQuery.Variables,
+  override val variables: CustomScalarInputQuery.Variables,
 ) : GraphQLClientRequest<CustomScalarInputQuery.Result> {
   @Required
-  public override val query: String = CUSTOM_SCALAR_INPUT_QUERY
+  override val query: String = CUSTOM_SCALAR_INPUT_QUERY
 
   @Required
-  public override val operationName: String = "CustomScalarInputQuery"
+  override val operationName: String = "CustomScalarInputQuery"
 
-  public override fun responseType(): KClass<CustomScalarInputQuery.Result> =
+  override fun responseType(): KClass<CustomScalarInputQuery.Result> =
       CustomScalarInputQuery.Result::class
 
   @Generated
diff --git a/plugins/client/graphql-kotlin-client-generator/src/test/data/kotlinx/custom_scalar_input/scalars/OptionalScalarWrapperInputSerializer.kt b/plugins/client/graphql-kotlin-client-generator/src/test/data/kotlinx/custom_scalar_input/scalars/OptionalScalarWrapperInputSerializer.kt
index 334184be52..872c6c2334 100644
--- a/plugins/client/graphql-kotlin-client-generator/src/test/data/kotlinx/custom_scalar_input/scalars/OptionalScalarWrapperInputSerializer.kt
+++ b/plugins/client/graphql-kotlin-client-generator/src/test/data/kotlinx/custom_scalar_input/scalars/OptionalScalarWrapperInputSerializer.kt
@@ -5,7 +5,6 @@ import com.expediagroup.graphql.client.serialization.types.OptionalInput
 import com.expediagroup.graphql.client.serialization.types.OptionalInput.Defined
 import com.expediagroup.graphql.client.serialization.types.OptionalInput.Undefined
 import com.expediagroup.graphql.generated.inputs.ScalarWrapperInput
-import kotlin.Unit
 import kotlinx.serialization.KSerializer
 import kotlinx.serialization.builtins.nullable
 import kotlinx.serialization.descriptors.SerialDescriptor
@@ -18,11 +17,10 @@ public object OptionalScalarWrapperInputSerializer : KSerializer<OptionalInput<S
     {
   private val `delegate`: KSerializer<ScalarWrapperInput> = ScalarWrapperInput.serializer()
 
-  public override val descriptor: SerialDescriptor =
+  override val descriptor: SerialDescriptor =
       buildClassSerialDescriptor("OptionalScalarWrapperInputSerializer")
 
-  public override fun serialize(encoder: Encoder, `value`: OptionalInput<ScalarWrapperInput>):
-      Unit {
+  override fun serialize(encoder: Encoder, `value`: OptionalInput<ScalarWrapperInput>) {
     when (value) {
       is OptionalInput.Undefined -> return
       is OptionalInput.Defined<ScalarWrapperInput> ->
@@ -33,6 +31,6 @@ public object OptionalScalarWrapperInputSerializer : KSerializer<OptionalInput<S
   /**
    * undefined is only supported during client serialization, this code should never be invoked
    */
-  public override fun deserialize(decoder: Decoder): OptionalInput<ScalarWrapperInput> =
+  override fun deserialize(decoder: Decoder): OptionalInput<ScalarWrapperInput> =
       OptionalInput.Defined(decoder.decodeNullableSerializableValue(delegate.nullable))
 }
diff --git a/plugins/client/graphql-kotlin-client-generator/src/test/data/kotlinx/custom_scalar_input/scalars/OptionalULocaleSerializer.kt b/plugins/client/graphql-kotlin-client-generator/src/test/data/kotlinx/custom_scalar_input/scalars/OptionalULocaleSerializer.kt
index 7b6d18d38c..f151943616 100644
--- a/plugins/client/graphql-kotlin-client-generator/src/test/data/kotlinx/custom_scalar_input/scalars/OptionalULocaleSerializer.kt
+++ b/plugins/client/graphql-kotlin-client-generator/src/test/data/kotlinx/custom_scalar_input/scalars/OptionalULocaleSerializer.kt
@@ -5,7 +5,6 @@ import com.expediagroup.graphql.client.serialization.types.OptionalInput
 import com.expediagroup.graphql.client.serialization.types.OptionalInput.Defined
 import com.expediagroup.graphql.client.serialization.types.OptionalInput.Undefined
 import com.ibm.icu.util.ULocale
-import kotlin.Unit
 import kotlinx.serialization.KSerializer
 import kotlinx.serialization.builtins.nullable
 import kotlinx.serialization.descriptors.SerialDescriptor
@@ -17,10 +16,10 @@ import kotlinx.serialization.encoding.Encoder
 public object OptionalULocaleSerializer : KSerializer<OptionalInput<ULocale>> {
   private val `delegate`: KSerializer<ULocale> = ULocaleSerializer
 
-  public override val descriptor: SerialDescriptor =
+  override val descriptor: SerialDescriptor =
       buildClassSerialDescriptor("OptionalULocaleSerializer")
 
-  public override fun serialize(encoder: Encoder, `value`: OptionalInput<ULocale>): Unit {
+  override fun serialize(encoder: Encoder, `value`: OptionalInput<ULocale>) {
     when (value) {
       is OptionalInput.Undefined -> return
       is OptionalInput.Defined<ULocale> ->
@@ -31,6 +30,6 @@ public object OptionalULocaleSerializer : KSerializer<OptionalInput<ULocale>> {
   /**
    * undefined is only supported during client serialization, this code should never be invoked
    */
-  public override fun deserialize(decoder: Decoder): OptionalInput<ULocale> =
+  override fun deserialize(decoder: Decoder): OptionalInput<ULocale> =
       OptionalInput.Defined(decoder.decodeNullableSerializableValue(delegate.nullable))
 }
diff --git a/plugins/client/graphql-kotlin-client-generator/src/test/data/kotlinx/custom_scalar_input/scalars/OptionalUUIDListSerializer.kt b/plugins/client/graphql-kotlin-client-generator/src/test/data/kotlinx/custom_scalar_input/scalars/OptionalUUIDListSerializer.kt
index 72bf99dffc..df312353f8 100644
--- a/plugins/client/graphql-kotlin-client-generator/src/test/data/kotlinx/custom_scalar_input/scalars/OptionalUUIDListSerializer.kt
+++ b/plugins/client/graphql-kotlin-client-generator/src/test/data/kotlinx/custom_scalar_input/scalars/OptionalUUIDListSerializer.kt
@@ -5,7 +5,6 @@ import com.expediagroup.graphql.client.serialization.types.OptionalInput
 import com.expediagroup.graphql.client.serialization.types.OptionalInput.Defined
 import com.expediagroup.graphql.client.serialization.types.OptionalInput.Undefined
 import java.util.UUID
-import kotlin.Unit
 import kotlin.collections.List
 import kotlinx.serialization.KSerializer
 import kotlinx.serialization.builtins.ListSerializer
@@ -19,10 +18,10 @@ import kotlinx.serialization.encoding.Encoder
 public object OptionalUUIDListSerializer : KSerializer<OptionalInput<List<UUID>>> {
   private val `delegate`: KSerializer<List<UUID>> = ListSerializer(UUIDSerializer)
 
-  public override val descriptor: SerialDescriptor =
+  override val descriptor: SerialDescriptor =
       buildClassSerialDescriptor("OptionalUUIDListSerializer")
 
-  public override fun serialize(encoder: Encoder, `value`: OptionalInput<List<UUID>>): Unit {
+  override fun serialize(encoder: Encoder, `value`: OptionalInput<List<UUID>>) {
     when (value) {
       is OptionalInput.Undefined -> return
       is OptionalInput.Defined<List<UUID>> ->
@@ -33,6 +32,6 @@ public object OptionalUUIDListSerializer : KSerializer<OptionalInput<List<UUID>>
   /**
    * undefined is only supported during client serialization, this code should never be invoked
    */
-  public override fun deserialize(decoder: Decoder): OptionalInput<List<UUID>> =
+  override fun deserialize(decoder: Decoder): OptionalInput<List<UUID>> =
       OptionalInput.Defined(decoder.decodeNullableSerializableValue(delegate.nullable))
 }
diff --git a/plugins/client/graphql-kotlin-client-generator/src/test/data/kotlinx/custom_scalar_input/scalars/OptionalUUIDSerializer.kt b/plugins/client/graphql-kotlin-client-generator/src/test/data/kotlinx/custom_scalar_input/scalars/OptionalUUIDSerializer.kt
index 9b602b9b6f..3723db9fc4 100644
--- a/plugins/client/graphql-kotlin-client-generator/src/test/data/kotlinx/custom_scalar_input/scalars/OptionalUUIDSerializer.kt
+++ b/plugins/client/graphql-kotlin-client-generator/src/test/data/kotlinx/custom_scalar_input/scalars/OptionalUUIDSerializer.kt
@@ -5,7 +5,6 @@ import com.expediagroup.graphql.client.serialization.types.OptionalInput
 import com.expediagroup.graphql.client.serialization.types.OptionalInput.Defined
 import com.expediagroup.graphql.client.serialization.types.OptionalInput.Undefined
 import java.util.UUID
-import kotlin.Unit
 import kotlinx.serialization.KSerializer
 import kotlinx.serialization.builtins.nullable
 import kotlinx.serialization.descriptors.SerialDescriptor
@@ -17,10 +16,9 @@ import kotlinx.serialization.encoding.Encoder
 public object OptionalUUIDSerializer : KSerializer<OptionalInput<UUID>> {
   private val `delegate`: KSerializer<UUID> = UUIDSerializer
 
-  public override val descriptor: SerialDescriptor =
-      buildClassSerialDescriptor("OptionalUUIDSerializer")
+  override val descriptor: SerialDescriptor = buildClassSerialDescriptor("OptionalUUIDSerializer")
 
-  public override fun serialize(encoder: Encoder, `value`: OptionalInput<UUID>): Unit {
+  override fun serialize(encoder: Encoder, `value`: OptionalInput<UUID>) {
     when (value) {
       is OptionalInput.Undefined -> return
       is OptionalInput.Defined<UUID> ->
@@ -31,6 +29,6 @@ public object OptionalUUIDSerializer : KSerializer<OptionalInput<UUID>> {
   /**
    * undefined is only supported during client serialization, this code should never be invoked
    */
-  public override fun deserialize(decoder: Decoder): OptionalInput<UUID> =
+  override fun deserialize(decoder: Decoder): OptionalInput<UUID> =
       OptionalInput.Defined(decoder.decodeNullableSerializableValue(delegate.nullable))
 }
diff --git a/plugins/client/graphql-kotlin-client-generator/src/test/data/kotlinx/custom_scalar_input/scalars/ULocaleSerializer.kt b/plugins/client/graphql-kotlin-client-generator/src/test/data/kotlinx/custom_scalar_input/scalars/ULocaleSerializer.kt
index ed0ae4034f..e40b3a5eec 100644
--- a/plugins/client/graphql-kotlin-client-generator/src/test/data/kotlinx/custom_scalar_input/scalars/ULocaleSerializer.kt
+++ b/plugins/client/graphql-kotlin-client-generator/src/test/data/kotlinx/custom_scalar_input/scalars/ULocaleSerializer.kt
@@ -3,7 +3,6 @@ package com.expediagroup.graphql.generated.scalars
 import com.expediagroup.graphql.client.Generated
 import com.expediagroup.graphql.plugin.client.generator.ULocaleScalarConverter
 import com.ibm.icu.util.ULocale
-import kotlin.Unit
 import kotlinx.serialization.KSerializer
 import kotlinx.serialization.descriptors.SerialDescriptor
 import kotlinx.serialization.descriptors.buildClassSerialDescriptor
@@ -18,9 +17,9 @@ import kotlinx.serialization.serializerOrNull
 public object ULocaleSerializer : KSerializer<ULocale> {
   private val converter: ULocaleScalarConverter = ULocaleScalarConverter()
 
-  public override val descriptor: SerialDescriptor = buildClassSerialDescriptor("ULocale")
+  override val descriptor: SerialDescriptor = buildClassSerialDescriptor("ULocale")
 
-  public override fun serialize(encoder: Encoder, `value`: ULocale): Unit {
+  override fun serialize(encoder: Encoder, `value`: ULocale) {
     val encoded = converter.toJson(value)
     val serializer = serializerOrNull(encoded::class.java)
     if (serializer != null) {
@@ -30,7 +29,7 @@ public object ULocaleSerializer : KSerializer<ULocale> {
     }
   }
 
-  public override fun deserialize(decoder: Decoder): ULocale {
+  override fun deserialize(decoder: Decoder): ULocale {
     val jsonDecoder = decoder as JsonDecoder
     val rawContent: Any = when (val element = jsonDecoder.decodeJsonElement()) {
       is JsonPrimitive -> element.jsonPrimitive.content
diff --git a/plugins/client/graphql-kotlin-client-generator/src/test/data/kotlinx/custom_scalar_input/scalars/UUIDSerializer.kt b/plugins/client/graphql-kotlin-client-generator/src/test/data/kotlinx/custom_scalar_input/scalars/UUIDSerializer.kt
index 832753647c..9cae6098b8 100644
--- a/plugins/client/graphql-kotlin-client-generator/src/test/data/kotlinx/custom_scalar_input/scalars/UUIDSerializer.kt
+++ b/plugins/client/graphql-kotlin-client-generator/src/test/data/kotlinx/custom_scalar_input/scalars/UUIDSerializer.kt
@@ -3,7 +3,6 @@ package com.expediagroup.graphql.generated.scalars
 import com.expediagroup.graphql.client.Generated
 import com.expediagroup.graphql.plugin.client.generator.UUIDScalarConverter
 import java.util.UUID
-import kotlin.Unit
 import kotlinx.serialization.KSerializer
 import kotlinx.serialization.descriptors.SerialDescriptor
 import kotlinx.serialization.descriptors.buildClassSerialDescriptor
@@ -18,9 +17,9 @@ import kotlinx.serialization.serializerOrNull
 public object UUIDSerializer : KSerializer<UUID> {
   private val converter: UUIDScalarConverter = UUIDScalarConverter()
 
-  public override val descriptor: SerialDescriptor = buildClassSerialDescriptor("UUID")
+  override val descriptor: SerialDescriptor = buildClassSerialDescriptor("UUID")
 
-  public override fun serialize(encoder: Encoder, `value`: UUID): Unit {
+  override fun serialize(encoder: Encoder, `value`: UUID) {
     val encoded = converter.toJson(value)
     val serializer = serializerOrNull(encoded::class.java)
     if (serializer != null) {
@@ -30,7 +29,7 @@ public object UUIDSerializer : KSerializer<UUID> {
     }
   }
 
-  public override fun deserialize(decoder: Decoder): UUID {
+  override fun deserialize(decoder: Decoder): UUID {
     val jsonDecoder = decoder as JsonDecoder
     val rawContent: Any = when (val element = jsonDecoder.decodeJsonElement()) {
       is JsonPrimitive -> element.jsonPrimitive.content
diff --git a/plugins/client/graphql-kotlin-client-generator/src/test/data/kotlinx/custom_scalars/CustomScalarQuery.kt b/plugins/client/graphql-kotlin-client-generator/src/test/data/kotlinx/custom_scalars/CustomScalarQuery.kt
index 022e684e43..eae8fa65d6 100644
--- a/plugins/client/graphql-kotlin-client-generator/src/test/data/kotlinx/custom_scalars/CustomScalarQuery.kt
+++ b/plugins/client/graphql-kotlin-client-generator/src/test/data/kotlinx/custom_scalars/CustomScalarQuery.kt
@@ -15,13 +15,12 @@ public const val CUSTOM_SCALAR_QUERY: String =
 @Serializable
 public class CustomScalarQuery : GraphQLClientRequest<CustomScalarQuery.Result> {
   @Required
-  public override val query: String = CUSTOM_SCALAR_QUERY
+  override val query: String = CUSTOM_SCALAR_QUERY
 
   @Required
-  public override val operationName: String = "CustomScalarQuery"
+  override val operationName: String = "CustomScalarQuery"
 
-  public override fun responseType(): KClass<CustomScalarQuery.Result> =
-      CustomScalarQuery.Result::class
+  override fun responseType(): KClass<CustomScalarQuery.Result> = CustomScalarQuery.Result::class
 
   @Generated
   @Serializable
diff --git a/plugins/client/graphql-kotlin-client-generator/src/test/data/kotlinx/custom_scalars/scalars/ULocaleSerializer.kt b/plugins/client/graphql-kotlin-client-generator/src/test/data/kotlinx/custom_scalars/scalars/ULocaleSerializer.kt
index ed0ae4034f..e40b3a5eec 100644
--- a/plugins/client/graphql-kotlin-client-generator/src/test/data/kotlinx/custom_scalars/scalars/ULocaleSerializer.kt
+++ b/plugins/client/graphql-kotlin-client-generator/src/test/data/kotlinx/custom_scalars/scalars/ULocaleSerializer.kt
@@ -3,7 +3,6 @@ package com.expediagroup.graphql.generated.scalars
 import com.expediagroup.graphql.client.Generated
 import com.expediagroup.graphql.plugin.client.generator.ULocaleScalarConverter
 import com.ibm.icu.util.ULocale
-import kotlin.Unit
 import kotlinx.serialization.KSerializer
 import kotlinx.serialization.descriptors.SerialDescriptor
 import kotlinx.serialization.descriptors.buildClassSerialDescriptor
@@ -18,9 +17,9 @@ import kotlinx.serialization.serializerOrNull
 public object ULocaleSerializer : KSerializer<ULocale> {
   private val converter: ULocaleScalarConverter = ULocaleScalarConverter()
 
-  public override val descriptor: SerialDescriptor = buildClassSerialDescriptor("ULocale")
+  override val descriptor: SerialDescriptor = buildClassSerialDescriptor("ULocale")
 
-  public override fun serialize(encoder: Encoder, `value`: ULocale): Unit {
+  override fun serialize(encoder: Encoder, `value`: ULocale) {
     val encoded = converter.toJson(value)
     val serializer = serializerOrNull(encoded::class.java)
     if (serializer != null) {
@@ -30,7 +29,7 @@ public object ULocaleSerializer : KSerializer<ULocale> {
     }
   }
 
-  public override fun deserialize(decoder: Decoder): ULocale {
+  override fun deserialize(decoder: Decoder): ULocale {
     val jsonDecoder = decoder as JsonDecoder
     val rawContent: Any = when (val element = jsonDecoder.decodeJsonElement()) {
       is JsonPrimitive -> element.jsonPrimitive.content
diff --git a/plugins/client/graphql-kotlin-client-generator/src/test/data/kotlinx/custom_scalars/scalars/UUIDSerializer.kt b/plugins/client/graphql-kotlin-client-generator/src/test/data/kotlinx/custom_scalars/scalars/UUIDSerializer.kt
index 832753647c..9cae6098b8 100644
--- a/plugins/client/graphql-kotlin-client-generator/src/test/data/kotlinx/custom_scalars/scalars/UUIDSerializer.kt
+++ b/plugins/client/graphql-kotlin-client-generator/src/test/data/kotlinx/custom_scalars/scalars/UUIDSerializer.kt
@@ -3,7 +3,6 @@ package com.expediagroup.graphql.generated.scalars
 import com.expediagroup.graphql.client.Generated
 import com.expediagroup.graphql.plugin.client.generator.UUIDScalarConverter
 import java.util.UUID
-import kotlin.Unit
 import kotlinx.serialization.KSerializer
 import kotlinx.serialization.descriptors.SerialDescriptor
 import kotlinx.serialization.descriptors.buildClassSerialDescriptor
@@ -18,9 +17,9 @@ import kotlinx.serialization.serializerOrNull
 public object UUIDSerializer : KSerializer<UUID> {
   private val converter: UUIDScalarConverter = UUIDScalarConverter()
 
-  public override val descriptor: SerialDescriptor = buildClassSerialDescriptor("UUID")
+  override val descriptor: SerialDescriptor = buildClassSerialDescriptor("UUID")
 
-  public override fun serialize(encoder: Encoder, `value`: UUID): Unit {
+  override fun serialize(encoder: Encoder, `value`: UUID) {
     val encoded = converter.toJson(value)
     val serializer = serializerOrNull(encoded::class.java)
     if (serializer != null) {
@@ -30,7 +29,7 @@ public object UUIDSerializer : KSerializer<UUID> {
     }
   }
 
-  public override fun deserialize(decoder: Decoder): UUID {
+  override fun deserialize(decoder: Decoder): UUID {
     val jsonDecoder = decoder as JsonDecoder
     val rawContent: Any = when (val element = jsonDecoder.decodeJsonElement()) {
       is JsonPrimitive -> element.jsonPrimitive.content
diff --git a/plugins/client/graphql-kotlin-client-generator/src/test/data/kotlinx/deprecated_opt_in/DeprecatedOptInQuery.kt b/plugins/client/graphql-kotlin-client-generator/src/test/data/kotlinx/deprecated_opt_in/DeprecatedOptInQuery.kt
index 4246b1a00b..ac6676b03b 100644
--- a/plugins/client/graphql-kotlin-client-generator/src/test/data/kotlinx/deprecated_opt_in/DeprecatedOptInQuery.kt
+++ b/plugins/client/graphql-kotlin-client-generator/src/test/data/kotlinx/deprecated_opt_in/DeprecatedOptInQuery.kt
@@ -15,12 +15,12 @@ public const val DEPRECATED_OPT_IN_QUERY: String =
 @Serializable
 public class DeprecatedOptInQuery : GraphQLClientRequest<DeprecatedOptInQuery.Result> {
   @Required
-  public override val query: String = DEPRECATED_OPT_IN_QUERY
+  override val query: String = DEPRECATED_OPT_IN_QUERY
 
   @Required
-  public override val operationName: String = "DeprecatedOptInQuery"
+  override val operationName: String = "DeprecatedOptInQuery"
 
-  public override fun responseType(): KClass<DeprecatedOptInQuery.Result> =
+  override fun responseType(): KClass<DeprecatedOptInQuery.Result> =
       DeprecatedOptInQuery.Result::class
 
   @Generated
diff --git a/plugins/client/graphql-kotlin-client-generator/src/test/data/kotlinx/enums/EnumQuery.kt b/plugins/client/graphql-kotlin-client-generator/src/test/data/kotlinx/enums/EnumQuery.kt
index 0df040be0d..7600677bd7 100644
--- a/plugins/client/graphql-kotlin-client-generator/src/test/data/kotlinx/enums/EnumQuery.kt
+++ b/plugins/client/graphql-kotlin-client-generator/src/test/data/kotlinx/enums/EnumQuery.kt
@@ -15,12 +15,12 @@ public const val ENUM_QUERY: String = "query EnumQuery {\n  enumQuery\n  otherEn
 @Serializable
 public class EnumQuery : GraphQLClientRequest<EnumQuery.Result> {
   @Required
-  public override val query: String = ENUM_QUERY
+  override val query: String = ENUM_QUERY
 
   @Required
-  public override val operationName: String = "EnumQuery"
+  override val operationName: String = "EnumQuery"
 
-  public override fun responseType(): KClass<EnumQuery.Result> = EnumQuery.Result::class
+  override fun responseType(): KClass<EnumQuery.Result> = EnumQuery.Result::class
 
   @Generated
   @Serializable
diff --git a/plugins/client/graphql-kotlin-client-generator/src/test/data/kotlinx/interface/InterfaceWithInlineFragmentsQuery.kt b/plugins/client/graphql-kotlin-client-generator/src/test/data/kotlinx/interface/InterfaceWithInlineFragmentsQuery.kt
index 1ce1c8d1ce..03d0f8021a 100644
--- a/plugins/client/graphql-kotlin-client-generator/src/test/data/kotlinx/interface/InterfaceWithInlineFragmentsQuery.kt
+++ b/plugins/client/graphql-kotlin-client-generator/src/test/data/kotlinx/interface/InterfaceWithInlineFragmentsQuery.kt
@@ -16,12 +16,12 @@ public const val INTERFACE_WITH_INLINE_FRAGMENTS_QUERY: String =
 public class InterfaceWithInlineFragmentsQuery :
     GraphQLClientRequest<InterfaceWithInlineFragmentsQuery.Result> {
   @Required
-  public override val query: String = INTERFACE_WITH_INLINE_FRAGMENTS_QUERY
+  override val query: String = INTERFACE_WITH_INLINE_FRAGMENTS_QUERY
 
   @Required
-  public override val operationName: String = "InterfaceWithInlineFragmentsQuery"
+  override val operationName: String = "InterfaceWithInlineFragmentsQuery"
 
-  public override fun responseType(): KClass<InterfaceWithInlineFragmentsQuery.Result> =
+  override fun responseType(): KClass<InterfaceWithInlineFragmentsQuery.Result> =
       InterfaceWithInlineFragmentsQuery.Result::class
 
   @Generated
diff --git a/plugins/client/graphql-kotlin-client-generator/src/test/data/kotlinx/interface/interfacewithinlinefragmentsquery/BasicInterface.kt b/plugins/client/graphql-kotlin-client-generator/src/test/data/kotlinx/interface/interfacewithinlinefragmentsquery/BasicInterface.kt
index fa53e01475..e81272a797 100644
--- a/plugins/client/graphql-kotlin-client-generator/src/test/data/kotlinx/interface/interfacewithinlinefragmentsquery/BasicInterface.kt
+++ b/plugins/client/graphql-kotlin-client-generator/src/test/data/kotlinx/interface/interfacewithinlinefragmentsquery/BasicInterface.kt
@@ -34,11 +34,11 @@ public data class FirstInterfaceImplementation(
   /**
    * Unique identifier of the first implementation
    */
-  public override val id: Int,
+  override val id: Int,
   /**
    * Name of the first implementation
    */
-  public override val name: String,
+  override val name: String,
   /**
    * Custom field integer value
    */
@@ -55,11 +55,11 @@ public data class SecondInterfaceImplementation(
   /**
    * Unique identifier of the second implementation
    */
-  public override val id: Int,
+  override val id: Int,
   /**
    * Name of the second implementation
    */
-  public override val name: String,
+  override val name: String,
   /**
    * Custom field float value
    */
@@ -79,9 +79,9 @@ public data class DefaultBasicInterfaceImplementation(
   /**
    * Unique identifier of an interface
    */
-  public override val id: Int,
+  override val id: Int,
   /**
    * Name field
    */
-  public override val name: String,
+  override val name: String,
 ) : BasicInterface()
diff --git a/plugins/client/graphql-kotlin-client-generator/src/test/data/kotlinx/multiple_queries/FirstQuery.kt b/plugins/client/graphql-kotlin-client-generator/src/test/data/kotlinx/multiple_queries/FirstQuery.kt
index 22445e5940..3de7a7f144 100644
--- a/plugins/client/graphql-kotlin-client-generator/src/test/data/kotlinx/multiple_queries/FirstQuery.kt
+++ b/plugins/client/graphql-kotlin-client-generator/src/test/data/kotlinx/multiple_queries/FirstQuery.kt
@@ -22,15 +22,15 @@ public const val FIRST_QUERY: String =
 @Generated
 @Serializable
 public class FirstQuery(
-  public override val variables: FirstQuery.Variables,
+  override val variables: FirstQuery.Variables,
 ) : GraphQLClientRequest<FirstQuery.Result> {
   @Required
-  public override val query: String = FIRST_QUERY
+  override val query: String = FIRST_QUERY
 
   @Required
-  public override val operationName: String = "FirstQuery"
+  override val operationName: String = "FirstQuery"
 
-  public override fun responseType(): KClass<FirstQuery.Result> = FirstQuery.Result::class
+  override fun responseType(): KClass<FirstQuery.Result> = FirstQuery.Result::class
 
   @Generated
   @Serializable
diff --git a/plugins/client/graphql-kotlin-client-generator/src/test/data/kotlinx/multiple_queries/SecondQuery.kt b/plugins/client/graphql-kotlin-client-generator/src/test/data/kotlinx/multiple_queries/SecondQuery.kt
index 0deb20b01c..aab32e9913 100644
--- a/plugins/client/graphql-kotlin-client-generator/src/test/data/kotlinx/multiple_queries/SecondQuery.kt
+++ b/plugins/client/graphql-kotlin-client-generator/src/test/data/kotlinx/multiple_queries/SecondQuery.kt
@@ -22,15 +22,15 @@ public const val SECOND_QUERY: String =
 @Generated
 @Serializable
 public class SecondQuery(
-  public override val variables: SecondQuery.Variables,
+  override val variables: SecondQuery.Variables,
 ) : GraphQLClientRequest<SecondQuery.Result> {
   @Required
-  public override val query: String = SECOND_QUERY
+  override val query: String = SECOND_QUERY
 
   @Required
-  public override val operationName: String = "SecondQuery"
+  override val operationName: String = "SecondQuery"
 
-  public override fun responseType(): KClass<SecondQuery.Result> = SecondQuery.Result::class
+  override fun responseType(): KClass<SecondQuery.Result> = SecondQuery.Result::class
 
   @Generated
   @Serializable
diff --git a/plugins/client/graphql-kotlin-client-generator/src/test/data/kotlinx/multiple_queries/firstquery/BasicInterface.kt b/plugins/client/graphql-kotlin-client-generator/src/test/data/kotlinx/multiple_queries/firstquery/BasicInterface.kt
index 1f5b1a8d34..39cc910242 100644
--- a/plugins/client/graphql-kotlin-client-generator/src/test/data/kotlinx/multiple_queries/firstquery/BasicInterface.kt
+++ b/plugins/client/graphql-kotlin-client-generator/src/test/data/kotlinx/multiple_queries/firstquery/BasicInterface.kt
@@ -34,11 +34,11 @@ public data class FirstInterfaceImplementation(
   /**
    * Unique identifier of the first implementation
    */
-  public override val id: Int,
+  override val id: Int,
   /**
    * Name of the first implementation
    */
-  public override val name: String,
+  override val name: String,
   /**
    * Custom field integer value
    */
@@ -55,11 +55,11 @@ public data class SecondInterfaceImplementation(
   /**
    * Unique identifier of the second implementation
    */
-  public override val id: Int,
+  override val id: Int,
   /**
    * Name of the second implementation
    */
-  public override val name: String,
+  override val name: String,
   /**
    * Custom field float value
    */
@@ -79,9 +79,9 @@ public data class DefaultBasicInterfaceImplementation(
   /**
    * Unique identifier of an interface
    */
-  public override val id: Int,
+  override val id: Int,
   /**
    * Name field
    */
-  public override val name: String,
+  override val name: String,
 ) : BasicInterface()
diff --git a/plugins/client/graphql-kotlin-client-generator/src/test/data/kotlinx/multiple_queries/scalars/OptionalComplexArgumentInputSerializer.kt b/plugins/client/graphql-kotlin-client-generator/src/test/data/kotlinx/multiple_queries/scalars/OptionalComplexArgumentInputSerializer.kt
index cac97563cf..1b7bac17ce 100644
--- a/plugins/client/graphql-kotlin-client-generator/src/test/data/kotlinx/multiple_queries/scalars/OptionalComplexArgumentInputSerializer.kt
+++ b/plugins/client/graphql-kotlin-client-generator/src/test/data/kotlinx/multiple_queries/scalars/OptionalComplexArgumentInputSerializer.kt
@@ -5,7 +5,6 @@ import com.expediagroup.graphql.client.serialization.types.OptionalInput
 import com.expediagroup.graphql.client.serialization.types.OptionalInput.Defined
 import com.expediagroup.graphql.client.serialization.types.OptionalInput.Undefined
 import com.expediagroup.graphql.generated.inputs.ComplexArgumentInput
-import kotlin.Unit
 import kotlinx.serialization.KSerializer
 import kotlinx.serialization.builtins.nullable
 import kotlinx.serialization.descriptors.SerialDescriptor
@@ -18,11 +17,10 @@ public object OptionalComplexArgumentInputSerializer :
     KSerializer<OptionalInput<ComplexArgumentInput>> {
   private val `delegate`: KSerializer<ComplexArgumentInput> = ComplexArgumentInput.serializer()
 
-  public override val descriptor: SerialDescriptor =
+  override val descriptor: SerialDescriptor =
       buildClassSerialDescriptor("OptionalComplexArgumentInputSerializer")
 
-  public override fun serialize(encoder: Encoder, `value`: OptionalInput<ComplexArgumentInput>):
-      Unit {
+  override fun serialize(encoder: Encoder, `value`: OptionalInput<ComplexArgumentInput>) {
     when (value) {
       is OptionalInput.Undefined -> return
       is OptionalInput.Defined<ComplexArgumentInput> ->
@@ -33,6 +31,6 @@ public object OptionalComplexArgumentInputSerializer :
   /**
    * undefined is only supported during client serialization, this code should never be invoked
    */
-  public override fun deserialize(decoder: Decoder): OptionalInput<ComplexArgumentInput> =
+  override fun deserialize(decoder: Decoder): OptionalInput<ComplexArgumentInput> =
       OptionalInput.Defined(decoder.decodeNullableSerializableValue(delegate.nullable))
 }
diff --git a/plugins/client/graphql-kotlin-client-generator/src/test/data/kotlinx/multiple_queries/scalars/UUIDSerializer.kt b/plugins/client/graphql-kotlin-client-generator/src/test/data/kotlinx/multiple_queries/scalars/UUIDSerializer.kt
index 832753647c..9cae6098b8 100644
--- a/plugins/client/graphql-kotlin-client-generator/src/test/data/kotlinx/multiple_queries/scalars/UUIDSerializer.kt
+++ b/plugins/client/graphql-kotlin-client-generator/src/test/data/kotlinx/multiple_queries/scalars/UUIDSerializer.kt
@@ -3,7 +3,6 @@ package com.expediagroup.graphql.generated.scalars
 import com.expediagroup.graphql.client.Generated
 import com.expediagroup.graphql.plugin.client.generator.UUIDScalarConverter
 import java.util.UUID
-import kotlin.Unit
 import kotlinx.serialization.KSerializer
 import kotlinx.serialization.descriptors.SerialDescriptor
 import kotlinx.serialization.descriptors.buildClassSerialDescriptor
@@ -18,9 +17,9 @@ import kotlinx.serialization.serializerOrNull
 public object UUIDSerializer : KSerializer<UUID> {
   private val converter: UUIDScalarConverter = UUIDScalarConverter()
 
-  public override val descriptor: SerialDescriptor = buildClassSerialDescriptor("UUID")
+  override val descriptor: SerialDescriptor = buildClassSerialDescriptor("UUID")
 
-  public override fun serialize(encoder: Encoder, `value`: UUID): Unit {
+  override fun serialize(encoder: Encoder, `value`: UUID) {
     val encoded = converter.toJson(value)
     val serializer = serializerOrNull(encoded::class.java)
     if (serializer != null) {
@@ -30,7 +29,7 @@ public object UUIDSerializer : KSerializer<UUID> {
     }
   }
 
-  public override fun deserialize(decoder: Decoder): UUID {
+  override fun deserialize(decoder: Decoder): UUID {
     val jsonDecoder = decoder as JsonDecoder
     val rawContent: Any = when (val element = jsonDecoder.decodeJsonElement()) {
       is JsonPrimitive -> element.jsonPrimitive.content
diff --git a/plugins/client/graphql-kotlin-client-generator/src/test/data/kotlinx/multiple_queries/secondquery/BasicInterface.kt b/plugins/client/graphql-kotlin-client-generator/src/test/data/kotlinx/multiple_queries/secondquery/BasicInterface.kt
index 5b1f3b94de..16ad723495 100644
--- a/plugins/client/graphql-kotlin-client-generator/src/test/data/kotlinx/multiple_queries/secondquery/BasicInterface.kt
+++ b/plugins/client/graphql-kotlin-client-generator/src/test/data/kotlinx/multiple_queries/secondquery/BasicInterface.kt
@@ -34,11 +34,11 @@ public data class FirstInterfaceImplementation(
   /**
    * Unique identifier of the first implementation
    */
-  public override val id: Int,
+  override val id: Int,
   /**
    * Name of the first implementation
    */
-  public override val name: String,
+  override val name: String,
   /**
    * Custom field integer value
    */
@@ -55,11 +55,11 @@ public data class SecondInterfaceImplementation(
   /**
    * Unique identifier of the second implementation
    */
-  public override val id: Int,
+  override val id: Int,
   /**
    * Name of the second implementation
    */
-  public override val name: String,
+  override val name: String,
   /**
    * Custom field float value
    */
@@ -79,9 +79,9 @@ public data class DefaultBasicInterfaceImplementation(
   /**
    * Unique identifier of an interface
    */
-  public override val id: Int,
+  override val id: Int,
   /**
    * Name field
    */
-  public override val name: String,
+  override val name: String,
 ) : BasicInterface()
diff --git a/plugins/client/graphql-kotlin-client-generator/src/test/data/kotlinx/object/ComplexObjectQuery.kt b/plugins/client/graphql-kotlin-client-generator/src/test/data/kotlinx/object/ComplexObjectQuery.kt
index 0db1c0e813..a10ea14b59 100644
--- a/plugins/client/graphql-kotlin-client-generator/src/test/data/kotlinx/object/ComplexObjectQuery.kt
+++ b/plugins/client/graphql-kotlin-client-generator/src/test/data/kotlinx/object/ComplexObjectQuery.kt
@@ -15,13 +15,12 @@ public const val COMPLEX_OBJECT_QUERY: String =
 @Serializable
 public class ComplexObjectQuery : GraphQLClientRequest<ComplexObjectQuery.Result> {
   @Required
-  public override val query: String = COMPLEX_OBJECT_QUERY
+  override val query: String = COMPLEX_OBJECT_QUERY
 
   @Required
-  public override val operationName: String = "ComplexObjectQuery"
+  override val operationName: String = "ComplexObjectQuery"
 
-  public override fun responseType(): KClass<ComplexObjectQuery.Result> =
-      ComplexObjectQuery.Result::class
+  override fun responseType(): KClass<ComplexObjectQuery.Result> = ComplexObjectQuery.Result::class
 
   @Generated
   @Serializable
diff --git a/plugins/client/graphql-kotlin-client-generator/src/test/data/kotlinx/union/UnionQueryWithInlineFragments.kt b/plugins/client/graphql-kotlin-client-generator/src/test/data/kotlinx/union/UnionQueryWithInlineFragments.kt
index 0d7d2cebfc..01231e59e3 100644
--- a/plugins/client/graphql-kotlin-client-generator/src/test/data/kotlinx/union/UnionQueryWithInlineFragments.kt
+++ b/plugins/client/graphql-kotlin-client-generator/src/test/data/kotlinx/union/UnionQueryWithInlineFragments.kt
@@ -16,12 +16,12 @@ public const val UNION_QUERY_WITH_INLINE_FRAGMENTS: String =
 public class UnionQueryWithInlineFragments :
     GraphQLClientRequest<UnionQueryWithInlineFragments.Result> {
   @Required
-  public override val query: String = UNION_QUERY_WITH_INLINE_FRAGMENTS
+  override val query: String = UNION_QUERY_WITH_INLINE_FRAGMENTS
 
   @Required
-  public override val operationName: String = "UnionQueryWithInlineFragments"
+  override val operationName: String = "UnionQueryWithInlineFragments"
 
-  public override fun responseType(): KClass<UnionQueryWithInlineFragments.Result> =
+  override fun responseType(): KClass<UnionQueryWithInlineFragments.Result> =
       UnionQueryWithInlineFragments.Result::class
 
   @Generated
diff --git a/plugins/client/graphql-kotlin-client-generator/src/test/data/kotlinx/variables/KotlinXInputQuery.kt b/plugins/client/graphql-kotlin-client-generator/src/test/data/kotlinx/variables/KotlinXInputQuery.kt
index b310ac0783..9520481539 100644
--- a/plugins/client/graphql-kotlin-client-generator/src/test/data/kotlinx/variables/KotlinXInputQuery.kt
+++ b/plugins/client/graphql-kotlin-client-generator/src/test/data/kotlinx/variables/KotlinXInputQuery.kt
@@ -18,16 +18,15 @@ public const val KOTLIN_X_INPUT_QUERY: String =
 @Generated
 @Serializable
 public class KotlinXInputQuery(
-  public override val variables: KotlinXInputQuery.Variables,
+  override val variables: KotlinXInputQuery.Variables,
 ) : GraphQLClientRequest<KotlinXInputQuery.Result> {
   @Required
-  public override val query: String = KOTLIN_X_INPUT_QUERY
+  override val query: String = KOTLIN_X_INPUT_QUERY
 
   @Required
-  public override val operationName: String = "KotlinXInputQuery"
+  override val operationName: String = "KotlinXInputQuery"
 
-  public override fun responseType(): KClass<KotlinXInputQuery.Result> =
-      KotlinXInputQuery.Result::class
+  override fun responseType(): KClass<KotlinXInputQuery.Result> = KotlinXInputQuery.Result::class
 
   @Generated
   @Serializable
diff --git a/plugins/client/graphql-kotlin-client-generator/src/test/data/kotlinx/variables/scalars/OptionalSimpleArgumentInputSerializer.kt b/plugins/client/graphql-kotlin-client-generator/src/test/data/kotlinx/variables/scalars/OptionalSimpleArgumentInputSerializer.kt
index 3cfbf063b0..44724e5477 100644
--- a/plugins/client/graphql-kotlin-client-generator/src/test/data/kotlinx/variables/scalars/OptionalSimpleArgumentInputSerializer.kt
+++ b/plugins/client/graphql-kotlin-client-generator/src/test/data/kotlinx/variables/scalars/OptionalSimpleArgumentInputSerializer.kt
@@ -5,7 +5,6 @@ import com.expediagroup.graphql.client.serialization.types.OptionalInput
 import com.expediagroup.graphql.client.serialization.types.OptionalInput.Defined
 import com.expediagroup.graphql.client.serialization.types.OptionalInput.Undefined
 import com.expediagroup.graphql.generated.inputs.SimpleArgumentInput
-import kotlin.Unit
 import kotlinx.serialization.KSerializer
 import kotlinx.serialization.builtins.nullable
 import kotlinx.serialization.descriptors.SerialDescriptor
@@ -18,11 +17,10 @@ public object OptionalSimpleArgumentInputSerializer :
     KSerializer<OptionalInput<SimpleArgumentInput>> {
   private val `delegate`: KSerializer<SimpleArgumentInput> = SimpleArgumentInput.serializer()
 
-  public override val descriptor: SerialDescriptor =
+  override val descriptor: SerialDescriptor =
       buildClassSerialDescriptor("OptionalSimpleArgumentInputSerializer")
 
-  public override fun serialize(encoder: Encoder, `value`: OptionalInput<SimpleArgumentInput>):
-      Unit {
+  override fun serialize(encoder: Encoder, `value`: OptionalInput<SimpleArgumentInput>) {
     when (value) {
       is OptionalInput.Undefined -> return
       is OptionalInput.Defined<SimpleArgumentInput> ->
@@ -33,6 +31,6 @@ public object OptionalSimpleArgumentInputSerializer :
   /**
    * undefined is only supported during client serialization, this code should never be invoked
    */
-  public override fun deserialize(decoder: Decoder): OptionalInput<SimpleArgumentInput> =
+  override fun deserialize(decoder: Decoder): OptionalInput<SimpleArgumentInput> =
       OptionalInput.Defined(decoder.decodeNullableSerializableValue(delegate.nullable))
 }
diff --git a/plugins/client/graphql-kotlin-client-generator/src/test/kotlin/com/expediagroup/graphql/plugin/client/generator/GraphQLTestUtils.kt b/plugins/client/graphql-kotlin-client-generator/src/test/kotlin/com/expediagroup/graphql/plugin/client/generator/GraphQLTestUtils.kt
index e0debd056c..44929219c3 100644
--- a/plugins/client/graphql-kotlin-client-generator/src/test/kotlin/com/expediagroup/graphql/plugin/client/generator/GraphQLTestUtils.kt
+++ b/plugins/client/graphql-kotlin-client-generator/src/test/kotlin/com/expediagroup/graphql/plugin/client/generator/GraphQLTestUtils.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright 2021 Expedia, Inc
+ * Copyright 2023 Expedia, Inc
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -20,6 +20,7 @@ import com.expediagroup.graphql.client.converter.ScalarConverter
 import com.ibm.icu.util.ULocale
 import com.tschuchort.compiletesting.KotlinCompilation
 import com.tschuchort.compiletesting.SourceFile
+import org.jetbrains.kotlin.compiler.plugin.ExperimentalCompilerApi
 import org.jetbrains.kotlinx.serialization.compiler.extensions.SerializationComponentRegistrar
 import org.junit.jupiter.params.provider.Arguments
 import java.io.File
@@ -54,13 +55,14 @@ internal fun locateTestFiles(directory: File): Pair<List<File>, Map<String, File
 
 internal const val TEST_SCHEMA_PATH = "testSchema.graphql"
 
+@OptIn(ExperimentalCompilerApi::class)
 internal fun verifyClientGeneration(config: GraphQLClientGeneratorConfig, testDirectory: File) {
     val (queries, expectedFiles) = locateTestFiles(testDirectory)
 
     val generator = GraphQLClientGenerator(TEST_SCHEMA_PATH, config)
     val fileSpecs = generator.generate(queries)
     assertTrue(fileSpecs.isNotEmpty())
-//    assertEquals(expectedFiles.size, fileSpecs.size)
+    assertEquals(expectedFiles.size, fileSpecs.size)
     for (spec in fileSpecs) {
         val expected = expectedFiles[spec.packageName + "." + spec.name]?.readText()
         assertEquals(expected, spec.toString())
@@ -76,7 +78,7 @@ internal fun verifyClientGeneration(config: GraphQLClientGeneratorConfig, testDi
         sources = generatedSources
         inheritClassPath = true
         if (config.serializer == GraphQLSerializer.KOTLINX) {
-            compilerPlugins = listOf(SerializationComponentRegistrar())
+            compilerPluginRegistrars = listOf(SerializationComponentRegistrar())
         }
     }.compile()
     if (compilationResult.exitCode != KotlinCompilation.ExitCode.OK) {