Skip to content

Commit a059442

Browse files
feat: make builder use null graphQLContext if null was provided (#1607)
1 parent a057368 commit a059442

File tree

2 files changed

+3
-1
lines changed

2 files changed

+3
-1
lines changed

servers/graphql-kotlin-server/src/main/kotlin/com/expediagroup/graphql/server/extensions/requestExtensions.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ fun GraphQLRequest.toExecutionInput(
3636
.extensions(this.extensions ?: emptyMap())
3737
.dataLoaderRegistry(dataLoaderRegistry ?: KotlinDataLoaderRegistry())
3838
.also { builder ->
39-
graphQLContext?.let { builder.context(it) }
39+
builder.context(graphQLContext)
4040
graphQLContextMap?.let { builder.graphQLContext(it) }
4141
}
4242
.build()

servers/graphql-kotlin-server/src/test/kotlin/com/expediagroup/graphql/server/extensions/RequestExtensionsKtTest.kt

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@ import org.dataloader.DataLoader
2424
import org.junit.jupiter.api.Test
2525
import kotlin.test.assertEquals
2626
import kotlin.test.assertNotNull
27+
import kotlin.test.assertNull
2728
import kotlin.test.assertTrue
2829

2930
class RequestExtensionsKtTest {
@@ -80,6 +81,7 @@ class RequestExtensionsKtTest {
8081

8182
val executionInput = request.toExecutionInput(graphQLContextMap = context)
8283
assertEquals(1, executionInput.graphQLContext.get("foo"))
84+
assertNull(executionInput.context)
8385
}
8486

8587
@Test

0 commit comments

Comments
 (0)