Pass schema to ApolloCompilerPlugin.schemaListener (#6166)

Author: martinbonnin

libraries/apollo-compiler/src/main/kotlin/com/apollographql/apollo/compiler/ApolloCompilerPlugin.kt

@@ -79,24 +79,24 @@ interface ApolloCompilerPlugin {
   }
 
   /**
-   * @return A [SchemaDocumentListener] called whenever the schema changed
+   * @return A [SchemaListener] called whenever the schema changed
    */
   @ApolloExperimental
-  fun schemaDocumentListener(): SchemaDocumentListener? {
+  fun schemaListener(): SchemaListener? {
     return null
   }
 }
 
 @ApolloExperimental
-interface SchemaDocumentListener {
+interface SchemaListener {
   /**
    * Called when the schema changed and codegen needs to be updated
    *
-   * @param schema the validated schema document.
+   * @param schema the validated schema.
    * @param outputDirectory the compiler output directory. This directory is shared with the compiler, make sure to use a specific
    * package name to avoid clobbering other files.
    */
-  fun onSchemaDocument(schema: GQLDocument, outputDirectory: File)
+  fun onSchema(schema: Schema, outputDirectory: File)
 }
 
 

libraries/apollo-gradle-plugin-external/src/main/kotlin/com/apollographql/apollo/gradle/internal/ApolloGenerateSourcesFromIrTask.kt

@@ -120,8 +120,8 @@ private abstract class GenerateSourcesFromIr : WorkAction<GenerateSourcesFromIrP
           operationOutputGenerator = plugin?.toOperationOutputGenerator(),
       ).writeTo(outputDir.get().asFile, true, metadataOutputFile.orNull?.asFile)
 
-      plugin?.schemaDocumentListener()?.let { onSchemaDocument ->
-        onSchemaDocument.onSchemaDocument(codegenSchema.schema.toGQLDocument(), outputDir.get().asFile)
+      plugin?.schemaListener()?.let { onSchemaDocument ->
+        onSchemaDocument.onSchema(codegenSchema.schema, outputDir.get().asFile)
       }
     }
   }

libraries/apollo-gradle-plugin-external/src/main/kotlin/com/apollographql/apollo/gradle/internal/ApolloGenerateSourcesTask.kt

@@ -1,6 +1,5 @@
 package com.apollographql.apollo.gradle.internal
 
-import com.apollographql.apollo.ast.GQLDocument
 import com.apollographql.apollo.compiler.ApolloCompiler
 import com.apollographql.apollo.compiler.CodegenSchema
 import com.apollographql.apollo.compiler.LayoutFactory
@@ -128,8 +127,8 @@ private abstract class GenerateSources : WorkAction<GenerateSourcesParameters> {
           operationManifestFile = operationManifestFile.orNull?.asFile,
       ).writeTo(outputDir.get().asFile, true, null)
 
-      plugin?.schemaDocumentListener()?.let { onSchemaDocument ->
-        onSchemaDocument.onSchemaDocument(codegenSchema.schema.toGQLDocument(), outputDir.get().asFile)
+      plugin?.schemaListener()?.let { onSchemaDocument ->
+        onSchemaDocument.onSchema(codegenSchema.schema, outputDir.get().asFile)
       }
     }
   }

tests/compiler-plugins/schema-codegen/src/main/kotlin/schema/TestPlugin.kt

@@ -1,24 +1,20 @@
 package schema
 
 import com.apollographql.apollo.ast.ForeignSchema
-import com.apollographql.apollo.ast.GQLDocument
 import com.apollographql.apollo.ast.GQLIntValue
-import com.apollographql.apollo.ast.GQLObjectTypeDefinition
+import com.apollographql.apollo.ast.Schema
 import com.apollographql.apollo.ast.parseAsGQLDocument
 import com.apollographql.apollo.compiler.ApolloCompilerPlugin
 import com.apollographql.apollo.compiler.ApolloCompilerPluginEnvironment
 import com.apollographql.apollo.compiler.ApolloCompilerPluginLogger
 import com.apollographql.apollo.compiler.ApolloCompilerPluginProvider
-import com.apollographql.apollo.compiler.CodegenSchema
-import com.apollographql.apollo.compiler.SchemaDocumentListener
-import com.apollographql.apollo.compiler.codegen.SchemaAndOperationsLayout
+import com.apollographql.apollo.compiler.SchemaListener
 import com.squareup.kotlinpoet.ClassName
 import com.squareup.kotlinpoet.FileSpec
 import com.squareup.kotlinpoet.PropertySpec
 import okio.buffer
 import okio.source
 import java.io.File
-import kotlin.math.max
 
 class TestPlugin(
     logger: ApolloCompilerPluginLogger,
@@ -39,13 +35,10 @@ class TestPlugin(
     )
   }
 
-  override fun schemaDocumentListener(): SchemaDocumentListener {
-    return object : SchemaDocumentListener {
-      override fun onSchemaDocument(schema: GQLDocument, outputDirectory: File) {
-        val maxAge = schema.definitions.filterIsInstance<GQLObjectTypeDefinition>()
-            .single {
-              it.name == "Menu"
-            }
+  override fun schemaListener(): SchemaListener {
+    return object : SchemaListener {
+      override fun onSchema(schema: Schema, outputDirectory: File) {
+        val maxAge = schema.typeDefinition("Menu")
             .directives
             .single {
               it.name == "cacheControl"