root
/
spring-boot
mirror of https://github.com/spring-projects/spring-boot.git
1
0
Fork 0
Code Issues Actions 15 Packages Projects Releases Wiki Activity

Start building against Spring Framework 6.2.0-M6 snapshots 

See gh-41555
This commit is contained in:
Stéphane Nicoll 2024-07-18 12:34:01 +02:00
parent 3648f5f494
commit 8e93b9f04a
3 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
gradle.properties
View File

@ -14,7 +14,7 @@ junitJupiterVersion=5.10.3
kotlinVersion=1.9.24 kotlinVersion=1.9.24
mavenVersion=3.9.4 mavenVersion=3.9.4
nativeBuildToolsVersion=0.10.2 nativeBuildToolsVersion=0.10.2
springFrameworkVersion=6.2.0-M5 springFrameworkVersion=6.2.0-SNAPSHOT
springFramework60xVersion=6.0.21 springFramework60xVersion=6.0.21
tomcatVersion=10.1.26 tomcatVersion=10.1.26
snakeYamlVersion=2.2 snakeYamlVersion=2.2

5
spring-boot-project/spring-boot/src/test/java/org/springframework/boot/web/reactive/error/DefaultErrorAttributesTests.java
View File

@ -282,7 +282,10 @@ class DefaultErrorAttributesTests {
MethodParameter parameter = new MethodParameter(method, 0); MethodParameter parameter = new MethodParameter(method, 0);
MethodValidationResult methodValidationResult = MethodValidationResult.create(target, method, MethodValidationResult methodValidationResult = MethodValidationResult.create(target, method,
List.of(new ParameterValidationResult(parameter, -1, 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); HandlerMethodValidationException ex = new HandlerMethodValidationException(methodValidationResult);
MockServerHttpRequest request = MockServerHttpRequest.get("/test").build(); MockServerHttpRequest request = MockServerHttpRequest.get("/test").build();
Map<String, Object> attributes = this.errorAttributes.getErrorAttributes(buildServerRequest(request, ex), Map<String, Object> attributes = this.errorAttributes.getErrorAttributes(buildServerRequest(request, ex),

5
spring-boot-project/spring-boot/src/test/java/org/springframework/boot/web/servlet/error/DefaultErrorAttributesTests.java
View File

@ -215,7 +215,10 @@ class DefaultErrorAttributesTests {
MethodParameter parameter = new MethodParameter(method, 0); MethodParameter parameter = new MethodParameter(method, 0);
MethodValidationResult methodValidationResult = MethodValidationResult.create(target, method, MethodValidationResult methodValidationResult = MethodValidationResult.create(target, method,
List.of(new ParameterValidationResult(parameter, -1, 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); HandlerMethodValidationException ex = new HandlerMethodValidationException(methodValidationResult);
testErrors(methodValidationResult.getAllErrors(), testErrors(methodValidationResult.getAllErrors(),
"Validation failed for method='public java.lang.String java.lang.String.substring(int)'. Error count: 1", "Validation failed for method='public java.lang.String java.lang.String.substring(int)'. Error count: 1",