Merge remote-tracking branch 'upstream/master'

# Conflicts:
#	gradle.properties

Author: bbakerman

README.md

@@ -12,7 +12,7 @@ syntax for GraphQL schema definition.
 
 ```groovy
 dependencies {
-  compile "com.graphql-java:graphql-java-annotations:0.14.0"
+  compile "com.graphql-java:graphql-java-annotations:0.15.0"
 }
 ```
 

build.gradle

@@ -67,7 +67,7 @@ gradle.projectsEvaluated {
 
 dependencies {
     compile 'javax.validation:validation-api:1.1.0.Final'
-    compile 'com.graphql-java:graphql-java:2.2.0'
+    compile 'com.graphql-java:graphql-java:3.0.0'
 
     // OSGi
     compileOnly 'org.osgi:org.osgi.core:6.0.0'

gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,6 @@
-#Thu Oct 27 10:18:00 ICT 2016
+#Tue Jun 06 14:52:40 AEST 2017
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-3.1-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-3.1-all.zip

src/main/java/graphql/annotations/BatchedTypeFunction.java

@@ -14,12 +14,9 @@
  */
 package graphql.annotations;
 
-import graphql.schema.GraphQLList;
-
 import java.lang.reflect.AnnotatedParameterizedType;
 import java.lang.reflect.AnnotatedType;
 import java.lang.reflect.ParameterizedType;
-import java.util.Collection;
 import java.util.List;
 
 public class BatchedTypeFunction implements TypeFunction {
@@ -30,7 +27,17 @@ public BatchedTypeFunction(TypeFunction defaultTypeFunction) {
     }
 
     @Override
-    public graphql.schema.GraphQLType apply(Class<?> aClass, AnnotatedType annotatedType) {
+    public String getTypeName(Class<?> aClass, AnnotatedType annotatedType) {
+        return defaultTypeFunction.getTypeName(aClass, annotatedType);
+    }
+
+    @Override
+    public boolean canBuildType(final Class<?> aClass, final AnnotatedType type) {
+        return defaultTypeFunction.canBuildType(aClass, type);
+    }
+
+    @Override
+    public graphql.schema.GraphQLType buildType(final String typeName, final Class<?> aClass, final AnnotatedType annotatedType) {
         if (!aClass.isAssignableFrom(List.class)) {
             throw new IllegalArgumentException("Batched method should return a List");
         }
@@ -45,10 +52,6 @@ public graphql.schema.GraphQLType apply(Class<?> aClass, AnnotatedType annotated
         } else {
             klass = (Class<?>) arg.getType();
         }
-        return defaultTypeFunction.apply(klass, arg);
-    }
-
-    @Override public Collection<Class<?>> getAcceptedTypes() {
-        return defaultTypeFunction.getAcceptedTypes();
+        return defaultTypeFunction.buildType(typeName, klass, arg);
     }
 }

src/main/java/graphql/annotations/Connection.java

@@ -16,5 +16,5 @@
 
 import graphql.schema.DataFetcher;
 
-public interface Connection extends DataFetcher {
+public interface Connection<T> extends DataFetcher<T> {
 }