Remove virtual type support hint

lib/src/main/java/graphql/nadel/NadelExecutionHints.kt

@@ -12,14 +12,12 @@ import graphql.nadel.hints.NadelNoInterfaceToObjectFragmentExpansionHint
 import graphql.nadel.hints.NadelReachableUnderlyingServiceTypesHint
 import graphql.nadel.hints.NadelShadowUnderlyingTypeNameInvestigation
 import graphql.nadel.hints.NadelSharedTypeRenamesHint
-import graphql.nadel.hints.NadelVirtualTypeSupportHint
 
 data class NadelExecutionHints(
     val legacyOperationNames: LegacyOperationNamesHint,
     val allDocumentVariablesHint: AllDocumentVariablesHint,
     val deferSupport: NadelDeferSupportHint,
     val sharedTypeRenames: NadelSharedTypeRenamesHint,
-    val virtualTypeSupport: NadelVirtualTypeSupportHint,
     val executeOnEngineSchema: NadelExecuteOnEngineSchemaHint,
     val hydrationFilterObjectTypes: NadelHydrationFilterObjectTypesHint,
     val hydrationExecutableSourceFields: NadelHydrationExecutableSourceFields,
@@ -44,7 +42,6 @@ data class NadelExecutionHints(
         private var allDocumentVariablesHint = AllDocumentVariablesHint { false }
         private var deferSupport = NadelDeferSupportHint { 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 }
@@ -61,7 +58,6 @@ data class NadelExecutionHints(
             allDocumentVariablesHint = nadelExecutionHints.allDocumentVariablesHint
             deferSupport = nadelExecutionHints.deferSupport
             sharedTypeRenames = nadelExecutionHints.sharedTypeRenames
-            virtualTypeSupport = nadelExecutionHints.virtualTypeSupport
             executeOnEngineSchema = nadelExecutionHints.executeOnEngineSchema
             hydrationFilterObjectTypes = nadelExecutionHints.hydrationFilterObjectTypes
             hydrationExecutableSourceFields = nadelExecutionHints.hydrationExecutableSourceFields
@@ -92,11 +88,6 @@ data class NadelExecutionHints(
             return this
         }
 
-        fun virtualTypeSupport(flag: NadelVirtualTypeSupportHint): Builder {
-            virtualTypeSupport = flag
-            return this
-        }
-
         fun executeOnEngineSchema(flag: NadelExecuteOnEngineSchemaHint): Builder {
             executeOnEngineSchema = flag
             return this
@@ -143,7 +134,6 @@ data class NadelExecutionHints(
                 allDocumentVariablesHint,
                 deferSupport,
                 sharedTypeRenames,
-                virtualTypeSupport,
                 executeOnEngineSchema,
                 hydrationFilterObjectTypes,
                 hydrationExecutableSourceFields,

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)
                 }
             }
     }

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,

test/src/test/kotlin/graphql/nadel/tests/next/fixtures/hydration/HydrationRemainingArgumentsTest.kt

@@ -1,7 +1,6 @@
 package graphql.nadel.tests.next.fixtures.hydration
 
 import graphql.nadel.Nadel
-import graphql.nadel.NadelExecutionHints
 import graphql.nadel.engine.util.strictAssociateBy
 import graphql.nadel.tests.next.NadelIntegrationTest
 import graphql.scalars.ExtendedScalars
@@ -170,9 +169,4 @@ class HydrationRemainingArgumentsTest : NadelIntegrationTest(
             },
         ),
     ),
-) {
-    override fun makeExecutionHints(): NadelExecutionHints.Builder {
-        return super.makeExecutionHints()
-            .virtualTypeSupport { true }
-    }
-}
+)

test/src/test/kotlin/graphql/nadel/tests/next/fixtures/hydration/statics/StaticHydrationAndPolymorphicHydrationTest.kt

@@ -1,7 +1,6 @@
 package graphql.nadel.tests.next.fixtures.hydration.statics
 
 import graphql.nadel.Nadel
