Merge pull request #986 from sangria-graphql/clean_resolver

prepare for custom resolver
sangria-graphql · Mar 31, 2023 · 16aff66 · 16aff66
2 parents b137c72 + c7887b1
commit 16aff66
Show file tree

Hide file tree

Showing 6 changed files with 2,011 additions and 1,824 deletions.
diff --git a/build.sbt b/build.sbt
@@ -192,7 +192,11 @@ lazy val core = project
       ProblemFilters.exclude[DirectMissingMethodProblem](
         "sangria.introspection.IntrospectionInterfaceType.curried"),
       ProblemFilters.exclude[DirectMissingMethodProblem](
-        "sangria.introspection.IntrospectionInterfaceType.copy")
+        "sangria.introspection.IntrospectionInterfaceType.copy"),
+      ProblemFilters.exclude[ReversedMissingMethodProblem](
+        "sangria.execution.ExecutionScheme.resolverBuilder"),
+      ProblemFilters.exclude[IncompatibleTemplateDefProblem]("sangria.execution.Resolver"),
+      ProblemFilters.exclude[MissingClassProblem]("sangria.execution.Resolver$*")
     ),
     Test / testOptions += Tests.Argument(TestFrameworks.ScalaTest, "-oF"),
     libraryDependencies ++= Seq(

diff --git a/modules/core/src/main/scala/sangria/execution/ExecutionScheme.scala b/modules/core/src/main/scala/sangria/execution/ExecutionScheme.scala
@@ -14,6 +14,7 @@ sealed trait ExecutionScheme {
   def flatMapFuture[Ctx, Res, T](future: Future[T])(resultFn: T => Result[Ctx, Res])(implicit
       ec: ExecutionContext): Result[Ctx, Res]
   def extended: Boolean
+  val resolverBuilder: ResolverBuilder
 }
 
 object ExecutionScheme extends AlternativeExecutionScheme {
@@ -34,6 +35,8 @@ object ExecutionScheme extends AlternativeExecutionScheme {
       future.flatMap(resultFn)
 
     def extended = false
+
+    override val resolverBuilder: ResolverBuilder = FutureResolverBuilder
   }
 }
 
@@ -46,7 +49,8 @@ trait EffectOps[F[_]] {
 
 @ApiMayChange
 class EffectBasedExecutionScheme[F[_]](
-    ops: EffectOps[F]
+    val ops: EffectOps[F],
+    val resolverBuilder: ResolverBuilder
 ) extends ExecutionScheme {
   override type Result[Ctx, Res] = F[Res]
   override def failed[Ctx, Res](error: Throwable): Result[Ctx, Res] =
@@ -85,6 +89,8 @@ trait AlternativeExecutionScheme {
       future.flatMap(resultFn)
 
     def extended = true
+
+    override val resolverBuilder: ResolverBuilder = FutureResolverBuilder
   }
 
   implicit def Stream[S[_]](implicit
@@ -107,6 +113,8 @@ trait AlternativeExecutionScheme {
       def flatMapFuture[Ctx, Res, T](future: Future[T])(resultFn: T => Result[Ctx, Res])(implicit
           ec: ExecutionContext): Result[Ctx, Res] =
         stream.flatMapFuture(future)(resultFn)
+
+      override val resolverBuilder: ResolverBuilder = FutureResolverBuilder
     }
 
   implicit def StreamExtended[S[_]](implicit
@@ -129,6 +137,8 @@ trait AlternativeExecutionScheme {
       def flatMapFuture[Ctx, Res, T](future: Future[T])(resultFn: T => Result[Ctx, Res])(implicit
           ec: ExecutionContext): Result[Ctx, Res] =
         stream.flatMapFuture(future)(resultFn)
+
+      override val resolverBuilder: ResolverBuilder = FutureResolverBuilder
     }
 }
 

diff --git a/modules/core/src/main/scala/sangria/execution/Executor.scala b/modules/core/src/main/scala/sangria/execution/Executor.scala
@@ -249,7 +249,7 @@ case class Executor[Ctx, Root](
       val middlewareVal = middleware.map(m => m.beforeQuery(middlewareCtx) -> m)
       val deferredResolverState = deferredResolver.initialQueryState
 
-      val resolver = new Resolver[Ctx](
+      val resolver = scheme.resolverBuilder.build[Ctx](
         marshaller,
         middlewareCtx,
         schema,