Remove virtual type support hint

temaEmelyan · temaEmelyan · commit c32fbedb3c4f · 2026-07-27T17:53:32.000+10:00
diff --git a/lib/src/main/java/graphql/nadel/NadelExecutionHints.kt b/lib/src/main/java/graphql/nadel/NadelExecutionHints.kt
@@ -13,7 +13,6 @@ import graphql.nadel.hints.NadelReachableUnderlyingServiceTypesHint
 import graphql.nadel.hints.NadelShadowUnderlyingTypeNameInvestigation
 import graphql.nadel.hints.NadelSharedTypeRenamesHint
 import graphql.nadel.hints.NadelShortCircuitEmptyQueryHint
-import graphql.nadel.hints.NadelVirtualTypeSupportHint
 import graphql.nadel.hints.NewResultMergerAndNamespacedTypename
 
 data class NadelExecutionHints(
@@ -23,7 +22,6 @@ data class NadelExecutionHints(
     val deferSupport: NadelDeferSupportHint,
     val sharedTypeRenames: NadelSharedTypeRenamesHint,
     val shortCircuitEmptyQuery: NadelShortCircuitEmptyQueryHint,
-    val virtualTypeSupport: NadelVirtualTypeSupportHint,
     val executeOnEngineSchema: NadelExecuteOnEngineSchemaHint,
     val hydrationFilterObjectTypes: NadelHydrationFilterObjectTypesHint,
     val hydrationExecutableSourceFields: NadelHydrationExecutableSourceFields,
@@ -50,7 +48,6 @@ data class NadelExecutionHints(
         private var deferSupport = NadelDeferSupportHint { false }
         private var shortCircuitEmptyQuery = NadelShortCircuitEmptyQueryHint { false }
         private var sharedTypeRenames = NadelSharedTypeRenamesHint { false }
-        private var virtualTypeSupport = NadelVirtualTypeSupportHint { false }
         private var executeOnEngineSchema = NadelExecuteOnEngineSchemaHint { false }
         private var hydrationFilterObjectTypes = NadelHydrationFilterObjectTypesHint { false }
         private var hydrationExecutableSourceFields = NadelHydrationExecutableSourceFields { false }
@@ -69,7 +66,6 @@ data class NadelExecutionHints(
             deferSupport = nadelExecutionHints.deferSupport
             shortCircuitEmptyQuery = nadelExecutionHints.shortCircuitEmptyQuery
             sharedTypeRenames = nadelExecutionHints.sharedTypeRenames
-            virtualTypeSupport = nadelExecutionHints.virtualTypeSupport
             executeOnEngineSchema = nadelExecutionHints.executeOnEngineSchema
             hydrationFilterObjectTypes = nadelExecutionHints.hydrationFilterObjectTypes
             hydrationExecutableSourceFields = nadelExecutionHints.hydrationExecutableSourceFields
@@ -110,11 +106,6 @@ data class NadelExecutionHints(
             return this
         }
 
-        fun virtualTypeSupport(flag: NadelVirtualTypeSupportHint): Builder {
-            virtualTypeSupport = flag
-            return this
-        }
-
         fun executeOnEngineSchema(flag: NadelExecuteOnEngineSchemaHint): Builder {
             executeOnEngineSchema = flag
             return this
@@ -163,7 +154,6 @@ data class NadelExecutionHints(
                 deferSupport,
                 sharedTypeRenames,
                 shortCircuitEmptyQuery,
-                virtualTypeSupport,
                 executeOnEngineSchema,
                 hydrationFilterObjectTypes,
                 hydrationExecutableSourceFields,
diff --git a/lib/src/main/java/graphql/nadel/engine/transform/hydration/NadelHydrationFieldsBuilder.kt b/lib/src/main/java/graphql/nadel/engine/transform/hydration/NadelHydrationFieldsBuilder.kt
@@ -23,7 +23,6 @@ import graphql.normalized.NormalizedInputValue
 internal object NadelHydrationFieldsBuilder {
     fun makeBackingQueries(
         executionContext: NadelExecutionContext,
-        service: Service,
         instruction: NadelHydrationFieldInstruction,
         aliasHelper: NadelAliasHelper,
         virtualField: ExecutableNormalizedField,
@@ -53,11 +52,9 @@ internal object NadelHydrationFieldsBuilder {
             }
             // Fix types for virtual fields
             .onEach { field ->
-                if (executionContext.hints.virtualTypeSupport(service)) {
-                    setBackingObjectTypeNames(instruction, field)
-                    field.traverseSubTree { child ->
-                        setBackingObjectTypeNames(instruction, child)
-                    }
+                setBackingObjectTypeNames(instruction, field)
+                field.traverseSubTree { child ->
+                    setBackingObjectTypeNames(instruction, child)
                 }
             }
     }
diff --git a/lib/src/main/java/graphql/nadel/engine/transform/hydration/NadelHydrationTransform.kt b/lib/src/main/java/graphql/nadel/engine/transform/hydration/NadelHydrationTransform.kt
@@ -336,7 +336,6 @@ internal class NadelHydrationTransform(
 
         val backingQueries = NadelHydrationFieldsBuilder.makeBackingQueries(
             executionContext = executionContext,
-            service = state.virtualFieldService,
             instruction = instruction,
             aliasHelper = state.aliasHelper,
             virtualField = virtualField,
diff --git a/lib/src/main/java/graphql/nadel/hints/NadelVirtualTypeSupportHint.kt b/lib/src/main/java/graphql/nadel/hints/NadelVirtualTypeSupportHint.kt
diff --git a/test/src/test/kotlin/graphql/nadel/tests/next/fixtures/hydration/HydrationRemainingArgumentsTest.kt b/test/src/test/kotlin/graphql/nadel/tests/next/fixtures/hydration/HydrationRemainingArgumentsTest.kt
@@ -173,7 +173,6 @@ class HydrationRemainingArgumentsTest : NadelIntegrationTest(
 ) {
     override fun makeExecutionHints(): NadelExecutionHints.Builder {
         return super.makeExecutionHints()
-            .virtualTypeSupport { true }
             .shortCircuitEmptyQuery { true }
     }
 }
diff --git a/test/src/test/kotlin/graphql/nadel/tests/next/fixtures/hydration/statics/StaticHydrationAndPolymorphicHydrationTest.kt b/test/src/test/kotlin/graphql/nadel/tests/next/fixtures/hydration/statics/StaticHydrationAndPolymorphicHydrationTest.kt
@@ -262,7 +262,6 @@ class StaticHydrationAndPolymorphicHydrationTest : NadelIntegrationTest(
 ) {
     override fun makeExecutionHints(): NadelExecutionHints.Builder {
         return super.makeExecutionHints()
-            .virtualTypeSupport { true }
             .shortCircuitEmptyQuery { true }
     }
 
diff --git a/test/src/test/kotlin/graphql/nadel/tests/next/fixtures/hydration/statics/StaticHydrationNestedErrorTest.kt b/test/src/test/kotlin/graphql/nadel/tests/next/fixtures/hydration/statics/StaticHydrationNestedErrorTest.kt
@@ -210,7 +210,6 @@ class StaticHydrationNestedErrorTest : NadelIntegrationTest(
 ) {
     override fun makeExecutionHints(): NadelExecutionHints.Builder {
         return super.makeExecutionHints()
-            .virtualTypeSupport { true }
             .shortCircuitEmptyQuery { true }
     }
 
diff --git a/test/src/test/kotlin/graphql/nadel/tests/next/fixtures/hydration/statics/StaticHydrationOverlappingHydrationTest.kt b/test/src/test/kotlin/graphql/nadel/tests/next/fixtures/hydration/statics/StaticHydrationOverlappingHydrationTest.kt
@@ -257,7 +257,6 @@ class StaticHydrationOverlappingHydrationTest : NadelIntegrationTest(
 ) {
     override fun makeExecutionHints(): NadelExecutionHints.Builder {
         return super.makeExecutionHints()
-            .virtualTypeSupport { true }
             .shortCircuitEmptyQuery { true }
     }
 
diff --git a/test/src/test/kotlin/graphql/nadel/tests/next/fixtures/hydration/statics/StaticHydrationScalarFieldTest.kt b/test/src/test/kotlin/graphql/nadel/tests/next/fixtures/hydration/statics/StaticHydrationScalarFieldTest.kt
@@ -67,7 +67,6 @@ class StaticHydrationScalarFieldTest : NadelIntegrationTest(
 ) {
     override fun makeExecutionHints(): NadelExecutionHints.Builder {
         return super.makeExecutionHints()
-            .virtualTypeSupport { true }
             .shortCircuitEmptyQuery { true }
     }
 }
diff --git a/test/src/test/kotlin/graphql/nadel/tests/next/fixtures/hydration/statics/StaticHydrationTest.kt b/test/src/test/kotlin/graphql/nadel/tests/next/fixtures/hydration/statics/StaticHydrationTest.kt
@@ -199,7 +199,6 @@ class StaticHydrationTest : NadelIntegrationTest(
 ) {
     override fun makeExecutionHints(): NadelExecutionHints.Builder {
         return super.makeExecutionHints()
-            .virtualTypeSupport { true }
             .shortCircuitEmptyQuery { true }
     }
 }
diff --git a/test/src/test/kotlin/graphql/nadel/tests/next/fixtures/hydration/statics/StaticHydrationVirtualTypeHintOffTest.kt b/test/src/test/kotlin/graphql/nadel/tests/next/fixtures/hydration/statics/StaticHydrationVirtualTypeHintOffTest.kt
diff --git a/test/src/test/kotlin/graphql/nadel/tests/next/fixtures/hydration/statics/StaticHydrationVirtualTypeHintOffTestSnapshot.kt b/test/src/test/kotlin/graphql/nadel/tests/next/fixtures/hydration/statics/StaticHydrationVirtualTypeHintOffTestSnapshot.kt
diff --git a/test/src/test/kotlin/graphql/nadel/tests/next/fixtures/schema/CustomHydrationDirectiveTest.kt b/test/src/test/kotlin/graphql/nadel/tests/next/fixtures/schema/CustomHydrationDirectiveTest.kt

Original file line number	Diff line number	Diff line change
`@@ -23,7 +23,6 @@ import graphql.normalized.NormalizedInputValue`
`23`	`23`	`internal object NadelHydrationFieldsBuilder {`
`24`	`24`	`fun makeBackingQueries(`
`25`	`25`	`executionContext: NadelExecutionContext,`
`26`		`- service: Service,`
`27`	`26`	`instruction: NadelHydrationFieldInstruction,`
`28`	`27`	`aliasHelper: NadelAliasHelper,`
`29`	`28`	`virtualField: ExecutableNormalizedField,`
`@@ -53,11 +52,9 @@ internal object NadelHydrationFieldsBuilder {`
`53`	`52`	`}`
`54`	`53`	`// Fix types for virtual fields`
`55`	`54`	`.onEach { field ->`
`56`		`- if (executionContext.hints.virtualTypeSupport(service)) {`
`57`		`- setBackingObjectTypeNames(instruction, field)`
`58`		`- field.traverseSubTree { child ->`
`59`		`- setBackingObjectTypeNames(instruction, child)`
`60`		`- }`
	`55`	`+ setBackingObjectTypeNames(instruction, field)`
	`56`	`+ field.traverseSubTree { child ->`
	`57`	`+ setBackingObjectTypeNames(instruction, child)`
`61`	`58`	`}`
`62`	`59`	`}`
`63`	`60`	`}`
Original file line number	Diff line number	Diff line change
`@@ -173,7 +173,6 @@ class HydrationRemainingArgumentsTest : NadelIntegrationTest(`
`173`	`173`	`) {`
`174`	`174`	`override fun makeExecutionHints(): NadelExecutionHints.Builder {`
`175`	`175`	`return super.makeExecutionHints()`
`176`		`- .virtualTypeSupport { true }`
`177`	`176`	`.shortCircuitEmptyQuery { true }`
`178`	`177`	`}`
`179`	`178`	`}`
Original file line number	Diff line number	Diff line change
`@@ -262,7 +262,6 @@ class StaticHydrationAndPolymorphicHydrationTest : NadelIntegrationTest(`
`262`	`262`	`) {`
`263`	`263`	`override fun makeExecutionHints(): NadelExecutionHints.Builder {`
`264`	`264`	`return super.makeExecutionHints()`
`265`		`- .virtualTypeSupport { true }`
`266`	`265`	`.shortCircuitEmptyQuery { true }`
`267`	`266`	`}`
`268`	`267`
Original file line number	Diff line number	Diff line change
`@@ -210,7 +210,6 @@ class StaticHydrationNestedErrorTest : NadelIntegrationTest(`
`210`	`210`	`) {`
`211`	`211`	`override fun makeExecutionHints(): NadelExecutionHints.Builder {`
`212`	`212`	`return super.makeExecutionHints()`
`213`		`- .virtualTypeSupport { true }`
`214`	`213`	`.shortCircuitEmptyQuery { true }`
`215`	`214`	`}`
`216`	`215`
Original file line number	Diff line number	Diff line change
`@@ -257,7 +257,6 @@ class StaticHydrationOverlappingHydrationTest : NadelIntegrationTest(`
`257`	`257`	`) {`
`258`	`258`	`override fun makeExecutionHints(): NadelExecutionHints.Builder {`
`259`	`259`	`return super.makeExecutionHints()`
`260`		`- .virtualTypeSupport { true }`
`261`	`260`	`.shortCircuitEmptyQuery { true }`
`262`	`261`	`}`
`263`	`262`
Original file line number	Diff line number	Diff line change
`@@ -67,7 +67,6 @@ class StaticHydrationScalarFieldTest : NadelIntegrationTest(`
`67`	`67`	`) {`
`68`	`68`	`override fun makeExecutionHints(): NadelExecutionHints.Builder {`
`69`	`69`	`return super.makeExecutionHints()`
`70`		`- .virtualTypeSupport { true }`
`71`	`70`	`.shortCircuitEmptyQuery { true }`
`72`	`71`	`}`
`73`	`72`	`}`
Original file line number	Diff line number	Diff line change
`@@ -199,7 +199,6 @@ class StaticHydrationTest : NadelIntegrationTest(`
`199`	`199`	`) {`
`200`	`200`	`override fun makeExecutionHints(): NadelExecutionHints.Builder {`
`201`	`201`	`return super.makeExecutionHints()`
`202`		`- .virtualTypeSupport { true }`
`203`	`202`	`.shortCircuitEmptyQuery { true }`
`204`	`203`	`}`
`205`	`204`	`}`