Browse Source

Polish contribution

See gh-27945
pull/27967/head
Sam Brannen 3 years ago
parent
commit
a6deac3ffe
  1. 7
      spring-beans/src/main/java/org/springframework/beans/factory/annotation/AutowiredAnnotationBeanPostProcessor.java
  2. 2
      spring-beans/src/main/java/org/springframework/beans/factory/groovy/GroovyDynamicElementReader.java
  3. 2
      spring-beans/src/main/java/org/springframework/beans/factory/support/AbstractBeanFactory.java
  4. 1
      spring-context/src/test/java/org/springframework/context/groovy/GroovyApplicationContextDynamicBeanPropertyTests.java

7
spring-beans/src/main/java/org/springframework/beans/factory/annotation/AutowiredAnnotationBeanPostProcessor.java

@ -1,5 +1,5 @@ @@ -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 @@ -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.<AnnotationAttributes> asMap(
mergedAnnotation -> new AnnotationAttributes(mergedAnnotation.getType())));
}
/**

2
spring-beans/src/main/java/org/springframework/beans/factory/groovy/GroovyDynamicElementReader.java

@ -58,7 +58,7 @@ class GroovyDynamicElementReader extends GroovyObjectSupport { @@ -58,7 +58,7 @@ class GroovyDynamicElementReader extends GroovyObjectSupport {
public GroovyDynamicElementReader(String namespace, Map<String, String> namespaceMap,
BeanDefinitionParserDelegate delegate, GroovyBeanDefinitionWrapper beanDefinition, boolean decorating) {
super();
this.rootNamespace = namespace;
this.xmlNamespaces = namespaceMap;
this.delegate = delegate;

2
spring-beans/src/main/java/org/springframework/beans/factory/support/AbstractBeanFactory.java

@ -1,5 +1,5 @@ @@ -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.

1
spring-context/src/test/java/org/springframework/context/groovy/GroovyApplicationContextDynamicBeanPropertyTests.java

@ -28,6 +28,7 @@ import static groovy.test.GroovyAssert.assertThrows; @@ -28,6 +28,7 @@ import static groovy.test.GroovyAssert.assertThrows;
/**
* @author Jeff Brown
* @author Sam Brannen
* @author Dave Syer
*/
class GroovyApplicationContextDynamicBeanPropertyTests {

Loading…
Cancel
Save