From d6cacc29ad1b2594c54be2bb8b6a2b76962b2919 Mon Sep 17 00:00:00 2001 From: Chris Liu Date: Mon, 24 Jun 2019 20:33:57 -0700 Subject: [PATCH] Take in middleware factory rather than middleware --- .../naptime/ari/graphql/controllers/GraphQLController.scala | 3 ++- version.sbt | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/naptime-graphql/src/main/scala/org/coursera/naptime/ari/graphql/controllers/GraphQLController.scala b/naptime-graphql/src/main/scala/org/coursera/naptime/ari/graphql/controllers/GraphQLController.scala index cffdf5f5..836bdc31 100644 --- a/naptime-graphql/src/main/scala/org/coursera/naptime/ari/graphql/controllers/GraphQLController.scala +++ b/naptime-graphql/src/main/scala/org/coursera/naptime/ari/graphql/controllers/GraphQLController.scala @@ -59,7 +59,7 @@ class GraphQLController @Inject()( fetcher: FetcherApi, filterList: FilterList, metricsCollector: GraphQLMetricsCollector, - additionalMiddlewares: List[Middleware[Any]])(implicit ec: ExecutionContext) + additionalMiddlewareFactories: List[() => Middleware[Any]])(implicit ec: ExecutionContext) extends InjectedController with StrictLogging { @@ -129,6 +129,7 @@ class GraphQLController @Inject()( case Success(queryAst) => val baseFilter: IncomingQuery => Future[OutgoingQuery] = (incoming: IncomingQuery) => { val context = SangriaGraphQlContext(fetcher, requestHeader, ec, incoming.debugMode) + val additionalMiddlewares = additionalMiddlewareFactories.map(factory => factory.apply) Executor .execute( graphqlSchemaProvider.schema, diff --git a/version.sbt b/version.sbt index 94f8e2fe..a637bd72 100644 --- a/version.sbt +++ b/version.sbt @@ -1 +1 @@ -version in ThisBuild := "0.9.2-alpha28" +version in ThisBuild := "0.9.2-alpha29"