Merge branch '6.1.x'

# Conflicts:
#	spring-core/src/main/java/org/springframework/core/CoroutinesUtils.java
This commit is contained in:
Juergen Hoeller
2024-03-19 10:06:48 +01:00
58 changed files with 322 additions and 253 deletions

View File

@@ -1,5 +1,5 @@
/*
* Copyright 2002-2022 the original author or authors.
* Copyright 2002-2024 the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -88,7 +88,7 @@ class DefaultMethodReferenceTests {
MethodSpec method = createTestMethod("methodName", new TypeName[0], Modifier.STATIC);
MethodReference methodReference = new DefaultMethodReference(method, null);
assertThatIllegalStateException().isThrownBy(methodReference::toCodeBlock)
.withMessage("static method reference must define a declaring class");
.withMessage("Static method reference must define a declaring class");
}
@Test