diff --git a/ezyhttp-client/pom.xml b/ezyhttp-client/pom.xml
index 0aa02aa..7d4fe77 100644
--- a/ezyhttp-client/pom.xml
+++ b/ezyhttp-client/pom.xml
@@ -5,7 +5,7 @@
com.tvd12
ezyhttp
- 1.5.3
+ 1.5.4
ezyhttp-client
diff --git a/ezyhttp-core/pom.xml b/ezyhttp-core/pom.xml
index c6659cb..ebd46f5 100644
--- a/ezyhttp-core/pom.xml
+++ b/ezyhttp-core/pom.xml
@@ -5,7 +5,7 @@
com.tvd12
ezyhttp
- 1.5.3
+ 1.5.4
ezyhttp-core
diff --git a/ezyhttp-server-boot/pom.xml b/ezyhttp-server-boot/pom.xml
index d9791c5..8829c28 100644
--- a/ezyhttp-server-boot/pom.xml
+++ b/ezyhttp-server-boot/pom.xml
@@ -5,7 +5,7 @@
com.tvd12
ezyhttp
- 1.5.3
+ 1.5.4
ezyhttp-server-boot
diff --git a/ezyhttp-server-core/pom.xml b/ezyhttp-server-core/pom.xml
index ef6f578..cb8cf3d 100644
--- a/ezyhttp-server-core/pom.xml
+++ b/ezyhttp-server-core/pom.xml
@@ -5,7 +5,7 @@
com.tvd12
ezyhttp
- 1.5.3
+ 1.5.4
ezyhttp-server-core
diff --git a/ezyhttp-server-graphql/pom.xml b/ezyhttp-server-graphql/pom.xml
index a92e7d7..40e5a6a 100644
--- a/ezyhttp-server-graphql/pom.xml
+++ b/ezyhttp-server-graphql/pom.xml
@@ -6,7 +6,7 @@
com.tvd12
ezyhttp
- 1.5.3
+ 1.5.4
ezyhttp-server-graphql
ezyhttp-server-graphql
diff --git a/ezyhttp-server-graphql/src/main/java/com/tvd12/ezyhttp/server/graphql/data/GraphQLDataFilter.java b/ezyhttp-server-graphql/src/main/java/com/tvd12/ezyhttp/server/graphql/data/GraphQLDataFilter.java
index f0a1230..1caa623 100644
--- a/ezyhttp-server-graphql/src/main/java/com/tvd12/ezyhttp/server/graphql/data/GraphQLDataFilter.java
+++ b/ezyhttp-server-graphql/src/main/java/com/tvd12/ezyhttp/server/graphql/data/GraphQLDataFilter.java
@@ -22,23 +22,42 @@ public Map filter(
GraphQLField queryDefinition
) {
Map answer = new HashMap<>();
- Map parentMap = null;
Deque stack = new ArrayDeque<>();
- stack.push(new StackEntry(queryDefinition, data));
+ stack.push(new StackEntry(queryDefinition, data, answer));
+ filterStack(stack);
+ return answer;
+ }
+
+ @SuppressWarnings({"rawtypes"})
+ public List