Skip to content
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 0 additions & 10 deletions lib/src/main/java/graphql/nadel/NadelExecutionHints.kt
Original file line number Diff line number Diff line change
Expand Up @@ -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(
Expand All @@ -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,
Expand All @@ -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 }
Expand All @@ -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
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -163,7 +154,6 @@ data class NadelExecutionHints(
deferSupport,
sharedTypeRenames,
shortCircuitEmptyQuery,
virtualTypeSupport,
executeOnEngineSchema,
hydrationFilterObjectTypes,
hydrationExecutableSourceFields,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,6 @@ import graphql.normalized.NormalizedInputValue
internal object NadelHydrationFieldsBuilder {
fun makeBackingQueries(
executionContext: NadelExecutionContext,
service: Service,
instruction: NadelHydrationFieldInstruction,
aliasHelper: NadelAliasHelper,
virtualField: ExecutableNormalizedField,
Expand Down Expand Up @@ -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)
}
}
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -336,7 +336,6 @@ internal class NadelHydrationTransform(

val backingQueries = NadelHydrationFieldsBuilder.makeBackingQueries(
executionContext = executionContext,
service = state.virtualFieldService,
instruction = instruction,
aliasHelper = state.aliasHelper,
virtualField = virtualField,
Expand Down

This file was deleted.

Original file line number Diff line number Diff line change
Expand Up @@ -173,7 +173,6 @@ class HydrationRemainingArgumentsTest : NadelIntegrationTest(
) {
override fun makeExecutionHints(): NadelExecutionHints.Builder {
return super.makeExecutionHints()
.virtualTypeSupport { true }
.shortCircuitEmptyQuery { true }
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -262,7 +262,6 @@ class StaticHydrationAndPolymorphicHydrationTest : NadelIntegrationTest(
) {
override fun makeExecutionHints(): NadelExecutionHints.Builder {
return super.makeExecutionHints()
.virtualTypeSupport { true }
.shortCircuitEmptyQuery { true }
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -210,7 +210,6 @@ class StaticHydrationNestedErrorTest : NadelIntegrationTest(
) {
override fun makeExecutionHints(): NadelExecutionHints.Builder {
return super.makeExecutionHints()
.virtualTypeSupport { true }
.shortCircuitEmptyQuery { true }
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -257,7 +257,6 @@ class StaticHydrationOverlappingHydrationTest : NadelIntegrationTest(
) {
override fun makeExecutionHints(): NadelExecutionHints.Builder {
return super.makeExecutionHints()
.virtualTypeSupport { true }
.shortCircuitEmptyQuery { true }
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,6 @@ class StaticHydrationScalarFieldTest : NadelIntegrationTest(
) {
override fun makeExecutionHints(): NadelExecutionHints.Builder {
return super.makeExecutionHints()
.virtualTypeSupport { true }
.shortCircuitEmptyQuery { true }
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -199,7 +199,6 @@ class StaticHydrationTest : NadelIntegrationTest(
) {
override fun makeExecutionHints(): NadelExecutionHints.Builder {
return super.makeExecutionHints()
.virtualTypeSupport { true }
.shortCircuitEmptyQuery { true }
}
}

This file was deleted.

Loading
Loading