logic changes

Author: danieltaub96

src/main/java/graphql/annotations/processor/util/DataFetcherConstructor.java

@@ -38,14 +38,31 @@ public DataFetcher constructDataFetcher(String fieldName, GraphQLDataFetcher ann
         if (args.length == 0) {
             return newInstance(annotatedDataFetcher.value());
         } else {
-            try {
-                // Get the String[] constructor
-                final Constructor<? extends DataFetcher> ctr = annotatedDataFetcher.value().getDeclaredConstructor(String[].class);
-                return constructNewInstance(ctr, new Object[] {args});
-            } catch (final NoSuchMethodException e) {
-                throw new GraphQLAnnotationsException("Unable to instantiate DataFetcher via constructor for: " + fieldName, e);
-            }
+            return Stream.of(annotatedDataFetcher.value().getConstructors())
+                    // filter only constructor that have the same args as the annotation args
+                    // or that get String[], String... args
+                    .filter(x -> (x.getParameterCount() == args.length) ||
+                            (x.getParameterTypes().length == 1 && x.getParameterTypes()[0] == String[].class))
+                    .map(x -> {
+                        try {
+                            Constructor<? extends DataFetcher> constructor;
+                            if (x.getParameterTypes().length == 1 && x.getParameterTypes()[0] == String[].class) {
+                                constructor = annotatedDataFetcher.value().getDeclaredConstructor(String[].class);
+                                return constructNewInstance(constructor, new Object[]{args});
+                            }
+
+                            constructor = annotatedDataFetcher.value().getDeclaredConstructor(
+                                    stream(args).map(v -> String.class).toArray(Class[]::new));
+                            return constructNewInstance(constructor, (Object[]) args);
+                        } catch (NoSuchMethodException e) {
+                            throw new GraphQLAnnotationsException("Unable to instantiate DataFetcher via constructor for: " + fieldName, e);
+                        }
+                    })
+                    .findFirst()
+                    .orElseThrow(NoArgsConstructorException::new);
         }
     }
 
+    public static class NoArgsConstructorException extends RuntimeException {
+    }
 }

src/test/java/graphql/annotations/processor/util/DataFetcherConstructorTest.java

@@ -1,3 +1,17 @@
+/**
+ * Copyright 2016 Yurii Rashkovskii
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ */
 package graphql.annotations.processor.util;
 
 import graphql.annotations.annotationTypes.GraphQLDataFetcher;
@@ -16,7 +30,7 @@ public class DataFetcherConstructorTest {
     private DataFetcherConstructor constructor = new DataFetcherConstructor();
 
     @Test
-    public void graphQLDataFetcherWithArgsTest() {
+    public void graphQLDataFetcherWithArrayCtorTest() {
         GraphQLDataFetcher graphQLDataFetcher = getGraphQLDataFetcher(DataFetcherMock.class, false, "Arg1", "Arg2");
         DataFetcherMock dataFetcher = (DataFetcherMock) constructor.constructDataFetcher(null, graphQLDataFetcher);
 
@@ -25,6 +39,17 @@ public void graphQLDataFetcherWithArgsTest() {
         assertEquals(dataFetcher.getArgs()[1], "Arg2");
     }
 
+    @Test
+    public void graphQLDataFetcherWithParamsCtorTest() {
+        GraphQLDataFetcher graphQLDataFetcher = getGraphQLDataFetcher(DataFetcherMock.class, false, "Arg1", "Arg2", "Arg3");
+        DataFetcherMock dataFetcher = (DataFetcherMock) constructor.constructDataFetcher(null, graphQLDataFetcher);
+
+        assertEquals(dataFetcher.getArgs().length, 3);
+        assertEquals(dataFetcher.getArgs()[0], "Arg1");
+        assertEquals(dataFetcher.getArgs()[1], "Arg2");
+        assertEquals(dataFetcher.getArgs()[2], "Arg3");
+    }
+
     @Test
     public void graphQLDataFetcherDefaultCtorTest() {
         GraphQLDataFetcher graphQLDataFetcher = getGraphQLDataFetcher(DataFetcherMock.class, false);

src/test/java/graphql/annotations/processor/util/DataFetcherMock.java

@@ -1,3 +1,17 @@
+/**
+ * Copyright 2016 Yurii Rashkovskii
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ */
 package graphql.annotations.processor.util;
 
 import graphql.schema.DataFetcher;
@@ -9,11 +23,18 @@
 public class DataFetcherMock implements DataFetcher {
     private String[] args;
 
-    public DataFetcherMock(String... args){
+    public DataFetcherMock(String... args) {
         this.args = args;
     }
 
-    public  DataFetcherMock(){ }
+    public DataFetcherMock(String arg1, String arg2, String arg3) {
+        this.args = new String[]{
+                arg1, arg2, arg3
+        };
+    }
+
+    public DataFetcherMock() {
+    }
 
     @Override
     public Object get(DataFetchingEnvironment environment) {