refactor: extract simple name for better test coverage (#114)

* refactor: extract simple name for better test coverage

* fix: remove suppression

* feat: move input name to extension

* doc: update javadocs of exceptions

Author: smyrick

src/main/kotlin/com/expedia/graphql/exceptions/CouldNotGetNameOfAnnotationException.kt

@@ -1,9 +1,9 @@
 package com.expedia.graphql.exceptions
 
-import kotlin.reflect.KType
+import kotlin.reflect.KClass
 
 /**
- * Thrown when trying to generate a class and cannot resolve the jvm erasure name.
+ * Thrown when trying to generate a class and cannot resolve the name.
  */
-class CouldNotGetJvmNameOfKTypeException(kType: KType?)
-    : GraphQLKotlinException("Could not get the name of the KClass $kType")
+class CouldNotGetNameOfKClassException(kclass: KClass<*>)
+    : GraphQLKotlinException("Could not get the name of the KClass $kclass")

src/main/kotlin/com/expedia/graphql/exceptions/CouldNotGetNameOfArgumentException.kt

@@ -0,0 +1,9 @@
+package com.expedia.graphql.exceptions
+
+import kotlin.reflect.KParameter
+
+/**
+ * Thrown when trying to generate a parameter and cannot resolve the name.
+ */
+class CouldNotGetNameOfKParameterException(kParameter: KParameter)
+    : GraphQLKotlinException("Could not get name of the KParameter $kParameter")

src/main/kotlin/com/expedia/graphql/exceptions/CouldNotGetNameOfEnumException.kt

@@ -0,0 +1,9 @@
+package com.expedia.graphql.exceptions
+
+import kotlin.reflect.KType
+
+/**
+ * Thrown when trying to generate a type and cannot resolve the name.
+ */
+class CouldNotGetNameOfKTypeException(kType: KType)
+    : GraphQLKotlinException("Could not get the name of the KType $kType")

…ns/CouldNotGetJvmNameOfKTypeException.kt …ions/CouldNotGetNameOfKClassException.ktsrc/main/kotlin/com/expedia/graphql/exceptions/CouldNotGetJvmNameOfKTypeException.kt renamed to src/main/kotlin/com/expedia/graphql/exceptions/CouldNotGetNameOfKClassException.kt src/main/kotlin/com/expedia/graphql/exceptions/CouldNotGetJvmNameOfKTypeException.kt renamed to src/main/kotlin/com/expedia/graphql/exceptions/CouldNotGetNameOfKClassException.kt

@@ -3,9 +3,9 @@ package com.expedia.graphql.generator
 import com.expedia.graphql.generator.extensions.getKClass
 import com.expedia.graphql.generator.extensions.isArray
 import com.expedia.graphql.generator.extensions.isEnum
-import com.expedia.graphql.generator.extensions.isGraphQLInterface
-import com.expedia.graphql.generator.extensions.isGraphQLUnion
+import com.expedia.graphql.generator.extensions.isInterface
 import com.expedia.graphql.generator.extensions.isList
+import com.expedia.graphql.generator.extensions.isUnion
 import com.expedia.graphql.generator.extensions.wrapInNonNull
 import com.expedia.graphql.generator.state.KGraphQLType
 import com.expedia.graphql.generator.state.TypesCacheKey
@@ -48,8 +48,8 @@ internal open class TypeBuilder constructor(val generator: SchemaGenerator) {
         kClass.isEnum() -> @Suppress("UNCHECKED_CAST") (generator.enumType(kClass as KClass<Enum<*>>))
         kClass.isArray() -> generator.arrayType(type, inputType)
         kClass.isList() -> generator.listType(type, inputType)
-        kClass.isGraphQLUnion() -> generator.unionType(kClass)
-        kClass.isGraphQLInterface() -> generator.interfaceType(kClass)
+        kClass.isUnion() -> generator.unionType(kClass)
+        kClass.isInterface() -> generator.interfaceType(kClass)
         inputType -> generator.inputObjectType(kClass)
         else -> generator.objectType(kClass)
     }

src/main/kotlin/com/expedia/graphql/exceptions/CouldNotGetNameOfKParameterException.kt

@@ -1,7 +1,6 @@
 package com.expedia.graphql.generator.extensions
 
 import com.expedia.graphql.annotations.GraphQLDirective
-import com.expedia.graphql.exceptions.CouldNotGetNameOfAnnotationException
 import com.expedia.graphql.generator.SchemaGenerator
 import com.google.common.base.CaseFormat
 import graphql.schema.GraphQLArgument
@@ -21,14 +20,12 @@ private fun Annotation.getDirectiveInfo(): DirectiveInfo? {
         .firstOrNull()
 }
 
-@Throws(CouldNotGetNameOfAnnotationException::class)
 private fun DirectiveInfo.getGraphQLDirective(generator: SchemaGenerator): graphql.schema.GraphQLDirective {
     val directiveClass = this.directive.annotationClass
-    val name: String = this.effectiveName ?: throw CouldNotGetNameOfAnnotationException(directiveClass)
 
     @Suppress("Detekt.SpreadOperator")
     val builder = graphql.schema.GraphQLDirective.newDirective()
-        .name(name)
+        .name(this.effectiveName)
         .validLocations(*this.directiveAnnotation.locations)
         .description(this.directiveAnnotation.description)
 
@@ -52,8 +49,8 @@ private fun DirectiveInfo.getGraphQLDirective(generator: SchemaGenerator): graph
 private fun String.normalizeDirectiveName() = CaseFormat.UPPER_CAMEL.to(CaseFormat.LOWER_CAMEL, this)
 
 private data class DirectiveInfo(val directive: Annotation, val directiveAnnotation: GraphQLDirective) {
-    val effectiveName: String? = when {
+    val effectiveName: String = when {
         directiveAnnotation.name.isNotEmpty() -> directiveAnnotation.name
-        else -> directive.annotationClass.simpleName?.normalizeDirectiveName()
+        else -> directive.annotationClass.getSimpleName().normalizeDirectiveName()
     }
 }

src/main/kotlin/com/expedia/graphql/exceptions/CouldNotGetNameOfKTypeException.kt

@@ -1,8 +1,9 @@
 package com.expedia.graphql.generator.extensions
 
-import com.expedia.graphql.hooks.SchemaGeneratorHooks
+import com.expedia.graphql.exceptions.CouldNotGetNameOfKClassException
 import com.expedia.graphql.generator.functionFilters
 import com.expedia.graphql.generator.propertyFilters
+import com.expedia.graphql.hooks.SchemaGeneratorHooks
 import kotlin.reflect.KClass
 import kotlin.reflect.KFunction
 import kotlin.reflect.KParameter
@@ -27,13 +28,19 @@ internal fun KClass<*>.findConstructorParamter(name: String): KParameter? =
         ?.parameters
         ?.find { it.name == name }
 
-internal fun KClass<*>.isGraphQLInterface(): Boolean = this.java.isInterface
+internal fun KClass<*>.isInterface(): Boolean = this.java.isInterface
 
-internal fun KClass<*>.isGraphQLUnion(): Boolean =
-    this.isGraphQLInterface() && this.declaredMemberProperties.isEmpty() && this.declaredMemberFunctions.isEmpty()
+internal fun KClass<*>.isUnion(): Boolean =
+    this.isInterface() && this.declaredMemberProperties.isEmpty() && this.declaredMemberFunctions.isEmpty()
 
 internal fun KClass<*>.isEnum(): Boolean = this.isSubclassOf(Enum::class)
 
 internal fun KClass<*>.isList(): Boolean = this.isSubclassOf(List::class)
 
 internal fun KClass<*>.isArray(): Boolean = this.java.isArray
+
+@Throws(CouldNotGetNameOfKClassException::class)
+internal fun KClass<*>.getSimpleName(): String =
+    this.simpleName ?: throw CouldNotGetNameOfKClassException(this)
+
+internal fun KClass<*>.getInputClassName(): String = "${this.getSimpleName()}Input"

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

@@ -1,14 +1,19 @@
 package com.expedia.graphql.generator.extensions
 
 import com.expedia.graphql.annotations.GraphQLContext
+import com.expedia.graphql.exceptions.CouldNotGetNameOfKParameterException
 import com.expedia.graphql.exceptions.InvalidInputFieldTypeException
 import kotlin.reflect.KParameter
 import kotlin.reflect.full.findAnnotation
 import kotlin.reflect.jvm.jvmErasure
 
 @Throws(InvalidInputFieldTypeException::class)
 internal fun KParameter.throwIfUnathorizedInterface() {
-    if (this.type.jvmErasure.java.isInterface) throw InvalidInputFieldTypeException()
+    if (this.type.jvmErasure.isInterface()) throw InvalidInputFieldTypeException()
 }
 
 internal fun KParameter.isGraphQLContext() = this.findAnnotation<GraphQLContext>() != null
+
+@Throws(CouldNotGetNameOfKParameterException::class)
+internal fun KParameter.getName(): String =
+    this.name ?: throw CouldNotGetNameOfKParameterException(this)