Merge branch '5.3.x'

This commit is contained in:
Sam Brannen
2021-10-05 14:55:22 +02:00
39 changed files with 93 additions and 82 deletions

View File

@@ -550,6 +550,8 @@ public class AutowiredAnnotationBeanPostProcessor implements SmartInstantiationA
* @return whether the annotation indicates that a dependency is required
*/
protected boolean determineRequiredStatus(MergedAnnotation<?> ann) {
// Cast to (AnnotationAttributes) is required. Otherwise, the :spring-beans:compileGroovy
// task fails in the Gradle build.
return determineRequiredStatus((AnnotationAttributes)
ann.asMap(mergedAnnotation -> new AnnotationAttributes(mergedAnnotation.getType())));
}