From 8e93b9f04aca91129941fa091f966db2d499e52d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?St=C3=A9phane=20Nicoll?= Date: Thu, 18 Jul 2024 12:34:01 +0200 Subject: [PATCH] Start building against Spring Framework 6.2.0-M6 snapshots See gh-41555 --- gradle.properties | 2 +- .../boot/web/reactive/error/DefaultErrorAttributesTests.java | 5 ++++- .../boot/web/servlet/error/DefaultErrorAttributesTests.java | 5 ++++- 3 files changed, 9 insertions(+), 3 deletions(-) diff --git a/gradle.properties b/gradle.properties index 2b5a76bcfd..7b3df94d32 100644 --- a/gradle.properties +++ b/gradle.properties @@ -14,7 +14,7 @@ junitJupiterVersion=5.10.3 kotlinVersion=1.9.24 mavenVersion=3.9.4 nativeBuildToolsVersion=0.10.2 -springFrameworkVersion=6.2.0-M5 +springFrameworkVersion=6.2.0-SNAPSHOT springFramework60xVersion=6.0.21 tomcatVersion=10.1.26 snakeYamlVersion=2.2 diff --git a/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/web/reactive/error/DefaultErrorAttributesTests.java b/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/web/reactive/error/DefaultErrorAttributesTests.java index d7a8ea1540..951f36c64c 100644 --- a/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/web/reactive/error/DefaultErrorAttributesTests.java +++ b/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/web/reactive/error/DefaultErrorAttributesTests.java @@ -282,7 +282,10 @@ class DefaultErrorAttributesTests { MethodParameter parameter = new MethodParameter(method, 0); MethodValidationResult methodValidationResult = MethodValidationResult.create(target, method, List.of(new ParameterValidationResult(parameter, -1, - List.of(new ObjectError("beginIndex", "beginIndex is negative")), null, null, null))); + List.of(new ObjectError("beginIndex", "beginIndex is negative")), null, null, null, + (error, sourceType) -> { + throw new IllegalArgumentException("No source object of the given type"); + }))); HandlerMethodValidationException ex = new HandlerMethodValidationException(methodValidationResult); MockServerHttpRequest request = MockServerHttpRequest.get("/test").build(); Map attributes = this.errorAttributes.getErrorAttributes(buildServerRequest(request, ex), diff --git a/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/web/servlet/error/DefaultErrorAttributesTests.java b/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/web/servlet/error/DefaultErrorAttributesTests.java index 0607bef439..999fb37d20 100644 --- a/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/web/servlet/error/DefaultErrorAttributesTests.java +++ b/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/web/servlet/error/DefaultErrorAttributesTests.java @@ -215,7 +215,10 @@ class DefaultErrorAttributesTests { MethodParameter parameter = new MethodParameter(method, 0); MethodValidationResult methodValidationResult = MethodValidationResult.create(target, method, List.of(new ParameterValidationResult(parameter, -1, - List.of(new ObjectError("beginIndex", "beginIndex is negative")), null, null, null))); + List.of(new ObjectError("beginIndex", "beginIndex is negative")), null, null, null, + (error, sourceType) -> { + throw new IllegalArgumentException("No source object of the given type"); + }))); HandlerMethodValidationException ex = new HandlerMethodValidationException(methodValidationResult); testErrors(methodValidationResult.getAllErrors(), "Validation failed for method='public java.lang.String java.lang.String.substring(int)'. Error count: 1",