Allow more than 1 type runtime wiring if it is for a datafetcher for a non-overlapping child field

dondonz · dondonz · commit 8d5436afbdc7 · 2025-03-22T12:52:06.000+11:00
diff --git a/src/main/java/graphql/schema/idl/RuntimeWiring.java b/src/main/java/graphql/schema/idl/RuntimeWiring.java
@@ -313,10 +313,17 @@ public Builder type(String typeName, UnaryOperator<TypeRuntimeWiring.Builder> bu
         public Builder type(TypeRuntimeWiring typeRuntimeWiring) {
             String typeName = typeRuntimeWiring.getTypeName();
             Map<String, DataFetcher> typeDataFetchers = dataFetchers.computeIfAbsent(typeName, k -> new LinkedHashMap<>());
+
+            Map<String, DataFetcher> additionalFieldDataFetchers = typeRuntimeWiring.getFieldDataFetchers();
             if (strictMode && !typeDataFetchers.isEmpty()) {
-                throw new StrictModeWiringException(format("The type %s has already been defined", typeName));
+                // Check if the existing type wiring contains overlapping DataFetcher definitions
+                for (String fieldName : additionalFieldDataFetchers.keySet()) {
+                    if (typeDataFetchers.containsKey(fieldName)) {
+                        throw new StrictModeWiringException(format("The field %s on type %s has already been defined", fieldName, typeName));
+                    }
+                }
             }
-            typeDataFetchers.putAll(typeRuntimeWiring.getFieldDataFetchers());
+            typeDataFetchers.putAll(additionalFieldDataFetchers);
 
             DataFetcher<?> defaultDataFetcher = typeRuntimeWiring.getDefaultDataFetcher();
             if (defaultDataFetcher != null) {
diff --git a/src/test/groovy/graphql/schema/idl/RuntimeWiringTest.groovy b/src/test/groovy/graphql/schema/idl/RuntimeWiringTest.groovy
@@ -206,7 +206,7 @@ class RuntimeWiringTest extends Specification {
 
         then:
         def e1 = thrown(StrictModeWiringException)
-        e1.message == "The type Foo has already been defined"
+        e1.message == "The field foo on type Foo has already been defined"
 
         when:
         RuntimeWiring.newRuntimeWiring()
@@ -253,6 +253,7 @@ class RuntimeWiringTest extends Specification {
         def runtimeWiring1 = RuntimeWiring.newRuntimeWiring()
                 .type(TypeRuntimeWiring.newTypeWiring("Foo").dataFetcher("foo", DF1))
                 .type(TypeRuntimeWiring.newTypeWiring("Foo").dataFetcher("bar", DF2))
+                .build()
 
         then:
         noExceptionThrown()
@@ -313,7 +314,7 @@ class RuntimeWiringTest extends Specification {
 
         then:
         noExceptionThrown()
-        runtimeWiring1.getDataFetchers().get("Foo").get("bar") == DF1
+        runtimeWiring1.getDataFetchers().get("Foo").get("foo") == DF2
 
         when:
         def runtimeWiring2 = RuntimeWiring.newRuntimeWiring()
