DATAJPA-453, DATAJPA-435 - Fixed BeanFactoryPostProcessor handling of BeanFactory hierarchies.

The AuditingBeanFactoryPostProcessor and EntityManagerBeanDefinitionPostProcessor now correctly lookup BeanDefinitions within BeanFactory hierarchies. Also, the EMBDPP registers the EntityManager bean definition in the BeanFactory, the source BeanDefinition for the EntityManagerFactory is found.
This commit is contained in:
Oliver Gierke
2014-01-27 12:41:57 +01:00
parent 7b5425322b
commit 7b9b303f05
6 changed files with 214 additions and 75 deletions

View File

@@ -1,5 +1,5 @@
/*
* Copyright 2008-2013 the original author or authors.
* Copyright 2008-2014 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.
@@ -91,4 +91,14 @@ public class AuditingBeanFactoryPostProcessorUnitTests {
is(arrayContaining(AuditingBeanFactoryPostProcessor.BEAN_CONFIGURER_ASPECT_BEAN_NAME)));
}
}
/**
* @see DATAJPA-453
*/
@Test
public void findsEntityManagerFactoryInParentBeanFactory() {
DefaultListableBeanFactory childFactory = new DefaultListableBeanFactory(getBeanFactory());
processor.postProcessBeanFactory(childFactory);
}
}

View File

@@ -87,10 +87,10 @@ public class EntityManagerBeanDefinitionRegistrarPostProcessorIntegrationTests {
@Autowired EntityManagerInjectionTarget target;
/**
* @see
* @see DATAJPA-445
*/
@Test
public void foo() {
public void injectsEntityManagerIntoConstructors() {
assertThat(target, is(notNullValue()));
assertThat(target.em, is(notNullValue()));

View File

@@ -0,0 +1,51 @@
/*
* Copyright 2014 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.data.jpa.repository.support;
import static org.hamcrest.CoreMatchers.*;
import static org.junit.Assert.*;
import org.junit.Test;
import org.springframework.beans.factory.config.BeanFactoryPostProcessor;
import org.springframework.beans.factory.config.ConfigurableListableBeanFactory;
import org.springframework.beans.factory.support.DefaultListableBeanFactory;
import org.springframework.beans.factory.support.RootBeanDefinition;
import org.springframework.orm.jpa.LocalContainerEntityManagerFactoryBean;
/**
* Unit tests for {@link EntityManagerBeanDefinitionRegistrarPostProcessor}.
*
* @author Oliver Gierke
*/
public class EntityManagerBeanDefinitionRegistratPostProcessorUnitTests {
/**
* @see DATAJPA-453
*/
@Test
public void findsBeanDefinitionInParentBeanFactory() {
DefaultListableBeanFactory beanFactory = new DefaultListableBeanFactory();
beanFactory.registerBeanDefinition("factory", new RootBeanDefinition(LocalContainerEntityManagerFactoryBean.class));
ConfigurableListableBeanFactory childFactory = new DefaultListableBeanFactory(beanFactory);
BeanFactoryPostProcessor processor = new EntityManagerBeanDefinitionRegistrarPostProcessor();
processor.postProcessBeanFactory(childFactory);
assertThat(beanFactory.getBeanDefinitionCount(), is(2));
}
}