Change FastBuilder.addType to accept GraphQLNamedType

andimarek · andimarek · commit 16a8fc2497dc · 2026-01-23T08:53:32.000+10:00
- addType() and addTypes() now take GraphQLNamedType instead of GraphQLType
- Remove unnecessary unwrapping logic since only named types are accepted
- Remove null checks from builder methods (fail fast on null)
- Update FastSchemaGenerator to use GraphQLNamedType
- Update FastBuilderComparisonTest to use GraphQLNamedType
diff --git a/src/main/java/graphql/schema/GraphQLSchema.java b/src/main/java/graphql/schema/GraphQLSchema.java
@@ -1088,7 +1088,7 @@ private GraphQLSchema validateSchema(GraphQLSchema graphQLSchema) {
      *   <li>There's no need to clear/reset the builder state midstream.</li>
      *   <li>The code registry builder is complete and available when FastBuilder is constructed</li>
      * </ul>
-     * FastBuilder also can optionally skip schema validation, which can save time and 
+     * FastBuilder also can optionally skip schema validation, which can save time and
      * memory for large schemas that have been previously validated (eg, in build tool chains).
      *
      * @see GraphQLSchema.Builder for standard schema construction
@@ -1146,24 +1146,19 @@ public FastBuilder(GraphQLCodeRegistry.Builder codeRegistryBuilder,
         }
 
         /**
-         * Adds a type to the schema. The type must be a named type (not a wrapper like List or NonNull).
+         * Adds a named type to the schema.
          * All non-root types added via this method will be included in {@link GraphQLSchema#getAdditionalTypes()}.
          *
-         * @param type the type to add
+         * @param type the named type to add
          * @return this builder for chaining
          */
-        public FastBuilder addType(GraphQLType type) {
-            if (type == null) {
-                return this;
-            }
+        public FastBuilder addType(GraphQLNamedType type) {
 
-            // Unwrap to named type
-            GraphQLUnmodifiedType namedType = GraphQLTypeUtil.unwrapAll(type);
-            String name = namedType.getName();
+            String name = type.getName();
 
             // Enforce uniqueness by name
             GraphQLNamedType existing = typeMap.get(name);
-            if (existing != null && existing != namedType) {
+            if (existing != null && existing != type) {
                 throw new AssertException(String.format("Type '%s' already exists with a different instance", name));
             }
 
@@ -1173,23 +1168,23 @@ public FastBuilder addType(GraphQLType type) {
             }
 
             // Insert into typeMap
-            typeMap.put(name, namedType);
+            typeMap.put(name, type);
 
             // Shallow scan via ShallowTypeRefCollector (also tracks interface implementations)
-            shallowTypeRefCollector.handleTypeDef(namedType);
+            shallowTypeRefCollector.handleTypeDef(type);
 
             // For interface types, wire type resolver if present
-            if (namedType instanceof GraphQLInterfaceType) {
-                GraphQLInterfaceType interfaceType = (GraphQLInterfaceType) namedType;
+            if (type instanceof GraphQLInterfaceType) {
+                GraphQLInterfaceType interfaceType = (GraphQLInterfaceType) type;
                 TypeResolver resolver = interfaceType.getTypeResolver();
                 if (resolver != null) {
                     codeRegistryBuilder.typeResolverIfAbsent(interfaceType, resolver);
                 }
             }
 
             // For union types, wire type resolver if present
-            if (namedType instanceof GraphQLUnionType) {
-                GraphQLUnionType unionType = (GraphQLUnionType) namedType;
+            if (type instanceof GraphQLUnionType) {
+                GraphQLUnionType unionType = (GraphQLUnionType) type;
                 TypeResolver resolver = unionType.getTypeResolver();
                 if (resolver != null) {
                     codeRegistryBuilder.typeResolverIfAbsent(unionType, resolver);
@@ -1200,16 +1195,14 @@ public FastBuilder addType(GraphQLType type) {
         }
 
         /**
-         * Adds multiple types to the schema.
+         * Adds multiple named types to the schema.
          * All non-root types added via this method will be included in {@link GraphQLSchema#getAdditionalTypes()}.
          *
-         * @param types the types to add
+         * @param types the named types to add
          * @return this builder for chaining
          */
-        public FastBuilder addTypes(Collection<? extends GraphQLType> types) {
-            if (types != null) {
-                types.forEach(this::addType);
-            }
+        public FastBuilder addTypes(Collection<? extends GraphQLNamedType> types) {
+            types.forEach(this::addType);
             return this;
         }
 
@@ -1220,10 +1213,6 @@ public FastBuilder addTypes(Collection<? extends GraphQLType> types) {
          * @return this builder for chaining
          */
         public FastBuilder additionalDirective(GraphQLDirective directive) {
-            if (directive == null) {
-                return this;
-            }
-
             String name = directive.getName();
             GraphQLDirective existing = directiveMap.get(name);
             if (existing != null && existing != directive) {
@@ -1245,9 +1234,7 @@ public FastBuilder additionalDirective(GraphQLDirective directive) {
          * @return this builder for chaining
          */
         public FastBuilder additionalDirectives(Collection<? extends GraphQLDirective> directives) {
-            if (directives != null) {
-                directives.forEach(this::additionalDirective);
-            }
+            directives.forEach(this::additionalDirective);
             return this;
         }
 
@@ -1258,9 +1245,7 @@ public FastBuilder additionalDirectives(Collection<? extends GraphQLDirective> d
          * @return this builder for chaining
          */
         public FastBuilder withSchemaDirective(GraphQLDirective directive) {
-            if (directive != null) {
-                schemaDirectives.add(directive);
-            }
+            schemaDirectives.add(directive);
             return this;
         }
 
@@ -1271,9 +1256,7 @@ public FastBuilder withSchemaDirective(GraphQLDirective directive) {
          * @return this builder for chaining
          */
         public FastBuilder withSchemaDirectives(Collection<? extends GraphQLDirective> directives) {
-            if (directives != null) {
-                schemaDirectives.addAll(directives);
-            }
+            schemaDirectives.addAll(directives);
             return this;
         }
 
@@ -1284,11 +1267,9 @@ public FastBuilder withSchemaDirectives(Collection<? extends GraphQLDirective> d
          * @return this builder for chaining
          */
         public FastBuilder withSchemaAppliedDirective(GraphQLAppliedDirective applied) {
-            if (applied != null) {
-                schemaAppliedDirectives.add(applied);
-                // Scan applied directive arguments for type references
-                shallowTypeRefCollector.scanAppliedDirectives(singletonList(applied));
-            }
+            schemaAppliedDirectives.add(applied);
+            // Scan applied directive arguments for type references
+            shallowTypeRefCollector.scanAppliedDirectives(singletonList(applied));
             return this;
         }
 
@@ -1299,9 +1280,7 @@ public FastBuilder withSchemaAppliedDirective(GraphQLAppliedDirective applied) {
          * @return this builder for chaining
          */
         public FastBuilder withSchemaAppliedDirectives(Collection<? extends GraphQLAppliedDirective> appliedList) {
-            if (appliedList != null) {
-                schemaAppliedDirectives.addAll(appliedList);
-            }
+            schemaAppliedDirectives.addAll(appliedList);
             return this;
         }
 
diff --git a/src/main/java/graphql/schema/idl/FastSchemaGenerator.java b/src/main/java/graphql/schema/idl/FastSchemaGenerator.java
@@ -7,10 +7,9 @@
 import graphql.schema.GraphQLNamedType;
 import graphql.schema.GraphQLObjectType;
 import graphql.schema.GraphQLSchema;
-import graphql.schema.GraphQLType;
-
 import java.util.Map;
 import java.util.Set;
+import java.util.stream.Collectors;
 
 import static graphql.schema.idl.SchemaGeneratorHelper.buildDescription;
 
@@ -81,8 +80,10 @@ private GraphQLSchema makeExecutableSchemaImpl(ImmutableTypeDefinitionRegistry t
         // Build the code registry
         GraphQLCodeRegistry codeRegistry = buildCtx.getCodeRegistry().build();
 
-        // Extract operation types by name from built types
-        Set<GraphQLType> allBuiltTypes = buildCtx.getTypes();
+        // Extract operation types by name from built types (all types from buildCtx are named types)
+        Set<GraphQLNamedType> allBuiltTypes = buildCtx.getTypes().stream()
+                .map(t -> (GraphQLNamedType) t)
+                .collect(Collectors.toSet());
 
         // Get the actual type names from operationTypeDefinitions, defaulting to standard names
         String queryTypeName = getOperationTypeName(operationTypeDefinitions, "query", "Query");
@@ -136,8 +137,8 @@ private String getOperationTypeName(Map<String, OperationTypeDefinition> operati
         return defaultTypeName;
     }
 
-    private GraphQLObjectType findOperationType(Set<GraphQLType> types, String typeName) {
-        for (GraphQLType type : types) {
+    private GraphQLObjectType findOperationType(Set<GraphQLNamedType> types, String typeName) {
+        for (GraphQLNamedType type : types) {
             if (type instanceof GraphQLObjectType) {
                 GraphQLObjectType objectType = (GraphQLObjectType) type;
                 if (objectType.getName().equals(typeName)) {
diff --git a/src/test/groovy/graphql/schema/FastBuilderComparisonTest.groovy b/src/test/groovy/graphql/schema/FastBuilderComparisonTest.groovy
@@ -53,7 +53,7 @@ class FastBuilderComparisonTest extends Specification {
             GraphQLObjectType queryType,
             GraphQLObjectType mutationType = null,
             GraphQLObjectType subscriptionType = null,
-            List<GraphQLType> additionalTypes = [],
+            List<GraphQLNamedType> additionalTypes = [],
             List<GraphQLDirective> additionalDirectives = [],
             GraphQLCodeRegistry.Builder codeRegistry = null
     ) {
