Merge pull request #132 from graphql-java/fix-extension-bug

no need in fielddatafetcher, using property only

Author: yarinvak

src/main/java/graphql/annotations/processor/retrievers/fieldBuilders/field/FieldDataFetcherBuilder.java

@@ -80,7 +80,7 @@ private DataFetcher handleNullCase(DataFetcher actualDataFetcher) {
         }
 
         if (actualDataFetcher == null) {
-            actualDataFetcher = wrapExtension(new FieldDataFetcher(field.getName()), field);
+            actualDataFetcher = wrapExtension(new PropertyDataFetcher(field.getName()), field);
         }
         return actualDataFetcher;
     }

src/test/java/graphql/annotations/GraphQLObjectTest.java

@@ -136,13 +136,22 @@ public String fieldWithNamedArgs(@GraphQLName("namedArg") String firstArgument)
     public static class TestMappedObject {
         @GraphQLField
         public String name;
+
+        @GraphQLField
+        public String aaa;
     }
 
     public static class TestObjectDB{
-        public String name;
+        public String aaa;
+
+        private String name;
+
+        public String getName() {
+            return name;
+        }
 
-        public TestObjectDB(String name) {
-            this.name = name;
+        public TestObjectDB(String name, String aaa) {
+            this.name = name; this.aaa=aaa;
         }
     }
 
@@ -156,7 +165,7 @@ public static class ObjectFetcher implements DataFetcher<TestObjectDB> {
 
         @Override
         public TestObjectDB get(DataFetchingEnvironment environment) {
-            return new TestObjectDB("test");
+            return new TestObjectDB("test", "test");
         }
     }
 
@@ -165,9 +174,10 @@ public void fetchTestMappedObject_assertNameIsMappedFromDBObject(){
         GraphQLObjectType object = GraphQLAnnotations.object(TestQuery.class);
         GraphQLSchema schema = newSchema().query(object).build();
 
-        ExecutionResult result = GraphQL.newGraphQL(schema).build().execute("{object {name}}");
+        ExecutionResult result = GraphQL.newGraphQL(schema).build().execute("{object {name aaa}}");
         assertTrue(result.getErrors().isEmpty());
         assertEquals(((LinkedHashMap)(((LinkedHashMap)result.getData()).get("object"))).get("name"), "test");
+        assertEquals(((LinkedHashMap)(((LinkedHashMap)result.getData()).get("object"))).get("aaa"), "test");
     }
 
     @Test
@@ -244,7 +254,7 @@ public void fields() {
         assertEquals(fields.get(6).getName(), "publicTest");
 
         assertEquals(fields.get(5).getDataFetcher().getClass(), PropertyDataFetcher.class);
-        assertEquals(fields.get(6).getDataFetcher().getClass(), FieldDataFetcher.class);
+        assertEquals(fields.get(6).getDataFetcher().getClass(), PropertyDataFetcher.class);
 
         assertEquals(fields.get(7).getName(), "z_nonOptionalString");
         assertTrue(fields.get(7).getType() instanceof graphql.schema.GraphQLNonNull);