Add max query depth #458
Add max query depth #458
Conversation
| @@ -7,7 +7,7 @@ plugins { | |||
| id("com.bnorm.power.kotlin-power-assert") | |||
| } | |||
|
|
|||
| val graphqlJavaVersion = "0.0.0-2023-06-07T00-38-50-5b19375" | |||
| val graphqlJavaVersion = "0.0.0-2023-07-12T23-55-39-fa8cf1b" | |||
There was a problem hiding this comment.
Brings in the max ENF depth change.
| @@ -38,15 +41,12 @@ import java.util.concurrent.atomic.AtomicReference | |||
| import java.util.function.Function | |||
|
|
|||
| class Nadel private constructor( | |||
| private val engine: NadelExecutionEngine, | |||
| private val engine: NextgenEngine, | |||
There was a problem hiding this comment.
Removed the engine abstraction. Nadel itself creates the engine now. All constructor params that were tied to NextgenEngine are now in Nadel.Builder.
| internal val instrumentation: NadelInstrumentation, | ||
| internal val serviceExecutionHooks: ServiceExecutionHooks, | ||
| internal val preparsedDocumentProvider: PreparsedDocumentProvider, | ||
| internal val executionIdProvider: ExecutionIdProvider, |
There was a problem hiding this comment.
Removed some things that are no longer needed in this class. Most of the things are now directly passed down to NextgenEngine
| private var instrumentation: NadelInstrumentation = object : NadelInstrumentation {} | ||
| private var serviceExecutionHooks: ServiceExecutionHooks = object : ServiceExecutionHooks {} | ||
| private var preparsedDocumentProvider: PreparsedDocumentProvider = NoOpPreparsedDocumentProvider.INSTANCE | ||
| private var executionIdProvider = ExecutionIdProvider.DEFAULT_EXECUTION_ID_PROVIDER | ||
| private var engineFactory: NadelExecutionEngineFactory = NadelExecutionEngineFactory(::NextgenEngine) | ||
| private var transforms = emptyList<NadelTransform<out Any>>() | ||
| private var introspectionRunnerFactory = NadelIntrospectionRunnerFactory(::NadelDefaultIntrospectionRunner) |
There was a problem hiding this comment.
These used to be constructor parameters to NextgenEngine but now are here
|
|
||
| private var schemaBuilder = NadelSchemas.Builder() | ||
|
|
||
| private var maxQueryDepth = Integer.MAX_VALUE |
There was a problem hiding this comment.
New option to set max ENF depth
|
|
||
| class NextgenEngine @JvmOverloads constructor( | ||
| nadel: Nadel, | ||
| internal class NextgenEngine( |
There was a problem hiding this comment.
Most of this is just changes to the constructor now that the engine abstraction is gone.
The Nadel.Builder now just passes everything required directly in here, so we don't need to go nadel. to get everything out.
|
|
||
| override fun execute( | ||
| private val operationParseOptions = executableNormalizedOperationFactoryOptions() | ||
| .maxChildrenDepth(maxQueryDepth) |
There was a problem hiding this comment.
Base options with the query depth set.
gnawf
requested review from
bbakerman,
felipe-gdr and
temaEmelyan
and removed request for
bbakerman
Ok I also removed the engine abstraction stuff and added
transformsandintrospectionRunnerFactorytoNadel.Builderinstead of passing those directly toNextgenEngine.Tested this new build with the Gateway and it works fine.