Skip to content
Closed
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
55 changes: 38 additions & 17 deletions src/main/java/graphql/schema/idl/ImplementingTypesChecker.java
Original file line number Diff line number Diff line change
Expand Up @@ -66,30 +66,38 @@ void checkImplementingTypes(List<GraphQLError> errors, TypeDefinitionRegistry ty
List<InterfaceTypeDefinition> interfaces = typeRegistry.getTypes(InterfaceTypeDefinition.class);
List<ObjectTypeDefinition> objects = typeRegistry.getTypes(ObjectTypeDefinition.class);

Map<String, List<ObjectTypeExtensionDefinition>> objectTypeExtensions = typeRegistry.objectTypeExtensions();
Map<String, List<InterfaceTypeExtensionDefinition>> interfaceTypeExtensions = typeRegistry.interfaceTypeExtensions();

Stream.<ImplementingTypeDefinition<?>>concat(interfaces.stream(), objects.stream())
.forEach(type -> checkImplementingType(errors, typeRegistry, type));
.forEach(type -> checkImplementingType(errors, typeRegistry, type, objectTypeExtensions, interfaceTypeExtensions));
}

private void checkImplementingType(
List<GraphQLError> errors,
TypeDefinitionRegistry typeRegistry,
ImplementingTypeDefinition type) {
ImplementingTypeDefinition type,
Map<String, List<ObjectTypeExtensionDefinition>> objectTypeExtensions,
Map<String, List<InterfaceTypeExtensionDefinition>> interfaceTypeDefinition
) {

Map<InterfaceTypeDefinition, ImplementingTypeDefinition> implementedInterfaces =
checkInterfacesNotImplementedMoreThanOnce(errors, type, typeRegistry);
checkInterfacesNotImplementedMoreThanOnce(errors, type, typeRegistry, objectTypeExtensions, interfaceTypeDefinition);

checkInterfaceIsImplemented(errors, typeRegistry, type, implementedInterfaces);
checkInterfaceIsImplemented(errors, typeRegistry, type, implementedInterfaces, objectTypeExtensions, interfaceTypeDefinition);

checkAncestorImplementation(errors, typeRegistry, type, implementedInterfaces);
checkAncestorImplementation(errors, typeRegistry, type, implementedInterfaces, objectTypeExtensions, interfaceTypeDefinition);
}

