Spring/spring-data-commons
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

DATACMNS-565 - Improved detection of custom implementations for CDI repositories.

Browse Source 
The detection of the custom implementation has now been moved into the Bean base class to avoid calls to BeanManager.getBeans(…) (which are necessary to pick up the configuration class defining postfixes and the like) happen to early in the CDI container lifecycle.

Related ticket: DATACMNS-557.
This commit is contained in:
Mark Paluch
2014-08-20 21:34:01 +02:00
committed by Oliver Gierke
parent 8bfa0bd9e0
commit 6cc9e33359
3 changed files with 129 additions and 118 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/test/java/org/springframework/data/repository/cdi/DummyCdiExtension.java
View File

@@ -1,5 +1,5 @@
/*
* Copyright 2011 the original author or authors.
* Copyright 2011-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.
@@ -27,29 +27,31 @@ import javax.enterprise.context.spi.Contextual;
import javax.enterprise.context.spi.CreationalContext;
import javax.enterprise.event.Observes;
import javax.enterprise.inject.spi.AfterBeanDiscovery;
import javax.enterprise.inject.spi.Bean;
import javax.enterprise.inject.spi.BeanManager;
import org.apache.webbeans.context.AbstractContext;
import org.apache.webbeans.context.creational.BeanInstanceBag;
import org.mockito.Mockito;
import org.springframework.data.repository.config.CustomRepositoryImplementationDetector;
/**
* Dummy extension of {@link CdiRepositoryExtensionSupport} to allow integration tests. Will create mocks for repository
* interfaces being found.
*
* @author Oliver Gierke
* @author Mark Paluch
*/
public class DummyCdiExtension extends CdiRepositoryExtensionSupport {
@SuppressWarnings({ "rawtypes", "unchecked" })
void afterBeanDiscovery(@Observes AfterBeanDiscovery afterBeanDiscovery, BeanManager beanManager) {
afterBeanDiscovery.addContext(new MyCustomScope());
for (Entry<Class<?>, Set<Annotation>> type : getRepositoryTypes()) {
Bean<?> customImplementation = getCustomImplementationBean(type.getKey(), beanManager, type.getValue());
DummyCdiRepositoryBean bean = new DummyCdiRepositoryBean(type.getValue(), type.getKey(), beanManager,
customImplementation);
getCustomImplementationDetector());
registerBean(bean);
afterBeanDiscovery.addBean(bean);
}
@@ -62,8 +64,8 @@ public class DummyCdiExtension extends CdiRepositoryExtensionSupport {
}
DummyCdiRepositoryBean(Set<Annotation> qualifiers, Class<T> repositoryType, BeanManager beanManager,
Bean<?> customImplementation) {
super(qualifiers, repositoryType, beanManager, customImplementation);
CustomRepositoryImplementationDetector detector) {
super(qualifiers, repositoryType, beanManager, detector);
}
public Class<? extends Annotation> getScope() {