From d00ade337f82dd875b544711b9ab175ffe869c73 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Niclas=20Ro=C3=9Fberger?= <niclas@nidomiro.de>
Date: Thu, 21 Nov 2019 19:13:49 +0100
Subject: [PATCH 1/5] moves Classes to more fitting packages

---
 .../kgraphql/schema/dsl/ResolverDSL.kt        |  1 +
 .../kgraphql/schema/dsl/SchemaBuilder.kt      | 15 ++++--
 .../{ => operations}/QueryOrMutationDSL.kt    |  7 ++-
 .../dsl/{ => operations}/SubscriptionDSL.kt   | 16 +++++--
 .../dsl/{ => types}/BooleanScalarDSL.kt       |  2 +-
 .../schema/dsl/{ => types}/DoubleScalarDSL.kt |  2 +-
 .../schema/dsl/{ => types}/EnumDSL.kt         |  5 +-
 .../schema/dsl/{ => types}/EnumValueDSL.kt    |  4 +-
 .../schema/dsl/{ => types}/InputTypeDSL.kt    |  3 +-
 .../schema/dsl/{ => types}/InputValueDSL.kt   |  3 +-
 .../schema/dsl/{ => types}/InputValuesDSL.kt  |  2 +-
 .../schema/dsl/{ => types}/IntScalarDSL.kt    |  2 +-
 .../schema/dsl/{ => types}/LongScalarDSL.kt   |  2 +-
 .../schema/dsl/{ => types}/ScalarDSL.kt       |  3 +-
 .../schema/dsl/{ => types}/StringScalarDSL.kt |  2 +-
 .../schema/dsl/{ => types}/TypeDSL.kt         |  8 +++-
 .../schema/dsl/{ => types}/UnionTypeDSL.kt    |  3 +-
 .../schema/model/MutableSchemaDefinition.kt   | 46 ++++++++++---------
 .../language/OperationsSpecificationTest.kt   |  9 ++--
 19 files changed, 84 insertions(+), 51 deletions(-)
 rename kgraphql/src/main/kotlin/com/apurebase/kgraphql/schema/dsl/{ => operations}/QueryOrMutationDSL.kt (93%)
 rename kgraphql/src/main/kotlin/com/apurebase/kgraphql/schema/dsl/{ => operations}/SubscriptionDSL.kt (85%)
 rename kgraphql/src/main/kotlin/com/apurebase/kgraphql/schema/dsl/{ => types}/BooleanScalarDSL.kt (95%)
 rename kgraphql/src/main/kotlin/com/apurebase/kgraphql/schema/dsl/{ => types}/DoubleScalarDSL.kt (95%)
 rename kgraphql/src/main/kotlin/com/apurebase/kgraphql/schema/dsl/{ => types}/EnumDSL.kt (78%)
 rename kgraphql/src/main/kotlin/com/apurebase/kgraphql/schema/dsl/{ => types}/EnumValueDSL.kt (56%)
 rename kgraphql/src/main/kotlin/com/apurebase/kgraphql/schema/dsl/{ => types}/InputTypeDSL.kt (73%)
 rename kgraphql/src/main/kotlin/com/apurebase/kgraphql/schema/dsl/{ => types}/InputValueDSL.kt (84%)
 rename kgraphql/src/main/kotlin/com/apurebase/kgraphql/schema/dsl/{ => types}/InputValuesDSL.kt (90%)
 rename kgraphql/src/main/kotlin/com/apurebase/kgraphql/schema/dsl/{ => types}/IntScalarDSL.kt (94%)
 rename kgraphql/src/main/kotlin/com/apurebase/kgraphql/schema/dsl/{ => types}/LongScalarDSL.kt (94%)
 rename kgraphql/src/main/kotlin/com/apurebase/kgraphql/schema/dsl/{ => types}/ScalarDSL.kt (89%)
 rename kgraphql/src/main/kotlin/com/apurebase/kgraphql/schema/dsl/{ => types}/StringScalarDSL.kt (95%)
 rename kgraphql/src/main/kotlin/com/apurebase/kgraphql/schema/dsl/{ => types}/TypeDSL.kt (94%)
 rename kgraphql/src/main/kotlin/com/apurebase/kgraphql/schema/dsl/{ => types}/UnionTypeDSL.kt (78%)

diff --git a/kgraphql/src/main/kotlin/com/apurebase/kgraphql/schema/dsl/ResolverDSL.kt b/kgraphql/src/main/kotlin/com/apurebase/kgraphql/schema/dsl/ResolverDSL.kt
index d3ff9801..a433b7a8 100644
--- a/kgraphql/src/main/kotlin/com/apurebase/kgraphql/schema/dsl/ResolverDSL.kt
+++ b/kgraphql/src/main/kotlin/com/apurebase/kgraphql/schema/dsl/ResolverDSL.kt
@@ -1,5 +1,6 @@
 package com.apurebase.kgraphql.schema.dsl
 
+import com.apurebase.kgraphql.schema.dsl.types.InputValuesDSL
 import com.apurebase.kgraphql.schema.model.InputValueDef
 
 
diff --git a/kgraphql/src/main/kotlin/com/apurebase/kgraphql/schema/dsl/SchemaBuilder.kt b/kgraphql/src/main/kotlin/com/apurebase/kgraphql/schema/dsl/SchemaBuilder.kt
index 927a1240..88295595 100644
--- a/kgraphql/src/main/kotlin/com/apurebase/kgraphql/schema/dsl/SchemaBuilder.kt
+++ b/kgraphql/src/main/kotlin/com/apurebase/kgraphql/schema/dsl/SchemaBuilder.kt
@@ -1,14 +1,19 @@
 package com.apurebase.kgraphql.schema.dsl
 
-import com.apurebase.kgraphql.schema.*
+import com.apurebase.kgraphql.schema.Publisher
+import com.apurebase.kgraphql.schema.Schema
+import com.apurebase.kgraphql.schema.SchemaException
+import com.apurebase.kgraphql.schema.dsl.operations.QueryOrMutationDSL
+import com.apurebase.kgraphql.schema.dsl.operations.SubscriptionDSL
+import com.apurebase.kgraphql.schema.dsl.types.*
+import com.apurebase.kgraphql.schema.model.EnumValueDef
+import com.apurebase.kgraphql.schema.model.MutableSchemaDefinition
+import com.apurebase.kgraphql.schema.model.TypeDef
+import com.apurebase.kgraphql.schema.structure.SchemaCompilation
 import com.fasterxml.jackson.core.JsonParser
 import com.fasterxml.jackson.databind.DeserializationContext
 import com.fasterxml.jackson.databind.deser.std.StdDeserializer
 import com.fasterxml.jackson.databind.module.SimpleModule
