From 231ff105c8e0f9fdbaa2cec4c8cf72552adbd5c2 Mon Sep 17 00:00:00 2001 From: Wu Sheng Date: Mon, 3 Sep 2018 16:33:10 +0800 Subject: [PATCH] Bind v6 query to query-protocol git repo. --- .gitmodules | 3 +++ .../oap/query/graphql/GraphQLQueryProvider.java | 14 +++++++------- .../src/main/resources/query-protocol | 1 + 3 files changed, 11 insertions(+), 7 deletions(-) create mode 160000 oap-server/server-query-plugin/query-graphql-plugin/src/main/resources/query-protocol diff --git a/.gitmodules b/.gitmodules index 050e4c2652..ed908a8b90 100644 --- a/.gitmodules +++ b/.gitmodules @@ -4,3 +4,6 @@ [submodule "apm-protocol/apm-network/src/main/proto"] path = apm-protocol/apm-network/src/main/proto url = https://github.com/apache/incubator-skywalking-data-collect-protocol.git +[submodule "oap-server/server-query-plugin/query-graphql-plugin/src/main/resources/query-protocol"] + path = oap-server/server-query-plugin/query-graphql-plugin/src/main/resources/query-protocol + url = https://github.com/apache/incubator-skywalking-query-protocol.git diff --git a/oap-server/server-query-plugin/query-graphql-plugin/src/main/java/org/apache/skywalking/oap/query/graphql/GraphQLQueryProvider.java b/oap-server/server-query-plugin/query-graphql-plugin/src/main/java/org/apache/skywalking/oap/query/graphql/GraphQLQueryProvider.java index 7696dfbd9d..b2c6740a72 100644 --- a/oap-server/server-query-plugin/query-graphql-plugin/src/main/java/org/apache/skywalking/oap/query/graphql/GraphQLQueryProvider.java +++ b/oap-server/server-query-plugin/query-graphql-plugin/src/main/java/org/apache/skywalking/oap/query/graphql/GraphQLQueryProvider.java @@ -63,19 +63,19 @@ public class GraphQLQueryProvider extends ModuleProvider { @Override public void prepare() throws ServiceNotProvidedException, ModuleStartException { GraphQLSchema schema = SchemaParser.newParser() - .file("ui-graphql-v6/common.graphqls") + .file("query-protocol/common.graphqls") .resolvers(new Query(), new Mutation()) - .file("ui-graphql-v6/metadata.graphqls") + .file("query-protocol/metadata.graphqls") .resolvers(new MetadataQuery()) - .file("ui-graphql-v6/metric.graphqls") + .file("query-protocol/metric.graphqls") .resolvers(new MetricQuery()) - .file("ui-graphql-v6/topology.graphqls") + .file("query-protocol/topology.graphqls") .resolvers(new TopologyQuery()) - .file("ui-graphql-v6/trace.graphqls") + .file("query-protocol/trace.graphqls") .resolvers(new TraceQuery()) - .file("ui-graphql-v6/aggregation.graphqls") + .file("query-protocol/aggregation.graphqls") .resolvers(new AggregationQuery()) - .file("ui-graphql-v6/alarm.graphqls") + .file("query-protocol/alarm.graphqls") .resolvers(new AlarmQuery()) .build() .makeExecutableSchema(); diff --git a/oap-server/server-query-plugin/query-graphql-plugin/src/main/resources/query-protocol b/oap-server/server-query-plugin/query-graphql-plugin/src/main/resources/query-protocol new file mode 160000 index 0000000000..ebbeb721d9 --- /dev/null +++ b/oap-server/server-query-plugin/query-graphql-plugin/src/main/resources/query-protocol @@ -0,0 +1 @@ +Subproject commit ebbeb721d95bba8ee63bc2e706e877ee3a56433e -- GitLab