Move creative type hierarchy and use expression body methods.

Author: marcus-nl

src/test/kotlin/graphql/kickstart/tools/EndToEndSpecHelper.kt

@@ -22,7 +22,7 @@ fun createSchema() = SchemaParser.newParser()
     .dictionary("ThirdItem", ThirdItem::class)
     .dictionary("ComplexMapItem", ComplexMapItem::class)
     .dictionary("NestedComplexMapItem", NestedComplexMapItem::class)
-    .dictionary("OutOfBeerError", OutOfBeerError::class)
+    .dictionary("NoDogError", NoDogError::class)
     .build()
     .makeExecutableSchema()
 
@@ -85,8 +85,8 @@ type Query {
     
     throwsIllegalArgumentException: String
     
-    allBars: [Bar!]!
-    findAvailableBar(persons: Int!): BarResult!
+    allDogs: [Dog!]!
+    findSuitableDog(preferredColor: String!, minimumFluffiness: Int!): FindDogResult!
 }
 
 type ExtendedType {
@@ -221,15 +221,17 @@ type ItemWithGenericProperties {
     keys: [String!]!
 }
 
-type Bar {
-    name: String
+type Dog {
+    name: String!
+    color: String!
+    fluffiness: Int!
 }
 
-type OutOfBeerError {
+type NoDogError {
     msg: String
 }
 
-union BarResult = Bar | OutOfBeerError
+union FindDogResult = Dog | NoDogError
 """
 
 val items = listOf(
@@ -329,15 +331,12 @@ class Query : GraphQLQueryResolver, ListListResolver<String>() {
         throw IllegalArgumentException("Expected")
     }
 
-    fun allBars(): List<Bar> {
-        return listOf(BarEntityImpl("123", "Bar Name"))
-    }
-    fun findAvailableBar(persons: Int): Any {
-        if (persons < 56)
-            return BarEntityImpl("123", "Bar Name");
-        else
-            return OutOfBeerError("No room for $persons persons")
-    }
+    fun allDogs(): List<Dog> = listOf(LabradorRetriever("Hershey", "chocolate", 42, 3.14159f))
+
+    fun findSuitableDog(preferredColor: String, minimumFluffiness: Int): Any =
+        allDogs()
+            .firstOrNull { it.color == preferredColor && it.fluffiness >= minimumFluffiness }
+            ?: NoDogError("No $preferredColor-colored dog found that is sufficiently fluffy")
 }
 
 class UnusedRootResolver : GraphQLQueryResolver
@@ -434,10 +433,14 @@ class MockPart(private val name: String, private val content: String) : Part {
     override fun delete() = throw IllegalArgumentException("Not supported")
 }
 
-interface Bar { val name: String }
-interface BarEntity : Bar { val id: String}
-class BarEntityImpl(override val id: String, override val name: String) : BarEntity
-class OutOfBeerError(val msg: String)
+interface Dog {
+    val name: String
+    val color: String
+    val fluffiness: Int
+}
+interface Retriever : Dog { val speed: Float }
+class LabradorRetriever(override val name: String, override val color: String, override val fluffiness: Int, override val speed: Float) : Retriever
+class NoDogError(val msg: String)
 
 val customScalarId = GraphQLScalarType.newScalar()
     .name("ID")

src/test/kotlin/graphql/kickstart/tools/EndToEndTest.kt

@@ -183,15 +183,15 @@ class EndToEndTest {
         val data = assertNoGraphQlErrors(gql) {
             """
             {
-                findAvailableBar(persons: 42) {
-                    ... on Bar { name }
-                    ... on OutOfBeerError { msg }
+                findSuitableDog(preferredColor: "chocolate", minimumFluffiness: 31) {
+                    ... on Dog { name }
+                    ... on NoDogError { msg }
                 }
             }
             """
         }
 
-        assertNotNull(data["findAvailableBar"])
+        assertNotNull(data["findSuitableDog"])
     }
 
     @Test