Merge pull request #1279 from Netflix/feature/address-spockmock-bug

[regresion] Allow Spock Stubs to be used as Data Fetchers
Netflix · Oct 19, 2022 · 26b6773 · 26b6773
2 parents 4ce1c46 + 30a0d12
commit 26b6773
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/graphql-dgs/src/main/kotlin/com/netflix/graphql/dgs/internal/DgsSchemaProvider.kt b/graphql-dgs/src/main/kotlin/com/netflix/graphql/dgs/internal/DgsSchemaProvider.kt
@@ -267,7 +267,7 @@ class DgsSchemaProvider(
                     val filteredMergedAnnotations =
                         mergedAnnotations
                             .stream(DgsData::class.java)
-                            .filter { (it.source as Method).declaringClass == method.declaringClass }
+                            .filter { AopUtils.getTargetClass((it.source as Method).declaringClass) == AopUtils.getTargetClass(method.declaringClass) }
                             .collect(Collectors.toList())
                     filteredMergedAnnotations.forEach { dgsDataAnnotation ->
                         registerDataFetcher(