Skip to content

Commit d194761

Browse files
authored
Merge pull request #3014 from graphql-java/fix-argument-directives-implementations
Bugfix for SDL check if an Interface is implemented correctly
2 parents 5c0c68b + ae51c2d commit d194761

2 files changed

Lines changed: 32 additions & 2 deletions

File tree

‎src/main/java/graphql/schema/idl/ImplementingTypesChecker.java‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -186,8 +186,9 @@ private void checkArgumentConsistency(
186186
if (objectArg == null) {
187187
errors.add(new MissingInterfaceFieldArgumentsError(typeOfType, objectTypeDef, interfaceTypeDef, objectFieldDef));
188188
} else {
189-
String interfaceArgStr = AstPrinter.printAstCompact(interfaceArg);
190-
String objectArgStr = AstPrinter.printAstCompact(objectArg);
189+
// we need to remove the not relevant applied directives on the argument definitions to compare
190+
String interfaceArgStr = AstPrinter.printAstCompact(interfaceArg.transform(builder -> builder.directives(emptyList())));
191+
String objectArgStr = AstPrinter.printAstCompact(objectArg.transform(builder -> builder.directives(emptyList())));
191192
if (!interfaceArgStr.equals(objectArgStr)) {
192193
errors.add(new InterfaceFieldArgumentRedefinitionError(typeOfType, objectTypeDef, interfaceTypeDef, objectFieldDef, objectArgStr, interfaceArgStr));
193194
}

‎src/test/groovy/graphql/schema/idl/SchemaTypeCheckerTest.groovy‎

Lines changed: 29 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -708,6 +708,35 @@ class SchemaTypeCheckerTest extends Specification {
708708

709709
}
710710

711+
def "directives on arguments are not relevant"() {
712+
def spec = """
713+
directive @d on ARGUMENT_DEFINITION
714+
interface InterfaceType {
715+
fieldB(arg1 : String = "defaultVal", arg2 : String @d, arg3 : Int @d) : String
716+
}
717+
718+
type BaseType {
719+
fieldX : Int
720+
}
721+
722+
extend type BaseType implements InterfaceType {
723+
fieldB(arg1 : String = "defaultVal" @d, arg2 : String, arg3 : Int) : String
724+
}
725+
726+
schema {
727+
query : BaseType
728+
}
729+
"""
730+
731+
def result = check(spec)
732+
733+
expect:
734+
result.isEmpty()
735+
736+
}
737+
738+
739+
711740
def "test field arguments on object can contain additional optional arguments"() {
712741
def spec = """
713742
interface InterfaceType {

0 commit comments

Comments
 (0)