support list

Author: yarinvak

src/main/java/graphql/annotations/processor/retrievers/fieldBuilders/DirectivesBuilder.java

@@ -14,15 +14,14 @@
  */
 package graphql.annotations.processor.retrievers.fieldBuilders;
 
-import com.sun.deploy.util.ReflectionUtil;
 import graphql.annotations.annotationTypes.directives.activation.GraphQLDirectives;
 import graphql.annotations.processor.ProcessingElementsContainer;
 import graphql.annotations.processor.exceptions.GraphQLAnnotationsException;
 import graphql.annotations.processor.util.DirectiveJavaAnnotationUtil;
 import graphql.schema.GraphQLArgument;
 import graphql.schema.GraphQLDirective;
 import graphql.schema.GraphQLScalarType;
-import javafx.scene.effect.Reflection;
+import graphql.schema.GraphQLType;
 
 import java.lang.annotation.Annotation;
 import java.lang.reflect.AnnotatedElement;
@@ -126,11 +125,17 @@ private void transformArgument(Annotation annotation, GraphQLDirective.Builder d
         Method[] methods = annotation.annotationType().getDeclaredMethods();
         directiveBuilder.argument(graphQLArgument.transform(builder -> {
             // todo: add support for list
-            if (graphQLArgument.getType() instanceof GraphQLScalarType) {
+            if (graphQLArgument.getType() instanceof GraphQLType) {
                 try {
                     methods[finalI].setAccessible(true);
                     Object argumentValue = methods[finalI].invoke(annotation);
-                    Object value = ((GraphQLScalarType) graphQLArgument.getType()).getCoercing().parseValue(argumentValue);
+                    Object value;
+                    if (graphQLArgument.getType() instanceof GraphQLScalarType) {
+                        value = ((GraphQLScalarType) graphQLArgument.getType()).getCoercing().parseValue(argumentValue);
+                    }
+                    else{
+                        value = argumentValue;
+                    }
                     builder.value(value);
                 } catch (Exception e) {
                     throw new GraphQLAnnotationsException("Could not parse argument value to argument type", e);

src/test/java/graphql/annotations/GraphQLDirectivesViaAnnotationDefinitionTest.java

@@ -19,8 +19,6 @@
 import graphql.annotations.annotationTypes.GraphQLDataFetcher;
 import graphql.annotations.annotationTypes.GraphQLField;
 import graphql.annotations.annotationTypes.GraphQLName;
-import graphql.annotations.annotationTypes.directives.activation.Directive;
-import graphql.annotations.annotationTypes.directives.activation.GraphQLDirectives;
 import graphql.annotations.annotationTypes.directives.definition.DirectiveLocations;
 import graphql.annotations.annotationTypes.directives.definition.GraphQLDirectiveDefinition;
 import graphql.annotations.directives.AnnotationsDirectiveWiring;
@@ -39,9 +37,7 @@
 import java.util.Map;
 
 import static graphql.schema.GraphQLSchema.newSchema;
-import static org.testng.Assert.assertEquals;
-import static org.testng.Assert.assertNotNull;
-import static org.testng.Assert.assertTrue;
+import static org.testng.Assert.*;
 
 public class GraphQLDirectivesViaAnnotationDefinitionTest {
     private GraphQLAnnotations graphQLAnnotations;
@@ -52,6 +48,7 @@ public void setUp() {
         this.graphQLAnnotations = new GraphQLAnnotations();
         this.graphQLAnnotations.directiveViaAnnotation(Upper.class);
         this.graphQLAnnotations.directiveViaAnnotation(Suffix.class);
+        this.graphQLAnnotations.directiveViaAnnotation(DirectiveWithList.class);
         GraphQLObjectType object = this.graphQLAnnotations.object(Query.class);
         GraphQLCodeRegistry codeRegistry = graphQLAnnotations.getContainer().getCodeRegistryBuilder().build();
         this.schema = newSchema().query(object).codeRegistry(codeRegistry).build();
@@ -122,6 +119,16 @@ public GraphQLInputObjectType onInputObjectType(AnnotationsWiringEnvironment env
         }
     }
 
+    public static class DirectiveWithListWiring implements AnnotationsDirectiveWiring{
+        @Override
+        public GraphQLFieldDefinition onField(AnnotationsWiringEnvironment environment) {
+            GraphQLFieldDefinition field = (GraphQLFieldDefinition) environment.getElement();
+            String[] list= (String[]) environment.getDirective().getArgument("list").getValue();
+            CodeRegistryUtil.wrapDataFetcher(field, environment, (dataFetchingEnvironment, value) -> value + list[0]);
+            return field;
+        }
+    }
+
 
     @GraphQLDirectiveDefinition(wiring = UpperWiring.class)
     @GraphQLName("upper")
@@ -141,7 +148,15 @@ public GraphQLInputObjectType onInputObjectType(AnnotationsWiringEnvironment env
         @GraphQLName("suffix")
         String suffixToAdd();
         boolean isActive();
-        String[] extraSuffixes() default {};
+    }
+
+    @GraphQLDirectiveDefinition(wiring = DirectiveWithListWiring.class)
+    @GraphQLName("list")
+    @Target({ElementType.FIELD, ElementType.PARAMETER, ElementType.TYPE, ElementType.METHOD})
+    @Retention(RetentionPolicy.RUNTIME)
+    @DirectiveLocations({Introspection.DirectiveLocation.FIELD_DEFINITION, Introspection.DirectiveLocation.ARGUMENT_DEFINITION, Introspection.DirectiveLocation.INPUT_FIELD_DEFINITION})
+    @interface DirectiveWithList{
+        String[] list();
     }
 
     public static class Query{
@@ -179,6 +194,9 @@ public static String nameWithMultipleDirectives(){
             return "yarin";
         }
 
+        @GraphQLField
+        @DirectiveWithList(list = {"v", "x", "y"})
+        public static String nameWithDirectiveWithList() {return "yarin";}
 
         public static class NameWithArgument implements DataFetcher {
             @Override
@@ -266,4 +284,15 @@ public void usingAnnotationDirective_multipleDirectivesOnField_wiringHappensInOr
         assertEquals(((Map<String, String>) result1.getData()).get("nameWithMultipleDirectives").toString(), "YARIN is cool");
     }
 
+    @Test
+    public void usingAnnotationDirective_listArgument_wiringHappens(){
+        // Act
+        ExecutionResult result1 = GraphQL.newGraphQL(schema).build().execute("query { nameWithDirectiveWithList }");
+
+        // Assert
+        assertTrue(result1.getErrors().isEmpty());
+        assertEquals(((Map<String, String>) result1.getData()).get("nameWithDirectiveWithList").toString(), "yarinv");
+    }
+
+
 }