Merge branch 'master' of https://github.com/graphql-java/graphql-java-annotations

Author: yarinvak

README.md

@@ -12,7 +12,7 @@ syntax for GraphQL schema definition.
 
 ```groovy
 dependencies {
-  compile "io.github.graphql-java:graphql-java-annotations:5.4"
+  compile "io.github.graphql-java:graphql-java-annotations:6.1"
 }
 ```
 
@@ -22,7 +22,7 @@ dependencies {
 <dependency>
     <groupId>io.github.graphql-java</groupId>
     <artifactId>graphql-java-annotations</artifactId>
-    <version>5.4</version>
+    <version>6.1</version>
 </dependency>
 ```
 

azure-pipelines.yml

@@ -0,0 +1,20 @@
+# Gradle
+# Build your Java project and run tests with Gradle using a Gradle wrapper script.
+# Add steps that analyze code, save build artifacts, deploy, and more:
+# https://docs.microsoft.com/azure/devops/pipelines/languages/java
+
+pool:
+  vmImage: 'Ubuntu 16.04'
+
+steps:
+- task: Gradle@2
+  inputs:
+    workingDirectory: ''
+    gradleWrapperFile: 'gradlew'
+    gradleOptions: '-Xmx3072m'
+    javaHomeOption: 'JDKVersion'
+    jdkVersionOption: '1.8'
+    jdkArchitectureOption: 'x64'
+    publishJUnitResults: true
+    testResultsFiles: '**/TEST-*.xml'
+    tasks: 'build'

build.gradle

@@ -47,6 +47,7 @@ idea {
 release {
     tagTemplate = 'v${version}'
     failOnPublishNeeded = false
+    failOnCommitNeeded = false
 }
 
 jar {
@@ -69,7 +70,7 @@ gradle.projectsEvaluated {
 
 dependencies {
     compile 'javax.validation:validation-api:1.1.0.Final'
-    compile 'com.graphql-java:graphql-java:9.2'
+    compile 'com.graphql-java:graphql-java:11.0'
 
     // OSGi
     compileOnly 'org.osgi:org.osgi.core:6.0.0'

gradle.properties

@@ -7,4 +7,4 @@ org.gradle.jvmargs=-Dfile.encoding=UTF-8
 
 bintray.user=DUMMY_USER
 bintray.key=DUMMY_KEY
-version = 6.0
+version = 6.1

src/main/java/graphql/annotations/connection/PaginatedDataConnectionFetcher.java

@@ -41,7 +41,7 @@ public PaginatedDataConnectionFetcher(DataFetcher<PaginatedData<T>> paginationDa
     }
 
     @Override
-    public Connection<T> get(DataFetchingEnvironment environment) {
+    public Connection<T> get(DataFetchingEnvironment environment) throws Exception{
         PaginatedData<T> paginatedData = paginationDataFetcher.get(environment);
         if (paginatedData == null) {
             return new DefaultConnection<>(Collections.emptyList(), new DefaultPageInfo(null,null,false,false));

src/main/java/graphql/annotations/connection/simple/SimpleConnectionDataFetcher.java

@@ -44,7 +44,7 @@ public SimpleConnectionDataFetcher(Class<? extends SimpleConnectionFetcher<T>> c
     }
 
     @Override
-    public Connection<T> get(DataFetchingEnvironment environment) {
+    public Connection<T> get(DataFetchingEnvironment environment) throws Exception {
         SimpleConnectionFetcher<T> conn = constructNewInstance(constructor, actualDataFetcher);
         return conn.get(environment);
     }

src/main/java/graphql/annotations/connection/simple/SimplePaginatedDataConnectionFetcher.java

@@ -26,7 +26,7 @@ public SimplePaginatedDataConnectionFetcher(DataFetcher<SimplePaginatedData<T>>
     }
 
     @Override
-    public SimpleConnection<T> get(DataFetchingEnvironment environment) {
+    public SimpleConnection<T> get(DataFetchingEnvironment environment) throws Exception {
         return simplePaginatedDataDataFetcher.get(environment);
     }
 }

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

@@ -34,7 +34,7 @@ public ExtensionDataFetcherWrapper(Class declaringClass, DataFetcher<T> dataFetc
     }
 
     @Override
-    public T get(DataFetchingEnvironment environment) {
+    public T get(DataFetchingEnvironment environment) throws Exception {
         Object source = environment.getSource();
         if (source != null && (!declaringClass.isInstance(source)) && !(source instanceof Map)) {
             environment = new DataFetchingEnvironmentImpl(newInstance(declaringClass, source),
@@ -43,7 +43,7 @@ public T get(DataFetchingEnvironment environment) {
                     environment.getFields(), environment.getFieldType(), environment.getParentType(),
                     environment.getGraphQLSchema(),
                     environment.getFragmentsByName(), environment.getExecutionId(),
-                    environment.getSelectionSet(), environment.getFieldTypeInfo(),
+                    environment.getSelectionSet(), environment.getExecutionStepInfo(),
                     environment.getExecutionContext());
         }
 

src/main/java/graphql/annotations/dataFetchers/connection/AsyncConnectionDataFetcher.java

@@ -30,7 +30,13 @@ public AsyncConnectionDataFetcher(ConnectionDataFetcher connectionFetcher) {
     }
 
     @Override
-    public CompletableFuture<graphql.relay.Connection<T>> get(DataFetchingEnvironment environment) {
-        return supplyAsync(() -> connectionDataFetcher.get(environment));
+    public CompletableFuture<graphql.relay.Connection<T>> get(DataFetchingEnvironment environment) throws Exception {
+        return supplyAsync(() -> {
+            try {
+                return connectionDataFetcher.get(environment);
+            } catch (Exception e) {
+                throw new RuntimeException("Error in AsyncConnectionDataFetcher", e);
+            }
+        });
     }
 }

src/main/java/graphql/annotations/dataFetchers/connection/ConnectionDataFetcher.java

@@ -44,7 +44,7 @@ public ConnectionDataFetcher(Class<? extends ConnectionFetcher<T>> connection, D
     }
 
     @Override
-    public graphql.relay.Connection<T> get(DataFetchingEnvironment environment) {
+    public graphql.relay.Connection<T> get(DataFetchingEnvironment environment) throws Exception {
         ConnectionFetcher<T> conn = constructNewInstance(constructor, actualDataFetcher);
         return conn.get(environment);
     }