Merge pull request #59 from introproventures/upgrade-to-graphql-11

Update graphql-java to 11.0

Author: igdianov

graphql-jpa-query-dependencies/pom.xml

@@ -10,7 +10,7 @@
     <packaging>pom</packaging>
 
     <properties>
-        <graphql-java.version>9.4</graphql-java.version>
+        <graphql-java.version>11.0</graphql-java.version>
         <hibernate-jpa-2.1-api.version>1.0.0.Final</hibernate-jpa-2.1-api.version>
     </properties>
 

graphql-jpa-query-schema/src/main/java/com/introproventures/graphql/jpa/query/schema/impl/GraphQLJpaQueryDataFetcher.java

@@ -94,7 +94,7 @@ public Object get(DataFetchingEnvironment environment) {
                             environment.getFragmentsByName(),
                             environment.getExecutionId(),
                             environment.getSelectionSet(),
-                            environment.getFieldTypeInfo(),
+                            environment.getExecutionStepInfo(),
                             environment.getExecutionContext()
                         )).orElse(environment);
 
@@ -132,7 +132,7 @@ public Object get(DataFetchingEnvironment environment) {
             final Long total = recordsSelection
                     .map(contentField -> getCountQuery(countQueryEnvironment, countQueryField).getSingleResult())
                     // if no "content" was selected an empty Field can be used
-                    .orElseGet(() -> getCountQuery(environment, new Field()).getSingleResult());
+                    .orElseGet(() -> getCountQuery(environment, new Field("count")).getSingleResult());
 
             result.put(GraphQLJpaSchemaBuilder.PAGE_TOTAL_PARAM_NAME, total);
             result.put(GraphQLJpaSchemaBuilder.PAGE_PAGES_PARAM_NAME, ((Double) Math.ceil(total / (double) page.size)).longValue());

graphql-jpa-query-schema/src/main/java/com/introproventures/graphql/jpa/query/schema/impl/QraphQLJpaBaseDataFetcher.java

@@ -321,7 +321,7 @@ protected Predicate getWherePredicate(CriteriaBuilder cb, Root<?> root,  From<?,
                 environment.getFragmentsByName(),
                 environment.getExecutionId(),
                 environment.getSelectionSet(),
-                environment.getFieldTypeInfo(),
+                environment.getExecutionStepInfo(),
                 environment.getExecutionContext()
             ), new Argument(Logical.AND.name(), whereValue)
          );
@@ -424,7 +424,7 @@ private PredicateFilter getPredicateFilter(ObjectField objectField, DataFetching
             environment.getFragmentsByName(),
             environment.getExecutionId(),
             environment.getSelectionSet(),
-            environment.getFieldTypeInfo(),
+            environment.getExecutionStepInfo(),
             environment.getExecutionContext()
         ),
             new Argument(objectField.getName(), argument.getValue()), argument.getValue() );
@@ -449,7 +449,7 @@ public ArgumentEnvironment(DataFetchingEnvironment environment, String argumentN
                 environment.getFragmentsByName(),
                 environment.getExecutionId(),
                 environment.getSelectionSet(),
-                environment.getFieldTypeInfo(),
+                environment.getExecutionStepInfo(),
                 environment.getExecutionContext()
             );
         }
@@ -471,7 +471,7 @@ public WherePredicateEnvironment(DataFetchingEnvironment environment, GraphQLFie
                 environment.getFragmentsByName(),
                 environment.getExecutionId(),
                 environment.getSelectionSet(),
-                environment.getFieldTypeInfo(),
+                environment.getExecutionStepInfo(),
                 environment.getExecutionContext()
             );
         }