-import com.apurebase.kgraphql.schema.model.EnumValueDef
-import com.apurebase.kgraphql.schema.model.TypeDef
-import com.apurebase.kgraphql.schema.model.MutableSchemaDefinition
-import com.apurebase.kgraphql.schema.structure.SchemaCompilation
 import kotlin.reflect.KClass
 
 /**
diff --git a/kgraphql/src/main/kotlin/com/apurebase/kgraphql/schema/dsl/QueryOrMutationDSL.kt b/kgraphql/src/main/kotlin/com/apurebase/kgraphql/schema/dsl/operations/QueryOrMutationDSL.kt
similarity index 93%
rename from kgraphql/src/main/kotlin/com/apurebase/kgraphql/schema/dsl/QueryOrMutationDSL.kt
rename to kgraphql/src/main/kotlin/com/apurebase/kgraphql/schema/dsl/operations/QueryOrMutationDSL.kt
index e458a9cf..5830765b 100644
--- a/kgraphql/src/main/kotlin/com/apurebase/kgraphql/schema/dsl/QueryOrMutationDSL.kt
+++ b/kgraphql/src/main/kotlin/com/apurebase/kgraphql/schema/dsl/operations/QueryOrMutationDSL.kt
@@ -1,6 +1,8 @@
-package com.apurebase.kgraphql.schema.dsl
+package com.apurebase.kgraphql.schema.dsl.operations
 
 import com.apurebase.kgraphql.Context
+import com.apurebase.kgraphql.schema.dsl.LimitedAccessItemDSL
+import com.apurebase.kgraphql.schema.dsl.ResolverDSL
 import com.apurebase.kgraphql.schema.model.FunctionWrapper
 import com.apurebase.kgraphql.schema.model.InputValueDef
 import com.apurebase.kgraphql.schema.model.MutationDef
@@ -11,7 +13,8 @@ import kotlin.reflect.KFunction
 class QueryOrMutationDSL(
     val name : String,
     private val block : QueryOrMutationDSL.() -> Unit
-) : LimitedAccessItemDSL<Nothing>(), ResolverDSL.Target {
+) : LimitedAccessItemDSL<Nothing>(),
+    ResolverDSL.Target {
 
     private val inputValues = mutableListOf<InputValueDef<*>>()
 
diff --git a/kgraphql/src/main/kotlin/com/apurebase/kgraphql/schema/dsl/SubscriptionDSL.kt b/kgraphql/src/main/kotlin/com/apurebase/kgraphql/schema/dsl/operations/SubscriptionDSL.kt
similarity index 85%
rename from kgraphql/src/main/kotlin/com/apurebase/kgraphql/schema/dsl/SubscriptionDSL.kt
rename to kgraphql/src/main/kotlin/com/apurebase/kgraphql/schema/dsl/operations/SubscriptionDSL.kt
index 1826ec28..22733149 100644
--- a/kgraphql/src/main/kotlin/com/apurebase/kgraphql/schema/dsl/SubscriptionDSL.kt
+++ b/kgraphql/src/main/kotlin/com/apurebase/kgraphql/schema/dsl/operations/SubscriptionDSL.kt
@@ -1,8 +1,15 @@
-package com.apurebase.kgraphql.schema.dsl
+package com.apurebase.kgraphql.schema.dsl.operations
 
 import com.apurebase.kgraphql.Context
-import com.apurebase.kgraphql.schema.*
-import com.apurebase.kgraphql.schema.model.*
+import com.apurebase.kgraphql.schema.Publisher
+import com.apurebase.kgraphql.schema.SchemaException
+import com.apurebase.kgraphql.schema.Subscriber
+import com.apurebase.kgraphql.schema.Subscription
+import com.apurebase.kgraphql.schema.dsl.LimitedAccessItemDSL
+import com.apurebase.kgraphql.schema.dsl.ResolverDSL
+import com.apurebase.kgraphql.schema.model.FunctionWrapper
+import com.apurebase.kgraphql.schema.model.InputValueDef
+import com.apurebase.kgraphql.schema.model.SubscriptionDef
 import com.fasterxml.jackson.databind.ObjectWriter
 import kotlin.reflect.full.isSubtypeOf
 import kotlin.reflect.full.memberProperties
@@ -12,7 +19,8 @@ import kotlin.reflect.full.starProjectedType
 class SubscriptionDSL(
         val name : String,
         block : SubscriptionDSL.() -> Unit
-) : LimitedAccessItemDSL<Nothing>(), ResolverDSL.Target {
+) : LimitedAccessItemDSL<Nothing>(),
+    ResolverDSL.Target {
 
     private val inputValues = mutableListOf<InputValueDef<*>>()
 
diff --git a/kgraphql/src/main/kotlin/com/apurebase/kgraphql/schema/dsl/BooleanScalarDSL.kt b/kgraphql/src/main/kotlin/com/apurebase/kgraphql/schema/dsl/types/BooleanScalarDSL.kt
similarity index 95%
rename from kgraphql/src/main/kotlin/com/apurebase/kgraphql/schema/dsl/BooleanScalarDSL.kt
rename to kgraphql/src/main/kotlin/com/apurebase/kgraphql/schema/dsl/types/BooleanScalarDSL.kt
index 9393d176..53b7d794 100644
--- a/kgraphql/src/main/kotlin/com/apurebase/kgraphql/schema/dsl/BooleanScalarDSL.kt
+++ b/kgraphql/src/main/kotlin/com/apurebase/kgraphql/schema/dsl/types/BooleanScalarDSL.kt
@@ -1,4 +1,4 @@
-package com.apurebase.kgraphql.schema.dsl
+package com.apurebase.kgraphql.schema.dsl.types
 
 import com.apurebase.kgraphql.schema.SchemaException
 import com.apurebase.kgraphql.schema.model.ast.ValueNode
diff --git a/kgraphql/src/main/kotlin/com/apurebase/kgraphql/schema/dsl/DoubleScalarDSL.kt b/kgraphql/src/main/kotlin/com/apurebase/kgraphql/schema/dsl/types/DoubleScalarDSL.kt
similarity index 95%
rename from kgraphql/src/main/kotlin/com/apurebase/kgraphql/schema/dsl/DoubleScalarDSL.kt
rename to kgraphql/src/main/kotlin/com/apurebase/kgraphql/schema/dsl/types/DoubleScalarDSL.kt
index ef427153..1541fa2e 100644
--- a/kgraphql/src/main/kotlin/com/apurebase/kgraphql/schema/dsl/DoubleScalarDSL.kt
+++ b/kgraphql/src/main/kotlin/com/apurebase/kgraphql/schema/dsl/types/DoubleScalarDSL.kt
@@ -1,4 +1,4 @@
-package com.apurebase.kgraphql.schema.dsl
+package com.apurebase.kgraphql.schema.dsl.types
 
 import com.apurebase.kgraphql.schema.SchemaException
 import com.apurebase.kgraphql.schema.model.ast.ValueNode
diff --git a/kgraphql/src/main/kotlin/com/apurebase/kgraphql/schema/dsl/EnumDSL.kt b/kgraphql/src/main/kotlin/com/apurebase/kgraphql/schema/dsl/types/EnumDSL.kt
similarity index 78%
rename from kgraphql/src/main/kotlin/com/apurebase/kgraphql/schema/dsl/EnumDSL.kt
rename to kgraphql/src/main/kotlin/com/apurebase/kgraphql/schema/dsl/types/EnumDSL.kt
index 66e44064..e2695d03 100644
--- a/kgraphql/src/main/kotlin/com/apurebase/kgraphql/schema/dsl/EnumDSL.kt
+++ b/kgraphql/src/main/kotlin/com/apurebase/kgraphql/schema/dsl/types/EnumDSL.kt
@@ -1,6 +1,7 @@
-package com.apurebase.kgraphql.schema.dsl
+package com.apurebase.kgraphql.schema.dsl.types
 
 import com.apurebase.kgraphql.defaultKQLTypeName
+import com.apurebase.kgraphql.schema.dsl.ItemDSL
 import kotlin.reflect.KClass
 
 
@@ -19,7 +20,7 @@ class EnumDSL<T : Enum<T>>(kClass: KClass<T>, block : (EnumDSL<T>.() -> Unit)?)
     }
 
     infix fun T.describe(content: String){
-        valueDefinitions[this] = EnumValueDSL(this){
+        valueDefinitions[this] = EnumValueDSL(this) {
             description = content
         }
     }
diff --git a/kgraphql/src/main/kotlin/com/apurebase/kgraphql/schema/dsl/EnumValueDSL.kt b/kgraphql/src/main/kotlin/com/apurebase/kgraphql/schema/dsl/types/EnumValueDSL.kt
similarity index 56%
rename from kgraphql/src/main/kotlin/com/apurebase/kgraphql/schema/dsl/EnumValueDSL.kt
rename to kgraphql/src/main/kotlin/com/apurebase/kgraphql/schema/dsl/types/EnumValueDSL.kt
index 1f4f5f84..22fdbe95 100644
--- a/kgraphql/src/main/kotlin/com/apurebase/kgraphql/schema/dsl/EnumValueDSL.kt
+++ b/kgraphql/src/main/kotlin/com/apurebase/kgraphql/schema/dsl/types/EnumValueDSL.kt
@@ -1,4 +1,6 @@
-package com.apurebase.kgraphql.schema.dsl
+package com.apurebase.kgraphql.schema.dsl.types
+
+import com.apurebase.kgraphql.schema.dsl.DepreciableItemDSL
 
 
 class EnumValueDSL<T : Enum<T>>(val value : T, block : EnumValueDSL<T>.() -> Unit) : DepreciableItemDSL(){
diff --git a/kgraphql/src/main/kotlin/com/apurebase/kgraphql/schema/dsl/InputTypeDSL.kt b/kgraphql/src/main/kotlin/com/apurebase/kgraphql/schema/dsl/types/InputTypeDSL.kt
similarity index 73%
rename from kgraphql/src/main/kotlin/com/apurebase/kgraphql/schema/dsl/InputTypeDSL.kt
rename to kgraphql/src/main/kotlin/com/apurebase/kgraphql/schema/dsl/types/InputTypeDSL.kt
index d02bc292..ac113cc0 100644
--- a/kgraphql/src/main/kotlin/com/apurebase/kgraphql/schema/dsl/InputTypeDSL.kt
+++ b/kgraphql/src/main/kotlin/com/apurebase/kgraphql/schema/dsl/types/InputTypeDSL.kt
@@ -1,6 +1,7 @@
-package com.apurebase.kgraphql.schema.dsl
+package com.apurebase.kgraphql.schema.dsl.types
 
 import com.apurebase.kgraphql.defaultKQLTypeName
+import com.apurebase.kgraphql.schema.dsl.ItemDSL
 import kotlin.reflect.KClass
 
 
diff --git a/kgraphql/src/main/kotlin/com/apurebase/kgraphql/schema/dsl/InputValueDSL.kt b/kgraphql/src/main/kotlin/com/apurebase/kgraphql/schema/dsl/types/InputValueDSL.kt
similarity index 84%
rename from kgraphql/src/main/kotlin/com/apurebase/kgraphql/schema/dsl/InputValueDSL.kt
rename to kgraphql/src/main/kotlin/com/apurebase/kgraphql/schema/dsl/types/InputValueDSL.kt
index fcd9c95a..23d010c0 100644
--- a/kgraphql/src/main/kotlin/com/apurebase/kgraphql/schema/dsl/InputValueDSL.kt
+++ b/kgraphql/src/main/kotlin/com/apurebase/kgraphql/schema/dsl/types/InputValueDSL.kt
@@ -1,5 +1,6 @@
-package com.apurebase.kgraphql.schema.dsl
+package com.apurebase.kgraphql.schema.dsl.types
 
+import com.apurebase.kgraphql.schema.dsl.DepreciableItemDSL
 import com.apurebase.kgraphql.schema.model.InputValueDef
 import kotlin.reflect.KClass
 
diff --git a/kgraphql/src/main/kotlin/com/apurebase/kgraphql/schema/dsl/InputValuesDSL.kt b/kgraphql/src/main/kotlin/com/apurebase/kgraphql/schema/dsl/types/InputValuesDSL.kt
similarity index 90%
rename from kgraphql/src/main/kotlin/com/apurebase/kgraphql/schema/dsl/InputValuesDSL.kt
rename to kgraphql/src/main/kotlin/com/apurebase/kgraphql/schema/dsl/types/InputValuesDSL.kt
index 66a6f6cc..b60b4888 100644
--- a/kgraphql/src/main/kotlin/com/apurebase/kgraphql/schema/dsl/InputValuesDSL.kt
+++ b/kgraphql/src/main/kotlin/com/apurebase/kgraphql/schema/dsl/types/InputValuesDSL.kt
@@ -1,4 +1,4 @@
-package com.apurebase.kgraphql.schema.dsl
+package com.apurebase.kgraphql.schema.dsl.types
 
 import kotlin.reflect.KClass
 
diff --git a/kgraphql/src/main/kotlin/com/apurebase/kgraphql/schema/dsl/IntScalarDSL.kt b/kgraphql/src/main/kotlin/com/apurebase/kgraphql/schema/dsl/types/IntScalarDSL.kt
similarity index 94%
rename from kgraphql/src/main/kotlin/com/apurebase/kgraphql/schema/dsl/IntScalarDSL.kt
rename to kgraphql/src/main/kotlin/com/apurebase/kgraphql/schema/dsl/types/IntScalarDSL.kt
index e6d5911a..1fbd9ba0 100644
--- a/kgraphql/src/main/kotlin/com/apurebase/kgraphql/schema/dsl/IntScalarDSL.kt
+++ b/kgraphql/src/main/kotlin/com/apurebase/kgraphql/schema/dsl/types/IntScalarDSL.kt
@@ -1,4 +1,4 @@
-package com.apurebase.kgraphql.schema.dsl
+package com.apurebase.kgraphql.schema.dsl.types
 
 import com.apurebase.kgraphql.schema.SchemaException
 import com.apurebase.kgraphql.schema.model.ast.ValueNode
diff --git a/kgraphql/src/main/kotlin/com/apurebase/kgraphql/schema/dsl/LongScalarDSL.kt b/kgraphql/src/main/kotlin/com/apurebase/kgraphql/schema/dsl/types/LongScalarDSL.kt
similarity index 94%
rename from kgraphql/src/main/kotlin/com/apurebase/kgraphql/schema/dsl/LongScalarDSL.kt
rename to kgraphql/src/main/kotlin/com/apurebase/kgraphql/schema/dsl/types/LongScalarDSL.kt
index 3eca61e7..fab48950 100644
--- a/kgraphql/src/main/kotlin/com/apurebase/kgraphql/schema/dsl/LongScalarDSL.kt
+++ b/kgraphql/src/main/kotlin/com/apurebase/kgraphql/schema/dsl/types/LongScalarDSL.kt
@@ -1,4 +1,4 @@
-package com.apurebase.kgraphql.schema.dsl
+package com.apurebase.kgraphql.schema.dsl.types
 
 import com.apurebase.kgraphql.schema.SchemaException
 import com.apurebase.kgraphql.schema.model.ast.ValueNode
diff --git a/kgraphql/src/main/kotlin/com/apurebase/kgraphql/schema/dsl/ScalarDSL.kt b/kgraphql/src/main/kotlin/com/apurebase/kgraphql/schema/dsl/types/ScalarDSL.kt
similarity index 89%
rename from kgraphql/src/main/kotlin/com/apurebase/kgraphql/schema/dsl/ScalarDSL.kt
rename to kgraphql/src/main/kotlin/com/apurebase/kgraphql/schema/dsl/types/ScalarDSL.kt
index 4b127050..4d09e4e9 100644
--- a/kgraphql/src/main/kotlin/com/apurebase/kgraphql/schema/dsl/ScalarDSL.kt
+++ b/kgraphql/src/main/kotlin/com/apurebase/kgraphql/schema/dsl/types/ScalarDSL.kt
@@ -1,6 +1,7 @@
-package com.apurebase.kgraphql.schema.dsl
+package com.apurebase.kgraphql.schema.dsl.types
 
 import com.apurebase.kgraphql.defaultKQLTypeName
+import com.apurebase.kgraphql.schema.dsl.ItemDSL
 import com.apurebase.kgraphql.schema.scalar.ScalarCoercion
 import kotlin.reflect.KClass
 
diff --git a/kgraphql/src/main/kotlin/com/apurebase/kgraphql/schema/dsl/StringScalarDSL.kt b/kgraphql/src/main/kotlin/com/apurebase/kgraphql/schema/dsl/types/StringScalarDSL.kt
similarity index 95%
rename from kgraphql/src/main/kotlin/com/apurebase/kgraphql/schema/dsl/StringScalarDSL.kt
rename to kgraphql/src/main/kotlin/com/apurebase/kgraphql/schema/dsl/types/StringScalarDSL.kt
index 5c3cf540..34ad0338 100644
--- a/kgraphql/src/main/kotlin/com/apurebase/kgraphql/schema/dsl/StringScalarDSL.kt
+++ b/kgraphql/src/main/kotlin/com/apurebase/kgraphql/schema/dsl/types/StringScalarDSL.kt
@@ -1,4 +1,4 @@
-package com.apurebase.kgraphql.schema.dsl
+package com.apurebase.kgraphql.schema.dsl.types
 
 import com.apurebase.kgraphql.schema.SchemaException
 import com.apurebase.kgraphql.schema.model.ast.ValueNode
diff --git a/kgraphql/src/main/kotlin/com/apurebase/kgraphql/schema/dsl/TypeDSL.kt b/kgraphql/src/main/kotlin/com/apurebase/kgraphql/schema/dsl/types/TypeDSL.kt
similarity index 94%
rename from kgraphql/src/main/kotlin/com/apurebase/kgraphql/schema/dsl/TypeDSL.kt
rename to kgraphql/src/main/kotlin/com/apurebase/kgraphql/schema/dsl/types/TypeDSL.kt
index 89e2cec6..1dc5907c 100644
--- a/kgraphql/src/main/kotlin/com/apurebase/kgraphql/schema/dsl/TypeDSL.kt
+++ b/kgraphql/src/main/kotlin/com/apurebase/kgraphql/schema/dsl/types/TypeDSL.kt
@@ -1,11 +1,15 @@
-package com.apurebase.kgraphql.schema.dsl
+package com.apurebase.kgraphql.schema.dsl.types
 
 import com.apurebase.kgraphql.defaultKQLTypeName
 import com.apurebase.kgraphql.schema.SchemaException
+import com.apurebase.kgraphql.schema.dsl.ItemDSL
+import com.apurebase.kgraphql.schema.dsl.KotlinPropertyDSL
+import com.apurebase.kgraphql.schema.dsl.PropertyDSL
+import com.apurebase.kgraphql.schema.dsl.UnionPropertyDSL
 import com.apurebase.kgraphql.schema.model.FunctionWrapper
 import com.apurebase.kgraphql.schema.model.PropertyDef
-import com.apurebase.kgraphql.schema.model.TypeDef
 import com.apurebase.kgraphql.schema.model.Transformation
+import com.apurebase.kgraphql.schema.model.TypeDef
 import kotlin.reflect.KClass
 import kotlin.reflect.KProperty1
 
diff --git a/kgraphql/src/main/kotlin/com/apurebase/kgraphql/schema/dsl/UnionTypeDSL.kt b/kgraphql/src/main/kotlin/com/apurebase/kgraphql/schema/dsl/types/UnionTypeDSL.kt
similarity index 78%
rename from kgraphql/src/main/kotlin/com/apurebase/kgraphql/schema/dsl/UnionTypeDSL.kt
rename to kgraphql/src/main/kotlin/com/apurebase/kgraphql/schema/dsl/types/UnionTypeDSL.kt
index 2b9917c9..ab286c2c 100644
--- a/kgraphql/src/main/kotlin/com/apurebase/kgraphql/schema/dsl/UnionTypeDSL.kt
+++ b/kgraphql/src/main/kotlin/com/apurebase/kgraphql/schema/dsl/types/UnionTypeDSL.kt
@@ -1,5 +1,6 @@
-package com.apurebase.kgraphql.schema.dsl
+package com.apurebase.kgraphql.schema.dsl.types
 
+import com.apurebase.kgraphql.schema.dsl.ItemDSL
 import kotlin.reflect.KClass
 
 
diff --git a/kgraphql/src/main/kotlin/com/apurebase/kgraphql/schema/model/MutableSchemaDefinition.kt b/kgraphql/src/main/kotlin/com/apurebase/kgraphql/schema/model/MutableSchemaDefinition.kt
index c1648b88..403adbf5 100644
--- a/kgraphql/src/main/kotlin/com/apurebase/kgraphql/schema/model/MutableSchemaDefinition.kt
+++ b/kgraphql/src/main/kotlin/com/apurebase/kgraphql/schema/model/MutableSchemaDefinition.kt
@@ -5,13 +5,8 @@ import com.apurebase.kgraphql.schema.SchemaException
 import com.apurebase.kgraphql.schema.builtin.BUILT_IN_TYPE
 import com.apurebase.kgraphql.schema.directive.Directive
 import com.apurebase.kgraphql.schema.directive.DirectiveLocation
-import com.apurebase.kgraphql.schema.dsl.TypeDSL
-import com.apurebase.kgraphql.schema.introspection.TypeKind
-import com.apurebase.kgraphql.schema.introspection.__Directive
-import com.apurebase.kgraphql.schema.introspection.__EnumValue
-import com.apurebase.kgraphql.schema.introspection.__Field
-import com.apurebase.kgraphql.schema.introspection.__Schema
-import com.apurebase.kgraphql.schema.introspection.__Type
+import com.apurebase.kgraphql.schema.dsl.types.TypeDSL
+import com.apurebase.kgraphql.schema.introspection.*
 import kotlin.reflect.KClass
 import kotlin.reflect.full.isSubclassOf
 
@@ -146,35 +141,42 @@ data class MutableSchemaDefinition (
     }
 }
 
-private fun create__TypeDefinition() = TypeDSL(emptyList(), __Type::class){
-    transformation(__Type::fields){ fields: List<__Field>?, includeDeprecated : Boolean? ->
+private fun create__TypeDefinition() = TypeDSL(emptyList(), __Type::class) {
+    transformation(__Type::fields) { fields: List<__Field>?, includeDeprecated: Boolean? ->
         if (includeDeprecated == true) fields else fields?.filterNot { it.isDeprecated }
     }
-    transformation(__Type::enumValues){ enumValues: List<__EnumValue>?, includeDeprecated: Boolean? ->
+    transformation(__Type::enumValues) { enumValues: List<__EnumValue>?, includeDeprecated: Boolean? ->
         if (includeDeprecated == true) enumValues else enumValues?.filterNot { it.isDeprecated }
     }
 }.toKQLObject()
 
-private fun create__DirectiveDefinition() = TypeDSL(emptyList(), __Directive::class){
-    property<Boolean>("onField"){
+private fun create__DirectiveDefinition() = TypeDSL(
+    emptyList(),
+    __Directive::class
+) {
+    property<Boolean>("onField") {
         resolver { dir: __Directive ->
             dir.locations.contains(DirectiveLocation.FIELD)
         }
         deprecate("Use `locations`.")
     }
-    property<Boolean>("onFragment"){
-        resolver { dir: __Directive -> dir.locations.containsAny (
-            DirectiveLocation.FRAGMENT_SPREAD,
-            DirectiveLocation.FRAGMENT_DEFINITION,
-            DirectiveLocation.INLINE_FRAGMENT)
+    property<Boolean>("onFragment") {
+        resolver { dir: __Directive ->
+            dir.locations.containsAny(
+                DirectiveLocation.FRAGMENT_SPREAD,
+                DirectiveLocation.FRAGMENT_DEFINITION,
+                DirectiveLocation.INLINE_FRAGMENT
+            )
         }
         deprecate("Use `locations`.")
     }
-    property<Boolean>("onOperation"){
-        resolver{ dir : __Directive -> dir.locations.containsAny (
-            DirectiveLocation.QUERY,
-            DirectiveLocation.MUTATION,
-            DirectiveLocation.SUBSCRIPTION)
+    property<Boolean>("onOperation") {
+        resolver { dir: __Directive ->
+            dir.locations.containsAny(
+                DirectiveLocation.QUERY,
+                DirectiveLocation.MUTATION,
+                DirectiveLocation.SUBSCRIPTION
+            )
         }
         deprecate("Use `locations`.")
     }
diff --git a/kgraphql/src/test/kotlin/com/apurebase/kgraphql/specification/language/OperationsSpecificationTest.kt b/kgraphql/src/test/kotlin/com/apurebase/kgraphql/specification/language/OperationsSpecificationTest.kt
index 8cbdc947..c8c1fef6 100644
--- a/kgraphql/src/test/kotlin/com/apurebase/kgraphql/specification/language/OperationsSpecificationTest.kt
+++ b/kgraphql/src/test/kotlin/com/apurebase/kgraphql/specification/language/OperationsSpecificationTest.kt
@@ -1,9 +1,12 @@
 package com.apurebase.kgraphql.specification.language
 
-import com.apurebase.kgraphql.*
+import com.apurebase.kgraphql.Specification
+import com.apurebase.kgraphql.defaultSchema
+import com.apurebase.kgraphql.executeEqualQueries
+import com.apurebase.kgraphql.expect
 import com.apurebase.kgraphql.schema.SchemaException
-import com.apurebase.kgraphql.schema.dsl.subscribe
-import com.apurebase.kgraphql.schema.dsl.unsubscribe
+import com.apurebase.kgraphql.schema.dsl.operations.subscribe
+import com.apurebase.kgraphql.schema.dsl.operations.unsubscribe
 import org.amshove.kluent.shouldEqual
 import org.junit.Test
 

From 85d0f820fb3086d5071eba0d62ae2e63d291478b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Niclas=20Ro=C3=9Fberger?= <niclas@nidomiro.de>
Date: Thu, 21 Nov 2019 19:36:55 +0100
Subject: [PATCH 2/5] moves block() outside of the DSL class

---
 .idea/runConfigurations/Run_Tests.xml         | 23 ------
 .../kotlin/com/apurebase/kgraphql/KGraphQL.kt |  7 +-
 .../kgraphql/schema/dsl/ResolverDSL.kt        |  2 +-
 .../kgraphql/schema/dsl/SchemaBuilder.kt      | 82 ++++++++++---------
 ...MutationDSL.kt => AbstractOperationDSL.kt} | 41 +---------
 .../schema/dsl/operations/MutationDSL.kt      | 26 ++++++
 .../schema/dsl/operations/QueryDSL.kt         | 25 ++++++
 .../schema/dsl/operations/SubscriptionDSL.kt  | 56 ++++---------
 .../schema/dsl/types/BooleanScalarDSL.kt      |  3 +-
 .../schema/dsl/types/DoubleScalarDSL.kt       |  3 +-
 .../kgraphql/schema/dsl/types/EnumDSL.kt      | 10 +--
 .../kgraphql/schema/dsl/types/EnumValueDSL.kt |  6 +-
 .../kgraphql/schema/dsl/types/InputTypeDSL.kt |  6 +-
 .../schema/dsl/types/InputValueDSL.kt         |  6 +-
 .../schema/dsl/types/InputValuesDSL.kt        |  7 +-
 .../kgraphql/schema/dsl/types/IntScalarDSL.kt |  3 +-
 .../schema/dsl/types/LongScalarDSL.kt         |  3 +-
 .../kgraphql/schema/dsl/types/ScalarDSL.kt    |  4 +-
 .../schema/dsl/types/StringScalarDSL.kt       |  3 +-
 .../kgraphql/schema/dsl/types/TypeDSL.kt      |  6 +-
 .../kgraphql/schema/dsl/types/UnionTypeDSL.kt |  6 +-
 .../schema/model/MutableSchemaDefinition.kt   |  4 +-
 .../com/apurebase/kgraphql/TestUtils.kt       | 10 ++-
 23 files changed, 146 insertions(+), 196 deletions(-)
 delete mode 100644 .idea/runConfigurations/Run_Tests.xml
 rename kgraphql/src/main/kotlin/com/apurebase/kgraphql/schema/dsl/operations/{QueryOrMutationDSL.kt => AbstractOperationDSL.kt} (59%)
 create mode 100644 kgraphql/src/main/kotlin/com/apurebase/kgraphql/schema/dsl/operations/MutationDSL.kt
 create mode 100644 kgraphql/src/main/kotlin/com/apurebase/kgraphql/schema/dsl/operations/QueryDSL.kt

diff --git a/.idea/runConfigurations/Run_Tests.xml b/.idea/runConfigurations/Run_Tests.xml
deleted file mode 100644
index 301bfc22..00000000
--- a/.idea/runConfigurations/Run_Tests.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-<component name="ProjectRunConfigurationManager">
-  <configuration default="false" name="Run Tests" type="JUnit" factoryName="JUnit">
-    <module name="kgraphql.test" />
-    <extension name="net.ashald.envfile">
-      <option name="IS_ENABLED" value="false" />
-      <option name="IS_SUBST" value="false" />
-      <option name="IS_PATH_MACRO_SUPPORTED" value="false" />
-      <option name="IS_IGNORE_MISSING_FILES" value="false" />
-      <ENTRIES>
-        <ENTRY IS_ENABLED="true" PARSER="runconfig" />
-      </ENTRIES>
-    </extension>
-    <option name="MAIN_CLASS_NAME" value="" />
-    <option name="METHOD_NAME" value="" />
-    <option name="TEST_OBJECT" value="directory" />
-    <option name="PARAMETERS" value="" />
-    <option name="WORKING_DIRECTORY" value="%MODULE_WORKING_DIR%" />
-    <dir value="$PROJECT_DIR$/src/test/kotlin/com/apurebase/kgraphql" />
-    <method v="2">
-      <option name="Make" enabled="true" />
-    </method>
-  </configuration>
-</component>
\ No newline at end of file
diff --git a/kgraphql/src/main/kotlin/com/apurebase/kgraphql/KGraphQL.kt b/kgraphql/src/main/kotlin/com/apurebase/kgraphql/KGraphQL.kt
index c1720ac3..bdac7990 100644
--- a/kgraphql/src/main/kotlin/com/apurebase/kgraphql/KGraphQL.kt
+++ b/kgraphql/src/main/kotlin/com/apurebase/kgraphql/KGraphQL.kt
@@ -1,10 +1,15 @@
 package com.apurebase.kgraphql
 
+import com.apurebase.kgraphql.schema.Schema
 import com.apurebase.kgraphql.schema.dsl.SchemaBuilder
 
 
 class KGraphQL {
     companion object {
-        fun schema(init : SchemaBuilder<Unit>.() -> Unit) = SchemaBuilder(init).build()
+        fun schema(init: SchemaBuilder.() -> Unit): Schema {
+            return SchemaBuilder()
+                .apply(init)
+                .build()
+        }
     }
 }
\ No newline at end of file
diff --git a/kgraphql/src/main/kotlin/com/apurebase/kgraphql/schema/dsl/ResolverDSL.kt b/kgraphql/src/main/kotlin/com/apurebase/kgraphql/schema/dsl/ResolverDSL.kt
index a433b7a8..978e00d8 100644
--- a/kgraphql/src/main/kotlin/com/apurebase/kgraphql/schema/dsl/ResolverDSL.kt
+++ b/kgraphql/src/main/kotlin/com/apurebase/kgraphql/schema/dsl/ResolverDSL.kt
@@ -6,7 +6,7 @@ import com.apurebase.kgraphql.schema.model.InputValueDef
 
 class ResolverDSL(private val target: Target) {
     fun withArgs(block : InputValuesDSL.() -> Unit){
-        val inputValuesDSL = InputValuesDSL(block)
+        val inputValuesDSL = InputValuesDSL().apply(block)
 
         target.addInputValues(inputValuesDSL.inputValues.map { inputValue ->
             (inputValue.toKQLInputValue())
diff --git a/kgraphql/src/main/kotlin/com/apurebase/kgraphql/schema/dsl/SchemaBuilder.kt b/kgraphql/src/main/kotlin/com/apurebase/kgraphql/schema/dsl/SchemaBuilder.kt
index 88295595..527e6034 100644
--- a/kgraphql/src/main/kotlin/com/apurebase/kgraphql/schema/dsl/SchemaBuilder.kt
+++ b/kgraphql/src/main/kotlin/com/apurebase/kgraphql/schema/dsl/SchemaBuilder.kt
@@ -3,7 +3,8 @@ package com.apurebase.kgraphql.schema.dsl
 import com.apurebase.kgraphql.schema.Publisher
 import com.apurebase.kgraphql.schema.Schema
 import com.apurebase.kgraphql.schema.SchemaException
-import com.apurebase.kgraphql.schema.dsl.operations.QueryOrMutationDSL
+import com.apurebase.kgraphql.schema.dsl.operations.MutationDSL
+import com.apurebase.kgraphql.schema.dsl.operations.QueryDSL
 import com.apurebase.kgraphql.schema.dsl.operations.SubscriptionDSL
 import com.apurebase.kgraphql.schema.dsl.types.*
 import com.apurebase.kgraphql.schema.model.EnumValueDef
@@ -19,14 +20,13 @@ import kotlin.reflect.KClass
 /**
  * SchemaBuilder exposes rich DSL to setup GraphQL schema
  */
