Skip to content

Commit f4e5790

Browse files
bbakermanbbakerman
authored
Merge branch 'master' into generic-dfr-builder
2 parents bc7e739 + 50c22c1 commit f4e5790

4 files changed

Lines changed: 10 additions & 5 deletions

File tree

‎.github/workflows/commit_performance_result.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ jobs:
1717
commitPerformanceResults:
1818
runs-on: ubuntu-latest
1919
steps:
20-
- uses: aws-actions/configure-aws-credentials@v5
20+
- uses: aws-actions/configure-aws-credentials@v6
2121
with:
2222
role-to-assume: arn:aws:iam::637423498965:role/GitHubActionGrahQLJava
2323
aws-region: "ap-southeast-2"

‎.github/workflows/publish_commit.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ jobs:
1515
if: github.event.pull_request.merged == true
1616
runs-on: ubuntu-latest
1717
steps:
18-
- uses: aws-actions/configure-aws-credentials@v5
18+
- uses: aws-actions/configure-aws-credentials@v6
1919
with:
2020
role-to-assume: arn:aws:iam::637423498965:role/GitHubActionGrahQLJava
2121
aws-region: "ap-southeast-2"

‎build.gradle‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ plugins {
1616
id "io.github.gradle-nexus.publish-plugin" version "2.0.0"
1717
id "groovy"
1818
id "me.champeau.jmh" version "0.7.3"
19-
id "net.ltgt.errorprone" version '4.3.0'
19+
id "net.ltgt.errorprone" version '5.0.0'
2020
//
2121
// Kotlin just for tests - not production code
2222
id 'org.jetbrains.kotlin.jvm' version '2.3.0'
@@ -136,15 +136,15 @@ dependencies {
136136
testImplementation 'org.apache.groovy:groovy-json:5.0.4'
137137
testImplementation 'com.google.code.gson:gson:2.13.2'
138138
testImplementation 'org.eclipse.jetty:jetty-server:11.0.26'
139-
testImplementation 'com.fasterxml.jackson.core:jackson-databind:2.20.1'
139+
testImplementation 'com.fasterxml.jackson.core:jackson-databind:2.21.0'
140140
testImplementation 'org.awaitility:awaitility-groovy:4.3.0'
141141
testImplementation 'com.github.javafaker:javafaker:1.0.2'
142142

143143
testImplementation 'org.reactivestreams:reactive-streams-tck:' + reactiveStreamsVersion
144144
testImplementation "io.reactivex.rxjava2:rxjava:2.2.21"
145145
testImplementation "io.projectreactor:reactor-core:3.8.0"
146146

147-
testImplementation 'org.testng:testng:7.11.0' // use for reactive streams test inheritance
147+
testImplementation 'org.testng:testng:7.12.0' // use for reactive streams test inheritance
148148
testImplementation "com.tngtech.archunit:archunit-junit5:1.4.1"
149149
testImplementation 'org.openjdk.jmh:jmh-core:1.37' // required for ArchUnit to check JMH tests
150150

‎src/jmh/java/benchmark/SchemaTransformerBenchmark.java‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
package benchmark;
22

3+
import graphql.introspection.Introspection.DirectiveLocation;
34
import graphql.schema.GraphQLDirective;
45
import graphql.schema.GraphQLFieldDefinition;
56
import graphql.schema.GraphQLObjectType;
@@ -42,6 +43,8 @@ public static class MyState {
4243

4344
GraphQLDirective infoDirective = GraphQLDirective.newDirective()
4445
.name("Info")
46+
.validLocation(DirectiveLocation.FIELD_DEFINITION)
47+
.validLocation(DirectiveLocation.OBJECT)
4548
.build();
4649
GraphQLTypeVisitor directiveAdder = new GraphQLTypeVisitorStub() {
4750
@Override
@@ -94,6 +97,8 @@ public void setup() {
9497
try {
9598
String schemaString = BenchmarkUtils.loadResource("large-schema-3.graphqls");
9699
schema = SchemaGenerator.createdMockedSchema(schemaString);
100+
// Declare the Info directive on the schema so validation passes after transformation
101+
schema = schema.transform(builder -> builder.additionalDirective(infoDirective));
97102
txSchema = SchemaTransformer.transformSchema(schema, directiveAdder);
98103
} catch (Exception e) {
99104
throw new RuntimeException(e);

0 commit comments

Comments
 (0)