Skip to content

Commit 95654b5

Browse files
bbakermanbbakerman
committed
Merge remote-tracking branch 'origin/master' into extra-tests-for-document-compiler
# Conflicts: # src/main/java/graphql/execution/Execution.java # src/main/java/graphql/normalized/ExecutableNormalizedOperationToAstCompiler.java
2 parents bfe691a + a1efdb8 commit 95654b5

File tree

135 files changed

+16686
-556
lines changed

Some content is hidden

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

135 files changed

+16686
-556
lines changed

‎README.md‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -32,3 +32,6 @@ take the time to read it.
3232
### License
3333

3434
Copyright (c) 2015, Andreas Marek and [Contributors](https://github.com/graphql-java/graphql-java/graphs/contributors)
35+
36+
### Powered by
37+
[![IntelliJ IDEA logo](https://resources.jetbrains.com/storage/products/company/brand/logos/IntelliJ_IDEA.svg)](https://jb.gg/OpenSourceSupport)

‎agent-test/build.gradle‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,9 @@ plugins {
44

55
dependencies {
66
implementation(rootProject)
7-
implementation("net.bytebuddy:byte-buddy-agent:1.17.1")
7+
implementation("net.bytebuddy:byte-buddy-agent:1.17.2")
88

9-
testImplementation 'org.junit.jupiter:junit-jupiter:5.11.4'
9+
testImplementation 'org.junit.jupiter:junit-jupiter:5.12.0'
1010
testRuntimeOnly 'org.junit.platform:junit-platform-launcher'
1111

1212
testImplementation("org.assertj:assertj-core:3.27.3")

‎agent/build.gradle‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ plugins {
66
}
77

88
dependencies {
9-
implementation("net.bytebuddy:byte-buddy:1.17.1")
9+
implementation("net.bytebuddy:byte-buddy:1.17.2")
1010
// graphql-java itself
1111
implementation(rootProject)
1212
}

‎agent/src/main/java/graphql/agent/GraphQLJavaAgent.java‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,7 @@ public static void agentmain(String agentArgs, Instrumentation inst) {
7171
return builder
7272
.visit(Advice.to(DataLoaderHelperDispatchAdvice.class).on(nameMatches("dispatch")))
7373
.visit(Advice.to(DataLoaderHelperInvokeBatchLoaderAdvice.class)
74-
.on(nameMatches("invokeLoader").and(takesArguments(List.class, List.class))));
74+
.on(nameMatches("invokeLoader").and(takesArguments(List.class, List.class, List.class))));
7575
})
7676
.type(named("graphql.schema.DataFetchingEnvironmentImpl"))
7777
.transform((builder, typeDescription, classLoader, module, protectionDomain) -> {
@@ -207,6 +207,7 @@ public static class DataLoaderHelperInvokeBatchLoaderAdvice {
207207
@Advice.OnMethodEnter
208208
public static void invokeLoader(@Advice.Argument(0) List keys,
209209
@Advice.Argument(1) List keysContext,
210+
@Advice.Argument(2) List queuedFutures,
210211
@Advice.This(typing = Assigner.Typing.DYNAMIC) Object dataLoaderHelper) {
211212
DataLoader dataLoader = getDataLoaderForHelper(dataLoaderHelper);
212213
ExecutionId executionId = GraphQLJavaAgent.dataLoaderToExecutionId.get(dataLoader);

‎build.gradle‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -99,27 +99,27 @@ jar {
9999
}
100100

101101
dependencies {
102-
compileOnly 'org.jetbrains:annotations:26.0.2'
103102
implementation 'org.antlr:antlr4-runtime:' + antlrVersion
104-
api 'com.graphql-java:java-dataloader:3.3.0'
103+
api 'com.graphql-java:java-dataloader:3.4.0'
105104
api 'org.reactivestreams:reactive-streams:' + reactiveStreamsVersion
105+
api "org.jspecify:jspecify:1.0.0"
106106
antlr 'org.antlr:antlr4:' + antlrVersion
107107
implementation 'com.google.guava:guava:' + guavaVersion
108108
testImplementation group: 'junit', name: 'junit', version: '4.13.2'
109109
testImplementation 'org.spockframework:spock-core:2.0-groovy-3.0'
110-
testImplementation 'org.codehaus.groovy:groovy:3.0.23'
111-
testImplementation 'org.codehaus.groovy:groovy-json:3.0.23'
110+
testImplementation 'org.codehaus.groovy:groovy:3.0.24'
111+
testImplementation 'org.codehaus.groovy:groovy-json:3.0.24'
112112
testImplementation 'com.google.code.gson:gson:2.12.1'
113113
testImplementation 'org.eclipse.jetty:jetty-server:11.0.24'
114-
testImplementation 'com.fasterxml.jackson.core:jackson-databind:2.18.2'
114+
testImplementation 'com.fasterxml.jackson.core:jackson-databind:2.18.3'
115115
testImplementation 'org.awaitility:awaitility-groovy:4.2.0'
116116
testImplementation 'com.github.javafaker:javafaker:1.0.2'
117117

118118
testImplementation 'org.reactivestreams:reactive-streams-tck:' + reactiveStreamsVersion
119119
testImplementation "io.reactivex.rxjava2:rxjava:2.2.21"
120-
testImplementation "io.projectreactor:reactor-core:3.7.2"
120+
testImplementation "io.projectreactor:reactor-core:3.7.3"
121121

122-
testImplementation 'org.testng:testng:7.10.2' // use for reactive streams test inheritance
122+
testImplementation 'org.testng:testng:7.11.0' // use for reactive streams test inheritance
123123

124124
testImplementation 'org.openjdk.jmh:jmh-core:1.37'
125125
testAnnotationProcessor 'org.openjdk.jmh:jmh-generator-annprocess:1.37'

0 commit comments

Comments
 (0)