Skip to content

Commit 9258d35

Browse files
committed
Upgrade to GraphQL Java 25.0.beta-5
Closes gh-1282
1 parent bb1e3d4 commit 9258d35

File tree

4 files changed

+4
-3
lines changed

4 files changed

+4
-3
lines changed

build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ description = "Spring for GraphQL"
77
ext {
88
moduleProjects = [project(":spring-graphql"), project(":spring-graphql-test")]
99
springFrameworkVersion = "7.0.0-M8"
10-
graphQlJavaVersion = "24.1"
10+
graphQlJavaVersion = "25.0.beta-5"
1111
springBootVersion = "3.5.3"
1212
}
1313

spring-graphql/src/main/java/org/springframework/graphql/execution/ConnectionTypeDefinitionConfigurer.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -102,7 +102,7 @@ private static Set<String> findConnectionTypeNames(TypeDefinitionRegistry regist
102102
.filter((type) -> type instanceof TypeName)
103103
.map((type) -> ((TypeName) type).getName())
104104
.filter((name) -> name.endsWith("Connection"))
105-
.filter((name) -> registry.getType(name).isEmpty())
105+
.filter((name) -> registry.getTypeOrNull(name) == null)
106106
.map((name) -> name.substring(0, name.length() - "Connection".length()));
107107
})
108108
.collect(Collectors.toCollection(LinkedHashSet::new));

spring-graphql/src/main/java/org/springframework/graphql/execution/ContextDataFetcherDecorator.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -81,6 +81,7 @@ private ContextDataFetcherDecorator(
8181

8282

8383
@Override
84+
@SuppressWarnings("NullAway")
8485
public @Nullable Object get(DataFetchingEnvironment env) throws Exception {
8586

8687
GraphQLContext graphQlContext = env.getGraphQlContext();

spring-graphql/src/main/java/org/springframework/graphql/observation/DefaultExecutionRequestObservationConvention.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -97,7 +97,7 @@ public KeyValues getHighCardinalityKeyValues(ExecutionRequestObservationContext
9797
}
9898

9999
protected KeyValue executionId(ExecutionRequestObservationContext context) {
100-
return KeyValue.of(ExecutionRequestHighCardinalityKeyNames.EXECUTION_ID, context.getExecutionInput().getExecutionId().toString());
100+
return KeyValue.of(ExecutionRequestHighCardinalityKeyNames.EXECUTION_ID, context.getExecutionInput().getExecutionIdNonNull().toString());
101101
}
102102

103103
}

0 commit comments

Comments
 (0)