sangria-graphql · yanns · Sep 19, 2022 · Sep 19, 2022
diff --git a/core/src/main/scala/sangria/federation/v1/Federation.scala b/core/src/main/scala/sangria/federation/v1/Federation.scala
@@ -1,6 +1,6 @@
 package sangria.federation.v1
 
-import sangria.ast.Document
+import sangria.ast
 import sangria.marshalling.InputUnmarshaller
 import sangria.renderer.SchemaFilter
 import sangria.schema._
@@ -29,15 +29,15 @@ object Federation {
     (entities match {
       case Nil =>
         schema.extend(
-          Document(definitions = Vector(queryType(_service))),
+          ast.Document(definitions = Vector(queryType(_service))),
           AstSchemaBuilder.resolverBased[Ctx](
             FieldResolver.map("Query" -> Map("_service" -> (_ => _Service(sdl)))),
             AdditionalTypes(_Any.__type[Node], _Service.Type, _FieldSet.Type)
           )
         )
       case entities =>
         schema.extend(
-          Document(definitions = Vector(queryType(_service, _entities))),
+          ast.Document(definitions = Vector(queryType(_service, _entities))),
           AstSchemaBuilder.resolverBased[Ctx](
             FieldResolver.map(
               "Query" -> Map(

diff --git a/core/src/main/scala/sangria/federation/v1/Query.scala b/core/src/main/scala/sangria/federation/v1/Query.scala
@@ -4,12 +4,12 @@ import sangria.ast._
 
 object Query {
 
-  val _service = FieldDefinition(
+  val _service: FieldDefinition = FieldDefinition(
     name = "_service",
     fieldType = NotNullType(NamedType("_Service")),
     arguments = Vector.empty)
 
-  val _entities =
+  val _entities: FieldDefinition =
     FieldDefinition(
       name = "_entities",
       fieldType = NotNullType(ListType(NamedType("_Entity"))),
@@ -20,7 +20,7 @@ object Query {
           defaultValue = None))
     )
 
-  def queryType(fields: FieldDefinition*) =
+  def queryType(fields: FieldDefinition*): ObjectTypeExtensionDefinition =
     ObjectTypeExtensionDefinition(
       name = "Query",
       interfaces = Vector.empty,

diff --git a/core/src/main/scala/sangria/federation/v1/_Any.scala b/core/src/main/scala/sangria/federation/v1/_Any.scala
@@ -14,11 +14,11 @@ private[federation] object _Any {
 
   def __type[Node] = ScalarType[_Any[Node]](
     name = "_Any",
-    coerceOutput = { case _ =>
+    coerceOutput = { (_, _) =>
       "output"
     },
     coerceUserInput = {
-      case n: NodeObject[Node] =>
+      case n: NodeObject[Node] @unchecked =>
         n.__typename match {
           case Some(__typename) => Right(_Any(__typename, n))
           case None => Left(TypeNameNotFound)

diff --git a/core/src/main/scala/sangria/federation/v2/Federation.scala b/core/src/main/scala/sangria/federation/v2/Federation.scala
@@ -1,13 +1,6 @@
 package sangria.federation.v2
 
-import sangria.ast.{
-  Argument => AstArgument,
-  Directive => AstDirective,
-  Document,
-  ListValue,
-  SchemaExtensionDefinition,
-  StringValue
-}
+import sangria.ast
 import sangria.marshalling.InputUnmarshaller
 import sangria.renderer.SchemaFilter
 import sangria.schema._
@@ -33,23 +26,23 @@ object Federation {
 
     val sdl = Some(schema.renderPretty(SchemaFilter.withoutGraphQLBuiltIn))
 
-    val schemaExtensionDefinition = SchemaExtensionDefinition(
+    val schemaExtensionDefinition = ast.SchemaExtensionDefinition(
       operationTypes = Vector.empty,
       directives = Vector(
-        AstDirective(
+        ast.Directive(
           name = "link",
           arguments = Vector(
-            AstArgument("url", StringValue("https://specs.apollo.dev/federation/v2.0")),
-            AstArgument(
+            ast.Argument("url", ast.StringValue("https://specs.apollo.dev/federation/v2.0")),
+            ast.Argument(
               "import",
-              ListValue(Vector(
-                StringValue("@key"),
-                StringValue("@shareable"),
-                StringValue("@inaccessible"),
-                StringValue("@override"),
-                StringValue("@external"),
-                StringValue("@provides"),
-                StringValue("@requires")
+              ast.ListValue(Vector(
+                ast.StringValue("@key"),
+                ast.StringValue("@shareable"),
+                ast.StringValue("@inaccessible"),
+                ast.StringValue("@override"),
+                ast.StringValue("@external"),
+                ast.StringValue("@provides"),
+                ast.StringValue("@requires")
               ))
             )
           )
@@ -59,7 +52,7 @@ object Federation {
     (entities match {
       case Nil =>
         schema.extend(
-          Document(Vector(queryType(_service), schemaExtensionDefinition)),
+          ast.Document(Vector(queryType(_service), schemaExtensionDefinition)),
           AstSchemaBuilder.resolverBased[Ctx](
             FieldResolver.map("Query" -> Map("_service" -> (_ => _Service(sdl)))),
             AdditionalTypes(
@@ -72,7 +65,7 @@ object Federation {
         )
       case entities =>
         schema.extend(
-          Document(Vector(queryType(_service, _entities), schemaExtensionDefinition)),
+          ast.Document(Vector(queryType(_service, _entities), schemaExtensionDefinition)),
           AstSchemaBuilder.resolverBased[Ctx](
             FieldResolver.map(
               "Query" -> Map(

diff --git a/core/src/main/scala/sangria/federation/v2/Query.scala b/core/src/main/scala/sangria/federation/v2/Query.scala
@@ -4,12 +4,12 @@ import sangria.ast._
 
 object Query {
 
-  val _service = FieldDefinition(
+  val _service: FieldDefinition = FieldDefinition(
     name = "_service",
     fieldType = NotNullType(NamedType("_Service")),
     arguments = Vector.empty)
 
-  val _entities =
+  val _entities: FieldDefinition =
     FieldDefinition(
       name = "_entities",
       fieldType = NotNullType(ListType(NamedType("_Entity"))),
@@ -20,7 +20,7 @@ object Query {
           defaultValue = None))
     )
 
-  def queryType(fields: FieldDefinition*) =
+  def queryType(fields: FieldDefinition*): ObjectTypeExtensionDefinition =
     ObjectTypeExtensionDefinition(
       name = "Query",
       interfaces = Vector.empty,

diff --git a/core/src/main/scala/sangria/federation/v2/_Any.scala b/core/src/main/scala/sangria/federation/v2/_Any.scala
@@ -14,11 +14,11 @@ private[federation] object _Any {
 
   def __type[Node] = ScalarType[_Any[Node]](
     name = "_Any",
-    coerceOutput = { case _ =>
+    coerceOutput = { (_, _) =>
       "output"
     },
     coerceUserInput = {
-      case n: NodeObject[Node] =>
+      case n: NodeObject[Node] @unchecked =>
         n.__typename match {
           case Some(__typename) => Right(_Any(__typename, n))
           case None => Left(TypeNameNotFound)

diff --git a/core/src/test/scala/sangria/federation/v1/_AnySpec.scala b/core/src/test/scala/sangria/federation/v1/_AnySpec.scala
@@ -5,17 +5,19 @@ import io.circe.parser._
 import org.scalatest.wordspec.AnyWordSpec
 import org.scalatest.matchers.should.Matchers
 import org.scalatest.EitherValues
+import sangria.marshalling.InputUnmarshaller
 import sangria.validation.Violation
 
 class _AnySpec extends AnyWordSpec with Matchers with EitherValues {
 
-  implicit val um = Federation.upgrade(sangria.marshalling.circe.CirceInputUnmarshaller)
+  implicit private val um: InputUnmarshaller[Json] =
+    Federation.upgrade(sangria.marshalling.circe.CirceInputUnmarshaller)
 
   "_Any scalar coercion accepts an object with __typename field" in {
     // https://www.apollographql.com/docs/federation/v1/federation-spec#scalar-_any
     parseUserInput(
       parse("""{ "__typename": "foo", "foo": "bar" }""")
-        .getOrElse(Json.Null)).value shouldBe a[_Any[Json]]
+        .getOrElse(Json.Null)).value shouldBe a[_Any[_]]
   }
 
   def parseUserInput(value: Json): Either[Violation, _Any[Json]] =

diff --git a/core/src/test/scala/sangria/federation/v2/_AnySpec.scala b/core/src/test/scala/sangria/federation/v2/_AnySpec.scala
@@ -5,17 +5,19 @@ import io.circe.parser._
 import org.scalatest.wordspec.AnyWordSpec
 import org.scalatest.matchers.should.Matchers
 import org.scalatest.EitherValues
+import sangria.marshalling.InputUnmarshaller
 import sangria.validation.Violation
 
 class _AnySpec extends AnyWordSpec with Matchers with EitherValues {
 
-  implicit val um = Federation.upgrade(sangria.marshalling.circe.CirceInputUnmarshaller)
+  implicit private val um: InputUnmarshaller[Json] =
+    Federation.upgrade(sangria.marshalling.circe.CirceInputUnmarshaller)
 
   "_Any scalar coercion accepts an object with __typename field" in {
     // https://www.apollographql.com/docs/federation/federation-spec/#scalar-_any
     parseUserInput(
       parse("""{ "__typename": "foo", "foo": "bar" }""")
-        .getOrElse(Json.Null)).value shouldBe a[_Any[Json]]
+        .getOrElse(Json.Null)).value shouldBe a[_Any[_]]
   }
 
   def parseUserInput(value: Json): Either[Violation, _Any[Json]] =

diff --git a/example/common/src/main/scala/common/GraphQL.scala b/example/common/src/main/scala/common/GraphQL.scala
@@ -6,7 +6,7 @@ import cats.effect._
 import cats.implicits._
 import io.circe._
 import io.circe.optics.JsonPath._
-import sangria.ast.Document
+import sangria.ast
 import sangria.execution._
 import sangria.marshalling.InputUnmarshaller
 import sangria.marshalling.circe.CirceResultMarshaller
@@ -75,7 +75,7 @@ object GraphQL {
       def exec(
           schema: Schema[A, Any],
           userContext: F[A],
-          query: Document,
+          query: ast.Document,
           operationName: Option[String],
           variables: Json): F[Either[Json, Json]] =
         for {

diff --git a/example/common/src/main/scala/common/Server.scala b/example/common/src/main/scala/common/Server.scala
@@ -37,7 +37,7 @@ object Server {
         PermanentRedirect(Location(uri"/playground"))
     }
 
-    BlazeServerBuilder[F](global)
+    BlazeServerBuilder[F]
       .bindHttp(port, "localhost")
       .withHttpApp(routes.orNotFound)
       .resource