Clean up logger instantiation

Author: vojtapol

src/main/kotlin/graphql/kickstart/tools/SchemaClassScanner.kt

@@ -19,9 +19,7 @@ internal class SchemaClassScanner(
     private val scalars: CustomScalarMap,
     private val options: SchemaParserOptions
 ) {
-    companion object {
-        val log = LoggerFactory.getLogger(SchemaClassScanner::class.java)!!
-    }
+    private val log = LoggerFactory.getLogger(javaClass)
 
     private val rootInfo = RootTypeInfo.fromSchemaDefinitions(allDefinitions.filterIsInstance<SchemaDefinition>())
 
@@ -153,9 +151,7 @@ internal class SchemaClassScanner(
                     ?: throw SchemaClassScannerError("Expected a user-defined GraphQL scalar type with name '${definition.name}' but found none!")
                 GraphQLScalarType.newScalar()
                     .name(provided.name)
-                    .description(
-                        if (definition.description != null) definition.description.content
-                        else SchemaParser.getDocumentation(definition) ?: provided.description)
+                    .description(definition.description?.content ?: getDocumentation(definition) ?: provided.description)
                     .coercing(provided.coercing)
                     .definition(definition)
                     .build()

src/main/kotlin/graphql/kickstart/tools/SchemaParser.kt

@@ -3,6 +3,7 @@ package graphql.kickstart.tools
 import graphql.Scalars
 import graphql.introspection.Introspection
 import graphql.kickstart.tools.directive.SchemaGeneratorDirectiveHelper
+import graphql.kickstart.tools.util.getDocumentation
 import graphql.kickstart.tools.util.getExtendedFieldDefinitions
 import graphql.kickstart.tools.util.unwrap
 import graphql.language.*
@@ -24,17 +25,11 @@ class SchemaParser internal constructor(
     private val options: SchemaParserOptions,
     private val runtimeWiring: RuntimeWiring
 ) {
-    companion object {
-        val log = LoggerFactory.getLogger(SchemaClassScanner::class.java)!!
-        const val DEFAULT_DEPRECATION_MESSAGE = "No longer supported"
+    private val log = LoggerFactory.getLogger(javaClass)
 
+    companion object {
         @JvmStatic
         fun newParser() = SchemaParserBuilder()
-
-        internal fun getDocumentation(node: AbstractNode<*>): String? = node.comments?.asSequence()
-            ?.filter { !it.content.startsWith("#") }
-            ?.joinToString("\n") { it.content.trimEnd() }
-            ?.trimIndent()
     }
 
     private val dictionary = scanResult.dictionary
@@ -389,7 +384,7 @@ class SchemaParser internal constructor(
             }
             is TypeName -> {
                 val scalarType = customScalars[typeDefinition.name]
-                    ?: graphQLScalars[typeDefinition.name]
+                    ?: GRAPHQL_SCALARS[typeDefinition.name]
                 if (scalarType != null) {
                     scalarType
                 } else {
@@ -416,7 +411,7 @@ class SchemaParser internal constructor(
             }
             is TypeName -> {
                 val scalarType = customScalars[typeDefinition.name]
-                    ?: graphQLScalars[typeDefinition.name]
+                    ?: GRAPHQL_SCALARS[typeDefinition.name]
                 if (scalarType != null) {
                     scalarType
                 } else {
@@ -463,4 +458,6 @@ class SchemaParser internal constructor(
 
 class SchemaError(message: String, cause: Throwable? = null) : RuntimeException(message, cause)
 
-val graphQLScalars = ScalarInfo.GRAPHQL_SPECIFICATION_SCALARS.associateBy { it.name }
+val GRAPHQL_SCALARS = ScalarInfo.GRAPHQL_SPECIFICATION_SCALARS.associateBy { it.name }
+
+const val DEFAULT_DEPRECATION_MESSAGE = "No longer supported"

src/main/kotlin/graphql/kickstart/tools/resolver/FieldResolverScanner.kt

@@ -25,23 +25,21 @@ import kotlin.reflect.jvm.kotlinFunction
  */
 internal class FieldResolverScanner(val options: SchemaParserOptions) {
 
+    private val log = LoggerFactory.getLogger(javaClass)
+
     private val allowedLastArgumentTypes = listOfNotNull(DataFetchingEnvironment::class.java, options.contextClass)
 
-    companion object {
-        private val log = LoggerFactory.getLogger(FieldResolverScanner::class.java)
-
-        fun getAllMethods(type: JavaType) =
-            (type.unwrap().declaredNonProxyMethods.toList()
-                + ClassUtils.getAllInterfaces(type.unwrap()).flatMap { it.methods.toList() }
-                + ClassUtils.getAllSuperclasses(type.unwrap()).flatMap { it.methods.toList() })
-                .asSequence()
-                .filter { !it.isSynthetic }
-                .filter { !Modifier.isPrivate(it.modifiers) }
-                // discard any methods that are coming off the root of the class hierarchy
-                // to avoid issues with duplicate method declarations
-                .filter { it.declaringClass != Object::class.java }
-                .toList()
-    }
+    fun getAllMethods(type: JavaType) =
+        (type.unwrap().declaredNonProxyMethods.toList()
+            + ClassUtils.getAllInterfaces(type.unwrap()).flatMap { it.methods.toList() }
+            + ClassUtils.getAllSuperclasses(type.unwrap()).flatMap { it.methods.toList() })
+            .asSequence()
+            .filter { !it.isSynthetic }
+            .filter { !Modifier.isPrivate(it.modifiers) }
+            // discard any methods that are coming off the root of the class hierarchy
+            // to avoid issues with duplicate method declarations
+            .filter { it.declaringClass != Object::class.java }
+            .toList()
 
     fun findFieldResolver(field: FieldDefinition, resolverInfo: ResolverInfo): FieldResolver {
         val searches = resolverInfo.getFieldSearches()

src/main/kotlin/graphql/kickstart/tools/util/Utils.kt

@@ -49,6 +49,11 @@ internal val Class<*>.declaredNonProxyMethods: List<JavaMethod>
         }
     }
 
+internal fun getDocumentation(node: AbstractNode<*>): String? = node.comments?.asSequence()
+    ?.filter { !it.content.startsWith("#") }
+    ?.joinToString("\n") { it.content.trimEnd() }
+    ?.trimIndent()
+
 /**
  * Simple heuristic to check is a method is a trivial data fetcher.
  *