Reformat

Author: oryan-block

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

@@ -1,10 +1,6 @@
 package graphql.kickstart.tools.resolver
 
 import graphql.kickstart.tools.*
-import graphql.kickstart.tools.GenericType
-import graphql.kickstart.tools.ResolverError
-import graphql.kickstart.tools.ResolverInfo
-import graphql.kickstart.tools.TypeClassMatcher
 import graphql.kickstart.tools.util.JavaType
 import graphql.language.FieldDefinition
 import graphql.schema.DataFetcher
@@ -34,15 +30,10 @@ internal abstract class FieldResolver(
             SourceResolver { _, _ -> this.search.source }
         } else {
             SourceResolver { environment, sourceObject ->
-                val source = if (sourceObject != null) {
-                    // if source object is known, environment is null as an optimization (LightDataFetcher)
-                    sourceObject
-                } else {
-                    environment
-                        ?: throw ResolverError("Expected DataFetchingEnvironment to not be null!")
-                    environment.getSource<Any>()
-                        ?: throw ResolverError("Expected source object to not be null!")
-                }
+                // if source object is known, environment is null as an optimization (LightDataFetcher)
+                val source = sourceObject
+                    ?: environment?.getSource<Any>()
+                    ?: throw ResolverError("Expected DataFetchingEnvironment and source object to not be null!")
 
                 if (!this.genericType.isAssignableFrom(source.javaClass)) {
                     throw ResolverError("Expected source object to be an instance of '${this.genericType.getRawClass().name}' but instead got '${source.javaClass.name}'")

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

@@ -52,7 +52,7 @@ internal class MapFieldResolver(
 
 internal class MapFieldResolverDataFetcher(
     private val sourceResolver: SourceResolver,
-    private val key: String,
+    private val key: String
 ) : LightDataFetcher<Any> {
 
     override fun get(fieldDefinition: GraphQLFieldDefinition, sourceObject: Any?, environmentSupplier: Supplier<DataFetchingEnvironment>): Any? {
@@ -64,6 +64,6 @@ internal class MapFieldResolverDataFetcher(
     }
 
     override fun get(environment: DataFetchingEnvironment): Any? {
-        return get(environment.fieldDefinition, sourceResolver.resolve(environment, null), { environment })
+        return get(environment.fieldDefinition, sourceResolver.resolve(environment, null)) { environment }
     }
 }

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

@@ -31,7 +31,7 @@ internal class MethodFieldResolver(
     field: FieldDefinition,
     search: FieldResolverScanner.Search,
     options: SchemaParserOptions,
-    val method: Method,
+    val method: Method
 ) : FieldResolver(field, search, options, search.type) {
 
     private val log = LoggerFactory.getLogger(javaClass)
@@ -202,10 +202,10 @@ internal class MethodFieldResolverDataFetcher(
 
         return if (isSuspendFunction) {
             environment.coroutineScope().future(options.coroutineContextProvider.provide()) {
-                invokeSuspend(source, method, args)?.transformWithGenericWrapper(options.genericWrappers, { environment })
+                invokeSuspend(source, method, args)?.transformWithGenericWrapper(options.genericWrappers) { environment }
             }
         } else {
-            invoke(method, source, args)?.transformWithGenericWrapper(options.genericWrappers, { environment })
+            invoke(method, source, args)?.transformWithGenericWrapper(options.genericWrappers) { environment }
         }
     }
 
@@ -224,7 +224,7 @@ internal class MethodFieldResolverDataFetcher(
 internal class LightMethodFieldResolverDataFetcher(
     private val sourceResolver: SourceResolver,
     private val method: Method,
-    private val options: SchemaParserOptions,
+    private val options: SchemaParserOptions
 ) : LightDataFetcher<Any?> {
 
     override fun get(fieldDefinition: GraphQLFieldDefinition, sourceObject: Any?, environmentSupplier: Supplier<DataFetchingEnvironment>): Any? {
@@ -234,7 +234,7 @@ internal class LightMethodFieldResolverDataFetcher(
     }
 
     override fun get(environment: DataFetchingEnvironment): Any? {
-        return get(environment.fieldDefinition, sourceResolver.resolve(environment, null), { environment })
+        return get(environment.fieldDefinition, sourceResolver.resolve(environment, null)) { environment }
     }
 
     /**
@@ -249,7 +249,7 @@ internal class LightMethodFieldResolverDataFetcher(
 private fun Any.transformWithGenericWrapper(
     genericWrappers: List<GenericWrapper>,
     environmentSupplier: Supplier<DataFetchingEnvironment>
-): Any? {
+): Any {
     return genericWrappers
         .asSequence()
         .filter { it.type.isInstance(this) }

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

@@ -18,7 +18,7 @@ internal class PropertyFieldResolver(
     field: FieldDefinition,
     search: FieldResolverScanner.Search,
     options: SchemaParserOptions,
-    private val property: Field,
+    private val property: Field
 ) : FieldResolver(field, search, options, property.declaringClass) {
 
     override fun createDataFetcher(): DataFetcher<*> {
@@ -41,14 +41,14 @@ internal class PropertyFieldResolver(
 
 internal class PropertyFieldResolverDataFetcher(
     private val sourceResolver: SourceResolver,
-    private val field: Field,
+    private val field: Field
 ) : LightDataFetcher<Any> {
 
     override fun get(fieldDefinition: GraphQLFieldDefinition, sourceObject: Any?, environmentSupplier: Supplier<DataFetchingEnvironment>): Any? {
         return field.get(sourceResolver.resolve(null, sourceObject))
     }
 
     override fun get(environment: DataFetchingEnvironment): Any? {
-        return get(environment.fieldDefinition, sourceResolver.resolve(environment, null), { environment })
+        return get(environment.fieldDefinition, sourceResolver.resolve(environment, null)) { environment }
     }
 }