Do not deprecate custom context option

Author: oryan-block

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

@@ -64,12 +64,10 @@ data class SchemaParserOptions internal constructor(
         private var includeUnusedTypes = false
         private var useCommentsForDescriptions = true
 
-        @Deprecated("Replaced with graphql.GraphQLContext")
         fun contextClass(contextClass: Class<*>) = this.apply {
             this.contextClass = contextClass
         }
 
-        @Deprecated("Replaced with graphql.GraphQLContext")
         fun contextClass(contextClass: KClass<*>) = this.apply {
             this.contextClass = contextClass.java
         }

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

@@ -33,7 +33,8 @@ internal class MethodFieldResolver(
 
     private val additionalLastArgument =
         try {
-            method.kotlinFunction?.valueParameters?.size ?: method.parameterCount == (field.inputValueDefinitions.size + getIndexOffset() + 1)
+            (method.kotlinFunction?.valueParameters?.size
+                ?: method.parameterCount) == (field.inputValueDefinitions.size + getIndexOffset() + 1)
         } catch (e: InternalError) {
             method.parameterCount == (field.inputValueDefinitions.size + getIndexOffset() + 1)
         }
@@ -95,7 +96,10 @@ internal class MethodFieldResolver(
         if (this.additionalLastArgument) {
             when (this.method.parameterTypes.last()) {
                 null -> throw ResolverError("Expected at least one argument but got none, this is most likely a bug with graphql-java-tools")
-                options.contextClass -> args.add { environment -> environment.getContext() }
+                options.contextClass -> args.add { environment ->
+                    environment.graphQlContext[options.contextClass]
+                        ?: environment.getContext() // TODO: remove deprecated use in next major release
+                }
                 GraphQLContext::class.java -> args.add { environment -> environment.graphQlContext }
                 else -> args.add { environment -> environment }
             }