Skip to content

Add query complexity limits and refactor GoodFaithIntrospection to use validation #4256

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
andimarek merged 12 commits into from
Mar 23, 2026
Merged

Add query complexity limits and refactor GoodFaithIntrospection to use validation #4256

Changes from 1 commit
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
2ef412a
Add query depth and field count limits to Validator
andimarek Jan 28, 2026
c496ac1
Refactor GoodFaithIntrospection to use validation instead of ENO
andimarek Feb 13, 2026
97d10d2
Fix NullAway errors and adapt to master's naming conventions after re…
andimarek Mar 22, 2026
455c7c8
Fix benchmark test to use unlimited QueryComplexityLimits
andimarek Mar 22, 2026
deb35be
Add tests for tooBigOperation good faith introspection path
andimarek Mar 22, 2026
901dafc
Detect introspection queries dynamically during validation
andimarek Mar 22, 2026
c7595a2
Merge branch 'master' into claude/build-and-run-tests-SByLK
andimarek Mar 23, 2026
8c8ea0a
Fix IntelliJ warnings in new code
andimarek Mar 23, 2026
31572d8
Remove redundant null check on queryType
andimarek Mar 23, 2026
5147481
Use Introspection constants instead of string literals
andimarek Mar 23, 2026
eadf432
Fix undefined sanitizedBranchName in dev version string
andimarek Mar 23, 2026
e9be74e
Add test for good faith disabled with custom validation predicate
andimarek Mar 23, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Fix benchmark test to use unlimited QueryComplexityLimits 
The OverlappingFieldsCanBeMergedBenchmarkTest uses intentionally large
queries (108k fields, depth 101) that exceed default complexity limits.
Pass QueryComplexityLimits.NONE to bypass the limits in these tests.

Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>
  • Loading branch information
@andimarek @claude
andimarek and claude committed Mar 22, 2026
commit 455c7c8767a1672af51dcaf7716b229cb60ebf19
8 changes: 6 additions & 2 deletions src/test/groovy/graphql/validation/OverlappingFieldsCanBeMergedBenchmarkTest.groovy
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ class OverlappingFieldsCanBeMergedBenchmarkTest extends Specification {
private List<ValidationError> validateQuery(GraphQLSchema schema, Document document) {
ValidationErrorCollector errorCollector = new ValidationErrorCollector()
I18n i18n = I18n.i18n(I18n.BundleType.Validation, Locale.ENGLISH)
ValidationContext validationContext = new ValidationContext(schema, document, i18n)
ValidationContext validationContext = new ValidationContext(schema, document, i18n, QueryComplexityLimits.NONE)
OperationValidator operationValidator = new OperationValidator(validationContext, errorCollector,
{ r -> r == OperationValidationRule.OVERLAPPING_FIELDS_CAN_BE_MERGED })
LanguageTraversal languageTraversal = new LanguageTraversal()
Expand All @@ -74,7 +74,11 @@ class OverlappingFieldsCanBeMergedBenchmarkTest extends Specification {
def "large schema query executes without errors"() {
when:
GraphQL graphQL = GraphQL.newGraphQL(schema).build()
ExecutionResult executionResult = graphQL.execute(loadResource("large-schema-4-query.graphql"))
def executionInput = graphql.ExecutionInput.newExecutionInput()
.query(loadResource("large-schema-4-query.graphql"))
.graphQLContext([(QueryComplexityLimits.KEY): QueryComplexityLimits.NONE])
.build()
ExecutionResult executionResult = graphQL.execute(executionInput)

then:
executionResult.errors.size() == 0
Expand Down
Loading