Skip to content

Commit 1627895

Browse files
committed
Upgrade to Spring Framework 7.0.0-M6
See gh-1202
1 parent 150c9cd commit 1627895

File tree

4 files changed

+5
-2
lines changed

4 files changed

+5
-2
lines changed

build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ description = "Spring for GraphQL"
66

77
ext {
88
moduleProjects = [project(":spring-graphql"), project(":spring-graphql-test")]
9-
springFrameworkVersion = "7.0.0-M5"
9+
springFrameworkVersion = "7.0.0-M6"
1010
graphQlJavaVersion = "24.1"
1111
springBootVersion = "3.4.3"
1212
}

platform/build.gradle

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -41,6 +41,7 @@ dependencies {
4141
api("org.skyscreamer:jsonassert:1.5.3")
4242
api("org.awaitility:awaitility:4.3.0")
4343
api("com.squareup.okhttp3:mockwebserver:4.12.0")
44+
api("org.hamcrest:hamcrest:3.0")
4445

4546
api("com.h2database:h2:2.3.232")
4647
api("org.hibernate.orm:hibernate-core:7.0.0.CR1")

spring-graphql-test/build.gradle

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@ dependencies {
2020
compileOnly 'org.skyscreamer:jsonassert'
2121
compileOnly 'com.google.code.findbugs:jsr305'
2222
compileOnly 'org.jetbrains.kotlinx:kotlinx-coroutines-core'
23+
compileOnly 'org.hamcrest:hamcrest'
2324

2425
testImplementation(testFixtures(project(":spring-graphql")))
2526
testImplementation 'org.junit.jupiter:junit-jupiter'

spring-graphql/src/main/java/org/springframework/graphql/data/GraphQlArgumentBinder.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -271,12 +271,13 @@ private Map<?, Object> bindMapToMap(
271271
private @Nullable Object bindViaConstructorAndSetters(Constructor<?> constructor,
272272
Map<String, Object> rawMap, ResolvableType ownerType, ArgumentsBindingResult bindingResult) {
273273

274-
String[] paramNames = BeanUtils.getParameterNames(constructor);
274+
@Nullable String[] paramNames = BeanUtils.getParameterNames(constructor);
275275
Class<?>[] paramTypes = constructor.getParameterTypes();
276276
@Nullable Object[] constructorArguments = new Object[paramTypes.length];
277277

278278
for (int i = 0; i < paramNames.length; i++) {
279279
String name = paramNames[i];
280+
Assert.notNull(name, () -> "Missing parameter name in " + constructor);
280281

281282
ResolvableType targetType = ResolvableType.forType(
282283
ResolvableType.forConstructorParameter(constructor, i).getType(), ownerType);

0 commit comments

Comments
 (0)