Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@
import java.util.List;
import java.util.Map;
import java.util.Objects;
import java.util.stream.Collectors;

import static graphql.schema.GraphQLTypeUtil.isList;
import static graphql.schema.GraphQLTypeUtil.isNonNull;
Expand Down Expand Up @@ -107,13 +108,18 @@ private void checkFieldArgumentEquivalence(GraphQLImplementingType implementingT
List<GraphQLArgument> interfaceArgs = interfaceFieldDef.getArguments();
List<GraphQLArgument> objectArgs = objectFieldDef.getArguments();

if (interfaceArgs.size() > objectArgs.size()) {
Map<String, GraphQLArgument> interfaceArgsByName = FpKit.getByName(interfaceArgs, GraphQLArgument::getName);
List<String> objectArgsNames = FpKit.map(objectArgs, GraphQLArgument::getName);

if (!objectArgsNames.containsAll(interfaceArgsByName.keySet())) {
final String missingArgsNames = interfaceArgsByName.keySet().stream()
.filter(name -> !objectArgsNames.contains(name))
.collect(Collectors.joining(", "));

validationErrorCollector.addError(
error(format("%s type '%s' does not implement interface '%s' because field '%s' has a different number of arguments",
TYPE_OF_MAP.get(implementingType.getClass()), implementingType.getName(), interfaceType.getName(), interfaceFieldDef.getName())));
error(format("%s type '%s' does not implement interface '%s' because field '%s' is missing argument(s): '%s'",
TYPE_OF_MAP.get(implementingType.getClass()), implementingType.getName(), interfaceType.getName(), interfaceFieldDef.getName(), missingArgsNames)));
} else {
Map<String, GraphQLArgument> interfaceArgsByName = FpKit.getByName(interfaceArgs, GraphQLArgument::getName);

objectArgs.forEach(objectArg -> {
GraphQLArgument interfaceArg = interfaceArgsByName.get(objectArg.getName());

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -1075,7 +1075,7 @@ type Query {
assertErrorMessage(error,
"interface type 'Interface2' does not implement interface 'Interface1' because field 'field1' argument 'arg1' is defined differently",
"interface type 'Interface2' does not implement interface 'Interface1' because field 'field2' is defined as 'Int' type and not as 'String' type",
"interface type 'Interface2' does not implement interface 'Interface1' because field 'field3' has a different number of arguments",
"interface type 'Interface2' does not implement interface 'Interface1' because field 'field3' is missing argument(s): 'arg3'",
"interface type 'Interface2' does not implement interface 'Interface1' because field 'field4' is missing"
)
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,13 +2,10 @@ package graphql.schema.validation

import graphql.TypeResolutionEnvironment
import graphql.schema.GraphQLInterfaceType
import graphql.schema.GraphQLNonNull
import graphql.schema.GraphQLObjectType
import graphql.schema.TypeResolver
import spock.lang.Specification

import java.util.stream.Collectors

import static SchemaValidationErrorType.ObjectDoesNotImplementItsInterfaces
import static graphql.Scalars.GraphQLBoolean
import static graphql.Scalars.GraphQLInt
Expand Down Expand Up @@ -97,7 +94,7 @@ class TypesImplementInterfacesTest extends Specification {
errors.contains(new SchemaValidationError(ObjectDoesNotImplementItsInterfaces,
"object type 'obj' does not implement interface 'Interface' because field 'argField1' argument 'arg4' is defined differently"))
errors.contains(new SchemaValidationError(ObjectDoesNotImplementItsInterfaces,
"object type 'obj' does not implement interface 'Interface' because field 'argField2' has a different number of arguments"))
"object type 'obj' does not implement interface 'Interface' because field 'argField2' is missing argument(s): 'arg2, arg3'"))
}

def "field is object implementing interface"() {
Expand Down Expand Up @@ -346,6 +343,37 @@ class TypesImplementInterfacesTest extends Specification {
errors.isEmpty()
}

def "type should declare all arguments present in implemented interface"() {
given:

GraphQLInterfaceType InterfaceType = newInterface()
.name("Interface")
.field(newFieldDefinition().name("argField").type(GraphQLString)
.argument(newArgument().name("arg1").type(GraphQLInt))
.argument(newArgument().name("arg2").type(GraphQLInt))
)
.build()

SchemaValidationErrorCollector errorCollector = new SchemaValidationErrorCollector()

GraphQLObjectType objType = GraphQLObjectType.newObject()
.name("Object")
.withInterface(InterfaceType)
.field(newFieldDefinition().name("argField").type(GraphQLString)
.argument(newArgument().name("argX").type(GraphQLInt))
.argument(newArgument().name("argZ").type(GraphQLInt))
)
.build()

when:
new TypesImplementInterfaces().check(objType, errorCollector)

then:
def errors = errorCollector.getErrors()
errors.size() == 1
errors.iterator().next().description == "object type 'Object' does not implement interface 'Interface' because field 'argField' is missing argument(s): 'arg1, arg2'"
}

def "type cannot declare extra non-null field arguments"() {
given:

Expand Down