Skip to content

Commit d57d4fd

Browse files
andimarekandimarek
committed
naming
1 parent fed7456 commit d57d4fd

13 files changed

+32
-32
lines changed

‎src/jmh/java/performance/DataLoaderPerformance.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
import graphql.ExecutionInput;
55
import graphql.ExecutionResult;
66
import graphql.GraphQL;
7-
import graphql.execution.instrumentation.dataloader.DispatchingContextKeys;
7+
import graphql.execution.instrumentation.dataloader.DataLoaderDispatchingContextKeys;
88
import graphql.schema.DataFetcher;
99
import graphql.schema.GraphQLSchema;
1010
import graphql.schema.idl.RuntimeWiring;
@@ -188,7 +188,7 @@ public void executeRequestWithDataLoaders(MyState myState, Blackhole blackhole)
188188
DataLoaderRegistry registry = DataLoaderRegistry.newRegistry().register(ownerDLName, ownerDL).register(petDLName, petDL).build();
189189

190190
ExecutionInput executionInput = ExecutionInput.newExecutionInput().query(myState.query).dataLoaderRegistry(registry).build();
191-
executionInput.getGraphQLContext().put(DispatchingContextKeys.ENABLE_DATA_LOADER_CHAINING, true);
191+
executionInput.getGraphQLContext().put(DataLoaderDispatchingContextKeys.ENABLE_DATA_LOADER_CHAINING, true);
192192
ExecutionResult execute = myState.graphQL.execute(executionInput);
193193
Assert.assertTrue(execute.isDataPresent());
194194
Assert.assertTrue(execute.getErrors().isEmpty());

src/main/java/graphql/execution/instrumentation/dataloader/DispatchingContextKeys.java renamed to src/main/java/graphql/execution/instrumentation/dataloader/DataLoaderDispatchingContextKeys.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,8 @@
66

