Browse Source
* 3.2.x: Promote use of @PostConstruct and @PreDestroy @Scheduled provides String variants of fixedDelay, fixedRate, initialDelay for placeholder support Further preparations for 3.2.2 @Scheduled provides String variants of fixedDelay, fixedRate, initialDelay for placeholder support Folded a FactoryBean-specific check into predictBeanType now Fix Assert.instanceOf exception message Allow for ordering of mixed AspectJ before/after advices Minor javadoc and source layout polishing Fixed documentation for "depends-on" attribute "depends-on" attribute on lang namespace element actually respected at runtime now Allow for ordering of mixed AspectJ before/after advicespull/230/head
Phillip Webb
13 years ago
25 changed files with 577 additions and 220 deletions
@ -0,0 +1,132 @@
@@ -0,0 +1,132 @@
|
||||
/* |
||||
* Copyright 2002-2013 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. |
||||
* You may obtain a copy of the License at |
||||
* |
||||
* http://www.apache.org/licenses/LICENSE-2.0
|
||||
* |
||||
* Unless required by applicable law or agreed to in writing, software |
||||
* distributed under the License is distributed on an "AS IS" BASIS, |
||||
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. |
||||
* See the License for the specific language governing permissions and |
||||
* limitations under the License. |
||||
*/ |
||||
|
||||
package org.springframework.context.annotation; |
||||
|
||||
import java.util.Map; |
||||
|
||||
import org.junit.Test; |
||||
|
||||
import org.springframework.beans.factory.FactoryBean; |
||||
import org.springframework.beans.factory.config.InstantiationAwareBeanPostProcessorAdapter; |
||||
import org.springframework.beans.factory.support.DefaultListableBeanFactory; |
||||
import org.springframework.beans.factory.support.RootBeanDefinition; |
||||
|
||||
import static org.hamcrest.CoreMatchers.*; |
||||
import static org.junit.Assert.*; |
||||
|
||||
/** |
||||
* Unit tests for SPR-8954, in which a custom {@link InstantiationAwareBeanPostProcessor} |
||||
* forces the predicted type of a FactoryBean, effectively preventing retrieval of the |
||||
* bean from calls to #getBeansOfType(FactoryBean.class). The implementation of |
||||
* {@link AbstractBeanFactory#isFactoryBean(String, RootBeanDefinition)} now ensures |
||||
* that not only the predicted bean type is considered, but also the original bean |
||||
* definition's beanClass. |
||||
* |
||||
* @author Chris Beams |
||||
* @author Oliver Gierke |
||||
*/ |
||||
public class ConfigurationClassSpr8954Tests { |
||||
|
||||
@Test |
||||
public void repro() { |
||||
AnnotationConfigApplicationContext bf = new AnnotationConfigApplicationContext(); |
||||
bf.registerBeanDefinition("fooConfig", new RootBeanDefinition(FooConfig.class)); |
||||
bf.getBeanFactory().addBeanPostProcessor(new PredictingBPP()); |
||||
bf.refresh(); |
||||
|
||||
assertThat(bf.getBean("foo"), instanceOf(Foo.class)); |
||||
assertThat(bf.getBean("&foo"), instanceOf(FooFactoryBean.class)); |
||||
|
||||
assertThat(bf.isTypeMatch("&foo", FactoryBean.class), is(true)); |
||||
|
||||
@SuppressWarnings("rawtypes") |
||||
Map<String, FactoryBean> fbBeans = bf.getBeansOfType(FactoryBean.class); |
||||
assertThat(1, equalTo(fbBeans.size())); |
||||
assertThat("&foo", equalTo(fbBeans.keySet().iterator().next())); |
||||
|
||||
Map<String, AnInterface> aiBeans = bf.getBeansOfType(AnInterface.class); |
||||
assertThat(1, equalTo(aiBeans.size())); |
||||
assertThat("&foo", equalTo(aiBeans.keySet().iterator().next())); |
||||
} |
||||
|
||||
@Test |
||||
public void findsBeansByTypeIfNotInstantiated() { |
||||
AnnotationConfigApplicationContext bf = new AnnotationConfigApplicationContext(); |
||||
bf.registerBeanDefinition("fooConfig", new RootBeanDefinition(FooConfig.class)); |
||||
bf.getBeanFactory().addBeanPostProcessor(new PredictingBPP()); |
||||
bf.refresh(); |
||||
|
||||
assertThat(bf.isTypeMatch("&foo", FactoryBean.class), is(true)); |
||||
|
||||
@SuppressWarnings("rawtypes") |
||||
Map<String, FactoryBean> fbBeans = bf.getBeansOfType(FactoryBean.class); |
||||
assertThat(1, equalTo(fbBeans.size())); |
||||
assertThat("&foo", equalTo(fbBeans.keySet().iterator().next())); |
||||
|
||||
Map<String, AnInterface> aiBeans = bf.getBeansOfType(AnInterface.class); |
||||
assertThat(1, equalTo(aiBeans.size())); |
||||
assertThat("&foo", equalTo(aiBeans.keySet().iterator().next())); |
||||
} |
||||
|
||||
|
||||
static class FooConfig { |
||||
|
||||
@Bean FooFactoryBean foo() { |
||||
return new FooFactoryBean(); |
||||
} |
||||
} |
||||
|
||||
static class FooFactoryBean implements FactoryBean<Foo>, AnInterface { |
||||
|
||||
@Override |
||||
public Foo getObject() throws Exception { |
||||
return new Foo(); |
||||
} |
||||
|
||||
@Override |
||||
public Class<?> getObjectType() { |
||||
return Foo.class; |
||||
} |
||||
|
||||
@Override |
||||
public boolean isSingleton() { |
||||
return true; |
||||
} |
||||
} |
||||
|
||||
interface AnInterface { |
||||
} |
||||
|
||||
static class Foo { |
||||
} |
||||
|
||||
interface PredictedType { |
||||
} |
||||
|
||||
static class PredictedTypeImpl implements PredictedType { |
||||
} |
||||
|
||||
static class PredictingBPP extends InstantiationAwareBeanPostProcessorAdapter { |
||||
|
||||
@Override |
||||
public Class<?> predictBeanType(Class<?> beanClass, String beanName) { |
||||
return FactoryBean.class.isAssignableFrom(beanClass) ? |
||||
PredictedType.class : null; |
||||
} |
||||
} |
||||
|
||||
} |
||||
Loading…
Reference in new issue