fix: make deepName public and move to extensions package (#108)

It's a very handy utility method.
ExpediaGroup · Dec 20, 2018 · ba0f9f1 · ba0f9f1
1 parent 36610c0
commit ba0f9f1
Show file tree

Hide file tree

Showing 6 changed files with 23 additions and 15 deletions.
diff --git a/src/main/kotlin/com/expedia/graphql/extensions/deepName.kt b/src/main/kotlin/com/expedia/graphql/extensions/deepName.kt
@@ -0,0 +1,19 @@
+package com.expedia.graphql.extensions
+
+import graphql.schema.GraphQLList
+import graphql.schema.GraphQLNonNull
+import graphql.schema.GraphQLType
+
+/**
+ * Useful public extension that renders a readable string from the given
+ * graphql type no matter how deeply nested it is.
+ * Eg: [[Int!]]!
+ *
+ * @return a string representation of the type taking list and non-null into account
+ */
+val GraphQLType.deepName: String
+    get() = when {
+        this is GraphQLNonNull -> "${wrappedType.deepName}!"
+        this is GraphQLList -> "[${wrappedType.deepName}]"
+        else -> name
+    }
diff --git a/src/main/kotlin/com/expedia/graphql/schema/extensions/graphQLTypeExtensions.kt b/src/main/kotlin/com/expedia/graphql/schema/extensions/graphQLTypeExtensions.kt
@@ -1,22 +1,10 @@
 package com.expedia.graphql.schema.extensions
 
 import com.expedia.graphql.exceptions.NestingNonNullTypeException
-import graphql.schema.GraphQLList
 import graphql.schema.GraphQLNonNull
 import graphql.schema.GraphQLType
 import kotlin.reflect.KType
 
-/**
- * Renders a readable string from the given graphql type no matter how deeply nested
- * Eg: [[Int!]]!
- */
-internal val GraphQLType.deepName: String
-    get() = when {
-        this is GraphQLNonNull -> "${this.wrappedType.deepName}!"
-        this is GraphQLList -> "[${this.wrappedType.deepName}]"
-        else -> name
-    }
-
 /**
  * Map null and non-null types.
  * Throws an exception on wrapping a non-null graphql type twice.

diff --git a/src/test/kotlin/com/expedia/graphql/schema/dataFetchers/CustomDataFetcherTests.kt b/src/test/kotlin/com/expedia/graphql/schema/dataFetchers/CustomDataFetcherTests.kt
@@ -2,7 +2,7 @@ package com.expedia.graphql.schema.dataFetchers
 
 import com.expedia.graphql.TopLevelObjectDef
 import com.expedia.graphql.schema.SchemaGeneratorConfig
-import com.expedia.graphql.schema.extensions.deepName
+import com.expedia.graphql.extensions.deepName
 import com.expedia.graphql.toSchema
 import graphql.GraphQL
 import graphql.schema.DataFetcher

diff --git a/src/test/kotlin/com/expedia/graphql/schema/extensions/GraphQLTypeExtensionsTest.kt b/src/test/kotlin/com/expedia/graphql/schema/extensions/GraphQLTypeExtensionsTest.kt
@@ -1,6 +1,7 @@
 package com.expedia.graphql.schema.extensions
 
 import com.expedia.graphql.exceptions.NestingNonNullTypeException
+import com.expedia.graphql.extensions.deepName
 import graphql.schema.GraphQLList
 import graphql.schema.GraphQLNonNull
 import graphql.schema.GraphQLType

diff --git a/src/test/kotlin/com/expedia/graphql/schema/generator/SchemaGeneratorTest.kt b/src/test/kotlin/com/expedia/graphql/schema/generator/SchemaGeneratorTest.kt
@@ -6,7 +6,7 @@ import com.expedia.graphql.annotations.GraphQLID
 import com.expedia.graphql.annotations.GraphQLIgnore
 import com.expedia.graphql.exceptions.ConflictingTypesException
 import com.expedia.graphql.exceptions.InvalidIdTypeException
-import com.expedia.graphql.schema.extensions.deepName
+import com.expedia.graphql.extensions.deepName
 import com.expedia.graphql.schema.testSchemaConfig
 import com.expedia.graphql.toSchema
 import graphql.GraphQL

diff --git a/src/test/kotlin/com/expedia/graphql/schema/hooks/SchemaGeneratorHooksTest.kt b/src/test/kotlin/com/expedia/graphql/schema/hooks/SchemaGeneratorHooksTest.kt
@@ -1,7 +1,7 @@
 package com.expedia.graphql.schema.hooks
 
 import com.expedia.graphql.TopLevelObjectDef
-import com.expedia.graphql.schema.extensions.deepName
+import com.expedia.graphql.extensions.deepName
 import com.expedia.graphql.schema.getTestSchemaConfigWithHooks
 import com.expedia.graphql.toSchema
 import graphql.GraphQL