diff --git a/oap-server/server-query-plugin/query-graphql-plugin/src/main/java/org/apache/skywalking/oap/query/graphql/GraphQLQueryHandler.java b/oap-server/server-query-plugin/query-graphql-plugin/src/main/java/org/apache/skywalking/oap/query/graphql/GraphQLQueryHandler.java index ae805e42a91da01eb2d0f037a6b40c82600bec89..ad4dcf6d02bc887551341ae4aa4d55d08b1dafb1 100644 --- a/oap-server/server-query-plugin/query-graphql-plugin/src/main/java/org/apache/skywalking/oap/query/graphql/GraphQLQueryHandler.java +++ b/oap-server/server-query-plugin/query-graphql-plugin/src/main/java/org/apache/skywalking/oap/query/graphql/GraphQLQueryHandler.java @@ -30,6 +30,7 @@ import graphql.GraphQLError; import java.io.BufferedReader; import java.io.IOException; import java.io.InputStreamReader; +import java.lang.reflect.Type; import java.util.List; import java.util.Map; import javax.servlet.http.HttpServletRequest; @@ -51,6 +52,8 @@ public class GraphQLQueryHandler extends JettyJsonHandler { private static final String MESSAGE = "message"; private final Gson gson = new Gson(); + private final Type mapOfStringObjectType = new TypeToken>() { + }.getType(); private final String path; @@ -75,8 +78,7 @@ public class GraphQLQueryHandler extends JettyJsonHandler { JsonObject requestJson = gson.fromJson(request.toString(), JsonObject.class); - return execute(requestJson.get(QUERY).getAsString(), gson.fromJson(requestJson.get(VARIABLES), new TypeToken>() { - }.getType())); + return execute(requestJson.get(QUERY).getAsString(), gson.fromJson(requestJson.get(VARIABLES), mapOfStringObjectType)); } private JsonObject execute(String request, Map variables) { diff --git a/pom.xml b/pom.xml index 8682040478753d262d66538ca5cbe10971c4c130..1527fec9a026573a89582706bcc1daef5b16ed4b 100644 --- a/pom.xml +++ b/pom.xml @@ -17,7 +17,8 @@ ~ --> - + 4.0.0 org.apache.skywalking @@ -82,7 +83,6 @@ UTF-8 1.8 - 2.11.7 1.6.4 6.18 4.12 @@ -114,13 +114,11 @@ junit junit - ${junit.version} test org.mockito mockito-all - ${mockito-all.version} test @@ -140,13 +138,13 @@ junit junit - 4.12 + ${junit.version} test org.mockito mockito-all - 1.10.19 + ${mockito-all.version} test