Refactor source input to be an object

atlassian-labs · Dec 27, 2023 · b6f553f · b6f553f
1 parent a93fe91
commit b6f553f
Show file tree

Hide file tree

Showing 7 changed files with 129 additions and 102 deletions.
diff --git a/...java/graphql/nadel/engine/transform/hydration/batch/NadelNewBatchHydrationInputBuilder.kt b/...java/graphql/nadel/engine/transform/hydration/batch/NadelNewBatchHydrationInputBuilder.kt
@@ -19,19 +19,19 @@ import graphql.schema.GraphQLTypeUtil
  * [NadelBatchHydrationFieldInstruction.batchSize] was exceeded etc.
  */
 internal data class NadelHydrationArgumentsBatch(
-    val sourceIds: List<JsonNode>,
+    val sourceInputs: List<JsonNode>,
     val arguments: Map<NadelHydrationActorInputDef, NormalizedInputValue>,
 )
 
 /**
  * An [NormalizedInputValue] for one query to a service.
  *
- * i.e. this object represents one batch of the [sourceIds] values that we send down.
+ * i.e. this object represents one batch of the [sourceInputs] values that we send down.
  *
  * An intermediary object to store info while we pass data around functions.
  */
 private data class BatchedArgumentValue(
-    val sourceIds: List<JsonNode>,
+    val sourceInputs: List<JsonNode>,
     val argumentDef: NadelHydrationActorInputDef,
     val argumentValue: NormalizedInputValue,
 )
@@ -50,23 +50,23 @@ internal object NadelNewBatchHydrationInputBuilder {
         userContext: Any?,
         instruction: NadelBatchHydrationFieldInstruction,
         hydrationField: ExecutableNormalizedField,
-        sourceIds: List<JsonNode>,
+        sourceInputs: List<JsonNode>,
     ): List<NadelHydrationArgumentsBatch> {
         val nonBatchArgs = getNonBatchInputValues(instruction, hydrationField)
-        val batchArgs = getBatchArgumentValue(instruction, sourceIds, hooks, userContext)
+        val batchArgs = getBatchArgumentValue(instruction, sourceInputs, hooks, userContext)
 
         return batchArgs
             .map { batchedArgument ->
                 NadelHydrationArgumentsBatch(
                     arguments = nonBatchArgs + (batchedArgument.argumentDef to batchedArgument.argumentValue),
-                    sourceIds = batchedArgument.sourceIds,
+                    sourceInputs = batchedArgument.sourceInputs,
                 )
             }
     }
 
     private fun getBatchArgumentValue(
         instruction: NadelBatchHydrationFieldInstruction,
-        sourceIds: List<JsonNode>,
+        sourceInputs: List<JsonNode>,
         hooks: NadelExecutionHooks,
         userContext: Any?,
     ): List<BatchedArgumentValue> {
@@ -76,7 +76,7 @@ internal object NadelNewBatchHydrationInputBuilder {
         val actorBatchArgDef = instruction.actorFieldDef.getArgument(batchInputDef.name)
 
         val partitionArgumentList = hooks.partitionBatchHydrationArgumentList(
-            argumentValues = sourceIds.map { it.value },
+            argumentValues = sourceInputs.map { it.value },
             instruction = instruction,
             userContext = userContext,
         )
@@ -92,7 +92,7 @@ internal object NadelNewBatchHydrationInputBuilder {
                 )
 
                 BatchedArgumentValue(
-                    sourceIds = chunk
+                    sourceInputs = chunk
                         .map {
                             JsonNode(it)
                         },