Skip to content

Commit abb8801

Browse files
committed
Merge remote-tracking branch 'origin/master' into make-get-field-definition-more-efficient
# Conflicts: # src/main/java/graphql/introspection/Introspection.java
2 parents aaa0083 + f4d49c6 commit abb8801

180 files changed

Lines changed: 5845 additions & 2108 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎README.md‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,8 @@ Discuss and ask questions in our Discussions: https://github.com/graphql-java/gr
44

55
This is a [GraphQL](https://github.com/graphql/graphql-spec) Java implementation.
66

7+
Latest build in Maven central: https://repo1.maven.org/maven2/com/graphql-java/graphql-java/
8+
79
[![Build](https://github.com/graphql-java/graphql-java/actions/workflows/master.yml/badge.svg)](https://github.com/graphql-java/graphql-java/actions/workflows/master.yml)
810
[![Latest Release](https://img.shields.io/maven-central/v/com.graphql-java/graphql-java?versionPrefix=21.)](https://maven-badges.herokuapp.com/maven-central/com.graphql-java/graphql-java/)
911
[![Latest Snapshot](https://img.shields.io/maven-central/v/com.graphql-java/graphql-java?label=maven-central%20snapshot&versionPrefix=0)](https://maven-badges.herokuapp.com/maven-central/com.graphql-java/graphql-java/)

‎agent-test/build.gradle‎

Lines changed: 57 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,57 @@
1+
plugins {
2+
id 'java'
3+
}
4+
5+
dependencies {
6+
implementation(rootProject)
7+
implementation("net.bytebuddy:byte-buddy-agent:1.14.12")
8+
9+
testImplementation 'org.junit.jupiter:junit-jupiter:5.10.2'
10+
testRuntimeOnly 'org.junit.platform:junit-platform-launcher'
11+
12+
testImplementation("org.assertj:assertj-core:3.25.3")
13+
14+
}
15+
16+
java {
17+
toolchain {
18+
languageVersion = JavaLanguageVersion.of(11)
19+
}
20+
}
21+
22+
tasks.named('test', Test) {
23+
dependsOn(':agent:shadowJar')
24+
useJUnitPlatform()
25+
26+
maxHeapSize = '4G'
27+
28+
testLogging {
29+
events "passed"
30+
}
31+
}
32+
33+
34+
repositories {
35+
mavenCentral()
36+
mavenLocal()
37+
}
38+
39+
40+
java {
41+
toolchain {
42+
languageVersion = JavaLanguageVersion.of(11)
43+
}
44+
}
45+
46+
47+
jar {
48+
manifest {
49+
attributes(
50+
'Agent-Class': 'graphql.agent.GraphQLJavaAgent',
51+
'Can-Redefine-Classes': 'true',
52+
'Can-Retransform-Classes': 'true',
53+
'Premain-Class': 'graphql.agent.GraphQLJavaAgent'
54+
)
55+
}
56+
}
57+
Lines changed: 40 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,40 @@
1+
package graphql;
2+
3+
import graphql.agent.result.ExecutionTrackingResult;
4+
import graphql.schema.GraphQLSchema;
5+
import graphql.schema.idl.RuntimeWiring;
6+
import graphql.schema.idl.SchemaGenerator;
7+
import graphql.schema.idl.SchemaParser;
8+
import graphql.schema.idl.TypeDefinitionRegistry;
9+
10+
/**
11+
* Used for testing loading the agent on startup.
12+
* See StartAgentOnStartupTest
13+
*/
14+
public class GraphQLApp {
15+
16+
public static void main(String[] args) {
17+
String schema = "type Query { hello: String }";
18+
TypeDefinitionRegistry typeDefinitionRegistry = new SchemaParser().parse(schema);
19+
RuntimeWiring runtimeWiring = RuntimeWiring.newRuntimeWiring()
20+
.type("Query", builder -> builder.dataFetcher("hello", environment -> "world"))
21+
.build();
22+
GraphQLSchema graphQLSchema = new SchemaGenerator().makeExecutableSchema(typeDefinitionRegistry, runtimeWiring);
23+
GraphQL graphQL = GraphQL.newGraphQL(graphQLSchema).build();
24+
ExecutionInput executionInput = ExecutionInput.newExecutionInput().query("{ hello alias: hello alias2: hello }").build();
25+
GraphQLContext graphQLContext = executionInput.getGraphQLContext();
26+
ExecutionResult executionResult = graphQL.execute(executionInput);
27+
System.out.println(executionResult.getData().toString());
28+
ExecutionTrackingResult executionTrackingResult = graphQLContext.get(ExecutionTrackingResult.EXECUTION_TRACKING_KEY);
29+
if (executionTrackingResult == null) {
30+
System.out.println("No tracking data found");
31+
System.exit(1);
32+
}
33+
if (executionTrackingResult.timePerPath.size() != 3) {
34+
System.out.println("Expected 3 paths, got " + executionTrackingResult.timePerPath.size());
35+
System.exit(1);
36+
}
37+
System.out.println("Successfully tracked execution");
38+
System.exit(0);
39+
}
40+
}
Lines changed: 72 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,72 @@
1+
package graphql.test;
2+
3+
import graphql.agent.result.ExecutionTrackingResult;
4+
import org.junit.jupiter.api.AfterAll;
5+
import org.junit.jupiter.api.BeforeAll;
6+
import org.junit.jupiter.api.Test;
7+
8+
import java.util.Collections;
9+
import java.util.List;
10+
import java.util.Map;
11+
12+
import static org.assertj.core.api.Assertions.assertThat;
13+
14+
public class AgentTest {
15+
16+
@BeforeAll
17+
static void init() {
18+
LoadAgent.loadIntoCurrentJVM();
19+
}
20+
21+
@AfterAll
22+
static void cleanup() {
23+
}
24+
25+
@Test
26+
void test() {
27+
ExecutionTrackingResult executionTrackingResult = TestQuery.executeQuery();
28+
assertThat(executionTrackingResult.dataFetcherCount()).isEqualTo(5);
29+
assertThat(executionTrackingResult.getTime("/issues")).isGreaterThan(100);
30+
assertThat(executionTrackingResult.getDfResultTypes("/issues"))
31+
.isEqualTo(ExecutionTrackingResult.DFResultType.DONE_OK);
32+
33+
verifyAgentDataIsEmpty();
34+
35+
}
36+
37+
@Test
38+
void testBatchLoader() {
39+
ExecutionTrackingResult executionTrackingResult = TestQuery.executeBatchedQuery();
40+
assertThat(executionTrackingResult.dataFetcherCount()).isEqualTo(9);
41+
assertThat(executionTrackingResult.getTime("/issues")).isGreaterThan(100);
42+
assertThat(executionTrackingResult.getDfResultTypes("/issues[0]/author"))
43+
.isEqualTo(ExecutionTrackingResult.DFResultType.PENDING);
44+
assertThat(executionTrackingResult.getDfResultTypes("/issues[1]/author"))
45+
.isEqualTo(ExecutionTrackingResult.DFResultType.PENDING);
46+
47+
assertThat(executionTrackingResult.getDataLoaderNames()).isEqualTo(Collections.singletonList("userLoader"));
48+
49+
assertThat(executionTrackingResult.dataLoaderNameToBatchCall).hasSize(1);
50+
List<ExecutionTrackingResult.BatchLoadingCall> userLoaderCalls = executionTrackingResult.dataLoaderNameToBatchCall.get("userLoader");
51+
assertThat(userLoaderCalls).hasSize(1);
52+
ExecutionTrackingResult.BatchLoadingCall batchLoadingCall = userLoaderCalls.get(0);
53+
54+
assertThat(batchLoadingCall.keyCount).isEqualTo(2);
55+
56+
verifyAgentDataIsEmpty();
57+
}
58+
59+
private void verifyAgentDataIsEmpty() {
60+
try {
61+
Class<?> agent = Class.forName("graphql.agent.GraphQLJavaAgent");
62+
Map executionIdToData = (Map) agent.getField("executionIdToData").get(null);
63+
Map dataLoaderToExecutionId = (Map) agent.getField("dataLoaderToExecutionId").get(null);
64+
assertThat(executionIdToData).isEmpty();
65+
assertThat(dataLoaderToExecutionId).isEmpty();
66+
67+
} catch (Exception e) {
68+
throw new RuntimeException(e);
69+
}
70+
71+
}
72+
}
Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
package graphql.test;
2+
3+
import net.bytebuddy.agent.ByteBuddyAgent;
4+
5+
import java.io.File;
6+
7+
8+
public class LoadAgent {
9+
10+
11+
public static void loadIntoCurrentJVM() {
12+
ByteBuddyAgent.attach(new File("../agent/build/libs/agent.jar"), String.valueOf(ProcessHandle.current().pid()));
13+
}
14+
15+
}
Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,23 @@
1+
package graphql.test;
2+
3+
import org.junit.jupiter.api.Test;
4+
5+
import java.io.IOException;
6+
7+
import static org.assertj.core.api.Assertions.assertThat;
8+
9+
public class StartAgentOnStartupTest {
10+
11+
12+
@Test
13+
void testAgentCanBeLoadedAtStartup() throws IOException, InterruptedException {
14+
// we use the classpath of the current test
15+
String classPath = System.getProperty("java.class.path");
16+
ProcessBuilder processBuilder = new ProcessBuilder("java", "-javaagent:../agent/build/libs/agent.jar", "-classpath", classPath, "graphql.GraphQLApp");
17+
Process process = processBuilder.start();
18+
process.getErrorStream().transferTo(System.err);
19+
process.getInputStream().transferTo(System.out);
20+
int i = process.waitFor();
21+
assertThat(i).isZero();
22+
}
23+
}
Lines changed: 102 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,102 @@
1+
package graphql.test;
2+
3+
import graphql.ExecutionInput;
4+
import graphql.ExecutionResult;
5+
import graphql.GraphQL;
6+
import graphql.agent.result.ExecutionTrackingResult;
7+
import graphql.schema.DataFetcher;
8+
import graphql.schema.GraphQLSchema;
9+
import graphql.schema.idl.RuntimeWiring;
10+
import graphql.schema.idl.SchemaGenerator;
11+
import graphql.schema.idl.SchemaParser;
12+
import graphql.schema.idl.TypeDefinitionRegistry;
13+
import org.assertj.core.api.Assertions;
14+
import org.dataloader.BatchLoader;
15+
import org.dataloader.DataLoader;
16+
import org.dataloader.DataLoaderFactory;
17+
import org.dataloader.DataLoaderRegistry;
18+
19+
import java.util.List;
20+
import java.util.Map;
21+
import java.util.concurrent.CompletableFuture;
22+
23+
public class TestQuery {
24+
25+
26+
static ExecutionTrackingResult executeQuery() {
27+
String sdl = "type Query{issues: [Issue]} type Issue {id: ID, title: String}";
28+
TypeDefinitionRegistry typeDefinitionRegistry = new SchemaParser().parse(sdl);
29+
DataFetcher<List> issuesDF = (env) -> {
30+
return List.of(
31+
Map.of("id", "1", "title", "issue-1"),
32+
Map.of("id", "2", "title", "issue-2"));
33+
};
34+
35+
RuntimeWiring runtimeWiring = RuntimeWiring.newRuntimeWiring()
36+
.type("Query", builder -> builder.dataFetcher("issues", issuesDF))
37+
.build();
38+
GraphQLSchema graphQLSchema = new SchemaGenerator().makeExecutableSchema(typeDefinitionRegistry, runtimeWiring);
39+
40+
GraphQL graphQL = GraphQL.newGraphQL(graphQLSchema).build();
41+
42+
ExecutionInput executionInput = ExecutionInput.newExecutionInput().query("{issues{id title}}").build();
43+
ExecutionResult result = graphQL.execute(executionInput);
44+
Assertions.assertThat(result.getErrors()).isEmpty();
45+
ExecutionTrackingResult trackingResult = executionInput.getGraphQLContext().get(ExecutionTrackingResult.EXECUTION_TRACKING_KEY);
46+
return trackingResult;
47+
}
48+
49+
static ExecutionTrackingResult executeBatchedQuery() {
50+
String sdl = "type Query{issues: [Issue]} " +
51+
"type Issue {id: ID, author: User}" +
52+
"type User {id: ID, name: String}";
53+
54+
DataFetcher<List> issuesDF = (env) -> List.of(
55+
Map.of("id", "1", "title", "issue-1", "authorId", "user-1"),
56+
Map.of("id", "2", "title", "issue-2", "authorId", "user-2"));
57+
58+
BatchLoader<String, Map> userBatchLoader = keys -> {
59+
// System.out.println("batch users with keys: " + keys);
60+
return CompletableFuture.supplyAsync(() -> {
61+
try {
62+
Thread.sleep(100);
63+
} catch (InterruptedException e) {
64+
throw new RuntimeException(e);
65+
}
66+
return List.of(
67+
Map.of("id", "user-1", "name", "Foo-1"),
68+
Map.of("id", "user-2", "name", "Foo-2")
69+
);
70+
});
71+
};
72+
DataLoaderRegistry dataLoaderRegistry = new DataLoaderRegistry();
73+
dataLoaderRegistry.register("userLoader", DataLoaderFactory.newDataLoader(userBatchLoader));
74+
75+
DataFetcher<CompletableFuture<Map>> authorDF = (env) -> {
76+
DataLoader<String, Map> userLoader = env.getDataLoader("userLoader");
77+
// System.out.println("author id: " + (String) ((Map) env.getSource()).get("authorId"));
78+
return userLoader.load((String) ((Map) env.getSource()).get("authorId"));
79+
};
80+
TypeDefinitionRegistry typeDefinitionRegistry = new SchemaParser().parse(sdl);
81+
82+
RuntimeWiring runtimeWiring = RuntimeWiring.newRuntimeWiring()
83+
.type("Query", builder -> builder.dataFetcher("issues", issuesDF))
84+
.type("Issue", builder -> builder.dataFetcher("author", authorDF))
85+
.build();
86+
GraphQLSchema graphQLSchema = new SchemaGenerator().makeExecutableSchema(typeDefinitionRegistry, runtimeWiring);
87+
88+
GraphQL graphQL = GraphQL.newGraphQL(graphQLSchema).build();
89+
String query = "{issues" +
90+
"{id author {id name}}" +
91+
"}";
92+
ExecutionInput executionInput = ExecutionInput.newExecutionInput()
93+
.dataLoaderRegistry(dataLoaderRegistry)
94+
.query(query).build();
95+
ExecutionResult result = graphQL.execute(executionInput);
96+
Assertions.assertThat(result.getErrors()).isEmpty();
97+
ExecutionTrackingResult trackingResult = executionInput.getGraphQLContext().get(ExecutionTrackingResult.EXECUTION_TRACKING_KEY);
98+
return trackingResult;
99+
}
100+
101+
102+
}

0 commit comments

Comments
 (0)