Merge pull request #1945 from dpolysiou/main-issue-36658

Fix field index computation for Source parameters
smallrye · Oct 24, 2023 · b9e489d · b9e489d
2 parents 23f2113 + d280d10
commit b9e489d
Showing 1 changed file with 8 additions and 3 deletions.
diff --git a/server/implementation/src/main/java/io/smallrye/graphql/validation/BeanValidationUtil.java b/server/implementation/src/main/java/io/smallrye/graphql/validation/BeanValidationUtil.java
@@ -11,6 +11,8 @@
 import jakarta.validation.ConstraintViolation;
 import jakarta.validation.Path;
 
+import org.eclipse.microprofile.graphql.Source;
+
 import graphql.execution.DataFetcherResult;
 import graphql.language.Argument;
 import graphql.language.Field;
@@ -73,12 +75,15 @@ private Argument requestedArgument(Path.Node node) {
         private int parameterIndex(String name) {
             Parameter[] parameters = method.getParameters();
             int index = 0;
-            for (int i = 0; i < parameters.length; i++) {
-                if (name.equals(parameters[i].getName())) {
+            for (Parameter parameter : parameters) {
+                if (name.equals(parameter.getName())) {
                     return index;
                 }
                 // parameters of type Context are not stored as arguments in the FieldDefinition, so don't increment the index on them
-                if (!parameters[i].getType().isAssignableFrom(Context.class)) {
+                boolean isContext = parameter.getType().isAssignableFrom(Context.class);
+                // similarly, parameters annotated with @Source are also not stored as arguments in the FieldDefinition
+                boolean isAnnotatedWithSource = parameter.getAnnotation(Source.class) != null;
+                if (!isContext && !isAnnotatedWithSource) {
                     index++;
                 }
             }