Minor improvements after merge

src/main/scala/sangria/schema/Schema.scala

@@ -743,7 +743,6 @@ case class Schema[Ctx, Val](
   def renderCompact(filter: SchemaFilter): String = toAst(filter).renderCompact
 
   lazy val types: Map[String, (Int, Type with Named)] = {
-
     def sameType(t1: Type, t2: Type): Boolean = {
       val sameSangriaType = t1.getClass.getName == t2.getClass.getName
 
@@ -753,19 +752,17 @@ case class Schema[Ctx, Val](
       }
     }
 
-    def typeConflict(name: String, t1: Type, t2: Type, parentInfo: String) = {
-
+    def typeConflict(name: String, t1: Type, t2: Type, parentInfo: String) =
       (t1, t2) match {
-        case (ot1: ObjectType[_, _], ot2: ObjectType[_, _]) ⇒ {
+        case (ot1: ObjectType[_, _], ot2: ObjectType[_, _]) ⇒
           throw SchemaValidationException(Vector(ConflictingObjectTypeCaseClassViolation(name, parentInfo)))
-        }
-        case _ => {
+
+        case _ ⇒
           val conflictingTypes = List(t1, t2).map(_.getClass.getSimpleName)
+
           throw SchemaValidationException(Vector(ConflictingTypeDefinitionViolation(
             name, conflictingTypes, parentInfo)))
-        }
       }
-    }
 
     def updated(priority: Int, name: String, tpe: Type with Named, result: Map[String, (Int, Type with Named)], parentInfo: String) =
       result get name match {

src/test/scala/sangria/schema/SchemaConstraintsSpec.scala

@@ -145,13 +145,12 @@ class SchemaConstraintsSpec extends WordSpec with Matchers {
     }
 
     "Not allow ObjectTypes with same name to be based on different case classes" in {
-
-      implicit val fooBazType = deriveObjectType[Unit, foo.Baz]()
-      implicit val barBazType = deriveObjectType[Unit, bar.Baz]()
+      implicit val fooBazType = deriveObjectType[Unit, test.foo.Baz]()
+      implicit val barBazType = deriveObjectType[Unit, test.bar.Baz]()
 
       val queryType = ObjectType("Query", fields[Unit, Unit](
-        Field("fooBaz", OptionType(fooBazType), resolve = _ => Some(foo.Baz(1))),
-        Field("barBaz", barBazType, resolve = _ => bar.Baz("2", 3.0))
+        Field("fooBaz", OptionType(fooBazType), resolve = _ ⇒ Some(test.foo.Baz(1))),
+        Field("barBaz", barBazType, resolve = _ ⇒ test.bar.Baz("2", 3.0))
       ))
 
       val error = intercept [SchemaValidationException] (Schema(queryType))
@@ -161,13 +160,12 @@ class SchemaConstraintsSpec extends WordSpec with Matchers {
     }
 
     "Allow ObjectTypes based on different case classes but with different names" in {
-
-      implicit val fooBazType = deriveObjectType[Unit, foo.Baz]()
-      implicit val barBazType = deriveObjectType[Unit, bar.Baz](ObjectTypeName("BazWithNewName"))
+      implicit val fooBazType = deriveObjectType[Unit, test.foo.Baz]()
+      implicit val barBazType = deriveObjectType[Unit, test.bar.Baz](ObjectTypeName("BazWithNewName"))
 
       val queryType = ObjectType("Query", fields[Unit, Unit](
-        Field("fooBaz", OptionType(fooBazType), resolve = _ => Some(foo.Baz(1))),
-        Field("barBaz", barBazType, resolve = _ => bar.Baz("2", 3.0))
+        Field("fooBaz", OptionType(fooBazType), resolve = _ ⇒ Some(test.foo.Baz(1))),
+        Field("barBaz", barBazType, resolve = _ ⇒ test.bar.Baz("2", 3.0))
       ))
 
       Schema(queryType) // Should not throw any SchemaValidationExceptions

src/test/scala/sangria/schema/bar/Baz.scala → src/test/scala/test/bar/Baz.scala

@@ -1,3 +1,3 @@
-package sangria.schema.bar
+package test.bar
 
 case class Baz(y: String, z: Double)

src/test/scala/test/foo/Baz.scala

@@ -0,0 +1,3 @@
+package test.foo
+
+case class Baz(x: Int)