Moved back to Marc's implementation instead of precaching

bbakerman · bbakerman · commit 3e82b74372b3 · 2025-07-06T13:06:43.000+10:00
diff --git a/src/main/java/graphql/schema/idl/ImmutableTypeDefinitionRegistry.java b/src/main/java/graphql/schema/idl/ImmutableTypeDefinitionRegistry.java
@@ -39,9 +39,6 @@
 @NullMarked
 public class ImmutableTypeDefinitionRegistry extends TypeDefinitionRegistry {
 
-    private final Map<InterfaceTypeDefinition, List<ImplementingTypeDefinition>> allImplementationsOf;
-    private final Map<InterfaceTypeDefinition, List<ObjectTypeDefinition>> implementationsOf;
-
     ImmutableTypeDefinitionRegistry(TypeDefinitionRegistry registry) {
         super(
                 copyOf(registry.objectTypeExtensions),
@@ -57,50 +54,9 @@ public class ImmutableTypeDefinitionRegistry extends TypeDefinitionRegistry {
                 registry.schema,
                 registry.schemaParseOrder
         );
-        allImplementationsOf = calculateAllImplementsOf();
-        implementationsOf = calculateImplementationsOf(allImplementationsOf);
-    }
-
-    private Map<InterfaceTypeDefinition, List<ImplementingTypeDefinition>> calculateAllImplementsOf() {
-        ImmutableMap.Builder<InterfaceTypeDefinition, List<ImplementingTypeDefinition>> mapBuilder = ImmutableMap.builder();
-        List<ImplementingTypeDefinition> implementingTypeDefinitions = getTypes(ImplementingTypeDefinition.class);
-        for (TypeDefinition typeDef : types.values()) {
-            if (typeDef instanceof InterfaceTypeDefinition) {
-                InterfaceTypeDefinition interfaceTypeDef = (InterfaceTypeDefinition) typeDef;
-                ImmutableList.Builder<ImplementingTypeDefinition> listBuilder = ImmutableList.builder();
-                for (ImplementingTypeDefinition<?> implementingTypeDefinition : implementingTypeDefinitions) {
-                    List<Type> implementsList = implementingTypeDefinition.getImplements();
-                    for (Type iFace : implementsList) {
-                        Optional<InterfaceTypeDefinition> implementsAnInterface = getType(iFace, InterfaceTypeDefinition.class);
-                        if (implementsAnInterface.isPresent()) {
-                            boolean equals = implementsAnInterface.get().getName().equals(interfaceTypeDef.getName());
-                            if (equals) {
-                                listBuilder.add(implementingTypeDefinition);
-                                break;
-                            }
-                        }
-                    }
-                }
-                mapBuilder.put(interfaceTypeDef, listBuilder.build());
-            }
-        }
-        return mapBuilder.build();
-    }
-
-    private Map<InterfaceTypeDefinition, List<ObjectTypeDefinition>> calculateImplementationsOf(Map<InterfaceTypeDefinition, List<ImplementingTypeDefinition>> allImplementationsOf1) {
-        ImmutableMap.Builder<InterfaceTypeDefinition, List<ObjectTypeDefinition>> mapBuilder = ImmutableMap.builder();
-        for (Map.Entry<InterfaceTypeDefinition, List<ImplementingTypeDefinition>> entry : allImplementationsOf1.entrySet()) {
-            ImmutableList.Builder<ObjectTypeDefinition> listBuilder = ImmutableList.builder();
-            for (ImplementingTypeDefinition implementingTypeDefinition : entry.getValue()) {
-                if (implementingTypeDefinition instanceof ObjectTypeDefinition) {
-                    listBuilder.add((ObjectTypeDefinition) implementingTypeDefinition);
-                }
-            }
-            mapBuilder.put(entry.getKey(), listBuilder.build());
-        }
-        return mapBuilder.build();
     }
 
+
     private UnsupportedOperationException unsupportedOperationException() {
         return new UnsupportedOperationException("The TypeDefinitionRegistry is in read only mode");
     }
@@ -179,14 +135,4 @@ public List<SchemaExtensionDefinition> getSchemaExtensionDefinitions() {
     public Map<String, DirectiveDefinition> getDirectiveDefinitions() {
         return directiveDefinitions;
     }
-
-    @Override
-    public List<ImplementingTypeDefinition> getAllImplementationsOf(InterfaceTypeDefinition targetInterface) {
-        return allImplementationsOf.getOrDefault(targetInterface, ImmutableList.of());
-    }
-
-    @Override
-    public List<ObjectTypeDefinition> getImplementationsOf(InterfaceTypeDefinition targetInterface) {
-        return implementationsOf.getOrDefault(targetInterface, ImmutableList.of());
-    }
 }
diff --git a/src/main/java/graphql/schema/idl/TypeDefinitionRegistry.java b/src/main/java/graphql/schema/idl/TypeDefinitionRegistry.java
@@ -768,10 +768,18 @@ public boolean isPossibleType(Type abstractType, Type possibleType) {
             return false;
         } else {
             InterfaceTypeDefinition iFace = (InterfaceTypeDefinition) abstractTypeDef;
-            List<ImplementingTypeDefinition> implementingTypeDefinitions = getAllImplementationsOf(iFace);
-            for (ImplementingTypeDefinition implementingTypeDefinition : implementingTypeDefinitions) {
-                if (implementingTypeDefinition.getName().equals(targetObjectTypeDef.getName())) {
-                    return true;
+            for (TypeDefinition<?> t : types.values()) {
+                if (t instanceof ImplementingTypeDefinition) {
+                    if (t.getName().equals(targetObjectTypeDef.getName())) {
+                        ImplementingTypeDefinition<?> itd = (ImplementingTypeDefinition<?>) t;
+
+                        for (Type implementsType : itd.getImplements()) {
+                            TypeDefinition<?> matchingInterface = types.get(typeName(implementsType));
+                            if (matchingInterface != null && matchingInterface.getName().equals(iFace.getName())) {
+                                return true;
+                            }
+                        }
+                    }
                 }
             }
             return false;
