Skip to content

Commit 3f7e8ae

Browse files
committed
Merge remote-tracking branch 'origin/master' into 3357-directive-filter
2 parents 2493389 + e05a02f commit 3f7e8ae

87 files changed

Lines changed: 6468 additions & 462 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.

.github/workflows/invoke_test_runner.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ jobs:
5050

5151
- id: 'auth'
5252
name: 'Authenticate to Google Cloud'
53-
uses: google-github-actions/auth@v2.0.1
53+
uses: google-github-actions/auth@v2.1.1
5454
with:
5555
credentials_json: ${{ secrets.GOOGLE_APPLICATION_CREDENTIALS }}
5656

.github/workflows/master.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ jobs:
1414

1515
steps:
1616
- uses: actions/checkout@v4
17-
- uses: gradle/wrapper-validation-action@v1
17+
- uses: gradle/wrapper-validation-action@v2
1818
- name: Set up JDK 11
1919
uses: actions/setup-java@v4
2020
with:

.github/workflows/pull_request.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ jobs:
1616
runs-on: ubuntu-latest
1717
steps:
1818
- uses: actions/checkout@v4
19-
- uses: gradle/wrapper-validation-action@v1
19+
- uses: gradle/wrapper-validation-action@v2
2020
- name: Set up JDK 11
2121
uses: actions/setup-java@v4
2222
with:

.github/workflows/release.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ jobs:
1818

1919
steps:
2020
- uses: actions/checkout@v4
21-
- uses: gradle/wrapper-validation-action@v1
21+
- uses: gradle/wrapper-validation-action@v2
2222
- name: Set up JDK 11
2323
uses: actions/setup-java@v4
2424
with:

build.gradle

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,6 @@ def getDevelopmentVersion() {
6262
}
6363

6464
def reactiveStreamsVersion = '1.0.3'
65-
def slf4jVersion = '2.0.7'
6665
def releaseVersion = System.env.RELEASE_VERSION
6766
def antlrVersion = '4.11.1' // https://mvnrepository.com/artifact/org.antlr/antlr4-runtime
6867
def guavaVersion = '32.1.2-jre'
@@ -101,7 +100,6 @@ jar {
101100
dependencies {
102101
compileOnly 'org.jetbrains:annotations:24.1.0'
103102
implementation 'org.antlr:antlr4-runtime:' + antlrVersion
104-
implementation 'org.slf4j:slf4j-api:' + slf4jVersion
105103
api 'com.graphql-java:java-dataloader:3.2.2'
106104
api 'org.reactivestreams:reactive-streams:' + reactiveStreamsVersion
107105
antlr 'org.antlr:antlr4:' + antlrVersion
@@ -111,9 +109,8 @@ dependencies {
111109
testImplementation 'org.codehaus.groovy:groovy:3.0.20'
112110
testImplementation 'org.codehaus.groovy:groovy-json:3.0.20'
113111
testImplementation 'com.google.code.gson:gson:2.10.1'
114-
testImplementation 'org.eclipse.jetty:jetty-server:11.0.15'
112+
testImplementation 'org.eclipse.jetty:jetty-server:11.0.20'
115113
testImplementation 'com.fasterxml.jackson.core:jackson-databind:2.16.1'
116-
testImplementation 'org.slf4j:slf4j-simple:' + slf4jVersion
117114
testImplementation 'org.awaitility:awaitility-groovy:4.2.0'
118115
testImplementation 'com.github.javafaker:javafaker:1.0.2'
119116

@@ -350,8 +347,8 @@ nexusPublishing {
350347
}
351348
}
352349

353-
// to publish to local maven repo skip signing: ./gradlew publishToMavenLocal -x signGraphqlJavaPublication
354350
signing {
351+
required { !project.hasProperty('publishToMavenLocal') }
355352
def signingKey = System.env.MAVEN_CENTRAL_PGP_KEY
356353
useInMemoryPgpKeys(signingKey, "")
357354
sign publishing.publications

gradle/wrapper/gradle-wrapper.jar

-17.7 KB
Binary file not shown.
Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
distributionBase=GRADLE_USER_HOME
22
distributionPath=wrapper/dists
3-
distributionUrl=https\://services.gradle.org/distributions/gradle-8.5-bin.zip
3+
distributionUrl=https\://services.gradle.org/distributions/gradle-8.6-bin.zip
44
networkTimeout=10000
5+
validateDistributionUrl=true
56
zipStoreBase=GRADLE_USER_HOME
67
zipStorePath=wrapper/dists

gradlew

Lines changed: 17 additions & 12 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

src/main/java/graphql/ExecutionInput.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -383,4 +383,4 @@ public ExecutionInput build() {
383383
return new ExecutionInput(this);
384384
}
385385
}
386-
}
386+
}