private Map<InterfaceTypeDefinition, ImplementingTypeDefinition> checkInterfacesNotImplementedMoreThanOnce(
List<GraphQLError> errors,
ImplementingTypeDefinition type,
TypeDefinitionRegistry typeRegistry
TypeDefinitionRegistry typeRegistry,
Map<String, List<ObjectTypeExtensionDefinition>> objectTypeExtensions,
Map<String, List<InterfaceTypeExtensionDefinition>> interfaceTypeDefinition
) {
Map<InterfaceTypeDefinition, List<ImplementingTypeDefinition>> implementedInterfaces =
getLogicallyImplementedInterfaces(type, typeRegistry);
getLogicallyImplementedInterfaces(type, typeRegistry, objectTypeExtensions, interfaceTypeDefinition);

Map<InterfaceTypeDefinition, ImplementingTypeDefinition> interfacesImplementedOnce = implementedInterfaces.entrySet()
.stream()
Expand All @@ -114,15 +122,23 @@ private void checkAncestorImplementation(
List<GraphQLError> errors,
TypeDefinitionRegistry typeRegistry,
ImplementingTypeDefinition type,
Map<InterfaceTypeDefinition, ImplementingTypeDefinition> implementedInterfaces) {
Map<InterfaceTypeDefinition, ImplementingTypeDefinition> implementedInterfaces,
Map<String, List<ObjectTypeExtensionDefinition>> objectTypeExtensions,
Map<String, List<InterfaceTypeExtensionDefinition>> interfaceTypeDefinition
) {

if (implementedInterfaces.containsKey(type)) {
errors.add(new InterfaceImplementingItselfError(TYPE_OF_MAP.get(type.getClass()), type));
return;
}

implementedInterfaces.forEach((implementedInterface, implementingType) -> {
Set<InterfaceTypeDefinition> transitiveInterfaces = getLogicallyImplementedInterfaces(implementedInterface, typeRegistry).keySet();
Set<InterfaceTypeDefinition> transitiveInterfaces = getLogicallyImplementedInterfaces(
implementedInterface,
typeRegistry,
objectTypeExtensions,
interfaceTypeDefinition
).keySet();

transitiveInterfaces.forEach(transitiveInterface -> {
if (transitiveInterface.equals(type)) {
Expand All @@ -138,9 +154,11 @@ private void checkInterfaceIsImplemented(
List<GraphQLError> errors,
TypeDefinitionRegistry typeRegistry,
ImplementingTypeDefinition type,
Map<InterfaceTypeDefinition, ImplementingTypeDefinition> implementedInterfaces
Map<InterfaceTypeDefinition, ImplementingTypeDefinition> implementedInterfaces,
Map<String, List<ObjectTypeExtensionDefinition>> objectTypeExtensions,
Map<String, List<InterfaceTypeExtensionDefinition>> interfaceTypeDefinition
) {
Set<FieldDefinition> fieldDefinitions = getLogicallyDeclaredFields(type, typeRegistry);
Set<FieldDefinition> fieldDefinitions = getLogicallyDeclaredFields(type, objectTypeExtensions, interfaceTypeDefinition);

Map<String, FieldDefinition> typeFields = fieldDefinitions.stream()
.collect(toMap(FieldDefinition::getName, Function.identity(), mergeFirstValue()));
Expand Down Expand Up @@ -212,12 +230,14 @@ private void checkArgumentConsistency(

private Map<InterfaceTypeDefinition, List<ImplementingTypeDefinition>> getLogicallyImplementedInterfaces(
ImplementingTypeDefinition type,
TypeDefinitionRegistry typeRegistry
TypeDefinitionRegistry typeRegistry,
Map<String, List<ObjectTypeExtensionDefinition>> objectTypeExtensions,
Map<String, List<InterfaceTypeExtensionDefinition>> interfaceTypeDefinition
) {

Stream<ImplementingTypeDefinition> extensions = Stream.concat(
typeRegistry.interfaceTypeExtensions().getOrDefault(type.getName(), emptyList()).stream(),
typeRegistry.objectTypeExtensions().getOrDefault(type.getName(), emptyList()).stream()
interfaceTypeDefinition.getOrDefault(type.getName(), emptyList()).stream(),
objectTypeExtensions.getOrDefault(type.getName(), emptyList()).stream()
);

return Stream.concat(Stream.of(type), extensions)
Expand All @@ -235,12 +255,13 @@ private Map<InterfaceTypeDefinition, List<ImplementingTypeDefinition>> getLogica

private Set<FieldDefinition> getLogicallyDeclaredFields(
ImplementingTypeDefinition type,
TypeDefinitionRegistry typeRegistry
Map<String, List<ObjectTypeExtensionDefinition>> objectTypeExtensions,
Map<String, List<InterfaceTypeExtensionDefinition>> interfaceTypeDefinition
) {

Stream<ImplementingTypeDefinition> extensions = Stream.concat(
typeRegistry.interfaceTypeExtensions().getOrDefault(type.getName(), emptyList()).stream(),
typeRegistry.objectTypeExtensions().getOrDefault(type.getName(), emptyList()).stream()
interfaceTypeDefinition.getOrDefault(type.getName(), emptyList()).stream(),
objectTypeExtensions.getOrDefault(type.getName(), emptyList()).stream()
);

return Stream.concat(Stream.of(type), extensions)
Expand Down
4 changes: 3 additions & 1 deletion src/main/java/graphql/schema/idl/SchemaGeneratorHelper.java
Original file line number Diff line number Diff line change
Expand Up @@ -112,6 +112,7 @@ public class SchemaGeneratorHelper {
*/
static class BuildContext {
private final TypeDefinitionRegistry typeRegistry;
private final Map<String, List<ObjectTypeExtensionDefinition>> objectTypeExtensions;
private final RuntimeWiring wiring;
private final Deque<String> typeStack = new ArrayDeque<>();

Expand All @@ -125,6 +126,7 @@ static class BuildContext {

BuildContext(TypeDefinitionRegistry typeRegistry, RuntimeWiring wiring, Map<String, OperationTypeDefinition> operationTypeDefinitions, SchemaGenerator.Options options) {
this.typeRegistry = typeRegistry;
this.objectTypeExtensions = typeRegistry.objectTypeExtensions();
this.wiring = wiring;
this.codeRegistry = GraphQLCodeRegistry.newCodeRegistry(wiring.getCodeRegistry());
this.operationTypeDefs = operationTypeDefinitions;
Expand Down Expand Up @@ -981,7 +983,7 @@ List<InterfaceTypeExtensionDefinition> interfaceTypeExtensions(InterfaceTypeDefi
}

List<ObjectTypeExtensionDefinition> objectTypeExtensions(ObjectTypeDefinition typeDefinition, BuildContext buildCtx) {
return buildCtx.getTypeRegistry().objectTypeExtensions().getOrDefault(typeDefinition.getName(), emptyList());
return buildCtx.objectTypeExtensions.getOrDefault(typeDefinition.getName(), emptyList());
}

List<UnionTypeExtensionDefinition> unionTypeExtensions(UnionTypeDefinition typeDefinition, BuildContext buildCtx) {
Expand Down