Merge pull request #192 from yarinvak/graphql-java-11

Graphql java 11

Author: yarinvak

build.gradle

@@ -69,7 +69,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 = 5.3.1
+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

@@ -1,12 +1,12 @@
 /**
  * Copyright 2016 Yurii Rashkovskii
- *
+ * <p>
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
+ * <p>
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * <p>
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -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);
     }

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

@@ -1,12 +1,12 @@
 /**
  * Copyright 2016 Yurii Rashkovskii
- *
+ * <p>
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
+ * <p>
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * <p>
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -34,7 +34,7 @@ public DispatchingConnection(Object o) {
     }
 
     @Override
-    public Object get(DataFetchingEnvironment environment) {
+    public Object get(DataFetchingEnvironment environment) throws Exception {
         return connection.get(environment);
     }
 }

src/main/java/graphql/annotations/strategies/EnhancedExecutionStrategy.java

@@ -31,7 +31,7 @@ public class EnhancedExecutionStrategy extends AsyncSerialExecutionStrategy {
 
     @Override
     protected CompletableFuture<ExecutionResult> resolveField(ExecutionContext executionContext, ExecutionStrategyParameters parameters) {
-        GraphQLObjectType parentType = (GraphQLObjectType) parameters.getTypeInfo().getType();
+        GraphQLObjectType parentType = (GraphQLObjectType) parameters.getExecutionStepInfo().getType();
         GraphQLFieldDefinition fieldDef = getFieldDef(executionContext.getGraphQLSchema(), parentType, parameters.getField().get(0));
         if (fieldDef == null) return null;
 
@@ -52,12 +52,12 @@ protected CompletableFuture<ExecutionResult> resolveField(ExecutionContext execu
                 clientMutationId = clientMutationIdVal.getValue();
             }
 
-            ExecutionTypeInfo fieldTypeInfo = ExecutionTypeInfo.newTypeInfo().type(fieldDef.getType()).parentInfo(parameters.getTypeInfo()).build();
+            ExecutionStepInfo fieldTypeInfo = ExecutionStepInfo.newExecutionStepInfo().type(fieldDef.getType()).parentInfo(parameters.getExecutionStepInfo()).build();
             ExecutionStrategyParameters newParameters = ExecutionStrategyParameters.newParameters()
                     .arguments(parameters.getArguments())
                     .fields(parameters.getFields())
                     .nonNullFieldValidator(parameters.getNonNullFieldValidator())
-                    .typeInfo(fieldTypeInfo)
+                    .executionStepInfo(fieldTypeInfo)
                     .source(clientMutationId)
                     .build();
 
@@ -70,7 +70,7 @@ protected CompletableFuture<ExecutionResult> resolveField(ExecutionContext execu
 
     @Override
     protected FieldValueInfo completeValue(ExecutionContext executionContext, ExecutionStrategyParameters parameters) throws NonNullableFieldWasNullException {
-        graphql.schema.GraphQLType fieldType = parameters.getTypeInfo().getType();
+        graphql.schema.GraphQLType fieldType = parameters.getExecutionStepInfo().getType();
         Object result = parameters.getSource();
         if (result instanceof Enum && fieldType instanceof GraphQLEnumType) {
             Object value = ((GraphQLEnumType) fieldType).getCoercing().parseValue(((Enum) result).name());
@@ -91,7 +91,7 @@ private ExecutionStrategyParameters withSource(ExecutionStrategyParameters param
                 .arguments(parameters.getArguments())
                 .fields(parameters.getFields())
                 .nonNullFieldValidator(parameters.getNonNullFieldValidator())
-                .typeInfo(parameters.getTypeInfo())
+                .executionStepInfo(parameters.getExecutionStepInfo())
                 .source(source)
                 .build();
     }