-class SchemaBuilder<Context : Any>(private val init: SchemaBuilder<Context>.() -> Unit) {
+class SchemaBuilder {
 
     private val model = MutableSchemaDefinition()
 
     private var configuration = SchemaConfigurationDSL()
 
     fun build(): Schema {
-        init()
         return SchemaCompilation(configuration.build(), model.toSchemaDefinition()).perform()
     }
 
@@ -38,75 +38,79 @@ class SchemaBuilder<Context : Any>(private val init: SchemaBuilder<Context>.() -
     // OPERATIONS
     //================================================================================
 
-    fun query(name : String, init: QueryOrMutationDSL.() -> Unit): Publisher {
-        val query = QueryOrMutationDSL(name, init).toKQLQuery()
+    fun query(name: String, init: QueryDSL.() -> Unit): Publisher {
+        val query = QueryDSL(name)
+            .apply(init)
+            .toKQLQuery()
         model.addQuery(query)
         return query
     }
 
-    fun mutation(name : String, init: QueryOrMutationDSL.() -> Unit): Publisher {
-        val mutation = QueryOrMutationDSL(name, init).toKQLMutation()
+    fun mutation(name: String, init: MutationDSL.() -> Unit): Publisher {
+        val mutation = MutationDSL(name)
+            .apply(init)
+            .toKQLMutation()
+
         model.addMutation(mutation)
         return mutation
     }
 
     fun subscription(name : String, init: SubscriptionDSL.() -> Unit){
-        model.addSubscription(SubscriptionDSL(name, init).toKQLSubscription())
+        val subscription = SubscriptionDSL(name)
+            .apply(init)
+            .toKQLSubscription()
+
+        model.addSubscription(subscription)
     }
 
     //================================================================================
     // SCALAR
     //================================================================================
 
-    fun <T : Any>stringScalar(kClass: KClass<T>, block: ScalarDSL<T, String>.() -> Unit){
-        val scalar = StringScalarDSL(kClass, block)
-        val coercion = scalar.createCoercion()
+    fun <T : Any> stringScalar(kClass: KClass<T>, block: ScalarDSL<T, String>.() -> Unit) {
+        val scalar = StringScalarDSL(kClass).apply(block)
         configuration.appendMapper(scalar, kClass)
-        model.addScalar(TypeDef.Scalar(scalar.name, kClass, coercion, scalar.description))
+        model.addScalar(TypeDef.Scalar(scalar.name, kClass, scalar.createCoercion(), scalar.description))
     }
 
     inline fun <reified T : Any> stringScalar(noinline block: ScalarDSL<T, String>.() -> Unit) {
         stringScalar(T::class, block)
     }
 
-    fun <T : Any>intScalar(kClass: KClass<T>, block: ScalarDSL<T, Int>.() -> Unit){
-        val scalar = IntScalarDSL(kClass, block)
-        val coercion = scalar.createCoercion()
+    fun <T : Any> intScalar(kClass: KClass<T>, block: ScalarDSL<T, Int>.() -> Unit) {
+        val scalar = IntScalarDSL(kClass).apply(block)
         configuration.appendMapper(scalar, kClass)
-        model.addScalar(TypeDef.Scalar(scalar.name, kClass, coercion, scalar.description))
+        model.addScalar(TypeDef.Scalar(scalar.name, kClass, scalar.createCoercion(), scalar.description))
     }
 
     inline fun <reified T : Any> intScalar(noinline block: ScalarDSL<T, Int>.() -> Unit) {
         intScalar(T::class, block)
     }
 
-    fun <T : Any>floatScalar(kClass: KClass<T>, block: ScalarDSL<T, Double>.() -> Unit){
-        val scalar = DoubleScalarDSL(kClass, block)
-        val coercion = scalar.createCoercion()
+    fun <T : Any> floatScalar(kClass: KClass<T>, block: ScalarDSL<T, Double>.() -> Unit) {
+        val scalar = DoubleScalarDSL(kClass).apply(block)
         configuration.appendMapper(scalar, kClass)
-        model.addScalar(TypeDef.Scalar(scalar.name, kClass, coercion, scalar.description))
+        model.addScalar(TypeDef.Scalar(scalar.name, kClass, scalar.createCoercion(), scalar.description))
     }
 
     inline fun <reified T : Any> floatScalar(noinline block: ScalarDSL<T, Double>.() -> Unit) {
         floatScalar(T::class, block)
     }
 
-    fun <T : Any>longScalar(kClass: KClass<T>, block: ScalarDSL<T, Long>.() -> Unit){
-        val scalar = LongScalarDSL(kClass, block)
-        val coercion = scalar.createCoercion()
+    fun <T : Any> longScalar(kClass: KClass<T>, block: ScalarDSL<T, Long>.() -> Unit) {
+        val scalar = LongScalarDSL(kClass).apply(block)
         configuration.appendMapper(scalar, kClass)
-        model.addScalar(TypeDef.Scalar(scalar.name, kClass, coercion, scalar.description))
+        model.addScalar(TypeDef.Scalar(scalar.name, kClass, scalar.createCoercion(), scalar.description))
     }
 
-    inline fun <reified T : Any>longScalar(noinline block: ScalarDSL<T, Long>.() -> Unit) {
+    inline fun <reified T : Any> longScalar(noinline block: ScalarDSL<T, Long>.() -> Unit) {
         longScalar(T::class, block)
     }
 
-    fun <T : Any>booleanScalar(kClass: KClass<T>, block: ScalarDSL<T, Boolean>.() -> Unit){
-        val scalar = BooleanScalarDSL(kClass, block)
-        val coercion = scalar.createCoercion()
+    fun <T : Any> booleanScalar(kClass: KClass<T>, block: ScalarDSL<T, Boolean>.() -> Unit) {
+        val scalar = BooleanScalarDSL(kClass).apply(block)
         configuration.appendMapper(scalar, kClass)
-        model.addScalar(TypeDef.Scalar(scalar.name, kClass, coercion, scalar.description))
+        model.addScalar(TypeDef.Scalar(scalar.name, kClass, scalar.createCoercion(), scalar.description))
     }
 
     inline fun <reified T : Any> booleanScalar(noinline block: ScalarDSL<T, Boolean>.() -> Unit) {
@@ -117,8 +121,8 @@ class SchemaBuilder<Context : Any>(private val init: SchemaBuilder<Context>.() -
     // TYPE
     //================================================================================
 
-    fun <T : Any>type(kClass: KClass<T>, block: TypeDSL<T>.() -> Unit){
-        val type = TypeDSL(model.unionsMonitor, kClass, block)
+    fun <T : Any> type(kClass: KClass<T>, block: TypeDSL<T>.() -> Unit) {
+        val type = TypeDSL(model.unionsMonitor, kClass).apply(block)
         model.addObject(type.toKQLObject())
     }
 
@@ -134,8 +138,12 @@ class SchemaBuilder<Context : Any>(private val init: SchemaBuilder<Context>.() -
     // ENUM
     //================================================================================
 
-    fun <T : Enum<T>>enum(kClass: KClass<T>, enumValues : Array<T>, block: (EnumDSL<T>.() -> Unit)? = null){
-        val type = EnumDSL(kClass, block)
+    fun <T : Enum<T>> enum(kClass: KClass<T>, enumValues: Array<T>, block: (EnumDSL<T>.() -> Unit)? = null) {
+        val type = EnumDSL(kClass).apply {
+            if (block != null) {
+                block()
+            }
+        }
 
         val kqlEnumValues = enumValues.map { value ->
             type.valueDefinitions[value]?.let { valueDSL ->
@@ -164,8 +172,8 @@ class SchemaBuilder<Context : Any>(private val init: SchemaBuilder<Context>.() -
     // UNION
     //================================================================================
 
-    fun unionType(name : String, block : UnionTypeDSL.() -> Unit) : TypeID {
-        val union = UnionTypeDSL(block)
+    fun unionType(name: String, block: UnionTypeDSL.() -> Unit): TypeID {
+        val union = UnionTypeDSL().apply(block)
         model.addUnion(TypeDef.Union(name, union.possibleTypes, union.description))
         return TypeID(name)
     }
@@ -174,8 +182,8 @@ class SchemaBuilder<Context : Any>(private val init: SchemaBuilder<Context>.() -
     // INPUT
     //================================================================================
 
-    fun <T : Any>inputType(kClass: KClass<T>, block : InputTypeDSL<T>.() -> Unit) {
-        val input = InputTypeDSL(kClass, block)
+    fun <T : Any> inputType(kClass: KClass<T>, block: InputTypeDSL<T>.() -> Unit) {
+        val input = InputTypeDSL(kClass).apply(block)
         model.addInputObject(TypeDef.Input(input.name, kClass, input.description))
     }
 
diff --git a/kgraphql/src/main/kotlin/com/apurebase/kgraphql/schema/dsl/operations/QueryOrMutationDSL.kt b/kgraphql/src/main/kotlin/com/apurebase/kgraphql/schema/dsl/operations/AbstractOperationDSL.kt
similarity index 59%
rename from kgraphql/src/main/kotlin/com/apurebase/kgraphql/schema/dsl/operations/QueryOrMutationDSL.kt
rename to kgraphql/src/main/kotlin/com/apurebase/kgraphql/schema/dsl/operations/AbstractOperationDSL.kt
index 5830765b..769f4b36 100644
--- a/kgraphql/src/main/kotlin/com/apurebase/kgraphql/schema/dsl/operations/QueryOrMutationDSL.kt
+++ b/kgraphql/src/main/kotlin/com/apurebase/kgraphql/schema/dsl/operations/AbstractOperationDSL.kt
@@ -1,24 +1,19 @@
-package com.apurebase.kgraphql.schema.dsl.operations
-
 import com.apurebase.kgraphql.Context
 import com.apurebase.kgraphql.schema.dsl.LimitedAccessItemDSL
 import com.apurebase.kgraphql.schema.dsl.ResolverDSL
 import com.apurebase.kgraphql.schema.model.FunctionWrapper
 import com.apurebase.kgraphql.schema.model.InputValueDef
-import com.apurebase.kgraphql.schema.model.MutationDef
-import com.apurebase.kgraphql.schema.model.QueryDef
 import kotlin.reflect.KFunction
 
 
-class QueryOrMutationDSL(
-    val name : String,
-    private val block : QueryOrMutationDSL.() -> Unit
+abstract class AbstractOperationDSL(
+    val name: String
 ) : LimitedAccessItemDSL<Nothing>(),
     ResolverDSL.Target {
 
-    private val inputValues = mutableListOf<InputValueDef<*>>()
+    protected val inputValues = mutableListOf<InputValueDef<*>>()
 
-    private var functionWrapper : FunctionWrapper<*>? = null
+    internal var functionWrapper: FunctionWrapper<*>? = null
 
     private fun resolver(function: FunctionWrapper<*>): ResolverDSL {
         functionWrapper = function
@@ -56,33 +51,5 @@ class QueryOrMutationDSL(
         this.inputValues.addAll(inputValues)
     }
 
-    internal fun toKQLQuery(): QueryDef<out Any?> {
-        block()
-        val function = functionWrapper ?: throw IllegalArgumentException("resolver has to be specified for query [$name]")
-
-        return QueryDef (
-            name = name,
-            resolver = function,
-            description = description,
-            isDeprecated = isDeprecated,
-            deprecationReason = deprecationReason,
-            inputValues = inputValues,
-            accessRule = accessRuleBlock
-        )
-    }
 
-    internal fun toKQLMutation(): MutationDef<out Any?> {
-        block()
-        val function = functionWrapper ?: throw IllegalArgumentException("resolver has to be specified for mutation [$name]")
-
-        return MutationDef(
-            name = name,
-            resolver = function,
-            description = description,
-            isDeprecated = isDeprecated,
-            deprecationReason = deprecationReason,
-            inputValues = inputValues,
-            accessRule = accessRuleBlock
-        )
-    }
 }
diff --git a/kgraphql/src/main/kotlin/com/apurebase/kgraphql/schema/dsl/operations/MutationDSL.kt b/kgraphql/src/main/kotlin/com/apurebase/kgraphql/schema/dsl/operations/MutationDSL.kt
new file mode 100644
index 00000000..ae4e291b
--- /dev/null
+++ b/kgraphql/src/main/kotlin/com/apurebase/kgraphql/schema/dsl/operations/MutationDSL.kt
@@ -0,0 +1,26 @@
+package com.apurebase.kgraphql.schema.dsl.operations
+
+import AbstractOperationDSL
+import com.apurebase.kgraphql.schema.model.MutationDef
+
+class MutationDSL(
+    name: String
+) : AbstractOperationDSL(name) {
+
+
+    internal fun toKQLMutation(): MutationDef<out Any?> {
+        val function =
+            functionWrapper ?: throw IllegalArgumentException("resolver has to be specified for mutation [$name]")
+
+        return MutationDef(
+            name = name,
+            resolver = function,
+            description = description,
+            isDeprecated = isDeprecated,
+            deprecationReason = deprecationReason,
+            inputValues = inputValues,
+            accessRule = accessRuleBlock
+        )
+    }
+
+}
\ No newline at end of file
diff --git a/kgraphql/src/main/kotlin/com/apurebase/kgraphql/schema/dsl/operations/QueryDSL.kt b/kgraphql/src/main/kotlin/com/apurebase/kgraphql/schema/dsl/operations/QueryDSL.kt
new file mode 100644
index 00000000..3d136d4e
--- /dev/null
+++ b/kgraphql/src/main/kotlin/com/apurebase/kgraphql/schema/dsl/operations/QueryDSL.kt
@@ -0,0 +1,25 @@
+package com.apurebase.kgraphql.schema.dsl.operations
+
+import AbstractOperationDSL
+import com.apurebase.kgraphql.schema.model.QueryDef
+
+class QueryDSL(
+    name: String
+) : AbstractOperationDSL(name) {
+
+
+    internal fun toKQLQuery(): QueryDef<out Any?> {
+        val function =
+            functionWrapper ?: throw IllegalArgumentException("resolver has to be specified for query [$name]")
+
+        return QueryDef(
+            name = name,
+            resolver = function,
+            description = description,
+            isDeprecated = isDeprecated,
+            deprecationReason = deprecationReason,
+            inputValues = inputValues,
+            accessRule = accessRuleBlock
+        )
+    }
+}
\ No newline at end of file
diff --git a/kgraphql/src/main/kotlin/com/apurebase/kgraphql/schema/dsl/operations/SubscriptionDSL.kt b/kgraphql/src/main/kotlin/com/apurebase/kgraphql/schema/dsl/operations/SubscriptionDSL.kt
index 22733149..163b10d4 100644
--- a/kgraphql/src/main/kotlin/com/apurebase/kgraphql/schema/dsl/operations/SubscriptionDSL.kt
+++ b/kgraphql/src/main/kotlin/com/apurebase/kgraphql/schema/dsl/operations/SubscriptionDSL.kt
@@ -1,14 +1,11 @@
 package com.apurebase.kgraphql.schema.dsl.operations
 
-import com.apurebase.kgraphql.Context
+import AbstractOperationDSL
 import com.apurebase.kgraphql.schema.Publisher
 import com.apurebase.kgraphql.schema.SchemaException
 import com.apurebase.kgraphql.schema.Subscriber
 import com.apurebase.kgraphql.schema.Subscription
-import com.apurebase.kgraphql.schema.dsl.LimitedAccessItemDSL
-import com.apurebase.kgraphql.schema.dsl.ResolverDSL
 import com.apurebase.kgraphql.schema.model.FunctionWrapper
-import com.apurebase.kgraphql.schema.model.InputValueDef
 import com.apurebase.kgraphql.schema.model.SubscriptionDef
 import com.fasterxml.jackson.databind.ObjectWriter
 import kotlin.reflect.full.isSubtypeOf
@@ -17,46 +14,21 @@ import kotlin.reflect.full.starProjectedType
 
 
 class SubscriptionDSL(
-        val name : String,
-        block : SubscriptionDSL.() -> Unit
-) : LimitedAccessItemDSL<Nothing>(),
-    ResolverDSL.Target {
-
-    private val inputValues = mutableListOf<InputValueDef<*>>()
-
-    init {
-        block()
-    }
-
-    private var functionWrapper : FunctionWrapper<*>? = null
-
-    private fun resolver(function: FunctionWrapper<*>): ResolverDSL {
-        functionWrapper = function
-        return ResolverDSL(this)
-    }
-
-    fun <T>resolver(function: suspend (String) -> T) = resolver(FunctionWrapper.on(function))
-
-    fun accessRule(rule: (Context) -> Exception?){
-        val accessRuleAdapter: (Nothing?, Context) -> Exception? = { _, ctx -> rule(ctx) }
-        this.accessRuleBlock = accessRuleAdapter
-    }
-
-    override fun addInputValues(inputValues: Collection<InputValueDef<*>>) {
-        this.inputValues.addAll(inputValues)
-    }
+    name: String
+) : AbstractOperationDSL(name) {
 
     internal fun toKQLSubscription(): SubscriptionDef<out Any?> {
-        val function = functionWrapper ?: throw IllegalArgumentException("resolver has to be specified for subscription [$name]")
-
-        return SubscriptionDef (
-                name = name,
-                resolver = function,
-                description = description,
-                isDeprecated = isDeprecated,
-                deprecationReason = deprecationReason,
-                inputValues = inputValues,
-                accessRule = accessRuleBlock
+        val function =
+            functionWrapper ?: throw IllegalArgumentException("resolver has to be specified for query [$name]")
+
+        return SubscriptionDef(
+            name = name,
+            resolver = function,
+            description = description,
+            isDeprecated = isDeprecated,
+            deprecationReason = deprecationReason,
+            inputValues = inputValues,
+            accessRule = accessRuleBlock
         )
     }
 }
diff --git a/kgraphql/src/main/kotlin/com/apurebase/kgraphql/schema/dsl/types/BooleanScalarDSL.kt b/kgraphql/src/main/kotlin/com/apurebase/kgraphql/schema/dsl/types/BooleanScalarDSL.kt
index 53b7d794..d09ddaa9 100644
--- a/kgraphql/src/main/kotlin/com/apurebase/kgraphql/schema/dsl/types/BooleanScalarDSL.kt
+++ b/kgraphql/src/main/kotlin/com/apurebase/kgraphql/schema/dsl/types/BooleanScalarDSL.kt
@@ -7,8 +7,7 @@ import com.apurebase.kgraphql.schema.scalar.ScalarCoercion
 import kotlin.reflect.KClass
 
 
-class BooleanScalarDSL<T : Any>(kClass: KClass<T>, block: ScalarDSL<T, Boolean>.() -> Unit)
-    : ScalarDSL<T, Boolean>(kClass, block){
+class BooleanScalarDSL<T : Any>(kClass: KClass<T>) : ScalarDSL<T, Boolean>(kClass) {
 
     override fun createCoercionFromFunctions(): ScalarCoercion<T, Boolean> {
         return object : BooleanScalarCoercion<T> {
diff --git a/kgraphql/src/main/kotlin/com/apurebase/kgraphql/schema/dsl/types/DoubleScalarDSL.kt b/kgraphql/src/main/kotlin/com/apurebase/kgraphql/schema/dsl/types/DoubleScalarDSL.kt
index 1541fa2e..6959358f 100644
--- a/kgraphql/src/main/kotlin/com/apurebase/kgraphql/schema/dsl/types/DoubleScalarDSL.kt
+++ b/kgraphql/src/main/kotlin/com/apurebase/kgraphql/schema/dsl/types/DoubleScalarDSL.kt
@@ -7,8 +7,7 @@ import com.apurebase.kgraphql.schema.scalar.ScalarCoercion
 import kotlin.reflect.KClass
 
 
-class DoubleScalarDSL<T : Any>(kClass: KClass<T>, block: ScalarDSL<T, Double>.() -> Unit)
-    : ScalarDSL<T, Double>(kClass, block){
+class DoubleScalarDSL<T : Any>(kClass: KClass<T>) : ScalarDSL<T, Double>(kClass) {
 
     override fun createCoercionFromFunctions(): ScalarCoercion<T, Double> {
         return object : DoubleScalarCoercion<T> {
diff --git a/kgraphql/src/main/kotlin/com/apurebase/kgraphql/schema/dsl/types/EnumDSL.kt b/kgraphql/src/main/kotlin/com/apurebase/kgraphql/schema/dsl/types/EnumDSL.kt
index e2695d03..43c9ae6e 100644
--- a/kgraphql/src/main/kotlin/com/apurebase/kgraphql/schema/dsl/types/EnumDSL.kt
+++ b/kgraphql/src/main/kotlin/com/apurebase/kgraphql/schema/dsl/types/EnumDSL.kt
@@ -5,22 +5,18 @@ import com.apurebase.kgraphql.schema.dsl.ItemDSL
 import kotlin.reflect.KClass
 
 
-class EnumDSL<T : Enum<T>>(kClass: KClass<T>, block : (EnumDSL<T>.() -> Unit)?) : ItemDSL() {
+class EnumDSL<T : Enum<T>>(kClass: KClass<T>) : ItemDSL() {
 
     var name = kClass.defaultKQLTypeName()
 
     val valueDefinitions = mutableMapOf<T, EnumValueDSL<T>>()
 
-    init {
-        block?.invoke(this)
-    }
-
     fun value(value : T, block : EnumValueDSL<T>.() -> Unit){
-        valueDefinitions[value] = EnumValueDSL(value, block)
+        valueDefinitions[value] = EnumValueDSL(value).apply(block)
     }
 
     infix fun T.describe(content: String){
-        valueDefinitions[this] = EnumValueDSL(this) {
+        valueDefinitions[this] = EnumValueDSL(this).apply {
             description = content
         }
     }
diff --git a/kgraphql/src/main/kotlin/com/apurebase/kgraphql/schema/dsl/types/EnumValueDSL.kt b/kgraphql/src/main/kotlin/com/apurebase/kgraphql/schema/dsl/types/EnumValueDSL.kt
index 22fdbe95..c06b3a45 100644
--- a/kgraphql/src/main/kotlin/com/apurebase/kgraphql/schema/dsl/types/EnumValueDSL.kt
+++ b/kgraphql/src/main/kotlin/com/apurebase/kgraphql/schema/dsl/types/EnumValueDSL.kt
@@ -3,8 +3,4 @@ package com.apurebase.kgraphql.schema.dsl.types
 import com.apurebase.kgraphql.schema.dsl.DepreciableItemDSL
 
 
-class EnumValueDSL<T : Enum<T>>(val value : T, block : EnumValueDSL<T>.() -> Unit) : DepreciableItemDSL(){
-    init {
-        block()
-    }
-}
\ No newline at end of file
+class EnumValueDSL<T : Enum<T>>(val value: T) : DepreciableItemDSL()
\ No newline at end of file
diff --git a/kgraphql/src/main/kotlin/com/apurebase/kgraphql/schema/dsl/types/InputTypeDSL.kt b/kgraphql/src/main/kotlin/com/apurebase/kgraphql/schema/dsl/types/InputTypeDSL.kt
index ac113cc0..0d2c39d6 100644
--- a/kgraphql/src/main/kotlin/com/apurebase/kgraphql/schema/dsl/types/InputTypeDSL.kt
+++ b/kgraphql/src/main/kotlin/com/apurebase/kgraphql/schema/dsl/types/InputTypeDSL.kt
@@ -5,11 +5,7 @@ import com.apurebase.kgraphql.schema.dsl.ItemDSL
 import kotlin.reflect.KClass
 
 
-class InputTypeDSL<T: Any>(val kClass: KClass<T>, block: (InputTypeDSL<T>.() -> Unit)?) : ItemDSL() {
+class InputTypeDSL<T : Any>(val kClass: KClass<T>) : ItemDSL() {
 
     var name = kClass.defaultKQLTypeName()
-
-    init {
-        block?.invoke(this)
-    }
 }
\ No newline at end of file
diff --git a/kgraphql/src/main/kotlin/com/apurebase/kgraphql/schema/dsl/types/InputValueDSL.kt b/kgraphql/src/main/kotlin/com/apurebase/kgraphql/schema/dsl/types/InputValueDSL.kt
index 23d010c0..f4deac35 100644
--- a/kgraphql/src/main/kotlin/com/apurebase/kgraphql/schema/dsl/types/InputValueDSL.kt
+++ b/kgraphql/src/main/kotlin/com/apurebase/kgraphql/schema/dsl/types/InputValueDSL.kt
@@ -5,11 +5,7 @@ import com.apurebase.kgraphql.schema.model.InputValueDef
 import kotlin.reflect.KClass
 
 
-class InputValueDSL<T : Any>(val kClass: KClass<T>, block : InputValueDSL<T>.() -> Unit) : DepreciableItemDSL() {
-
-    init {
-        block()
-    }
+class InputValueDSL<T : Any>(val kClass: KClass<T>) : DepreciableItemDSL() {
 
     lateinit var name : String
 
diff --git a/kgraphql/src/main/kotlin/com/apurebase/kgraphql/schema/dsl/types/InputValuesDSL.kt b/kgraphql/src/main/kotlin/com/apurebase/kgraphql/schema/dsl/types/InputValuesDSL.kt
index b60b4888..a8b7c4e8 100644
--- a/kgraphql/src/main/kotlin/com/apurebase/kgraphql/schema/dsl/types/InputValuesDSL.kt
+++ b/kgraphql/src/main/kotlin/com/apurebase/kgraphql/schema/dsl/types/InputValuesDSL.kt
@@ -3,16 +3,13 @@ package com.apurebase.kgraphql.schema.dsl.types
 import kotlin.reflect.KClass
 
 
-class InputValuesDSL(block : InputValuesDSL.() -> Unit) {
+class InputValuesDSL {
 
     val inputValues = mutableListOf<InputValueDSL<*>>()
 
-    init {
-        block()
-    }
 
     fun <T : Any> arg(kClass: KClass<T>, block : InputValueDSL<T>.() -> Unit){
-        inputValues.add(InputValueDSL(kClass, block))
+        inputValues.add(InputValueDSL(kClass).apply(block))
     }
 
     inline fun <reified T : Any> arg(noinline block : InputValueDSL<T>.() -> Unit){
diff --git a/kgraphql/src/main/kotlin/com/apurebase/kgraphql/schema/dsl/types/IntScalarDSL.kt b/kgraphql/src/main/kotlin/com/apurebase/kgraphql/schema/dsl/types/IntScalarDSL.kt
index 1fbd9ba0..739548b9 100644
--- a/kgraphql/src/main/kotlin/com/apurebase/kgraphql/schema/dsl/types/IntScalarDSL.kt
+++ b/kgraphql/src/main/kotlin/com/apurebase/kgraphql/schema/dsl/types/IntScalarDSL.kt
@@ -7,8 +7,7 @@ import com.apurebase.kgraphql.schema.scalar.ScalarCoercion
 import kotlin.reflect.KClass
 
 
-class IntScalarDSL<T : Any>(kClass: KClass<T>, block: ScalarDSL<T, Int>.() -> Unit)
-    : ScalarDSL<T, Int>(kClass, block){
+class IntScalarDSL<T : Any>(kClass: KClass<T>) : ScalarDSL<T, Int>(kClass) {
 
     override fun createCoercionFromFunctions(): ScalarCoercion<T, Int> {
         return object : IntScalarCoercion<T> {
diff --git a/kgraphql/src/main/kotlin/com/apurebase/kgraphql/schema/dsl/types/LongScalarDSL.kt b/kgraphql/src/main/kotlin/com/apurebase/kgraphql/schema/dsl/types/LongScalarDSL.kt
index fab48950..d80c1749 100644
--- a/kgraphql/src/main/kotlin/com/apurebase/kgraphql/schema/dsl/types/LongScalarDSL.kt
+++ b/kgraphql/src/main/kotlin/com/apurebase/kgraphql/schema/dsl/types/LongScalarDSL.kt
@@ -7,8 +7,7 @@ import com.apurebase.kgraphql.schema.scalar.ScalarCoercion
 import kotlin.reflect.KClass
 
 
-class LongScalarDSL<T : Any>(kClass: KClass<T>, block: ScalarDSL<T, Long>.() -> Unit)
-    : ScalarDSL<T, Long>(kClass, block){
+class LongScalarDSL<T : Any>(kClass: KClass<T>) : ScalarDSL<T, Long>(kClass) {
 
     override fun createCoercionFromFunctions(): ScalarCoercion<T, Long> {
         return object : LongScalarCoercion<T> {
diff --git a/kgraphql/src/main/kotlin/com/apurebase/kgraphql/schema/dsl/types/ScalarDSL.kt b/kgraphql/src/main/kotlin/com/apurebase/kgraphql/schema/dsl/types/ScalarDSL.kt
index 4d09e4e9..c7ea6f37 100644
--- a/kgraphql/src/main/kotlin/com/apurebase/kgraphql/schema/dsl/types/ScalarDSL.kt
+++ b/kgraphql/src/main/kotlin/com/apurebase/kgraphql/schema/dsl/types/ScalarDSL.kt
@@ -7,8 +7,7 @@ import kotlin.reflect.KClass
 
 
 abstract class ScalarDSL<T : Any, Raw : Any>(
-    kClass: KClass<T>,
-    private val block: ScalarDSL<T, Raw>.() -> Unit
+    kClass: KClass<T>
 ) : ItemDSL() {
 
     companion object {
@@ -25,7 +24,6 @@ abstract class ScalarDSL<T : Any, Raw : Any>(
     var coercion: ScalarCoercion<T, Raw>? = null
 
     fun createCoercion() : ScalarCoercion<T, Raw> {
-        block()
         return coercion ?: createCoercionFromFunctions()
     }
 
diff --git a/kgraphql/src/main/kotlin/com/apurebase/kgraphql/schema/dsl/types/StringScalarDSL.kt b/kgraphql/src/main/kotlin/com/apurebase/kgraphql/schema/dsl/types/StringScalarDSL.kt
index 34ad0338..e65e99cd 100644
--- a/kgraphql/src/main/kotlin/com/apurebase/kgraphql/schema/dsl/types/StringScalarDSL.kt
+++ b/kgraphql/src/main/kotlin/com/apurebase/kgraphql/schema/dsl/types/StringScalarDSL.kt
@@ -7,8 +7,7 @@ import com.apurebase.kgraphql.schema.scalar.StringScalarCoercion
 import kotlin.reflect.KClass
 
 
-class StringScalarDSL<T : Any>(kClass: KClass<T>, block: ScalarDSL<T, String>.() -> Unit)
-    : ScalarDSL<T, String>(kClass, block){
+class StringScalarDSL<T : Any>(kClass: KClass<T>) : ScalarDSL<T, String>(kClass) {
 
     override fun createCoercionFromFunctions(): ScalarCoercion<T, String> {
         return object : StringScalarCoercion<T> {
diff --git a/kgraphql/src/main/kotlin/com/apurebase/kgraphql/schema/dsl/types/TypeDSL.kt b/kgraphql/src/main/kotlin/com/apurebase/kgraphql/schema/dsl/types/TypeDSL.kt
index 1dc5907c..56e75cfe 100644
--- a/kgraphql/src/main/kotlin/com/apurebase/kgraphql/schema/dsl/types/TypeDSL.kt
+++ b/kgraphql/src/main/kotlin/com/apurebase/kgraphql/schema/dsl/types/TypeDSL.kt
@@ -15,9 +15,8 @@ import kotlin.reflect.KProperty1
 
 
 open class TypeDSL<T : Any>(
-        private val supportedUnions: Collection<TypeDef.Union>,
-        val kClass: KClass<T>,
-        private val block: TypeDSL<T>.() -> Unit
+    private val supportedUnions: Collection<TypeDef.Union>,
+    val kClass: KClass<T>
 ) : ItemDSL() {
 
     var name = kClass.defaultKQLTypeName()
@@ -91,7 +90,6 @@ open class TypeDSL<T : Any>(
 
 
     internal fun toKQLObject() : TypeDef.Object<T> {
-        block()
         return TypeDef.Object(
             name = name,
             kClass = kClass,
diff --git a/kgraphql/src/main/kotlin/com/apurebase/kgraphql/schema/dsl/types/UnionTypeDSL.kt b/kgraphql/src/main/kotlin/com/apurebase/kgraphql/schema/dsl/types/UnionTypeDSL.kt
index ab286c2c..6ff52b2c 100644
--- a/kgraphql/src/main/kotlin/com/apurebase/kgraphql/schema/dsl/types/UnionTypeDSL.kt
+++ b/kgraphql/src/main/kotlin/com/apurebase/kgraphql/schema/dsl/types/UnionTypeDSL.kt
@@ -4,14 +4,10 @@ import com.apurebase.kgraphql.schema.dsl.ItemDSL
 import kotlin.reflect.KClass
 
 
-class UnionTypeDSL(block : UnionTypeDSL.() -> Unit) : ItemDSL() {
+class UnionTypeDSL() : ItemDSL() {
 
     internal val possibleTypes = mutableSetOf<KClass<*>>()
 
-    init {
-        block()
-    }
-
     fun <T : Any>type(kClass : KClass<T>){
         possibleTypes.add(kClass)
     }
diff --git a/kgraphql/src/main/kotlin/com/apurebase/kgraphql/schema/model/MutableSchemaDefinition.kt b/kgraphql/src/main/kotlin/com/apurebase/kgraphql/schema/model/MutableSchemaDefinition.kt
index 403adbf5..f2eb8ac6 100644
--- a/kgraphql/src/main/kotlin/com/apurebase/kgraphql/schema/model/MutableSchemaDefinition.kt
+++ b/kgraphql/src/main/kotlin/com/apurebase/kgraphql/schema/model/MutableSchemaDefinition.kt
@@ -141,7 +141,7 @@ data class MutableSchemaDefinition (
     }
 }
 
-private fun create__TypeDefinition() = TypeDSL(emptyList(), __Type::class) {
+private fun create__TypeDefinition() = TypeDSL(emptyList(), __Type::class).apply {
     transformation(__Type::fields) { fields: List<__Field>?, includeDeprecated: Boolean? ->
         if (includeDeprecated == true) fields else fields?.filterNot { it.isDeprecated }
     }
@@ -153,7 +153,7 @@ private fun create__TypeDefinition() = TypeDSL(emptyList(), __Type::class) {
 private fun create__DirectiveDefinition() = TypeDSL(
     emptyList(),
     __Directive::class
-) {
+).apply {
     property<Boolean>("onField") {
         resolver { dir: __Directive ->
             dir.locations.contains(DirectiveLocation.FIELD)
diff --git a/kgraphql/src/test/kotlin/com/apurebase/kgraphql/TestUtils.kt b/kgraphql/src/test/kotlin/com/apurebase/kgraphql/TestUtils.kt
index 6284bdd6..5f680872 100644
--- a/kgraphql/src/test/kotlin/com/apurebase/kgraphql/TestUtils.kt
+++ b/kgraphql/src/test/kotlin/com/apurebase/kgraphql/TestUtils.kt
@@ -5,8 +5,10 @@ import com.apurebase.kgraphql.schema.Schema
 import com.apurebase.kgraphql.schema.dsl.SchemaBuilder
 import com.fasterxml.jackson.module.kotlin.jacksonObjectMapper
 import org.amshove.kluent.shouldEqual
-import org.hamcrest.*
+import org.hamcrest.CoreMatchers
+import org.hamcrest.FeatureMatcher
 import org.hamcrest.MatcherAssert.assertThat
+import org.hamcrest.Matchers
 import org.hamcrest.Matchers.instanceOf
 import java.io.File
 
@@ -48,8 +50,8 @@ fun <T>extractOrNull(map: Map<*,*>, path : String) : T? {
     }
 }
 
-fun defaultSchema(block: SchemaBuilder<Unit>.() -> Unit): DefaultSchema {
-    return SchemaBuilder(block).build() as DefaultSchema
+fun defaultSchema(block: SchemaBuilder.() -> Unit): DefaultSchema {
+    return SchemaBuilder().apply(block).build() as DefaultSchema
 }
 
 fun assertNoErrors(map : Map<*,*>) {
@@ -59,7 +61,7 @@ fun assertNoErrors(map : Map<*,*>) {
 
 fun assertError(map : Map<*,*>, vararg messageElements : String) {
     val errorMessage = map.extract<String>("errors/message")
-    MatcherAssert.assertThat(errorMessage, CoreMatchers.notNullValue())
+    assertThat(errorMessage, CoreMatchers.notNullValue())
 
     messageElements
         .filterNot { errorMessage.contains(it) }

From 22e040faa8521982100f00adce1810118fcefb6c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Niclas=20Ro=C3=9Fberger?= <niclas@nidomiro.de>
Date: Sat, 23 Nov 2019 09:05:46 +0100
Subject: [PATCH 3/5] makes SchemaBuilder internal

---
 .../kotlin/com/apurebase/kgraphql/schema/dsl/SchemaBuilder.kt   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/kgraphql/src/main/kotlin/com/apurebase/kgraphql/schema/dsl/SchemaBuilder.kt b/kgraphql/src/main/kotlin/com/apurebase/kgraphql/schema/dsl/SchemaBuilder.kt
index 527e6034..e4d2ccde 100644
--- a/kgraphql/src/main/kotlin/com/apurebase/kgraphql/schema/dsl/SchemaBuilder.kt
+++ b/kgraphql/src/main/kotlin/com/apurebase/kgraphql/schema/dsl/SchemaBuilder.kt
@@ -20,7 +20,7 @@ import kotlin.reflect.KClass
 /**
  * SchemaBuilder exposes rich DSL to setup GraphQL schema
  */
-class SchemaBuilder {
+internal class SchemaBuilder {
 
     private val model = MutableSchemaDefinition()
 

From beca33bc6f917243fa344757e6c694d51aba1550 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Niclas=20Ro=C3=9Fberger?= <niclas@nidomiro.de>
Date: Sat, 23 Nov 2019 09:07:41 +0100
Subject: [PATCH 4/5] moves internal to constructor of SchemaBuilder

---
 .../kotlin/com/apurebase/kgraphql/schema/dsl/SchemaBuilder.kt   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/kgraphql/src/main/kotlin/com/apurebase/kgraphql/schema/dsl/SchemaBuilder.kt b/kgraphql/src/main/kotlin/com/apurebase/kgraphql/schema/dsl/SchemaBuilder.kt
index e4d2ccde..5ccca132 100644
--- a/kgraphql/src/main/kotlin/com/apurebase/kgraphql/schema/dsl/SchemaBuilder.kt
+++ b/kgraphql/src/main/kotlin/com/apurebase/kgraphql/schema/dsl/SchemaBuilder.kt
@@ -20,7 +20,7 @@ import kotlin.reflect.KClass
 /**
  * SchemaBuilder exposes rich DSL to setup GraphQL schema
  */
-internal class SchemaBuilder {
+class SchemaBuilder internal constructor() {
 
     private val model = MutableSchemaDefinition()
 

From 1c86a4fb67f0f196368abbb724ee953c8d0319ba Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Niclas=20Ro=C3=9Fberger?= <niclas@nidomiro.de>
Date: Sat, 23 Nov 2019 11:47:34 +0100
Subject: [PATCH 5/5] adds missing package to AbstractOperationDSL

---
 .../kgraphql/schema/dsl/operations/AbstractOperationDSL.kt      | 2 ++
 .../com/apurebase/kgraphql/schema/dsl/operations/MutationDSL.kt | 1 -
 .../com/apurebase/kgraphql/schema/dsl/operations/QueryDSL.kt    | 1 -
 .../apurebase/kgraphql/schema/dsl/operations/SubscriptionDSL.kt | 1 -
 4 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/kgraphql/src/main/kotlin/com/apurebase/kgraphql/schema/dsl/operations/AbstractOperationDSL.kt b/kgraphql/src/main/kotlin/com/apurebase/kgraphql/schema/dsl/operations/AbstractOperationDSL.kt
index 769f4b36..c2467160 100644
--- a/kgraphql/src/main/kotlin/com/apurebase/kgraphql/schema/dsl/operations/AbstractOperationDSL.kt
+++ b/kgraphql/src/main/kotlin/com/apurebase/kgraphql/schema/dsl/operations/AbstractOperationDSL.kt
@@ -1,3 +1,5 @@
+package com.apurebase.kgraphql.schema.dsl.operations
+
 import com.apurebase.kgraphql.Context
 import com.apurebase.kgraphql.schema.dsl.LimitedAccessItemDSL
 import com.apurebase.kgraphql.schema.dsl.ResolverDSL
diff --git a/kgraphql/src/main/kotlin/com/apurebase/kgraphql/schema/dsl/operations/MutationDSL.kt b/kgraphql/src/main/kotlin/com/apurebase/kgraphql/schema/dsl/operations/MutationDSL.kt
index ae4e291b..dbeb80e0 100644
--- a/kgraphql/src/main/kotlin/com/apurebase/kgraphql/schema/dsl/operations/MutationDSL.kt
+++ b/kgraphql/src/main/kotlin/com/apurebase/kgraphql/schema/dsl/operations/MutationDSL.kt
@@ -1,6 +1,5 @@
 package com.apurebase.kgraphql.schema.dsl.operations
 
-import AbstractOperationDSL
 import com.apurebase.kgraphql.schema.model.MutationDef
 
 class MutationDSL(
diff --git a/kgraphql/src/main/kotlin/com/apurebase/kgraphql/schema/dsl/operations/QueryDSL.kt b/kgraphql/src/main/kotlin/com/apurebase/kgraphql/schema/dsl/operations/QueryDSL.kt
index 3d136d4e..9e3b126c 100644
--- a/kgraphql/src/main/kotlin/com/apurebase/kgraphql/schema/dsl/operations/QueryDSL.kt
+++ b/kgraphql/src/main/kotlin/com/apurebase/kgraphql/schema/dsl/operations/QueryDSL.kt
@@ -1,6 +1,5 @@
 package com.apurebase.kgraphql.schema.dsl.operations
 
-import AbstractOperationDSL
 import com.apurebase.kgraphql.schema.model.QueryDef
 
 class QueryDSL(
diff --git a/kgraphql/src/main/kotlin/com/apurebase/kgraphql/schema/dsl/operations/SubscriptionDSL.kt b/kgraphql/src/main/kotlin/com/apurebase/kgraphql/schema/dsl/operations/SubscriptionDSL.kt
index 163b10d4..1037e5b8 100644
--- a/kgraphql/src/main/kotlin/com/apurebase/kgraphql/schema/dsl/operations/SubscriptionDSL.kt
+++ b/kgraphql/src/main/kotlin/com/apurebase/kgraphql/schema/dsl/operations/SubscriptionDSL.kt
@@ -1,6 +1,5 @@
 package com.apurebase.kgraphql.schema.dsl.operations
 
-import AbstractOperationDSL
 import com.apurebase.kgraphql.schema.Publisher
 import com.apurebase.kgraphql.schema.SchemaException
 import com.apurebase.kgraphql.schema.Subscriber