make nested adapter classes private. Fixes #2926 (#3188)

apollographql · Jun 25, 2021 · f911f23 · f911f23
1 parent f233416
commit f911f23
Show file tree

Hide file tree

Showing 161 changed files with 407 additions and 372 deletions.
diff --git a/...kotlin/com/apollographql/apollo3/compiler/codegen/adapter/ImplementationAdapterBuilder.kt b/...kotlin/com/apollographql/apollo3/compiler/codegen/adapter/ImplementationAdapterBuilder.kt
@@ -10,6 +10,9 @@ import com.squareup.kotlinpoet.FunSpec
 import com.squareup.kotlinpoet.TypeSpec
 import com.squareup.kotlinpoet.asTypeName
 
+/**
+ * For responseBased codegen, generates an adapter for an implementation
+ */
 class ImplementationAdapterBuilder(
     val context: CgContext,
     val model: IrModel,
@@ -24,7 +27,8 @@ class ImplementationAdapterBuilder(
     ResponseAdapterBuilder.create(
         context,
         it,
-        path + adapterName
+        path + adapterName,
+        false
     )
   }
 

diff --git a/.../apollographql/apollo3/compiler/codegen/adapter/MonomorphicFieldResponseAdapterBuilder.kt b/.../apollographql/apollo3/compiler/codegen/adapter/MonomorphicFieldResponseAdapterBuilder.kt
@@ -4,6 +4,7 @@ import com.apollographql.apollo3.api.Adapter
 import com.apollographql.apollo3.api.CustomScalarAdapters
 import com.apollographql.apollo3.api.json.JsonReader
 import com.apollographql.apollo3.api.json.JsonWriter
+import com.apollographql.apollo3.compiler.applyIf
 import com.apollographql.apollo3.compiler.codegen.Identifier
 import com.apollographql.apollo3.compiler.codegen.CgContext
 import com.apollographql.apollo3.compiler.ir.IrModel
@@ -18,6 +19,7 @@ class MonomorphicFieldResponseAdapterBuilder(
     val context: CgContext,
     val model: IrModel,
     val path: List<String>,
+    val public: Boolean,
 ) : ResponseAdapterBuilder {
 
   private val adapterName = model.modelName
@@ -29,7 +31,8 @@ class MonomorphicFieldResponseAdapterBuilder(
     ResponseAdapterBuilder.create(
         context,
         it,
-        path + adapterName
+        path + adapterName,
+        false
     )
   }
 
@@ -52,6 +55,9 @@ class MonomorphicFieldResponseAdapterBuilder(
                 context.resolver.resolveModel(model.id)
             )
         )
+        .applyIf(!public) {
+          addModifiers(KModifier.PRIVATE)
+        }
         .addProperty(responseNamesPropertySpec(model))
         .addFunction(readFromResponseFunSpec())
         .addFunction(writeToResponseFunSpec())

diff --git a/.../apollographql/apollo3/compiler/codegen/adapter/PolymorphicFieldResponseAdapterBuilder.kt b/.../apollographql/apollo3/compiler/codegen/adapter/PolymorphicFieldResponseAdapterBuilder.kt
@@ -4,6 +4,7 @@ import com.apollographql.apollo3.api.Adapter
 import com.apollographql.apollo3.api.CustomScalarAdapters
 import com.apollographql.apollo3.api.json.JsonReader
 import com.apollographql.apollo3.api.json.JsonWriter
+import com.apollographql.apollo3.compiler.applyIf
 import com.apollographql.apollo3.compiler.codegen.Identifier
 import com.apollographql.apollo3.compiler.codegen.Identifier.__typename
 import com.apollographql.apollo3.compiler.codegen.Identifier.fromJson
@@ -27,6 +28,7 @@ class PolymorphicFieldResponseAdapterBuilder(
     val context: CgContext,
     val modelGroup: IrModelGroup,
     val path: List<String>,
+    val public: Boolean,
 ) : ResponseAdapterBuilder {
   private val baseModel = modelGroup.models.first {
     it.id == modelGroup.baseModelId
@@ -70,6 +72,9 @@ class PolymorphicFieldResponseAdapterBuilder(
         .addSuperinterface(
             Adapter::class.asTypeName().parameterizedBy(adaptedClassName)
         )
+        .applyIf(!public) {
+          addModifiers(KModifier.PRIVATE)
+        }
         .addProperty(responseNamesPropertySpec())
         .addFunction(readFromResponseFunSpec())
         .addFunction(writeToResponseFunSpec())

diff --git a/.../main/kotlin/com/apollographql/apollo3/compiler/codegen/adapter/ResponseAdapterBuilder.kt b/.../main/kotlin/com/apollographql/apollo3/compiler/codegen/adapter/ResponseAdapterBuilder.kt
@@ -15,18 +15,21 @@ interface ResponseAdapterBuilder {
     fun create(
         context: CgContext,
         modelGroup: IrModelGroup,
-        path: List<String>
+        path: List<String>,
+        public: Boolean
     ): ResponseAdapterBuilder = when(modelGroup.models.size) {
       0 -> error("Don't know how to create an adapter for a scalar type")
       1 -> MonomorphicFieldResponseAdapterBuilder(
           context = context,
           model = modelGroup.models.first(),
-          path = path
+          path = path,
+          public = public
       )
       else -> PolymorphicFieldResponseAdapterBuilder(
           context = context,
           modelGroup = modelGroup,
-          path = path
+          path = path,
+          public = public
       )
     }
   }

diff --git a/.../kotlin/com/apollographql/apollo3/compiler/codegen/file/FragmentResponseAdapterBuilder.kt b/.../kotlin/com/apollographql/apollo3/compiler/codegen/file/FragmentResponseAdapterBuilder.kt
@@ -22,7 +22,8 @@ class FragmentResponseAdapterBuilder(
     ResponseAdapterBuilder.create(
         context = context,
         modelGroup = it,
-        path = listOf(packageName, simpleName)
+        path = listOf(packageName, simpleName),
+        true
     )
   }
 

diff --git a/...kotlin/com/apollographql/apollo3/compiler/codegen/file/OperationResponseAdapterBuilder.kt b/...kotlin/com/apollographql/apollo3/compiler/codegen/file/OperationResponseAdapterBuilder.kt
@@ -21,7 +21,8 @@ class OperationResponseAdapterBuilder(
     ResponseAdapterBuilder.create(
         context = context,
         modelGroup = it,
-        path = listOf(packageName, simpleName)
+        path = listOf(packageName, simpleName),
+        true
     )
   }
 

diff --git a/...phql/com/example/antlr_tokens/responseBased/adapter/TestQuery_ResponseAdapter.kt.expected b/...phql/com/example/antlr_tokens/responseBased/adapter/TestQuery_ResponseAdapter.kt.expected
diff --git a/...m/example/arguments_hardcoded/responseBased/adapter/TestQuery_ResponseAdapter.kt.expected b/...m/example/arguments_hardcoded/responseBased/adapter/TestQuery_ResponseAdapter.kt.expected
diff --git a/...om/example/custom_scalar_type/responseBased/adapter/TestQuery_ResponseAdapter.kt.expected b/...om/example/custom_scalar_type/responseBased/adapter/TestQuery_ResponseAdapter.kt.expected
diff --git a/...aphql/com/example/deprecation/responseBased/adapter/TestQuery_ResponseAdapter.kt.expected b/...aphql/com/example/deprecation/responseBased/adapter/TestQuery_ResponseAdapter.kt.expected
diff --git a/...raphql/com/example/enum_field/responseBased/adapter/TestQuery_ResponseAdapter.kt.expected b/...raphql/com/example/enum_field/responseBased/adapter/TestQuery_ResponseAdapter.kt.expected
diff --git a/.../field_with_include_directive/responseBased/adapter/TestQuery_ResponseAdapter.kt.expected b/.../field_with_include_directive/responseBased/adapter/TestQuery_ResponseAdapter.kt.expected
diff --git a/...fieldset_with_multiple_super/operationBased/adapter/TestQuery_ResponseAdapter.kt.expected b/...fieldset_with_multiple_super/operationBased/adapter/TestQuery_ResponseAdapter.kt.expected
diff --git a/.../fieldset_with_multiple_super/responseBased/adapter/TestQuery_ResponseAdapter.kt.expected b/.../fieldset_with_multiple_super/responseBased/adapter/TestQuery_ResponseAdapter.kt.expected
diff --git a/...agment_spread_with_include_directive/compat/adapter/TestQuery_ResponseAdapter.kt.expected b/...agment_spread_with_include_directive/compat/adapter/TestQuery_ResponseAdapter.kt.expected
diff --git a/...pread_with_include_directive/operationBased/adapter/TestQuery_ResponseAdapter.kt.expected b/...pread_with_include_directive/operationBased/adapter/TestQuery_ResponseAdapter.kt.expected
diff --git a/...e/fragment_spread_with_nested_fields/compat/adapter/TestQuery_ResponseAdapter.kt.expected b/...e/fragment_spread_with_nested_fields/compat/adapter/TestQuery_ResponseAdapter.kt.expected
diff --git a/...nt_spread_with_nested_fields/operationBased/adapter/TestQuery_ResponseAdapter.kt.expected b/...nt_spread_with_nested_fields/operationBased/adapter/TestQuery_ResponseAdapter.kt.expected
diff --git a/...ad_with_nested_fields/operationBased/fragment/HeroDetailsImpl_ResponseAdapter.kt.expected b/...ad_with_nested_fields/operationBased/fragment/HeroDetailsImpl_ResponseAdapter.kt.expected
diff --git a/...ent_spread_with_nested_fields/responseBased/adapter/TestQuery_ResponseAdapter.kt.expected b/...ent_spread_with_nested_fields/responseBased/adapter/TestQuery_ResponseAdapter.kt.expected
diff --git a/...ead_with_nested_fields/responseBased/fragment/HeroDetailsImpl_ResponseAdapter.kt.expected b/...ead_with_nested_fields/responseBased/fragment/HeroDetailsImpl_ResponseAdapter.kt.expected
diff --git a/...phql/com/example/fragment_used_twice/compat/adapter/TestQuery_ResponseAdapter.kt.expected b/...phql/com/example/fragment_used_twice/compat/adapter/TestQuery_ResponseAdapter.kt.expected
diff --git a/...m/example/fragment_used_twice/compat/fragment/HeroDetailsImpl_ResponseAdapter.kt.expected b/...m/example/fragment_used_twice/compat/fragment/HeroDetailsImpl_ResponseAdapter.kt.expected
diff --git a/.../example/fragment_used_twice/compat/fragment/HumanDetailsImpl_ResponseAdapter.kt.expected b/.../example/fragment_used_twice/compat/fragment/HumanDetailsImpl_ResponseAdapter.kt.expected