Skip to content

Stable port of #2940 #2947

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
bbakerman merged 1 commit into from
Sep 7, 2022
Merged

Stable port of #2940 #2947

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
7 changes: 7 additions & 0 deletions src/main/java/graphql/schema/idl/SchemaGeneratorHelper.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -80,8 +80,10 @@

import static graphql.Assert.assertNotNull;
import static graphql.Directives.DEPRECATED_DIRECTIVE_DEFINITION;
import static graphql.Directives.IncludeDirective;
import static graphql.Directives.NO_LONGER_SUPPORTED;
import static graphql.Directives.SPECIFIED_BY_DIRECTIVE_DEFINITION;
import static graphql.Directives.SkipDirective;
import static graphql.Directives.SpecifiedByDirective;
import static graphql.collect.ImmutableKit.emptyList;
import static graphql.introspection.Introspection.DirectiveLocation.ARGUMENT_DEFINITION;
Expand Down Expand Up @@ -1055,6 +1057,11 @@ Set<GraphQLDirective> buildAdditionalDirectiveDefinitions(BuildContext buildCtx)
TypeDefinitionRegistry typeRegistry = buildCtx.getTypeRegistry();

for (DirectiveDefinition directiveDefinition : typeRegistry.getDirectiveDefinitions().values()) {
if (IncludeDirective.getName().equals(directiveDefinition.getName())
|| SkipDirective.getName().equals(directiveDefinition.getName())) {
// skip and include directives are added by default to the GraphQLSchema via the GraphQLSchema builder.
continue;
}
GraphQLDirective directive = buildDirectiveDefinitionFromAst(buildCtx, directiveDefinition, inputTypeFactory(buildCtx));
buildCtx.addDirectiveDefinition(directive);
additionalDirectives.add(directive);
Expand Down
31 changes: 31 additions & 0 deletions src/test/groovy/graphql/schema/idl/SchemaGeneratorTest.groovy
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2533,4 +2533,35 @@ class SchemaGeneratorTest extends Specification {
then:
noExceptionThrown()
}

def "skip and include should be added to the schema only if not already defined"() {
def sdl = '''
"Directs the executor to skip this field or fragment when the `if`'argument is true."
directive @skip(
"Skipped when true."
if: Boolean!
) on FIELD | FRAGMENT_SPREAD | INLINE_FRAGMENT

"Directs the executor to include this field or fragment only when the `if` argument is true"
directive @include(
"Included when true."
if: Boolean!
) on FIELD | FRAGMENT_SPREAD | INLINE_FRAGMENT

type Query {
hello: String
}
'''
when:
def schema = TestUtil.schema(sdl)
then:
schema.getDirectives().findAll { it.name == "skip" }.size() == 1
schema.getDirectives().findAll { it.name == "include" }.size() == 1

and:
def newSchema = GraphQLSchema.newSchema(schema).build()
then:
newSchema.getDirectives().findAll { it.name == "skip" }.size() == 1
newSchema.getDirectives().findAll { it.name == "include" }.size() == 1
}
}