src/main/java/graphql/ExecutionResultImpl.java

Lines changed: 21 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -40,6 +40,10 @@ public ExecutionResultImpl(ExecutionResultImpl other) {
4040
this(other.dataPresent, other.data, other.errors, other.extensions);
4141
}
4242

43+
public <T extends Builder<T>> ExecutionResultImpl(Builder<T> builder) {
44+
this(builder.dataPresent, builder.data, builder.errors, builder.extensions);
45+
}
46+
4347
private ExecutionResultImpl(boolean dataPresent, Object data, List<? extends GraphQLError> errors, Map<Object, Object> extensions) {
4448
this.dataPresent = dataPresent;
4549
this.data = data;
@@ -103,61 +107,61 @@ public String toString() {
103107
'}';
104108
}
105109

106-
public static Builder newExecutionResult() {
107-
return new Builder();
110+
public static <T extends Builder<T>> Builder<T> newExecutionResult() {
111+
return new Builder<>();
108112
}
109113

110-
public static class Builder implements ExecutionResult.Builder<Builder> {
114+
public static class Builder<T extends Builder<T>> implements ExecutionResult.Builder<T> {
111115
private boolean dataPresent;
112116
private Object data;
113117
private List<GraphQLError> errors = new ArrayList<>();
114118
private Map<Object, Object> extensions;
115119

116120
@Override
117-
public Builder from(ExecutionResult executionResult) {
121+
public T from(ExecutionResult executionResult) {
118122
dataPresent = executionResult.isDataPresent();
119123
data = executionResult.getData();
120124
errors = new ArrayList<>(executionResult.getErrors());
121125
extensions = executionResult.getExtensions();
122-
return this;
126+
return (T) this;
123127
}
124128

125129
@Override
126-
public Builder data(Object data) {
130+
public T data(Object data) {
127131
dataPresent = true;
128132
this.data = data;
129-
return this;
133+
return (T) this;
130134
}
131135

132136
@Override
133-
public Builder errors(List<GraphQLError> errors) {
137+
public T errors(List<GraphQLError> errors) {
134138
this.errors = errors;
135-
return this;
139+
return (T) this;
136140
}
137141

138142
@Override
139-
public Builder addErrors(List<GraphQLError> errors) {
143+
public T addErrors(List<GraphQLError> errors) {
140144
this.errors.addAll(errors);
141-
return this;
145+
return (T) this;
142146
}
143147

144148
@Override
145-
public Builder addError(GraphQLError error) {
149+
public T addError(GraphQLError error) {
146150
this.errors.add(error);
147-
return this;
151+
return (T) this;
148152
}
149153

150154
@Override
151-
public Builder extensions(Map<Object, Object> extensions) {
155+
public T extensions(Map<Object, Object> extensions) {
152156
this.extensions = extensions;
153-
return this;
157+
return (T) this;
154158
}
155159

156160
@Override
157-
public Builder addExtension(String key, Object value) {
161+
public T addExtension(String key, Object value) {
158162
this.extensions = (this.extensions == null ? new LinkedHashMap<>() : this.extensions);
159163
this.extensions.put(key, value);
160-
return this;
164+
return (T) this;
161165
}
162166

163167
@Override

0 commit comments

Comments
 (0)