From a6deac3ffe8d9ed5d15802eca8b46fa21c765ac3 Mon Sep 17 00:00:00 2001 From: Sam Brannen Date: Fri, 21 Jan 2022 10:33:32 +0100 Subject: [PATCH] Polish contribution See gh-27945 --- .../annotation/AutowiredAnnotationBeanPostProcessor.java | 7 +++---- .../beans/factory/groovy/GroovyDynamicElementReader.java | 2 +- .../beans/factory/support/AbstractBeanFactory.java | 2 +- .../GroovyApplicationContextDynamicBeanPropertyTests.java | 1 + 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/spring-beans/src/main/java/org/springframework/beans/factory/annotation/AutowiredAnnotationBeanPostProcessor.java b/spring-beans/src/main/java/org/springframework/beans/factory/annotation/AutowiredAnnotationBeanPostProcessor.java index 00e1b73f34..9e7fabe5c3 100644 --- a/spring-beans/src/main/java/org/springframework/beans/factory/annotation/AutowiredAnnotationBeanPostProcessor.java +++ b/spring-beans/src/main/java/org/springframework/beans/factory/annotation/AutowiredAnnotationBeanPostProcessor.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2021 the original author or authors. + * Copyright 2002-2022 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. @@ -541,10 +541,9 @@ public class AutowiredAnnotationBeanPostProcessor implements SmartInstantiationA * @param ann the Autowired annotation * @return whether the annotation indicates that a dependency is required */ - @SuppressWarnings("cast") protected boolean determineRequiredStatus(MergedAnnotation ann) { - return determineRequiredStatus((AnnotationAttributes) - ann.asMap(mergedAnnotation -> new AnnotationAttributes(mergedAnnotation.getType()))); + return determineRequiredStatus(ann. asMap( + mergedAnnotation -> new AnnotationAttributes(mergedAnnotation.getType()))); } /** diff --git a/spring-beans/src/main/java/org/springframework/beans/factory/groovy/GroovyDynamicElementReader.java b/spring-beans/src/main/java/org/springframework/beans/factory/groovy/GroovyDynamicElementReader.java index 7cd9e852b6..bcab348fec 100644 --- a/spring-beans/src/main/java/org/springframework/beans/factory/groovy/GroovyDynamicElementReader.java +++ b/spring-beans/src/main/java/org/springframework/beans/factory/groovy/GroovyDynamicElementReader.java @@ -58,7 +58,7 @@ class GroovyDynamicElementReader extends GroovyObjectSupport { public GroovyDynamicElementReader(String namespace, Map namespaceMap, BeanDefinitionParserDelegate delegate, GroovyBeanDefinitionWrapper beanDefinition, boolean decorating) { - super(); + this.rootNamespace = namespace; this.xmlNamespaces = namespaceMap; this.delegate = delegate; diff --git a/spring-beans/src/main/java/org/springframework/beans/factory/support/AbstractBeanFactory.java b/spring-beans/src/main/java/org/springframework/beans/factory/support/AbstractBeanFactory.java index 9c00e0fcf3..d003326cc3 100644 --- a/spring-beans/src/main/java/org/springframework/beans/factory/support/AbstractBeanFactory.java +++ b/spring-beans/src/main/java/org/springframework/beans/factory/support/AbstractBeanFactory.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2021 the original author or authors. + * Copyright 2002-2022 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. diff --git a/spring-context/src/test/java/org/springframework/context/groovy/GroovyApplicationContextDynamicBeanPropertyTests.java b/spring-context/src/test/java/org/springframework/context/groovy/GroovyApplicationContextDynamicBeanPropertyTests.java index 51ba8d349f..5333961078 100644 --- a/spring-context/src/test/java/org/springframework/context/groovy/GroovyApplicationContextDynamicBeanPropertyTests.java +++ b/spring-context/src/test/java/org/springframework/context/groovy/GroovyApplicationContextDynamicBeanPropertyTests.java @@ -28,6 +28,7 @@ import static groovy.test.GroovyAssert.assertThrows; /** * @author Jeff Brown * @author Sam Brannen + * @author Dave Syer */ class GroovyApplicationContextDynamicBeanPropertyTests {