fix: non-functional clean up (#184)

* fix: non-functional clean up

* rename classes

Author: smyrick

codecov.yml

@@ -80,12 +80,12 @@ class Application {
         }
 
         val schema = toSchema(
+            config = schemaConfig,
             queries = queries.toTopLevelObjectDefs(),
-            mutations = mutations.toTopLevelObjectDefs(),
-            config = schemaConfig
+            mutations = mutations.toTopLevelObjectDefs()
         )
 
-        logger.info(schemaPrinter().print(schema))
+        logger.info(schemaPrinter.print(schema))
 
         return schema
     }

example/src/main/kotlin/com/expedia/graphql/sample/Application.kt

@@ -83,11 +83,11 @@
         <!-- Test Dependency Versions -->
         <junit-jupiter.version>5.4.0</junit-jupiter.version>
         <mockk.version>1.9.1</mockk.version>
-        <rxjava2.version>2.2.6</rxjava2.version>
+        <rxjava2.version>2.2.7</rxjava2.version>
 
         <!-- Build Plugin Versions -->
         <dokka-maven-plugin.version>0.9.17</dokka-maven-plugin.version>
-        <detekt-cli.version>1.0.0-RC13</detekt-cli.version>
+        <detekt-cli.version>1.0.0-RC14</detekt-cli.version>
         <ktlint.version>0.30.0</ktlint.version>
         <jacoco-maven-plugin.version>0.8.3</jacoco-maven-plugin.version>
         <maven-surefire-plugin.version>2.22.1</maven-surefire-plugin.version>

pom.xml

@@ -3,18 +3,18 @@ package com.expedia.graphql.generator
 import com.expedia.graphql.SchemaGeneratorConfig
 import com.expedia.graphql.TopLevelObject
 import com.expedia.graphql.generator.state.SchemaGeneratorState
-import com.expedia.graphql.generator.types.DirectiveTypeBuilder
-import com.expedia.graphql.generator.types.EnumTypeBuilder
-import com.expedia.graphql.generator.types.FunctionTypeBuilder
-import com.expedia.graphql.generator.types.InputObjectTypeBuilder
-import com.expedia.graphql.generator.types.InterfaceTypeBuilder
-import com.expedia.graphql.generator.types.ListTypeBuilder
-import com.expedia.graphql.generator.types.MutationTypeBuilder
-import com.expedia.graphql.generator.types.ObjectTypeBuilder
-import com.expedia.graphql.generator.types.PropertyTypeBuilder
-import com.expedia.graphql.generator.types.QueryTypeBuilder
-import com.expedia.graphql.generator.types.ScalarTypeBuilder
-import com.expedia.graphql.generator.types.UnionTypeBuilder
+import com.expedia.graphql.generator.types.DirectiveBuilder
+import com.expedia.graphql.generator.types.EnumBuilder
+import com.expedia.graphql.generator.types.FunctionBuilder
+import com.expedia.graphql.generator.types.InputObjectBuilder
+import com.expedia.graphql.generator.types.InterfaceBuilder
+import com.expedia.graphql.generator.types.ListBuilder
+import com.expedia.graphql.generator.types.MutationBuilder
+import com.expedia.graphql.generator.types.ObjectBuilder
+import com.expedia.graphql.generator.types.PropertyBuilder
+import com.expedia.graphql.generator.types.QueryBuilder
+import com.expedia.graphql.generator.types.ScalarBuilder
+import com.expedia.graphql.generator.types.UnionBuilder
 import graphql.schema.GraphQLDirective
 import graphql.schema.GraphQLInterfaceType
 import graphql.schema.GraphQLSchema
