[compiler] remove unused argument to scalarAdapterInitializer() (#5996)

martinbonnin · web-flow · commit 5d86b23f5a45 · 2024-06-26T09:17:27.000+02:00
diff --git a/libraries/apollo-compiler/src/main/kotlin/com/apollographql/apollo3/compiler/codegen/kotlin/KotlinResolver.kt b/libraries/apollo-compiler/src/main/kotlin/com/apollographql/apollo3/compiler/codegen/kotlin/KotlinResolver.kt
@@ -182,28 +182,28 @@ internal class KotlinResolver(
       is IrListType2 -> adapterInitializer2(type.ofType, jsExport)?.list(jsExport)
       is IrScalarType2 -> {
         if (scalarMapping.containsKey(type.name)) {
-          scalarAdapterInitializer(type.name, customScalarAdapters)
+          scalarAdapterInitializer(type.name)
         } else {
           null
         }
       }
 
       is IrEnumType2 -> {
-        adapterInitializer(IrEnumType(type.name), false, jsExport, "")
+        adapterInitializer(IrEnumType(type.name), false, jsExport)
       }
 
       is IrCompositeType2 -> null
     }
   }
 
-  internal fun adapterInitializer(type: IrType, requiresBuffering: Boolean, jsExport: Boolean, runtimeAdapterPrefix: String): CodeBlock {
+  internal fun adapterInitializer(type: IrType, requiresBuffering: Boolean, jsExport: Boolean): CodeBlock {
     return when {
       type.optional -> {
         val presentFun = MemberName("com.apollographql.apollo3.api", "present")
-        CodeBlock.of("%L.%M()", adapterInitializer(type.optional(false), requiresBuffering, jsExport, runtimeAdapterPrefix), presentFun)
+        CodeBlock.of("%L.%M()", adapterInitializer(type.optional(false), requiresBuffering, jsExport), presentFun)
       }
       type.catchTo != IrCatchTo.NoCatch -> {
-        adapterInitializer(type.catchTo(IrCatchTo.NoCatch), requiresBuffering, jsExport, runtimeAdapterPrefix).let {
+        adapterInitializer(type.catchTo(IrCatchTo.NoCatch), requiresBuffering, jsExport).let {
           val member = when (type.catchTo) {
             IrCatchTo.Null -> KotlinSymbols.catchToNull
             IrCatchTo.Result -> KotlinSymbols.catchToResult
@@ -213,7 +213,7 @@ internal class KotlinResolver(
         }
       }
       type.maybeError -> {
-        adapterInitializer(type.maybeError(false), requiresBuffering, jsExport, runtimeAdapterPrefix).let {
+        adapterInitializer(type.maybeError(false), requiresBuffering, jsExport).let {
           CodeBlock.of("%L.%M()", it, KotlinSymbols.errorAware)
         }
       }
@@ -232,23 +232,23 @@ internal class KotlinResolver(
 
           else -> {
             val nullableFun = MemberName("com.apollographql.apollo3.api", "nullable")
-            CodeBlock.of("%L.%M()", adapterInitializer(type.nullable(false), requiresBuffering, jsExport, runtimeAdapterPrefix), nullableFun)
+            CodeBlock.of("%L.%M()", adapterInitializer(type.nullable(false), requiresBuffering, jsExport), nullableFun)
           }
         }
       }
       else -> {
         when (type) {
           is IrListType -> {
-            adapterInitializer(type.ofType, requiresBuffering, jsExport, runtimeAdapterPrefix).list(jsExport)
+            adapterInitializer(type.ofType, requiresBuffering, jsExport).list(jsExport)
           }
 
           is IrScalarType -> {
-            scalarAdapterInitializer(type.name, runtimeAdapterPrefix)
+            scalarAdapterInitializer(type.name)
           }
 
           is IrEnumType -> {
             if (jsExport) {
-              scalarAdapterInitializer("String", runtimeAdapterPrefix)
+              scalarAdapterInitializer("String")
             } else {
               CodeBlock.of("%T", resolveAndAssert(ResolverKeyKind.SchemaTypeAdapter, type.name))
             }
@@ -272,7 +272,7 @@ internal class KotlinResolver(
     return CodeBlock.of("%T.$type", resolveAndAssert(ResolverKeyKind.SchemaType, name))
   }
 
-  private fun scalarAdapterInitializer(name: String, runtimeAdaptersPrefix: String): CodeBlock {
+  private fun scalarAdapterInitializer(name: String): CodeBlock {
     return when (val adapterInitializer = scalarMapping[name]?.adapterInitializer) {
       is ExpressionAdapterInitializer -> {
         CodeBlock.of(adapterInitializer.expression)
@@ -281,7 +281,7 @@ internal class KotlinResolver(
       is RuntimeAdapterInitializer -> {
         val target = resolveScalarTarget(name)
         CodeBlock.of(
-            "$runtimeAdaptersPrefix.responseAdapterFor<%T>(%L)",
+            "$customScalarAdapters.responseAdapterFor<%T>(%L)",
             target,
             resolveCompiledType(name)
         )
@@ -300,7 +300,7 @@ internal class KotlinResolver(
               CodeBlock.of("%M", KotlinSymbols.AnyAdapter)
             } else {
               CodeBlock.of(
-                  "$runtimeAdaptersPrefix.responseAdapterFor<%T>(%L)",
+                  "$customScalarAdapters.responseAdapterFor<%T>(%L)",
                   target,
                   resolveCompiledType(name)
               )
diff --git a/libraries/apollo-compiler/src/main/kotlin/com/apollographql/apollo3/compiler/codegen/kotlin/helpers/AdapterCommon.kt b/libraries/apollo-compiler/src/main/kotlin/com/apollographql/apollo3/compiler/codegen/kotlin/helpers/AdapterCommon.kt
@@ -71,7 +71,7 @@ internal fun readFromResponseCodeBlock(
         .add(
             regularProperties.mapIndexed { index, property ->
               val variableName = property.info.responseName.variableName()
-              val adapterInitializer = context.resolver.adapterInitializer(property.info.type, property.requiresBuffering, context.jsExport, customScalarAdapters)
+              val adapterInitializer = context.resolver.adapterInitializer(property.info.type, property.requiresBuffering, context.jsExport)
               CodeBlock.of(
                   "%L·->·%N·=·%L.$fromJson($reader,·${customScalarAdapters})",
                   index,
@@ -215,7 +215,7 @@ private fun IrProperty.writeToResponseCodeBlock(context: KotlinContext): CodeBlo
   val propertyName = context.layout.propertyName(info.responseName)
 
   if (!isSynthetic) {
-    val adapterInitializer = context.resolver.adapterInitializer(info.type, requiresBuffering, context.jsExport, customScalarAdapters)
+    val adapterInitializer = context.resolver.adapterInitializer(info.type, requiresBuffering, context.jsExport)
     builder.addStatement("${writer}.name(%S)", info.responseName)
     builder.addStatement(
         "%L.$toJson($writer, $customScalarAdapters, $value.%N)",
diff --git a/libraries/apollo-compiler/src/main/kotlin/com/apollographql/apollo3/compiler/codegen/kotlin/helpers/InputAdapter.kt b/libraries/apollo-compiler/src/main/kotlin/com/apollographql/apollo3/compiler/codegen/kotlin/helpers/InputAdapter.kt
@@ -73,7 +73,7 @@ private fun List<NamedType>.writeToResponseCodeBlock(context: KotlinContext): Co
 }
 
 private fun NamedType.writeToResponseCodeBlock(context: KotlinContext): CodeBlock {
-  val adapterInitializer = context.resolver.adapterInitializer(type, false, context.jsExport, customScalarAdapters)
+  val adapterInitializer = context.resolver.adapterInitializer(type, false, context.jsExport)
   val builder = CodeBlock.builder()
   val propertyName = context.layout.propertyName(graphQlName)
 
diff --git a/libraries/apollo-compiler/src/main/kotlin/com/apollographql/apollo3/compiler/codegen/kotlin/operations/util/ExecutableCommon.kt b/libraries/apollo-compiler/src/main/kotlin/com/apollographql/apollo3/compiler/codegen/kotlin/operations/util/ExecutableCommon.kt
@@ -64,7 +64,7 @@ internal fun adapterFunSpec(
       .addCode(
           CodeBlock.of(
               "return·%L",
-              context.resolver.adapterInitializer(type, property.requiresBuffering, context.jsExport, "")
+              context.resolver.adapterInitializer(type, property.requiresBuffering, context.jsExport)
           )
       )
     .build()
diff --git a/libraries/apollo-compiler/src/main/kotlin/com/apollographql/apollo3/compiler/codegen/kotlin/operations/util/VariablesAdapter.kt b/libraries/apollo-compiler/src/main/kotlin/com/apollographql/apollo3/compiler/codegen/kotlin/operations/util/VariablesAdapter.kt
@@ -50,7 +50,7 @@ private fun List<IrVariable>.writeToResponseCodeBlock(context: KotlinContext): C
 }
 
 private fun IrVariable.writeToResponseCodeBlock(context: KotlinContext): CodeBlock {
-  val adapterInitializer = context.resolver.adapterInitializer(type, false, context.jsExport, customScalarAdapters)
+  val adapterInitializer = context.resolver.adapterInitializer(type, false, context.jsExport)
   val builder = CodeBlock.builder()
   val propertyName = context.layout.propertyName(name)
 

Original file line number	Diff line number	Diff line change
`@@ -182,28 +182,28 @@ internal class KotlinResolver(`
`182`	`182`	`is IrListType2 -> adapterInitializer2(type.ofType, jsExport)?.list(jsExport)`
`183`	`183`	`is IrScalarType2 -> {`
`184`	`184`	`if (scalarMapping.containsKey(type.name)) {`
`185`		`- scalarAdapterInitializer(type.name, customScalarAdapters)`
	`185`	`+ scalarAdapterInitializer(type.name)`
`186`	`186`	`} else {`
`187`	`187`	`null`
`188`	`188`	`}`
`189`	`189`	`}`
`190`	`190`
`191`	`191`	`is IrEnumType2 -> {`
`192`		`- adapterInitializer(IrEnumType(type.name), false, jsExport, "")`
	`192`	`+ adapterInitializer(IrEnumType(type.name), false, jsExport)`
`193`	`193`	`}`
`194`	`194`
`195`	`195`	`is IrCompositeType2 -> null`
`196`	`196`	`}`
`197`	`197`	`}`
`198`	`198`
`199`		`- internal fun adapterInitializer(type: IrType, requiresBuffering: Boolean, jsExport: Boolean, runtimeAdapterPrefix: String): CodeBlock {`
	`199`	`+ internal fun adapterInitializer(type: IrType, requiresBuffering: Boolean, jsExport: Boolean): CodeBlock {`
`200`	`200`	`return when {`
`201`	`201`	`type.optional -> {`
`202`	`202`	`val presentFun = MemberName("com.apollographql.apollo3.api", "present")`
`203`		`- CodeBlock.of("%L.%M()", adapterInitializer(type.optional(false), requiresBuffering, jsExport, runtimeAdapterPrefix), presentFun)`
	`203`	`+ CodeBlock.of("%L.%M()", adapterInitializer(type.optional(false), requiresBuffering, jsExport), presentFun)`
`204`	`204`	`}`
`205`	`205`	`type.catchTo != IrCatchTo.NoCatch -> {`
`206`		`- adapterInitializer(type.catchTo(IrCatchTo.NoCatch), requiresBuffering, jsExport, runtimeAdapterPrefix).let {`
	`206`	`+ adapterInitializer(type.catchTo(IrCatchTo.NoCatch), requiresBuffering, jsExport).let {`
`207`	`207`	`val member = when (type.catchTo) {`
`208`	`208`	`IrCatchTo.Null -> KotlinSymbols.catchToNull`
`209`	`209`	`IrCatchTo.Result -> KotlinSymbols.catchToResult`
`@@ -213,7 +213,7 @@ internal class KotlinResolver(`
`213`	`213`	`}`
`214`	`214`	`}`
`215`	`215`	`type.maybeError -> {`
`216`		`- adapterInitializer(type.maybeError(false), requiresBuffering, jsExport, runtimeAdapterPrefix).let {`
	`216`	`+ adapterInitializer(type.maybeError(false), requiresBuffering, jsExport).let {`
`217`	`217`	`CodeBlock.of("%L.%M()", it, KotlinSymbols.errorAware)`
`218`	`218`	`}`
`219`	`219`	`}`
`@@ -232,23 +232,23 @@ internal class KotlinResolver(`
`232`	`232`
`233`	`233`	`else -> {`
`234`	`234`	`val nullableFun = MemberName("com.apollographql.apollo3.api", "nullable")`
`235`		`- CodeBlock.of("%L.%M()", adapterInitializer(type.nullable(false), requiresBuffering, jsExport, runtimeAdapterPrefix), nullableFun)`
	`235`	`+ CodeBlock.of("%L.%M()", adapterInitializer(type.nullable(false), requiresBuffering, jsExport), nullableFun)`
`236`	`236`	`}`
`237`	`237`	`}`
`238`	`238`	`}`
`239`	`239`	`else -> {`
`240`	`240`	`when (type) {`
`241`	`241`	`is IrListType -> {`
`242`		`- adapterInitializer(type.ofType, requiresBuffering, jsExport, runtimeAdapterPrefix).list(jsExport)`
	`242`	`+ adapterInitializer(type.ofType, requiresBuffering, jsExport).list(jsExport)`
`243`	`243`	`}`
`244`	`244`
`245`	`245`	`is IrScalarType -> {`
`246`		`- scalarAdapterInitializer(type.name, runtimeAdapterPrefix)`
	`246`	`+ scalarAdapterInitializer(type.name)`
`247`	`247`	`}`
`248`	`248`
`249`	`249`	`is IrEnumType -> {`
`250`	`250`	`if (jsExport) {`
`251`		`- scalarAdapterInitializer("String", runtimeAdapterPrefix)`
	`251`	`+ scalarAdapterInitializer("String")`
`252`	`252`	`} else {`
`253`	`253`	`CodeBlock.of("%T", resolveAndAssert(ResolverKeyKind.SchemaTypeAdapter, type.name))`
`254`	`254`	`}`
`@@ -272,7 +272,7 @@ internal class KotlinResolver(`
`272`	`272`	`return CodeBlock.of("%T.$type", resolveAndAssert(ResolverKeyKind.SchemaType, name))`
`273`	`273`	`}`
`274`	`274`
`275`		`- private fun scalarAdapterInitializer(name: String, runtimeAdaptersPrefix: String): CodeBlock {`
	`275`	`+ private fun scalarAdapterInitializer(name: String): CodeBlock {`
`276`	`276`	`return when (val adapterInitializer = scalarMapping[name]?.adapterInitializer) {`
`277`	`277`	`is ExpressionAdapterInitializer -> {`
`278`	`278`	`CodeBlock.of(adapterInitializer.expression)`
`@@ -281,7 +281,7 @@ internal class KotlinResolver(`
`281`	`281`	`is RuntimeAdapterInitializer -> {`
`282`	`282`	`val target = resolveScalarTarget(name)`
`283`	`283`	`CodeBlock.of(`
`284`		`- "$runtimeAdaptersPrefix.responseAdapterFor<%T>(%L)",`
	`284`	`+ "$customScalarAdapters.responseAdapterFor<%T>(%L)",`
`285`	`285`	`target,`
`286`	`286`	`resolveCompiledType(name)`
`287`	`287`	`)`
`@@ -300,7 +300,7 @@ internal class KotlinResolver(`
`300`	`300`	`CodeBlock.of("%M", KotlinSymbols.AnyAdapter)`
`301`	`301`	`} else {`
`302`	`302`	`CodeBlock.of(`
`303`		`- "$runtimeAdaptersPrefix.responseAdapterFor<%T>(%L)",`
	`303`	`+ "$customScalarAdapters.responseAdapterFor<%T>(%L)",`
`304`	`304`	`target,`
`305`	`305`	`resolveCompiledType(name)`
`306`	`306`	`)`
Original file line number	Diff line number	Diff line change
`@@ -73,7 +73,7 @@ private fun List<NamedType>.writeToResponseCodeBlock(context: KotlinContext): Co`
`73`	`73`	`}`
`74`	`74`
`75`	`75`	`private fun NamedType.writeToResponseCodeBlock(context: KotlinContext): CodeBlock {`
`76`		`- val adapterInitializer = context.resolver.adapterInitializer(type, false, context.jsExport, customScalarAdapters)`
	`76`	`+ val adapterInitializer = context.resolver.adapterInitializer(type, false, context.jsExport)`
`77`	`77`	`val builder = CodeBlock.builder()`
`78`	`78`	`val propertyName = context.layout.propertyName(graphQlName)`
`79`	`79`
Original file line number	Diff line number	Diff line change
`@@ -64,7 +64,7 @@ internal fun adapterFunSpec(`
`64`	`64`	`.addCode(`
`65`	`65`	`CodeBlock.of(`
`66`	`66`	`"return·%L",`
`67`		`- context.resolver.adapterInitializer(type, property.requiresBuffering, context.jsExport, "")`
	`67`	`+ context.resolver.adapterInitializer(type, property.requiresBuffering, context.jsExport)`
`68`	`68`	`)`
`69`	`69`	`)`
`70`	`70`	`.build()`
Original file line number	Diff line number	Diff line change
`@@ -50,7 +50,7 @@ private fun List<IrVariable>.writeToResponseCodeBlock(context: KotlinContext): C`
`50`	`50`	`}`
`51`	`51`
`52`	`52`	`private fun IrVariable.writeToResponseCodeBlock(context: KotlinContext): CodeBlock {`
`53`		`- val adapterInitializer = context.resolver.adapterInitializer(type, false, context.jsExport, customScalarAdapters)`
	`53`	`+ val adapterInitializer = context.resolver.adapterInitializer(type, false, context.jsExport)`
`54`	`54`	`val builder = CodeBlock.builder()`
`55`	`55`	`val propertyName = context.layout.propertyName(name)`
`56`	`56`