-import graphql.nadel.NadelExecutionHints
 import graphql.nadel.engine.blueprint.NadelGenericHydrationInstruction
 import graphql.nadel.engine.transform.artificial.NadelAliasHelper
 import graphql.nadel.engine.transform.result.json.JsonNode
@@ -260,11 +259,6 @@ class StaticHydrationAndPolymorphicHydrationTest : NadelIntegrationTest(
         ),
     ),
 ) {
-    override fun makeExecutionHints(): NadelExecutionHints.Builder {
-        return super.makeExecutionHints()
-            .virtualTypeSupport { true }
-    }
-
     override fun makeNadel(): Nadel.Builder {
         return super.makeNadel()
             .executionHooks(

test/src/test/kotlin/graphql/nadel/tests/next/fixtures/hydration/statics/StaticHydrationNestedErrorTest.kt

@@ -1,7 +1,6 @@
 package graphql.nadel.tests.next.fixtures.hydration.statics
 
 import graphql.nadel.Nadel
-import graphql.nadel.NadelExecutionHints
 import graphql.nadel.ServiceExecutionHydrationDetails
 import graphql.nadel.ServiceExecutionResult
 import graphql.nadel.engine.NadelExecutionContext
@@ -208,11 +207,6 @@ class StaticHydrationNestedErrorTest : NadelIntegrationTest(
         ),
     ),
 ) {
-    override fun makeExecutionHints(): NadelExecutionHints.Builder {
-        return super.makeExecutionHints()
-            .virtualTypeSupport { true }
-    }
-
     override fun makeNadel(): Nadel.Builder {
         return super.makeNadel()
             .transforms(

test/src/test/kotlin/graphql/nadel/tests/next/fixtures/hydration/statics/StaticHydrationOverlappingHydrationTest.kt

@@ -1,7 +1,6 @@
 package graphql.nadel.tests.next.fixtures.hydration.statics
 
 import graphql.nadel.Nadel
-import graphql.nadel.NadelExecutionHints
 import graphql.nadel.engine.blueprint.NadelGenericHydrationInstruction
 import graphql.nadel.engine.transform.artificial.NadelAliasHelper
 import graphql.nadel.engine.transform.result.json.JsonNode
@@ -255,11 +254,6 @@ class StaticHydrationOverlappingHydrationTest : NadelIntegrationTest(
         ),
     ),
 ) {
-    override fun makeExecutionHints(): NadelExecutionHints.Builder {
-        return super.makeExecutionHints()
-            .virtualTypeSupport { true }
-    }
-
     override fun makeNadel(): Nadel.Builder {
         return super.makeNadel()
             .executionHooks(

test/src/test/kotlin/graphql/nadel/tests/next/fixtures/hydration/statics/StaticHydrationScalarFieldTest.kt

@@ -1,6 +1,5 @@
 package graphql.nadel.tests.next.fixtures.hydration.statics
 
-import graphql.nadel.NadelExecutionHints
 import graphql.nadel.tests.next.NadelIntegrationTest
 
 class StaticHydrationScalarFieldTest : NadelIntegrationTest(
@@ -64,9 +63,4 @@ class StaticHydrationScalarFieldTest : NadelIntegrationTest(
             },
         ),
     ),
-) {
-    override fun makeExecutionHints(): NadelExecutionHints.Builder {
-        return super.makeExecutionHints()
-            .virtualTypeSupport { true }
-    }
-}
+)

test/src/test/kotlin/graphql/nadel/tests/next/fixtures/hydration/statics/StaticHydrationTest.kt

@@ -1,6 +1,5 @@
 package graphql.nadel.tests.next.fixtures.hydration.statics
 
-import graphql.nadel.NadelExecutionHints
 import graphql.nadel.engine.util.strictAssociateBy
 import graphql.nadel.tests.next.NadelIntegrationTest
 
@@ -196,9 +195,4 @@ class StaticHydrationTest : NadelIntegrationTest(
             },
         ),
     ),
-) {
-    override fun makeExecutionHints(): NadelExecutionHints.Builder {
-        return super.makeExecutionHints()
-            .virtualTypeSupport { true }
-    }
-}
+)