From 706766536dde3bf594a29aa1798b0462bf258932 Mon Sep 17 00:00:00 2001 From: Rossen Stoyanchev Date: Thu, 8 Jul 2021 21:24:18 +0100 Subject: [PATCH] Upgrade to GraphQL Java pre-17 version See gh-84 --- build.gradle | 2 +- graphql-spring-boot-starter/build.gradle | 2 +- .../graphql/execution/ReactorContextManager.java | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/build.gradle b/build.gradle index 19096b3f..59bd4086 100644 --- a/build.gradle +++ b/build.gradle @@ -42,7 +42,7 @@ configure(moduleProjects) { mavenBom "org.junit:junit-bom:5.7.2" } dependencies { - dependency 'com.graphql-java:graphql-java:16.2' + dependency 'com.graphql-java:graphql-java:0.0.0-2021-07-06T01-36-09-02444b78' dependency 'org.assertj:assertj-core:3.19.0' dependencySet(group: 'org.apache.logging.log4j', version: '2.14.1') { entry 'log4j-api' diff --git a/graphql-spring-boot-starter/build.gradle b/graphql-spring-boot-starter/build.gradle index b8248e5e..aaca0848 100644 --- a/graphql-spring-boot-starter/build.gradle +++ b/graphql-spring-boot-starter/build.gradle @@ -24,7 +24,7 @@ dependencyManagement { dependencies { api project(':spring-graphql') - api 'com.graphql-java:graphql-java:16.2' + api 'com.graphql-java:graphql-java:0.0.0-2021-07-06T01-36-09-02444b78' api 'io.projectreactor:reactor-core' api 'org.springframework:spring-context' api 'org.springframework.boot:spring-boot-starter' diff --git a/spring-graphql/src/main/java/org/springframework/graphql/execution/ReactorContextManager.java b/spring-graphql/src/main/java/org/springframework/graphql/execution/ReactorContextManager.java index 10e8efbf..e7b57d3c 100644 --- a/spring-graphql/src/main/java/org/springframework/graphql/execution/ReactorContextManager.java +++ b/spring-graphql/src/main/java/org/springframework/graphql/execution/ReactorContextManager.java @@ -55,7 +55,7 @@ public abstract class ReactorContextManager { * @param input the GraphQL query input */ static void setReactorContext(ContextView contextView, ExecutionInput input) { - ((GraphQLContext) input.getContext()).put(CONTEXT_VIEW_KEY, contextView); + input.getGraphQLContext().put(CONTEXT_VIEW_KEY, contextView); } /** @@ -64,7 +64,7 @@ public abstract class ReactorContextManager { * @return the reactor {@link ContextView} */ static ContextView getReactorContext(DataFetchingEnvironment environment) { - GraphQLContext graphQlContext = environment.getContext(); + GraphQLContext graphQlContext = environment.getGraphQlContext(); return graphQlContext.getOrDefault(CONTEXT_VIEW_KEY, Context.empty()); }