minor naming changes

sangria-graphql · Jan 23, 2016 · f68f769 · f68f769
1 parent 4d65ee4
commit f68f769
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/src/main/scala/sangria/marshalling/circe.scala b/src/main/scala/sangria/marshalling/circe.scala
@@ -69,11 +69,11 @@ object circe {
     def render(node: Json) = node.noSpaces
   }
 
-  implicit object circeJsonToInput extends ToInput[Json, Json] {
+  implicit object circeToInput extends ToInput[Json, Json] {
     def toInput(value: Json) = (value, CirceInputUnmarshaller)
   }
 
-  implicit object circeJsonFromInput extends FromInput[Json] {
+  implicit object circeFromInput extends FromInput[Json] {
     val marshaller = CirceResultMarshaller
     def fromResult(node: marshaller.Node) = node
   }

diff --git a/src/test/scala/sangria/marshalling/CirceSupportSpec.scala b/src/test/scala/sangria/marshalling/CirceSupportSpec.scala
@@ -7,10 +7,10 @@ import sangria.marshalling.circe._
 import sangria.marshalling.testkit._
 
 class CirceSupportSpec extends WordSpec with Matchers with MarshallingBehaviour with InputHandlingBehaviour {
-  "SprayJson integration" should {
+  "Circe integration" should {
     behave like `value (un)marshaller` (CirceResultMarshaller)
 
-    behave like `AST-based input unmarshaller` (circeJsonFromInput)
+    behave like `AST-based input unmarshaller` (circeFromInput)
     behave like `AST-based input marshaller` (CirceResultMarshaller)
   }