diff --git a/annotations/pom.xml b/annotations/pom.xml
index 1eac51eae..2c45280e5 100644
--- a/annotations/pom.xml
+++ b/annotations/pom.xml
@@ -6,7 +6,7 @@
com.introproventures
graphql-jpa-query-dependencies
- 1.0.1-SNAPSHOT
+ 1.1.0-SNAPSHOT
../dependencies
diff --git a/autoconfigure/pom.xml b/autoconfigure/pom.xml
index 2f1abbd8a..2ceaa41ea 100644
--- a/autoconfigure/pom.xml
+++ b/autoconfigure/pom.xml
@@ -3,7 +3,7 @@
com.introproventures
graphql-jpa-query-build
- 1.0.1-SNAPSHOT
+ 1.1.0-SNAPSHOT
../build
graphql-jpa-query-autoconfigure
diff --git a/boot-starter/pom.xml b/boot-starter/pom.xml
index 8ece5d2de..d663a5bdd 100644
--- a/boot-starter/pom.xml
+++ b/boot-starter/pom.xml
@@ -12,7 +12,7 @@
com.introproventures
graphql-jpa-query-dependencies
- 1.0.1-SNAPSHOT
+ 1.1.0-SNAPSHOT
../dependencies
diff --git a/build/pom.xml b/build/pom.xml
index cdcc6de04..3123cb791 100644
--- a/build/pom.xml
+++ b/build/pom.xml
@@ -3,7 +3,7 @@
com.introproventures
graphql-jpa-query-dependencies
- 1.0.1-SNAPSHOT
+ 1.1.0-SNAPSHOT
../dependencies
graphql-jpa-query-build
diff --git a/dependencies/pom.xml b/dependencies/pom.xml
index f4629b456..2b4cc3dc9 100644
--- a/dependencies/pom.xml
+++ b/dependencies/pom.xml
@@ -3,7 +3,7 @@
com.introproventures
graphql-jpa-query
- 1.0.1-SNAPSHOT
+ 1.1.0-SNAPSHOT
../pom.xml
graphql-jpa-query-dependencies
@@ -14,11 +14,11 @@
- 3.0.6
- 19.5
+ 3.1.0
+ 20.2
1.3
2.10.5
- 19.1
+ 20.2
3.1.0
diff --git a/examples/pom.xml b/examples/pom.xml
index 6add850de..260859c1a 100644
--- a/examples/pom.xml
+++ b/examples/pom.xml
@@ -4,7 +4,7 @@
com.introproventures
graphql-jpa-query-build
- 1.0.1-SNAPSHOT
+ 1.1.0-SNAPSHOT
../build
diff --git a/examples/spring-graphql-web/pom.xml b/examples/spring-graphql-web/pom.xml
index 382cc4d01..119857472 100644
--- a/examples/spring-graphql-web/pom.xml
+++ b/examples/spring-graphql-web/pom.xml
@@ -7,7 +7,7 @@
com.introproventures
graphql-jpa-query-examples
- 1.0.1-SNAPSHOT
+ 1.1.0-SNAPSHOT
../pom.xml
diff --git a/introspection/pom.xml b/introspection/pom.xml
index 6e10efe3b..46d550f27 100644
--- a/introspection/pom.xml
+++ b/introspection/pom.xml
@@ -3,7 +3,7 @@
com.introproventures
graphql-jpa-query-build
- 1.0.1-SNAPSHOT
+ 1.1.0-SNAPSHOT
../build
graphql-jpa-query-introspection
diff --git a/pom.xml b/pom.xml
index 4bfe69e87..8785db257 100644
--- a/pom.xml
+++ b/pom.xml
@@ -4,7 +4,7 @@
com.introproventures
graphql-jpa-query
- 1.0.1-SNAPSHOT
+ 1.1.0-SNAPSHOT
pom
GraphQL JPA Query
diff --git a/scalars/pom.xml b/scalars/pom.xml
index 9e5ef0913..7d139bcf1 100644
--- a/scalars/pom.xml
+++ b/scalars/pom.xml
@@ -9,7 +9,7 @@
com.introproventures
graphql-jpa-query-build
- 1.0.1-SNAPSHOT
+ 1.1.0-SNAPSHOT
../build
diff --git a/schema/pom.xml b/schema/pom.xml
index 4c812f50c..dfa462f5e 100644
--- a/schema/pom.xml
+++ b/schema/pom.xml
@@ -9,7 +9,7 @@
com.introproventures
graphql-jpa-query-build
- 1.0.1-SNAPSHOT
+ 1.1.0-SNAPSHOT
../build
diff --git a/schema/src/main/java/com/introproventures/graphql/jpa/query/schema/impl/GraphQLJpaQueryFactory.java b/schema/src/main/java/com/introproventures/graphql/jpa/query/schema/impl/GraphQLJpaQueryFactory.java
index d4fd25d36..7241b23d9 100644
--- a/schema/src/main/java/com/introproventures/graphql/jpa/query/schema/impl/GraphQLJpaQueryFactory.java
+++ b/schema/src/main/java/com/introproventures/graphql/jpa/query/schema/impl/GraphQLJpaQueryFactory.java
@@ -97,6 +97,7 @@
import java.util.HashMap;
import java.util.LinkedHashMap;
import java.util.List;
+import java.util.Locale;
import java.util.Map;
import java.util.Objects;
import java.util.Optional;
@@ -245,8 +246,10 @@ protected Stream getResultStream(TypedQuery query, int fetchSize, bool
logger.info("\nGraphQL JPQL Fetch Query String:\n {}", getJPQLQueryString(query));
}
+ // FIXME result stream is broken in StarwarsQueryExecutorTestsSupport.queryWithWhereInsideManyToOneRelations test since Hibernate 6.2.x
if (resultStream) {
- return query.getResultStream().peek(entityManager::detach);
+ logger.warn("Skipping result stream query due to regression in Hibernate 6.2.x");
+ // return query.getResultStream().peek(entityManager::detach);
}
// Let's execute query and wrap result into stream
@@ -703,7 +706,9 @@ protected List getFieldPredicates(
Map fieldArguments = ValuesResolver.getArgumentValues(
fieldDefinition.getArguments(),
values,
- new CoercedVariables(variables)
+ new CoercedVariables(variables),
+ environment.getGraphQlContext(),
+ Locale.ROOT
);
DataFetchingEnvironment fieldEnvironment = wherePredicateEnvironment(
@@ -852,7 +857,9 @@ protected Predicate getPredicate(
.getArgumentValues(
fieldDef.getArguments(),
Collections.singletonList(where),
- new CoercedVariables(variables)
+ new CoercedVariables(variables),
+ environment.getGraphQlContext(),
+ Locale.ROOT
)
.get(WHERE);
diff --git a/schema/src/test/java/com/introproventures/graphql/jpa/query/support/StarwarsQueryExecutorTestsSupport.java b/schema/src/test/java/com/introproventures/graphql/jpa/query/support/StarwarsQueryExecutorTestsSupport.java
index 973d04d6e..cf27d601c 100644
--- a/schema/src/test/java/com/introproventures/graphql/jpa/query/support/StarwarsQueryExecutorTestsSupport.java
+++ b/schema/src/test/java/com/introproventures/graphql/jpa/query/support/StarwarsQueryExecutorTestsSupport.java
@@ -40,7 +40,7 @@
public abstract class StarwarsQueryExecutorTestsSupport extends AbstractSpringBootTestSupport {
@Autowired
- private GraphQLJpaExecutor executor;
+ protected GraphQLJpaExecutor executor;
@Autowired
private EntityManager em;
@@ -318,9 +318,10 @@ public void queryDeepNesting() {
String expected =
"{Droid={name=R2-D2, friends=[" +
+ "{name=Han Solo, appearsIn=[A_NEW_HOPE, EMPIRE_STRIKES_BACK, RETURN_OF_THE_JEDI, THE_FORCE_AWAKENS], friends=[{name=Leia Organa}, {name=Luke Skywalker}, {name=R2-D2}]}, " +
"{name=Leia Organa, appearsIn=[A_NEW_HOPE, EMPIRE_STRIKES_BACK, RETURN_OF_THE_JEDI, THE_FORCE_AWAKENS], friends=[{name=C-3PO}, {name=Han Solo}, {name=Luke Skywalker}, {name=R2-D2}]}, " +
- "{name=Luke Skywalker, appearsIn=[A_NEW_HOPE, EMPIRE_STRIKES_BACK, RETURN_OF_THE_JEDI, THE_FORCE_AWAKENS], friends=[{name=C-3PO}, {name=Han Solo}, {name=Leia Organa}, {name=R2-D2}]}, " +
- "{name=Han Solo, appearsIn=[A_NEW_HOPE, EMPIRE_STRIKES_BACK, RETURN_OF_THE_JEDI, THE_FORCE_AWAKENS], friends=[{name=Leia Organa}, {name=Luke Skywalker}, {name=R2-D2}]}]}}";
+ "{name=Luke Skywalker, appearsIn=[A_NEW_HOPE, EMPIRE_STRIKES_BACK, RETURN_OF_THE_JEDI, THE_FORCE_AWAKENS], friends=[{name=C-3PO}, {name=Han Solo}, {name=Leia Organa}, {name=R2-D2}]}" +
+ "]}}";
//when:
Object result = executor.execute(query).getData();
@@ -338,9 +339,9 @@ public void queryDeepNestingPlural() {
String expected =
"{Droids={select=[{name=R2-D2, friends=[" +
+ "{name=Han Solo, appearsIn=[A_NEW_HOPE, EMPIRE_STRIKES_BACK, RETURN_OF_THE_JEDI, THE_FORCE_AWAKENS], friends=[{name=Leia Organa}, {name=Luke Skywalker}, {name=R2-D2}]}, " +
"{name=Leia Organa, appearsIn=[A_NEW_HOPE, EMPIRE_STRIKES_BACK, RETURN_OF_THE_JEDI, THE_FORCE_AWAKENS], friends=[{name=C-3PO}, {name=Han Solo}, {name=Luke Skywalker}, {name=R2-D2}]}, " +
- "{name=Luke Skywalker, appearsIn=[A_NEW_HOPE, EMPIRE_STRIKES_BACK, RETURN_OF_THE_JEDI, THE_FORCE_AWAKENS], friends=[{name=C-3PO}, {name=Han Solo}, {name=Leia Organa}, {name=R2-D2}]}, " +
- "{name=Han Solo, appearsIn=[A_NEW_HOPE, EMPIRE_STRIKES_BACK, RETURN_OF_THE_JEDI, THE_FORCE_AWAKENS], friends=[{name=Leia Organa}, {name=Luke Skywalker}, {name=R2-D2}]}" +
+ "{name=Luke Skywalker, appearsIn=[A_NEW_HOPE, EMPIRE_STRIKES_BACK, RETURN_OF_THE_JEDI, THE_FORCE_AWAKENS], friends=[{name=C-3PO}, {name=Han Solo}, {name=Leia Organa}, {name=R2-D2}]}" +
"]}]}}";
//when:
@@ -672,9 +673,10 @@ public void queryWithTypenameDeepNesting() {
String expected =
"{Droid={name=R2-D2, friends=[" +
+ "{name=Han Solo, appearsIn=[A_NEW_HOPE, EMPIRE_STRIKES_BACK, RETURN_OF_THE_JEDI, THE_FORCE_AWAKENS], friends=[{name=Leia Organa, __typename=Character}, {name=Luke Skywalker, __typename=Character}, {name=R2-D2, __typename=Character}], __typename=Character}, " +
"{name=Leia Organa, appearsIn=[A_NEW_HOPE, EMPIRE_STRIKES_BACK, RETURN_OF_THE_JEDI, THE_FORCE_AWAKENS], friends=[{name=C-3PO, __typename=Character}, {name=Han Solo, __typename=Character}, {name=Luke Skywalker, __typename=Character}, {name=R2-D2, __typename=Character}], __typename=Character}, " +
- "{name=Luke Skywalker, appearsIn=[A_NEW_HOPE, EMPIRE_STRIKES_BACK, RETURN_OF_THE_JEDI, THE_FORCE_AWAKENS], friends=[{name=C-3PO, __typename=Character}, {name=Han Solo, __typename=Character}, {name=Leia Organa, __typename=Character}, {name=R2-D2, __typename=Character}], __typename=Character}, " +
- "{name=Han Solo, appearsIn=[A_NEW_HOPE, EMPIRE_STRIKES_BACK, RETURN_OF_THE_JEDI, THE_FORCE_AWAKENS], friends=[{name=Leia Organa, __typename=Character}, {name=Luke Skywalker, __typename=Character}, {name=R2-D2, __typename=Character}], __typename=Character}], __typename=Droid}}";
+ "{name=Luke Skywalker, appearsIn=[A_NEW_HOPE, EMPIRE_STRIKES_BACK, RETURN_OF_THE_JEDI, THE_FORCE_AWAKENS], friends=[{name=C-3PO, __typename=Character}, {name=Han Solo, __typename=Character}, {name=Leia Organa, __typename=Character}, {name=R2-D2, __typename=Character}], __typename=Character}" +
+ "], __typename=Droid}}";
//when:
Object result = executor.execute(query).getData();
diff --git a/tests/boot-starter/pom.xml b/tests/boot-starter/pom.xml
index 86bb002e1..cbe426767 100644
--- a/tests/boot-starter/pom.xml
+++ b/tests/boot-starter/pom.xml
@@ -6,7 +6,7 @@
com.introproventures
graphql-jpa-query-tests
- 1.0.1-SNAPSHOT
+ 1.1.0-SNAPSHOT
../pom.xml
diff --git a/tests/models/books/pom.xml b/tests/models/books/pom.xml
index 5c3da8f12..0a4b9feac 100644
--- a/tests/models/books/pom.xml
+++ b/tests/models/books/pom.xml
@@ -3,7 +3,7 @@
com.introproventures
graphql-jpa-query-test-models
- 1.0.1-SNAPSHOT
+ 1.1.0-SNAPSHOT
../pom.xml
diff --git a/tests/models/pom.xml b/tests/models/pom.xml
index 159cc172d..1bcfa99a9 100644
--- a/tests/models/pom.xml
+++ b/tests/models/pom.xml
@@ -4,7 +4,7 @@
com.introproventures
graphql-jpa-query-tests
- 1.0.1-SNAPSHOT
+ 1.1.0-SNAPSHOT
../pom.xml
diff --git a/tests/models/starwars/pom.xml b/tests/models/starwars/pom.xml
index c24c63554..45f92742d 100644
--- a/tests/models/starwars/pom.xml
+++ b/tests/models/starwars/pom.xml
@@ -3,7 +3,7 @@
com.introproventures
graphql-jpa-query-test-models
- 1.0.1-SNAPSHOT
+ 1.1.0-SNAPSHOT
../pom.xml
diff --git a/tests/multiple-datasources/pom.xml b/tests/multiple-datasources/pom.xml
index 995643d3d..dd9a9ec6c 100644
--- a/tests/multiple-datasources/pom.xml
+++ b/tests/multiple-datasources/pom.xml
@@ -6,7 +6,7 @@
com.introproventures
graphql-jpa-query-tests
- 1.0.1-SNAPSHOT
+ 1.1.0-SNAPSHOT
../pom.xml
diff --git a/tests/pom.xml b/tests/pom.xml
index e7648282f..5cd345b52 100644
--- a/tests/pom.xml
+++ b/tests/pom.xml
@@ -4,7 +4,7 @@
com.introproventures
graphql-jpa-query-build
- 1.0.1-SNAPSHOT
+ 1.1.0-SNAPSHOT
../build
diff --git a/tests/relay/pom.xml b/tests/relay/pom.xml
index 10771f7fb..25a21d50a 100644
--- a/tests/relay/pom.xml
+++ b/tests/relay/pom.xml
@@ -7,7 +7,7 @@
com.introproventures
graphql-jpa-query-tests
- 1.0.1-SNAPSHOT
+ 1.1.0-SNAPSHOT
../pom.xml
diff --git a/tests/starwars/pom.xml b/tests/starwars/pom.xml
index a2ff865e0..2673ffe65 100644
--- a/tests/starwars/pom.xml
+++ b/tests/starwars/pom.xml
@@ -6,7 +6,7 @@
com.introproventures
graphql-jpa-query-tests
- 1.0.1-SNAPSHOT
+ 1.1.0-SNAPSHOT
../pom.xml
diff --git a/tests/web/pom.xml b/tests/web/pom.xml
index 0d947e874..2ec7d0630 100644
--- a/tests/web/pom.xml
+++ b/tests/web/pom.xml
@@ -4,7 +4,7 @@
com.introproventures
graphql-jpa-query-tests
- 1.0.1-SNAPSHOT
+ 1.1.0-SNAPSHOT
../pom.xml
diff --git a/web/pom.xml b/web/pom.xml
index 1a1a46a5a..d42d83b5d 100644
--- a/web/pom.xml
+++ b/web/pom.xml
@@ -3,7 +3,7 @@
com.introproventures
graphql-jpa-query-build
- 1.0.1-SNAPSHOT
+ 1.1.0-SNAPSHOT
../build
graphql-jpa-query-web