Skip to content

Commit 6ee513a

Browse files
committed
Fix unit tests for all scalar types
1 parent 7ed2033 commit 6ee513a

File tree

1 file changed

+3
-1
lines changed

1 file changed

+3
-1
lines changed

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

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@ import graphql.schema.GraphQLTypeUtil.isScalar
1212
import kotlinx.coroutines.future.future
1313
import java.lang.reflect.Method
1414
import java.lang.reflect.ParameterizedType
15+
import java.lang.reflect.WildcardType
1516
import java.util.*
1617
import kotlin.coroutines.intrinsics.suspendCoroutineUninterceptedOrReturn
1718
import kotlin.reflect.full.valueParameters
@@ -133,7 +134,8 @@ internal class MethodFieldResolver(field: FieldDefinition, search: FieldResolver
133134
private fun isJavaLanguageType(type: JavaType): Boolean =
134135
when (type) {
135136
is ParameterizedType -> isJavaLanguageType(type.actualTypeArguments[0])
136-
else -> type.javaClass.`package`.name == "java.lang"
137+
is WildcardType -> isJavaLanguageType(type.upperBounds[0])
138+
else -> genericType.getRawClass(type).packageName == "java.lang"
137139
}
138140

139141
override fun scanForMatches(): List<TypeClassMatcher.PotentialMatch> {

0 commit comments

Comments
 (0)