77
@ExperimentalApi
88
@NullMarked
9-
public final class DispatchingContextKeys {
10-
private DispatchingContextKeys() {
9+
public final class DataLoaderDispatchingContextKeys {
10+
private DataLoaderDispatchingContextKeys() {
1111
}
1212

1313
/**

‎src/main/java/graphql/execution/instrumentation/dataloader/PerLevelDataLoaderDispatchStrategy.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -182,22 +182,22 @@ public PerLevelDataLoaderDispatchStrategy(ExecutionContext executionContext) {
182182
this.executionContext = executionContext;
183183

184184
GraphQLContext graphQLContext = executionContext.getGraphQLContext();
185-
Long batchWindowNs = graphQLContext.get(DispatchingContextKeys.DELAYED_DATA_LOADER_BATCH_WINDOW_SIZE_NANO_SECONDS);
185+
Long batchWindowNs = graphQLContext.get(DataLoaderDispatchingContextKeys.DELAYED_DATA_LOADER_BATCH_WINDOW_SIZE_NANO_SECONDS);
186186
if (batchWindowNs != null) {
187187
this.batchWindowNs = batchWindowNs;
188188
} else {
189189
this.batchWindowNs = DEFAULT_BATCH_WINDOW_NANO_SECONDS_DEFAULT;
190190
}
191191

192192
this.delayedDataLoaderDispatchExecutor = new InterThreadMemoizedSupplier<>(() -> {
193-
DelayedDataLoaderDispatcherExecutorFactory delayedDataLoaderDispatcherExecutorFactory = graphQLContext.get(DispatchingContextKeys.DELAYED_DATA_LOADER_DISPATCHING_EXECUTOR_FACTORY);
193+
DelayedDataLoaderDispatcherExecutorFactory delayedDataLoaderDispatcherExecutorFactory = graphQLContext.get(DataLoaderDispatchingContextKeys.DELAYED_DATA_LOADER_DISPATCHING_EXECUTOR_FACTORY);
194194
if (delayedDataLoaderDispatcherExecutorFactory != null) {
195195
return delayedDataLoaderDispatcherExecutorFactory.createExecutor(executionContext.getExecutionId(), graphQLContext);
196196
}
197197
return defaultDelayedDLCFBatchWindowScheduler.get();
198198
});
199199

200-
Boolean enableDataLoaderChaining = graphQLContext.get(DispatchingContextKeys.ENABLE_DATA_LOADER_CHAINING);
200+
Boolean enableDataLoaderChaining = graphQLContext.get(DataLoaderDispatchingContextKeys.ENABLE_DATA_LOADER_CHAINING);
201201
this.enableDataLoaderChaining = enableDataLoaderChaining != null && enableDataLoaderChaining;
202202
}
203203

‎src/test/groovy/graphql/ChainedDataLoaderTest.groovy‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ package graphql
22

33
import graphql.execution.ExecutionId
44
import graphql.execution.instrumentation.dataloader.DelayedDataLoaderDispatcherExecutorFactory
5-
import graphql.execution.instrumentation.dataloader.DispatchingContextKeys
5+
import graphql.execution.instrumentation.dataloader.DataLoaderDispatchingContextKeys
66
import graphql.schema.DataFetcher
77
import org.awaitility.Awaitility
88
import org.dataloader.BatchLoader
@@ -72,7 +72,7 @@ class ChainedDataLoaderTest extends Specification {
7272
def graphQL = GraphQL.newGraphQL(schema).build()
7373

7474
def query = "{ dogName catName } "
75-
def ei = newExecutionInput(query).graphQLContext([(DispatchingContextKeys.ENABLE_DATA_LOADER_CHAINING): true]).dataLoaderRegistry(dataLoaderRegistry).build()
75+
def ei = newExecutionInput(query).graphQLContext([(DataLoaderDispatchingContextKeys.ENABLE_DATA_LOADER_CHAINING): true]).dataLoaderRegistry(dataLoaderRegistry).build()
7676

7777
when:
7878
def efCF = graphQL.executeAsync(ei)
@@ -163,7 +163,7 @@ class ChainedDataLoaderTest extends Specification {
163163
def graphQL = GraphQL.newGraphQL(schema).build()
164164

165165
def query = "{ hello helloDelayed} "
166-
def ei = newExecutionInput(query).graphQLContext([(DispatchingContextKeys.ENABLE_DATA_LOADER_CHAINING): true]).dataLoaderRegistry(dataLoaderRegistry).build()
166+
def ei = newExecutionInput(query).graphQLContext([(DataLoaderDispatchingContextKeys.ENABLE_DATA_LOADER_CHAINING): true]).dataLoaderRegistry(dataLoaderRegistry).build()
167167

168168
when:
169169
def efCF = graphQL.executeAsync(ei)
@@ -254,7 +254,7 @@ class ChainedDataLoaderTest extends Specification {
254254
def graphQL = GraphQL.newGraphQL(schema).build()
255255

256256
def query = "{ foo } "
257-
def ei = newExecutionInput(query).graphQLContext([(DispatchingContextKeys.ENABLE_DATA_LOADER_CHAINING): true]).dataLoaderRegistry(dataLoaderRegistry).build()
257+
def ei = newExecutionInput(query).graphQLContext([(DataLoaderDispatchingContextKeys.ENABLE_DATA_LOADER_CHAINING): true]).dataLoaderRegistry(dataLoaderRegistry).build()
258258

259259
when:
260260
def efCF = graphQL.executeAsync(ei)
@@ -322,7 +322,7 @@ class ChainedDataLoaderTest extends Specification {
322322
def graphQL = GraphQL.newGraphQL(schema).build()
323323

324324
def query = "{ dogName catName } "
325-
def ei = newExecutionInput(query).graphQLContext([(DispatchingContextKeys.ENABLE_DATA_LOADER_CHAINING): true]).dataLoaderRegistry(dataLoaderRegistry).build()
325+
def ei = newExecutionInput(query).graphQLContext([(DataLoaderDispatchingContextKeys.ENABLE_DATA_LOADER_CHAINING): true]).dataLoaderRegistry(dataLoaderRegistry).build()
326326

327327
when:
328328
def efCF = graphQL.executeAsync(ei)
@@ -381,10 +381,10 @@ class ChainedDataLoaderTest extends Specification {
381381
def graphQL = GraphQL.newGraphQL(schema).build()
382382

383383
def query = "{ foo bar } "
384-
def ei = newExecutionInput(query).graphQLContext([(DispatchingContextKeys.ENABLE_DATA_LOADER_CHAINING): true]).dataLoaderRegistry(dataLoaderRegistry).build()
384+
def ei = newExecutionInput(query).graphQLContext([(DataLoaderDispatchingContextKeys.ENABLE_DATA_LOADER_CHAINING): true]).dataLoaderRegistry(dataLoaderRegistry).build()
385385

386386
// make the window to 50ms
387-
ei.getGraphQLContext().put(DispatchingContextKeys.DELAYED_DATA_LOADER_BATCH_WINDOW_SIZE_NANO_SECONDS, 1_000_000L * 250)
387+
ei.getGraphQLContext().put(DataLoaderDispatchingContextKeys.DELAYED_DATA_LOADER_BATCH_WINDOW_SIZE_NANO_SECONDS, 1_000_000L * 250)
388388

389389
when:
390390
def efCF = graphQL.executeAsync(ei)
@@ -431,11 +431,11 @@ class ChainedDataLoaderTest extends Specification {
431431
def graphQL = GraphQL.newGraphQL(schema).build()
432432

433433
def query = "{ foo } "
434-
def ei = newExecutionInput(query).graphQLContext([(DispatchingContextKeys.ENABLE_DATA_LOADER_CHAINING): true]).dataLoaderRegistry(dataLoaderRegistry).build()
434+
def ei = newExecutionInput(query).graphQLContext([(DataLoaderDispatchingContextKeys.ENABLE_DATA_LOADER_CHAINING): true]).dataLoaderRegistry(dataLoaderRegistry).build()
435435

436436

437437
ScheduledExecutorService scheduledExecutorService = Mock()
438-
ei.getGraphQLContext().put(DispatchingContextKeys.DELAYED_DATA_LOADER_DISPATCHING_EXECUTOR_FACTORY, new DelayedDataLoaderDispatcherExecutorFactory() {
438+
ei.getGraphQLContext().put(DataLoaderDispatchingContextKeys.DELAYED_DATA_LOADER_DISPATCHING_EXECUTOR_FACTORY, new DelayedDataLoaderDispatcherExecutorFactory() {
439439
@Override
440440
ScheduledExecutorService createExecutor(ExecutionId executionId, GraphQLContext graphQLContext) {
441441
return scheduledExecutorService

‎src/test/groovy/graphql/MutationTest.groovy‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
package graphql
22

3-
import graphql.execution.instrumentation.dataloader.DispatchingContextKeys
3+
import graphql.execution.instrumentation.dataloader.DataLoaderDispatchingContextKeys
44
import graphql.schema.DataFetcher
55
import org.awaitility.Awaitility
66
import org.dataloader.BatchLoader
@@ -439,7 +439,7 @@ class MutationTest extends Specification {
439439
}
440440
}
441441
}
442-
""").dataLoaderRegistry(dlReg).graphQLContext([DispatchingContextKeys.ENABLE_DATA_LOADER_CHAINING]: enableDataLoaderChaining).build()
442+
""").dataLoaderRegistry(dlReg).graphQLContext([DataLoaderDispatchingContextKeys.ENABLE_DATA_LOADER_CHAINING]: enableDataLoaderChaining).build()
443443
when:
444444
def cf = graphQL.executeAsync(ei)
445445

@@ -690,7 +690,7 @@ class MutationTest extends Specification {
690690
}
691691
}
692692
}
693-
""").dataLoaderRegistry(dlReg).graphQLContext([(DispatchingContextKeys.ENABLE_DATA_LOADER_CHAINING): enableDataLoaderChaining]).build()
693+
""").dataLoaderRegistry(dlReg).graphQLContext([(DataLoaderDispatchingContextKeys.ENABLE_DATA_LOADER_CHAINING): enableDataLoaderChaining]).build()
694694
def cf = graphQL.executeAsync(ei)
695695

696696
Awaitility.await().until { cf.isDone() }

‎src/test/groovy/graphql/execution/instrumentation/dataloader/DataLoaderCompanyProductMutationTest.groovy‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,7 @@ class DataLoaderCompanyProductMutationTest extends Specification {
7171
ExecutionInput executionInput = ExecutionInput.newExecutionInput()
7272
.query(query)
7373
.dataLoaderRegistry(registry)
74-
.graphQLContext([(DispatchingContextKeys.ENABLE_DATA_LOADER_CHAINING): false])
74+
.graphQLContext([(DataLoaderDispatchingContextKeys.ENABLE_DATA_LOADER_CHAINING): false])
7575
.build()
7676

7777
when:

‎src/test/groovy/graphql/execution/instrumentation/dataloader/DataLoaderDispatcherTest.groovy‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,7 @@ class DataLoaderDispatcherTest extends Specification {
7575

7676
def graphQL = GraphQL.newGraphQL(starWarsSchema).build()
7777
def executionInput = newExecutionInput().dataLoaderRegistry(dataLoaderRegistry).query('{ hero { name } }').build()
78-
executionInput.getGraphQLContext().put(DispatchingContextKeys.ENABLE_DATA_LOADER_CHAINING, false)
78+
executionInput.getGraphQLContext().put(DataLoaderDispatchingContextKeys.ENABLE_DATA_LOADER_CHAINING, false)
7979

8080
when:
8181
def er = graphQL.execute(executionInput)
@@ -245,7 +245,7 @@ class DataLoaderDispatcherTest extends Specification {
245245

246246
when:
247247
def executionInput = newExecutionInput().dataLoaderRegistry(dataLoaderRegistry).query('{ field }').build()
248-
executionInput.getGraphQLContext().put(DispatchingContextKeys.ENABLE_DATA_LOADER_CHAINING, false)
248+
executionInput.getGraphQLContext().put(DataLoaderDispatchingContextKeys.ENABLE_DATA_LOADER_CHAINING, false)
249249
def er = graphql.execute(executionInput)
250250

251251
then:

‎src/test/groovy/graphql/execution/instrumentation/dataloader/DataLoaderHangingTest.groovy‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -140,7 +140,7 @@ class DataLoaderHangingTest extends Specification {
140140

141141
def result = graphql.executeAsync(newExecutionInput()
142142
.dataLoaderRegistry(dataLoaderRegistry)
143-
.graphQLContext([(DispatchingContextKeys.ENABLE_DATA_LOADER_CHAINING): enableDataLoaderChaining] as Map)
143+
.graphQLContext([(DataLoaderDispatchingContextKeys.ENABLE_DATA_LOADER_CHAINING): enableDataLoaderChaining] as Map)
144144
.query("""
145145
query getArtistsWithData {
146146
listArtists(limit: 1) {
@@ -370,7 +370,7 @@ class DataLoaderHangingTest extends Specification {
370370
ExecutionInput executionInput = newExecutionInput()
371371
.query(query)
372372
.graphQLContext(["registry": registry])
373-
.graphQLContext([(DispatchingContextKeys.ENABLE_DATA_LOADER_CHAINING): false])
373+
.graphQLContext([(DataLoaderDispatchingContextKeys.ENABLE_DATA_LOADER_CHAINING): false])
374374
.dataLoaderRegistry(registry)
375375
.build()
376376

‎src/test/groovy/graphql/execution/instrumentation/dataloader/DataLoaderNodeTest.groovy‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -135,7 +135,7 @@ class DataLoaderNodeTest extends Specification {
135135
ExecutionResult result = GraphQL.newGraphQL(schema)
136136
.build()
137137
.execute(ExecutionInput.newExecutionInput()
138-
.graphQLContext([(DispatchingContextKeys.ENABLE_DATA_LOADER_CHAINING): enableDataLoaderChaining])
138+
.graphQLContext([(DataLoaderDispatchingContextKeys.ENABLE_DATA_LOADER_CHAINING): enableDataLoaderChaining])
139139
.dataLoaderRegistry(registry).query(
140140
'''
141141
query Q {

‎src/test/groovy/graphql/execution/instrumentation/dataloader/DataLoaderPerformanceTest.groovy‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ class DataLoaderPerformanceTest extends Specification {
2929
ExecutionInput executionInput = ExecutionInput.newExecutionInput()
3030
.query(getQuery())
3131
.dataLoaderRegistry(dataLoaderRegistry)
32-
.graphQLContext([(ENABLE_INCREMENTAL_SUPPORT): incrementalSupport, (DispatchingContextKeys.ENABLE_DATA_LOADER_CHAINING): enableDataLoaderChaining])
32+
.graphQLContext([(ENABLE_INCREMENTAL_SUPPORT): incrementalSupport, (DataLoaderDispatchingContextKeys.ENABLE_DATA_LOADER_CHAINING): enableDataLoaderChaining])
3333
.build()
3434
def result = graphQL.execute(executionInput)
3535

@@ -52,7 +52,7 @@ class DataLoaderPerformanceTest extends Specification {
5252
ExecutionInput executionInput = ExecutionInput.newExecutionInput()
5353
.query(getExpensiveQuery(false))
5454
.dataLoaderRegistry(dataLoaderRegistry)
55-
.graphQLContext([(ENABLE_INCREMENTAL_SUPPORT): incrementalSupport, (DispatchingContextKeys.ENABLE_DATA_LOADER_CHAINING): enableDataLoaderChaining])
55+
.graphQLContext([(ENABLE_INCREMENTAL_SUPPORT): incrementalSupport, (DataLoaderDispatchingContextKeys.ENABLE_DATA_LOADER_CHAINING): enableDataLoaderChaining])
5656
.build()
5757
def result = graphQL.execute(executionInput)
5858

@@ -76,7 +76,7 @@ class DataLoaderPerformanceTest extends Specification {
7676
ExecutionInput executionInput = ExecutionInput.newExecutionInput()
7777
.query(getQuery())
7878
.dataLoaderRegistry(dataLoaderRegistry)
79-
.graphQLContext([(ENABLE_INCREMENTAL_SUPPORT): incrementalSupport, (DispatchingContextKeys.ENABLE_DATA_LOADER_CHAINING): enableDataLoaderChaining])
79+
.graphQLContext([(ENABLE_INCREMENTAL_SUPPORT): incrementalSupport, (DataLoaderDispatchingContextKeys.ENABLE_DATA_LOADER_CHAINING): enableDataLoaderChaining])
8080
.build()
8181

8282
def result = graphQL.execute(executionInput)
@@ -102,7 +102,7 @@ class DataLoaderPerformanceTest extends Specification {
102102
ExecutionInput executionInput = ExecutionInput.newExecutionInput()
103103
.query(getExpensiveQuery(false))
104104
.dataLoaderRegistry(dataLoaderRegistry)
105-
.graphQLContext([(ENABLE_INCREMENTAL_SUPPORT): incrementalSupport, (DispatchingContextKeys.ENABLE_DATA_LOADER_CHAINING): enableDataLoaderChaining])
105+
.graphQLContext([(ENABLE_INCREMENTAL_SUPPORT): incrementalSupport, (DataLoaderDispatchingContextKeys.ENABLE_DATA_LOADER_CHAINING): enableDataLoaderChaining])
106106
.build()
107107

108108
def result = graphQL.execute(executionInput)

0 commit comments

Comments
 (0)