add test fix batched

Author: osher-sade

src/main/java/graphql/annotations/dataFetchers/MethodDataFetcher.java

@@ -14,6 +14,7 @@
  */
 package graphql.annotations.dataFetchers;
 
+import graphql.annotations.annotationTypes.GraphQLBatched;
 import graphql.annotations.annotationTypes.GraphQLInvokeDetached;
 import graphql.annotations.annotationTypes.GraphQLName;
 import graphql.annotations.processor.ProcessingElementsContainer;
@@ -45,10 +46,7 @@ public MethodDataFetcher(Method method, TypeFunction typeFunction, ProcessingEle
     public T get(DataFetchingEnvironment environment) {
         try {
             T obj;
-
-            if (Modifier.isStatic(method.getModifiers())) {
-                obj = null;
-            } else if (method.getAnnotation(GraphQLInvokeDetached.class) != null) {
+            if (method.isAnnotationPresent(GraphQLBatched.class) || method.isAnnotationPresent(GraphQLInvokeDetached.class)) {
                 obj = newInstance((Class<T>) method.getDeclaringClass());
             } else if (!method.getDeclaringClass().isInstance(environment.getSource())) {
                 obj = newInstance((Class<T>) method.getDeclaringClass(), environment.getSource());
@@ -61,11 +59,11 @@ public T get(DataFetchingEnvironment environment) {
 
             if (obj == null && environment.getSource() != null) {
                 Object value = getFieldValue(environment.getSource(), method.getName());
-                if (value != null) return (T) value;
+                return (T) value;
             }
 
             return (T) method.invoke(obj, invocationArgs(environment, container));
-        } catch (IllegalAccessException | InvocationTargetException e) {
+        } catch (IllegalAccessException | InvocationTargetException | NoSuchFieldException e) {
             throw new RuntimeException(e);
         }
     }
@@ -137,13 +135,9 @@ private Object buildArg(Type p, GraphQLType graphQLType, Object arg) {
         }
     }
 
-    private Object getFieldValue(Object source, String fieldName) throws IllegalAccessException {
-        try {
-            Field field = source.getClass().getDeclaredField(fieldName);
-            field.setAccessible(true);
-            return field.get(source);
-        } catch (NoSuchFieldException e) {
-            return null;
-        }
+    private Object getFieldValue(Object source, String fieldName) throws IllegalAccessException, NoSuchFieldException {
+        Field field = source.getClass().getDeclaredField(fieldName);
+        field.setAccessible(true);
+        return field.get(source);
     }
 }

src/test/java/graphql/annotations/MethodDataFetcherTest.java

@@ -14,6 +14,7 @@
  */
 package graphql.annotations;
 
+import graphql.ExceptionWhileDataFetching;
 import graphql.ExecutionResult;
 import graphql.GraphQL;
 import graphql.annotations.annotationTypes.GraphQLDataFetcher;
@@ -31,8 +32,7 @@
 import java.util.Map;
 
 import static graphql.schema.GraphQLSchema.newSchema;
-import static org.testng.Assert.assertEquals;
-import static org.testng.Assert.assertTrue;
+import static org.testng.Assert.*;
 
 @SuppressWarnings("unchecked")
 public class MethodDataFetcherTest {
@@ -73,6 +73,11 @@ public int a() {
         public int b() {
             return 2;
         }
+
+        @GraphQLField
+        public int c() {
+            return 4;
+        }
     }
 
     public static class InternalType {
@@ -103,6 +108,7 @@ public ApiType get(DataFetchingEnvironment environment) {
         }
     }
 
+
     @Test
     public void queryingOneFieldNotAnnotatedWithGraphQLInvokeDetached_valueIsDeterminedByEntity() {
         GraphQLObjectType object = GraphQLAnnotations.object(Query.class);
@@ -133,4 +139,14 @@ public void queryingFieldsFromApiEntityFetcher_valueIsDeterminedByApiEntity() {
         assertEquals(((Map<String, Map<String, Integer>>) result.getData()).get("apiField").get("a").toString(), "1");
         assertEquals(((Map<String, Map<String, Integer>>) result.getData()).get("apiField").get("b").toString(), "2");
     }
+
+    @Test
+    public void queryingFieldsFromNoApiEntityFetcher_noMatchingFieldInEntity_throwException(){
+        GraphQLObjectType object = GraphQLAnnotations.object(Query.class);
+        GraphQLSchema schema = newSchema().query(object).build();
+
+        ExecutionResult result = GraphQL.newGraphQL(schema).build().execute("query { field { c } }");
+        assertFalse(result.getErrors().isEmpty());
+        assertTrue(((ExceptionWhileDataFetching)result.getErrors().get(0)).getException().getCause() instanceof NoSuchFieldException);
+    }
 }