@@ -30,18 +30,18 @@ internal class SchemaGenerator(internal val config: SchemaGeneratorConfig) {
     internal val state = SchemaGeneratorState(config.supportedPackages)
     internal val subTypeMapper = SubTypeMapper(config.supportedPackages)
 
-    private val queryBuilder = QueryTypeBuilder(this)
-    private val mutationBuilder = MutationTypeBuilder(this)
-    private val objectTypeBuilder = ObjectTypeBuilder(this)
-    private val unionTypeBuilder = UnionTypeBuilder(this)
-    private val interfaceTypeBuilder = InterfaceTypeBuilder(this)
-    private val propertyTypeBuilder = PropertyTypeBuilder(this)
-    private val inputObjectTypeBuilder = InputObjectTypeBuilder(this)
-    private val listTypeBuilder = ListTypeBuilder(this)
-    private val functionTypeBuilder = FunctionTypeBuilder(this)
-    private val enumTypeBuilder = EnumTypeBuilder(this)
-    private val scalarTypeBuilder = ScalarTypeBuilder(this)
-    private val directiveTypeBuilder = DirectiveTypeBuilder(this)
+    private val queryBuilder = QueryBuilder(this)
+    private val mutationBuilder = MutationBuilder(this)
+    private val objectTypeBuilder = ObjectBuilder(this)
+    private val unionTypeBuilder = UnionBuilder(this)
+    private val interfaceTypeBuilder = InterfaceBuilder(this)
+    private val propertyTypeBuilder = PropertyBuilder(this)
+    private val inputObjectTypeBuilder = InputObjectBuilder(this)
+    private val listTypeBuilder = ListBuilder(this)
+    private val functionTypeBuilder = FunctionBuilder(this)
+    private val enumTypeBuilder = EnumBuilder(this)
+    private val scalarTypeBuilder = ScalarBuilder(this)
+    private val directiveTypeBuilder = DirectiveBuilder(this)
 
     internal fun generate(queries: List<TopLevelObject>, mutations: List<TopLevelObject>): GraphQLSchema {
         val builder = GraphQLSchema.newSchema()

src/main/kotlin/com/expedia/graphql/generator/SchemaGenerator.kt

@@ -1,10 +1,12 @@
 package com.expedia.graphql.generator.extensions
 
 import com.expedia.graphql.annotations.GraphQLContext
+import com.expedia.graphql.exceptions.CouldNotCastArgumentException
 import com.expedia.graphql.exceptions.CouldNotGetNameOfKParameterException
 import graphql.schema.DataFetchingEnvironment
 import kotlin.reflect.KParameter
 import kotlin.reflect.full.findAnnotation
+import kotlin.reflect.jvm.javaType
 
 internal fun KParameter.isInterface() = this.type.getKClass().isInterface()
 
@@ -15,3 +17,7 @@ internal fun KParameter.isDataFetchingEnvironment() = this.type.classifier == Da
 @Throws(CouldNotGetNameOfKParameterException::class)
 internal fun KParameter.getName(): String =
     this.name ?: throw CouldNotGetNameOfKParameterException(this)
+
+@Throws(CouldNotCastArgumentException::class)
+internal fun KParameter.javaTypeClass(): Class<*> =
+    this.type.javaType as? Class<*> ?: throw CouldNotCastArgumentException(this)

src/main/kotlin/com/expedia/graphql/generator/extensions/kParameterExtensions.kt

@@ -12,7 +12,7 @@ import java.lang.reflect.Field
 import kotlin.reflect.KAnnotatedElement
 import com.expedia.graphql.annotations.GraphQLDirective as GraphQLDirectiveAnnotation
 
-internal class DirectiveTypeBuilder(generator: SchemaGenerator) : TypeBuilder(generator) {
+internal class DirectiveBuilder(generator: SchemaGenerator) : TypeBuilder(generator) {
 
     internal fun directives(element: KAnnotatedElement): List<GraphQLDirective> =
         element.annotations

src/main/kotlin/com/expedia/graphql/generator/extensions/suppressedExtenstions.kt

@@ -9,7 +9,7 @@ import graphql.schema.GraphQLEnumType
 import graphql.schema.GraphQLEnumValueDefinition
 import kotlin.reflect.KClass
 
-internal class EnumTypeBuilder(generator: SchemaGenerator) : TypeBuilder(generator) {
+internal class EnumBuilder(generator: SchemaGenerator) : TypeBuilder(generator) {
     internal fun enumType(kClass: KClass<out Enum<*>>): GraphQLEnumType {
         val enumBuilder = GraphQLEnumType.newEnum()
 

…/generator/types/DirectiveTypeBuilder.kt …phql/generator/types/DirectiveBuilder.ktsrc/main/kotlin/com/expedia/graphql/generator/types/DirectiveTypeBuilder.kt renamed to src/main/kotlin/com/expedia/graphql/generator/types/DirectiveBuilder.kt src/main/kotlin/com/expedia/graphql/generator/types/DirectiveTypeBuilder.kt renamed to src/main/kotlin/com/expedia/graphql/generator/types/DirectiveBuilder.kt

@@ -20,8 +20,7 @@ import kotlin.reflect.KParameter
 import kotlin.reflect.KType
 import kotlin.reflect.full.valueParameters
 
-@Suppress("Detekt.UnsafeCast")
-internal class FunctionTypeBuilder(generator: SchemaGenerator) : TypeBuilder(generator) {
+internal class FunctionBuilder(generator: SchemaGenerator) : TypeBuilder(generator) {
 
     internal fun function(fn: KFunction<*>, target: Any? = null, abstract: Boolean = false): GraphQLFieldDefinition {
         val builder = GraphQLFieldDefinition.newFieldDefinition()

…aphql/generator/types/EnumTypeBuilder.kt …a/graphql/generator/types/EnumBuilder.ktsrc/main/kotlin/com/expedia/graphql/generator/types/EnumTypeBuilder.kt renamed to src/main/kotlin/com/expedia/graphql/generator/types/EnumBuilder.kt src/main/kotlin/com/expedia/graphql/generator/types/EnumTypeBuilder.kt renamed to src/main/kotlin/com/expedia/graphql/generator/types/EnumBuilder.kt

@@ -14,7 +14,7 @@ import graphql.schema.GraphQLInputType
 import kotlin.reflect.KClass
 import kotlin.reflect.KProperty
 
-internal class InputObjectTypeBuilder(generator: SchemaGenerator) : TypeBuilder(generator) {
+internal class InputObjectBuilder(generator: SchemaGenerator) : TypeBuilder(generator) {
     internal fun inputObjectType(kClass: KClass<*>): GraphQLInputObjectType {
         val builder = GraphQLInputObjectType.newInputObject()