Merge remote-tracking branch 'upstream/master'

Author: yarinvak

README.md

@@ -1,5 +1,5 @@
 [![Build Status](https://travis-ci.org/graphql-java/graphql-java-annotations.svg?branch=master)](https://travis-ci.org/yrashk/graphql-java-annotations)
-[![Maven Central](https://img.shields.io/maven-central/v/com.graphql-java/graphql-java-annotations.svg?maxAge=2592000)]()
+[![Maven Central](https://img.shields.io/maven-central/v/io.github.graphql-java/graphql-java-annotations.svg?maxAge=2592000)]()
 # GraphQL Annotations for Java
 
 [GraphQL-Java](https://github.com/andimarek/graphql-java) is a great library, but its syntax is a little bit verbose. This library offers an annotations-based
@@ -12,7 +12,7 @@ syntax for GraphQL schema definition.
 
 ```groovy
 dependencies {
-  compile "com.graphql-java:graphql-java-annotations:3.0.3"
+  compile "io.github.graphql-java:graphql-java-annotations:5.0.4"
 }
 ```
 

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

@@ -15,6 +15,7 @@
 package graphql.annotations.processor.retrievers.fieldBuilders.field;
 
 import graphql.annotations.annotationTypes.GraphQLDataFetcher;
+import graphql.annotations.annotationTypes.GraphQLTypeExtension;
 import graphql.annotations.connection.GraphQLConnection;
 import graphql.annotations.dataFetchers.ExtensionDataFetcherWrapper;
 import graphql.annotations.dataFetchers.MethodDataFetcher;
@@ -73,13 +74,13 @@ private DataFetcher handleNullCase(DataFetcher actualDataFetcher) {
         if (isaBoolean()) {
             actualDataFetcher = getBooleanDataFetcher(actualDataFetcher);
         } else if (checkIfPrefixGetterExists(field.getDeclaringClass(), "get", field.getName())) {
-            actualDataFetcher = wrapExtension(new PropertyDataFetcher(field.getName()));
+            actualDataFetcher = wrapExtension(new PropertyDataFetcher(field.getName()), field);
         } else{
             actualDataFetcher = getDataFetcherWithFluentGetter(actualDataFetcher);
         }
 
         if (actualDataFetcher == null) {
-            actualDataFetcher = wrapExtension(new FieldDataFetcher(field.getName()));
+            actualDataFetcher = wrapExtension(new FieldDataFetcher(field.getName()), field);
         }
         return actualDataFetcher;
     }
@@ -103,14 +104,17 @@ private DataFetcher getDataFetcherWithFluentGetter(DataFetcher actualDataFetcher
         return actualDataFetcher;
     }
 
-    private ExtensionDataFetcherWrapper wrapExtension(DataFetcher dataFetcher) {
-        return new ExtensionDataFetcherWrapper(field.getDeclaringClass(), dataFetcher);
+    private DataFetcher wrapExtension(DataFetcher dataFetcher, Field field) {
+        if (field.getDeclaringClass().isAnnotationPresent(GraphQLTypeExtension.class)) {
+            return new ExtensionDataFetcherWrapper(field.getDeclaringClass(), dataFetcher);
+        }
+        return dataFetcher;
     }
 
     private DataFetcher getBooleanDataFetcher(DataFetcher actualDataFetcher) {
         if (checkIfPrefixGetterExists(field.getDeclaringClass(), "is", field.getName()) ||
                 checkIfPrefixGetterExists(field.getDeclaringClass(), "get", field.getName())) {
-            actualDataFetcher = wrapExtension(new PropertyDataFetcher(field.getName()));
+            actualDataFetcher = wrapExtension(new PropertyDataFetcher(field.getName()), field);
         }
         return actualDataFetcher;
     }

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

@@ -18,22 +18,14 @@
 import graphql.GraphQL;
 import graphql.Scalars;
 import graphql.annotations.annotationTypes.*;
-import graphql.annotations.dataFetchers.ExtensionDataFetcherWrapper;
+import graphql.annotations.annotationTypes.GraphQLNonNull;
 import graphql.annotations.processor.GraphQLAnnotations;
 import graphql.annotations.processor.ProcessingElementsContainer;
 import graphql.annotations.processor.retrievers.GraphQLInputObjectRetriever;
 import graphql.annotations.processor.retrievers.GraphQLObjectHandler;
 import graphql.annotations.processor.typeFunctions.TypeFunction;
-import graphql.schema.DataFetcher;
-import graphql.schema.DataFetchingEnvironment;
-
-import graphql.schema.GraphQLArgument;
-import graphql.schema.GraphQLFieldDefinition;
-import graphql.schema.GraphQLInputObjectType;
-import graphql.schema.GraphQLInputType;
-import graphql.schema.GraphQLList;
-import graphql.schema.GraphQLObjectType;
-import graphql.schema.GraphQLSchema;
+import graphql.schema.*;
+
 import graphql.schema.GraphQLType;
 import graphql.schema.idl.SchemaParser;
 import graphql.schema.idl.SchemaPrinter;
@@ -141,6 +133,43 @@ public String fieldWithNamedArgs(@GraphQLName("namedArg") String firstArgument)
         }
     }
 
+    public static class TestMappedObject {
+        @GraphQLField
+        public String name;
+    }
+
+    public static class TestObjectDB{
+        public String name;
+
+        public TestObjectDB(String name) {
+            this.name = name;
+        }
+    }
+
+    public static class TestQuery{
+        @GraphQLField
+        @GraphQLDataFetcher(ObjectFetcher.class)
+        public TestMappedObject object;
+    }
+
+    public static class ObjectFetcher implements DataFetcher<TestObjectDB> {
+
+        @Override
+        public TestObjectDB get(DataFetchingEnvironment environment) {
+            return new TestObjectDB("test");
+        }
+    }
+
+    @Test
+    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}}");
+        assertTrue(result.getErrors().isEmpty());
+        assertEquals(((LinkedHashMap)(((LinkedHashMap)result.getData()).get("object"))).get("name"), "test");
+    }
+
     @Test
     public void namedFields() {
         GraphQLObjectType object = GraphQLAnnotations.object(TestObjectNamedArgs.class);
@@ -214,8 +243,8 @@ public void fields() {
         assertEquals(fields.get(5).getName(), "privateTest");
         assertEquals(fields.get(6).getName(), "publicTest");
 
-        assertEquals(fields.get(5).getDataFetcher().getClass(), ExtensionDataFetcherWrapper.class);
-        assertEquals(fields.get(6).getDataFetcher().getClass(), ExtensionDataFetcherWrapper.class);
+        assertEquals(fields.get(5).getDataFetcher().getClass(), PropertyDataFetcher.class);
+        assertEquals(fields.get(6).getDataFetcher().getClass(), FieldDataFetcher.class);
 
         assertEquals(fields.get(7).getName(), "z_nonOptionalString");
         assertTrue(fields.get(7).getType() instanceof graphql.schema.GraphQLNonNull);