未验证 提交 2c8504a3 编写于 作者: K kezhenxu94 提交者: GitHub

Bump up GraphQL related dependencies to latest versions (#8446)

上级 1eacba86
...@@ -33,6 +33,7 @@ Release Notes. ...@@ -33,6 +33,7 @@ Release Notes.
* Adjust e2e case for V9 core. * Adjust e2e case for V9 core.
* Support ZGC GC time and count metric collecting. * Support ZGC GC time and count metric collecting.
* Sync proto buffers files from upstream Envoy (Related to https://github.com/envoyproxy/envoy/pull/18955). * Sync proto buffers files from upstream Envoy (Related to https://github.com/envoyproxy/envoy/pull/18955).
* Bump up GraphQL related dependencies to latest versions.
#### UI #### UI
......
...@@ -267,13 +267,17 @@ The text of each license is the standard Apache 2.0 license. ...@@ -267,13 +267,17 @@ The text of each license is the standard Apache 2.0 license.
jackson-core 2.12.2: https://github.com/FasterXML/jackson-core, Apache 2.0 jackson-core 2.12.2: https://github.com/FasterXML/jackson-core, Apache 2.0
jackson-databind 2.12.2: https://github.com/FasterXML/jackson-databind, Apache 2.0 jackson-databind 2.12.2: https://github.com/FasterXML/jackson-databind, Apache 2.0
jackson-datatype-jdk8 2.9.5: https://github.com/FasterXML/jackson-modules-java8/tree/jackson-modules-java8-2.8.8, Apache 2.0 jackson-datatype-jdk8 2.9.5: https://github.com/FasterXML/jackson-modules-java8/tree/jackson-modules-java8-2.8.8, Apache 2.0
jackson-module-kotlin 2.8.8: http://kotlinlang.org, Apache 2.0 jackson-module-kotlin 2.13.1: http://kotlinlang.org, Apache 2.0
jackson-module-afterburner 2.12.2: https://github.com/FasterXML/jackson-modules-base, Apache 2.0 jackson-module-afterburner 2.12.2: https://github.com/FasterXML/jackson-modules-base, Apache 2.0
java-dataloader 2.0.1: https://github.com/graphql-java/java-dataloader, Apache 2.0 java-dataloader 3.1.0: https://github.com/graphql-java/java-dataloader, Apache 2.0
kotlin-reflect 1.1.1: http://kotlinlang.org, Apache 2.0 kotlin-reflect 1.1.1: http://kotlinlang.org, Apache 2.0
kotlin-stdlib 1.1.60: http://kotlinlang.org, Apache 2.0 kotlin-stdlib 1.1.60: http://kotlinlang.org, Apache 2.0
kotlin-stdlib-common 1.1.60: http://kotlinlang.org, Apache 2.0
kotlin-stdlib-jdk7-1.5.0 1.1.60: http://kotlinlang.org, Apache 2.0
kotlin-stdlib-jdk8-1.5.0 1.1.60: http://kotlinlang.org, Apache 2.0
kotlinx coroutines 1.5.0: https://github.com/Kotlin/kotlinx.coroutines, Apache 2.0
archaius-core 0.7.4: https://github.com/Netflix/archaius, Apache 2.0 archaius-core 0.7.4: https://github.com/Netflix/archaius, Apache 2.0
classmate 1.3.1: https://github.com/FasterXML/java-classmate, Apache 2.0 classmate 1.5.1: https://github.com/FasterXML/java-classmate, Apache 2.0
hibernate-validator 5.3.6.Final: https://github.com/hibernate/hibernate-validator, Apache 2.0 hibernate-validator 5.3.6.Final: https://github.com/hibernate/hibernate-validator, Apache 2.0
hystrix 1.5.12: https://github.com/Netflix/Hystrix, Apache 2.0 hystrix 1.5.12: https://github.com/Netflix/Hystrix, Apache 2.0
javax.inject 1: http://central.maven.org/maven2/javax/inject/javax.inject/1/javax.inject-1.pom, Apache 2.0 javax.inject 1: http://central.maven.org/maven2/javax/inject/javax.inject/1/javax.inject-1.pom, Apache 2.0
...@@ -366,10 +370,9 @@ The following components are provided under a BSD license. See project link for ...@@ -366,10 +370,9 @@ The following components are provided under a BSD license. See project link for
The text of each license is also included at licenses/LICENSE-[project].txt. The text of each license is also included at licenses/LICENSE-[project].txt.
asm 9.0:https://gitlab.ow2.org , BSD-3-Clause asm 9.0:https://gitlab.ow2.org , BSD-3-Clause
antlr4-runtime 4.5.1: http://www.antlr.org/license.html, BSD-3-Clause antlr4-runtime 4.9.2: http://www.antlr.org/license.html, BSD-3-Clause
Google: protobuf-java 3.19.2: https://github.com/google/protobuf/blob/master/java/pom.xml , BSD-3-Clause Google: protobuf-java 3.19.2: https://github.com/google/protobuf/blob/master/java/pom.xml , BSD-3-Clause
Google: protobuf-java-util 3.19.2: https://github.com/google/protobuf/blob/master/java/pom.xml , BSD-3-Clause Google: protobuf-java-util 3.19.2: https://github.com/google/protobuf/blob/master/java/pom.xml , BSD-3-Clause
reflectasm 1.11.7: https://github.com/EsotericSoftware/reflectasm , BSD-3-Clause
zstd-jni 1.4.3-1: https://github.com/luben/zstd-jni, BSD-3-Clause zstd-jni 1.4.3-1: https://github.com/luben/zstd-jni, BSD-3-Clause
postgresql 42.2.18: https://jdbc.postgresql.org/about/license.html, BSD-2-Clause postgresql 42.2.18: https://jdbc.postgresql.org/about/license.html, BSD-2-Clause
......
...@@ -910,3 +910,20 @@ This product includes software developed at CoreOS, Inc. ...@@ -910,3 +910,20 @@ This product includes software developed at CoreOS, Inc.
(http://www.coreos.com/). (http://www.coreos.com/).
=========================================================================== ===========================================================================
------
===========================================================================
graphql-java-tools Notice
===========================================================================
Copyright (C) 2017, Cox Automotive, Inc.
All rights reserved.
Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
===========================================================================
Copyright (c) 2008, Nathan Sweet
All rights reserved.
Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met:
* Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer.
* Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution.
* Neither the name of Esoteric Software nor the names of its contributors may be used to endorse or promote products derived from this software without specific prior written permission.
THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
\ No newline at end of file
...@@ -30,8 +30,9 @@ ...@@ -30,8 +30,9 @@
<properties> <properties>
<slf4j.version>1.7.30</slf4j.version> <slf4j.version>1.7.30</slf4j.version>
<log4j.version>2.17.1</log4j.version> <log4j.version>2.17.1</log4j.version>
<graphql-java-tools.version>5.2.3</graphql-java-tools.version> <graphql-java-tools.version>12.0.2</graphql-java-tools.version>
<graphql-java.version>8.0</graphql-java.version> <graphql-java.version>17.3</graphql-java.version>
<graphql-java-extended-scalars.version>17.0</graphql-java-extended-scalars.version>
<okhttp.version>3.14.9</okhttp.version> <okhttp.version>3.14.9</okhttp.version>
<httpclient.version>4.5.13</httpclient.version> <httpclient.version>4.5.13</httpclient.version>
<h2.version>2.0.206</h2.version> <h2.version>2.0.206</h2.version>
...@@ -62,7 +63,7 @@ ...@@ -62,7 +63,7 @@
<etcd4j.version>2.18.0</etcd4j.version> <etcd4j.version>2.18.0</etcd4j.version>
<netty.version>4.1.68.Final</netty.version> <netty.version>4.1.68.Final</netty.version>
<jackson-module-afterburner.version>2.12.2</jackson-module-afterburner.version> <jackson-module-afterburner.version>2.12.2</jackson-module-afterburner.version>
<antlr.version>4.7.1</antlr.version> <antlr.version>4.9.2</antlr.version>
<freemarker.version>2.3.28</freemarker.version> <freemarker.version>2.3.28</freemarker.version>
<javaassist.version>3.25.0-GA</javaassist.version> <javaassist.version>3.25.0-GA</javaassist.version>
<vavr.version>0.10.3</vavr.version> <vavr.version>0.10.3</vavr.version>
...@@ -116,7 +117,7 @@ ...@@ -116,7 +117,7 @@
<version>${log4j.version}</version> <version>${log4j.version}</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>com.graphql-java</groupId> <groupId>com.graphql-java-kickstart</groupId>
<artifactId>graphql-java-tools</artifactId> <artifactId>graphql-java-tools</artifactId>
<version>${graphql-java-tools.version}</version> <version>${graphql-java-tools.version}</version>
</dependency> </dependency>
...@@ -125,6 +126,11 @@ ...@@ -125,6 +126,11 @@
<artifactId>graphql-java</artifactId> <artifactId>graphql-java</artifactId>
<version>${graphql-java.version}</version> <version>${graphql-java.version}</version>
</dependency> </dependency>
<dependency>
<groupId>com.graphql-java</groupId>
<artifactId>graphql-java-extended-scalars</artifactId>
<version>${graphql-java-extended-scalars.version}</version>
</dependency>
<dependency> <dependency>
<groupId>com.google.code.gson</groupId> <groupId>com.google.code.gson</groupId>
<artifactId>gson</artifactId> <artifactId>gson</artifactId>
......
...@@ -28,7 +28,7 @@ ...@@ -28,7 +28,7 @@
<artifactId>oal-grammar</artifactId> <artifactId>oal-grammar</artifactId>
<properties> <properties>
<antlr.version>4.7.1</antlr.version> <antlr.version>4.9.2</antlr.version>
</properties> </properties>
<dependencies> <dependencies>
......
...@@ -48,9 +48,13 @@ ...@@ -48,9 +48,13 @@
<artifactId>graphql-java</artifactId> <artifactId>graphql-java</artifactId>
</dependency> </dependency>
<dependency> <dependency>
<groupId>com.graphql-java</groupId> <groupId>com.graphql-java-kickstart</groupId>
<artifactId>graphql-java-tools</artifactId> <artifactId>graphql-java-tools</artifactId>
</dependency> </dependency>
<dependency>
<groupId>com.graphql-java</groupId>
<artifactId>graphql-java-extended-scalars</artifactId>
</dependency>
<dependency> <dependency>
<groupId>com.google.code.gson</groupId> <groupId>com.google.code.gson</groupId>
<artifactId>gson</artifactId> <artifactId>gson</artifactId>
......
...@@ -81,10 +81,11 @@ public class GraphQLQueryHandler extends JettyJsonHandler { ...@@ -81,10 +81,11 @@ public class GraphQLQueryHandler extends JettyJsonHandler {
private JsonObject execute(String request, Map<String, Object> variables) { private JsonObject execute(String request, Map<String, Object> variables) {
try { try {
ExecutionInput executionInput = ExecutionInput.newExecutionInput() final ExecutionInput.Builder queryBuilder = ExecutionInput.newExecutionInput().query(request);
.query(request) if (CollectionUtils.isNotEmpty(variables)) {
.variables(variables) queryBuilder.variables(variables);
.build(); }
final ExecutionInput executionInput = queryBuilder.build();
ExecutionResult executionResult = graphQL.execute(executionInput); ExecutionResult executionResult = graphQL.execute(executionInput);
LOGGER.debug("Execution result is {}", executionResult); LOGGER.debug("Execution result is {}", executionResult);
Object data = executionResult.getData(); Object data = executionResult.getData();
......
...@@ -18,8 +18,9 @@ ...@@ -18,8 +18,9 @@
package org.apache.skywalking.oap.query.graphql; package org.apache.skywalking.oap.query.graphql;
import com.coxautodev.graphql.tools.SchemaParser;
import graphql.GraphQL; import graphql.GraphQL;
import graphql.kickstart.tools.SchemaParser;
import graphql.scalars.ExtendedScalars;
import graphql.schema.GraphQLSchema; import graphql.schema.GraphQLSchema;
import org.apache.skywalking.oap.query.graphql.resolver.AggregationQuery; import org.apache.skywalking.oap.query.graphql.resolver.AggregationQuery;
import org.apache.skywalking.oap.query.graphql.resolver.AlarmQuery; import org.apache.skywalking.oap.query.graphql.resolver.AlarmQuery;
...@@ -115,6 +116,7 @@ public class GraphQLQueryProvider extends ModuleProvider { ...@@ -115,6 +116,7 @@ public class GraphQLQueryProvider extends ModuleProvider {
.resolvers(new EventQuery(getManager())) .resolvers(new EventQuery(getManager()))
.file("query-protocol/metadata-v2.graphqls") .file("query-protocol/metadata-v2.graphqls")
.resolvers(new MetadataQueryV2(getManager())) .resolvers(new MetadataQueryV2(getManager()))
.scalars(ExtendedScalars.GraphQLLong)
.build() .build()
.makeExecutableSchema(); .makeExecutableSchema();
this.graphQL = GraphQL.newGraphQL(schema).build(); this.graphQL = GraphQL.newGraphQL(schema).build();
......
...@@ -18,7 +18,7 @@ ...@@ -18,7 +18,7 @@
package org.apache.skywalking.oap.query.graphql.resolver; package org.apache.skywalking.oap.query.graphql.resolver;
import com.coxautodev.graphql.tools.GraphQLQueryResolver; import graphql.kickstart.tools.GraphQLQueryResolver;
import java.io.IOException; import java.io.IOException;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.List; import java.util.List;
......
...@@ -18,8 +18,7 @@ ...@@ -18,8 +18,7 @@
package org.apache.skywalking.oap.query.graphql.resolver; package org.apache.skywalking.oap.query.graphql.resolver;
import com.coxautodev.graphql.tools.GraphQLQueryResolver; import graphql.kickstart.tools.GraphQLQueryResolver;
import graphql.schema.DataFetchingEnvironment; import graphql.schema.DataFetchingEnvironment;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.List; import java.util.List;
...@@ -99,7 +98,7 @@ public class AlarmQuery implements GraphQLQueryResolver { ...@@ -99,7 +98,7 @@ public class AlarmQuery implements GraphQLQueryResolver {
Alarms alarms = getQueryService().getAlarm( Alarms alarms = getQueryService().getAlarm(
scopeId, keyword, paging, startSecondTB, endSecondTB, tags); scopeId, keyword, paging, startSecondTB, endSecondTB, tags);
final boolean selectEvents = env.getSelectionSet().get().entrySet().stream().anyMatch(it -> it.getKey().contains("/events/")); final boolean selectEvents = env.getSelectionSet().contains("**/events/**");
if (selectEvents) { if (selectEvents) {
return findRelevantEvents(alarms, conditionPrototype); return findRelevantEvents(alarms, conditionPrototype);
......
...@@ -17,7 +17,7 @@ ...@@ -17,7 +17,7 @@
package org.apache.skywalking.oap.query.graphql.resolver; package org.apache.skywalking.oap.query.graphql.resolver;
import com.coxautodev.graphql.tools.GraphQLQueryResolver; import graphql.kickstart.tools.GraphQLQueryResolver;
import java.io.IOException; import java.io.IOException;
import java.util.Optional; import java.util.Optional;
import lombok.RequiredArgsConstructor; import lombok.RequiredArgsConstructor;
......
...@@ -18,7 +18,7 @@ ...@@ -18,7 +18,7 @@
package org.apache.skywalking.oap.query.graphql.resolver; package org.apache.skywalking.oap.query.graphql.resolver;
import com.coxautodev.graphql.tools.GraphQLQueryResolver; import graphql.kickstart.tools.GraphQLQueryResolver;
import org.apache.skywalking.oap.server.core.CoreModule; import org.apache.skywalking.oap.server.core.CoreModule;
import org.apache.skywalking.oap.server.core.query.EventQueryService; import org.apache.skywalking.oap.server.core.query.EventQueryService;
import org.apache.skywalking.oap.server.core.query.type.event.EventQueryCondition; import org.apache.skywalking.oap.server.core.query.type.event.EventQueryCondition;
......
...@@ -18,7 +18,7 @@ ...@@ -18,7 +18,7 @@
package org.apache.skywalking.oap.query.graphql.resolver; package org.apache.skywalking.oap.query.graphql.resolver;
import com.coxautodev.graphql.tools.GraphQLQueryResolver; import graphql.kickstart.tools.GraphQLQueryResolver;
import java.util.Optional; import java.util.Optional;
import lombok.RequiredArgsConstructor; import lombok.RequiredArgsConstructor;
import org.apache.skywalking.oap.server.core.query.type.HealthStatus; import org.apache.skywalking.oap.server.core.query.type.HealthStatus;
......
...@@ -18,7 +18,7 @@ ...@@ -18,7 +18,7 @@
package org.apache.skywalking.oap.query.graphql.resolver; package org.apache.skywalking.oap.query.graphql.resolver;
import com.coxautodev.graphql.tools.GraphQLQueryResolver; import graphql.kickstart.tools.GraphQLQueryResolver;
import java.io.IOException; import java.io.IOException;
import org.apache.skywalking.oap.server.core.CoreModule; import org.apache.skywalking.oap.server.core.CoreModule;
import org.apache.skywalking.oap.server.core.UnexpectedException; import org.apache.skywalking.oap.server.core.UnexpectedException;
......
...@@ -18,7 +18,7 @@ ...@@ -18,7 +18,7 @@
package org.apache.skywalking.oap.query.graphql.resolver; package org.apache.skywalking.oap.query.graphql.resolver;
import com.coxautodev.graphql.tools.GraphQLQueryResolver; import graphql.kickstart.tools.GraphQLQueryResolver;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Arrays; import java.util.Arrays;
import java.util.List; import java.util.List;
......
...@@ -18,7 +18,7 @@ ...@@ -18,7 +18,7 @@
package org.apache.skywalking.oap.query.graphql.resolver; package org.apache.skywalking.oap.query.graphql.resolver;
import com.coxautodev.graphql.tools.GraphQLQueryResolver; import graphql.kickstart.tools.GraphQLQueryResolver;
import java.io.IOException; import java.io.IOException;
import java.util.List; import java.util.List;
import java.util.stream.Collectors; import java.util.stream.Collectors;
......
...@@ -18,7 +18,7 @@ ...@@ -18,7 +18,7 @@
package org.apache.skywalking.oap.query.graphql.resolver; package org.apache.skywalking.oap.query.graphql.resolver;
import com.coxautodev.graphql.tools.GraphQLQueryResolver; import graphql.kickstart.tools.GraphQLQueryResolver;
import java.io.IOException; import java.io.IOException;
import java.text.SimpleDateFormat; import java.text.SimpleDateFormat;
import java.util.Date; import java.util.Date;
......
...@@ -18,7 +18,7 @@ ...@@ -18,7 +18,7 @@
package org.apache.skywalking.oap.query.graphql.resolver; package org.apache.skywalking.oap.query.graphql.resolver;
import com.coxautodev.graphql.tools.GraphQLQueryResolver; import graphql.kickstart.tools.GraphQLQueryResolver;
import java.io.IOException; import java.io.IOException;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.List; import java.util.List;
......
...@@ -18,7 +18,7 @@ ...@@ -18,7 +18,7 @@
package org.apache.skywalking.oap.query.graphql.resolver; package org.apache.skywalking.oap.query.graphql.resolver;
import com.coxautodev.graphql.tools.GraphQLQueryResolver; import graphql.kickstart.tools.GraphQLQueryResolver;
import java.io.IOException; import java.io.IOException;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Collections; import java.util.Collections;
......
...@@ -18,7 +18,7 @@ ...@@ -18,7 +18,7 @@
package org.apache.skywalking.oap.query.graphql.resolver; package org.apache.skywalking.oap.query.graphql.resolver;
import com.coxautodev.graphql.tools.GraphQLMutationResolver; import graphql.kickstart.tools.GraphQLMutationResolver;
/** /**
* Root mutation resolver. * Root mutation resolver.
......
...@@ -18,7 +18,7 @@ ...@@ -18,7 +18,7 @@
package org.apache.skywalking.oap.query.graphql.resolver; package org.apache.skywalking.oap.query.graphql.resolver;
import com.coxautodev.graphql.tools.GraphQLMutationResolver; import graphql.kickstart.tools.GraphQLMutationResolver;
import java.io.IOException; import java.io.IOException;
import org.apache.skywalking.oap.server.core.query.input.ProfileTaskCreationRequest; import org.apache.skywalking.oap.server.core.query.input.ProfileTaskCreationRequest;
import org.apache.skywalking.oap.server.core.CoreModule; import org.apache.skywalking.oap.server.core.CoreModule;
......
...@@ -18,7 +18,7 @@ ...@@ -18,7 +18,7 @@
package org.apache.skywalking.oap.query.graphql.resolver; package org.apache.skywalking.oap.query.graphql.resolver;
import com.coxautodev.graphql.tools.GraphQLQueryResolver; import graphql.kickstart.tools.GraphQLQueryResolver;
import org.apache.skywalking.oap.server.core.CoreModule; import org.apache.skywalking.oap.server.core.CoreModule;
import org.apache.skywalking.oap.server.core.query.ProfileTaskQueryService; import org.apache.skywalking.oap.server.core.query.ProfileTaskQueryService;
import org.apache.skywalking.oap.server.core.query.type.BasicTrace; import org.apache.skywalking.oap.server.core.query.type.BasicTrace;
......
...@@ -18,7 +18,7 @@ ...@@ -18,7 +18,7 @@
package org.apache.skywalking.oap.query.graphql.resolver; package org.apache.skywalking.oap.query.graphql.resolver;
import com.coxautodev.graphql.tools.GraphQLQueryResolver; import graphql.kickstart.tools.GraphQLQueryResolver;
import org.apache.skywalking.oap.server.core.version.Version; import org.apache.skywalking.oap.server.core.version.Version;
/** /**
......
...@@ -18,7 +18,7 @@ ...@@ -18,7 +18,7 @@
package org.apache.skywalking.oap.query.graphql.resolver; package org.apache.skywalking.oap.query.graphql.resolver;
import com.coxautodev.graphql.tools.GraphQLQueryResolver; import graphql.kickstart.tools.GraphQLQueryResolver;
import java.io.IOException; import java.io.IOException;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.List; import java.util.List;
......
...@@ -18,7 +18,7 @@ ...@@ -18,7 +18,7 @@
package org.apache.skywalking.oap.query.graphql.resolver; package org.apache.skywalking.oap.query.graphql.resolver;
import com.coxautodev.graphql.tools.GraphQLQueryResolver; import graphql.kickstart.tools.GraphQLQueryResolver;
import java.io.IOException; import java.io.IOException;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.List; import java.util.List;
......
...@@ -18,7 +18,7 @@ ...@@ -18,7 +18,7 @@
package org.apache.skywalking.oap.query.graphql.resolver; package org.apache.skywalking.oap.query.graphql.resolver;
import com.coxautodev.graphql.tools.GraphQLQueryResolver; import graphql.kickstart.tools.GraphQLQueryResolver;
import com.google.common.base.Strings; import com.google.common.base.Strings;
import java.io.IOException; import java.io.IOException;
import org.apache.skywalking.oap.server.core.Const; import org.apache.skywalking.oap.server.core.Const;
......
...@@ -18,8 +18,8 @@ ...@@ -18,8 +18,8 @@
package org.apache.skywalking.oap.query.graphql.resolver; package org.apache.skywalking.oap.query.graphql.resolver;
import com.coxautodev.graphql.tools.GraphQLMutationResolver; import graphql.kickstart.tools.GraphQLMutationResolver;
import com.coxautodev.graphql.tools.GraphQLQueryResolver; import graphql.kickstart.tools.GraphQLQueryResolver;
import java.io.IOException; import java.io.IOException;
import java.util.List; import java.util.List;
import lombok.RequiredArgsConstructor; import lombok.RequiredArgsConstructor;
......
...@@ -3,7 +3,7 @@ HikariCP-3.1.0.jar ...@@ -3,7 +3,7 @@ HikariCP-3.1.0.jar
LatencyUtils-2.0.3.jar LatencyUtils-2.0.3.jar
animal-sniffer-annotations-1.18.jar animal-sniffer-annotations-1.18.jar
annotations-13.0.jar annotations-13.0.jar
antlr4-runtime-4.7.1.jar antlr4-runtime-4.9.2.jar
aopalliance-1.0.jar aopalliance-1.0.jar
apollo-client-1.8.0.jar apollo-client-1.8.0.jar
apollo-core-1.8.0.jar apollo-core-1.8.0.jar
...@@ -15,6 +15,7 @@ bcprov-jdk15on-1.69.jar ...@@ -15,6 +15,7 @@ bcprov-jdk15on-1.69.jar
bcutil-jdk15on-1.69.jar bcutil-jdk15on-1.69.jar
brotli4j-1.6.0.jar brotli4j-1.6.0.jar
checker-qual-2.8.1.jar checker-qual-2.8.1.jar
classmate-1.5.1.jar
client-java-14.0.0.jar client-java-14.0.0.jar
client-java-api-14.0.0.jar client-java-api-14.0.0.jar
client-java-proto-14.0.0.jar client-java-proto-14.0.0.jar
...@@ -40,8 +41,9 @@ failsafe-2.3.4.jar ...@@ -40,8 +41,9 @@ failsafe-2.3.4.jar
failureaccess-1.0.1.jar failureaccess-1.0.1.jar
flatbuffers-java-1.12.0.jar flatbuffers-java-1.12.0.jar
freemarker-2.3.28.jar freemarker-2.3.28.jar
graphql-java-8.0.jar graphql-java-17.3.jar
graphql-java-tools-5.2.3.jar graphql-java-extended-scalars-17.0.jar
graphql-java-tools-12.0.2.jar
groovy-3.0.8.jar groovy-3.0.8.jar
grpc-api-1.43.2.jar grpc-api-1.43.2.jar
grpc-context-1.43.2.jar grpc-context-1.43.2.jar
...@@ -70,8 +72,8 @@ jackson-databind-2.12.2.jar ...@@ -70,8 +72,8 @@ jackson-databind-2.12.2.jar
jackson-datatype-guava-2.9.10.jar jackson-datatype-guava-2.9.10.jar
jackson-datatype-jdk8-2.9.10.jar jackson-datatype-jdk8-2.9.10.jar
jackson-module-afterburner-2.12.2.jar jackson-module-afterburner-2.12.2.jar
jackson-module-kotlin-2.8.8.jar jackson-module-kotlin-2.13.1.jar
java-dataloader-2.0.2.jar java-dataloader-3.1.0.jar
javassist-3.25.0-GA.jar javassist-3.25.0-GA.jar
javax.inject-1.jar javax.inject-1.jar
javax.servlet-api-3.1.0.jar javax.servlet-api-3.1.0.jar
...@@ -90,8 +92,15 @@ joda-time-2.10.5.jar ...@@ -90,8 +92,15 @@ joda-time-2.10.5.jar
jose4j-0.7.9.jar jose4j-0.7.9.jar
jsr305-3.0.2.jar jsr305-3.0.2.jar
kafka-clients-2.4.1.jar kafka-clients-2.4.1.jar
kotlin-reflect-1.1.1.jar kotlin-reflect-1.5.0.jar
kotlin-stdlib-1.1.60.jar kotlin-stdlib-1.5.0.jar
kotlin-stdlib-common-1.5.0.jar
kotlin-stdlib-jdk7-1.5.0.jar
kotlin-stdlib-jdk8-1.5.0.jar
kotlinx-coroutines-core-1.5.0-native-mt.jar
kotlinx-coroutines-core-jvm-1.5.0-native-mt.jar
kotlinx-coroutines-jdk8-1.5.0-native-mt.jar
kotlinx-coroutines-reactive-1.5.0-native-mt.jar
libthrift-0.14.1.jar libthrift-0.14.1.jar
listenablefuture-9999.0-empty-to-avoid-conflict-with-guava.jar listenablefuture-9999.0-empty-to-avoid-conflict-with-guava.jar
log4j-api-2.17.1.jar log4j-api-2.17.1.jar
...@@ -134,7 +143,6 @@ proto-google-common-protos-2.0.1.jar ...@@ -134,7 +143,6 @@ proto-google-common-protos-2.0.1.jar
protobuf-java-3.19.2.jar protobuf-java-3.19.2.jar
protobuf-java-util-3.19.2.jar protobuf-java-util-3.19.2.jar
reactive-streams-1.0.2.jar reactive-streams-1.0.2.jar
reflectasm-1.11.7.jar
retrofit-2.5.0.jar retrofit-2.5.0.jar
service-rpc-0.12.3.jar service-rpc-0.12.3.jar
simpleclient-0.6.0.jar simpleclient-0.6.0.jar
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册