Skip to content

Commit 62ba6ec

Browse files
committed
feat: update to graphql-java 22
1 parent 306e02f commit 62ba6ec

File tree

35 files changed

+75
-1136
lines changed

35 files changed

+75
-1136
lines changed

executions/graphql-kotlin-dataloader-instrumentation/src/main/kotlin/com/expediagroup/graphql/dataloader/instrumentation/extensions/CompletableFutureExtensions.kt

+1-8
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright 2022 Expedia, Inc
2+
* Copyright 2024 Expedia, Inc
33
*
44
* Licensed under the Apache License, Version 2.0 (the "License");
55
* you may not use this file except in compliance with the License.
@@ -19,8 +19,6 @@ package com.expediagroup.graphql.dataloader.instrumentation.extensions
1919
import com.expediagroup.graphql.dataloader.KotlinDataLoaderRegistry
2020
import com.expediagroup.graphql.dataloader.instrumentation.exceptions.MissingInstrumentationStateException
2121
import com.expediagroup.graphql.dataloader.instrumentation.exceptions.MissingKotlinDataLoaderRegistryException
22-
import com.expediagroup.graphql.dataloader.instrumentation.level.state.ExecutionLevelDispatchedState
23-
import com.expediagroup.graphql.dataloader.instrumentation.level.state.Level
2422
import com.expediagroup.graphql.dataloader.instrumentation.syncexhaustion.state.SyncExecutionExhaustedState
2523
import graphql.schema.DataFetchingEnvironment
2624
import org.dataloader.DataLoader
@@ -38,11 +36,6 @@ fun <V> CompletableFuture<V>.dispatchIfNeeded(
3836

3937
if (dataLoaderRegistry.dataLoadersInvokedOnDispatch()) {
4038
val cantContinueExecution = when {
41-
environment.graphQlContext.hasKey(ExecutionLevelDispatchedState::class) -> {
42-
environment
43-
.graphQlContext.get<ExecutionLevelDispatchedState>(ExecutionLevelDispatchedState::class)
44-
.allExecutionsDispatched(Level(environment.executionStepInfo.path.level))
45-
}
4639
environment.graphQlContext.hasKey(SyncExecutionExhaustedState::class) -> {
4740
environment
4841
.graphQlContext.get<SyncExecutionExhaustedState>(SyncExecutionExhaustedState::class)

executions/graphql-kotlin-dataloader-instrumentation/src/main/kotlin/com/expediagroup/graphql/dataloader/instrumentation/level/DataLoaderLevelDispatchedInstrumentation.kt

-45
This file was deleted.

executions/graphql-kotlin-dataloader-instrumentation/src/main/kotlin/com/expediagroup/graphql/dataloader/instrumentation/level/execution/AbstractExecutionLevelDispatchedInstrumentation.kt

-105
This file was deleted.

executions/graphql-kotlin-dataloader-instrumentation/src/main/kotlin/com/expediagroup/graphql/dataloader/instrumentation/level/execution/ExecutionLevelDispatchedInstrumentationParameters.kt

-32
This file was deleted.

executions/graphql-kotlin-dataloader-instrumentation/src/main/kotlin/com/expediagroup/graphql/dataloader/instrumentation/level/state/ExecutionBatchState.kt

-156
This file was deleted.

0 commit comments

Comments
 (0)