Fix short circuit introspection for namespace like fields #697
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,41 @@ | ||
| package graphql.nadel.tests.next.fixtures.introspection | ||
|
|
||
| import graphql.nadel.NadelExecutionHints | ||
| import graphql.nadel.tests.next.NadelIntegrationTest | ||
|
|
||
| class NamespaceLikeShortCircuitsIntrospectionTest : NadelIntegrationTest( | ||
| query = """ | ||
| { | ||
| test { | ||
| __typename | ||
| } | ||
| } | ||
| """.trimIndent(), | ||
| services = listOf( | ||
| Service( | ||
| name = "myService", | ||
| overallSchema = """ | ||
| type Query { | ||
| test: TestQuery | ||
| } | ||
| type TestQuery { | ||
| echo: String | ||
| } | ||
| """.trimIndent(), | ||
| runtimeWiring = { wiring -> | ||
| wiring | ||
| .type("Query") { type -> | ||
| type | ||
| .dataFetcher("echo") { env -> | ||
| "echo" | ||
| } | ||
| } | ||
| }, | ||
| ), | ||
| ), | ||
| ) { | ||
| override fun makeExecutionHints(): NadelExecutionHints.Builder { | ||
| return super.makeExecutionHints() | ||
| .shortCircuitEmptyQuery { true } | ||
| } | ||
| } |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,50 @@ | ||
| // @formatter:off | ||
| package graphql.nadel.tests.next.fixtures.introspection | ||
|
|
||
| import graphql.nadel.tests.next.ExpectedNadelResult | ||
| import graphql.nadel.tests.next.ExpectedServiceCall | ||
| import graphql.nadel.tests.next.TestSnapshot | ||
| import graphql.nadel.tests.next.listOfJsonStrings | ||
| import kotlin.Suppress | ||
| import kotlin.collections.List | ||
| import kotlin.collections.listOf | ||
|
|
||
| private suspend fun main() { | ||
| graphql.nadel.tests.next.update<NamespaceLikeShortCircuitsIntrospectionTest>() | ||
| } | ||
|
|
||
| /** | ||
| * This class is generated. Do NOT modify. | ||
| * | ||
| * Refer to [graphql.nadel.tests.next.UpdateTestSnapshots] | ||
| */ | ||
| @Suppress("unused") | ||
| public class NamespaceLikeShortCircuitsIntrospectionTestSnapshot : TestSnapshot() { | ||
| override val calls: List<ExpectedServiceCall> = listOf( | ||
| ) | ||
|
Collaborator
Author
There was a problem hiding this comment. So here the calls are empty because the tests are executed by our internal introspection service. |
||
|
|
||
| /** | ||
| * ```json | ||
| * { | ||
| * "data": { | ||
| * "test": { | ||
| * "__typename": "TestQuery" | ||
| * } | ||
| * } | ||
| * } | ||
| * ``` | ||
| */ | ||
| override val result: ExpectedNadelResult = ExpectedNadelResult( | ||
| result = """ | ||
| | { | ||
| | "data": { | ||
| | "test": { | ||
| | "__typename": "TestQuery" | ||
|
Collaborator
Author
There was a problem hiding this comment. Prior to this PR's fix, it would error out like so {
"errors": [
{
"message": "Exception while fetching data (/test) : Internal error: should never happen: This data fetcher should NEVER be called from Nadel",
"locations": [
{
"column": 2,
"line": 1
}
],
"path": [
"test"
],
"extensions": {
"classification": "DataFetchingException"
}
}
],
"data": {
"test": null
}
} |
||
| | } | ||
| | } | ||
| | } | ||
| """.trimMargin(), | ||
| delayedResults = listOfJsonStrings( | ||
| ), | ||
| ) | ||
| } | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,47 @@ | ||
| package graphql.nadel.tests.next.fixtures.introspection | ||
|
|
||
| import graphql.nadel.NadelExecutionHints | ||
| import graphql.nadel.tests.next.NadelIntegrationTest | ||
|
|
||
| class NamespaceMutationLikeShortCircuitsIntrospectionTest : NadelIntegrationTest( | ||
| query = """ | ||
| mutation { | ||
| test { | ||
| __typename | ||
| } | ||
| } | ||
| """.trimIndent(), | ||
| services = listOf( | ||
| Service( | ||
| name = "myService", | ||
| overallSchema = """ | ||
| type Query { | ||
| test: TestQuery | ||
| } | ||
| type TestQuery { | ||
| echo: String | ||
| } | ||
| type Mutation { | ||
| test: TestMutation | ||
| } | ||
| type TestMutation { | ||
| echo: String | ||
| } | ||
| """.trimIndent(), | ||
| runtimeWiring = { wiring -> | ||
| wiring | ||
| .type("Query") { type -> | ||
| type | ||
| .dataFetcher("echo") { env -> | ||
| "echo" | ||
| } | ||
| } | ||
| }, | ||
| ), | ||
| ), | ||
| ) { | ||
| override fun makeExecutionHints(): NadelExecutionHints.Builder { | ||
| return super.makeExecutionHints() | ||
| .shortCircuitEmptyQuery { true } | ||
| } | ||
| } |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,50 @@ | ||
| // @formatter:off | ||
| package graphql.nadel.tests.next.fixtures.introspection | ||
|
|
||
| import graphql.nadel.tests.next.ExpectedNadelResult | ||
| import graphql.nadel.tests.next.ExpectedServiceCall | ||
| import graphql.nadel.tests.next.TestSnapshot | ||
| import graphql.nadel.tests.next.listOfJsonStrings | ||
| import kotlin.Suppress | ||
| import kotlin.collections.List | ||
| import kotlin.collections.listOf | ||
|
|
||
| private suspend fun main() { | ||
| graphql.nadel.tests.next.update<NamespaceMutationLikeShortCircuitsIntrospectionTest>() | ||
| } | ||
|
|
||
| /** | ||
| * This class is generated. Do NOT modify. | ||
| * | ||
| * Refer to [graphql.nadel.tests.next.UpdateTestSnapshots] | ||
| */ | ||
| @Suppress("unused") | ||
| public class NamespaceMutationLikeShortCircuitsIntrospectionTestSnapshot : TestSnapshot() { | ||
| override val calls: List<ExpectedServiceCall> = listOf( | ||
| ) | ||
|
|
||
| /** | ||
| * ```json | ||
| * { | ||
| * "data": { | ||
| * "test": { | ||
| * "__typename": "TestMutation" | ||
| * } | ||
| * } | ||
| * } | ||
| * ``` | ||
| */ | ||
| override val result: ExpectedNadelResult = ExpectedNadelResult( | ||
| result = """ | ||
| | { | ||
| | "data": { | ||
| | "test": { | ||
| | "__typename": "TestMutation" | ||
| | } | ||
| | } | ||
| | } | ||
| """.trimMargin(), | ||
| delayedResults = listOfJsonStrings( | ||
| ), | ||
| ) | ||
| } |
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Extracted this code into common
NamespacedUtil.isNamespaceFieldLike