Skip to content

Update graphql-java to 11.0 #59

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Dec 26, 2018
Merged

Update graphql-java to 11.0 #59

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion graphql-jpa-query-dependencies/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>

Expand Down
4 changes: 2 additions & 2 deletions ...n/java/com/introproventures/graphql/jpa/query/schema/impl/GraphQLJpaQueryDataFetcher.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -94,7 +94,7 @@ public Object get(DataFetchingEnvironment environment) {
environment.getFragmentsByName(),
environment.getExecutionId(),
environment.getSelectionSet(),
environment.getFieldTypeInfo(),
environment.getExecutionStepInfo(),
environment.getExecutionContext()
)).orElse(environment);

Expand Down Expand Up @@ -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());
Expand Down
8 changes: 4 additions & 4 deletions ...in/java/com/introproventures/graphql/jpa/query/schema/impl/QraphQLJpaBaseDataFetcher.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
);
Expand Down Expand Up @@ -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() );
Expand All @@ -449,7 +449,7 @@ public ArgumentEnvironment(DataFetchingEnvironment environment, String argumentN
environment.getFragmentsByName(),
environment.getExecutionId(),
environment.getSelectionSet(),
environment.getFieldTypeInfo(),
environment.getExecutionStepInfo(),
environment.getExecutionContext()
);
}
Expand All @@ -471,7 +471,7 @@ public WherePredicateEnvironment(DataFetchingEnvironment environment, GraphQLFie
environment.getFragmentsByName(),
environment.getExecutionId(),
environment.getSelectionSet(),
environment.getFieldTypeInfo(),
environment.getExecutionStepInfo(),
environment.getExecutionContext()
);
}
Expand Down