parent
f7c3706361
commit
a6deac3ffe
|
@ -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");
|
* Licensed under the Apache License, Version 2.0 (the "License");
|
||||||
* you may not use this file except in compliance with 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
|
* @param ann the Autowired annotation
|
||||||
* @return whether the annotation indicates that a dependency is required
|
* @return whether the annotation indicates that a dependency is required
|
||||||
*/
|
*/
|
||||||
@SuppressWarnings("cast")
|
|
||||||
protected boolean determineRequiredStatus(MergedAnnotation<?> ann) {
|
protected boolean determineRequiredStatus(MergedAnnotation<?> ann) {
|
||||||
return determineRequiredStatus((AnnotationAttributes)
|
return determineRequiredStatus(ann.<AnnotationAttributes> asMap(
|
||||||
ann.asMap(mergedAnnotation -> new AnnotationAttributes(mergedAnnotation.getType())));
|
mergedAnnotation -> new AnnotationAttributes(mergedAnnotation.getType())));
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
|
|
@ -58,7 +58,7 @@ class GroovyDynamicElementReader extends GroovyObjectSupport {
|
||||||
|
|
||||||
public GroovyDynamicElementReader(String namespace, Map<String, String> namespaceMap,
|
public GroovyDynamicElementReader(String namespace, Map<String, String> namespaceMap,
|
||||||
BeanDefinitionParserDelegate delegate, GroovyBeanDefinitionWrapper beanDefinition, boolean decorating) {
|
BeanDefinitionParserDelegate delegate, GroovyBeanDefinitionWrapper beanDefinition, boolean decorating) {
|
||||||
super();
|
|
||||||
this.rootNamespace = namespace;
|
this.rootNamespace = namespace;
|
||||||
this.xmlNamespaces = namespaceMap;
|
this.xmlNamespaces = namespaceMap;
|
||||||
this.delegate = delegate;
|
this.delegate = delegate;
|
||||||
|
|
|
@ -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");
|
* Licensed under the Apache License, Version 2.0 (the "License");
|
||||||
* you may not use this file except in compliance with the License.
|
* you may not use this file except in compliance with the License.
|
||||||
|
|
|
@ -28,6 +28,7 @@ import static groovy.test.GroovyAssert.assertThrows;
|
||||||
/**
|
/**
|
||||||
* @author Jeff Brown
|
* @author Jeff Brown
|
||||||
* @author Sam Brannen
|
* @author Sam Brannen
|
||||||
|
* @author Dave Syer
|
||||||
*/
|
*/
|
||||||
class GroovyApplicationContextDynamicBeanPropertyTests {
|
class GroovyApplicationContextDynamicBeanPropertyTests {
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue